Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/
Now on revision 101498.
------------------------------------------------------------
revno: 101498
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Mon 2010-09-20 01:57:46 +0000
message:
  Make Gnus work for Emacs 22 and XEmacs.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-20 01:20:32 +0000
+++ lisp/gnus/ChangeLog	2010-09-20 01:57:46 +0000
@@ -1,3 +1,10 @@
+2010-09-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-html.el (gnus-html-image-fetched): Pass arg to kill-buffer.
+
+	* gnus-sum.el (gnus-summary-update-mark): Replace subst-char-in-string
+	by mm-subst-char-in-string.
+
 2010-09-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* nnimap.el (nnimap-wait-for-connection): Avoid a race condition while

=== modified file 'lisp/gnus/gnus-html.el'
--- lisp/gnus/gnus-html.el	2010-09-20 00:36:54 +0000
+++ lisp/gnus/gnus-html.el	2010-09-20 01:57:46 +0000
@@ -339,7 +339,7 @@
     (when (search-forward "\n\n" nil t)
       ;; Write region (image data) silently
       (write-region (point) (point-max) file nil 1)
-      (kill-buffer)
+      (kill-buffer (current-buffer))
       (when (and (buffer-live-p buffer)
 		 ;; If the `image' has no marker, do not replace anything
 		 (cadr image)

=== modified file 'lisp/gnus/gnus-sum.el'
--- lisp/gnus/gnus-sum.el	2010-09-20 00:36:54 +0000
+++ lisp/gnus/gnus-sum.el	2010-09-20 01:57:46 +0000
@@ -10769,8 +10769,9 @@
 	(goto-char (+ forward (point)))
 	;; Replace the old mark with the new mark.
         (let ((to-insert
-               (subst-char-in-string (char-after) mark
-                                     (buffer-substring (point) (1+ (point))))))
+               (mm-subst-char-in-string
+		(char-after) mark
+		(buffer-substring (point) (1+ (point))))))
           (delete-region (point) (1+ (point)))
           (insert to-insert))
 	;; Optionally update the marks by some user rule.
------------------------------------------------------------
revno: 101497
committer: Juanma Barranquero <lekktu@gmail.com>
branch nick: trunk
timestamp: Mon 2010-09-20 03:20:32 +0200
message:
  Fix typos in ChangeLogs.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-20 00:52:17 +0000
+++ lisp/ChangeLog	2010-09-20 01:20:32 +0000
@@ -24,30 +24,29 @@
 2010-09-18  Michael R. Mauger  <mmaug@yahoo.com>
 
 	* progmodes/sql.el: Version 2.8
-	(sql-login-params): Update widget structure; changes still
-	needed.
+	(sql-login-params): Update widget structure; changes still needed.
 	(sql-product-alist): Add :list-all and :list-table features for
 	SQLite, Postgres and MySQL products.
 	(sql-redirect): Handle default value.
 	(sql-execute, sql-execute-feature): New functions.
 	(sql-read-table-name): New function.
-	(sql-list-all, sql-list-table): New functions. User API
+	(sql-list-all, sql-list-table): New functions.  User API.
 	(sql-mode-map, sql-interactive-mode-map): Add key definitions
 	for above functions.
 	(sql-mode-menu, sql-interactive-mode-menu): Add menu definitions
 	for above functions.
 	(sql-postgres-login-params): Add user and database defaults.
 	(sql-buffer-live-p): Bug fix.
-	(sql-product-history); New variable.
+	(sql-product-history): New variable.
 	(sql-read-product): New function. Use it.
 	(sql-set-product, sql-product-interactive): Use it.
 	(sql-connection-history): New variable.
-	(sql-read-connection): New function. Use it.
+	(sql-read-connection): New function.  Use it.
 	(sql-connect): New function.
 	(sql-for-each-login): Redesign function interface.
 	(sql-make-alternate-buffer-name, sql-save-connection): Use it.
-	(sql-get-login-ext, sql-get-login): Use it. Handle default values.
-	(sql-comint): Check for program. Existing live buffer.
+	(sql-get-login-ext, sql-get-login): Use it.  Handle default values.
+	(sql-comint): Check for program.  Existing live buffer.
 	(sql-comint-postgres): Add port parameter.
 
 2010-09-19  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -420,7 +419,7 @@
 	(tramp-handle-set-file-modes)
 	(tramp-do-copy-or-rename-file-directly)
 	(tramp-handle-delete-directory, tramp-handle-delete-file)
-	(tramp-maybe-send-script, ): Use `tramp-barf-unless-okay'.
+	(tramp-maybe-send-script): Use `tramp-barf-unless-okay'.
 	(tramp-sh-file-name-handler, tramp-send-command-and-check)
 	(tramp-get-remote-ln): Set tramp-autoload cookie.
 
@@ -974,7 +973,7 @@
 	`default-directory' unless using Ispell per-directory personal
 	dictionaries and not in a mini-buffer under XEmacs.
 	(kill-buffer-hook): Do not kill ispell process on exit when
-	`ispell-process-directory' is "~/". (Bug#6143)
+	`ispell-process-directory' is "~/".  (Bug#6143)
 
 2010-09-02  Jan Djärv  <jan.h.d@swipnet.se>
 
@@ -1351,8 +1350,8 @@
 	(tramp-gvfs-mount-spec): Return both prefix and mountspec.
 	(tramp-gvfs-maybe-open-connection): Test, whether mountpoint
 	exists.  Raise an error, if not (due to a corresponding answer
-	"no" in interactive questions, for example). Use
-	`tramp-compat-funcall'.
+	"no" in interactive questions, for example).
+	Use `tramp-compat-funcall'.
 
 	* net/tramp-imap.el (top): Autoload `epg-make-context'.
 	(tramp-imap-handle-copy-file): Add PRESERVE-SELINUX-CONTEXT.
@@ -2084,10 +2083,10 @@
 2010-08-08  Stephen Peters  <speters@itasoftware.com>
 
 	* calendar/icalendar.el
-	(icalendar--split-value): Fixed splitting regexp. (Bug#6766)
-	(icalendar--get-weekday-numbers): New
+	(icalendar--split-value): Fix splitting regexp.  (Bug#6766)
+	(icalendar--get-weekday-numbers): New.
 	(icalendar--convert-recurring-to-diary): Handle multiple byday
-	values in weekly rules. (Bug#6766)
+	values in weekly rules.  (Bug#6766)
 
 2010-08-08  Ulf Jasper  <ulf.jasper@web.de>
 
@@ -5721,7 +5720,7 @@
 
 	Enable recentf-mode if using virtual buffers.
 	* ido.el (recentf-list): Declare for byte-compiler.
-	(ido-virtual-buffers): Move up to silence byte-compiler. Add docstring.
+	(ido-virtual-buffers): Move up to silence byte-compiler.  Add docstring.
 	(ido-make-buffer-list): Simplify.
 	(ido-add-virtual-buffers-to-list): Simplify.  Enable recentf-mode.
 

=== modified file 'lisp/ChangeLog.10'
--- lisp/ChangeLog.10	2010-07-24 11:53:19 +0000
+++ lisp/ChangeLog.10	2010-09-20 01:20:32 +0000
@@ -4757,7 +4757,7 @@
 	* files.el (insert-directory): Decode by what specified.
 
 	* language/japan-util.el (setup-japanese-environment-internal):
-	By defalt, use japanese-iso-8bit for file names, and prefer
+	By default, use japanese-iso-8bit for file names, and prefer
 	japanese-shift-jis on DOS and Windows.
 
 	* international/quail.el (quail-show-guidance-buf): Make the quail
@@ -21636,7 +21636,7 @@
 2001-11-26  Sam Steingold  <sds@gnu.org>
 
 	* frame.el (show-trailing-whitespace): Remove :set argument (the
-	value was essentially identical to the defalt).
+	value was essentially identical to the default).
 
 2001-11-26  Pavel Janík  <Pavel@Janik.cz>
 

=== modified file 'lisp/ChangeLog.11'
--- lisp/ChangeLog.11	2010-07-24 11:53:19 +0000
+++ lisp/ChangeLog.11	2010-09-20 01:20:32 +0000
@@ -2000,7 +2000,7 @@
 	(math-rewrite, math-rewrite-phase): Replace variable expr by
 	declared variable.
 	(math-rewrite-heads-heads, math-rewrite-heads-skips)
-	(math-rewrite-heads-blanks ): New variables.
+	(math-rewrite-heads-blanks): New variables.
 	(math-rewrite-heads, math-rewrite-heads-rec): Replace variables
 	heads, skips and blanks by declared variables.
 	(math-rwcomp-subst-old, math-rwcomp-subst-new)
@@ -11832,7 +11832,7 @@
 	(ido-saved-vc-hb): Rename from ido-saved-vc-mt.  Uses changed.
 	(ido-no-final-slash): New defun.
 	(ido-make-prompt, ido-file-internal, ido-toggle-vc)
-	(ido-read-file-name): ): Toggle VC checking via
+	(ido-read-file-name): Toggle VC checking via
 	vc-handled-backends instead of vc-master-templates.
 	(ido-file-internal): Handle ido-use-url-at-point and
 	ido-use-filename-at-point via code borrowed from ffap-guesser.

=== modified file 'lisp/ChangeLog.13'
--- lisp/ChangeLog.13	2010-07-24 11:53:19 +0000
+++ lisp/ChangeLog.13	2010-09-20 01:20:32 +0000
@@ -7567,7 +7567,7 @@
 	(ediff-setup-windows-plain-merge)
 	(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
 	(ediff-refresh-control-frame, ediff-get-visible-buffer-window):
-	* ediff-util.el (ediff-setup-keymap, )
+	* ediff-util.el (ediff-setup-keymap)
 	(ediff-toggle-wide-display, ediff-toggle-multiframe)
 	(ediff-toggle-use-toolbar, ediff-really-quit)
 	(ediff-good-frame-under-mouse)

=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-20 00:36:54 +0000
+++ lisp/gnus/ChangeLog	2010-09-20 01:20:32 +0000
@@ -70,7 +70,7 @@
 	(gnus-html-image-fetched): Fix `gnus-html-put-image' call not setting
 	the right URL and ALT text on images.
 	(gnus-html-wash-tags): Fix tag case.
-	Add support for `s' and `ins' tags. Use gnus-emphasis-* faces.
+	Add support for `s' and `ins' tags.  Use gnus-emphasis-* faces.
 	(gnus-article-html): Add -o display_ins_del=2 option.
 	(gnus-html-wash-tags): Add better support for <ul> tags symbols.
 
@@ -647,7 +647,7 @@
 2010-09-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus-html.el (gnus-html-wash-tags): Don't show images that are really
-	small. They're probably tracking images.
+	small.  They're probably tracking images.
 	(gnus-html-wash-tags): Remove all <pre_int> place holders.
 	(gnus-html-rescale-image): Yet another try at getting the image sizing
 	right.
@@ -801,12 +801,12 @@
 
 	* gnus-sum.el: As per discussion 3 years, 8 weeks, 3 days, 9 hours, 57
 	minutes, 56 seconds ago on the ding list, remove the `w' and `i'
-	bindings, as they aren't useful at all. `w' is moved to `W w'.
+	bindings, as they aren't useful at all.  `w' is moved to `W w'.
 
 	* gnus-move.el: Removed file, since it doesn't really work.
 
 	* gnus-html.el (gnus-article-html): Tell w3m that the input is
-	UTF-8. This seems to fix problems with some German web feeds.
+	UTF-8.  This seems to fix problems with some German web feeds.
 
 	* gnus.el (gnus-group-startup-message): Put the xpm version of the logo
 	at the top so that the proper colours are applied.
@@ -4293,7 +4293,7 @@
 	(nntp-wait-for, nntp-retrieve-articles, nntp-async-trigger)
 	(nntp-retrieve-headers-with-xover): Use nntp-insert-buffer-substring to
 	copy data from unibyte buffer to multibyte current buffer.
-	(nntp-retrieve-headers, nntp-retrieve-groups); Use nntp-copy-to-buffer
+	(nntp-retrieve-headers, nntp-retrieve-groups): Use nntp-copy-to-buffer
 	to copy data from unibyte current buffer to multibyte buffer.
 	(nntp-make-process-buffer): Make process buffer unibyte.
 

=== modified file 'lisp/org/ChangeLog'
--- lisp/org/ChangeLog	2010-08-19 03:45:46 +0000
+++ lisp/org/ChangeLog	2010-09-20 01:20:32 +0000
@@ -1163,7 +1163,7 @@
 	(org-agenda-bulk-remove-overlays): Use the normal overlay API.
 
 	* org-freemind.el (org-freemind-from-org-mode-node)
-	(org-freemind-from-org-mode, )
+	(org-freemind-from-org-mode)
 	(org-freemind-from-org-sparse-tree, org-freemind-to-org-mode): Use
 	interactive-p instead of called-interactively, because this is
 	backward compatible with older Emacsen I still support..
@@ -2616,7 +2616,7 @@
 2010-02-15  Chong Yidong  <cyd@stupidchicken.com>
 
 	* org-freemind.el (org-freemind-from-org-mode-node)
-	(org-freemind-from-org-mode, )
+	(org-freemind-from-org-mode)
 	(org-freemind-from-org-sparse-tree, org-freemind-to-org-mode):
 	Pass arg to called-interactively-p.
 

=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-09-20 00:18:18 +0000
+++ src/ChangeLog	2010-09-20 01:20:32 +0000
@@ -13,8 +13,8 @@
 
 	* deps.mk (xml.o): Add dependencies.
 
-	* xdisp.c (Fcurrent_bidi_paragraph_direction): Call
-	bidi_paragraph_init with NO_DEFAULT_P non-zero.  (Bug#7038)
+	* xdisp.c (Fcurrent_bidi_paragraph_direction):
+	Call bidi_paragraph_init with NO_DEFAULT_P non-zero.  (Bug#7038)
 
 	* bidi.c (bidi_paragraph_init): Accept an additional argument
 	NO_DEFAULT_P; all callers changed.  If NO_DEFAULT_P is non-zero,
@@ -644,7 +644,7 @@
 	* xterm.c (emacs_class): New char[] for EMACS_CLASS.
 	(xim_open_dpy, xim_initialize, xim_close_dpy): Use emacs_class.
 	(x_term_init): Use char[] display_opt and name_opt instead of
-	string literal. file is const char*.
+	string literal.  file is const char*.
 
 	* xsmfns.c (NOSPLASH_OPT): Change to char[].
 	(smc_save_yourself_CB): Do xstrdup on all ->type and ->name for
@@ -656,7 +656,7 @@
 	non-const char.
 
 	* xmenu.c (Fx_popup_dialog): error_name is const char*.
-	(xmenu_show): error parameter is const char **. pane_string is const
+	(xmenu_show): error parameter is const char **.  pane_string is const
 	char *.
 	(button_names): Is const char *.
 	(xdialog_show): error_name and pane_string is const.

=== modified file 'src/ChangeLog.10'
--- src/ChangeLog.10	2010-09-14 20:32:35 +0000
+++ src/ChangeLog.10	2010-09-20 01:20:32 +0000
@@ -21089,7 +21089,7 @@
 
 	* w32.c (g_b_init_is_windows_9x, g_b_init_open_process_token)
 	(g_b_init_get_token_information, g_b_init_lookup_account_sid)
-	(g_b_init_get_sid_identifier_authority ): Add several static
+	(g_b_init_get_sid_identifier_authority): Add several static
 	global variables.
 
 	* w32.c (globals_of_w32): New function.  Used to initialize those

=== modified file 'src/ChangeLog.8'
--- src/ChangeLog.8	2010-09-14 20:32:35 +0000
+++ src/ChangeLog.8	2010-09-20 01:20:32 +0000
@@ -10392,7 +10392,7 @@
 	* term.c (get_char_info): Use WHAT field of CHAR_INFO.
 	Use tabs as multiples of spaces.
 
-	* dispextern.h (struct char_info ): WHAT field.
+	* dispextern.h (struct char_info): WHAT field.
 
 	* term.c (encode_terminal_code): Don't use GLYPH_CHAR, use
 	FAST_GLYPH_CHAR instead because GLYPH_CHAR won't remove faces.
@@ -10407,8 +10407,7 @@
 
 	* xterm.c (XTget_char_info): Check WANT_ELLIPSIS_P.
 
-	* dispextern.h (struct char_info ): GLYPH_ROW for intermediate
-	glyphs.
+	* dispextern.h (struct char_info): GLYPH_ROW for intermediate glyphs.
 
 	* dispnew.c (init_char_info): Init GLYPH_ROW to NULL.  CHAR_CURSOR
 	moved to xdisp.c.
@@ -10436,7 +10435,7 @@
 
 	* term.c (get_char_info): Set MAX_PIXEL_WIDTH in CHAR_INFO.
 
-	* dispextern.h (struct char_info ): Use LISP_CHAR_TABLE for DP.
+	* dispextern.h (struct char_info): Use LISP_CHAR_TABLE for DP.
 	New member MAX_PIXEL_HEIGHT.
 
 	* xterm.c (x_per_char_metric): Get per character metrics.
------------------------------------------------------------
revno: 101496
committer: Juanma Barranquero <lekktu@gmail.com>
branch nick: trunk
timestamp: Mon 2010-09-20 02:52:17 +0200
message:
  * subr.el (y-or-n-p): Remove leftover code from revno 101459.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-20 00:26:22 +0000
+++ lisp/ChangeLog	2010-09-20 00:52:17 +0000
@@ -1,5 +1,7 @@
 2010-09-20  Juanma Barranquero  <lekktu@gmail.com>
 
+	* subr.el (y-or-n-p): Remove leftover code from revno 101459.
+
 	* emacs-lisp/smie.el (smie-indent--hanging-p): Use `smie-indent--bolp'.
 
 2010-09-19  Stefan Monnier  <monnier@iro.umontreal.ca>

=== modified file 'lisp/subr.el'
--- lisp/subr.el	2010-09-17 13:30:30 +0000
+++ lisp/subr.el	2010-09-20 00:52:17 +0000
@@ -3403,10 +3403,7 @@
              ((memq answer '(exit-prefix quit)) (signal 'quit nil) t)
              (t t)))
         (ding)
-        (discard-input)
-        (setq xprompt
-              (if (eq answer 'recenter) prompt
-                (concat "Please answer y or n.  " prompt)))))
+        (discard-input)))
     (let ((ret (eq answer 'act)))
       (unless noninteractive
         (message "%s %s" prompt (if ret "y" "n")))
------------------------------------------------------------
revno: 101495
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Mon 2010-09-20 00:36:54 +0000
message:
  Merge changes made in Gnus trunk.
  
  mail-parse.el (mail-header-encode-parameter): Define as rfc2045-encode-string.
  nnheader.el (nnheader-insert-nov): Protect against junk appearing in the extra mail headers.
  gnus-html.el: Prefetch and html washing additions.
  gnus-html.el (gnus-html-prefetch-images): Fix up the url-retrieve calling conventions so that prefetch doesn't bug out.
  Pass proper format strings to gnus-message.
  nnimap.el: Allow anonymous login.
  nnimap.el (nnimap-transform-headers): The chars header is called Chars not Bytes.
  nnimap.el (nnimap-wait-for-response): Don't infloop if the IMAP connection drops.
  gnus-start.el (gnus-get-unread-articles): Call `gnus-open-server' on each method before trying to scan them etc.
  gnus-sum.el (gnus-summary-update-mark): Replace subst-char-in-region by subst-char-in-region.
  gnus.el (gnus-similar-server-opened): Refactor a bit and add comments.
  gnus.el: Fix a speed regression based in methods that were similar weren't the same.
  gnus.el (gnus): When using the development version of Gnus, load the gnus-load file.
  nnimap.el (nnimap-open-connection):  When looking for credentials, also use the nnimap-server-port.
  nnimap.el (nnimap-request-article): Return the group/article number, so that Gnus `^' works as expected.
  nnimap.el (nnimap-find-wanted-parts-1): Return the MIME parts as IMAP wants them.
  gnus-start.el (gnus-ignored-newsgroups): Remove [] from the list of bogus characters.
  gnus-html.el (gnus-html-image-fetched): Protect against the data not arriving.
  nnimap.el (nnimap-wait-for-connection): Avoid a race condition while waiting for the connection string.
  gnus.texi (Required Back End Functions): Document INFO.
diff:
=== modified file 'doc/misc/gnus.texi'
--- doc/misc/gnus.texi	2010-09-04 15:34:39 +0000
+++ doc/misc/gnus.texi	2010-09-20 00:36:54 +0000
@@ -29672,7 +29672,7 @@
 on successful article retrieval.
 
 
-@item (nnchoke-request-group GROUP &optional SERVER FAST)
+@item (nnchoke-request-group GROUP &optional SERVER FAST INFO)
 
 Get data on @var{group}.  This function also has the side effect of
 making @var{group} the current group.
@@ -29680,6 +29680,9 @@
 If @var{fast}, don't bother to return useful data, just make @var{group}
 the current group.
 
+If @var{info}, it allows the backend to update the group info
+structure.
+
 Here's an example of some result data and a definition of the same:
 
 @example

=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-19 10:45:51 +0000
+++ lisp/gnus/ChangeLog	2010-09-20 00:36:54 +0000
@@ -1,5 +1,90 @@
 2010-09-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* nnimap.el (nnimap-wait-for-connection): Avoid a race condition while
+	waiting for the connection string.
+
+	* gnus-html.el (gnus-html-image-fetched): Protect against the data not
+	arriving.
+
+	* gnus-start.el (gnus-ignored-newsgroups): Remove [] from the list of
+	bogus characters.  This allows selecting certain Gmail groups.
+
+	* nnimap.el (nnimap-find-wanted-parts-1): New function.
+	(nnimap-fetch-partial-articles): New variable.
+	(nnimap-open-connection): When looking for credentials, also use the
+	nnimap-server-port.
+	(nnimap-request-article): Return the group/article number, so that Gnus
+	`^' works as expected.
+	(nnimap-find-wanted-parts-1): Return the MIME parts as IMAP wants
+	them.
+
+	* gnus.el (gnus-similar-server-opened): Refactor a bit and add
+	comments.
+	(gnus-methods-sloppily-equal): New function.
+	(gnus): When using the development version of Gnus, load the gnus-load
+	file.
+
+	* gnus-start.el (gnus-get-unread-articles): Make sure that we call
+	`gnus-open-server' on each method before trying to scan them etc.  This
+	ensures that all the backend parameters are set correctly.
+
+	* nnimap.el (nnimap-authenticator): New variable.
+	(nnimap-open-connection): Allow anonymous login.
+	(nnimap-transform-headers): The chars header is called Chars not
+	Bytes.
+	(nnimap-wait-for-response): Don't infloop if the IMAP connection
+	drops.
+
+	* gnus-art.el (gnus-article-describe-briefly): Fix up typo in last
+	patch, found by Knut Anders Hatlen.
+
+2010-09-19  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* gnus-agent.el (gnus-agent-batch-confirmation)
+	(gnus-agent-expire-group, gnus-agent-expire): Pass proper format string
+	to gnus-message.
+	* gnus-art.el (gnus-article-describe-briefly): Likewise.
+	* gnus-group.el (gnus-group-list-groups, gnus-group-describe-group)
+	(gnus-group-edit-global-kill, gnus-group-describe-briefly): Likewise.
+	* gnus-int.el (gnus-open-server): Likewise.
+	* gnus-score.el (gnus-score-edit-current-scores, gnus-score-edit-file)
+	(gnus-score-check-syntax): Likewise.
+	* gnus-srvr.el (gnus-browse-describe-briefly): Likewise.
+	* gnus-start.el (gnus-read-active-file-1, gnus-read-active-file-1):
+	Likewise.
+	* gnus-sum.el (gnus-summary-describe-briefly): Likewise.
+
+2010-09-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus-html.el (gnus-html-prefetch-images): Fix up the url-retrieve
+	calling conventions so that prefetch doesn't bug out.
+
+2010-09-19  Julien Danjou  <julien@danjou.info>
+
+	* gnus-sum.el (gnus-summary-update-mark): Use `subst-char-in-string'
+	rather than `subst-char-in-region' in order to be able to replace ASCII
+	char by UTF-8 ones.
+
+	* gnus-html.el (gnus-html-prefetch-images): Use `url-retrieve' rather
+	than curl.
+	(gnus-html-image-fetched): Fix `gnus-html-put-image' call not setting
+	the right URL and ALT text on images.
+	(gnus-html-wash-tags): Fix tag case.
+	Add support for `s' and `ins' tags. Use gnus-emphasis-* faces.
+	(gnus-article-html): Add -o display_ins_del=2 option.
+	(gnus-html-wash-tags): Add better support for <ul> tags symbols.
+
+2010-09-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* nnheader.el (nnheader-insert-nov): Protect against junk appearing in
+	the extra mail headers, which sometimes seem to happen for unknown
+	reasons.
+
+	* mail-parse.el (mail-header-encode-parameter): Define as
+	rfc2045-encode-string instead of as rfc2231-encode-string, since some
+	(or most, perhaps?) mail readers don't understand the latter, but do
+	understand the former.
+
 	* gnus-agent.el (gnus-agent-auto-agentize-methods): Switch the default
 	to nil, so that no methods are automatically agentized.  I think this
 	is probably what most users want.
@@ -41,7 +126,7 @@
 	the range update right.
 	(nnimap-request-group): Don't make `M-g' bug out on group with no
 	marks.
-	(nnoo): Require, so that other packages can require nnimap.
+	(nnoo): Required, so that other packages can require nnimap.
 	(nnimap-wait-for-response): Be a bit more lax in finding the end of the
 	command we're looking for.  This helps when the server sends more
 	responses after we've gotten everything we expected.

=== modified file 'lisp/gnus/gnus-agent.el'
--- lisp/gnus/gnus-agent.el	2010-09-19 10:45:51 +0000
+++ lisp/gnus/gnus-agent.el	2010-09-20 00:36:54 +0000
@@ -2377,7 +2377,7 @@
 
 (defun gnus-agent-batch-confirmation (msg)
   "Show error message and return t."
-  (gnus-message 1 msg)
+  (gnus-message 1 "%s" msg)
   t)
 
 ;;;###autoload
@@ -3123,7 +3123,7 @@
                        group overview (gnus-gethash-safe group orig)
                        articles force))))
               (kill-buffer overview))))
-      (gnus-message 4 (gnus-agent-expire-done-message)))))
+      (gnus-message 4 "%s" (gnus-agent-expire-done-message)))))
 
 (defun gnus-agent-expire-group-1 (group overview active articles force)
   ;; Internal function - requires caller to have set
@@ -3548,7 +3548,7 @@
                              expiring-group overview active articles force))))))))
             (kill-buffer overview))
           (gnus-agent-expire-unagentized-dirs)
-          (gnus-message 4 (gnus-agent-expire-done-message))))))
+          (gnus-message 4 "%s" (gnus-agent-expire-done-message))))))
 
 (defun gnus-agent-expire-done-message ()
   (if (and (> gnus-verbose 4)

=== modified file 'lisp/gnus/gnus-art.el'
--- lisp/gnus/gnus-art.el	2010-09-04 15:24:35 +0000
+++ lisp/gnus/gnus-art.el	2010-09-20 00:36:54 +0000
@@ -6406,7 +6406,7 @@
 (defun gnus-article-describe-briefly ()
   "Describe article mode commands briefly."
   (interactive)
-  (gnus-message 6 (substitute-command-keys "\\<gnus-article-mode-map>\\[gnus-article-goto-next-page]:Next page	 \\[gnus-article-goto-prev-page]:Prev page  \\[gnus-article-show-summary]:Show summary  \\[gnus-info-find-node]:Run Info  \\[gnus-article-describe-briefly]:This help")))
+  (gnus-message 6 "%s" (substitute-command-keys "\\<gnus-article-mode-map>\\[gnus-article-goto-next-page]:Next page	 \\[gnus-article-goto-prev-page]:Prev page  \\[gnus-article-show-summary]:Show summary  \\[gnus-info-find-node]:Run Info  \\[gnus-article-describe-briefly]:This help")))
 
 (defun gnus-article-check-buffer ()
   "Beep if not in an article buffer."

=== modified file 'lisp/gnus/gnus-group.el'
--- lisp/gnus/gnus-group.el	2010-09-05 00:34:16 +0000
+++ lisp/gnus/gnus-group.el	2010-09-20 00:36:54 +0000
@@ -1273,7 +1273,7 @@
 		   (zerop number))
 	      (zerop (buffer-size)))
       ;; No groups in the buffer.
-      (gnus-message 5 gnus-no-groups-message))
+      (gnus-message 5 "%s" gnus-no-groups-message))
     ;; We have some groups displayed.
     (goto-char (point-max))
     (when (or (not gnus-group-goto-next-group-function)
@@ -4136,7 +4136,7 @@
 		   (gnus-gethash mname gnus-description-hashtb))
 	      (setq desc (gnus-group-get-description group))
 	      (gnus-read-descriptions-file method))
-      (gnus-message 1
+      (gnus-message 1 "%s"
 		    (or desc (gnus-gethash group gnus-description-hashtb)
 			"No description available")))))
 
@@ -4297,11 +4297,9 @@
   (interactive "P")
   (setq gnus-current-kill-article article)
   (gnus-kill-file-edit-file group)
-  (gnus-message
-   6
-   (substitute-command-keys
-    (format "Editing a %s kill file (Type \\[gnus-kill-file-exit] to exit)"
-	    (if group "local" "global")))))
+  (gnus-message 6 "Editing a %s kill file (Type %s to exit)"
+		(if group "local" "global")
+		(substitute-command-keys "\\[gnus-kill-file-exit]")))
 
 (defun gnus-group-edit-local-kill (article group)
   "Edit a local kill file."
@@ -4392,7 +4390,7 @@
 (defun gnus-group-describe-briefly ()
   "Give a one line description of the group mode commands."
   (interactive)
-  (gnus-message 7 (substitute-command-keys "\\<gnus-group-mode-map>\\[gnus-group-read-group]:Select  \\[gnus-group-next-unread-group]:Forward  \\[gnus-group-prev-unread-group]:Backward  \\[gnus-group-exit]:Exit  \\[gnus-info-find-node]:Run Info  \\[gnus-group-describe-briefly]:This help")))
+  (gnus-message 7 "%s" (substitute-command-keys "\\<gnus-group-mode-map>\\[gnus-group-read-group]:Select  \\[gnus-group-next-unread-group]:Forward  \\[gnus-group-prev-unread-group]:Backward  \\[gnus-group-exit]:Exit  \\[gnus-info-find-node]:Run Info  \\[gnus-group-describe-briefly]:This help")))
 
 (defun gnus-group-browse-foreign-server (method)
   "Browse a foreign news server.

=== modified file 'lisp/gnus/gnus-html.el'
--- lisp/gnus/gnus-html.el	2010-09-19 10:45:51 +0000
+++ lisp/gnus/gnus-html.el	2010-09-20 00:36:54 +0000
@@ -114,6 +114,7 @@
 				 "-I" "UTF-8"
 				 "-O" "UTF-8"
 				 "-o" "ext_halfdump=1"
+                                 "-o" "display_ins_del=2"
 				 "-o" "pre_conv=1"
 				 "-t" (format "%s" tab-width)
 				 "-cols" (format "%s" gnus-html-frame-width)
@@ -253,13 +254,39 @@
        ;; should be deleted.
        ((equal tag "IMG_ALT")
 	(delete-region start end))
+       ;; w3m does not normalize the case
+       ((or (equal tag "b")
+            (equal tag "B"))
+        (gnus-overlay-put (gnus-make-overlay start end) 'face 'gnus-emphasis-bold))
+       ((or (equal tag "u")
+            (equal tag "U"))
+        (gnus-overlay-put (gnus-make-overlay start end) 'face 'gnus-emphasis-underline))
+       ((or (equal tag "i")
+            (equal tag "I"))
+        (gnus-overlay-put (gnus-make-overlay start end) 'face 'gnus-emphasis-italic))
+       ((or (equal tag "s")
+            (equal tag "S"))
+        (gnus-overlay-put (gnus-make-overlay start end) 'face 'gnus-emphasis-strikethru))
+       ((or (equal tag "ins")
+            (equal tag "INS"))
+        (gnus-overlay-put (gnus-make-overlay start end) 'face 'gnus-emphasis-underline))
+       ;; Handle different UL types
+       ((equal tag "_SYMBOL")
+        (when (string-match "TYPE=\\(.+\\)" parameters)
+          (let ((type (string-to-number (match-string 1 parameters))))
+            (delete-region start end)
+            (cond ((= type 33) (insert " "))
+                  ((= type 34) (insert " "))
+                  ((= type 35) (insert " "))
+                  ((= type 36) (insert " "))
+                  ((= type 37) (insert " "))
+                  ((= type 38) (insert " "))
+                  ((= type 39) (insert " "))
+                  ((= type 40) (insert " "))
+                  ((= type 42) (insert " "))
+                  ((= type 43) (insert " "))
+                  (t (insert " "))))))
        ;; Whatever.  Just ignore the tag.
-       ((equal tag "b")
-        (gnus-overlay-put (gnus-make-overlay start end) 'face 'bold))
-       ((equal tag "U")
-        (gnus-overlay-put (gnus-make-overlay start end) 'face 'underline))
-       ((equal tag "i")
-        (gnus-overlay-put (gnus-make-overlay start end) 'face 'italic))
        (t
 	))
       (goto-char start))
@@ -307,23 +334,25 @@
   (expand-file-name (sha1 url) gnus-html-cache-directory))
 
 (defun gnus-html-image-fetched (status buffer image)
-  (when (and (buffer-live-p buffer)
-             ;; If the position of the marker is 1, then that
-             ;; means that the text it was in has been deleted;
-             ;; i.e., that the user has selected a different
-             ;; article before the image arrived.
-             (not (= (marker-position (cadr image)) (point-min))))
-    (let ((file (gnus-html-image-id (car image))))
-      ;; Search the start of the image data
-      (search-forward "\n\n")
-      ;; Write region (image) silently
+  (let ((file (gnus-html-image-id (car image))))
+    ;; Search the start of the image data
+    (when (search-forward "\n\n" nil t)
+      ;; Write region (image data) silently
       (write-region (point) (point-max) file nil 1)
       (kill-buffer)
-      (with-current-buffer buffer
-        (let ((inhibit-read-only t)
-              (string (buffer-substring (cadr image) (caddr image))))
-          (delete-region (cadr image) (caddr image))
-          (gnus-html-put-image file (cadr image) string))))))
+      (when (and (buffer-live-p buffer)
+		 ;; If the `image' has no marker, do not replace anything
+		 (cadr image)
+		 ;; If the position of the marker is 1, then that
+		 ;; means that the text it was in has been deleted;
+		 ;; i.e., that the user has selected a different
+		 ;; article before the image arrived.
+		 (not (= (marker-position (cadr image)) (point-min))))
+	(with-current-buffer buffer
+	  (let ((inhibit-read-only t)
+		(string (buffer-substring (cadr image) (caddr image))))
+	    (delete-region (cadr image) (caddr image))
+	    (gnus-html-put-image file (cadr image) (car image) string)))))))
 
 (defun gnus-html-put-image (file point string &optional url alt-text)
   (when (gnus-graphic-display-p)
@@ -441,27 +470,18 @@
 
 ;;;###autoload
 (defun gnus-html-prefetch-images (summary)
-  (let (blocked-images urls)
-    (when (and (buffer-live-p summary)
-	       (executable-find "curl"))
-      (with-current-buffer summary
-	(setq blocked-images gnus-blocked-images))
+  (when (buffer-live-p summary)
+    (let ((blocked-images (with-current-buffer summary
+                            gnus-blocked-images)))
       (save-match-data
 	(while (re-search-forward "<img.*src=[\"']\\([^\"']+\\)" nil t)
 	  (let ((url (match-string 1)))
 	    (unless (gnus-html-image-url-blocked-p url blocked-images)
               (unless (file-exists-p (gnus-html-image-id url))
-                (push (mm-url-decode-entities-string url) urls)
-                (push (gnus-html-image-id url) urls)
-                (push "-o" urls)))))
-	(let ((process
-	       (apply 'start-process
-		      "images" nil "curl"
-		      "-s" "--create-dirs"
-		      "--location"
-		      "--max-time" "60"
-		      urls)))
-	  (gnus-set-process-query-on-exit-flag process nil))))))
+                (ignore-errors
+                  (url-retrieve (mm-url-decode-entities-string url)
+                                'gnus-html-image-fetched
+				(list nil (list url))))))))))))
 
 (provide 'gnus-html)
 

=== modified file 'lisp/gnus/gnus-int.el'
--- lisp/gnus/gnus-int.el	2010-09-18 23:36:29 +0000
+++ lisp/gnus/gnus-int.el	2010-09-20 00:36:54 +0000
@@ -245,9 +245,8 @@
                           (nth 1 gnus-command-method)
                           (nthcdr 2 gnus-command-method))
                (error
-                (gnus-message 1 (format
-                                 "Unable to open server %s due to: %s"
-                                 server (error-message-string err)))
+                (gnus-message 1 "Unable to open server %s due to: %s"
+			      server (error-message-string err))
                 nil)
                (quit
                 (gnus-message 1 "Quit trying to open server %s" server)

=== modified file 'lisp/gnus/gnus-score.el'
--- lisp/gnus/gnus-score.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/gnus-score.el	2010-09-20 00:36:54 +0000
@@ -1114,8 +1114,8 @@
       (make-local-variable 'gnus-prev-winconf)
       (setq gnus-prev-winconf winconf))
     (gnus-message
-     4 (substitute-command-keys
-	"\\<gnus-score-mode-map>\\[gnus-score-edit-exit] to save edits"))))
+     4 "%s" (substitute-command-keys
+	     "\\<gnus-score-mode-map>\\[gnus-score-edit-exit] to save edits"))))
 
 (defun gnus-score-edit-all-score ()
   "Edit the all.SCORE file."
@@ -1142,8 +1142,8 @@
     (make-local-variable 'gnus-prev-winconf)
     (setq gnus-prev-winconf winconf))
   (gnus-message
-   4 (substitute-command-keys
-      "\\<gnus-score-mode-map>\\[gnus-score-edit-exit] to save edits")))
+   4 "%s" (substitute-command-keys
+	   "\\<gnus-score-mode-map>\\[gnus-score-edit-exit] to save edits")))
 
 (defun gnus-score-edit-file-at-point (&optional format)
   "Edit score file at point in Score Trace buffers.
@@ -1391,7 +1391,7 @@
       (if err
 	  (progn
 	    (ding)
-	    (gnus-message 3 err)
+	    (gnus-message 3 "%s" err)
 	    (sit-for 2)
 	    nil)
 	alist)))))

=== modified file 'lisp/gnus/gnus-srvr.el'
--- lisp/gnus/gnus-srvr.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/gnus-srvr.el	2010-09-20 00:36:54 +0000
@@ -976,7 +976,7 @@
 (defun gnus-browse-describe-briefly ()
   "Give a one line description of the group mode commands."
   (interactive)
-  (gnus-message 6
+  (gnus-message 6 "%s"
 		(substitute-command-keys "\\<gnus-browse-mode-map>\\[gnus-group-next-group]:Forward  \\[gnus-group-prev-group]:Backward  \\[gnus-browse-exit]:Exit  \\[gnus-info-find-node]:Run Info  \\[gnus-browse-describe-briefly]:This help")))
 
 (defun gnus-server-regenerate-server ()

=== modified file 'lisp/gnus/gnus-start.el'
--- lisp/gnus/gnus-start.el	2010-09-19 10:45:51 +0000
+++ lisp/gnus/gnus-start.el	2010-09-20 00:36:54 +0000
@@ -268,7 +268,7 @@
   (mapconcat 'identity
 	     '("^to\\."			; not "real" groups
 	       "^[0-9. \t]+\\( \\|$\\)"	; all digits in name
-	       "^[\"][]\"[#'()]"	; bogus characters
+	       "^[\"][\"#'()]"	; bogus characters
 	       )
 	     "\\|")
   "*A regexp to match uninteresting newsgroups in the active file.
@@ -1759,14 +1759,16 @@
     (dolist (elem type-cache)
       (destructuring-bind (method method-type infos dummy) elem
 	(when (and method infos
-		   (not (gnus-method-denied-p method))
-		   (gnus-check-backend-function
-		    'retrieve-group-data-early (car method)))
-	  (when (gnus-check-backend-function 'request-scan (car method))
-	    (dolist (info infos)
-	      (gnus-request-scan (gnus-info-group info) method)))
-	  (setcar (nthcdr 3 elem)
-		  (gnus-retrieve-group-data-early method infos)))))
+		   (not (gnus-method-denied-p method)))
+	  (unless (gnus-server-opened method)
+	    (gnus-open-server method))
+	  (when (gnus-check-backend-function
+		 'retrieve-group-data-early (car method))
+	    (when (gnus-check-backend-function 'request-scan (car method))
+	      (dolist (info infos)
+		(gnus-request-scan (gnus-info-group info) method)))
+	    (setcar (nthcdr 3 elem)
+		    (gnus-retrieve-group-data-early method infos))))))
 
     ;; Do the rest of the retrieval.
     (dolist (elem type-cache)
@@ -2054,7 +2056,7 @@
 		       (if (and where (not (zerop (length where))))
 			   (concat " from " where) "")
 		       (car method)))
-    (gnus-message 5 mesg)
+    (gnus-message 5 "%s" mesg)
     (when (gnus-check-server method)
       ;; Request that the backend scan its incoming messages.
       (when (and (or (and gnus-agent
@@ -2089,7 +2091,7 @@
 	    (unless (equal method gnus-message-archive-method)
 	      (gnus-error 1 "Cannot read active file from %s server"
 			  (car method)))
-	  (gnus-message 5 mesg)
+	  (gnus-message 5 "%s" mesg)
 	  (gnus-active-to-gnus-format method gnus-active-hashtb nil t)
 	  ;; We mark this active file as read.
 	  (push method gnus-have-read-active-file)

=== modified file 'lisp/gnus/gnus-sum.el'
--- lisp/gnus/gnus-sum.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/gnus-sum.el	2010-09-20 00:36:54 +0000
@@ -7330,7 +7330,7 @@
 (defun gnus-summary-describe-briefly ()
   "Describe summary mode commands briefly."
   (interactive)
-  (gnus-message 6 (substitute-command-keys "\\<gnus-summary-mode-map>\\[gnus-summary-next-page]:Select  \\[gnus-summary-next-unread-article]:Forward  \\[gnus-summary-prev-unread-article]:Backward  \\[gnus-summary-exit]:Exit  \\[gnus-info-find-node]:Run Info	 \\[gnus-summary-describe-briefly]:This help")))
+  (gnus-message 6 "%s" (substitute-command-keys "\\<gnus-summary-mode-map>\\[gnus-summary-next-page]:Select  \\[gnus-summary-next-unread-article]:Forward  \\[gnus-summary-prev-unread-article]:Backward  \\[gnus-summary-exit]:Exit  \\[gnus-info-find-node]:Run Info	 \\[gnus-summary-describe-briefly]:This help")))
 
 ;; Walking around group mode buffer from summary mode.
 
@@ -10768,7 +10768,11 @@
 	;; Go to the right position on the line.
 	(goto-char (+ forward (point)))
 	;; Replace the old mark with the new mark.
-	(subst-char-in-region (point) (1+ (point)) (char-after) mark)
+        (let ((to-insert
+               (subst-char-in-string (char-after) mark
+                                     (buffer-substring (point) (1+ (point))))))
+          (delete-region (point) (1+ (point)))
+          (insert to-insert))
 	;; Optionally update the marks by some user rule.
 	(when (eq type 'unread)
 	  (gnus-data-set-mark

=== modified file 'lisp/gnus/gnus.el'
--- lisp/gnus/gnus.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/gnus.el	2010-09-20 00:36:54 +0000
@@ -3678,6 +3678,41 @@
 					    gnus-valid-select-methods)))
 		 (equal (nth 1 m1) (nth 1 m2)))))))
 
+(defun gnus-methods-sloppily-equal (m1 m2)
+  ;; Same method.
+  (or
+   (eq m1 m2)
+   ;; Type and name are equal.
+   (and
+    (eq (car m1) (car m2))
+    (equal (cadr m1) (cadr m2))
+    ;; Check parameters for sloppy equalness.
+    (let ((p1 (copy-list (cddr m1)))
+	  (p2 (copy-list (cddr m2)))
+	  e1 e2)
+      (block nil
+	(while (setq e1 (pop p1))
+	  (unless (setq e2 (assq (car e1) p2))
+	    ;; The parameter doesn't exist in p2.
+	    (return nil))
+	  (setq p2 (delq e2 p2))
+	  (unless (equalp e1 e2)
+	    (if (not (and (stringp (cadr e1))
+			  (stringp (cadr e2))))
+		(return nil)
+	      ;; Special-case string parameter comparison so that we
+	      ;; can uniquify them.
+	      (let ((s1 (cadr e1))
+		    (s2 (cadr e2)))
+		(when (string-match "/$" s1)
+		  (setq s1 (directory-file-name s1)))
+		(when (string-match "/$" s2)
+		  (setq s2 (directory-file-name s2)))
+		(unless (equal s1 s2)
+		  (return nil))))))
+	;; If p2 now is empty, they were equal.
+	(null p2))))))
+
 (defun gnus-server-equal (m1 m2)
   "Say whether two methods are equal."
   (let ((m1 (cond ((null m1) gnus-select-method)
@@ -4142,13 +4177,19 @@
 		      gnus-valid-select-methods)))
 
 (defun gnus-similar-server-opened (method)
-  (let ((opened gnus-opened-servers))
+  "Return non-nil if we have a similar server opened.
+This is defined as a server with the same name, but different
+parameters."
+  (let ((opened gnus-opened-servers)
+	open)
     (while (and method opened)
-      (when (and (equal (cadr method) (cadaar opened))
-		 (equal (car method) (caaar opened))
-		 (not (equal method (caar opened))))
-	(setq method nil))
-      (pop opened))
+      (setq open (car (pop opened)))
+      ;; Type and name are the same...
+      (when (and (equal (car method) (car open))
+		 (equal (cadr method) (cadr open))
+		 ;; ... but the rest of the parameters differ.
+		 (not (gnus-methods-sloppily-equal method open)))
+	(setq method nil)))
     (not method)))
 
 (defun gnus-server-extend-method (group method)
@@ -4397,6 +4438,10 @@
 startup level.  If ARG is non-nil and not a positive number, Gnus will
 prompt the user for the name of an NNTP server to use."
   (interactive "P")
+  ;; When using the development version of Gnus, load the gnus-load
+  ;; file.
+  (unless (string-match "^Gnus" gnus-version)
+    (load "gnus-load"))
   (unless (byte-code-function-p (symbol-function 'gnus))
     (message "You should byte-compile Gnus")
     (sit-for 2))

=== modified file 'lisp/gnus/mail-parse.el'
--- lisp/gnus/mail-parse.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/mail-parse.el	2010-09-20 00:36:54 +0000
@@ -45,8 +45,7 @@
 (defalias 'mail-header-parse-content-type 'rfc2231-parse-qp-string)
 (defalias 'mail-header-parse-content-disposition 'rfc2231-parse-qp-string)
 (defalias 'mail-content-type-get 'rfc2231-get-value)
-;(defalias 'mail-header-encode-parameter 'rfc2045-encode-string)
-(defalias 'mail-header-encode-parameter 'rfc2231-encode-string)
+(defalias 'mail-header-encode-parameter 'rfc2045-encode-string)
 
 (defalias 'mail-header-remove-comments 'ietf-drums-remove-comments)
 (defalias 'mail-header-remove-whitespace 'ietf-drums-remove-whitespace)

=== modified file 'lisp/gnus/nnheader.el'
--- lisp/gnus/nnheader.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/nnheader.el	2010-09-20 00:36:54 +0000
@@ -463,7 +463,7 @@
       (let ((extra (mail-header-extra header)))
 	(while extra
 	  (insert (symbol-name (caar extra))
-		  ": " (cdar extra) "\t")
+		  ": " (if (stringp (cdar extra)) (cdar extra) "") "\t")
 	  (pop extra))))
     (insert "\n")
     (backward-char 1)

=== modified file 'lisp/gnus/nnimap.el'
--- lisp/gnus/nnimap.el	2010-09-19 10:45:51 +0000
+++ lisp/gnus/nnimap.el	2010-09-20 00:36:54 +0000
@@ -66,6 +66,17 @@
 This is always done if the server supports UID EXPUNGE, but it's
 not done by default on servers that doesn't support that command.")
 
+(defvoo nnimap-authenticator nil
+  "How nnimap authenticate itself to the server.
+Possible choices are nil (use default methods) or `anonymous'.")
+
+(defvoo nnimap-fetch-partial-articles nil
+  "If non-nil, nnimap will fetch partial articles.
+If t, nnimap will fetch only the first part.  If a string, it
+will fetch all parts that have types that match that string.  A
+likely value would be \"text/\" to automatically fetch all
+textual parts.")
+
 (defvoo nnimap-connection-alist nil)
 
 (defvoo nnimap-current-infos nil)
@@ -146,7 +157,7 @@
 	(delete-region (line-beginning-position) (line-end-position))
 	(insert (format "211 %s Article retrieved." article))
 	(forward-line 1)
-	(insert (format "Bytes: %d\n" bytes))
+	(insert (format "Chars: %d\n" bytes))
 	(when lines
 	  (insert (format "Lines: %s\n" lines)))
 	(re-search-forward "^\r$")
@@ -254,7 +265,14 @@
 	(when (setq connection-result (nnimap-wait-for-connection))
 	  (unless (equal connection-result "PREAUTH")
 	    (if (not (setq credentials
-			   (nnimap-credentials nnimap-address ports)))
+			   (if (eq nnimap-authenticator 'anonymous)
+			       (list "anonymous"
+				     (message-make-address))
+			     (nnimap-credentials
+			      nnimap-address
+			      (if nnimap-server-port
+				  (cons (format "%s" nnimap-server-port) ports)
+				ports)))))
 		(setq nnimap-object nil)
 	      (setq login-result (nnimap-command "LOGIN %S %S"
 						 (car credentials)
@@ -302,7 +320,8 @@
 
 (deffoo nnimap-request-article (article &optional group server to-buffer)
   (with-current-buffer nntp-server-buffer
-    (let ((result (nnimap-possibly-change-group group server)))
+    (let ((result (nnimap-possibly-change-group group server))
+	  parts)
       (when (stringp article)
 	(setq article (nnimap-find-article-by-message-id group article)))
       (when (and result
@@ -310,6 +329,14 @@
 	(erase-buffer)
 	(with-current-buffer (nnimap-buffer)
 	  (erase-buffer)
+	  (when nnimap-fetch-partial-articles
+	    (if (eq nnimap-fetch-partial-articles t)
+		(setq parts '(1))
+	      (nnimap-command "UID FETCH %d (BODYSTRUCTURE)" article)
+	      (goto-char (point-min))
+	      (when (re-search-forward "FETCH.*BODYSTRUCTURE" nil t)
+		(let ((structure (ignore-errors (read (current-buffer)))))
+		  (setq parts (nnimap-find-wanted-parts structure))))))
 	  (setq result
 		(nnimap-command
 		 (if (member "IMAP4REV1" (nnimap-capabilities nnimap-object))
@@ -331,7 +358,30 @@
 		(goto-char (+ (point) bytes))
 		(delete-region (point) (point-max))
 		(nnheader-ms-strip-cr))
-	      t)))))))
+	      (cons group article))))))))
+
+(defun nnimap-find-wanted-parts (structure)
+  (message-flatten-list (nnimap-find-wanted-parts-1 structure "")))
+
+(defun nnimap-find-wanted-parts-1 (structure prefix)
+  (let ((num 1)
+	parts)
+    (while (consp (car structure))
+      (let ((sub (pop structure)))
+	(if (consp (car sub))
+	    (push (nnimap-find-wanted-parts-1
+		   sub (if (string= prefix "")
+			   (number-to-string num)
+			 (format "%s.%s" prefix num)))
+		  parts)
+	  (let ((type (format "%s/%s" (nth 0 sub) (nth 1 sub))))
+	    (when (string-match nnimap-fetch-partial-articles type)
+	      (push (if (string= prefix "")
+			(number-to-string num)
+		      (format "%s.%s" prefix num))
+		    parts)))
+	  (incf num))))
+    (nreverse parts)))
 
 (deffoo nnimap-request-group (group &optional server dont-check info)
   (with-current-buffer nntp-server-buffer
@@ -825,21 +875,25 @@
     (goto-char (point-min))
     (while (and (memq (process-status process)
 		      '(open run))
-		(not (re-search-forward "^\\* " nil t)))
+		(not (re-search-forward "^\\* .*\n" nil t)))
       (nnheader-accept-process-output process)
       (goto-char (point-min)))
-    (and (looking-at "[A-Z0-9]+")
-	 (match-string 0))))
+    (forward-line -1)
+    (and (looking-at "\\* \\([A-Z0-9]+\\)")
+	 (match-string 1))))
 
 (defun nnimap-wait-for-response (sequence &optional messagep)
-  (goto-char (point-max))
-  (while (not (re-search-backward (format "^%d .*\n" sequence)
-				  (max (point-min) (- (point) 500))
-				  t))
-    (when messagep
-      (message "Read %dKB" (/ (buffer-size) 1000)))
-    (nnheader-accept-process-output (get-buffer-process (current-buffer)))
-    (goto-char (point-max))))
+  (let ((process (get-buffer-process (current-buffer))))
+    (goto-char (point-max))
+    (while (and (memq (process-status process)
+		      '(open run))
+		(not (re-search-backward (format "^%d .*\n" sequence)
+					 (max (point-min) (- (point) 500))
+					 t)))
+      (when messagep
+	(message "Read %dKB" (/ (buffer-size) 1000)))
+      (nnheader-accept-process-output process)
+      (goto-char (point-max)))))
 
 (defun nnimap-parse-response ()
   (let ((lines (split-string (nnimap-last-response-string) "\r\n" t))
------------------------------------------------------------
revno: 101494
committer: Juanma Barranquero <lekktu@gmail.com>
branch nick: trunk
timestamp: Mon 2010-09-20 02:26:22 +0200
message:
  * emacs-lisp/smie.el (smie-indent--hanging-p): Use `smie-indent--bolp'.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-19 14:52:37 +0000
+++ lisp/ChangeLog	2010-09-20 00:26:22 +0000
@@ -1,3 +1,7 @@
+2010-09-20  Juanma Barranquero  <lekktu@gmail.com>
+
+	* emacs-lisp/smie.el (smie-indent--hanging-p): Use `smie-indent--bolp'.
+
 2010-09-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/smie.el (smie-bnf-precedence-table): Improve error message.

=== modified file 'lisp/emacs-lisp/smie.el'
--- lisp/emacs-lisp/smie.el	2010-09-19 14:52:37 +0000
+++ lisp/emacs-lisp/smie.el	2010-09-20 00:26:22 +0000
@@ -865,7 +865,7 @@
            (forward-char 1))
          (skip-chars-forward " \t")
          (eolp))
-       (not (smie-bolp))))
+       (not (smie-indent--bolp))))
 
 (defun smie-indent--bolp ()
   (save-excursion (skip-chars-backward " \t") (bolp)))
------------------------------------------------------------
revno: 101493
committer: Juanma Barranquero <lekktu@gmail.com>
branch nick: trunk
timestamp: Mon 2010-09-20 02:18:18 +0200
message:
  Don't make W32 code conditional on HAVE_SOCKETS, it's always defined.
  * w32.c: Remove top-level uses of #ifdef HAVE_SOCKETS.
    (gethostname) [!HAVE_SOCKETS]: Remove.
    (SOCK_REPLACE_HANDLE): Remove macro.
    (socket_to_fd, sys_close, _sys_read_ahead, sys_read, sys_write)
    (term_ntproc, init_ntproc): Don't conditionalize on HAVE_SOCKETS.
  * w32proc.c: Remove top-level uses of #ifdef HAVE_SOCKETS.
    (syms_of_ntproc): Don't conditionalize on HAVE_SOCKETS.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-09-18 14:23:29 +0000
+++ src/ChangeLog	2010-09-20 00:18:18 +0000
@@ -1,3 +1,14 @@
+2010-09-20  Juanma Barranquero  <lekktu@gmail.com>
+
+	Don't make W32 code conditional on HAVE_SOCKETS, it's always defined.
+	* w32.c: Remove top-level uses of #ifdef HAVE_SOCKETS.
+	(gethostname) [!HAVE_SOCKETS]: Remove.
+	(SOCK_REPLACE_HANDLE): Remove macro.
+	(socket_to_fd, sys_close, _sys_read_ahead, sys_read, sys_write)
+	(term_ntproc, init_ntproc): Don't conditionalize on HAVE_SOCKETS.
+	* w32proc.c: Remove top-level uses of #ifdef HAVE_SOCKETS.
+	(syms_of_ntproc): Don't conditionalize on HAVE_SOCKETS.
+
 2010-09-18  Eli Zaretskii  <eliz@gnu.org>
 
 	* deps.mk (xml.o): Add dependencies.

=== modified file 'src/w32.c'
--- src/w32.c	2010-09-17 21:34:45 +0000
+++ src/w32.c	2010-09-20 00:18:18 +0000
@@ -114,7 +114,7 @@
 } PROCESS_MEMORY_COUNTERS_EX,*PPROCESS_MEMORY_COUNTERS_EX;
 #endif
 
-#ifdef HAVE_SOCKETS	/* TCP connection support, if kernel can do it */
+/* TCP connection support.  */
 #include <sys/socket.h>
 #undef socket
 #undef bind
@@ -133,7 +133,6 @@
 #undef accept
 #undef recvfrom
 #undef sendto
-#endif
 
 #include "w32.h"
 #include "ndir.h"
@@ -834,17 +833,6 @@
 #endif
 }
 
-#ifndef HAVE_SOCKETS
-/* Emulate gethostname.  */
-int
-gethostname (char *buffer, int size)
-{
-  /* NT only allows small host names, so the buffer is
-     certainly large enough.  */
-  return !GetComputerName (buffer, &size);
-}
-#endif /* HAVE_SOCKETS */
-
 /* Emulate getloadavg.  */
 
 struct load_sample {
@@ -4352,8 +4340,6 @@
 }
 
 
-#ifdef HAVE_SOCKETS
-
 /* Wrappers for  winsock functions to map between our file descriptors
    and winsock's handles; also set h_errno for convenience.
 
@@ -4640,13 +4626,7 @@
    but I believe the method of keeping the socket handle separate (and
    insuring it is not inheritable) is the correct one. */
 
-//#define SOCK_REPLACE_HANDLE
-
-#ifdef SOCK_REPLACE_HANDLE
-#define SOCK_HANDLE(fd) ((SOCKET) _get_osfhandle (fd))
-#else
 #define SOCK_HANDLE(fd) ((SOCKET) fd_info[fd].hnd)
-#endif
 
 int socket_to_fd (SOCKET s);
 
@@ -4690,13 +4670,6 @@
   fd = _open ("NUL:", _O_RDWR);
   if (fd >= 0)
     {
-#ifdef SOCK_REPLACE_HANDLE
-      /* now replace handle to NUL with our socket handle */
-      CloseHandle ((HANDLE) _get_osfhandle (fd));
-      _free_osfhnd (fd);
-      _set_osfhnd (fd, s);
-      /* setmode (fd, _O_BINARY); */
-#else
       /* Make a non-inheritable copy of the socket handle.  Note
 	 that it is possible that sockets aren't actually kernel
 	 handles, which appears to be the case on Windows 9x when
@@ -4742,7 +4715,6 @@
 	  }
       }
       fd_info[fd].hnd = (HANDLE) s;
-#endif
 
       /* set our own internal flags */
       fd_info[fd].flags = FILE_SOCKET | FILE_BINARY | FILE_READ | FILE_WRITE;
@@ -5103,8 +5075,6 @@
   return SOCKET_ERROR;
 }
 
-#endif /* HAVE_SOCKETS */
-
 
 /* Shadow main io functions: we need to handle pipes and sockets more
    intelligently, and implement non-blocking mode as well. */
@@ -5139,18 +5109,15 @@
 	    }
 	  if (i == MAXDESC)
 	    {
-#ifdef HAVE_SOCKETS
 	      if (fd_info[fd].flags & FILE_SOCKET)
 		{
-#ifndef SOCK_REPLACE_HANDLE
 		  if (winsock_lib == NULL) abort ();
 
 		  pfn_shutdown (SOCK_HANDLE (fd), 2);
 		  rc = pfn_closesocket (SOCK_HANDLE (fd));
-#endif
+
 		  winsock_inuse--; /* count open sockets */
 		}
-#endif
 	      delete_child (cp);
 	    }
 	}
@@ -5318,7 +5285,6 @@
 	    return STATUS_READ_ERROR;
 	}
     }
-#ifdef HAVE_SOCKETS
   else if (fd_info[fd].flags & FILE_SOCKET)
     {
       unsigned long nblock = 0;
@@ -5334,7 +5300,6 @@
 	  pfn_ioctlsocket (SOCK_HANDLE (fd), FIONBIO, &nblock);
 	}
     }
-#endif
 
   if (rc == sizeof (char))
     cp->status = STATUS_READ_SUCCEEDED;
@@ -5506,7 +5471,6 @@
 		  nchars += rc;
 		}
 	    }
-#ifdef HAVE_SOCKETS
 	  else /* FILE_SOCKET */
 	    {
 	      if (winsock_lib == NULL) abort ();
@@ -5533,7 +5497,6 @@
 		  nchars += res;
 		}
 	    }
-#endif
 	}
       else
 	{
@@ -5658,9 +5621,7 @@
 	    }
 	}
     }
-  else
-#ifdef HAVE_SOCKETS
-  if (fd < MAXDESC && fd_info[fd].flags & FILE_SOCKET)
+  else if (fd < MAXDESC && fd_info[fd].flags & FILE_SOCKET)
     {
       unsigned long nblock = 0;
       if (winsock_lib == NULL) abort ();
@@ -5688,7 +5649,6 @@
 	}
     }
   else
-#endif
     {
       /* Some networked filesystems don't like too large writes, so
 	 break them into smaller chunks.  See the Comments section of
@@ -5780,10 +5740,8 @@
 void
 term_ntproc (void)
 {
-#ifdef HAVE_SOCKETS
   /* shutdown the socket interface if necessary */
   term_winsock ();
-#endif
 
   term_w32select ();
 }
@@ -5791,7 +5749,6 @@
 void
 init_ntproc (void)
 {
-#ifdef HAVE_SOCKETS
   /* Initialise the socket interface now if available and requested by
      the user by defining PRELOAD_WINSOCK; otherwise loading will be
      delayed until open-network-stream is called (w32-has-winsock can
@@ -5805,7 +5762,6 @@
 
   if (getenv ("PRELOAD_WINSOCK") != NULL)
     init_winsock (TRUE);
-#endif
 
   /* Initial preparation for subprocess support: replace our standard
      handles with non-inheritable versions. */

=== modified file 'src/w32proc.c'
--- src/w32proc.c	2010-07-08 21:25:08 +0000
+++ src/w32proc.c	2010-09-20 00:18:18 +0000
@@ -1694,8 +1694,6 @@
   process_dir = dir;
 }
 
-#ifdef HAVE_SOCKETS
-
 /* To avoid problems with winsock implementations that work over dial-up
    connections causing or requiring a connection to exist while Emacs is
    running, Emacs no longer automatically loads winsock on startup if it
@@ -1759,8 +1757,6 @@
   return term_winsock () ? Qt : Qnil;
 }
 
-#endif /* HAVE_SOCKETS */
-
 
 /* Some miscellaneous functions that are Windows specific, but not GUI
    specific (ie. are applicable in terminal or batch mode as well).  */
@@ -2268,10 +2264,9 @@
   DEFSYM (Qhigh, "high");
   DEFSYM (Qlow, "low");
 
-#ifdef HAVE_SOCKETS
   defsubr (&Sw32_has_winsock);
   defsubr (&Sw32_unload_winsock);
-#endif
+
   defsubr (&Sw32_short_file_name);
   defsubr (&Sw32_long_file_name);
   defsubr (&Sw32_set_process_priority);
------------------------------------------------------------
revno: 101492
author: Julien Danjou <julien@danjou.info>
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Sun 2010-09-19 11:48:11 -0700
message:
  * lisp/url/url-cache.el (url-fetch-from-cache): New function.
diff:
=== modified file 'lisp/url/ChangeLog'
--- lisp/url/ChangeLog	2010-09-18 20:54:55 +0000
+++ lisp/url/ChangeLog	2010-09-19 18:48:11 +0000
@@ -1,3 +1,7 @@
+2010-09-19  Julien Danjou  <julien@danjou.info>
+
+	* url-cache.el (url-fetch-from-cache): New function.
+
 2010-09-18  Julien Danjou  <julien@danjou.info>
 
 	* url-vars.el (url-cache-expired): Remove unused variable.

=== modified file 'lisp/url/url-cache.el'
--- lisp/url/url-cache.el	2010-09-14 14:41:53 +0000
+++ lisp/url/url-cache.el	2010-09-19 18:48:11 +0000
@@ -68,6 +68,12 @@
             (let ((coding-system-for-write 'binary))
               (write-region (point-min) (point-max) fname nil 5))))))
 
+(defun url-fetch-from-cache (url)
+  "Fetch URL from cache and return a buffer with the content."
+  (with-current-buffer (generate-new-buffer " *temp*")
+    (url-cache-extract (url-cache-create-filename url))
+    (current-buffer)))
+
 ;;;###autoload
 (defun url-is-cached (url)
   "Return non-nil if the URL is cached."
------------------------------------------------------------
revno: 101491
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Sun 2010-09-19 16:52:37 +0200
message:
  * lisp/emacs-lisp/smie.el (smie-bnf-precedence-table): Improve error message.
  (smie-debug--prec2-cycle, smie-debug--describe-cycle): New functions.
  (smie-prec2-levels): Use them to better diagnose precedence cycles.
  (smie-blink-matching-check): Don't signal a mismatch if car is t.
  (smie-blink-matching-open): Rewrite to remove assumptions, so that
  something like "." can also be a closer.
  (smie--associative-p, smie-indent--hanging-p, smie-indent--bolp)
  (smie-indent--offset, smie-indent--offset-rule, smie-indent--column):
  Rename internal functions to use "--".  Update callers.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-19 09:53:28 +0000
+++ lisp/ChangeLog	2010-09-19 14:52:37 +0000
@@ -1,5 +1,15 @@
 2010-09-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* emacs-lisp/smie.el (smie-bnf-precedence-table): Improve error message.
+	(smie-debug--prec2-cycle, smie-debug--describe-cycle): New functions.
+	(smie-prec2-levels): Use them to better diagnose precedence cycles.
+	(smie-blink-matching-check): Don't signal a mismatch if car is t.
+	(smie-blink-matching-open): Rewrite to remove assumptions, so that
+	something like "." can also be a closer.
+	(smie--associative-p, smie-indent--hanging-p, smie-indent--bolp)
+	(smie-indent--offset, smie-indent--offset-rule, smie-indent--column):
+	Rename internal functions to use "--".  Update callers.
+
 	* frame.el (make-frame-names-alist): Don't list frames on other displays.
 
 	* fringe.el (fringe-styles): New var.

=== modified file 'lisp/emacs-lisp/smie.el'
--- lisp/emacs-lisp/smie.el	2010-09-03 11:18:45 +0000
+++ lisp/emacs-lisp/smie.el	2010-09-19 14:52:37 +0000
@@ -159,7 +159,8 @@
             (last-nts ())
             (first-nts ()))
         (dolist (rhs (cdr rules))
-          (assert (consp rhs))
+          (unless (consp rhs)
+            (signal 'wrong-type-argument `(consp ,rhs)))
           (if (not (member (car rhs) nts))
               (pushnew (car rhs) first-ops)
             (pushnew (car rhs) first-nts)
@@ -307,6 +308,40 @@
     (nreverse alist)))
     
 
+(defun smie-debug--prec2-cycle (csts)
+  "Return a cycle in CSTS, assuming there's one.
+CSTS is a list of pairs representing arcs in a graph."
+  ;; A PATH is of the form (START . REST) where REST is a reverse
+  ;; list of nodes through which the path goes.
+  (let ((paths (mapcar (lambda (pair) (list (car pair) (cdr pair))) csts))
+        (cycle nil))
+    (while (null cycle)
+      (dolist (path (prog1 paths (setq paths nil)))
+        (dolist (cst csts)
+          (when (eq (car cst) (nth 1 path))
+            (if (eq (cdr cst) (car path))
+                (setq cycle path)
+              (push (cons (car path) (cons (cdr cst) (cdr path)))
+                    paths))))))
+    (cons (car cycle) (nreverse (cdr cycle)))))
+            
+(defun smie-debug--describe-cycle (table cycle)
+  (let ((names
+         (mapcar (lambda (val)
+                   (let ((res nil))
+                     (dolist (elem table)
+                       (if (eq (cdr elem) val)
+                           (push (concat "." (car elem)) res))
+                       (if (eq (cddr elem) val)
+                           (push (concat (car elem) ".") res)))
+                     (assert res)
+                     res))
+                 cycle)))
+    (mapconcat
+     (lambda (elems) (mapconcat 'indentity elems "="))
+     (append names (list (car names)))
+     " < ")))
+
 (defun smie-prec2-levels (prec2)
   ;; FIXME: Rather than only return an alist of precedence levels, we should
   ;; also extract other useful data from it:
@@ -387,7 +422,9 @@
                 (incf i))
               (setq csts (delq cst csts))))
           (unless progress
-            (error "Can't resolve the precedence table to precedence levels")))
+            (error "Can't resolve the precedence cycle: %s"
+                   (smie-debug--describe-cycle
+                    table (smie-debug--prec2-cycle csts)))))
         (incf i 10))
       ;; Propagate equalities back to their source.
       (dolist (eq (nreverse eqs))
@@ -450,7 +487,7 @@
               (skip-syntax-forward "w_'"))
           (point))))
 
-(defun smie-associative-p (toklevels)
+(defun smie--associative-p (toklevels)
   ;; in "a + b + c" we want to stop at each +, but in
   ;; "if a then b elsif c then d else c" we don't want to stop at each keyword.
   ;; To distinguish the two cases, we made smie-prec2-levels choose
@@ -535,13 +572,13 @@
                    ;; If the new operator is not the last in the BNF rule,
                    ;; ans is not associative, it's one of the inner operators
                    ;; (like the "in" in "let .. in .. end"), so keep looking.
-                   ((not (smie-associative-p toklevels))
+                   ((not (smie--associative-p toklevels))
                     (push toklevels levels))
                    ;; The new operator is associative.  Two cases:
                    ;; - it's really just an associative operator (like + or ;)
                    ;;   in which case we should have stopped right before.
                    ((and lastlevels
-                         (smie-associative-p (car lastlevels)))
+                         (smie--associative-p (car lastlevels)))
                     (throw 'return
                            (prog1 (list (or (car toklevels) t) (point) token)
                              (goto-char pos))))
@@ -720,6 +757,7 @@
         ;; This not is one of the begin..end we know how to check.
         (blink-matching-check-mismatch start end))
        ((not start) t)
+       ((eq t (car (rassoc ender smie-closer-alist))) nil)
        (t
         (goto-char start)
         (let ((starter (funcall smie-forward-token-function)))
@@ -732,45 +770,42 @@
              smie-closer-alist                     ; Optimization.
              (eq (char-before) last-command-event) ; Sanity check.
              (memq last-command-event smie-blink-matching-triggers)
-             (save-excursion
-               ;; FIXME: Here we assume that closers all end
-               ;; with a word-syntax char.
-               (unless (eq ?\w (char-syntax last-command-event))
-		 (forward-char -1))
-               (and (looking-at "\\>")
-                    (not (nth 8 (syntax-ppss))))))
+             (not (nth 8 (syntax-ppss))))
     (save-excursion
       (let ((pos (point))
             (token (funcall smie-backward-token-function)))
-        (if (= 1 (length token))
-            ;; The trigger char is itself a token but is not
-            ;; one of the closers (e.g. ?\; in Octave mode),
-            ;; so go back to the previous token
-	    (setq token (save-excursion
-			  (funcall smie-backward-token-function)))
-	  (goto-char pos))
-	;; Here we assume that smie-backward-token-function
-	;; returns a token that is a string and whose content
-	;; match the buffer's representation of this token.
-	(when (and (> (length token) 1) (stringp token)
-		   (memq (aref token (1- (length token)))
-			 smie-blink-matching-triggers)
-		   (not (eq (aref token (1- (length token)))
-			    last-command-event)))
-	  ;; Token ends with a trigger char, so don't blink for
-	  ;; anything else than this trigger char, lest we'd blink
-	  ;; both when inserting the trigger char and when inserting a
-	  ;; subsequent SPC.
-	  (setq token nil))
-        (when (and (rassoc token smie-closer-alist)
-                   (or smie-blink-matching-inners
-                       (null (nth 2 (assoc token smie-op-levels)))))
-          ;; The major mode might set blink-matching-check-function
-          ;; buffer-locally so that interactive calls to
-          ;; blink-matching-open work right, but let's not presume
-          ;; that's the case.
-          (let ((blink-matching-check-function #'smie-blink-matching-check))
-            (blink-matching-open)))))))
+        (when (and (eq (point) (1- pos))
+                   (= 1 (length token))
+                   (not (rassoc token smie-closer-alist)))
+          ;; The trigger char is itself a token but is not one of the
+          ;; closers (e.g. ?\; in Octave mode), so go back to the
+          ;; previous token.
+          (setq pos (point))
+          (setq token (save-excursion
+                        (funcall smie-backward-token-function))))
+        (when (rassoc token smie-closer-alist)
+          ;; We're after a close token.  Let's still make sure we
+          ;; didn't skip a comment to find that token.
+          (funcall smie-forward-token-function)
+          (when (and (save-excursion
+                       ;; Trigger can be SPC, or reindent.
+                       (skip-chars-forward " \n\t")
+                       (>= (point) pos))
+                     ;; If token ends with a trigger char, so don't blink for
+                     ;; anything else than this trigger char, lest we'd blink
+                     ;; both when inserting the trigger char and when
+                     ;; inserting a subsequent trigger char like SPC.
+                     (or (eq (point) pos)
+                         (not (memq (char-before)
+                                    smie-blink-matching-triggers)))
+                     (or smie-blink-matching-inners
+                         (null (nth 2 (assoc token smie-op-levels)))))
+            ;; The major mode might set blink-matching-check-function
+            ;; buffer-locally so that interactive calls to
+            ;; blink-matching-open work right, but let's not presume
+            ;; that's the case.
+            (let ((blink-matching-check-function #'smie-blink-matching-check))
+              (blink-matching-open))))))))
 
 ;;; The indentation engine.
 
@@ -821,7 +856,7 @@
 A nil offset for indentation after an opening token defaults
 to `smie-indent-basic'.")
 
-(defun smie-indent-hanging-p ()
+(defun smie-indent--hanging-p ()
   ;; A hanging keyword is one that's at the end of a line except it's not at
   ;; the beginning of a line.
   (and (save-excursion
@@ -832,17 +867,17 @@
          (eolp))
        (not (smie-bolp))))
 
-(defun smie-bolp ()
+(defun smie-indent--bolp ()
   (save-excursion (skip-chars-backward " \t") (bolp)))
 
-(defun smie-indent-offset (elem)
+(defun smie-indent--offset (elem)
   (or (cdr (assq elem smie-indent-rules))
       (cdr (assq t smie-indent-rules))
       smie-indent-basic))
 
 (defvar smie-indent-debug-log)
 
-(defun smie-indent-offset-rule (tokinfo &optional after parent)
+(defun smie-indent--offset-rule (tokinfo &optional after parent)
   "Apply the OFFSET-RULES in TOKINFO.
 Point is expected to be right in front of the token corresponding to TOKINFO.
 If computing the indentation after the token, then AFTER is the position
@@ -857,10 +892,10 @@
          ((not (consp rule)) (setq offset rule))
          ((eq (car rule) '+) (setq offset rule))
          ((eq (car rule) :hanging)
-          (when (smie-indent-hanging-p)
+          (when (smie-indent--hanging-p)
             (setq rules (cdr rule))))
          ((eq (car rule) :bolp)
-          (when (smie-bolp)
+          (when (smie-indent--bolp)
             (setq rules (cdr rule))))
          ((eq (car rule) :eolp)
           (unless after
@@ -900,13 +935,13 @@
       (push (list (point) offset tokinfo) smie-indent-debug-log))
     offset))
 
-(defun smie-indent-column (offset &optional base parent virtual-point)
+(defun smie-indent--column (offset &optional base parent virtual-point)
   "Compute the actual column to use for a given OFFSET.
 BASE is the base position to use, and PARENT is the parent info, if any.
 If VIRTUAL-POINT is non-nil, then `point' is virtual."
   (cond
    ((eq (car-safe offset) '+)
-    (apply '+ (mapcar (lambda (offset) (smie-indent-column offset nil parent))
+    (apply '+ (mapcar (lambda (offset) (smie-indent--column offset nil parent))
                       (cdr offset))))
    ((integerp offset)
     (+ offset
@@ -941,7 +976,7 @@
     (smie-indent-virtual))
    ((eq offset nil) nil)
    ((and (symbolp offset) (boundp 'offset))
-    (smie-indent-column (symbol-value offset) base parent virtual-point))
+    (smie-indent--column (symbol-value offset) base parent virtual-point))
    (t (error "Unknown indentation offset %s" offset))))
 
 (defun smie-indent-forward-token ()
@@ -974,11 +1009,11 @@
 need to compute the column at which point should be indented
 in order to figure out the indentation of some other (further down) point."
   ;; Trust pre-existing indentation on other lines.
-  (if (smie-bolp) (current-column) (smie-indent-calculate)))
+  (if (smie-indent--bolp) (current-column) (smie-indent-calculate)))
 
 (defun smie-indent-fixindent ()
   ;; Obey the `fixindent' special comment.
-  (and (smie-bolp)
+  (and (smie-indent--bolp)
        (save-excursion
          (comment-normalize-vars)
          (re-search-forward (concat comment-start-skip
@@ -1018,14 +1053,14 @@
           (save-excursion
             (goto-char pos)
             ;; Different cases:
-            ;; - smie-bolp: "indent according to others".
+            ;; - smie-indent--bolp: "indent according to others".
             ;; - common hanging: "indent according to others".
             ;; - SML-let hanging: "indent like parent".
             ;; - if-after-else: "indent-like parent".
             ;; - middle-of-line: "trust current position".
             (cond
              ((null (cdr toklevels)) nil) ;Not a keyword.
-             ((smie-bolp)
+             ((smie-indent--bolp)
               ;; For an open-paren-like thingy at BOL, always indent only
               ;; based on other rules (typically smie-indent-after-keyword).
               nil)
@@ -1037,8 +1072,8 @@
                                   ;; By default use point unless we're hanging.
                                   `((:before . ,token) (:hanging nil) point)))
                      ;; (after (prog1 (point) (goto-char pos)))
-                     (offset (smie-indent-offset-rule tokinfo)))
-                (smie-indent-column offset)))))
+                     (offset (smie-indent--offset-rule tokinfo)))
+                (smie-indent--column offset)))))
 
         ;; FIXME: This still looks too much like black magic!!
         ;; FIXME: Rather than a bunch of rules like (PARENT . TOKEN), we
@@ -1054,7 +1089,7 @@
                       point)))
                (offset (save-excursion
                          (goto-char pos)
-                         (smie-indent-offset-rule tokinfo nil parent))))
+                         (smie-indent--offset-rule tokinfo nil parent))))
           ;; Different behaviors:
           ;; - align with parent.
           ;; - parent + offset.
@@ -1079,10 +1114,10 @@
             nil)
            ((eq (car parent) (car toklevels))
             ;; We bumped into a same-level operator. align with it.
-            (if (and (smie-bolp) (/= (point) pos)
+            (if (and (smie-indent--bolp) (/= (point) pos)
                      (save-excursion
                        (goto-char (goto-char (cadr parent)))
-                       (not (smie-bolp)))
+                       (not (smie-indent--bolp)))
                      ;; Check the offset of `token' rather then its parent
                      ;; because its parent may have used a special rule.  E.g.
                      ;;    function foo;
@@ -1119,7 +1154,7 @@
               ;; So as to align with the earliest appropriate place.
               (smie-indent-virtual)))
            (tokinfo
-            (if (and (= (point) pos) (smie-bolp)
+            (if (and (= (point) pos) (smie-indent--bolp)
                      (or (eq offset 'point)
                          (and (consp offset) (memq 'point offset))))
                 ;; Since we started at BOL, we're not computing a virtual
@@ -1127,7 +1162,7 @@
                 ;; we can't use `current-column' which would cause
                 ;; indentation to depend on itself.
                 nil
-              (smie-indent-column offset 'parent parent
+              (smie-indent--column offset 'parent parent
                                   ;; If we're still at pos, indent-virtual
                                   ;; will inf-loop.
                                   (unless (= (point) pos) 'virtual))))))))))
@@ -1137,7 +1172,7 @@
   ;; Don't do it for virtual indentations.  We should normally never be "in
   ;; front of a comment" when doing virtual-indentation anyway.  And if we are
   ;; (as can happen in octave-mode), moving forward can lead to inf-loops.
-  (and (smie-bolp)
+  (and (smie-indent--bolp)
        (looking-at comment-start-skip)
        (save-excursion
          (forward-comment (point-max))
@@ -1178,13 +1213,13 @@
           ;; Using the BNF syntax, we could come up with better
           ;; defaults, but we only have the precedence levels here.
           (setq tokinfo (list tok 'default-rule
-                              (if (cadr toklevel) 0 (smie-indent-offset t)))))
+                              (if (cadr toklevel) 0 (smie-indent--offset t)))))
         (let ((offset
-               (or (smie-indent-offset-rule tokinfo pos)
-                   (smie-indent-offset t))))
+               (or (smie-indent--offset-rule tokinfo pos)
+                   (smie-indent--offset t))))
           (let ((before (point)))
             (goto-char pos)
-            (smie-indent-column offset before)))))))
+            (smie-indent--column offset before)))))))
 
 (defun smie-indent-exps ()
   ;; Indentation of sequences of simple expressions without
@@ -1207,7 +1242,7 @@
           arg)
       (while (and (null (car (smie-backward-sexp)))
                   (push (point) positions)
-                  (not (smie-bolp))))
+                  (not (smie-indent--bolp))))
       (save-excursion
         ;; Figure out if the atom we just skipped is an argument rather
         ;; than a function.
@@ -1232,8 +1267,8 @@
        (positions
         ;; We're the first arg.
         (goto-char (car positions))
-        ;; FIXME: Use smie-indent-column.
-        (+ (smie-indent-offset 'args)
+        ;; FIXME: Use smie-indent--column.
+        (+ (smie-indent--offset 'args)
            ;; We used to use (smie-indent-virtual), but that
            ;; doesn't seem right since it might then indent args less than
            ;; the function itself.
------------------------------------------------------------
revno: 101490
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Sun 2010-09-19 10:45:51 +0000
message:
  Merge changes made in Gnus trunk.
  
  nnimap.el (nnimap-finish-retrieve-group-infos): Return data in the nntp buffer so the agent can save it.
  nnimap.el (nnimap-open-shell-stream): Bind `process-connection-type' to nil, so that CRLF doesn't get translated to \n; (nnimap-open-connection): Don't make 'shell commands only send \n.
  nnimap.el (nnimap-request-group): Don't make `M-g' bug out on group with no marks.
  gnus-agent.el (gnus-agent-load-alist): Nix out the alist if the file doesn't exist.
  nnimap.el (nnimap-finish-retrieve-group-infos): Protect against groups that have no articles.
  nnimap.el (nnimap-request-article): Check that we really got an article when we requested one.
  gnus-html.el (gnus-html-schedule-image-fetching): Ignore all errors from url-retrieve, for instance about invalid URLs.
  gnus-agent.el: Change default of gnus-agent-auto-agentize-methods to nil.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-19 09:16:28 +0000
+++ lisp/gnus/ChangeLog	2010-09-19 10:45:51 +0000
@@ -1,3 +1,26 @@
+2010-09-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus-agent.el (gnus-agent-auto-agentize-methods): Switch the default
+	to nil, so that no methods are automatically agentized.  I think this
+	is probably what most users want.
+
+	* gnus-html.el (gnus-html-schedule-image-fetching): Ignore all errors
+	from url-retrieve, for instance about invalid URLs.
+
+	* nnimap.el (nnimap-finish-retrieve-group-infos): Protect against
+	groups that have no articles.
+	(nnimap-request-article): Check that we really got an article when we
+	requested one.
+
+	* gnus-agent.el (gnus-agent-load-alist): Nix out the alist if the file
+	doesn't exist.
+
+	* nnimap.el (nnimap-finish-retrieve-group-infos): Return data in the
+	nntp buffer so the agent can save it.
+	(nnimap-open-shell-stream): Bind `process-connection-type' to nil, so
+	that CRLF doesn't get translated to \n.
+	(nnimap-open-connection): Don't make 'shell commands only send \n.
+
 2010-09-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* nnml.el (nnml-files): Add prefix to dynamic var `files'.

=== modified file 'lisp/gnus/gnus-agent.el'
--- lisp/gnus/gnus-agent.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/gnus-agent.el	2010-09-19 10:45:51 +0000
@@ -184,7 +184,7 @@
   :type 'boolean
   :group 'gnus-agent)
 
-(defcustom gnus-agent-auto-agentize-methods '(nntp)
+(defcustom gnus-agent-auto-agentize-methods nil
   "Initially, all servers from these methods are agentized.
 The user may remove or add servers using the Server buffer.
 See Info node `(gnus)Server Buffer'."
@@ -2104,12 +2104,12 @@
   (let* ((gnus-agent-read-agentview group)
 	 (file-name-coding-system nnmail-pathname-coding-system)
 	 (agentview (gnus-agent-article-name ".agentview" group)))
-    (when (file-exists-p agentview)
-      (setq gnus-agent-article-alist
-	    (gnus-cache-file-contents
-	     agentview
-	     'gnus-agent-file-loading-cache
-	     'gnus-agent-read-agentview)))))
+    (setq gnus-agent-article-alist
+	  (and (file-exists-p agentview)
+	       (gnus-cache-file-contents
+		agentview
+		'gnus-agent-file-loading-cache
+		'gnus-agent-read-agentview)))))
 
 (defun gnus-agent-read-agentview (file)
   "Load FILE and do a `read' there."
@@ -2353,7 +2353,6 @@
          (local (or local (gnus-agent-load-local)))
          (symb (intern gmane local))
          (minmax (and (boundp symb) (symbol-value symb))))
-
     (if (cond ((and minmax
                     (or (not (eq min (car minmax)))
                         (not (eq max (cdr minmax))))

=== modified file 'lisp/gnus/gnus-html.el'
--- lisp/gnus/gnus-html.el	2010-09-18 23:36:29 +0000
+++ lisp/gnus/gnus-html.el	2010-09-19 10:45:51 +0000
@@ -298,9 +298,10 @@
   (gnus-message 8 "gnus-html-schedule-image-fetching: buffer %s, images %s"
                 buffer images)
   (dolist (image images)
-    (url-retrieve (car image)
-                  'gnus-html-image-fetched
-                  (list buffer image))))
+    (ignore-errors
+      (url-retrieve (car image)
+		    'gnus-html-image-fetched
+		    (list buffer image)))))
 
 (defun gnus-html-image-id (url)
   (expand-file-name (sha1 url) gnus-html-cache-directory))

=== modified file 'lisp/gnus/gnus-start.el'
--- lisp/gnus/gnus-start.el	2010-09-18 23:36:29 +0000
+++ lisp/gnus/gnus-start.el	2010-09-19 10:45:51 +0000
@@ -1808,7 +1808,8 @@
        (gnus-check-backend-function 'finish-retrieve-group-infos (car method))
        (or (not (gnus-agent-method-p method))
 	   (gnus-online method)))
-      (gnus-finish-retrieve-group-infos method infos early-data))
+      (gnus-finish-retrieve-group-infos method infos early-data)
+      (gnus-agent-save-active method))
      ((gnus-check-backend-function 'retrieve-groups (car method))
       (when (gnus-check-backend-function 'request-scan (car method))
 	(dolist (info infos)

=== modified file 'lisp/gnus/nnimap.el'
--- lisp/gnus/nnimap.el	2010-09-18 23:36:29 +0000
+++ lisp/gnus/nnimap.el	2010-09-19 10:45:51 +0000
@@ -197,14 +197,14 @@
     (current-buffer)))
 
 (defun nnimap-open-shell-stream (name buffer host port)
-  (let ((process (start-process name buffer shell-file-name
-				shell-command-switch
-				(format-spec
-				 nnimap-shell-program
-				 (format-spec-make
-				  ?s host
-				  ?p port)))))
-    process))
+  (let ((process-connection-type nil))
+    (start-process name buffer shell-file-name
+		   shell-command-switch
+		   (format-spec
+		    nnimap-shell-program
+		    (format-spec-make
+		     ?s host
+		     ?p port)))))
 
 (defun nnimap-credentials (address ports)
   (let (port credentials)
@@ -263,8 +263,6 @@
 		(delete-process (nnimap-process nnimap-object))
 		(setq nnimap-object nil))))
 	  (when nnimap-object
-	    (when (eq nnimap-stream 'shell)
-	      (setf (nnimap-newlinep nnimap-object) t))
 	    (setf (nnimap-capabilities nnimap-object)
 		  (mapcar
 		   #'upcase
@@ -317,10 +315,14 @@
 		 (if (member "IMAP4REV1" (nnimap-capabilities nnimap-object))
 		     "UID FETCH %d BODY.PEEK[]"
 		   "UID FETCH %d RFC822.PEEK")
-		 article)))
+		 article))
+	  ;; Check that we really got an article.
+	  (goto-char (point-min))
+	  (unless (looking-at "\\* [0-9]+ FETCH")
+	    (setq result nil)))
 	(let ((buffer (nnimap-find-process-buffer (current-buffer))))
 	  (when (car result)
-	    (with-current-buffer to-buffer
+	    (with-current-buffer (or to-buffer nntp-server-buffer)
 	      (insert-buffer-substring buffer)
 	      (goto-char (point-min))
 	      (let ((bytes (nnimap-get-length)))
@@ -611,7 +613,19 @@
       (nnimap-update-infos (nnimap-flags-to-marks
 			    (nnimap-parse-flags
 			     (nreverse sequences)))
-			   infos))))
+			   infos)
+      ;; Finally, just return something resembling an active file in
+      ;; the nntp buffer, so that the agent can save the info, too.
+      (with-current-buffer nntp-server-buffer
+	(erase-buffer)
+	(dolist (info infos)
+	  (let* ((group (gnus-info-group info))
+		 (active (gnus-active group)))
+	    (when active
+	      (insert (format "%S %d %d y\n"
+			      (gnus-group-real-name group)
+			      (cdr active)
+			      (car active))))))))))
 
 (defun nnimap-update-infos (flags infos)
   (dolist (info infos)
------------------------------------------------------------
revno: 101489
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Sun 2010-09-19 11:53:28 +0200
message:
  * lisp/frame.el (make-frame-names-alist): Don't list frames on other displays.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-19 09:32:52 +0000
+++ lisp/ChangeLog	2010-09-19 09:53:28 +0000
@@ -1,5 +1,7 @@
 2010-09-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* frame.el (make-frame-names-alist): Don't list frames on other displays.
+
 	* fringe.el (fringe-styles): New var.
 	(fringe-mode, fringe-query-style): Use it.
 

=== modified file 'lisp/frame.el'
--- lisp/frame.el	2010-09-02 10:17:02 +0000
+++ lisp/frame.el	2010-09-19 09:53:28 +0000
@@ -907,15 +907,16 @@
      (t (suspend-emacs)))))
 
 (defun make-frame-names-alist ()
+  ;; Only consider the frames on the same display.
   (let* ((current-frame (selected-frame))
 	 (falist
 	  (cons
 	   (cons (frame-parameter current-frame 'name) current-frame) nil))
-	 (frame (next-frame nil t)))
+	 (frame (next-frame nil 0)))
     (while (not (eq frame current-frame))
       (progn
-	(setq falist (cons (cons (frame-parameter frame 'name) frame) falist))
-	(setq frame (next-frame frame t))))
+	(push (cons (frame-parameter frame 'name) frame) falist)
+	(setq frame (next-frame frame 0))))
     falist))
 
 (defvar frame-name-history nil)
------------------------------------------------------------
revno: 101488
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Sun 2010-09-19 11:32:52 +0200
message:
  * lisp/fringe.el (fringe-styles): New var.
  (fringe-mode, fringe-query-style): Use it.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-19 02:11:18 +0000
+++ lisp/ChangeLog	2010-09-19 09:32:52 +0000
@@ -1,7 +1,12 @@
+2010-09-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* fringe.el (fringe-styles): New var.
+	(fringe-mode, fringe-query-style): Use it.
+
 2010-09-18  Michael R. Mauger  <mmaug@yahoo.com>
 
 	* progmodes/sql.el: Version 2.8
-	(sql-login-params): Updated widget structure; changes still
+	(sql-login-params): Update widget structure; changes still
 	needed.
 	(sql-product-alist): Add :list-all and :list-table features for
 	SQLite, Postgres and MySQL products.

=== modified file 'lisp/fringe.el'
--- lisp/fringe.el	2010-09-18 09:38:52 +0000
+++ lisp/fringe.el	2010-09-19 09:32:52 +0000
@@ -136,6 +136,14 @@
       ;; Otherwise impose the user-specified value of fringe-mode.
       (custom-initialize-reset symbol value))))
 
+(defconst fringe-styles
+  '(("default" . nil)
+    ("no-fringes" . 0)
+    ("right-only" . (0 . nil))
+    ("left-only" . (nil . 0))
+    ("half-width" . (4 . 4))
+    ("minimal" . (1 . 1))))
+
 (defcustom fringe-mode nil
   "Specify appearance of fringes on all frames.
 This variable can be nil (the default) meaning the fringes should have
@@ -152,16 +160,19 @@
 Setting the variable with a customization buffer also takes effect.
 If you only want to modify the appearance of the fringe in one frame,
 you can use the interactive function `set-fringe-style'."
-  :type '(choice (const :tag "Default width" nil)
-		 (const :tag "No fringes" 0)
-		 (const :tag "Only right" (0 . nil))
-		 (const :tag "Only left" (nil . 0))
-		 (const :tag "Half width" (4 . 4))
-		 (const :tag "Minimal" (1 . 1))
-		 (integer :tag "Specific width")
-		 (cons :tag "Different left/right sizes"
-		       (integer :tag "Left width")
-		       (integer :tag "Right width")))
+  :type `(choice
+          ,@ (mapcar (lambda (style)
+                      (let ((name
+                             (replace-regexp-in-string "-" " " (car style))))
+                        `(const :tag
+                                ,(concat (capitalize (substring name 0 1))
+                                         (substring name 1))
+                                ,(cdr style))))
+                    fringe-styles)
+          (integer :tag "Specific width")
+          (cons :tag "Different left/right sizes"
+                (integer :tag "Left width")
+                (integer :tag "Right width")))
   :group 'fringe
   :require 'fringe
   :initialize 'fringe-mode-initialize
@@ -178,27 +189,20 @@
 `default-frame-alist' is used when user enters the empty string.
 Otherwise the negation of the fringe value in the currently selected
 frame parameter is used."
-  (let ((mode (intern (completing-read
-		       (concat
-			"Select fringe mode for "
-			(if all-frames "all frames" "selected frame")
-			" (type ? for list): ")
-		       '(("none") ("default") ("left-only")
-			 ("right-only") ("half") ("minimal"))
-		       nil t))))
-    (cond ((eq mode 'none) 0)
-	  ((eq mode 'default) nil)
-	  ((eq mode 'left-only) '(nil . 0))
-	  ((eq mode 'right-only) '(0 . nil))
-	  ((eq mode 'half) '(4 . 4))
-	  ((eq mode 'minimal) '(1 . 1))
-	  ((eq mode (intern ""))
-	   (if (eq 0 (cdr (assq 'left-fringe
-				(if all-frames
-				    default-frame-alist
-				  (frame-parameters (selected-frame))))))
-	       nil
-	     0)))))
+  (let* ((mode (completing-read
+                (concat
+                 "Select fringe mode for "
+                 (if all-frames "all frames" "selected frame")
+                 " (type ? for list): ")
+                fringe-styles nil t))
+         (style (assoc (downcase mode) fringe-styles)))
+    (if style (cdr style)
+      (if (eq 0 (cdr (assq 'left-fringe
+                           (if all-frames
+                               default-frame-alist
+                             (frame-parameters (selected-frame))))))
+          nil
+        0))))
 
 (defun fringe-mode (&optional mode)
   "Set the default appearance of fringes on all frames.
------------------------------------------------------------
revno: 101487
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Sun 2010-09-19 11:16:28 +0200
message:
  * lisp/gnus/nnml.el (nnml-files): Add prefix to dynamic var `files'.
  (nnml-generate-nov-databases-directory, nnml-generate-active-info):
  Update var name.
  (nnml-generate-nov-file): Use dolist.
  (nnml-directory-articles, nnml-current-group-article-to-file-alist):
  Use with-current-buffer.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-18 23:36:29 +0000
+++ lisp/gnus/ChangeLog	2010-09-19 09:16:28 +0000
@@ -1,3 +1,12 @@
+2010-09-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* nnml.el (nnml-files): Add prefix to dynamic var `files'.
+	(nnml-generate-nov-databases-directory, nnml-generate-active-info):
+	Update var name.
+	(nnml-generate-nov-file): Use dolist.
+	(nnml-directory-articles, nnml-current-group-article-to-file-alist):
+	Use with-current-buffer.
+
 2010-09-18  Julien Danjou  <julien@danjou.info>
 
 	* gnus-html.el (gnus-html-schedule-image-fetching): Fetch all images in
@@ -9,7 +18,7 @@
 	the range update right.
 	(nnimap-request-group): Don't make `M-g' bug out on group with no
 	marks.
-	(nnoo): Required, so that other packages can require nnimap.
+	(nnoo): Require, so that other packages can require nnimap.
 	(nnimap-wait-for-response): Be a bit more lax in finding the end of the
 	command we're looking for.  This helps when the server sends more
 	responses after we've gotten everything we expected.

=== modified file 'lisp/gnus/nnml.el'
--- lisp/gnus/nnml.el	2010-09-18 23:36:29 +0000
+++ lisp/gnus/nnml.el	2010-09-19 09:16:28 +0000
@@ -878,6 +878,7 @@
   ;; Save the active file.
   (nnmail-save-active nnml-group-alist nnml-active-file))
 
+(defvar nnml-files)
 (defun nnml-generate-nov-databases-directory (dir &optional seen no-active)
   "Regenerate the NOV database in DIR.
 
@@ -897,9 +898,9 @@
 		   (file-directory-p dir))
 	  (nnml-generate-nov-databases-directory dir seen)))
       ;; Do this directory.
-      (let ((files (sort (nnheader-article-to-file-alist dir)
+      (let ((nnml-files (sort (nnheader-article-to-file-alist dir)
 			 'car-less-than-car)))
-	(if (not files)
+	(if (not nnml-files)
 	    (let* ((group (nnheader-file-to-group
 			   (directory-file-name dir) nnml-directory))
 		   (info (cadr (assoc group nnml-group-alist))))
@@ -907,11 +908,10 @@
 		(setcar info (1+ (cdr info)))))
 	  (funcall nnml-generate-active-function dir)
 	  ;; Generate the nov file.
-	  (nnml-generate-nov-file dir files)
+	  (nnml-generate-nov-file dir nnml-files)
 	  (unless no-active
 	    (nnmail-save-active nnml-group-alist nnml-active-file)))))))
 
-(defvar files)
 (defun nnml-generate-active-info (dir)
   ;; Update the active info for this group.
   (let ((group (directory-file-name dir))
@@ -922,9 +922,9 @@
 	  last (or (caadr entry) 0)
 	  nnml-group-alist (delq entry nnml-group-alist))
     (push (list group
-		(cons (or (caar files) (1+ last))
+		(cons (or (caar nnml-files) (1+ last))
 		      (max last
-			   (or (caar (last files))
+			   (or (caar (last nnml-files))
 			       0))))
 	  nnml-group-alist)))
 
@@ -941,8 +941,8 @@
       ;; Delete the old NOV file.
       (when (file-exists-p nov)
 	(funcall nnmail-delete-file-function nov))
-      (while files
-	(unless (file-directory-p (setq file (concat dir (cdar files))))
+      (dolist (file files)
+	(unless (file-directory-p (setq file (concat dir (cdr file))))
 	  (erase-buffer)
 	  (nnheader-insert-file-contents file)
 	  (narrow-to-region
@@ -953,12 +953,11 @@
 	     (max (point-min) (1- (point)))))
 	  (unless (zerop (buffer-size))
 	    (goto-char (point-min))
-	    (setq headers (nnml-parse-head chars (caar files)))
+	    (setq headers (nnml-parse-head chars (car file)))
 	    (with-current-buffer nov-buffer
 	      (goto-char (point-max))
 	      (nnheader-insert-nov headers)))
-	  (widen))
-	(setq files (cdr files)))
+	  (widen)))
       (with-current-buffer nov-buffer
 	(nnmail-write-region (point-min) (point-max) nov nil 'nomesg)
 	(kill-buffer (current-buffer))))))
@@ -995,11 +994,9 @@
     ;; build list from .overview if available
     ;; We would use nnml-open-nov, except that nnml-nov-buffer-alist is
     ;; defvoo'd, and we might get called when it hasn't been swapped in.
-    (save-excursion
+    (with-current-buffer (nnml-get-nov-buffer nnml-current-group)
       (let ((list nil)
-	    art
-	    (buffer (nnml-get-nov-buffer nnml-current-group)))
-	(set-buffer buffer)
+	    art)
 	(goto-char (point-min))
 	(while (not (eobp))
 	  (setq art (read (current-buffer)))
@@ -1018,11 +1015,9 @@
 				  nnml-current-directory))))
       (nnheader-article-to-file-alist nnml-current-directory)
     ;; build list from .overview if available
-    (save-excursion
+    (with-current-buffer (nnml-get-nov-buffer nnml-current-group)
       (let ((alist nil)
-	    (buffer (nnml-get-nov-buffer nnml-current-group))
 	    art)
-	(set-buffer buffer)
 	(goto-char (point-min))
 	(while (not (eobp))
 	  (setq art (read (current-buffer)))
------------------------------------------------------------
revno: 101486
committer: Michael Mauger <mmaug@yahoo.com>
branch nick: trunk
timestamp: Sat 2010-09-18 22:11:18 -0400
message:
  SQL Mode, Version 2.8 - sql-list-all and sql-list-table functions.
  
  	* progmodes/sql.el: Version 2.8
  	(sql-login-params): Updated widget structure; changes still
  	needed.
  	(sql-product-alist): Add :list-all and :list-table features for
  	SQLite, Postgres and MySQL products.
  	(sql-redirect): Handle default value.
  	(sql-execute, sql-execute-feature): New functions.
  	(sql-read-table-name): New function.
  	(sql-list-all, sql-list-table): New functions. User API
  	(sql-mode-map, sql-interactive-mode-map): Add key definitions
  	for above functions.
  	(sql-mode-menu, sql-interactive-mode-menu): Add menu definitions
  	for above functions.
  	(sql-postgres-login-params): Add user and database defaults.
  	(sql-buffer-live-p): Bug fix.
  	(sql-product-history); New variable.
  	(sql-read-product): New function. Use it.
  	(sql-set-product, sql-product-interactive): Use it.
  	(sql-connection-history): New variable.
  	(sql-read-connection): New function. Use it.
  	(sql-connect): New function.
  	(sql-for-each-login): Redesign function interface.
  	(sql-make-alternate-buffer-name, sql-save-connection): Use it.
  	(sql-get-login-ext, sql-get-login): Use it. Handle default values.
  	(sql-comint): Check for program. Existing live buffer.
  	(sql-comint-postgres): Add port parameter.
diff:
=== modified file 'etc/NEWS'
--- etc/NEWS	2010-09-18 09:15:02 +0000
+++ etc/NEWS	2010-09-19 02:11:18 +0000
@@ -320,9 +320,11 @@
 
 *** `sql-dialect' is a synonym for `sql-product'.
 
-*** Added ability to login with a port on MySQL.
+*** Added ability to login with a port on MySQL and Postgres.
 The custom variable `sql-port' can be specified for connection to
-MySQL servers.
+MySQL or Postgres servers.  By default, the port is not listed in
+either login parameter, but will be added to the command line if set
+to a non-zero value.
 
 *** Dynamic selection of product in an SQL interactive session.
 If you use `sql-product-interactive' to start an SQL interactive
@@ -349,22 +351,34 @@
 which is a list of the parameters to be prompted for before a
 connection is established.
 
-By default, the value of the parameter is simply prompted for.  For
-`server' and `database', they can be specified in a list as shown
-below:
-
-  (server :file ARG)
-  (database :file ARG)
-  (server :completion ARG)
-  (database :completion ARG)
-
-The ARG when :file is specified is a regexp that will match valid file
-names (without the directory portion).  Generally these strings will
-be of the form ".+\.SUF" where SUF is the desired file suffix.
-
-When :completion is specified, the ARG corresponds to the PREDICATE
-argument to the `completing-read' function (a list of possible values
-or a function returning such a list).
+The lists consist of the following five tokens: `user', `password',
+`database', `server', and `port'.  The order in which they appear is
+the order in which they are prompted.  The tokens symbols can be
+replaced by a sublist starting with the token and followed by a plist
+which control the prompting for values.  The tokens `user',
+`database', and `server' each can take a property of :default which
+specifies the value to be used if no value is entered.  The
+`database', `server', and `port' tokens handle the :completion
+property which restricts the entry to either one of the values in the
+list or to one of the values returned by the function provided as the
+property value.  The `database' and `server' tokens also accept the
+:file property whose value is a regexp to identify useful file names.
+
+  (user :default DEF)
+  (database :default DEF
+            :file FILEPAT
+            :completion COMPLETE)
+  (server :default DEF
+          :file FILEPAT
+          :completion COMPLETE)
+
+The FILEPAT when :file is specified is a regexp that will match valid
+file names (without the directory portion).  Generally these strings
+will be of the form ".+\.SUF" where SUF is the desired file suffix.
+
+When :completion is specified, the COMPLETE corresponds to the
+PREDICATE argument to the `completing-read' function (a list of
+possible values or a function returning such a list).
 
 *** Added `sql-connection-alist' to record login parameter values.
 An alist for recording different username, database and server
@@ -404,6 +418,26 @@
 `sql-save-connection' will gather the login params specified for the
 session and save them as a new connection.
 
+*** List database objects and details.
+Once a SQL interactive session has been started, you can get a list of
+the objects in the database and see details of those objects.  The
+objects shown and the details available are product specific.
+
+**** List all objects.
+Using `M-x sql-list-all', `C-c C-l a' or selecting "SQL->List all
+objects" will list all the objects in the database.  At a minimum it
+lists the tables and views in the database.  Preceeding the command by
+universal argument may provide additional details or extend the
+listing to include other schemas objects.  The list will appear in a
+separate window in view-mode.
+
+**** List Table details.
+Using `M-x sql-list-table', `C-c C-l t' or selecting "SQL->List Table
+details" will ask for the name of a database table or view and display
+the list of columns in the relation.  Preceeding the comand with the
+universal argument may provide additional details about each column.
+The list will appear in a separate window in view-mode.
+
 *** Added option `sql-send-terminator'.
 When set makes sure that each command sent with `sql-send-*' commands
 are properly terminated and submitted to the SQL processor.

=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-19 00:05:26 +0000
+++ lisp/ChangeLog	2010-09-19 02:11:18 +0000
@@ -1,3 +1,32 @@
+2010-09-18  Michael R. Mauger  <mmaug@yahoo.com>
+
+	* progmodes/sql.el: Version 2.8
+	(sql-login-params): Updated widget structure; changes still
+	needed.
+	(sql-product-alist): Add :list-all and :list-table features for
+	SQLite, Postgres and MySQL products.
+	(sql-redirect): Handle default value.
+	(sql-execute, sql-execute-feature): New functions.
+	(sql-read-table-name): New function.
+	(sql-list-all, sql-list-table): New functions. User API
+	(sql-mode-map, sql-interactive-mode-map): Add key definitions
+	for above functions.
+	(sql-mode-menu, sql-interactive-mode-menu): Add menu definitions
+	for above functions.
+	(sql-postgres-login-params): Add user and database defaults.
+	(sql-buffer-live-p): Bug fix.
+	(sql-product-history); New variable.
+	(sql-read-product): New function. Use it.
+	(sql-set-product, sql-product-interactive): Use it.
+	(sql-connection-history): New variable.
+	(sql-read-connection): New function. Use it.
+	(sql-connect): New function.
+	(sql-for-each-login): Redesign function interface.
+	(sql-make-alternate-buffer-name, sql-save-connection): Use it.
+	(sql-get-login-ext, sql-get-login): Use it. Handle default values.
+	(sql-comint): Check for program. Existing live buffer.
+	(sql-comint-postgres): Add port parameter.
+
 2010-09-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/warnings.el: Fix commenting convention.

=== modified file 'lisp/progmodes/sql.el'
--- lisp/progmodes/sql.el	2010-09-13 20:05:23 +0000
+++ lisp/progmodes/sql.el	2010-09-19 02:11:18 +0000
@@ -5,10 +5,9 @@
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Michael Mauger <mmaug@yahoo.com>
-;; Version: 2.7
+;; Version: 2.8
 ;; Keywords: comm languages processes
 ;; URL: http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/progmodes/sql.el
-;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?SqlMode
 
 ;; This file is part of GNU Emacs.
 
@@ -286,6 +285,9 @@
 
 (define-widget 'sql-login-params 'lazy
   "Widget definition of the login parameters list"
+  ;; FIXME: does not implement :default property for the user,
+  ;; database and server options.  Anybody have some guidance on how to
+  ;; do this.
   :tag "Login Parameters"
   :type '(repeat (choice
                   (const user)
@@ -300,7 +302,7 @@
                                 (const :format "" server)
                                 (const :format "" :completion)
                                 (restricted-sexp
-                                 :match-alternatives (listp symbolp))))
+                                 :match-alternatives (listp stringp))))
                   (choice :tag "database"
                           (const database)
                           (list :tag "file"
@@ -311,7 +313,7 @@
                                 (const :format "" database)
                                 (const :format "" :completion)
                                 (restricted-sexp
-                                 :match-alternatives (listp symbolp))))
+                                 :match-alternatives (listp stringp))))
                   (const port))))
 
 ;; SQL Product support
@@ -401,6 +403,8 @@
      :sqli-options sql-mysql-options
      :sqli-login sql-mysql-login-params
      :sqli-comint-func sql-comint-mysql
+     :list-all "SHOW TABLES;"
+     :list-table "DESCRIBE %s;"
      :prompt-regexp "^mysql> "
      :prompt-length 6
      :prompt-cont-regexp "^    -> "
@@ -428,6 +432,8 @@
      :sqli-options sql-postgres-options
      :sqli-login sql-postgres-login-params
      :sqli-comint-func sql-comint-postgres
+     :list-all ("\\d+" . "\\dS+")
+     :list-table ("\\d+ %s" . "\\dS+ %s")
      :prompt-regexp "^.*=[#>] "
      :prompt-length 5
      :prompt-cont-regexp "^.*[-(][#>] "
@@ -452,6 +458,8 @@
      :sqli-options sql-sqlite-options
      :sqli-login sql-sqlite-login-params
      :sqli-comint-func sql-comint-sqlite
+     :list-all ".tables"
+     :list-table ".schema %s"
      :prompt-regexp "^sqlite> "
      :prompt-length 8
      :prompt-cont-regexp "^   ...> "
@@ -510,6 +518,23 @@
                         database.  Do product specific
                         configuration of comint in this function.
 
+ :list-all              Command string or function which produces
+                        a listing of all objects in the database.
+                        If it's a cons cell, then the car
+                        produces the standard list of objects and
+                        the cdr produces an enhanced list of
+                        objects.  What \"enhanced\" means is
+                        dependent on the SQL product and may not
+                        exist.  In general though, the
+                        \"enhanced\" list should include visible
+                        objects from other schemas.
+
+ :list-table            Command string or function which produces
+                        a detailed listing of a specific database
+                        table.  If its a cons cell, then the car
+                        produces the standard list and the cdr
+                        produces an enhanced list.
+
  :prompt-regexp         regular expression string that matches
                         the prompt issued by the product
                         interpreter.
@@ -941,7 +966,9 @@
   :version "20.8"
   :group 'SQL)
 
-(defcustom sql-postgres-login-params '(user database server)
+(defcustom sql-postgres-login-params `((user :default ,(user-login-name))
+                                       (database :default ,(user-login-name))
+                                       server)
   "List of login parameters needed to connect to Postgres."
   :type 'sql-login-params
   :version "24.1"
@@ -1025,6 +1052,12 @@
 
 ;; Passwords are not kept in a history.
 
+(defvar sql-product-history nil
+  "History of products used.")
+
+(defvar sql-connection-history nil
+  "History of connections used.")
+
 (defvar sql-buffer nil
   "Current SQLi buffer.
 
@@ -1067,7 +1100,7 @@
          (get-buffer-process buffer)
          (comint-check-proc buffer)
          (with-current-buffer buffer
-           (and (derived-mode-p 'sql-product-interactive)
+           (and (derived-mode-p 'sql-interactive-mode)
                 (or (not product)
                     (eq product sql-product)))))))
 
@@ -1086,6 +1119,8 @@
     (define-key map (kbd "O") 'sql-magic-go)
     (define-key map (kbd "o") 'sql-magic-go)
     (define-key map (kbd ";") 'sql-magic-semicolon)
+    (define-key map (kbd "C-c C-l a") 'sql-list-all)
+    (define-key map (kbd "C-c C-l t") 'sql-list-table)
     map)
   "Mode map used for `sql-interactive-mode'.
 Based on `comint-mode-map'.")
@@ -1099,6 +1134,8 @@
     (define-key map (kbd "C-c C-s") 'sql-send-string)
     (define-key map (kbd "C-c C-b") 'sql-send-buffer)
     (define-key map (kbd "C-c C-i") 'sql-product-interactive)
+    (define-key map (kbd "C-c C-l a") 'sql-list-all)
+    (define-key map (kbd "C-c C-l t") 'sql-list-table)
     map)
   "Mode map used for `sql-mode'.")
 
@@ -1114,6 +1151,9 @@
    ["Send Buffer" sql-send-buffer (sql-buffer-live-p sql-buffer)]
    ["Send String" sql-send-string (sql-buffer-live-p sql-buffer)]
    "--"
+   ["List all objects" sql-list-all (sql-buffer-live-p sql-buffer)]
+   ["List table details" sql-list-table (sql-buffer-live-p sql-buffer)]
+   "--"
    ["Start SQLi session" sql-product-interactive
     :visible (not sql-connection-alist)
     :enable (sql-get-product-feature sql-product :sqli-comint-func)]
@@ -1152,7 +1192,10 @@
  "Menu for `sql-interactive-mode'."
  '("SQL"
    ["Rename Buffer" sql-rename-buffer t]
-   ["Save Connection" sql-save-connection (not sql-connection)]))
+   ["Save Connection" sql-save-connection (not sql-connection)]
+   "--"
+   ["List all objects" sql-list-all t]
+   ["List table details" sql-list-table t]))
 
 ;; Abbreviations -- if you want more of them, define them in your
 ;; ~/.emacs file.  Abbrevs have to be enabled in your ~/.emacs, too.
@@ -2135,6 +2178,16 @@
 
 ;;; SQL Product support functions
 
+(defun sql-read-product (prompt &optional initial)
+  "Read a valid SQL product."
+  (let ((init (or (and initial (symbol-name initial)) "ansi")))
+    (intern (completing-read
+             prompt
+             (mapcar (lambda (info) (symbol-name (car info)))
+                     sql-product-alist)
+             nil 'require-match
+             init 'sql-product-history init))))
+
 (defun sql-add-product (product display &rest plist)
   "Add support for a database product in `sql-mode'.
 
@@ -2325,10 +2378,9 @@
         (mapcar
          (lambda (param)
            (let ((token (or (and (listp param) (car param)) param))
-                 (type  (or (and (listp param) (nth 1 param)) nil))
-                 (arg   (or (and (listp param) (nth 2 param)) nil)))
+                 (plist (or (and (listp param) (cdr param)) nil)))
 
-             (funcall body token type arg)))
+             (funcall body token plist)))
          login-params)))
 
 
@@ -2348,11 +2400,7 @@
 (defun sql-set-product (product)
   "Set `sql-product' to PRODUCT and enable appropriate highlighting."
   (interactive
-   (list (completing-read "SQL product: "
-                          (mapcar (lambda (info) (symbol-name (car info)))
-                                  sql-product-alist)
-                          nil 'require-match
-                          (or (and sql-product (symbol-name sql-product)) "ansi"))))
+   (list (sql-read-product "SQL product: ")))
   (if (stringp product) (setq product (intern product)))
   (when (not (assoc product sql-product-alist))
     (error "SQL product %s is not supported; treated as ANSI" product)
@@ -2492,37 +2540,53 @@
   "Read a password using PROMPT.  Optional DEFAULT is password to start with."
   (read-passwd prompt nil default))
 
-(defun sql-get-login-ext (prompt last-value history-var type arg)
+(defun sql-get-login-ext (prompt last-value history-var plist)
   "Prompt user with extended login parameters.
 
-If TYPE is nil, then the user is simply prompted for a string
+If PLIST is nil, then the user is simply prompted for a string
 value.
 
-If TYPE is `:file', then the user is prompted for a file
-name that must match the regexp pattern specified in the ARG
-argument.
-
-If TYPE is `:completion', then the user is prompted for a string
-specified by ARG.  (ARG is used as the PREDICATE argument to
+The property `:default' specifies the default value.  If the
+`:number' property is non-nil then ask for a number.
+
+The `:file' property prompts for a file name that must match the
+regexp pattern specified in its value.
+
+The `:completion' property prompts for a string specified by its
+value.  (The property value is used as the PREDICATE argument to
 `completing-read'.)"
-  (cond
-   ((eq type nil)
-    (read-from-minibuffer prompt last-value nil nil history-var))
-
-   ((eq type :file)
-    (let ((use-dialog-box nil))
+  (let* ((default (plist-get plist :default))
+         (prompt-def
+          (if default
+              (if (string-match "\\(\\):[ \t]*\\'" prompt)
+                  (replace-match (format " (default \"%s\")" default) t t prompt 1)
+                (replace-regexp-in-string "[ \t]*\\'"
+                                          (format " (default \"%s\") " default)
+                                          prompt t t))
+            prompt))
+         (use-dialog-box nil))
+    (cond
+     ((plist-member plist :file)
       (expand-file-name
        (read-file-name prompt
-                       (file-name-directory last-value) nil t
+                       (file-name-directory last-value) default t
                        (file-name-nondirectory last-value)
-                       (if arg
-                           `(lambda (f)
-                              (string-match (concat "\\<" ,arg "\\>")
-                                            (file-name-nondirectory f)))
-                         nil)))))
-
-   ((eq type :completion)
-    (completing-read prompt arg nil t last-value history-var))))
+                       (when (plist-get plist :file)
+                         `(lambda (f)
+                            (string-match
+                             (concat "\\<" ,(plist-get plist :file) "\\>")
+                             (file-name-nondirectory f)))))))
+
+     ((plist-member plist :completion)
+      (completing-read prompt-def (plist-get plist :completion) nil t
+                       last-value history-var default))
+
+     ((plist-get plist :number)
+      (read-number prompt (or default last-value 0)))
+
+     (t
+      (let ((r (read-from-minibuffer prompt-def last-value nil nil history-var nil)))
+        (if (string= "" r) (or default "") r))))))
 
 (defun sql-get-login (&rest what)
   "Get username, password and database from the user.
@@ -2541,57 +2605,55 @@
 `database'.  The members of WHAT are processed in the order in
 which they are provided.
 
-The tokens for `database' and `server' may also be lists to
-control or limit the values that can be supplied.  These can be
-of the form:
-
-  \(database :file \".+\\\\.EXT\")
-  \(database :completion FUNCTION)
-
-The `server' token supports the same forms.
+Each token may also be a list with the token in the car and a
+plist of options as the cdr.  The following properties are
+supported:
+
+    :file <filename-regexp>
+    :completion <list-of-strings-or-function>
+    :default <default-value>
+    :number t
 
 In order to ask the user for username, password and database, call the
 function like this: (sql-get-login 'user 'password 'database)."
   (interactive)
-    (mapcar
-     (lambda (w)
-       (let ((token (or (and (listp w) (car w)) w))
-             (type  (or (and (listp w) (nth 1 w)) nil))
-             (arg   (or (and (listp w) (nth 2 w)) nil)))
-
-         (cond
-          ((eq token 'user)		; user
-           (setq sql-user
-                 (read-from-minibuffer "User: " sql-user nil nil
-                                       'sql-user-history)))
-
-          ((eq token 'password)		; password
-           (setq sql-password
-                 (sql-read-passwd "Password: " sql-password)))
-
-          ((eq token 'server)		; server
-           (setq sql-server
-                 (sql-get-login-ext "Server: " sql-server
-                                    'sql-server-history type arg)))
-
-          ((eq token 'database)		; database
-           (setq sql-database
-                 (sql-get-login-ext "Database: " sql-database
-                                    'sql-database-history type arg)))
-
-          ((eq token 'port)		; port
-           (setq sql-port
-                 (read-number "Port: " (if (numberp sql-port)
-                                           sql-port
-                                         0)))))))
-     what))
-
-(defun sql-find-sqli-buffer ()
+  (mapcar
+   (lambda (w)
+     (let ((token (or (and (consp w) (car w)) w))
+           (plist (or (and (consp w) (cdr w)) nil)))
+
+     (cond
+      ((eq token 'user)		; user
+       (setq sql-user
+             (sql-get-login-ext "User: " sql-user
+                                'sql-user-history plist)))
+
+      ((eq token 'password)		; password
+       (setq sql-password
+             (sql-read-passwd "Password: " sql-password)))
+
+      ((eq token 'server)		; server
+       (setq sql-server
+             (sql-get-login-ext "Server: " sql-server
+                                'sql-server-history plist)))
+
+      ((eq token 'database)		; database
+       (setq sql-database
+             (sql-get-login-ext "Database: " sql-database
+                                'sql-database-history plist)))
+
+      ((eq token 'port)		; port
+       (setq sql-port
+             (sql-get-login-ext "Port: " sql-port
+                                nil (append '(:number t) plist)))))))
+   what))
+
+(defun sql-find-sqli-buffer (&optional product)
   "Returns the name of the current default SQLi buffer or nil.
 In order to qualify, the SQLi buffer must be alive, be in
 `sql-interactive-mode' and have a process."
   (let ((buf  sql-buffer)
-        (prod sql-product))
+        (prod (or product sql-product)))
     (or
      ;; Current sql-buffer, if there is one.
      (and (sql-buffer-live-p buf prod)
@@ -2689,7 +2751,7 @@
                   (apply 'append nil
                          (sql-for-each-login
                           (sql-get-product-feature sql-product :sqli-login)
-                          (lambda (token type arg)
+                          (lambda (token plist)
                             (cond
                              ((eq token 'user)
                               (unless (string= "" sql-user)
@@ -2701,13 +2763,13 @@
                              ((eq token 'server)
                               (unless (string= "" sql-server)
                                 (list "."
-                                      (if (eq type :file)
+                                      (if (plist-member plist :file)
                                           (file-name-nondirectory sql-server)
                                         sql-server))))
                              ((eq token 'database)
                               (unless (string= "" sql-database)
                                 (list "@"
-                                      (if (eq type :file)
+                                      (if (plist-member plist :file)
                                          (file-name-nondirectory sql-database)
                                         sql-database))))
 
@@ -3019,18 +3081,28 @@
                                                          :prompt-regexp))
           (start nil))
       (with-current-buffer buf
+        (toggle-read-only -1)
         (unless save-prior
           (erase-buffer))
         (goto-char (point-max))
+        (unless (zerop (buffer-size))
+          (insert "\n"))
         (setq start (point)))
 
       ;; Run the command
+      (message "Executing SQL command...")
       (comint-redirect-send-command-to-process command buf proc nil t)
       (while (null comint-redirect-completed)
 	(accept-process-output nil 1))
+      (message "Executing SQL command...done")
 
-      ;; Remove echo if there was one
+      ;; Clean up the output results
       (with-current-buffer buf
+        ;; Remove trailing whitespace
+        (goto-char (point-max))
+        (when (looking-back "[ \t\f\n\r]*" start)
+          (delete-region (match-beginning 0) (match-end 0)))
+        ;; Remove echo if there was one
         (goto-char start)
         (when (looking-at (concat "^" (regexp-quote command) "[\\n]"))
           (delete-region (match-beginning 0) (match-end 0)))
@@ -3064,9 +3136,6 @@
           ;; one group specified
           ((numberp regexp-groups)
            (match-string regexp-groups))
-           ;; (buffer-substring-no-properties
-           ;;  (match-beginning regexp-groups)
-           ;;  (match-end regexp-groups)))
           ;; list of numbers; return the specified matches only
           ((consp regexp-groups)
            (mapcar (lambda (c)
@@ -3084,6 +3153,79 @@
          results)))
       (nreverse results)))
 
+(defun sql-execute (sqlbuf outbuf command arg)
+  "Executes a command in a SQL interacive buffer and captures the output.
+
+The commands are run in SQLBUF and the output saved in OUTBUF.
+COMMAND must be a string, a function or a list of such elements.
+Functions are called with SQLBUF, OUTBUF and ARG as parameters;
+strings are formatted with ARG and executed.
+
+If the results are empty the OUTBUF is deleted, otherwise the
+buffer is popped into a view window. "
+  (mapc
+   (lambda (c)
+     (cond
+      ((stringp c)
+       (sql-redirect (if arg (format c arg) c) sqlbuf outbuf) t)
+      ((functionp c)
+       (apply c sqlbuf outbuf arg))
+      (t (error "Unknown sql-execute item %s" c))))
+   (if (consp command) command (cons command nil)))
+
+  (setq outbuf (get-buffer outbuf))
+  (if (zerop (buffer-size outbuf))
+      (kill-buffer outbuf)
+    (let ((one-win (eq (selected-window)
+                       (get-lru-window))))
+      (with-current-buffer outbuf
+        (set-buffer-modified-p nil)
+        (toggle-read-only 1))
+      (view-buffer-other-window outbuf)
+      (when one-win
+        (shrink-window-if-larger-than-buffer)))))
+
+(defun sql-execute-feature (sqlbuf outbuf feature enhanced arg)
+  "List objects or details in a separate display buffer."
+  (let (command)
+    (with-current-buffer sqlbuf
+      (setq command (sql-get-product-feature sql-product feature)))
+    (unless command
+      (error "%s does not support %s" sql-product feature))
+    (when (consp command)
+      (setq command (if enhanced
+                        (cdr command)
+                      (car command))))
+    (sql-execute sqlbuf outbuf command arg)))
+
+(defun sql-read-table-name (prompt)
+  "Read the name of a database table."
+  ;; TODO: Fetch table/view names from database and provide completion.
+  ;; Also implement thing-at-point if the buffer has valid names in it
+  ;; (i.e. sql-mode, sql-interactive-mode, or sql-list-all buffers)
+  (read-from-minibuffer prompt))
+
+(defun sql-list-all (&optional enhanced)
+  "List all database objects."
+  (interactive "P")
+  (let ((sqlbuf (sql-find-sqli-buffer)))
+    (unless sqlbuf
+      (error "No SQL interactive buffer found"))
+    (sql-execute-feature sqlbuf "*List All*" :list-all enhanced nil)))
+
+(defun sql-list-table (name &optional enhanced)
+  "List the details of a database table. "
+  (interactive
+   (list (sql-read-table-name "Table name: ")
+         current-prefix-arg))
+  (let ((sqlbuf (sql-find-sqli-buffer)))
+    (unless sqlbuf
+      (error "No SQL interactive buffer found"))
+    (unless name
+      (error "No table name specified"))
+    (sql-execute-feature sqlbuf (format "*List %s*" name)
+                         :list-table enhanced name)))
+
 
 
 ;;; SQL mode -- uses SQL interactive mode
@@ -3313,6 +3455,14 @@
 
 ;;; Connection handling
 
+(defun sql-read-connection (prompt &optional initial default)
+  "Read a connection name."
+  (let ((completion-ignore-case t))
+    (completing-read prompt
+                     (mapcar (lambda (c) (car c))
+                             sql-connection-alist)
+                     nil t initial 'sql-connection-history default)))
+
 ;;;###autoload
 (defun sql-connect (connection)
   "Connect to an interactive session using CONNECTION settings.
@@ -3326,12 +3476,7 @@
   ;; Prompt for the connection from those defined in the alist
   (interactive
    (if sql-connection-alist
-       (list
-        (let ((completion-ignore-case t))
-          (completing-read "Connection: "
-                           (mapcar (lambda (c) (car c))
-                                   sql-connection-alist)
-                           nil t nil nil '(()))))
+       (list (sql-read-connection "Connection: " nil '(nil)))
      nil))
 
   ;; Are there connections defined
@@ -3365,10 +3510,10 @@
                           ;; the remaining params (w/o the connection params)
                           (rem-params   (sql-for-each-login
                                          login-params
-                                         (lambda (token type arg)
+                                         (lambda (token plist)
                                            (unless (member token set-params)
-                                                    (if (or type arg)
-                                                        (list token type arg)
+                                                    (if plist
+                                                        (cons token plist)
                                                       token)))))
                           ;; Remember the connection
                           (sql-connection connection))
@@ -3409,7 +3554,7 @@
               (append (list name)
                       (sql-for-each-login
                        `(product ,@login)
-                       (lambda (token type arg)
+                       (lambda (token plist)
                          (cond
                           ((eq token 'product)  `(sql-product  ',sql-product))
                           ((eq token 'user)     `(sql-user     ,sql-user))
@@ -3460,7 +3605,7 @@
     (when (and (consp product)
                (not (cdr product))
                (numberp (car product)))
-      (when (>= (car product) 16)
+      (when (>= (prefix-numeric-value product) 16)
         (when (not new-name)
           (setq new-name '(4)))
         (setq product '(4)))))
@@ -3468,59 +3613,53 @@
   ;; Get the value of product that we need
   (setq product
         (cond
-         ((equal product '(4))          ; C-u, prompt for product
-          (intern (completing-read "SQL product: "
-                                   (mapcar (lambda (info) (symbol-name (car info)))
-                                           sql-product-alist)
-                                   nil 'require-match
-                                   (or (and sql-product
-                                            (symbol-name sql-product))
-                                       "ansi"))))
          ((and product                  ; Product specified
                (symbolp product)) product)
+         ((= (prefix-numeric-value product) 4) ; C-u, prompt for product
+          (sql-read-product "SQL product: " sql-product))
          (t sql-product)))              ; Default to sql-product
 
   ;; If we have a product and it has a interactive mode
   (if product
       (when (sql-get-product-feature product :sqli-comint-func)
-        ;; If no new name specified, fall back on sql-buffer if its for
-        ;; the same product
-        (if (and (not new-name)
-                 (sql-buffer-live-p sql-buffer product))
-            (pop-to-buffer sql-buffer)
-
-          ;; We have a new name or sql-buffer doesn't exist or match
-          ;; Start by remembering where we start
-          (let* ((start-buffer (current-buffer))
-                 new-sqli-buffer)
-
-            ;; Get credentials.
-            (apply 'sql-get-login (sql-get-product-feature product :sqli-login))
-
-            ;; Connect to database.
-            (message "Login...")
-            (funcall (sql-get-product-feature product :sqli-comint-func)
-                     product
-                     (sql-get-product-feature product :sqli-options))
-
-            ;; Set SQLi mode.
-            (setq new-sqli-buffer (current-buffer))
-            (let ((sql-interactive-product product))
-              (sql-interactive-mode))
-
-            ;; Set the new buffer name
-            (when new-name
-              (sql-rename-buffer new-name))
-
-            ;; Set `sql-buffer' in the new buffer and the start buffer
-            (setq sql-buffer (buffer-name new-sqli-buffer))
-            (with-current-buffer start-buffer
+        ;; If no new name specified, try to pop to an active SQL
+        ;; interactive for the same product
+        (let ((buf (sql-find-sqli-buffer product)))
+          (if (and (not new-name) buf)
+              (pop-to-buffer buf)
+
+            ;; We have a new name or sql-buffer doesn't exist or match
+            ;; Start by remembering where we start
+            (let ((start-buffer (current-buffer))
+                  new-sqli-buffer)
+
+              ;; Get credentials.
+              (apply 'sql-get-login (sql-get-product-feature product :sqli-login))
+
+              ;; Connect to database.
+              (message "Login...")
+              (funcall (sql-get-product-feature product :sqli-comint-func)
+                       product
+                       (sql-get-product-feature product :sqli-options))
+
+              ;; Set SQLi mode.
+              (setq new-sqli-buffer (current-buffer))
+              (let ((sql-interactive-product product))
+                (sql-interactive-mode))
+
+              ;; Set the new buffer name
+              (when new-name
+                (sql-rename-buffer new-name))
+
+              ;; Set `sql-buffer' in the new buffer and the start buffer
               (setq sql-buffer (buffer-name new-sqli-buffer))
-              (run-hooks 'sql-set-sqli-hook))
+              (with-current-buffer start-buffer
+                (setq sql-buffer (buffer-name new-sqli-buffer))
+                (run-hooks 'sql-set-sqli-hook))
 
-            ;; All done.
-            (message "Login...done")
-            (pop-to-buffer sql-buffer))))
+              ;; All done.
+              (message "Login...done")
+              (pop-to-buffer sql-buffer)))))
     (message "No default SQL product defined.  Set `sql-product'.")))
 
 (defun sql-comint (product params)
@@ -3530,14 +3669,17 @@
 passed as command line arguments."
   (let ((program (sql-get-product-feature product :sqli-program))
         (buf-name "SQL"))
+    ;; make sure we can find the program
+    (unless (executable-find program)
+      (error "Unable to locate SQL program \'%s\'" program))
     ;; Make sure buffer name is unique
-    (when (get-buffer (format "*%s*" buf-name))
+    (when (sql-buffer-live-p (format "*%s*" buf-name))
       (setq buf-name (format "SQL-%s" product))
-      (when (get-buffer (format "*%s*" buf-name))
+      (when (sql-buffer-live-p (format "*%s*" buf-name))
         (let ((i 1))
-          (while (get-buffer (format "*%s*"
-                                     (setq buf-name
-                                           (format "SQL-%s%d" product i))))
+          (while (sql-buffer-live-p
+                  (format "*%s*"
+                          (setq buf-name (format "SQL-%s%d" product i))))
             (setq i (1+ i))))))
     (set-buffer
      (apply 'make-comint buf-name program nil params))))
@@ -3980,6 +4122,8 @@
 	(setq params (append (list "-h" sql-server) params)))
     (if (not (string= "" sql-user))
 	(setq params (append (list "-U" sql-user) params)))
+    (if (not (= 0 sql-port))
+	(setq params (append (list "-p" sql-port) params)))
     (sql-comint product params)))
------------------------------------------------------------
revno: 101485
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Sun 2010-09-19 02:05:26 +0200
message:
  * lisp/emacs-lisp/warnings.el: Fix commenting convention.
  (display-warning): Use special mode and make the buffer read-only.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-18 17:23:12 +0000
+++ lisp/ChangeLog	2010-09-19 00:05:26 +0000
@@ -1,3 +1,8 @@
+2010-09-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* emacs-lisp/warnings.el: Fix commenting convention.
+	(display-warning): Use special mode and make the buffer read-only.
+
 2010-09-18  Jay Belanger  <jay.p.belanger@gmail.com>
 
 	* calc/calc-prog.el (calc-read-parse-table-part): Don't "fix" the

=== modified file 'lisp/emacs-lisp/warnings.el'
--- lisp/emacs-lisp/warnings.el	2010-01-13 08:35:10 +0000
+++ lisp/emacs-lisp/warnings.el	2010-09-19 00:05:26 +0000
@@ -119,9 +119,9 @@
   :type '(repeat (repeat symbol))
   :version "22.1")
 
-;;; The autoload cookie is so that programs can bind this variable
-;;; safely, testing the existing value, before they call one of the
-;;; warnings functions.
+;; The autoload cookie is so that programs can bind this variable
+;; safely, testing the existing value, before they call one of the
+;; warnings functions.
 ;;;###autoload
 (defvar warning-prefix-function nil
   "Function to generate warning prefixes.
@@ -132,9 +132,9 @@
 and the function can insert text in it.  This text becomes
 the beginning of the warning.")
 
-;;; The autoload cookie is so that programs can bind this variable
-;;; safely, testing the existing value, before they call one of the
-;;; warnings functions.
+;; The autoload cookie is so that programs can bind this variable
+;; safely, testing the existing value, before they call one of the
+;; warnings functions.
 ;;;###autoload
 (defvar warning-series nil
   "Non-nil means treat multiple `display-warning' calls as a series.
@@ -146,16 +146,16 @@
 also call that function before the next warning.")
 (put 'warning-series 'risky-local-variable t)
 
-;;; The autoload cookie is so that programs can bind this variable
-;;; safely, testing the existing value, before they call one of the
-;;; warnings functions.
+;; The autoload cookie is so that programs can bind this variable
+;; safely, testing the existing value, before they call one of the
+;; warnings functions.
 ;;;###autoload
 (defvar warning-fill-prefix nil
   "Non-nil means fill each warning text using this string as `fill-prefix'.")
 
-;;; The autoload cookie is so that programs can bind this variable
-;;; safely, testing the existing value, before they call one of the
-;;; warnings functions.
+;; The autoload cookie is so that programs can bind this variable
+;; safely, testing the existing value, before they call one of the
+;; warnings functions.
 ;;;###autoload
 (defvar warning-type-format (purecopy " (%s)")
   "Format for displaying the warning type in the warning message.
@@ -241,6 +241,8 @@
 	(with-current-buffer buffer
           ;; If we created the buffer, disable undo.
           (unless old
+            (special-mode)
+            (setq buffer-read-only t)
             (setq buffer-undo-list t))
 	  (goto-char (point-max))
 	  (when (and warning-series (symbolp warning-series))
@@ -248,6 +250,7 @@
 		  (prog1 (point-marker)
 		    (unless (eq warning-series t)
 		      (funcall warning-series)))))
+          (let ((inhibit-read-only t))
 	  (unless (bolp)
 	    (newline))
 	  (setq start (point))
@@ -262,7 +265,7 @@
 	    (let ((fill-prefix warning-fill-prefix)
 		  (fill-column 78))
 	      (fill-region start (point))))
-	  (setq end (point))
+            (setq end (point)))
 	  (when (and (markerp warning-series)
 		     (eq (marker-buffer warning-series) buffer))
 	    (goto-char warning-series)))
------------------------------------------------------------
revno: 101484
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Sat 2010-09-18 23:36:29 +0000
message:
  Merge changes made in Gnus trunk.
  
  nnimap.el (nnimap-request-group): Use the stored info for the dont-check case.
  nnimap.el: Use deffoo instead of defun for interface functions.
  gnus-int.el (gnus-request-group): Take an optional `info' parameter.
  nnimap.el: Allow nnimap-request-group to do a complete marks sync on `M-g'.
  nnimap.el: Get credentials for numerical equivalents of the port numbers.
  gnus-html.el (gnus-html-wash-tags): Add support for i, b and u HTML tags.
  nnimap.el (nnimap-update-info): Extend the info so that we can set the marks.
  nnimap.el (nnimap-open-connection): Fix typo -- should be 'shell, not 'stream.
  nnimap.el: Allow PREAUTH nnimap connections to log in without credentials.
  nnimap.el (nnimap-update-info): Fix off-by-one error when concatenating ranges when doing a partial update.
  gnus-html.el (gnus-html-schedule-image-fetching): Use `url' rather than curl to retrieve images.
  nnimap.el (nnimap-update-info): When doing partial marks update, get the range update right.
  nnimap.el (nnimap-wait-for-response): Be a bit more lax in finding the end of the command we're looking for.
  nnimap.el: Allow sending \n instead of \r\n on 'shell streams.
  gnus-html.el (gnus-html-schedule-image-fetching): Fetch all images in parallel.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-18 20:27:52 +0000
+++ lisp/gnus/ChangeLog	2010-09-18 23:36:29 +0000
@@ -1,6 +1,67 @@
-2010-09-18  Lars Magne Ingebrigtsen  <larsi@gnus.org>
-
-	* nnimap.el: Require nnoo and other files necessary.
+2010-09-18  Julien Danjou  <julien@danjou.info>
+
+	* gnus-html.el (gnus-html-schedule-image-fetching): Fetch all images in
+	parallel.
+
+2010-09-18  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* nnimap.el (nnimap-update-info): When doing partial marks update, get
+	the range update right.
+	(nnimap-request-group): Don't make `M-g' bug out on group with no
+	marks.
+	(nnoo): Required, so that other packages can require nnimap.
+	(nnimap-wait-for-response): Be a bit more lax in finding the end of the
+	command we're looking for.  This helps when the server sends more
+	responses after we've gotten everything we expected.
+	(nnimap): Add a `newlinep' field to keep track of end-of-line
+	conventions.
+	Don't send CRLF to things that don't want it.
+	(nnimap-request-accept-article): Ditto.
+
+2010-09-18  Julien Danjou  <julien@danjou.info>
+
+	* gnus-html.el (gnus-html-schedule-image-fetching): Use `url' rather
+	than curl to retrieve images.
+
+2010-09-18  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* nnimap.el (nnimap-update-info): Extend the info so that we can set
+	the marks.
+	(nnimap-open-connection): Fix typo -- should be 'shell, not 'stream.
+	(nnimap-wait-for-connection): New function.
+	(nnimap-open-connection): If we have PREAUTH, don't query for login
+	credentials.
+	(nnimap-update-info): Fix off-by-one error when concatenating ranges
+	when doing a partial update.
+
+2010-09-18  Julien Danjou  <julien@danjou.info>
+
+	* gnus-html.el (gnus-html-wash-tags): Add support for i, b and u HTML
+	tags.
+
+2010-09-18  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* nnimap.el (nnimap-credentials): New function.
+	(nnimap-open-connection): Use the new function to look for credentials
+	also on the numeric equivalents of "imap" and "imaps".
+
+	* gnus-start.el (gnus-activate-group): Send the info to
+	gnus-request-group.
+
+	* nnimap.el (nnimap-request-group): Have the "check" version of the
+	function parse flags and update the info, so that a `M-g' get a total
+	resync of all flags from the group.
+
+	* gnus-int.el (gnus-request-group): Take an optional `info' parameter
+	to allow backends to alter the info on group selection.  Also alter all
+	the backend -request-group functions to take the parameter.
+
+	* nnimap.el (nnimap-store-info): New function.
+	(nnimap-update-info): Store the info for later usage.
+	(nnimap-request-group): Use the stored info for the dont-check case, so
+	that we don't retrieve all marks when we enter a group.
+
+	* nnimap.el: Use deffoo instead of defun for interface functions.
 
 	* gnus-start.el (gnus-get-unread-articles): Allow the backends to
 	update the group info.  This makes the nndraft groups, for instance, go

=== modified file 'lisp/gnus/gnus-html.el'
--- lisp/gnus/gnus-html.el	2010-09-17 06:24:10 +0000
+++ lisp/gnus/gnus-html.el	2010-09-18 23:36:29 +0000
@@ -33,6 +33,7 @@
 
 (require 'gnus-art)
 (require 'mm-url)
+(require 'url)
 
 (defcustom gnus-html-cache-directory (nnheader-concat gnus-directory "html-cache/")
   "Where Gnus will cache images it downloads from the web."
@@ -253,6 +254,12 @@
        ((equal tag "IMG_ALT")
 	(delete-region start end))
        ;; Whatever.  Just ignore the tag.
+       ((equal tag "b")
+        (gnus-overlay-put (gnus-make-overlay start end) 'face 'bold))
+       ((equal tag "U")
+        (gnus-overlay-put (gnus-make-overlay start end) 'face 'underline))
+       ((equal tag "i")
+        (gnus-overlay-put (gnus-make-overlay start end) 'face 'italic))
        (t
 	))
       (goto-char start))
@@ -290,42 +297,32 @@
 (defun gnus-html-schedule-image-fetching (buffer images)
   (gnus-message 8 "gnus-html-schedule-image-fetching: buffer %s, images %s"
                 buffer images)
-  (when (executable-find "curl")
-    (let* ((url (caar images))
-	   (process (start-process
-		     "images" nil "curl"
-		     "-s" "--create-dirs"
-		     "--location"
-		     "--max-time" "60"
-		     "-o" (gnus-html-image-id url)
-		     (mm-url-decode-entities-string url))))
-      (gnus-set-process-query-on-exit-flag process nil)
-      (set-process-sentinel process 'gnus-html-curl-sentinel)
-      (gnus-set-process-plist process (list 'images images
-					    'buffer buffer)))))
+  (dolist (image images)
+    (url-retrieve (car image)
+                  'gnus-html-image-fetched
+                  (list buffer image))))
 
 (defun gnus-html-image-id (url)
   (expand-file-name (sha1 url) gnus-html-cache-directory))
 
-(defun gnus-html-curl-sentinel (process event)
-  (when (string-match "finished" event)
-    (let* ((images (gnus-process-get process 'images))
-	   (buffer (gnus-process-get process 'buffer))
-	   (spec (pop images))
-	   (file (gnus-html-image-id (car spec))))
-      (when (and (buffer-live-p buffer)
-		 ;; If the position of the marker is 1, then that
-		 ;; means that the text it was in has been deleted;
-		 ;; i.e., that the user has selected a different
-		 ;; article before the image arrived.
-		 (not (= (marker-position (cadr spec)) (point-min))))
-	(with-current-buffer buffer
-	  (let ((inhibit-read-only t)
-		(string (buffer-substring (cadr spec) (caddr spec))))
-	    (delete-region (cadr spec) (caddr spec))
-	    (gnus-html-put-image file (cadr spec) string))))
-      (when images
-	(gnus-html-schedule-image-fetching buffer images)))))
+(defun gnus-html-image-fetched (status buffer image)
+  (when (and (buffer-live-p buffer)
+             ;; If the position of the marker is 1, then that
+             ;; means that the text it was in has been deleted;
+             ;; i.e., that the user has selected a different
+             ;; article before the image arrived.
+             (not (= (marker-position (cadr image)) (point-min))))
+    (let ((file (gnus-html-image-id (car image))))
+      ;; Search the start of the image data
+      (search-forward "\n\n")
+      ;; Write region (image) silently
+      (write-region (point) (point-max) file nil 1)
+      (kill-buffer)
+      (with-current-buffer buffer
+        (let ((inhibit-read-only t)
+              (string (buffer-substring (cadr image) (caddr image))))
+          (delete-region (cadr image) (caddr image))
+          (gnus-html-put-image file (cadr image) string))))))
 
 (defun gnus-html-put-image (file point string &optional url alt-text)
   (when (gnus-graphic-display-p)

=== modified file 'lisp/gnus/gnus-int.el'
--- lisp/gnus/gnus-int.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/gnus-int.el	2010-09-18 23:36:29 +0000
@@ -375,7 +375,7 @@
   (funcall (gnus-get-function gnus-command-method 'request-compact)
 	   (nth 1 gnus-command-method)))
 
-(defun gnus-request-group (group &optional dont-check gnus-command-method)
+(defun gnus-request-group (group &optional dont-check gnus-command-method info)
   "Request GROUP.  If DONT-CHECK, no information is required."
   (let ((gnus-command-method
 	 (or gnus-command-method (inline (gnus-find-method-for-group group)))))
@@ -384,7 +384,8 @@
 	    (inline (gnus-server-to-method gnus-command-method))))
     (funcall (inline (gnus-get-function gnus-command-method 'request-group))
 	     (gnus-group-real-name group) (nth 1 gnus-command-method)
-	     dont-check)))
+	     dont-check
+	     info)))
 
 (defun gnus-list-active-group (group)
   "Request active information on GROUP."

=== modified file 'lisp/gnus/gnus-start.el'
--- lisp/gnus/gnus-start.el	2010-09-18 13:59:25 +0000
+++ lisp/gnus/gnus-start.el	2010-09-18 23:36:29 +0000
@@ -1536,10 +1536,12 @@
 	   t)
 	 (if (or debug-on-error debug-on-quit)
 	     (inline (gnus-request-group group (or dont-sub-check dont-check)
-					 method))
+					 method
+					 (gnus-get-info group)))
 	   (condition-case nil
 	       (inline (gnus-request-group group (or dont-sub-check dont-check)
-					   method))
+					   method
+					   (gnus-get-info group)))
 	     ;;(error nil)
 	     (quit
 	      (message "Quit activating %s" group)

=== modified file 'lisp/gnus/nnagent.el'
--- lisp/gnus/nnagent.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/nnagent.el	2010-09-18 23:36:29 +0000
@@ -190,9 +190,9 @@
 (deffoo nnagent-request-expire-articles (articles group &optional server force)
   articles)
 
-(deffoo nnagent-request-group (group &optional server dont-check)
+(deffoo nnagent-request-group (group &optional server dont-check info)
   (nnoo-parent-function 'nnagent 'nnml-request-group
-			(list group (nnagent-server server) dont-check)))
+			(list group (nnagent-server server) dont-check info)))
 
 (deffoo nnagent-close-group (group &optional server)
   (nnoo-parent-function 'nnagent 'nnml-close-group

=== modified file 'lisp/gnus/nnbabyl.el'
--- lisp/gnus/nnbabyl.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/nnbabyl.el	2010-09-18 23:36:29 +0000
@@ -191,7 +191,7 @@
 	      (cons nnbabyl-current-group article)
 	    (nnbabyl-article-group-number)))))))
 
-(deffoo nnbabyl-request-group (group &optional server dont-check)
+(deffoo nnbabyl-request-group (group &optional server dont-check info)
   (let ((active (cadr (assoc group nnbabyl-group-alist))))
     (save-excursion
       (cond

=== modified file 'lisp/gnus/nndiary.el'
--- lisp/gnus/nndiary.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/nndiary.el	2010-09-18 23:36:29 +0000
@@ -482,7 +482,7 @@
       (cons (if group-num (car group-num) group)
 	    (string-to-number (file-name-nondirectory path)))))))
 
-(deffoo nndiary-request-group (group &optional server dont-check)
+(deffoo nndiary-request-group (group &optional server dont-check info)
   (let ((file-name-coding-system nnmail-pathname-coding-system))
     (cond
      ((not (nndiary-possibly-change-directory group server))

=== modified file 'lisp/gnus/nndoc.el'
--- lisp/gnus/nndoc.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/nndoc.el	2010-09-18 23:36:29 +0000
@@ -264,7 +264,7 @@
 	    (funcall nndoc-article-transform-function article))
 	  t))))))
 
-(deffoo nndoc-request-group (group &optional server dont-check)
+(deffoo nndoc-request-group (group &optional server dont-check info)
   "Select news GROUP."
   (let (number)
     (cond

=== modified file 'lisp/gnus/nndraft.el'
--- lisp/gnus/nndraft.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/nndraft.el	2010-09-18 23:36:29 +0000
@@ -182,7 +182,7 @@
       (add-hook hook 'nndraft-generate-headers nil t))
     article))
 
-(deffoo nndraft-request-group (group &optional server dont-check)
+(deffoo nndraft-request-group (group &optional server dont-check info)
   (nndraft-possibly-change-group group)
   (unless dont-check
     (let* ((pathname (nnmail-group-pathname group nndraft-directory))

=== modified file 'lisp/gnus/nneething.el'
--- lisp/gnus/nneething.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/nneething.el	2010-09-18 23:36:29 +0000
@@ -144,7 +144,7 @@
 	     (insert "\n"))
 	   t))))
 
-(deffoo nneething-request-group (group &optional server dont-check)
+(deffoo nneething-request-group (group &optional server dont-check info)
   (nneething-possibly-change-directory group server)
   (unless dont-check
     (nneething-create-mapping)

=== modified file 'lisp/gnus/nnfolder.el'
--- lisp/gnus/nnfolder.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/nnfolder.el	2010-09-18 23:36:29 +0000
@@ -289,7 +289,7 @@
 				      (point) (point-at-eol)))
 		    -1))))))))
 
-(deffoo nnfolder-request-group (group &optional server dont-check)
+(deffoo nnfolder-request-group (group &optional server dont-check info)
   (nnfolder-possibly-change-group group server t)
   (save-excursion
     (cond ((not (assoc group nnfolder-group-alist))

=== modified file 'lisp/gnus/nnimap.el'
--- lisp/gnus/nnimap.el	2010-09-18 20:27:52 +0000
+++ lisp/gnus/nnimap.el	2010-09-18 23:36:29 +0000
@@ -67,6 +67,9 @@
 not done by default on servers that doesn't support that command.")
 
 (defvoo nnimap-connection-alist nil)
+
+(defvoo nnimap-current-infos nil)
+
 (defvar nnimap-process nil)
 
 (defvar nnimap-status-string "")
@@ -75,7 +78,7 @@
   "Internal variable with default value for `nnimap-split-download-body'.")
 
 (defstruct nnimap
-  group process commands capabilities)
+  group process commands capabilities select-result newlinep)
 
 (defvar nnimap-object nil)
 
@@ -95,7 +98,7 @@
 (defun nnimap-buffer ()
   (nnimap-find-process-buffer nntp-server-buffer))
 
-(defun nnimap-retrieve-headers (articles &optional group server fetch-old)
+(deffoo nnimap-retrieve-headers (articles &optional group server fetch-old)
   (with-current-buffer nntp-server-buffer
     (erase-buffer)
     (when (nnimap-possibly-change-group group server)
@@ -171,7 +174,7 @@
 	 result))
       (mapconcat #'identity (nreverse result) ",")))))
 
-(defun nnimap-open-server (server &optional defs)
+(deffoo nnimap-open-server (server &optional defs)
   (if (nnimap-server-opened server)
       t
     (unless (assq 'nnimap-address defs)
@@ -203,55 +206,69 @@
 				  ?p port)))))
     process))
 
+(defun nnimap-credentials (address ports)
+  (let (port credentials)
+    ;; Request the credentials from all ports, but only query on the
+    ;; last port if all the previous ones have failed.
+    (while (and (null credentials)
+		(setq port (pop ports)))
+      (setq credentials
+	    (auth-source-user-or-password
+	     '("login" "password") address port nil (null ports))))
+    credentials))
+
 (defun nnimap-open-connection (buffer)
   (with-current-buffer (nnimap-make-process-buffer buffer)
     (let* ((coding-system-for-read 'binary)
 	   (coding-system-for-write 'binary)
-	   (credentials
+	   (ports
 	    (cond
 	     ((eq nnimap-stream 'network)
-	      (open-network-stream "*nnimap*" (current-buffer) nnimap-address
-				   (or nnimap-server-port
-				       (if (netrc-find-service-number "imap")
-					   "imap"
-					 "143")))
-	      (auth-source-user-or-password
-	       '("login" "password") nnimap-address "imap" nil t))
-	     ((eq nnimap-stream 'stream)
+	      (open-network-stream
+	       "*nnimap*" (current-buffer) nnimap-address
+	       (or nnimap-server-port
+		   (if (netrc-find-service-number "imap")
+		       "imap"
+		     "143")))
+	      '("143" "imap"))
+	     ((eq nnimap-stream 'shell)
 	      (nnimap-open-shell-stream
 	       "*nnimap*" (current-buffer) nnimap-address
 	       (or nnimap-server-port "imap"))
-	      (auth-source-user-or-password
-	       '("login" "password") nnimap-address "imap" nil t))
+	      '("imap"))
 	     ((eq nnimap-stream 'ssl)
-	      (open-tls-stream "*nnimap*" (current-buffer) nnimap-address
-			       (or nnimap-server-port
-				   (if (netrc-find-service-number "imaps")
-				       "imaps"
-				     "993")))
-	      (or
-	       (auth-source-user-or-password
-		'("login" "password") nnimap-address "imap")
-	       (auth-source-user-or-password
-		'("login" "password") nnimap-address "imaps" nil t))))))
+	      (open-tls-stream
+	       "*nnimap*" (current-buffer) nnimap-address
+	       (or nnimap-server-port
+		   (if (netrc-find-service-number "imaps")
+		       "imaps"
+		     "993")))
+	      '("143" "993" "imap" "imaps"))))
+	   connection-result login-result credentials)
       (setf (nnimap-process nnimap-object)
 	    (get-buffer-process (current-buffer)))
-      (unless credentials
-	(delete-process (nnimap-process nnimap-object)))
       (when (and (nnimap-process nnimap-object)
 		 (memq (process-status (nnimap-process nnimap-object))
 		       '(open run)))
 	(gnus-set-process-query-on-exit-flag (nnimap-process nnimap-object) nil)
-	(let ((result (nnimap-command "LOGIN %S %S"
-				      (car credentials) (cadr credentials))))
-	  (if (not (car result))
-	      (progn
+	(when (setq connection-result (nnimap-wait-for-connection))
+	  (unless (equal connection-result "PREAUTH")
+	    (if (not (setq credentials
+			   (nnimap-credentials nnimap-address ports)))
+		(setq nnimap-object nil)
+	      (setq login-result (nnimap-command "LOGIN %S %S"
+						 (car credentials)
+						 (cadr credentials)))
+	      (unless (car login-result)
 		(delete-process (nnimap-process nnimap-object))
-		nil)
+		(setq nnimap-object nil))))
+	  (when nnimap-object
+	    (when (eq nnimap-stream 'shell)
+	      (setf (nnimap-newlinep nnimap-object) t))
 	    (setf (nnimap-capabilities nnimap-object)
 		  (mapcar
 		   #'upcase
-		   (or (nnimap-find-parameter "CAPABILITY" (cdr result))
+		   (or (nnimap-find-parameter "CAPABILITY" (cdr login-result))
 		       (nnimap-find-parameter
 			"CAPABILITY" (cdr (nnimap-command "CAPABILITY"))))))
 	    (when (member "QRESYNC" (nnimap-capabilities nnimap-object))
@@ -270,22 +287,22 @@
 	(setq result (cdr (cadr elem))))))
     result))
 
-(defun nnimap-close-server (&optional server)
-  t)
-
-(defun nnimap-request-close ()
-  t)
-
-(defun nnimap-server-opened (&optional server)
+(deffoo nnimap-close-server (&optional server)
+  t)
+
+(deffoo nnimap-request-close ()
+  t)
+
+(deffoo nnimap-server-opened (&optional server)
   (and (nnoo-current-server-p 'nnimap server)
        nntp-server-buffer
        (gnus-buffer-live-p nntp-server-buffer)
        (nnimap-find-connection nntp-server-buffer)))
 
-(defun nnimap-status-message (&optional server)
+(deffoo nnimap-status-message (&optional server)
   nnimap-status-string)
 
-(defun nnimap-request-article (article &optional group server to-buffer)
+(deffoo nnimap-request-article (article &optional group server to-buffer)
   (with-current-buffer nntp-server-buffer
     (let ((result (nnimap-possibly-change-group group server)))
       (when (stringp article)
@@ -314,21 +331,46 @@
 		(nnheader-ms-strip-cr))
 	      t)))))))
 
-(defun nnimap-request-group (group &optional server dont-check)
+(deffoo nnimap-request-group (group &optional server dont-check info)
   (with-current-buffer nntp-server-buffer
     (let ((result (nnimap-possibly-change-group group server))
-	  articles)
+	  articles active marks high low)
       (when result
-	(setq articles (nnimap-get-flags "1:*"))
-	(erase-buffer)
-	(insert
-	 (format
-	  "211 %d %d %d %S\n"
-	  (length articles)
-	  (or (caar articles) 0)
-	  (or (caar (last articles)) 0)
-	  group))
-	t))))
+	(if (and dont-check
+		 (setq active (nth 2 (assoc group nnimap-current-infos))))
+	    (insert (format "211 %d %d %d %S\n"
+			    (- (cdr active) (car active))
+			    (car active)
+			    (cdr active)
+			    group))
+	  (with-current-buffer (nnimap-buffer)
+	    (erase-buffer)
+	    (let ((group-sequence
+		   (nnimap-send-command "SELECT %S" (utf7-encode group)))
+		  (flag-sequence
+		   (nnimap-send-command "UID FETCH 1:* FLAGS")))
+	      (nnimap-wait-for-response flag-sequence)
+	      (setq marks
+		    (nnimap-flags-to-marks
+		     (nnimap-parse-flags
+		      (list (list group-sequence flag-sequence 1 group)))))
+	      (when info
+		(nnimap-update-infos marks (list info)))
+	      (goto-char (point-max))
+	      (cond
+	       (marks
+		(setq high (nth 3 (car marks))
+		      low (nth 4 (car marks))))
+	       ((re-search-backward "UIDNEXT \\([0-9]+\\)" nil t)
+		(setq high (string-to-number (match-string 1))
+		      low 1)))))
+	  (erase-buffer)
+	  (insert
+	   (format
+	    "211 %d %d %d %S\n"
+	    (1+ (- high low))
+	    low high group))))
+      t)))
 
 (defun nnimap-get-flags (spec)
   (let ((articles nil)
@@ -345,7 +387,7 @@
 	      articles)))
     (nreverse articles)))
 
-(defun nnimap-close-group (group &optional server)
+(deffoo nnimap-close-group (group &optional server)
   t)
 
 (deffoo nnimap-request-move-article (article group server accept-form
@@ -417,7 +459,7 @@
 	(push flag flags)))
     flags))
 
-(defun nnimap-request-set-mark (group actions &optional server)
+(deffoo nnimap-request-set-mark (group actions &optional server)
   (when (nnimap-possibly-change-group group server)
     (let (sequence)
       (with-current-buffer (nnimap-buffer)
@@ -449,7 +491,10 @@
 			"APPEND %S {%d}" (utf7-encode group t)
 			(length message)))
 	(process-send-string (get-buffer-process (current-buffer)) message)
-	(process-send-string (get-buffer-process (current-buffer)) "\r\n")
+	(process-send-string (get-buffer-process (current-buffer))
+			     (if (nnimap-newlinep nnimap-object)
+				 "\n"
+			       "\r\n"))
 	(let ((result (nnimap-get-response sequence)))
 	  (when result
 	    (cons group
@@ -471,7 +516,7 @@
 	  (push (car (last line)) groups)))
       (nreverse groups))))
 
-(defun nnimap-request-list (&optional server)
+(deffoo nnimap-request-list (&optional server)
   (nnimap-possibly-change-group nil server)
   (with-current-buffer nntp-server-buffer
     (erase-buffer)
@@ -514,7 +559,7 @@
 				  (or highest exists)))))))))
 	t))))
 
-(defun nnimap-retrieve-group-data-early (server infos)
+(deffoo nnimap-retrieve-group-data-early (server infos)
   (when (nnimap-possibly-change-group nil server)
     (with-current-buffer (nnimap-buffer)
       ;; QRESYNC handling isn't implemented.
@@ -554,7 +599,7 @@
 		    sequences))))
 	sequences))))
 
-(defun nnimap-finish-retrieve-group-infos (server infos sequences)
+(deffoo nnimap-finish-retrieve-group-infos (server infos sequences)
   (when (and sequences
 	     (nnimap-possibly-change-group nil server))
     (with-current-buffer (nnimap-buffer)
@@ -601,9 +646,11 @@
 	  (when (> start-article 1)
 	    (setq read
 		  (gnus-range-nconcat
-		   (gnus-sorted-range-intersection
-		    (cons 1 start-article)
-		    (gnus-info-read info))
+		   (if (> start-article 1)
+		       (gnus-sorted-range-intersection
+			(cons 1 (1- start-article))
+			(gnus-info-read info))
+		     (gnus-info-read info))
 		   read)))
 	  (gnus-info-set-read info read)
 	  ;; Update the marks.
@@ -622,12 +669,20 @@
 	      (when (and old-marks
 			 (> start-article 1))
 		(setq old-marks (gnus-range-difference
-				 (cons start-article high)
-				 old-marks))
+				 old-marks
+				 (cons start-article high)))
 		(setq new-marks (gnus-range-nconcat old-marks new-marks)))
 	      (when new-marks
 		(push (cons (car type) new-marks) marks)))
-	    (gnus-info-set-marks info marks)))))))
+	    (gnus-info-set-marks info marks t)
+	    (nnimap-store-info info (gnus-active group))))))))
+
+(defun nnimap-store-info (info active)
+  (let* ((group (gnus-group-real-name (gnus-info-group info)))
+	 (entry (assoc group nnimap-current-infos)))
+    (if entry
+	(setcdr entry (list info active))
+      (push (list group info active) nnimap-current-infos))))
 
 (defun nnimap-flags-to-marks (groups)
   (let (data group totalp uidnext articles start-article mark)
@@ -681,7 +736,7 @@
 (defun nnimap-find-process-buffer (buffer)
   (cadr (assoc buffer nnimap-connection-alist)))
 
-(defun nnimap-request-post (&optional server)
+(deffoo nnimap-request-post (&optional server)
   (setq nnimap-status-string "Read-only server")
   nil)
 
@@ -701,7 +756,8 @@
 	    t
 	  (let ((result (nnimap-command "SELECT %S" (utf7-encode group t))))
 	    (when (car result)
-	      (setf (nnimap-group nnimap-object) group)
+	      (setf (nnimap-group nnimap-object) group
+		    (nnimap-select-result nnimap-object) result)
 	      result))))))))
 
 (defun nnimap-find-connection (buffer)
@@ -722,9 +778,12 @@
   (process-send-string
    (get-buffer-process (current-buffer))
    (nnimap-log-command
-    (format "%d %s\r\n"
+    (format "%d %s%s\n"
 	    (incf nnimap-sequence)
-	    (apply #'format args))))
+	    (apply #'format args)
+	    (if (nnimap-newlinep nnimap-object)
+		""
+	      "\r"))))
   nnimap-sequence)
 
 (defun nnimap-log-command (command)
@@ -747,12 +806,22 @@
   (nnimap-wait-for-response sequence)
   (nnimap-parse-response))
 
+(defun nnimap-wait-for-connection ()
+  (let ((process (get-buffer-process (current-buffer))))
+    (goto-char (point-min))
+    (while (and (memq (process-status process)
+		      '(open run))
+		(not (re-search-forward "^\\* " nil t)))
+      (nnheader-accept-process-output process)
+      (goto-char (point-min)))
+    (and (looking-at "[A-Z0-9]+")
+	 (match-string 0))))
+
 (defun nnimap-wait-for-response (sequence &optional messagep)
   (goto-char (point-max))
-  (while (or (bobp)
-	     (progn
-	       (forward-line -1)
-	       (not (looking-at (format "^%d .*\n" sequence)))))
+  (while (not (re-search-backward (format "^%d .*\n" sequence)
+				  (max (point-min) (- (point) 500))
+				  t))
     (when messagep
       (message "Read %dKB" (/ (buffer-size) 1000)))
     (nnheader-accept-process-output (get-buffer-process (current-buffer)))

=== modified file 'lisp/gnus/nnir.el'
--- lisp/gnus/nnir.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/nnir.el	2010-09-18 23:36:29 +0000
@@ -733,7 +733,7 @@
   ;; Just set the server variables appropriately.
   (nnoo-change-server 'nnir server definitions))
 
-(deffoo nnir-request-group (group &optional server fast)
+(deffoo nnir-request-group (group &optional server fast info)
   "GROUP is the query string."
   (nnir-possibly-change-server server)
   ;; Check for cache and return that if appropriate.

=== modified file 'lisp/gnus/nnmaildir.el'
--- lisp/gnus/nnmaildir.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/nnmaildir.el	2010-09-18 23:36:29 +0000
@@ -983,7 +983,7 @@
       (setf (nnmaildir--grp-mmth group) new-mmth)
       info)))
 
-(defun nnmaildir-request-group (gname &optional server fast)
+(defun nnmaildir-request-group (gname &optional server fast info)
   (let ((group (nnmaildir--prepare server gname))
 	deactivate-mark)
     (catch 'return

=== modified file 'lisp/gnus/nnmairix.el'
--- lisp/gnus/nnmairix.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/nnmairix.el	2010-09-18 23:36:29 +0000
@@ -424,7 +424,7 @@
   (setq nnmairix-current-server server)
   (nnoo-change-server 'nnmairix server definitions))
 
-(deffoo nnmairix-request-group (group &optional server fast)
+(deffoo nnmairix-request-group (group &optional server fast info)
   ;; Call mairix and request group on back end server
   (when server (nnmairix-open-server server))
   (let* ((qualgroup (if server

=== modified file 'lisp/gnus/nnmbox.el'
--- lisp/gnus/nnmbox.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/nnmbox.el	2010-09-18 23:36:29 +0000
@@ -172,7 +172,7 @@
 	      (cons nnmbox-current-group article)
 	    (nnmbox-article-group-number nil)))))))
 
-(deffoo nnmbox-request-group (group &optional server dont-check)
+(deffoo nnmbox-request-group (group &optional server dont-check info)
   (nnmbox-possibly-change-newsgroup nil server)
   (let ((active (cadr (assoc group nnmbox-group-alist))))
     (cond

=== modified file 'lisp/gnus/nnmh.el'
--- lisp/gnus/nnmh.el	2010-09-05 04:09:07 +0000
+++ lisp/gnus/nnmh.el	2010-09-18 23:36:29 +0000
@@ -149,7 +149,7 @@
 	 (save-excursion (nnmail-find-file file))
 	 (string-to-number (file-name-nondirectory file)))))
 
-(deffoo nnmh-request-group (group &optional server dont-check)
+(deffoo nnmh-request-group (group &optional server dont-check info)
   (nnheader-init-server-buffer)
   (nnmh-possibly-change-directory group server)
   (let ((pathname (nnmail-group-pathname group nnmh-directory))

=== modified file 'lisp/gnus/nnml.el'
--- lisp/gnus/nnml.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/nnml.el	2010-09-18 23:36:29 +0000
@@ -254,7 +254,7 @@
       (cons (if group-num (car group-num) group)
 	    (string-to-number (file-name-nondirectory path)))))))
 
-(deffoo nnml-request-group (group &optional server dont-check)
+(deffoo nnml-request-group (group &optional server dont-check info)
   (let ((file-name-coding-system nnmail-pathname-coding-system)
 	(decoded (nnml-decoded-group-name group server)))
     (cond

=== modified file 'lisp/gnus/nnnil.el'
--- lisp/gnus/nnnil.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/nnnil.el	2010-09-18 23:36:29 +0000
@@ -56,7 +56,7 @@
   (setq nnnil-status-string "No such group")
   nil)
 
-(defun nnnil-request-group (group &optional server fast)
+(defun nnnil-request-group (group &optional server fast info)
   (let (deactivate-mark)
     (with-current-buffer nntp-server-buffer
       (erase-buffer)

=== modified file 'lisp/gnus/nnrss.el'
--- lisp/gnus/nnrss.el	2010-09-17 14:22:06 +0000
+++ lisp/gnus/nnrss.el	2010-09-18 23:36:29 +0000
@@ -178,7 +178,7 @@
 		    "\n")))))
   'nov)
 
-(deffoo nnrss-request-group (group &optional server dont-check)
+(deffoo nnrss-request-group (group &optional server dont-check info)
   (setq group (nnrss-decode-group-name group))
   (nnheader-message 6 "nnrss: Requesting %s..." group)
   (nnrss-possibly-change-group group server)

=== modified file 'lisp/gnus/nnspool.el'
--- lisp/gnus/nnspool.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/nnspool.el	2010-09-18 23:36:29 +0000
@@ -226,7 +226,7 @@
 	(nnheader-fold-continuation-lines)))
     res))
 
-(deffoo nnspool-request-group (group &optional server dont-check)
+(deffoo nnspool-request-group (group &optional server dont-check info)
   "Select news GROUP."
   (let ((pathname (nnspool-article-pathname group))
 	dir)

=== modified file 'lisp/gnus/nntp.el'
--- lisp/gnus/nntp.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/nntp.el	2010-09-18 23:36:29 +0000
@@ -987,7 +987,7 @@
     "\r?\n\\.\r?\n" "BODY"
     (if (numberp article) (int-to-string article) article))))
 
-(deffoo nntp-request-group (group &optional server dont-check)
+(deffoo nntp-request-group (group &optional server dont-check info)
   (nntp-with-open-group
     nil server
     (when (nntp-send-command "^[245].*\n" "GROUP" group)

=== modified file 'lisp/gnus/nnvirtual.el'
--- lisp/gnus/nnvirtual.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/nnvirtual.el	2010-09-18 23:36:29 +0000
@@ -247,7 +247,7 @@
       t)))
 
 
-(deffoo nnvirtual-request-group (group &optional server dont-check)
+(deffoo nnvirtual-request-group (group &optional server dont-check info)
   (nnvirtual-possibly-change-server server)
   (setq nnvirtual-component-groups
 	(delete (nnvirtual-current-group) nnvirtual-component-groups))

=== modified file 'lisp/gnus/nnweb.el'
--- lisp/gnus/nnweb.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/nnweb.el	2010-09-18 23:36:29 +0000
@@ -124,7 +124,7 @@
     (nnweb-write-active)
     (nnweb-write-overview group)))
 
-(deffoo nnweb-request-group (group &optional server dont-check)
+(deffoo nnweb-request-group (group &optional server dont-check info)
   (nnweb-possibly-change-server group server)
   (unless (or nnweb-ephemeral-p
 	      dont-check
------------------------------------------------------------
revno: 101483
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Sat 2010-09-18 13:54:55 -0700
message:
  Fix ChangeLog typo, mea culpa.
diff:
=== modified file 'lisp/url/ChangeLog'
--- lisp/url/ChangeLog	2010-09-18 20:49:25 +0000
+++ lisp/url/ChangeLog	2010-09-18 20:54:55 +0000
@@ -1,6 +1,6 @@
 2010-09-18  Julien Danjou  <julien@danjou.info>
 
-	* url-vars.el (url-automatic-caching): Remove unused variable.
+	* url-vars.el (url-cache-expired): Remove unused variable.
 
 2010-09-14  Julien Danjou  <julien@danjou.info>
------------------------------------------------------------
revno: 101482
author: Julien Danjou <julien@danjou.info>
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Sat 2010-09-18 13:49:25 -0700
message:
  * lisp/url/url-vars.el (url-automatic-caching): Remove unused variable.
diff:
=== modified file 'lisp/url/ChangeLog'
--- lisp/url/ChangeLog	2010-09-14 14:41:53 +0000
+++ lisp/url/ChangeLog	2010-09-18 20:49:25 +0000
@@ -1,3 +1,7 @@
+2010-09-18  Julien Danjou  <julien@danjou.info>
+
+	* url-vars.el (url-automatic-caching): Remove unused variable.
+
 2010-09-14  Julien Danjou  <julien@danjou.info>
 
 	* url-cache (url-store-in-cache): Make `buff' argument really optional.

=== modified file 'lisp/url/url-vars.el'
--- lisp/url/url-vars.el	2010-09-11 01:58:42 +0000
+++ lisp/url/url-vars.el	2010-09-18 20:49:25 +0000
@@ -83,15 +83,6 @@
   :type 'boolean
   :group 'url-cache)
 
-;; Fixme: sanitize this.
-(defcustom url-cache-expired
-  (lambda (t1 t2) (>= (- (car t2) (car t1)) 5))
-  "A function determining if a cached item has expired.
-It takes two times (numbers) as its arguments, and returns non-nil if
-the second time is 'too old' when compared to the first time."
-  :type 'function
-  :group 'url-cache)
-
 (defconst url-bug-address "bug-gnu-emacs@gnu.org"
   "Where to send bug reports.")
------------------------------------------------------------
revno: 101481
committer: Lars Magne Ingebrigtsen <larsi@gnus.org>
branch nick: trunk
timestamp: Sat 2010-09-18 22:27:52 +0200
message:
  * nnimap.el: Require nnoo and other files necessary.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-18 13:59:25 +0000
+++ lisp/gnus/ChangeLog	2010-09-18 20:27:52 +0000
@@ -1,5 +1,7 @@
 2010-09-18  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* nnimap.el: Require nnoo and other files necessary.
+
 	* gnus-start.el (gnus-get-unread-articles): Allow the backends to
 	update the group info.  This makes the nndraft groups, for instance, go
 	back to their old behaviour.

=== modified file 'lisp/gnus/nnimap.el'
--- lisp/gnus/nnimap.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/nnimap.el	2010-09-18 20:27:52 +0000
@@ -32,6 +32,10 @@
 (eval-when-compile
   (require 'cl))
 
+(require 'nnheader)
+(require 'gnus-util)
+(require 'gnus)
+(require 'nnoo)
 (require 'netrc)
 
 (nnoo-declare nnimap)
------------------------------------------------------------
revno: 101480
committer: Jay Belanger <jay.p.belanger@gmail.com>
branch nick: trunk
timestamp: Sat 2010-09-18 12:23:12 -0500
message:
  calc-prog.el (calc-read-parse-table-part): Don't "fix" the empty
  string when it follows a repeated or optional pattern.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-18 16:21:16 +0000
+++ lisp/ChangeLog	2010-09-18 17:23:12 +0000
@@ -1,3 +1,8 @@
+2010-09-18  Jay Belanger  <jay.p.belanger@gmail.com>
+
+	* calc/calc-prog.el (calc-read-parse-table-part): Don't "fix" the
+	empty string when it follows a repeated or optional pattern.
+
 2010-09-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* indent.el (indent-according-to-mode): Apply syntax-propertize.

=== modified file 'lisp/calc/calc-prog.el'
--- lisp/calc/calc-prog.el	2010-01-13 08:35:10 +0000
+++ lisp/calc/calc-prog.el	2010-09-18 17:23:12 +0000
@@ -627,7 +627,8 @@
 			(error "Separator not allowed with { ... }?"))
 		   (if (string-match "\\`\"" sep)
 		       (setq sep (read-from-string sep)))
-		   (setq sep (calc-fix-token-name sep))
+                   (if (> (length sep) 0)
+                       (setq sep (calc-fix-token-name sep)))
 		   (setq part (nconc part
 				     (list (list sym p
 						 (and (> (length sep) 0)
------------------------------------------------------------
revno: 101479
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Sat 2010-09-18 18:21:16 +0200
message:
  * lisp/indent.el (indent-according-to-mode): Apply syntax-propertize.
  (indent-region): Use indent-according-to-mode.
  * test/indent/octave.m: Remove one more `fixindent'.  Use `end'.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-18 09:38:52 +0000
+++ lisp/ChangeLog	2010-09-18 16:21:16 +0000
@@ -1,3 +1,8 @@
+2010-09-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* indent.el (indent-according-to-mode): Apply syntax-propertize.
+	(indent-region): Use indent-according-to-mode.
+
 2010-09-18  Eli Zaretskii  <eliz@gnu.org>
 
 	* fringe.el (fringe-mode): Doc fix.

=== modified file 'lisp/indent.el'
--- lisp/indent.el	2010-08-29 16:17:13 +0000
+++ lisp/indent.el	2010-09-18 16:21:16 +0000
@@ -68,6 +68,7 @@
 but the functions `indent-relative' and `indent-relative-maybe' are
 special; we don't actually use them here."
   (interactive)
+  (syntax-propertize (line-end-position))
   (if (memq indent-line-function
 	    '(indent-relative indent-relative-maybe))
       ;; These functions are used for tabbing, but can't be used for
@@ -418,7 +419,7 @@
 	    (goto-char start)
 	    (while (< (point) end)
 	      (or (and (bolp) (eolp))
-		  (funcall indent-line-function))
+		  (indent-according-to-mode))
 	      (forward-line 1))
 	    (move-marker end nil))))
     (setq column (prefix-numeric-value column))

=== modified file 'test/ChangeLog'
--- test/ChangeLog	2010-09-10 23:13:42 +0000
+++ test/ChangeLog	2010-09-18 16:21:16 +0000
@@ -1,3 +1,7 @@
+2010-09-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* indent/octave.m: Remove one more `fixindent'.  Use `end'.
+
 2010-09-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* indent/octave.m: Remove some `fixindent' not needed any more.

=== modified file 'test/indent/octave.m'
--- test/indent/octave.m	2010-09-10 23:13:42 +0000
+++ test/indent/octave.m	2010-09-18 16:21:16 +0000
@@ -6,7 +6,7 @@
 	 
   if nargin ~= 1
     print_usage()
-  endif
+  end
 
   data = dlmread(fn, 3, 0);
 
@@ -1412,7 +1412,7 @@
     for i = 1:length (lst)
       nam = fullfile (packdir, "inst", lst(i).name);
       fwrite (instfid, extract_pkg (nam, ['^[#%][#%]* *' nm ': *(.*)$']));
-    endfor                                   # fixindent
+    endfor
 
     ## Search all C++ source files for PKG commands.
     lst = dir (fullfile (packdir, "src", "*.cc"));
------------------------------------------------------------
revno: 101478
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Sat 2010-09-18 17:50:06 +0200
message:
  * lispref/text.texi (Special Properties): Clarify when modification-hooks run.
diff:
=== modified file 'doc/lispref/ChangeLog'
--- doc/lispref/ChangeLog	2010-09-11 13:58:57 +0000
+++ doc/lispref/ChangeLog	2010-09-18 15:50:06 +0000
@@ -1,3 +1,7 @@
+2010-09-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* text.texi (Special Properties): Clarify when modification-hooks run.
+
 2010-09-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* syntax.texi (Syntax Flags): Document new `c' flag.

=== modified file 'doc/lispref/text.texi'
--- doc/lispref/text.texi	2010-09-10 16:44:35 +0000
+++ doc/lispref/text.texi	2010-09-18 15:50:06 +0000
@@ -3230,12 +3230,16 @@
 @cindex hooks for changing a character
 @kindex modification-hooks @r{(text property)}
 If a character has the property @code{modification-hooks}, then its
-value should be a list of functions; modifying that character calls all
-of those functions.  Each function receives two arguments: the beginning
-and end of the part of the buffer being modified.  Note that if a
-particular modification hook function appears on several characters
-being modified by a single primitive, you can't predict how many times
-the function will be called.
+value should be a list of functions; modifying that character calls
+all of those functions before the actual modification.  Each function
+receives two arguments: the beginning and end of the part of the
+buffer being modified.  Note that if a particular modification hook
+function appears on several characters being modified by a single
+primitive, you can't predict how many times the function will
+be called.
+Furthermore, insertion will not modify any existing character, so this
+hook will only be run when removing some characters, replacing them
+with others, or changing their text-properties.
 
 If these functions modify the buffer, they should bind
 @code{inhibit-modification-hooks} to @code{t} around doing so, to
------------------------------------------------------------
revno: 101477
committer: Eli Zaretskii <eliz@gnu.org>
branch nick: trunk
timestamp: Sat 2010-09-18 16:23:29 +0200
message:
  src/Changelog: Merge two last entries.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-09-18 14:13:09 +0000
+++ src/ChangeLog	2010-09-18 14:23:29 +0000
@@ -2,8 +2,6 @@
 
 	* deps.mk (xml.o): Add dependencies.
 
-2010-09-18  Eli Zaretskii  <eliz@gnu.org>
-
 	* xdisp.c (Fcurrent_bidi_paragraph_direction): Call
 	bidi_paragraph_init with NO_DEFAULT_P non-zero.  (Bug#7038)
------------------------------------------------------------
revno: 101476 [merge]
committer: Eli Zaretskii <eliz@gnu.org>
branch nick: trunk
timestamp: Sat 2010-09-18 16:13:09 +0200
message:
  Fix MSDOS build broken by revno 101403, support MSDOS build with libxml2.
  
   config.bat: Detect that libxml2 is installed and if so, build with it.
   src/deps.mk (xml.o): Add dependencies.
   msdos/sed1v2.inp (LIBXML2_LIBS, LIBXML2_CFLAGS): Edit to empty.
diff:
=== modified file 'ChangeLog'
--- ChangeLog	2010-09-13 14:58:48 +0000
+++ ChangeLog	2010-09-18 13:57:06 +0000
@@ -1,3 +1,8 @@
+2010-09-18  Eli Zaretskii  <eliz@gnu.org>
+
+	* config.bat: Detect that libxml2 is installed and if so, build
+	with it.
+
 2010-09-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* configure.in (HAVE_LIBXML2): Check that the libxml2 we found can

=== modified file 'config.bat'
--- config.bat	2010-09-04 07:30:14 +0000
+++ config.bat	2010-09-18 13:57:06 +0000
@@ -38,6 +38,7 @@
 set nodebug=
 set djgpp_ver=
 set sys_malloc=
+set libxml=
 if "%1" == "" goto usage
 rem   ----------------------------------------------------------------------
 rem   See if their environment is large enough.  We need 28 bytes.
@@ -175,6 +176,24 @@
 rem For details see lisp.h where it defines USE_LSB_TAG
 echo #define NO_DECL_ALIGN >>config.h2
 :alignOk
+Rem See if they have libxml2 later than v2.2.0 installed
+Echo Checking whether libxml2 v2.2.1 or later is installed ...
+rm -f junk.c junk.o junk junk.exe
+rem Use djecho here because we need to quote brackets
+djecho "#include <libxml/xmlversion.h>"             >junk.c
+djecho "int main()"                                 >>junk.c
+djecho "{return (LIBXML_VERSION > 20200 ? 0 : 1);}" >>junk.c
+redir -o Nul -eo gcc -I/dev/env/DJDIR/include/libxml2 -o junk junk.c
+if not exist junk Goto xmlDone
+if not exist junk.exe coff2exe junk
+junk
+If ErrorLevel 1 Goto xmlDone
+Echo Configuring with libxml2 ...
+sed -e "/#undef HAVE_LIBXML2/s/^.*$/#define HAVE_LIBXML2 1/" <config.h2 >config.h3
+mv config.h3 config.h2
+set libxml=1
+:xmlDone
+rm -f junk.c junk junk.exe
 Rem See if they requested a SYSTEM_MALLOC build
 if "%sys_malloc%" == "" Goto cfgDone
 rm -f config.tmp
@@ -213,6 +232,12 @@
 sed -e "/^LDFLAGS *=/s/=/=-s/" <makefile.tmp >Makefile
 rm -f makefile.tmp
 :src6
+
+if "%libxml%" == "" goto src7
+sed -e "/^LIBXML2_LIBS *=/s/=/= -lxml2 -lz -liconv/" <Makefile >makefile.tmp
+sed -e "/^LIBXML2_CFLAGS *=/s|=|= -I/dev/env/DJDIR/include/libxml2|" <makefile.tmp >Makefile
+rm -f makefile.tmp
+:src7
 cd ..
 rem   ----------------------------------------------------------------------
 Echo Configuring the library source directory...
@@ -289,6 +314,7 @@
 set nodebug=
 set djgpp_ver=
 set sys_malloc=
+set libxml=
 
 goto skipArchTag
    arch-tag: 2d2fed23-4dc6-4006-a2e4-49daf0031f33

=== modified file 'msdos/ChangeLog'
--- msdos/ChangeLog	2010-08-27 09:29:32 +0000
+++ msdos/ChangeLog	2010-09-17 12:44:56 +0000
@@ -1,3 +1,7 @@
+2010-09-17  Eli Zaretskii  <eliz@gnu.org>
+
+	* sed1v2.inp (LIBXML2_LIBS, LIBXML2_CFLAGS): Edit to empty.
+
 2010-08-22  Chong Yidong  <cyd@stupidchicken.com>
 
 	* sedleim.inp (RUN-EMACS): Don't use --multibyte.

=== modified file 'msdos/sed1v2.inp'
--- msdos/sed1v2.inp	2010-08-20 20:26:12 +0000
+++ msdos/sed1v2.inp	2010-09-17 12:44:56 +0000
@@ -90,6 +90,8 @@
 /^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@//
 /^IMAGEMAGICK_LIBS *=/s/@IMAGEMAGICK_LIBS@//
 /^IMAGEMAGICK_CFLAGS *=/s/@IMAGEMAGICK_CFLAGS@//
+/^LIBXML2_LIBS *=/s/@LIBXML2_LIBS@//
+/^LIBXML2_CFLAGS *=/s/@LIBXML2_CFLAGS@//
 /^WIDGET_OBJ *=/s/@WIDGET_OBJ@//
 /^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@//
 /^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o w16select.o/

=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-09-18 11:59:53 +0000
+++ src/ChangeLog	2010-09-18 14:13:09 +0000
@@ -1,5 +1,9 @@
 2010-09-18  Eli Zaretskii  <eliz@gnu.org>
 
+	* deps.mk (xml.o): Add dependencies.
+
+2010-09-18  Eli Zaretskii  <eliz@gnu.org>
+
 	* xdisp.c (Fcurrent_bidi_paragraph_direction): Call
 	bidi_paragraph_init with NO_DEFAULT_P non-zero.  (Bug#7038)
 

=== modified file 'src/deps.mk'
--- src/deps.mk	2010-08-22 17:18:52 +0000
+++ src/deps.mk	2010-09-18 14:09:40 +0000
@@ -230,6 +230,7 @@
    charset.h keyboard.h $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h \
    systime.h gtkutil.h msdos.h coding.h menu.h lisp.h $(config_h) composite.h \
    keymap.h sysselect.h
+xml.o: xml.c buffer.h lisp.h $(config_h)
 xterm.o: xterm.c xterm.h termhooks.h termopts.h termchar.h window.h buffer.h \
    dispextern.h frame.h disptab.h blockinput.h atimer.h systime.h syssignal.h \
    keyboard.h emacs-icon.h character.h charset.h ccl.h fontset.h composite.h \
------------------------------------------------------------
revno: 101475
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Sat 2010-09-18 13:59:25 +0000
message:
  gnus-start.el (gnus-get-unread-articles): Allow the backends to update the group info.  This makes the nndraft groups, for instance, go back to their old behaviour.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-18 10:21:30 +0000
+++ lisp/gnus/ChangeLog	2010-09-18 13:59:25 +0000
@@ -1,5 +1,9 @@
 2010-09-18  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* gnus-start.el (gnus-get-unread-articles): Allow the backends to
+	update the group info.  This makes the nndraft groups, for instance, go
+	back to their old behaviour.
+
 	* gnus-sum.el (gnus-select-newsgroup): Indent.
 
 	* nnimap.el (nnimap-possibly-change-group): Return nil if we can't log

=== modified file 'lisp/gnus/gnus-start.el'
--- lisp/gnus/gnus-start.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/gnus-start.el	2010-09-18 13:59:25 +0000
@@ -1774,7 +1774,8 @@
 	  (gnus-read-active-for-groups method infos early-data)
 	  (dolist (info infos)
 	    (inline (gnus-get-unread-articles-in-group
-		     info (gnus-active (gnus-info-group info))))))))
+		     info (gnus-active (gnus-info-group info))
+		     t))))))
     (gnus-message 6 "Checking new news...done")))
 
 (defun gnus-method-rank (type method)
------------------------------------------------------------
revno: 101474
committer: Eli Zaretskii <eliz@gnu.org>
branch nick: trunk
timestamp: Sat 2010-09-18 13:59:53 +0200
message:
  Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
  
   xdisp.c (Fcurrent_bidi_paragraph_direction): Call
   bidi_paragraph_init with NO_DEFAULT_P non-zero.
   bidi.c (bidi_paragraph_init): Accept an additional argument
   NO_DEFAULT_P; all callers changed.  If NO_DEFAULT_P is non-zero,
   search back until a paragraph with a strong directional character
   is found, and use that to determine paragraph's base direction.
   dispextern.h (bidi_paragraph_init): Update prototype.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-09-17 21:34:45 +0000
+++ src/ChangeLog	2010-09-18 11:59:53 +0000
@@ -1,3 +1,15 @@
+2010-09-18  Eli Zaretskii  <eliz@gnu.org>
+
+	* xdisp.c (Fcurrent_bidi_paragraph_direction): Call
+	bidi_paragraph_init with NO_DEFAULT_P non-zero.  (Bug#7038)
+
+	* bidi.c (bidi_paragraph_init): Accept an additional argument
+	NO_DEFAULT_P; all callers changed.  If NO_DEFAULT_P is non-zero,
+	search back until a paragraph with a strong directional character
+	is found, and use that to determine paragraph's base direction.
+
+	* dispextern.h (bidi_paragraph_init): Update prototype.
+
 2010-09-17  Eli Zaretskii  <eliz@gnu.org>
 
 	* w32.c (_PROCESS_MEMORY_COUNTERS_EX): Don't define with versions

=== modified file 'src/bidi.c'
--- src/bidi.c	2010-08-18 16:54:08 +0000
+++ src/bidi.c	2010-09-18 11:59:53 +0000
@@ -583,18 +583,26 @@
   return pos_byte;
 }
 
-/* Determine the direction, a.k.a. base embedding level, of the
+/* Determine the base direction, a.k.a. base embedding level, of the
    paragraph we are about to iterate through.  If DIR is either L2R or
    R2L, just use that.  Otherwise, determine the paragraph direction
-   from the first strong character of the paragraph.
-
-   Note that this gives the paragraph separator the same direction as
-   the preceding paragraph, even though Emacs generally views the
-   separartor as not belonging to any paragraph.  */
+   from the first strong directional character of the paragraph.
+
+   NO_DEFAULT_P non-nil means don't default to L2R if the paragraph
+   has no strong directional characters and both DIR and
+   bidi_it->paragraph_dir are NEUTRAL_DIR.  In that case, search back
+   in the buffer until a paragraph is found with a strong character,
+   or until hitting BEGV.  In the latter case, fall back to L2R.  This
+   flag is used in current-bidi-paragraph-direction.
+
+   Note that this function gives the paragraph separator the same
+   direction as the preceding paragraph, even though Emacs generally
+   views the separartor as not belonging to any paragraph.  */
 void
-bidi_paragraph_init (bidi_dir_t dir, struct bidi_it *bidi_it)
+bidi_paragraph_init (bidi_dir_t dir, struct bidi_it *bidi_it, int no_default_p)
 {
   EMACS_INT bytepos = bidi_it->bytepos;
+  EMACS_INT pstartbyte;
 
   /* Special case for an empty buffer. */
   if (bytepos == BEGV_BYTE && bytepos == ZV_BYTE)
@@ -643,49 +651,75 @@
 
       /* We are either at the beginning of a paragraph or in the
 	 middle of it.  Find where this paragraph starts.  */
-      bytepos = bidi_find_paragraph_start (pos, bytepos);
-
+      pstartbyte = bidi_find_paragraph_start (pos, bytepos);
       bidi_it->separator_limit = -1;
       bidi_it->new_paragraph = 0;
-      ch = FETCH_CHAR (bytepos);
-      ch_len = CHAR_BYTES (ch);
-      pos = BYTE_TO_CHAR (bytepos);
-      type = bidi_get_type (ch, NEUTRAL_DIR);
-
-      for (pos++, bytepos += ch_len;
-	   /* NOTE: UAX#9 says to search only for L, AL, or R types of
-	      characters, and ignore RLE, RLO, LRE, and LRO.  However,
-	      I'm not sure it makes sense to omit those 4; should try
-	      with and without that to see the effect.  */
-	   (bidi_get_category (type) != STRONG)
-	     || (bidi_ignore_explicit_marks_for_paragraph_level
-		 && (type == RLE || type == RLO
-		     || type == LRE || type == LRO));
-	   type = bidi_get_type (ch, NEUTRAL_DIR))
-	{
-	  if (type == NEUTRAL_B && bidi_at_paragraph_end (pos, bytepos) >= -1)
-	    break;
-	  if (bytepos >= ZV_BYTE)
-	    {
-	      /* Pretend there's a paragraph separator at end of buffer.  */
-	      type = NEUTRAL_B;
+
+      /* The following loop is run more than once only if NO_DEFAULT_P
+	 is non-zero.  */
+      do {
+	bytepos = pstartbyte;
+	ch = FETCH_CHAR (bytepos);
+	ch_len = CHAR_BYTES (ch);
+	pos = BYTE_TO_CHAR (bytepos);
+	type = bidi_get_type (ch, NEUTRAL_DIR);
+
+	for (pos++, bytepos += ch_len;
+	     /* NOTE: UAX#9 says to search only for L, AL, or R types
+		of characters, and ignore RLE, RLO, LRE, and LRO.
+		However, I'm not sure it makes sense to omit those 4;
+		should try with and without that to see the effect.  */
+	     (bidi_get_category (type) != STRONG)
+	       || (bidi_ignore_explicit_marks_for_paragraph_level
+		   && (type == RLE || type == RLO
+		       || type == LRE || type == LRO));
+	     type = bidi_get_type (ch, NEUTRAL_DIR))
+	  {
+	    if (type == NEUTRAL_B && bidi_at_paragraph_end (pos, bytepos) >= -1)
 	      break;
-	    }
-	  FETCH_CHAR_ADVANCE (ch, pos, bytepos);
-	}
-      if (type == STRONG_R || type == STRONG_AL) /* P3 */
-	bidi_it->paragraph_dir = R2L;
-      else if (type == STRONG_L)
-	bidi_it->paragraph_dir = L2R;
+	    if (bytepos >= ZV_BYTE)
+	      {
+		/* Pretend there's a paragraph separator at end of
+		   buffer.  */
+		type = NEUTRAL_B;
+		break;
+	      }
+	    FETCH_CHAR_ADVANCE (ch, pos, bytepos);
+	  }
+	if (type == STRONG_R || type == STRONG_AL) /* P3 */
+	  bidi_it->paragraph_dir = R2L;
+	else if (type == STRONG_L)
+	  bidi_it->paragraph_dir = L2R;
+	if (no_default_p && bidi_it->paragraph_dir == NEUTRAL_DIR)
+	  {
+	    /* If this paragraph is at BEGV, default to L2R.  */
+	    if (pstartbyte == BEGV_BYTE)
+	      bidi_it->paragraph_dir = L2R; /* P3 and HL1 */
+	    else
+	      {
+		EMACS_INT prevpbyte = pstartbyte;
+		EMACS_INT p = BYTE_TO_CHAR (pstartbyte), pbyte = pstartbyte;
+
+		/* Find the beginning of the previous paragraph, if any.  */
+		while (pbyte > BEGV_BYTE && prevpbyte >= pstartbyte)
+		  {
+		    p--;
+		    pbyte = CHAR_TO_BYTE (p);
+		    prevpbyte = bidi_find_paragraph_start (p, pbyte);
+		  }
+		pstartbyte = prevpbyte;
+	      }
+	  }
+      } while (no_default_p && bidi_it->paragraph_dir == NEUTRAL_DIR);
     }
   else
     abort ();
 
   /* Contrary to UAX#9 clause P3, we only default the paragraph
      direction to L2R if we have no previous usable paragraph
-     direction.  */
+     direction.  This is allowed by the HL1 clause.  */
   if (bidi_it->paragraph_dir != L2R && bidi_it->paragraph_dir != R2L)
-    bidi_it->paragraph_dir = L2R; /* P3 and ``higher protocols'' */
+    bidi_it->paragraph_dir = L2R; /* P3 and HL1 ``higher-level protocols'' */
   if (bidi_it->paragraph_dir == R2L)
     bidi_it->level_stack[0].level = 1;
   else

=== modified file 'src/dispextern.h'
--- src/dispextern.h	2010-09-01 07:13:21 +0000
+++ src/dispextern.h	2010-09-18 11:59:53 +0000
@@ -2896,7 +2896,7 @@
 
 extern void bidi_init_it (EMACS_INT, EMACS_INT, struct bidi_it *);
 extern void bidi_move_to_visually_next (struct bidi_it *);
-extern void bidi_paragraph_init (bidi_dir_t, struct bidi_it *);
+extern void bidi_paragraph_init (bidi_dir_t, struct bidi_it *, int);
 extern int  bidi_mirror_char (int);
 
 /* Defined in xdisp.c */

=== modified file 'src/xdisp.c'
--- src/xdisp.c	2010-09-01 07:13:21 +0000
+++ src/xdisp.c	2010-09-18 11:59:53 +0000
@@ -3821,7 +3821,8 @@
 		     not have a chance to do it, if we are going to
 		     skip any text at the beginning, which resets the
 		     FIRST_ELT flag.  */
-		  bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it);
+		  bidi_paragraph_init (it->paragraph_embedding,
+				       &it->bidi_it, 0);
 		}
 	      do
 		{
@@ -5143,7 +5144,7 @@
      of a new paragraph, next_element_from_buffer may not have a
      chance to do that.  */
   if (it->bidi_it.first_elt && it->bidi_it.charpos < ZV)
-    bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it);
+    bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it, 0);
   /* prev_stop can be zero, so check against BEGV as well.  */
   while (it->bidi_it.charpos >= BEGV
 	 && it->prev_stop <= it->bidi_it.charpos
@@ -6201,7 +6202,7 @@
 	      /* If this is a new paragraph, determine its base
 		 direction (a.k.a. its base embedding level).  */
 	      if (it->bidi_it.new_paragraph)
-		bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it);
+		bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it, 0);
 	      bidi_move_to_visually_next (&it->bidi_it);
 	      IT_BYTEPOS (*it) = it->bidi_it.bytepos;
 	      IT_CHARPOS (*it) = it->bidi_it.charpos;
@@ -6673,7 +6674,7 @@
 	{
 	  /* If we are at the beginning of a line, we can produce the
 	     next element right away.  */
-	  bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it);
+	  bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it, 0);
 	  bidi_move_to_visually_next (&it->bidi_it);
 	}
       else
@@ -6687,7 +6688,7 @@
 	  IT_BYTEPOS (*it) = CHAR_TO_BYTE (IT_CHARPOS (*it));
 	  it->bidi_it.charpos = IT_CHARPOS (*it);
 	  it->bidi_it.bytepos = IT_BYTEPOS (*it);
-	  bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it);
+	  bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it, 0);
 	  do
 	    {
 	      /* Now return to buffer position where we were asked to
@@ -6910,7 +6911,7 @@
 	  if (it->bidi_p)
 	    {
 	      if (it->bidi_it.new_paragraph)
-		bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it);
+		bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it, 0);
 	      /* Resync the bidi iterator with IT's new position.
 		 FIXME: this doesn't support bidirectional text.  */
 	      while (it->bidi_it.charpos < IT_CHARPOS (*it))
@@ -17992,8 +17993,9 @@
       itb.bytepos = bytepos;
       itb.first_elt = 1;
       itb.separator_limit = -1;
+      itb.paragraph_dir = NEUTRAL_DIR;
 
-      bidi_paragraph_init (NEUTRAL_DIR, &itb);
+      bidi_paragraph_init (NEUTRAL_DIR, &itb, 1);
       if (buf != current_buffer)
 	set_buffer_temp (old);
       switch (itb.paragraph_dir)
------------------------------------------------------------
revno: 101473
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Sat 2010-09-18 10:21:30 +0000
message:
  Fix previous merge from Gnus trunk.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-17 14:22:06 +0000
+++ lisp/gnus/ChangeLog	2010-09-18 10:21:30 +0000
@@ -1,3 +1,103 @@
+2010-09-18  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus-sum.el (gnus-select-newsgroup): Indent.
+
+	* nnimap.el (nnimap-possibly-change-group): Return nil if we can't log
+	in.
+	(nnimap-finish-retrieve-group-infos): Make sure we're not waiting for
+	nothing.
+
+	* gnus-start.el (gnus-get-unread-articles): Don't try to scan groups
+	from methods that are denied.
+
+	* gnus-int.el (gnus-method-denied-p): New function.
+
+	* nnimap.el (nnimap-open-connection): Use auth-sources to query and
+	store the password instead of netrc.
+	(nnimap-open-connection): Don't error out when we can't make a
+	connections.
+
+	* auth-source.el (auth-source-create): In the password prompt, say what
+	we're querying for.  Also prompt for user name if that hasn't been
+	given.
+
+	* nnimap.el (nnimap-with-process-buffer): Removed.
+
+2010-09-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus-start.el (gnus-read-active-for-groups): Don't use the "finish"
+	method when we're reading from the agent.
+
+	* nnagent.el (nnagent-retrieve-group-data-early): New dummy method.
+
+	* auth-source.el (auth-sources): Add ~/.authinfo to the default, since
+	that's probably most useful for users.
+
+	* gnus-int.el (gnus-check-server): Save result so that it doesn't say
+	"failed" all the time.
+
+	* gnus.el: Throughout all files, replace (save-excursion (set-buffer
+	...)) with (with-current-buffer ... ).
+
+	* nntp.el (nntp-open-server): Return whether the open was successful or
+	not.
+
+	* gnus-sum.el (gnus-summary-first-subject): Have `unseen-or-unread'
+	select an unread unseen article first.
+
+	* nnimap.el (nnimap-open-connection): If the user doesn't have a
+	/etc/services, supply some sensible port defaults.
+
+	* dgnushack.el: Define netrc-credentials.
+
+2010-09-17  Julien Danjou  <julien@danjou.info>  (tiny fix)
+
+	* mm-decode.el (mm-text-html-renderer): Document gnus-article-html.
+
+2010-09-17  Knut Anders Hatlen  <kahatlen@gmail.com>  (tiny change)
+
+	* nnimap.el (nnimap-get-groups): Don't bug out if the LIST command
+	doesn't have any parameters.
+
+2010-09-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* nnimap.el (nnimap-open-connection): Upcase all capabilities, and use
+	only upcased checks.
+
+	* nnmail.el (nnmail-article-group): Fix typo in "bogus" section.
+
+	* nnimap.el (nnimap-open-shell-stream): New function.
+	(nnimap-open-connection): Use it.
+	(nnimap-transform-headers): Get the number of lines in each message.
+	(nnimap-retrieve-headers): Query for BODYSTRUCTURE so that we get the
+	number of lines.
+	(nnimap-request-list): Not all servers return UIDNEXT.  Work past this
+	problem.
+
+	* utf7.el (utf7-encode): Autoload.
+
+	* nnmail.el (nnmail-inhibit-default-split-group): New internal variable
+	to allow the mail splitting to not return a default group.  This is
+	useful for nnimap, which will leave unmatched mail in the inbox.
+
+	* nnimap.el: Rewritten.
+
+	* gnus.el (gnus-article-special-mark-lists): Add uid/active tuples, for
+	nnimap usage.
+
+	* gnus-sum.el (gnus-summary-move-article): Pass the move-to group name
+	if the move is internal, so that nnimap can do fast internal moves.
+
+	* gnus-start.el (gnus-get-unread-articles): Support early retrieval of
+	data.
+	(gnus-read-active-for-groups): Support finishing the early retrieval of
+	data.
+
+	* gnus-range.el (gnus-range-nconcat): New function.
+
+	* gnus-int.el (gnus-finish-retrieve-group-infos)
+	(gnus-retrieve-group-data-early): New functions.
+
 2010-09-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* nnrss.el (nnrss-retrieve-headers, nnrss-request-list-newsgroups)

=== modified file 'lisp/gnus/pop3.el'
--- lisp/gnus/pop3.el	2010-09-18 10:02:19 +0000
+++ lisp/gnus/pop3.el	2010-09-18 10:21:30 +0000
@@ -279,9 +279,9 @@
   (let ((coding-system-for-read 'binary)
 	(coding-system-for-write 'binary)
 	process)
-    (save-excursion
-      (set-buffer (get-buffer-create (concat " trace of POP session to "
-					     mailhost)))
+    (with-current-buffer
+        (get-buffer-create (concat " trace of POP session to "
+                                   mailhost))
       (erase-buffer)
       (setq pop3-read-point (point-min))
       (setq process
@@ -353,8 +353,7 @@
 Return the response string if optional second argument is non-nil."
   (let ((case-fold-search nil)
 	match-end)
-    (save-excursion
-      (set-buffer (process-buffer process))
+    (with-current-buffer (process-buffer process)
       (goto-char pop3-read-point)
       (while (and (memq (process-status process) '(open run))
 		  (not (search-forward "\r\n" nil t)))
@@ -511,8 +510,7 @@
     (if msg
 	(string-to-number (nth 2 (split-string response " ")))
       (let ((start pop3-read-point) end)
-	(save-excursion
-	  (set-buffer (process-buffer process))
+	(with-current-buffer (process-buffer process)
 	  (while (not (re-search-forward "^\\.\r\n" nil t))
 	    (pop3-accept-process-output process)
 	    (goto-char start))
@@ -530,8 +528,7 @@
   (pop3-send-command process (format "RETR %s" msg))
   (pop3-read-response process)
   (let ((start pop3-read-point) end)
-    (save-excursion
-      (set-buffer (process-buffer process))
+    (with-current-buffer (process-buffer process)
       (while (not (re-search-forward "^\\.\r\n" nil t))
 	(pop3-accept-process-output process)
 	(goto-char start))
@@ -547,8 +544,7 @@
       (setq end (point-marker))
       (pop3-clean-region start end)
       (pop3-munge-message-separator start end)
-      (save-excursion
-	(set-buffer crashbuf)
+      (with-current-buffer crashbuf
 	(erase-buffer))
       (copy-to-buffer crashbuf start end)
       (delete-region start end)
@@ -585,8 +581,7 @@
   (pop3-send-command process "QUIT")
   (pop3-read-response process t)
   (if process
-      (save-excursion
-	(set-buffer (process-buffer process))
+      (with-current-buffer (process-buffer process)
 	(goto-char (point-max))
 	(delete-process process))))
------------------------------------------------------------
revno: 101472
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Sat 2010-09-18 10:02:19 +0000
message:
  Merge changes made in Gnus trunk.
  
  Reimplement nnimap, and do tweaks to the rest of the code to support that.
  
  * gnus-int.el (gnus-finish-retrieve-group-infos)
  (gnus-retrieve-group-data-early): New functions.
  
  * gnus-range.el (gnus-range-nconcat): New function.
  
  * gnus-start.el (gnus-get-unread-articles): Support early retrieval of
  data.
  (gnus-read-active-for-groups): Support finishing the early retrieval of
  data.
  
  * gnus-sum.el (gnus-summary-move-article): Pass the move-to group name
  if the move is internal, so that nnimap can do fast internal moves.
  
  * gnus.el (gnus-article-special-mark-lists): Add uid/active tuples, for
  nnimap usage.
  
  * nnimap.el: Rewritten.
  
  * nnmail.el (nnmail-inhibit-default-split-group): New internal variable
  to allow the mail splitting to not return a default group.  This is
  useful for nnimap, which will leave unmatched mail in the inbox.
  
  * utf7.el (utf7-encode): Autoload.
  
  
  Implement shell connection.
  
  * nnimap.el (nnimap-open-shell-stream): New function.
  (nnimap-open-connection): Use it.
  
  
  Get the number of lines by using BODYSTRUCTURE.
  
  (nnimap-transform-headers): Get the number of lines in each message.
  (nnimap-retrieve-headers): Query for BODYSTRUCTURE so that we get the
  number of lines.
  
  
  Not all servers return UIDNEXT.  Work past this problem.
  
  
  Remove junk from end of file.
  
  
  Fix typo in "bogus" section.
  
  
  Make capabilties be case-insensitive.
  
  
  Require cl when compiling.
  
  
  Don't bug out if the LIST command doesn't have any parameters.
  
  2010-09-17  Knut Anders Hatlen  <kahatlen@gmail.com>  (tiny change)
  
  	    * nnimap.el (nnimap-get-groups): Don't bug out if the LIST command
  	    doesn't have any parameters.
  
  
  (mm-text-html-renderer): Document gnus-article-html.
  
  2010-09-17  Julien Danjou  <julien@danjou.info>  (tiny fix)
  
  	    * mm-decode.el (mm-text-html-renderer): Document gnus-article-html.
  
  
  * dgnushack.el: Define netrc-credentials.
  
  
  If the user doesn't have a /etc/services, supply some sensible port defaults.
  
  
  Have `unseen-or-unread' select an unread unseen article first.
  
  
  (nntp-open-server): Return whether the open was successful or not.
  
  
  Throughout all files, replace (save-excursion (set-buffer ...)) with (with-current-buffer ... ).
  
  
  Save result so that it doesn't say "failed" all the time.
  
  
  Add ~/.authinfo to the default, since that's probably most useful for users.
  
  
  Don't use the "finish" method when we're reading from the agent.
  
  
  Add some more nnimap-relevant agent stuff to nnagent.el.
  
  
  * nnimap.el (nnimap-with-process-buffer): Removed.
  
  
  Revert one line that was changed by mistake in the last checkin.
  
  
  (nnimap-open-connection): Don't error out when we can't make a connection
  
  
  nnimap-related changes to avoid bugging out if we can't contact a server.
  * gnus-start.el (gnus-get-unread-articles): Don't try to scan groups
   from methods that are denied.
  * nnimap.el (nnimap-possibly-change-group): Return nil if we can't log
   in.
  (nnimap-finish-retrieve-group-infos): Make sure we're not waiting for
   nothing.
  * gnus-sum.el (gnus-select-newsgroup): Indent.
diff:
=== modified file 'lisp/gnus/auth-source.el'
--- lisp/gnus/auth-source.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/auth-source.el	2010-09-18 10:02:19 +0000
@@ -107,7 +107,8 @@
   :version "23.2" ;; No Gnus
   :type `boolean)
 
-(defcustom auth-sources '((:source "~/.authinfo.gpg"))
+(defcustom auth-sources '((:source "~/.authinfo.gpg")
+			  (:source "~/.authinfo"))
   "List of authentication sources.
 
 The default will get login and password information from a .gpg
@@ -311,20 +312,23 @@
     (setq result
 	  (mapcar
 	   (lambda (m)
-	     (if (equal "password" m)
-		 (let ((passwd (read-passwd "Password: ")))
-		   (cond
-		    ;; Secret Service API.
-		    ((consp source)
-		     (apply
-		      'secrets-create-item
-		      (auth-get-source entry) name passwd spec))
-		    (t)) ;; netrc not implemented yes.
-		   passwd)
-	       (or
-		;; the originally requested :user
-		user
-		"unknown-user")))
+	     (cond
+	      ((equal "password" m)
+	       (let ((passwd (read-passwd
+			      (format "Password for %s on %s: " prot host))))
+		 (cond
+		  ;; Secret Service API.
+		  ((consp source)
+		   (apply
+		    'secrets-create-item
+		    (auth-get-source entry) name passwd spec))
+		  (t)) ;; netrc not implemented yes.
+		 passwd))
+	      ((equal "login" m)
+	       (or user
+		   (read-string (format "User name for %s on %s: " prot host))))
+	      (t
+	       "unknownuser")))
 	   (if (consp mode) mode (list mode))))
     (if (consp mode) result (car result))))
 

=== modified file 'lisp/gnus/earcon.el'
--- lisp/gnus/earcon.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/earcon.el	2010-09-18 10:02:19 +0000
@@ -151,8 +151,7 @@
 
 (defun earcon-button-push (marker)
   ;; Push button starting at MARKER.
-  (save-excursion
-    (set-buffer gnus-article-buffer)
+  (with-current-buffer gnus-article-buffer
     (goto-char marker)
     (let* ((entry (earcon-button-entry))
 	   (inhibit-point-motion-hooks t)
@@ -214,8 +213,7 @@
 (defun gnus-earcon-display ()
   "Play sounds in message buffers."
   (interactive)
-  (save-excursion
-    (set-buffer gnus-article-buffer)
+  (with-current-buffer gnus-article-buffer
     (goto-char (point-min))
     ;; Skip headers
     (unless (search-forward "\n\n" nil t)

=== modified file 'lisp/gnus/flow-fill.el'
--- lisp/gnus/flow-fill.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/flow-fill.el	2010-09-18 10:02:19 +0000
@@ -97,8 +97,7 @@
 
 ;;;###autoload
 (defun fill-flowed (&optional buffer delete-space)
-  (save-excursion
-    (set-buffer (or (current-buffer) buffer))
+  (with-current-buffer (or (current-buffer) buffer)
     (goto-char (point-min))
     ;; Remove space stuffing.
     (while (re-search-forward "^\\( \\|>+ $\\)" nil t)

=== modified file 'lisp/gnus/gnus-agent.el'
--- lisp/gnus/gnus-agent.el	2010-09-05 00:44:53 +0000
+++ lisp/gnus/gnus-agent.el	2010-09-18 10:02:19 +0000
@@ -305,8 +305,7 @@
 `(prog1 (let ((gnus-agent-inhibit-update-total-fetched-for t)) ,@body)
      (when (and gnus-agent-need-update-total-fetched-for
 		(not gnus-agent-inhibit-update-total-fetched-for))
-	(save-excursion
-	  (set-buffer gnus-group-buffer)
+	(with-current-buffer gnus-group-buffer
 	  (setq gnus-agent-need-update-total-fetched-for nil)
 	  (gnus-group-update-group ,group t)))))
 
@@ -474,8 +473,7 @@
 (defun gnus-agent-stop-fetch ()
   "Save all data structures and clean up."
   (setq gnus-agent-spam-hashtb nil)
-  (save-excursion
-    (set-buffer nntp-server-buffer)
+  (with-current-buffer nntp-server-buffer
     (widen)))
 
 (defmacro gnus-agent-with-fetch (&rest forms)
@@ -1608,8 +1606,7 @@
 		       nntp-server-buffer (point-min) (point-max))
                       (setq pos (nreverse pos)))))
                 ;; Then save these articles into the Agent.
-                (save-excursion
-                  (set-buffer nntp-server-buffer)
+                (with-current-buffer nntp-server-buffer
                   (while pos
                     (narrow-to-region (cdar pos) (or (cdadr pos) (point-max)))
                     (goto-char (point-min))
@@ -1693,8 +1690,7 @@
   (setq date (or date t))
 
   (let (gnus-agent-article-alist group alist beg end)
-    (save-excursion
-      (set-buffer gnus-agent-overview-buffer)
+    (with-current-buffer gnus-agent-overview-buffer
       (when (nnheader-find-nov-line article)
 	(forward-word 1)
 	(setq beg (point))
@@ -1705,9 +1701,8 @@
 	(push (setq alist (list group (gnus-agent-load-alist (caar crosses))))
 	      gnus-agent-group-alist))
       (setcdr alist (cons (cons (cdar crosses) date) (cdr alist)))
-      (save-excursion
-	(set-buffer (gnus-get-buffer-create (format " *Gnus agent overview %s*"
-						    group)))
+      (with-current-buffer (gnus-get-buffer-create
+			    (format " *Gnus agent overview %s*"group))
 	(when (= (point-max) (point-min))
 	  (push (cons group (current-buffer)) gnus-agent-buffer-alist)
 	  (ignore-errors
@@ -1939,9 +1934,7 @@
        10 "gnus-agent-fetch-headers: undownloaded articles are '%s'"
        (gnus-compress-sequence articles t))
 
-      (save-excursion
-        (set-buffer nntp-server-buffer)
-
+      (with-current-buffer nntp-server-buffer
         (if articles
             (progn
 	      (gnus-message 7 "Fetching headers for %s..."
@@ -2767,8 +2760,7 @@
 
 (defun gnus-category-setup-buffer ()
   (unless (get-buffer gnus-category-buffer)
-    (save-excursion
-      (set-buffer (gnus-get-buffer-create gnus-category-buffer))
+    (with-current-buffer (gnus-get-buffer-create gnus-category-buffer)
       (gnus-category-mode))))
 
 (defun gnus-category-prepare ()

=== modified file 'lisp/gnus/gnus-async.el'
--- lisp/gnus/gnus-async.el	2010-09-08 23:51:10 +0000
+++ lisp/gnus/gnus-async.el	2010-09-18 10:02:19 +0000
@@ -145,8 +145,7 @@
   (when (and (gnus-buffer-live-p summary)
 	     gnus-asynchronous
 	     (gnus-group-asynchronous-p group))
-    (save-excursion
-      (set-buffer gnus-summary-buffer)
+    (with-current-buffer gnus-summary-buffer
       (let ((next (caadr (gnus-data-find-list article))))
 	(when next
 	  (if (not (fboundp 'run-with-idle-timer))
@@ -205,8 +204,7 @@
 
 	  (when (and do-fetch article)
 	    ;; We want to fetch some more articles.
-	    (save-excursion
-	      (set-buffer summary)
+	    (with-current-buffer summary
 	      (let (mark)
 		(gnus-async-set-buffer)
 		(goto-char (point-max))

=== modified file 'lisp/gnus/gnus-bcklg.el'
--- lisp/gnus/gnus-bcklg.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/gnus-bcklg.el	2010-09-18 10:02:19 +0000
@@ -40,8 +40,7 @@
 (defun gnus-backlog-buffer ()
   "Return the backlog buffer."
   (or (get-buffer gnus-backlog-buffer)
-      (save-excursion
-	(set-buffer (gnus-get-buffer-create gnus-backlog-buffer))
+      (with-current-buffer (gnus-get-buffer-create gnus-backlog-buffer)
 	(buffer-disable-undo)
 	(setq buffer-read-only t)
 	(get-buffer gnus-backlog-buffer))))
@@ -76,8 +75,7 @@
 	   (gnus-backlog-remove-oldest-article))
 	(push ident gnus-backlog-articles)
 	;; Insert the new article.
-	(save-excursion
-	  (set-buffer (gnus-backlog-buffer))
+	(with-current-buffer (gnus-backlog-buffer)
 	  (let (buffer-read-only)
 	    (goto-char (point-max))
 	    (unless (bolp)
@@ -90,8 +88,7 @@
 	      (gnus-error 3 "Article %d is blank" number))))))))
 
 (defun gnus-backlog-remove-oldest-article ()
-  (save-excursion
-    (set-buffer (gnus-backlog-buffer))
+  (with-current-buffer (gnus-backlog-buffer)
     (goto-char (point-min))
     (if (zerop (buffer-size))
 	()				; The buffer is empty.
@@ -114,8 +111,7 @@
 	  beg end)
       (when (memq ident gnus-backlog-articles)
 	;; It was in the backlog.
-	(save-excursion
-	  (set-buffer (gnus-backlog-buffer))
+	(with-current-buffer (gnus-backlog-buffer)
 	  (let (buffer-read-only)
 	    (when (setq beg (text-property-any
 			     (point-min) (point-max) 'gnus-backlog
@@ -138,8 +134,7 @@
 	  beg end)
       (when (memq ident gnus-backlog-articles)
 	;; It was in the backlog.
-	(save-excursion
-	  (set-buffer (gnus-backlog-buffer))
+	(with-current-buffer (gnus-backlog-buffer)
 	  (if (not (setq beg (text-property-any
 			      (point-min) (point-max) 'gnus-backlog
 			      ident)))
@@ -150,8 +145,7 @@
 	    (setq end
 		  (next-single-property-change
 		   (1+ beg) 'gnus-backlog (current-buffer) (point-max)))))
-	(save-excursion
-	  (and buffer (set-buffer buffer))
+	(with-current-buffer (or (current-buffer) buffer)
 	  (let ((buffer-read-only nil))
 	    (erase-buffer)
 	    (insert-buffer-substring gnus-backlog-buffer beg end)))

=== modified file 'lisp/gnus/gnus-cache.el'
--- lisp/gnus/gnus-cache.el	2010-09-02 01:42:32 +0000
+++ lisp/gnus/gnus-cache.el	2010-09-18 10:02:19 +0000
@@ -180,8 +180,7 @@
 	;; Save the article in the cache.
 	(if (file-exists-p file)
 	    t				; The article already is saved.
-	  (save-excursion
-	    (set-buffer nntp-server-buffer)
+	  (with-current-buffer nntp-server-buffer
 	    (require 'gnus-art)
 	    (let ((gnus-use-cache nil)
 		  (gnus-article-decode-hook nil))
@@ -554,8 +553,7 @@
   (let ((cache-buf (gnus-get-buffer-create " *gnus-cache*"))
 	beg end)
     (gnus-cache-save-buffers)
-    (save-excursion
-      (set-buffer cache-buf)
+    (with-current-buffer cache-buf
       (erase-buffer)
       (let ((coding-system-for-read gnus-cache-overview-coding-system)
 	    (file-name-coding-system nnmail-pathname-coding-system))
@@ -844,8 +842,7 @@
 	    ,@body)
      (when (and gnus-cache-need-update-total-fetched-for
 		(not gnus-cache-inhibit-update-total-fetched-for))
-	(save-excursion
-	  (set-buffer gnus-group-buffer)
+	(with-current-buffer gnus-group-buffer
 	  (setq gnus-cache-need-update-total-fetched-for nil)
 	  (gnus-group-update-group ,group t)))))
 

=== modified file 'lisp/gnus/gnus-demon.el'
--- lisp/gnus/gnus-demon.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/gnus-demon.el	2010-09-18 10:02:19 +0000
@@ -291,11 +291,9 @@
   (let ((win (current-window-configuration)))
     (unwind-protect
 	(save-window-excursion
-	  (save-excursion
-	    (when (gnus-alive-p)
-	      (save-excursion
-		(set-buffer gnus-group-buffer)
-		(gnus-group-get-new-news)))))
+	  (when (gnus-alive-p)
+	    (with-current-buffer gnus-group-buffer
+	      (gnus-group-get-new-news))))
       (set-window-configuration win))))
 
 (defun gnus-demon-add-scan-timestamps ()

=== modified file 'lisp/gnus/gnus-int.el'
--- lisp/gnus/gnus-int.el	2010-09-05 01:31:15 +0000
+++ lisp/gnus/gnus-int.el	2010-09-18 10:02:19 +0000
@@ -179,10 +179,7 @@
 			(format " on %s" (nth 1 method)))))
       (gnus-run-hooks 'gnus-open-server-hook)
       (prog1
-	  (condition-case ()
-	      (setq result (gnus-open-server method))
-	    (quit (message "Quit gnus-check-server")
-		  nil))
+	  (setq result (gnus-open-server method))
 	(unless silent
 	  (gnus-message 5 "Opening %s server%s...%s" (car method)
 			(if (equal (nth 1 method) "") ""
@@ -225,6 +222,10 @@
 ;;; Interface functions to the backends.
 ;;;
 
+(defun gnus-method-denied-p (method)
+  (eq (nth 1 (assoc method gnus-opened-servers))
+      'denied))
+
 (defun gnus-open-server (gnus-command-method)
   "Open a connection to GNUS-COMMAND-METHOD."
   (when (stringp gnus-command-method)
@@ -319,6 +320,22 @@
   (funcall (gnus-get-function gnus-command-method 'request-list)
 	   (nth 1 gnus-command-method)))
 
+(defun gnus-finish-retrieve-group-infos (gnus-command-method infos data)
+  "Read and update infos from GNUS-COMMAND-METHOD."
+  (when (stringp gnus-command-method)
+    (setq gnus-command-method (gnus-server-to-method gnus-command-method)))
+  (funcall (gnus-get-function gnus-command-method 'finish-retrieve-group-infos)
+	   (nth 1 gnus-command-method)
+	   infos data))
+
+(defun gnus-retrieve-group-data-early (gnus-command-method infos)
+  "Start early async retrival of data from GNUS-COMMAND-METHOD."
+  (when (stringp gnus-command-method)
+    (setq gnus-command-method (gnus-server-to-method gnus-command-method)))
+  (funcall (gnus-get-function gnus-command-method 'retrieve-group-data-early)
+	   (nth 1 gnus-command-method)
+	   infos))
+
 (defun gnus-request-list-newsgroups (gnus-command-method)
   "Request the newsgroups file from GNUS-COMMAND-METHOD."
   (when (stringp gnus-command-method)
@@ -490,8 +507,7 @@
       (setq res (gnus-request-article article group)
 	    clean-up t)))
     (when clean-up
-      (save-excursion
-	(set-buffer nntp-server-buffer)
+      (with-current-buffer nntp-server-buffer
 	(goto-char (point-min))
 	(when (search-forward "\n\n" nil t)
 	  (delete-region (1- (point)) (point-max)))
@@ -523,8 +539,7 @@
       (setq res (gnus-request-article article group)
 	    clean-up t)))
     (when clean-up
-      (save-excursion
-	(set-buffer nntp-server-buffer)
+      (with-current-buffer nntp-server-buffer
 	(goto-char (point-min))
 	(when (search-forward "\n\n" nil t)
 	  (delete-region (point-min) (1- (point))))))

=== modified file 'lisp/gnus/gnus-kill.el'
--- lisp/gnus/gnus-kill.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/gnus-kill.el	2010-09-18 10:02:19 +0000
@@ -349,8 +349,7 @@
 
 (defun gnus-expunge (marks)
   "Remove lines marked with MARKS."
-  (save-excursion
-    (set-buffer gnus-summary-buffer)
+  (with-current-buffer gnus-summary-buffer
     (gnus-summary-limit-to-marks marks 'reverse)))
 
 (defun gnus-apply-kill-file-unless-scored ()
@@ -442,8 +441,7 @@
 	  (progn
 	    (delete-region beg (point))
 	    (insert (or (eval form) "")))
-	(save-excursion
-	  (set-buffer gnus-summary-buffer)
+	(with-current-buffer gnus-summary-buffer
 	  (ignore-errors (eval form)))))
     (and (buffer-modified-p)
 	 gnus-kill-save-kill-file
@@ -555,8 +553,7 @@
 	  (and (eq 'quote (car (nth 2 object)))
 	       (not (consp (cdadr (nth 2 object))))))
       (concat "\n" (gnus-prin1-to-string object))
-    (save-excursion
-      (set-buffer (gnus-get-buffer-create "*Gnus PP*"))
+    (with-current-buffer (gnus-get-buffer-create "*Gnus PP*")
       (buffer-disable-undo)
       (erase-buffer)
       (insert (format "\n(%S %S\n  '(" (nth 0 object) (nth 1 object)))
@@ -610,8 +607,7 @@
 	     6 "Searching for article: %d..." (mail-header-number header))
 	    (gnus-article-setup-buffer)
 	    (gnus-article-prepare (mail-header-number header) t)
-	    (when (save-excursion
-		    (set-buffer gnus-article-buffer)
+	    (when (with-current-buffer gnus-article-buffer
 		    (goto-char (point-min))
 		    (setq did-kill (re-search-forward regexp nil t)))
 	      (cond ((stringp form)	;Keyboard macro.

=== modified file 'lisp/gnus/gnus-logic.el'
--- lisp/gnus/gnus-logic.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/gnus-logic.el	2010-09-18 10:02:19 +0000
@@ -179,8 +179,7 @@
 (defun gnus-advanced-body (header match type)
   (when (string= header "all")
     (setq header "article"))
-  (save-excursion
-    (set-buffer nntp-server-buffer)
+  (with-current-buffer nntp-server-buffer
     (let* ((request-func (cond ((string= "head" header)
 				'gnus-request-head)
 			       ((string= "body" header)

=== modified file 'lisp/gnus/gnus-range.el'
--- lisp/gnus/gnus-range.el	2010-09-02 01:42:32 +0000
+++ lisp/gnus/gnus-range.el	2010-09-18 10:02:19 +0000
@@ -59,6 +59,36 @@
       (setq list2 (cdr list2)))
     list1))
 
+(defun gnus-range-nconcat (&rest ranges)
+  "Return a range comprising all the RANGES, which are pre-sorted.
+RANGES will be destructively altered."
+  (setq ranges (delete nil ranges))
+  (let* ((result (gnus-range-normalize (pop ranges)))
+	 (last (last result)))
+    (dolist (range ranges)
+      (setq range (gnus-range-normalize range))
+      ;; Normalize the single-number case, so that we don't need to
+      ;; special-case that so much.
+      (when (numberp (car last))
+	(setcar last (cons (car last) (car last))))
+      (when (numberp (car range))
+	(setcar range (cons (car range) (car range))))
+      (if (= (1+ (cdar last)) (caar range))
+	  (progn
+	    (setcdr (car last) (cdar range))
+	    (setcdr last (cdr range)))
+	(setcdr last range)
+	;; Denormalize back, since we couldn't join the ranges up.
+	(when (= (caar range) (cdar range))
+	  (setcar range (caar range)))
+	(when (= (caar last) (cdar last))
+	  (setcar last (caar last))))
+      (setq last (last last)))
+    (if (and (consp (car result))
+	     (= (length result) 1))
+	(car result)
+      result)))
+
 (defun gnus-range-difference (range1 range2)
   "Return the range of elements in RANGE1 that do not appear in RANGE2.
 Both ranges must be in ascending order."

=== modified file 'lisp/gnus/gnus-registry.el'
--- lisp/gnus/gnus-registry.el	2010-09-14 14:59:42 +0000
+++ lisp/gnus/gnus-registry.el	2010-09-18 10:02:19 +0000
@@ -241,8 +241,7 @@
   "Save the registry cache file."
   (interactive)
   (let ((file gnus-registry-cache-file))
-    (save-excursion
-      (set-buffer (gnus-get-buffer-create " *Gnus-registry-cache*"))
+    (with-current-buffer (gnus-get-buffer-create " *Gnus-registry-cache*")
       (make-local-variable 'version-control)
     (setq version-control gnus-backup-startup-file)
     (setq buffer-file-name file)
@@ -674,8 +673,7 @@
 	word words)
     (if (or (not (gnus-registry-fetch-extra id 'keywords))
 	    force)
-	(save-excursion
-	  (set-buffer gnus-article-buffer)
+	(with-current-buffer gnus-article-buffer
 	  (article-goto-body)
 	  (save-window-excursion
 	    (save-restriction

=== modified file 'lisp/gnus/gnus-score.el'
--- lisp/gnus/gnus-score.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/gnus-score.el	2010-09-18 10:02:19 +0000
@@ -708,8 +708,7 @@
 
     ;; Change score file to the "all.SCORE" file.
     (when (eq symp 'a)
-      (save-excursion
-	(set-buffer gnus-summary-buffer)
+      (with-current-buffer gnus-summary-buffer
 	(gnus-score-load-file
 	 ;; This is a kludge; yes...
 	 (cond
@@ -735,14 +734,12 @@
 
     (when (eq symp 'a)
       ;; We change the score file back to the previous one.
-      (save-excursion
-	(set-buffer gnus-summary-buffer)
+      (with-current-buffer gnus-summary-buffer
 	(gnus-score-load-file current-score-file)))))
 
 (defun gnus-score-insert-help (string alist idx)
   (setq gnus-score-help-winconf (current-window-configuration))
-  (save-excursion
-    (set-buffer (gnus-get-buffer-create "*Score Help*"))
+  (with-current-buffer (gnus-get-buffer-create "*Score Help*")
     (buffer-disable-undo)
     (delete-windows-on (current-buffer))
     (erase-buffer)
@@ -1270,8 +1267,7 @@
 	       exclude-files))
 	     gnus-scores-exclude-files))
       (when local
-	(save-excursion
-	  (set-buffer gnus-summary-buffer)
+	(with-current-buffer gnus-summary-buffer
 	  (while local
 	    (and (consp (car local))
 		 (symbolp (caar local))
@@ -1528,8 +1524,7 @@
 		    (cons (cons header (or gnus-summary-default-score 0))
 			  gnus-scores-articles))))
 
-	  (save-excursion
-	    (set-buffer (gnus-get-buffer-create "*Headers*"))
+	  (with-current-buffer (gnus-get-buffer-create "*Headers*")
 	    (buffer-disable-undo)
 	    (when (gnus-buffer-live-p gnus-summary-buffer)
 	      (message-clone-locals gnus-summary-buffer))
@@ -1854,8 +1849,7 @@
 
       ;; Change score file to the adaptive score file.  All entries that
       ;; this function makes will be put into this file.
-      (save-excursion
-	(set-buffer gnus-summary-buffer)
+      (with-current-buffer gnus-summary-buffer
 	(gnus-score-load-file
 	 (or gnus-newsgroup-adaptive-score-file
 	     (gnus-score-file-name
@@ -1946,15 +1940,13 @@
 		   (setq rest entries)))
 	    (setq entries rest))))
       ;; We change the score file back to the previous one.
-      (save-excursion
-	(set-buffer gnus-summary-buffer)
+      (with-current-buffer gnus-summary-buffer
 	(gnus-score-load-file current-score-file))
       (list (cons "references" news)))))
 
 (defun gnus-score-add-followups (header score scores &optional thread)
   "Add a score entry to the adapt file."
-  (save-excursion
-    (set-buffer gnus-summary-buffer)
+  (with-current-buffer gnus-summary-buffer
     (let* ((id (mail-header-id header))
 	   (scores (car scores))
 	   entry dont)
@@ -2282,8 +2274,7 @@
   "Create adaptive score rules for this newsgroup."
   (when gnus-newsgroup-adaptive
     ;; We change the score file to the adaptive score file.
-    (save-excursion
-      (set-buffer gnus-summary-buffer)
+    (with-current-buffer gnus-summary-buffer
       (gnus-score-load-file
        (or gnus-newsgroup-adaptive-score-file
 	   (gnus-home-score-file gnus-newsgroup-name t)
@@ -2697,8 +2688,7 @@
 	 (trans (cdr (assq ?: nnheader-file-name-translation-alist)))
 	 (group-trans (nnheader-translate-file-chars group t))
 	 ofiles not-match regexp)
-    (save-excursion
-      (set-buffer (gnus-get-buffer-create "*gnus score files*"))
+    (with-current-buffer (gnus-get-buffer-create "*gnus score files*")
       (buffer-disable-undo)
       ;; Go through all score file names and create regexp with them
       ;; as the source.

=== modified file 'lisp/gnus/gnus-start.el'
--- lisp/gnus/gnus-start.el	2010-09-14 13:44:44 +0000
+++ lisp/gnus/gnus-start.el	2010-09-18 10:02:19 +0000
@@ -594,8 +594,7 @@
 (defun gnus-subscribe-hierarchically (newgroup)
   "Subscribe new NEWGROUP and insert it in hierarchical newsgroup order."
   ;; Basic ideas by mike-w@cs.aukuni.ac.nz (Mike Williams)
-  (save-excursion
-    (set-buffer (nnheader-find-file-noselect gnus-current-startup-file))
+  (with-current-buffer (nnheader-find-file-noselect gnus-current-startup-file)
     (prog1
 	(let ((groupkey newgroup) before)
 	  (while (and (not before) groupkey)
@@ -857,8 +856,7 @@
       ;; it's not needed).
       ;; (set-window-point (get-buffer-window (current-buffer)) (point-max))
       (bury-buffer gnus-dribble-buffer)
-      (save-excursion
-	(set-buffer gnus-group-buffer)
+      (with-current-buffer gnus-group-buffer
 	(gnus-group-set-mode-line))
       (set-buffer obuf))))
 
@@ -871,10 +869,9 @@
   (let ((dribble-file (gnus-dribble-file-name)))
     (unless (file-exists-p (file-name-directory dribble-file))
       (make-directory (file-name-directory dribble-file) t))
-    (save-excursion
-      (set-buffer (setq gnus-dribble-buffer
-			(gnus-get-buffer-create
-			 (file-name-nondirectory dribble-file))))
+    (with-current-buffer (setq gnus-dribble-buffer
+			       (gnus-get-buffer-create
+				(file-name-nondirectory dribble-file)))
       (set (make-local-variable 'file-precious-flag) t)
       (erase-buffer)
       (setq buffer-file-name dribble-file)
@@ -923,8 +920,7 @@
   (when (file-exists-p (gnus-dribble-file-name))
     (delete-file (gnus-dribble-file-name)))
   (when gnus-dribble-buffer
-    (save-excursion
-      (set-buffer gnus-dribble-buffer)
+    (with-current-buffer gnus-dribble-buffer
       (let ((auto (make-auto-save-file-name)))
 	(when (file-exists-p auto)
 	  (delete-file auto))
@@ -934,14 +930,12 @@
 (defun gnus-dribble-save ()
   (when (and gnus-dribble-buffer
 	     (buffer-name gnus-dribble-buffer))
-    (save-excursion
-      (set-buffer gnus-dribble-buffer)
+    (with-current-buffer gnus-dribble-buffer
       (save-buffer))))
 
 (defun gnus-dribble-clear ()
   (when (gnus-buffer-exists-p gnus-dribble-buffer)
-    (save-excursion
-      (set-buffer gnus-dribble-buffer)
+    (with-current-buffer gnus-dribble-buffer
       (erase-buffer)
       (set-buffer-modified-p nil)
       (setq buffer-saved-size (buffer-size)))))
@@ -1302,8 +1296,7 @@
 	  (when (gnus-active group)
 	    (gnus-group-change-level
 	     group gnus-level-default-subscribed gnus-level-killed)))
-	(save-excursion
-	  (set-buffer gnus-group-buffer)
+	(with-current-buffer gnus-group-buffer
 	  ;; Don't error if the group already exists. This happens when a
 	  ;; first-time user types 'F'. -- didier
 	  (gnus-group-make-help-group t))
@@ -1734,7 +1727,7 @@
 		'primary)
 	       (t
 		'foreign)))
-	(push (setq method-group-list (list method method-type nil))
+	(push (setq method-group-list (list method method-type nil nil))
 	      type-cache))
       ;; Only add groups that need updating.
       (if (<= (gnus-info-level info)
@@ -1760,19 +1753,28 @@
 		  (< (gnus-method-rank (cadr c1) (car c1))
 		     (gnus-method-rank (cadr c2) (car c2))))))
 
-    (while type-cache
-      (setq method (nth 0 (car type-cache))
-	    method-type (nth 1 (car type-cache))
-	    infos (nth 2 (car type-cache)))
-      (pop type-cache)
+    ;; Start early async retrieval of data.
+    (dolist (elem type-cache)
+      (destructuring-bind (method method-type infos dummy) elem
+	(when (and method infos
+		   (not (gnus-method-denied-p method))
+		   (gnus-check-backend-function
+		    'retrieve-group-data-early (car method)))
+	  (when (gnus-check-backend-function 'request-scan (car method))
+	    (dolist (info infos)
+	      (gnus-request-scan (gnus-info-group info) method)))
+	  (setcar (nthcdr 3 elem)
+		  (gnus-retrieve-group-data-early method infos)))))
 
-      (when (and method
-		 infos)
-	;; See if any of the groups from this method require updating.
-	(gnus-read-active-for-groups method infos)
-	(dolist (info infos)
-	  (inline (gnus-get-unread-articles-in-group
-		   info (gnus-active (gnus-info-group info)))))))
+    ;; Do the rest of the retrieval.
+    (dolist (elem type-cache)
+      (destructuring-bind (method method-type infos early-data) elem
+	(when (and method infos)
+	  ;; See if any of the groups from this method require updating.
+	  (gnus-read-active-for-groups method infos early-data)
+	  (dolist (info infos)
+	    (inline (gnus-get-unread-articles-in-group
+		     info (gnus-active (gnus-info-group info))))))))
     (gnus-message 6 "Checking new news...done")))
 
 (defun gnus-method-rank (type method)
@@ -1796,9 +1798,14 @@
    (t
     100)))
 
-(defun gnus-read-active-for-groups (method infos)
+(defun gnus-read-active-for-groups (method infos early-data)
   (with-current-buffer nntp-server-buffer
     (cond
+     ((and
+       (gnus-check-backend-function 'finish-retrieve-group-infos (car method))
+       (or (not (gnus-agent-method-p method))
+	   (gnus-online method)))
+      (gnus-finish-retrieve-group-infos method infos early-data))
      ((gnus-check-backend-function 'retrieve-groups (car method))
       (when (gnus-check-backend-function 'request-scan (car method))
 	(dolist (info infos)
@@ -1867,8 +1874,7 @@
 
 (defun gnus-parse-active ()
   "Parse active info in the nntp server buffer."
-  (save-excursion
-    (set-buffer nntp-server-buffer)
+  (with-current-buffer nntp-server-buffer
     (goto-char (point-min))
     ;; Parse the result we got from `gnus-request-group'.
     (when (looking-at "[0-9]+ [0-9]+ \\([0-9]+\\) [0-9]+")
@@ -2022,8 +2028,7 @@
 	     (list "archive")))))
 	method)
     (setq gnus-have-read-active-file nil)
-    (save-excursion
-      (set-buffer nntp-server-buffer)
+    (with-current-buffer nntp-server-buffer
       (while (setq method (pop methods))
 	;; Only do each method once, in case the methods appear more
 	;; than once in this list.
@@ -2089,8 +2094,7 @@
 (defun gnus-read-active-file-2 (groups method)
   "Read an active file for GROUPS in METHOD using `gnus-retrieve-groups'."
   (when groups
-    (save-excursion
-      (set-buffer nntp-server-buffer)
+    (with-current-buffer nntp-server-buffer
       (gnus-check-server method)
       (let ((list-type (gnus-retrieve-groups groups method)))
 	(cond ((not list-type)
@@ -2771,8 +2775,7 @@
 	       (not force)
 	       (or (not gnus-dribble-buffer)
 		   (not (buffer-name gnus-dribble-buffer))
-		   (zerop (save-excursion
-			    (set-buffer gnus-dribble-buffer)
+		   (zerop (with-current-buffer gnus-dribble-buffer
 			    (buffer-size)))))
 	  (gnus-message 4 "(No changes need to be saved)")
 	(gnus-run-hooks 'gnus-save-newsrc-hook)
@@ -2906,8 +2909,7 @@
 
 (defun gnus-gnus-to-newsrc-format ()
   ;; Generate and save the .newsrc file.
-  (save-excursion
-    (set-buffer (create-file-buffer gnus-current-startup-file))
+  (with-current-buffer (create-file-buffer gnus-current-startup-file)
     (let ((newsrc (cdr gnus-newsrc-alist))
 	  (standard-output (current-buffer))
 	  info ranges range method)
@@ -2980,8 +2982,7 @@
   (gnus-run-hooks 'gnus-slave-mode-hook))
 
 (defun gnus-slave-save-newsrc ()
-  (save-excursion
-    (set-buffer gnus-dribble-buffer)
+  (with-current-buffer gnus-dribble-buffer
     (let ((slave-name
 	   (mm-make-temp-file (concat gnus-current-startup-file "-slave-")))
 	  (modes (ignore-errors
@@ -3005,8 +3006,7 @@
     (if (not slave-files)
 	()				; There are no slave files to read.
       (gnus-message 7 "Reading slave newsrcs...")
-      (save-excursion
-	(set-buffer (gnus-get-buffer-create " *gnus slave*"))
+      (with-current-buffer (gnus-get-buffer-create " *gnus slave*")
 	(setq slave-files
 	      (sort (mapcar (lambda (file)
 			      (list (nth 5 (file-attributes file)) file))
@@ -3126,8 +3126,7 @@
 (defun gnus-group-get-description (group)
   "Get the description of a group by sending XGTITLE to the server."
   (when (gnus-request-group-description group)
-    (save-excursion
-      (set-buffer nntp-server-buffer)
+    (with-current-buffer nntp-server-buffer
       (goto-char (point-min))
       (when (looking-at "[^ \t]+[ \t]+\\(.*\\)")
 	(match-string 1)))))

=== modified file 'lisp/gnus/gnus-sum.el'
--- lisp/gnus/gnus-sum.el	2010-09-11 00:36:27 +0000
+++ lisp/gnus/gnus-sum.el	2010-09-18 10:02:19 +0000
@@ -5504,11 +5504,11 @@
 	   (mm-decode-coding-string (gnus-status-message group) charset))))
 
     (unless (gnus-request-group group t)
-	(when (equal major-mode 'gnus-summary-mode)
-	  (gnus-kill-buffer (current-buffer)))
-	(error "Couldn't request group %s: %s"
-	       (mm-decode-coding-string group charset)
-	       (mm-decode-coding-string (gnus-status-message group) charset)))
+      (when (equal major-mode 'gnus-summary-mode)
+	(gnus-kill-buffer (current-buffer)))
+      (error "Couldn't request group %s: %s"
+	     (mm-decode-coding-string group charset)
+	     (mm-decode-coding-string (gnus-status-message group) charset)))
 
     (when gnus-agent
       (gnus-agent-possibly-alter-active group (gnus-active group) info)
@@ -7394,7 +7394,7 @@
   "Go to the first subject satisfying any non-nil constraint.
 If UNREAD is non-nil, the article should be unread.
 If UNDOWNLOADED is non-nil, the article should be undownloaded.
-If UNSEEN is non-nil, the article should be unseen.
+If UNSEEN is non-nil, the article should be unseen as well as unread.
 Returns the article selected or nil if there are no matching articles."
   (interactive "P")
   (cond
@@ -7417,7 +7417,8 @@
                                  (and undownloaded
                                       (memq num gnus-newsgroup-undownloaded))
                                  (and unseen
-                                      (memq num gnus-newsgroup-unseen)))))))
+                                      (memq num gnus-newsgroup-unseen)
+				      (memq num gnus-newsgroup-unreads)))))))
         (setq data (cdr data)))
       (prog1
           (if data
@@ -7908,8 +7909,8 @@
     (gnus-summary-position-point)))
 
 (defun gnus-summary-first-unseen-or-unread-subject ()
-  "Place the point on the subject line of the first unseen article or,
-if all article have been seen, on the subject line of the first unread
+  "Place the point on the subject line of the first unseen and unread article.
+If all article have been seen, on the subject line of the first unread
 article."
   (interactive)
   (prog1
@@ -9690,7 +9691,8 @@
 		  to-newsgroup (list 'quote select-method)
 		  (not articles) t)	; Accept form
 	    (not articles)		; Only save nov last time
-	    move-is-internal)))		; is this move internal?
+	    (and move-is-internal
+		 (gnus-group-real-name to-newsgroup))))) ; is this move internal?
 	;; Copy the article.
 	((eq action 'copy)
 	 (with-current-buffer copy-buf
@@ -9821,8 +9823,9 @@
 		  (gnus-add-marked-articles
 		   to-group 'expire (list to-article) info))
 
-		(gnus-request-set-mark
-		 to-group (list (list (list to-article) 'add to-marks))))
+		(when to-marks
+		  (gnus-request-set-mark
+		   to-group (list (list (list to-article) 'add to-marks)))))
 
 	      (gnus-dribble-enter
 	       (concat "(gnus-group-set-info '"

=== modified file 'lisp/gnus/gnus-topic.el'
--- lisp/gnus/gnus-topic.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/gnus-topic.el	2010-09-18 10:02:19 +0000
@@ -148,8 +148,7 @@
 
 (defun gnus-group-parent-topic (group)
   "Return the topic GROUP is member of by looking at the group buffer."
-  (save-excursion
-    (set-buffer gnus-group-buffer)
+  (with-current-buffer gnus-group-buffer
     (if (gnus-group-goto-group group)
 	(gnus-current-topic)
       (gnus-group-topic group))))
@@ -912,8 +911,7 @@
 
 (defun gnus-topic-change-level (group level oldlevel &optional previous)
   "Run when changing levels to enter/remove groups from topics."
-  (save-excursion
-    (set-buffer gnus-group-buffer)
+  (with-current-buffer gnus-group-buffer
     (let ((buffer-read-only nil))
       (unless gnus-topic-inhibit-change-level
 	(gnus-group-goto-group (or (car (nth 2 previous)) group))

=== modified file 'lisp/gnus/gnus-util.el'
--- lisp/gnus/gnus-util.el	2010-09-03 02:29:03 +0000
+++ lisp/gnus/gnus-util.el	2010-09-18 10:02:19 +0000
@@ -1115,8 +1115,7 @@
 		  (gnus-yes-or-no-p
 		   (concat "\"" filename "\" does not exist, create it? ")))
 	      (let ((file-buffer (create-file-buffer filename)))
-		(save-excursion
-		  (set-buffer file-buffer)
+		(with-current-buffer file-buffer
                   (if (fboundp 'rmail-insert-rmail-file-header)
                       (rmail-insert-rmail-file-header))
 		  (let ((require-final-newline nil)
@@ -1194,8 +1193,7 @@
 		(gnus-y-or-n-p
 		 (concat "\"" filename "\" does not exist, create it? ")))
 	    (let ((file-buffer (create-file-buffer filename)))
-	      (save-excursion
-		(set-buffer file-buffer)
+	      (with-current-buffer file-buffer
 		(let ((require-final-newline nil)
 		      (coding-system-for-write mm-text-coding-system))
 		  (gnus-write-buffer filename)))
@@ -1274,8 +1272,7 @@
   "Say whether Gnus is running or not."
   (and (boundp 'gnus-group-buffer)
        (get-buffer gnus-group-buffer)
-       (save-excursion
-	 (set-buffer gnus-group-buffer)
+       (with-current-buffer gnus-group-buffer
 	 (eq major-mode 'gnus-group-mode))))
 
 (defun gnus-remove-if (predicate list)

=== modified file 'lisp/gnus/gnus-uu.el'
--- lisp/gnus/gnus-uu.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/gnus-uu.el	2010-09-18 10:02:19 +0000
@@ -827,8 +827,7 @@
 (defun gnus-uu-save-article (buffer in-state)
   (cond
    (gnus-uu-save-separate-articles
-    (save-excursion
-      (set-buffer buffer)
+    (with-current-buffer buffer
       (let ((coding-system-for-write mm-text-coding-system))
 	(gnus-write-buffer
 	 (concat gnus-uu-saved-article-name gnus-current-article)))
@@ -838,8 +837,7 @@
 	    ((eq in-state 'last) (list 'end))
 	    (t (list 'middle)))))
    ((not gnus-uu-save-in-digest)
-    (save-excursion
-      (set-buffer buffer)
+    (with-current-buffer buffer
       (write-region (point-min) (point-max) gnus-uu-saved-article-name t)
       (cond ((eq in-state 'first) (list gnus-uu-saved-article-name 'begin))
 	    ((eq in-state 'first-and-last) (list gnus-uu-saved-article-name
@@ -857,11 +855,9 @@
 	      (eq in-state 'first-and-last))
 	  (progn
 	    (setq state (list 'begin))
-	    (save-excursion
-	      (set-buffer (gnus-get-buffer-create "*gnus-uu-body*"))
+	    (with-current-buffer (gnus-get-buffer-create "*gnus-uu-body*")
 	      (erase-buffer))
-	    (save-excursion
-	      (set-buffer (gnus-get-buffer-create "*gnus-uu-pre*"))
+	    (with-current-buffer (gnus-get-buffer-create "*gnus-uu-pre*")
 	      (erase-buffer)
 	      (insert (format
 		       "Date: %s\nFrom: %s\nSubject: %s Digest\n\n"
@@ -873,8 +869,7 @@
 	      (insert "Topics:\n")))
 	(when (not (eq in-state 'end))
 	  (setq state (list 'middle))))
-      (save-excursion
-	(set-buffer "*gnus-uu-body*")
+      (with-current-buffer "*gnus-uu-body*"
 	(goto-char (setq beg (point-max)))
 	(save-excursion
 	  (save-restriction
@@ -940,8 +935,7 @@
 	(when (re-search-forward "^Subject: \\(.*\\)$" nil t)
 	  (setq subj (buffer-substring (match-beginning 1) (match-end 1))))
 	(when subj
-	  (save-excursion
-	    (set-buffer "*gnus-uu-pre*")
+	  (with-current-buffer "*gnus-uu-pre*"
 	    (insert (format "   %s\n" subj)))))
       (when (or (eq in-state 'last)
 		(eq in-state 'first-and-last))
@@ -951,8 +945,7 @@
 	      (insert-buffer-substring "*gnus-uu-pre*")
 	      (goto-char (point-max))
 	      (insert-buffer-substring "*gnus-uu-body*"))
-	  (save-excursion
-	    (set-buffer "*gnus-uu-pre*")
+	  (with-current-buffer "*gnus-uu-pre*"
 	    (insert (format "\n\n%s\n\n" (make-string 70 ?-)))
 	    (if gnus-uu-digest-buffer
 		(with-current-buffer gnus-uu-digest-buffer
@@ -960,8 +953,7 @@
 		  (insert-buffer-substring "*gnus-uu-pre*"))
 	      (let ((coding-system-for-write mm-text-coding-system))
 		(gnus-write-buffer gnus-uu-saved-article-name))))
-	  (save-excursion
-	    (set-buffer "*gnus-uu-body*")
+	  (with-current-buffer "*gnus-uu-body*"
 	    (goto-char (point-max))
 	    (insert
 	     (concat (setq end-string (format "End of %s Digest" name))
@@ -993,8 +985,7 @@
 
 (defun gnus-uu-binhex-article (buffer in-state)
   (let (state start-char)
-    (save-excursion
-      (set-buffer buffer)
+    (with-current-buffer buffer
       (widen)
       (goto-char (point-min))
       (when (not (re-search-forward gnus-uu-binhex-begin-line nil t))
@@ -1030,8 +1021,7 @@
 ;; yEnc
 
 (defun gnus-uu-yenc-article (buffer in-state)
-  (save-excursion
-    (set-buffer gnus-original-article-buffer)
+  (with-current-buffer gnus-original-article-buffer
     (widen)
     (let ((file-name (yenc-extract-filename))
 	  state start-char)
@@ -1065,8 +1055,7 @@
 (defun gnus-uu-decode-postscript-article (process-buffer in-state)
   (let ((state (list 'ok))
 	start-char end-char file-name)
-    (save-excursion
-      (set-buffer process-buffer)
+    (with-current-buffer process-buffer
       (goto-char (point-min))
       (if (not (re-search-forward gnus-uu-postscript-begin-string nil t))
 	  (setq state (list 'wrong-type))
@@ -1128,8 +1117,7 @@
   ;; replaces the last thing that looks like "2/3" with "[0-9]+/3"
   ;; or, if it can't find something like that, tries "2 of 3", then
   ;; finally just replaces the next to last number with "[0-9]+".
-  (save-excursion
-    (set-buffer (gnus-get-buffer-create gnus-uu-output-buffer-name))
+  (with-current-buffer (gnus-get-buffer-create gnus-uu-output-buffer-name)
     (buffer-disable-undo)
     (erase-buffer)
     (insert (regexp-quote string))
@@ -1228,8 +1216,7 @@
   ;; decoded in.  Returns the list of expanded strings.
   (let ((out-list string-list)
 	string)
-    (save-excursion
-      (set-buffer (gnus-get-buffer-create gnus-uu-output-buffer-name))
+    (with-current-buffer (gnus-get-buffer-create gnus-uu-output-buffer-name)
       (buffer-disable-undo)
       (while string-list
 	(erase-buffer)
@@ -1332,11 +1319,9 @@
 	(gnus-summary-display-article article)
 
 	;; Push the article to the processing function.
-	(save-excursion
-	  (set-buffer gnus-original-article-buffer)
+	(with-current-buffer gnus-original-article-buffer
 	  (let ((buffer-read-only nil))
-	    (save-excursion
-	      (set-buffer gnus-summary-buffer)
+	    (with-current-buffer gnus-summary-buffer
 	      (setq process-state
 		    (funcall process-function
 			     gnus-original-article-buffer state)))))
@@ -1477,8 +1462,7 @@
 
 (defun gnus-uu-uustrip-article (process-buffer in-state)
   ;; Uudecodes a file asynchronously.
-  (save-excursion
-    (set-buffer process-buffer)
+  (with-current-buffer process-buffer
     (let ((state (list 'wrong-type))
 	  process-connection-type case-fold-search buffer-read-only
 	  files start-char)
@@ -1600,8 +1584,7 @@
 (defun gnus-uu-unshar-article (process-buffer in-state)
   (let ((state (list 'ok))
 	start-char)
-    (save-excursion
-      (set-buffer process-buffer)
+    (with-current-buffer process-buffer
       (goto-char (point-min))
       (if (not (re-search-forward gnus-uu-shar-begin-string nil t))
 	  (setq state (list 'wrong-type))
@@ -1688,8 +1671,7 @@
 
     (setq command (format "cd %s ; %s" dir (gnus-uu-command action file-path)))
 
-    (save-excursion
-      (set-buffer (gnus-get-buffer-create gnus-uu-output-buffer-name))
+    (with-current-buffer (gnus-get-buffer-create gnus-uu-output-buffer-name)
       (erase-buffer))
 
     (gnus-message 5 "Unpacking: %s..." (gnus-uu-command action file-path))
@@ -2039,9 +2021,8 @@
       (setq file-name file-path))
 
     (unwind-protect
-	(if (save-excursion
-	      (set-buffer (setq uubuf
-				(gnus-get-buffer-create uuencode-buffer-name)))
+	(if (with-current-buffer
+		(setq uubuf (gnus-get-buffer-create uuencode-buffer-name))
 	      (erase-buffer)
 	      (funcall gnus-uu-post-encode-method file-path file-name))
 	    (insert-buffer-substring uubuf)
@@ -2073,8 +2054,8 @@
     (setq beg-binary (point))
     (setq end-binary (point-max))
 
-    (save-excursion
-      (set-buffer (setq uubuf (gnus-get-buffer-create encoded-buffer-name)))
+    (with-current-buffer
+	(setq uubuf (gnus-get-buffer-create encoded-buffer-name))
       (erase-buffer)
       (insert-buffer-substring post-buf beg-binary end-binary)
       (goto-char (point-min))
@@ -2129,8 +2110,7 @@
 	  (insert (format " (%d/%d)" i parts)))
 
 	(goto-char (point-max))
-	(save-excursion
-	  (set-buffer uubuf)
+	(with-current-buffer uubuf
 	  (goto-char beg)
 	  (if (= i parts)
 	      (goto-char (point-max))

=== modified file 'lisp/gnus/gnus.el'
--- lisp/gnus/gnus.el	2010-09-02 03:35:06 +0000
+++ lisp/gnus/gnus.el	2010-09-18 10:02:19 +0000
@@ -2743,6 +2743,8 @@
   '((seen range)
     (killed range)
     (bookmark tuple)
+    (uid tuple)
+    (active tuple)
     (score tuple)))
 
 ;; Propagate flags to server, with the following exceptions:

=== modified file 'lisp/gnus/mm-decode.el'
--- lisp/gnus/mm-decode.el	2010-09-14 23:14:44 +0000
+++ lisp/gnus/mm-decode.el	2010-09-18 10:02:19 +0000
@@ -114,6 +114,7 @@
   "Render of HTML contents.
 It is one of defined renderer types, or a rendering function.
 The defined renderer types are:
+`gnus-article-html' : use Gnus renderer based on w3m;
 `w3m'  : use emacs-w3m;
 `w3m-standalone': use w3m;
 `links': use links;
@@ -122,8 +123,9 @@
 `html2text' : use html2text;
 nil    : use external viewer (default web browser)."
   :version "24.1"
-  :type '(choice (const w3)
-		 (const w3m :tag "emacs-w3m")
+  :type '(choice (const gnus-article-html)
+                 (const w3)
+                 (const w3m :tag "emacs-w3m")
 		 (const w3m-standalone :tag "standalone w3m" )
 		 (const links)
 		 (const lynx)

=== modified file 'lisp/gnus/mm-partial.el'
--- lisp/gnus/mm-partial.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/mm-partial.el	2010-09-18 10:02:19 +0000
@@ -70,8 +70,7 @@
 	    (sort (cons handle
 			(mm-partial-find-parts
 			 id
-			 (save-excursion
-			   (set-buffer gnus-summary-buffer)
+			 (with-current-buffer gnus-summary-buffer
 			   (gnus-summary-article-number))))
 		  #'(lambda (a b)
 		      (let ((anumber (string-to-number
@@ -83,8 +82,7 @@
 			(< anumber bnumber)))))
       (setq gnus-article-mime-handles
 	    (mm-merge-handles gnus-article-mime-handles phandles))
-      (save-excursion
-	(set-buffer (generate-new-buffer " *mm*"))
+      (with-current-buffer (generate-new-buffer " *mm*")
 	(while (setq phandle (pop phandles))
 	  (setq nn (string-to-number
 		    (cdr (assq 'number

=== modified file 'lisp/gnus/nnagent.el'
--- lisp/gnus/nnagent.el	2010-09-02 01:42:32 +0000
+++ lisp/gnus/nnagent.el	2010-09-18 10:02:19 +0000
@@ -252,6 +252,9 @@
   (nnoo-parent-function 'nnagent 'nnml-request-regenerate
 			(list (nnagent-server server))))
 
+(deffoo nnagent-retrieve-group-data-early (server infos)
+  nil)
+
 ;; Use nnml functions for just about everything.
 (nnoo-import nnagent
   (nnml))

=== modified file 'lisp/gnus/nnbabyl.el'
--- lisp/gnus/nnbabyl.el	2010-09-02 01:42:32 +0000
+++ lisp/gnus/nnbabyl.el	2010-09-18 10:02:19 +0000
@@ -75,8 +75,7 @@
 (nnoo-define-basics nnbabyl)
 
 (deffoo nnbabyl-retrieve-headers (articles &optional group server fetch-old)
-  (save-excursion
-    (set-buffer nntp-server-buffer)
+  (with-current-buffer nntp-server-buffer
     (erase-buffer)
     (let ((number (length articles))
 	  (count 0)
@@ -136,8 +135,7 @@
   ;; Restore buffer mode.
   (when (and (nnbabyl-server-opened)
 	     nnbabyl-previous-buffer-mode)
-    (save-excursion
-      (set-buffer nnbabyl-mbox-buffer)
+    (with-current-buffer nnbabyl-mbox-buffer
       (narrow-to-region
        (caar nnbabyl-previous-buffer-mode)
        (cdar nnbabyl-previous-buffer-mode))
@@ -155,8 +153,7 @@
 
 (deffoo nnbabyl-request-article (article &optional newsgroup server buffer)
   (nnbabyl-possibly-change-newsgroup newsgroup server)
-  (save-excursion
-    (set-buffer nnbabyl-mbox-buffer)
+  (with-current-buffer nnbabyl-mbox-buffer
     (goto-char (point-min))
     (when (search-forward (nnbabyl-article-string article) nil t)
       (let (start stop summary-line)
@@ -216,8 +213,7 @@
   (nnmail-get-new-mail
    'nnbabyl
    (lambda ()
-     (save-excursion
-       (set-buffer nnbabyl-mbox-buffer)
+     (with-current-buffer nnbabyl-mbox-buffer
        (save-buffer)))
    (file-name-directory nnbabyl-mbox-file)
    group
@@ -264,8 +260,7 @@
 	 rest)
     (nnmail-activate 'nnbabyl)
 
-    (save-excursion
-      (set-buffer nnbabyl-mbox-buffer)
+    (with-current-buffer nnbabyl-mbox-buffer
       (set-text-properties (point-min) (point-max) nil)
       (while (and articles is-old)
 	(goto-char (point-min))
@@ -308,8 +303,7 @@
 	result)
     (and
      (nnbabyl-request-article article group server)
-     (save-excursion
-       (set-buffer buf)
+     (with-current-buffer buf
        (insert-buffer-substring nntp-server-buffer)
        (goto-char (point-min))
        (while (re-search-forward
@@ -373,8 +367,7 @@
 
 (deffoo nnbabyl-request-replace-article (article group buffer)
   (nnbabyl-possibly-change-newsgroup group)
-  (save-excursion
-    (set-buffer nnbabyl-mbox-buffer)
+  (with-current-buffer nnbabyl-mbox-buffer
     (goto-char (point-min))
     (if (not (search-forward (nnbabyl-article-string article) nil t))
 	nil
@@ -388,8 +381,7 @@
   ;; Delete all articles in GROUP.
   (if (not force)
       ()				; Don't delete the articles.
-    (save-excursion
-      (set-buffer nnbabyl-mbox-buffer)
+    (with-current-buffer nnbabyl-mbox-buffer
       (goto-char (point-min))
       ;; Delete all articles in this group.
       (let ((ident (concat "\nX-Gnus-Newsgroup: " nnbabyl-current-group ":"))
@@ -409,8 +401,7 @@
 
 (deffoo nnbabyl-request-rename-group (group new-name &optional server)
   (nnbabyl-possibly-change-newsgroup group server)
-  (save-excursion
-    (set-buffer nnbabyl-mbox-buffer)
+  (with-current-buffer nnbabyl-mbox-buffer
     (goto-char (point-min))
     (let ((ident (concat "\nX-Gnus-Newsgroup: " nnbabyl-current-group ":"))
 	  (new-ident (concat "\nX-Gnus-Newsgroup: " new-name ":"))
@@ -558,9 +549,8 @@
 (defun nnbabyl-create-mbox ()
   (unless (file-exists-p nnbabyl-mbox-file)
     ;; Create a new, empty RMAIL mbox file.
-    (save-excursion
-      (set-buffer (setq nnbabyl-mbox-buffer
-			(create-file-buffer nnbabyl-mbox-file)))
+    (with-current-buffer (setq nnbabyl-mbox-buffer
+			       (create-file-buffer nnbabyl-mbox-file))
       (setq buffer-file-name nnbabyl-mbox-file)
       (insert "BABYL OPTIONS:\n\n\^_")
       (nnmail-write-region
@@ -572,8 +562,7 @@
 
   (unless (and nnbabyl-mbox-buffer
 	       (buffer-name nnbabyl-mbox-buffer)
-	       (save-excursion
-		 (set-buffer nnbabyl-mbox-buffer)
+	       (with-current-buffer nnbabyl-mbox-buffer
 		 (= (buffer-size) (nnheader-file-size nnbabyl-mbox-file))))
     ;; This buffer has changed since we read it last.  Possibly.
     (save-excursion

=== modified file 'lisp/gnus/nndiary.el'
--- lisp/gnus/nndiary.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/nndiary.el	2010-09-18 10:02:19 +0000
@@ -380,8 +380,7 @@
 
 (deffoo nndiary-retrieve-headers (sequence &optional group server fetch-old)
   (when (nndiary-possibly-change-directory group server)
-    (save-excursion
-      (set-buffer nntp-server-buffer)
+    (with-current-buffer nntp-server-buffer
       (erase-buffer)
       (let* ((file nil)
 	     (number (length sequence))
@@ -615,8 +614,7 @@
      (let (nndiary-current-directory
 	   nndiary-current-group
 	   nndiary-article-file-alist)
-       (save-excursion
-	 (set-buffer buf)
+       (with-current-buffer buf
 	 (insert-buffer-substring nntp-server-buffer)
 	 (setq result (eval accept-form))
 	 (kill-buffer (current-buffer))
@@ -672,8 +670,7 @@
 
 (deffoo nndiary-request-replace-article (article group buffer)
   (nndiary-possibly-change-directory group)
-  (save-excursion
-    (set-buffer buffer)
+  (with-current-buffer buffer
     (nndiary-possibly-create-directory group)
     (let ((chars (nnmail-insert-lines))
 	  (art (concat (int-to-string article) "\t"))
@@ -688,8 +685,7 @@
 	      t)
 	(setq headers (nndiary-parse-head chars article))
 	;; Replace the NOV line in the NOV file.
-	(save-excursion
-	  (set-buffer (nndiary-open-nov group))
+	(with-current-buffer (nndiary-open-nov group)
 	  (goto-char (point-min))
 	  (if (or (looking-at art)
 		  (search-forward (concat "\n" art) nil t))
@@ -842,8 +838,7 @@
 
 ;; Find an article number in the current group given the Message-ID.
 (defun nndiary-find-group-number (id)
-  (save-excursion
-    (set-buffer (get-buffer-create " *nndiary id*"))
+  (with-current-buffer (get-buffer-create " *nndiary id*")
     (let ((alist nndiary-group-alist)
 	  number)
       ;; We want to look through all .overview files, but we want to
@@ -888,8 +883,7 @@
     (let ((nov (expand-file-name nndiary-nov-file-name
 				 nndiary-current-directory)))
       (when (file-exists-p nov)
-	(save-excursion
-	  (set-buffer nntp-server-buffer)
+	(with-current-buffer nntp-server-buffer
 	  (erase-buffer)
 	  (nnheader-insert-file-contents nov)
 	  (if (and fetch-old
@@ -989,8 +983,7 @@
 
 (defun nndiary-add-nov (group article headers)
   "Add a nov line for the GROUP base."
-  (save-excursion
-    (set-buffer (nndiary-open-nov group))
+  (with-current-buffer (nndiary-open-nov group)
     (goto-char (point-max))
     (mail-header-set-number headers article)
     (nnheader-insert-nov headers)))
@@ -1015,8 +1008,7 @@
   (or (cdr (assoc group nndiary-nov-buffer-alist))
       (let ((buffer (get-buffer-create (format " *nndiary overview %s*"
 					       group))))
-	(save-excursion
-	  (set-buffer buffer)
+	(with-current-buffer buffer
 	  (set (make-local-variable 'nndiary-nov-buffer-file-name)
 	       (expand-file-name
 		nndiary-nov-file-name
@@ -1103,9 +1095,8 @@
 	 (nov (concat dir nndiary-nov-file-name))
 	 (nov-buffer (get-buffer-create " *nov*"))
 	 chars file headers)
-    (save-excursion
-      ;; Init the nov buffer.
-      (set-buffer nov-buffer)
+    ;; Init the nov buffer.
+    (with-current-buffer nov-buffer
       (buffer-disable-undo)
       (erase-buffer)
       (set-buffer nntp-server-buffer)
@@ -1125,20 +1116,17 @@
 	  (unless (zerop (buffer-size))
 	    (goto-char (point-min))
 	    (setq headers (nndiary-parse-head chars (caar files)))
-	    (save-excursion
-	      (set-buffer nov-buffer)
+	    (with-current-buffer nov-buffer
 	      (goto-char (point-max))
 	      (nnheader-insert-nov headers)))
 	  (widen))
 	(setq files (cdr files)))
-      (save-excursion
-	(set-buffer nov-buffer)
+      (with-current-buffer nov-buffer
 	(nnmail-write-region 1 (point-max) nov nil 'nomesg)
 	(kill-buffer (current-buffer))))))
 
 (defun nndiary-nov-delete-article (group article)
-  (save-excursion
-    (set-buffer (nndiary-open-nov group))
+  (with-current-buffer (nndiary-open-nov group)
     (when (nnheader-find-nov-line article)
       (delete-region (point) (progn (forward-line 1) (point)))
       (when (bobp)

=== modified file 'lisp/gnus/nndoc.el'
--- lisp/gnus/nndoc.el	2010-09-02 01:42:32 +0000
+++ lisp/gnus/nndoc.el	2010-09-18 10:02:19 +0000
@@ -215,8 +215,7 @@
 
 (deffoo nndoc-retrieve-headers (articles &optional newsgroup server fetch-old)
   (when (nndoc-possibly-change-buffer newsgroup server)
-    (save-excursion
-      (set-buffer nntp-server-buffer)
+    (with-current-buffer nntp-server-buffer
       (erase-buffer)
       (let (article entry)
 	(if (stringp (car articles))
@@ -333,8 +332,7 @@
 			       (concat " *nndoc " group "*"))))
 	    nndoc-group-alist)
       (setq nndoc-dissection-alist nil)
-      (save-excursion
-	(set-buffer nndoc-current-buffer)
+      (with-current-buffer nndoc-current-buffer
 	(erase-buffer)
 	(if (and (stringp nndoc-address)
 		 (string-match nndoc-binary-file-names nndoc-address))
@@ -347,8 +345,7 @@
     ;; Initialize the nndoc structures according to this new document.
     (when (and nndoc-current-buffer
 	       (not nndoc-dissection-alist))
-      (save-excursion
-	(set-buffer nndoc-current-buffer)
+      (with-current-buffer nndoc-current-buffer
 	(nndoc-set-delims)
 	(if (eq nndoc-article-type 'mime-parts)
 	    (nndoc-dissect-mime-parts)
@@ -588,8 +585,7 @@
 (defun nndoc-generate-clari-briefs-head (article)
   (let ((entry (cdr (assq article nndoc-dissection-alist)))
 	subject from)
-    (save-excursion
-      (set-buffer nndoc-current-buffer)
+    (with-current-buffer nndoc-current-buffer
       (save-restriction
 	(narrow-to-region (car entry) (nth 3 entry))
 	(goto-char (point-min))
@@ -677,8 +673,7 @@
   (let ((entry (cdr (assq article nndoc-dissection-alist)))
 	(from "<no address given>")
 	subject date)
-    (save-excursion
-      (set-buffer nndoc-current-buffer)
+    (with-current-buffer nndoc-current-buffer
       (save-restriction
 	(narrow-to-region (car entry) (nth 1 entry))
 	(goto-char (point-min))
@@ -829,8 +824,7 @@
 	(first t)
 	art-begin head-begin head-end body-begin body-end)
     (setq nndoc-dissection-alist nil)
-    (save-excursion
-      (set-buffer nndoc-current-buffer)
+    (with-current-buffer nndoc-current-buffer
       (goto-char (point-min))
       ;; Remove blank lines.
       (while (eq (following-char) ?\n)
@@ -902,8 +896,7 @@
 the header of this entity, and one article per sub-entity."
   (setq nndoc-dissection-alist nil
 	nndoc-mime-split-ordinal 0)
-  (save-excursion
-    (set-buffer nndoc-current-buffer)
+  (with-current-buffer nndoc-current-buffer
     (nndoc-dissect-mime-parts-sub (point-min) (point-max) nil nil nil)))
 
 (defun nndoc-dissect-mime-parts-sub (head-begin body-end article-insert

=== modified file 'lisp/gnus/nndraft.el'
--- lisp/gnus/nndraft.el	2010-09-02 01:42:32 +0000
+++ lisp/gnus/nndraft.el	2010-09-18 10:02:19 +0000
@@ -77,8 +77,7 @@
 
 (deffoo nndraft-retrieve-headers (articles &optional group server fetch-old)
   (nndraft-possibly-change-group group)
-  (save-excursion
-    (set-buffer nntp-server-buffer)
+  (with-current-buffer nntp-server-buffer
     (erase-buffer)
     (let* (article)
       ;; We don't support fetching by Message-ID.
@@ -119,8 +118,7 @@
 			      mm-text-coding-system)
 			  mm-auto-save-coding-system)))
 		   (nnmail-find-file newest)))
-	(save-excursion
-	  (set-buffer nntp-server-buffer)
+	(with-current-buffer nntp-server-buffer
 	  (goto-char (point-min))
 	  ;; If there's a mail header separator in this file,
 	  ;; we remove it.
@@ -209,8 +207,7 @@
 	result)
     (and
      (nndraft-request-article article group server)
-     (save-excursion
-       (set-buffer buf)
+     (with-current-buffer buf
        (erase-buffer)
        (insert-buffer-substring nntp-server-buffer)
        (setq result (eval accept-form))

=== modified file 'lisp/gnus/nneething.el'
--- lisp/gnus/nneething.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/nneething.el	2010-09-18 10:02:19 +0000
@@ -81,8 +81,7 @@
 (deffoo nneething-retrieve-headers (articles &optional group server fetch-old)
   (nneething-possibly-change-directory group)
 
-  (save-excursion
-    (set-buffer nntp-server-buffer)
+  (with-current-buffer nntp-server-buffer
     (erase-buffer)
     (let* ((number (length articles))
 	   (count 0)
@@ -323,8 +322,7 @@
      (if (equal '(0 0) (nth 5 atts)) ""
        (concat "Date: " (current-time-string (nth 5 atts)) "\n"))
      (or (when buffer
-	   (save-excursion
-	     (set-buffer buffer)
+	   (with-current-buffer buffer
 	     (when (re-search-forward "<[a-zA-Z0-9_]@[-a-zA-Z0-9_]>" 1000 t)
 	       (concat "From: " (match-string 0) "\n"))))
 	 (nneething-from-line (nth 2 atts) file))
@@ -332,8 +330,7 @@
 	 (concat "Chars: " (int-to-string (nth 7 atts)) "\n")
        "")
      (if buffer
-	 (save-excursion
-	   (set-buffer buffer)
+	 (with-current-buffer buffer
 	   (concat "Lines: " (int-to-string
 			      (count-lines (point-min) (point-max)))
 		   "\n"))
@@ -382,8 +379,7 @@
 
 (defun nneething-get-head (file)
   "Either find the head in FILE or make a head for FILE."
-  (save-excursion
-    (set-buffer (get-buffer-create nneething-work-buffer))
+  (with-current-buffer (get-buffer-create nneething-work-buffer)
     (setq case-fold-search nil)
     (buffer-disable-undo)
     (erase-buffer)

=== modified file 'lisp/gnus/nnfolder.el'
--- lisp/gnus/nnfolder.el	2010-09-02 01:42:32 +0000
+++ lisp/gnus/nnfolder.el	2010-09-18 10:02:19 +0000
@@ -157,8 +157,7 @@
 (nnoo-define-basics nnfolder)
 
 (deffoo nnfolder-retrieve-headers (articles &optional group server fetch-old)
-  (save-excursion
-    (set-buffer nntp-server-buffer)
+  (with-current-buffer nntp-server-buffer
     (erase-buffer)
     (let (article start stop num)
       (nnfolder-possibly-change-group group server)
@@ -261,8 +260,7 @@
 
 (deffoo nnfolder-request-article (article &optional group server buffer)
   (nnfolder-possibly-change-group group server)
-  (save-excursion
-    (set-buffer nnfolder-current-buffer)
+  (with-current-buffer nnfolder-current-buffer
     (goto-char (point-min))
     (when (nnfolder-goto-article article)
       (let (start stop)
@@ -360,8 +358,7 @@
 	      nnfolder-current-group (car inf))))
     (when (and nnfolder-current-buffer
 	       (buffer-name nnfolder-current-buffer))
-      (save-excursion
-	(set-buffer nnfolder-current-buffer)
+      (with-current-buffer nnfolder-current-buffer
 	;; If the buffer was modified, write the file out now.
 	(nnfolder-save-buffer)
 	;; If we're shutting the server down, we need to kill the
@@ -447,8 +444,7 @@
 	target)
     (nnmail-activate 'nnfolder)
 
-    (save-excursion
-      (set-buffer nnfolder-current-buffer)
+    (with-current-buffer nnfolder-current-buffer
       ;; Since messages are sorted in arrival order and expired in the
       ;; same order, we can stop as soon as we find a message that is
       ;; too old.
@@ -501,8 +497,7 @@
 	  result)
       (and
        (nnfolder-request-article article group server)
-       (save-excursion
-	 (set-buffer buf)
+       (with-current-buffer buf
 	 (erase-buffer)
 	 (insert-buffer-substring nntp-server-buffer)
 	 (goto-char (point-min))
@@ -578,8 +573,7 @@
 
 (deffoo nnfolder-request-replace-article (article group buffer)
   (nnfolder-possibly-change-group group)
-  (save-excursion
-    (set-buffer buffer)
+  (with-current-buffer buffer
     (goto-char (point-min))
     (if (not (looking-at "X-From-Line: "))
 	(insert "From nobody " (current-time-string) "\n")
@@ -596,8 +590,7 @@
       (nnfolder-delete-mail)
       (insert-buffer-substring buffer)
       (unless (or gnus-nov-is-evil nnfolder-nov-is-evil)
-	(save-excursion
-	  (set-buffer buffer)
+	(with-current-buffer buffer
 	  (let ((headers (nnfolder-parse-head article
 					      (point-min) (point-max))))
 	    (with-current-buffer (nnfolder-open-nov group)
@@ -630,8 +623,7 @@
 
 (deffoo nnfolder-request-rename-group (group new-name &optional server)
   (nnfolder-possibly-change-group group server)
-  (save-excursion
-    (set-buffer nnfolder-current-buffer)
+  (with-current-buffer nnfolder-current-buffer
     (and (file-writable-p buffer-file-name)
 	 (ignore-errors
 	   (let ((new-file (nnfolder-group-pathname new-name)))
@@ -671,8 +663,7 @@
 	 (marker (concat "\n" nnfolder-article-marker))
 	 (number "[0-9]+")
 	 (activemin (cdr active)))
-    (save-excursion
-      (set-buffer nnfolder-current-buffer)
+    (with-current-buffer nnfolder-current-buffer
       (goto-char (point-min))
       (while (and (search-forward marker nil t)
 		  (re-search-forward number nil t))
@@ -1114,8 +1105,7 @@
 (defun nnfolder-open-nov (group)
   (or (cdr (assoc group nnfolder-nov-buffer-alist))
       (let ((buffer (get-buffer-create (format " *nnfolder overview %s*" group))))
-	(save-excursion
-	  (set-buffer buffer)
+	(with-current-buffer buffer
 	  (set (make-local-variable 'nnfolder-nov-buffer-file-name)
 	       (nnfolder-group-nov-pathname group))
 	  (erase-buffer)
@@ -1139,8 +1129,7 @@
       (setq nnfolder-nov-buffer-alist (cdr nnfolder-nov-buffer-alist)))))
 
 (defun nnfolder-nov-delete-article (group article)
-  (save-excursion
-    (set-buffer (nnfolder-open-nov group))
+  (with-current-buffer (nnfolder-open-nov group)
     (when (nnheader-find-nov-line article)
       (delete-region (point) (progn (forward-line 1) (point))))
     t))
@@ -1150,8 +1139,7 @@
       nil
     (let ((nov (nnfolder-group-nov-pathname nnfolder-current-group)))
       (when (file-exists-p nov)
-	(save-excursion
-	  (set-buffer nntp-server-buffer)
+	(with-current-buffer nntp-server-buffer
 	  (erase-buffer)
 	  (nnheader-insert-file-contents nov)
 	  (if (and fetch-old
@@ -1187,8 +1175,7 @@
 
 (defun nnfolder-add-nov (group article headers)
   "Add a nov line for the GROUP base."
-  (save-excursion
-    (set-buffer (nnfolder-open-nov group))
+  (with-current-buffer (nnfolder-open-nov group)
     (goto-char (point-max))
     (mail-header-set-number headers article)
     (nnheader-insert-nov headers)))

=== modified file 'lisp/gnus/nnheader.el'
--- lisp/gnus/nnheader.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/nnheader.el	2010-09-18 10:02:19 +0000
@@ -835,8 +835,7 @@
   "Clear the communication buffer and insert FORMAT and ARGS into the buffer.
 If FORMAT isn't a format string, it and all ARGS will be inserted
 without formatting."
-  (save-excursion
-    (set-buffer nntp-server-buffer)
+  (with-current-buffer nntp-server-buffer
     (erase-buffer)
     (if (string-match "%" format)
 	(insert (apply 'format format args))

=== modified file 'lisp/gnus/nnimap.el'
--- lisp/gnus/nnimap.el	2010-09-06 00:33:15 +0000
+++ lisp/gnus/nnimap.el	2010-09-18 10:02:19 +0000
@@ -1,11 +1,9 @@
-;;; nnimap.el --- imap backend for Gnus
-
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008, 2009, 2010  Free Software Foundation, Inc.
-
-;; Author: Simon Josefsson <simon@josefsson.org>
-;;         Jim Radford <radford@robby.caltech.edu>
-;; Keywords: mail
+;;; nnimap.el --- IMAP interface for Gnus
+
+;; Copyright (C) 2010 Free Software Foundation, Inc.
+
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
+;;         Simon Josefsson <simon@josefsson.org>
 
 ;; This file is part of GNU Emacs.
 
@@ -24,1791 +22,942 @@
 
 ;;; Commentary:
 
-;; Todo, major things:
-;;
-;;   o Fix Gnus to view correct number of unread/total articles in group buffer
-;;   o Fix Gnus to handle leading '.' in group names (fixed?)
-;;   o Finish disconnected mode (moving articles between mailboxes unplugged)
-;;   o Sieve
-;;   o MIME (partial article fetches)
-;;   o Split to other backends, different split rules for different
-;;     servers/inboxes
-;;
-;; Todo, minor things:
-;;
-;;   o Don't require half of Gnus -- backends should be standalone
-;;   o Verify that we don't use IMAP4rev1 specific things (RFC2060 App B)
-;;   o Dont uid fetch 1,* in nnimap-retrive-groups (slow)
-;;   o Split up big fetches (1,* header especially) in smaller chunks
-;;   o What do I do with gnus-newsgroup-*?
-;;   o Tell Gnus about new groups (how can we tell?)
-;;   o Respooling (fix Gnus?) (unnecessary?)
-;;   o Add support for the following: (if applicable)
-;;       request-list-newsgroups, request-regenerate
-;;       list-active-group,
-;;       request-associate-buffer, request-restore-buffer,
-;;   o Do The Right Thing when UIDVALIDITY changes (what's the right thing?)
-;;   o Support RFC2221 (Login referrals)
-;;   o IMAP2BIS compatibility? (RFC2061)
-;;   o ACAP stuff (perhaps a different project, would be nice to ACAPify
-;;     .newsrc.eld)
-;;   o What about Gnus's article editing, can we support it?  NO!
-;;   o Use \Draft to support the draft group??
-;;   o Duplicate suppression
-;;   o Rewrite UID SEARCH UID X as UID FETCH X (UID) for those with slow servers
+;; nnimap interfaces Gnus with IMAP servers.
 
 ;;; Code:
 
-;; For Emacs < 22.2.
 (eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
-
-(require 'imap)
-(require 'nnoo)
-(require 'nnmail)
-(require 'nnheader)
-(require 'mm-util)
-(require 'gnus)
-(require 'gnus-range)
-(require 'gnus-start)
-(require 'gnus-int)
-
-(eval-when-compile (require 'cl))
-
-(autoload 'auth-source-user-or-password "auth-source")
+  (require 'nnheader))
+
+(eval-when-compile
+  (require 'cl))
+
+(require 'netrc)
 
 (nnoo-declare nnimap)
 
-(defconst nnimap-version "nnimap 1.0")
-
-(defgroup nnimap nil
-  "Reading IMAP mail with Gnus."
-  :group 'gnus)
-
 (defvoo nnimap-address nil
-  "Address of physical IMAP server.  If nil, use the virtual server's name.")
+  "The address of the IMAP server.")
 
 (defvoo nnimap-server-port nil
-  "Port number on physical IMAP server.
-If nil, defaults to 993 for TLS/SSL connections and 143 otherwise.")
-
-;; Splitting variables
-
-(defcustom nnimap-split-crosspost t
-  "If non-nil, do crossposting if several split methods match the mail.
-If nil, the first match found will be used."
-  :group 'nnimap
-  :type 'boolean)
-
-(defcustom nnimap-split-inbox nil
-  "Name of mailbox to split mail from.
-
-Mail is read from this mailbox and split according to rules in
-`nnimap-split-rule'.
-
-This can be a string or a list of strings."
-  :group 'nnimap
-  :type '(choice (string)
-		 (repeat string)))
-
-(define-widget 'nnimap-strict-function 'function
-  "This widget only matches values that are functionp.
-
-Warning: This means that a value that is the symbol of a not yet
-loaded function will not match.  Use with care."
-  :match 'nnimap-strict-function-match)
-
-(defun nnimap-strict-function-match (widget value)
-  "Ignoring WIDGET, match if VALUE is a function."
-  (functionp value))
-
-(defcustom nnimap-split-rule nil
-  "Mail will be split according to these rules.
-
-Mail is read from mailbox(es) specified in `nnimap-split-inbox'.
-
-If you'd like, for instance, one mail group for mail from the
-\"gnus-imap\" mailing list, one group for junk mail and leave
-everything else in the incoming mailbox, you could do something like
-this:
-
-\(setq nnimap-split-rule '((\"INBOX.gnus-imap\"   \"From:.*gnus-imap\")
-			  (\"INBOX.junk\"        \"Subject:.*buy\")))
-
-As you can see, `nnimap-split-rule' is a list of lists, where the
-first element in each \"rule\" is the name of the IMAP mailbox (or the
-symbol `junk' if you want to remove the mail), and the second is a
-regexp that nnimap will try to match on the header to find a fit.
-
-The second element can also be a function.  In that case, it will be
-called narrowed to the headers with the first element of the rule as
-the argument.  It should return a non-nil value if it thinks that the
-mail belongs in that group.
-
-This variable can also have a function as its value, the function will
-be called with the headers narrowed and should return a group where it
-thinks the article should be splitted to.  See `nnimap-split-fancy'.
-
-To allow for different split rules on different virtual servers, and
-even different split rules in different inboxes on the same server,
-the syntax of this variable have been extended along the lines of:
-
-\(setq nnimap-split-rule
-      '((\"my1server\"    (\".*\"    ((\"ding\"    \"ding@gnus.org\")
-				  (\"junk\"    \"From:.*Simon\")))
-	(\"my2server\"    (\"INBOX\" nnimap-split-fancy))
-	(\"my[34]server\" (\".*\"    ((\"private\" \"To:.*Simon\")
-				  (\"junk\"    my-junk-func)))))
-
-The virtual server name is in fact a regexp, so that the same rules
-may apply to several servers.  In the example, the servers
-\"my3server\" and \"my4server\" both use the same rules.  Similarly,
-the inbox string is also a regexp.  The actual splitting rules are as
-before, either a function, or a list with group/regexp or
-group/function elements."
-  :group 'nnimap
-  ;; FIXME: Doesn't allow `("my2server" ("INBOX" nnimap-split-fancy))'
-  ;; per example above.  -- fx
-  :type '(choice :tag "Rule type"
-		 (repeat :menu-tag "Single-server"
-			 :tag "Single-server list"
-			 (list (string :tag "Mailbox")
-			       (choice :tag "Predicate"
-				       (regexp :tag "A regexp")
-				       (nnimap-strict-function :tag "A function"))))
-		 (choice :menu-tag "A function"
-			 :tag "A function"
-			 (function-item nnimap-split-fancy)
-			 (function-item nnmail-split-fancy)
-			 (nnimap-strict-function :tag "User-defined function"))
-		 (repeat :menu-tag "Multi-server (extended)"
-			 :tag "Multi-server list"
-			 (list (regexp :tag "Server regexp")
-			       (list (regexp :tag "Incoming Mailbox regexp")
-				     (repeat :tag "Rules for matching server(s) and mailbox(es)"
-					     (list (string :tag "Destination mailbox")
-						   (choice :tag "Predicate"
-							   (regexp :tag "A Regexp")
-							   (nnimap-strict-function :tag "A Function")))))))))
-
-(defcustom nnimap-split-predicate "UNSEEN UNDELETED"
-  "The predicate used to find articles to split.
-If you use another IMAP client to peek on articles but always would
-like nnimap to split them once it's started, you could change this to
-\"UNDELETED\". Other available predicates are available in
-RFC2060 section 6.4.4."
-  :group 'nnimap
-  :type 'string)
-
-(defcustom nnimap-split-fancy nil
-  "Like the variable `nnmail-split-fancy'."
-  :group 'nnimap
-  :type 'sexp)
+  "The IMAP port used.
+If nnimap-stream is `ssl', this will default to `imaps'.  If not,
+it will default to `imap'.")
+
+(defvoo nnimap-stream 'ssl
+  "How nnimap will talk to the IMAP server.
+Values are `ssl' and `network'.")
+
+(defvoo nnimap-shell-program (if (boundp 'imap-shell-program)
+				 (if (listp imap-shell-program)
+				     (car imap-shell-program)
+				   imap-shell-program)
+			       "ssh %s imapd"))
+
+(defvoo nnimap-inbox nil
+  "The mail box where incoming mail arrives and should be split out of.")
+
+(defvoo nnimap-expunge-inbox nil
+  "If non-nil, expunge the inbox after fetching mail.
+This is always done if the server supports UID EXPUNGE, but it's
+not done by default on servers that doesn't support that command.")
+
+(defvoo nnimap-connection-alist nil)
+(defvar nnimap-process nil)
+
+(defvar nnimap-status-string "")
 
 (defvar nnimap-split-download-body-default nil
   "Internal variable with default value for `nnimap-split-download-body'.")
 
-(defcustom nnimap-split-download-body 'default
-  "Whether to download entire articles during splitting.
-This is generally not required, and will slow things down considerably.
-You may need it if you want to use an advanced splitting function that
-analyzes the body before splitting the article.
-If this variable is nil, bodies will not be downloaded; if this
-variable is the symbol `default' the default behavior is
-used (which currently is nil, unless you use a statistical
-spam.el test); if this variable is another non-nil value bodies
-will be downloaded."
-  :version "22.1"
-  :group 'nnimap
-  :type '(choice (const :tag "Let system decide" deault)
-		 boolean))
-
-;; Performance / bug workaround variables
-
-(defcustom nnimap-close-asynchronous t
-  "Close mailboxes asynchronously in `nnimap-close-group'.
-This means that errors caught by nnimap when closing the mailbox will
-not prevent Gnus from updating the group status, which may be harmful.
-However, it increases speed."
-  :version "22.1"
-  :type 'boolean
-  :group 'nnimap)
-
-(defcustom nnimap-dont-close t
-  "Never close mailboxes.
-This increases the speed of closing mailboxes (quiting group) but may
-decrease the speed of selecting another mailbox later.  Re-selecting
-the same mailbox will be faster though."
-  :version "22.1"
-  :type 'boolean
-  :group 'nnimap)
-
-(defcustom nnimap-retrieve-groups-asynchronous t
-  "Send asynchronous STATUS commands for each mailbox before checking mail.
-If you have mailboxes that rarely receives mail, this speeds up new
-mail checking.  It works by first sending STATUS commands for each
-mailbox, and then only checking groups which has a modified UIDNEXT
-more carefully for new mail.
-
-In summary, the default is O((1-p)*k+p*n) and changing it to nil makes
-it O(n).  If p is small, then the default is probably faster."
-  :version "22.1"
-  :type 'boolean
-  :group 'nnimap)
-
-(defvoo nnimap-need-unselect-to-notice-new-mail t
-  "Unselect mailboxes before looking for new mail in them.
-Some servers seem to need this under some circumstances.")
-
-(defvoo nnimap-logout-timeout nil
-  "Close server immediately if it can't logout in this number of seconds.
-If it is nil, never close server until logout completes.  This variable
-overrides `imap-logout-timeout' on a per-server basis.")
-
-;; Authorization / Privacy variables
-
-(defvoo nnimap-auth-method nil
-  "Obsolete.")
-
-(defvoo nnimap-stream nil
-  "How nnimap will connect to the server.
-
-The default, nil, will try to use the \"best\" method the server can
-handle.
-
-Change this if
-
-1) you want to connect with TLS/SSL.  The TLS/SSL integration
-   with IMAP is suboptimal so you'll have to tell it
-   specifically.
-
-2) your server is more capable than your environment -- i.e. your
-   server accept Kerberos login's but you haven't installed the
-   `imtest' program or your machine isn't configured for Kerberos.
-
-Possible choices: gssapi, kerberos4, starttls, tls, ssl, network, shell.
-See also `imap-streams' and `imap-stream-alist'.")
-
-(defvoo nnimap-authenticator nil
-  "How nnimap authenticate itself to the server.
-
-The default, nil, will try to use the \"best\" method the server can
-handle.
-
-There is only one reason for fiddling with this variable, and that is
-if your server is more capable than your environment -- i.e. you
-connect to a server that accept Kerberos login's but you haven't
-installed the `imtest' program or your machine isn't configured for
-Kerberos.
-
-Possible choices: gssapi, kerberos4, digest-md5, cram-md5, login, anonymous.
-See also `imap-authenticators' and `imap-authenticator-alist'")
-
-(defvoo nnimap-directory (nnheader-concat gnus-directory "overview/")
-  "Directory to keep NOV cache files for nnimap groups.
-See also `nnimap-nov-file-name'.")
-
-(defvoo nnimap-nov-file-name "nnimap."
-  "NOV cache base filename.
-The group name and `nnimap-nov-file-name-suffix' will be appended.  A
-typical complete file name would be
-~/News/overview/nnimap.pdc.INBOX.ding.nov, or
-~/News/overview/nnimap/pdc/INBOX/ding/nov if
-`nnmail-use-long-file-names' is nil")
-
-(defvoo nnimap-nov-file-name-suffix ".novcache"
-  "Suffix for NOV cache base filename.")
-
-(defvoo nnimap-nov-is-evil gnus-agent
-  "If non-nil, never generate or use a local nov database for this backend.
-Using nov databases should speed up header fetching considerably.
-However, it will invoke a UID SEARCH UID command on the server, and
-some servers implement this command inefficiently by opening each and
-every message in the group, thus making it quite slow.
-Unlike other backends, you do not need to take special care if you
-flip this variable.")
-
-(defvoo nnimap-search-uids-not-since-is-evil nil
-  "If non-nil, avoid \"UID SEARCH UID ... NOT SINCE\" queries when expiring.
-Instead, use \"UID SEARCH SINCE\" to prune the list of expirable
-articles within Gnus.  This seems to be faster on Courier in some cases.")
-
-(defvoo nnimap-expunge-on-close 'always ; 'ask, 'never
-  "Whether to expunge a group when it is closed.
-When a IMAP group with articles marked for deletion is closed, this
-variable determine if nnimap should actually remove the articles or
-not.
-
-If always, nnimap always perform a expunge when closing the group.
-If never, nnimap never expunges articles marked for deletion.
-If ask, nnimap will ask you if you wish to expunge marked articles.
-
-When setting this variable to `never', you can only expunge articles
-by using `G x' (gnus-group-nnimap-expunge) from the Group buffer.")
-
-(defvoo nnimap-list-pattern "*"
-  "A string LIMIT or list of strings with mailbox wildcards used to limit available groups.
-See below for available wildcards.
-
-The LIMIT string can be a cons cell (REFERENCE . LIMIT), where
-REFERENCE will be passed as the first parameter to LIST/LSUB.  The
-semantics of this are server specific, on the University of Washington
-server you can specify a directory.
-
-Example:
- '(\"INBOX\" \"mail/*\" (\"~friend/mail/\" . \"list/*\"))
-
-There are two wildcards * and %. * matches everything, % matches
-everything in the current hierarchy.")
-
-(defvoo nnimap-news-groups nil
-  "IMAP support a news-like mode, also known as bulletin board mode,
-where replies is sent via IMAP instead of SMTP.
-
-This variable should contain a regexp matching groups where you wish
-replies to be stored to the mailbox directly.
-
-Example:
-  '(\"^[^I][^N][^B][^O][^X].*$\")
-
-This will match all groups not beginning with \"INBOX\".
-
-Note that there is nothing technically different between mail-like and
-news-like mailboxes.  If you wish to have a group with todo items or
-similar which you wouldn't want to set up a mailing list for, you can
-use this to make replies go directly to the group.")
-
-(defvoo nnimap-expunge-search-string "UID %s NOT SINCE %s"
-  "IMAP search command to use for articles that are to be expired.
-The first %s is replaced by a UID set of articles to search on,
-and the second %s is replaced by a date criterium.
-
-One useful (and perhaps the only useful) value to change this to would
-be `UID %s NOT SENTSINCE %s' to make nnimap use the Date: header
-instead of the internal date of messages.  See section 6.4.4 of RFC
-2060 for more information on valid strings.
-
-However, if `nnimap-search-uids-not-since-is-evil' is true, this
-variable has no effect since the search logic is reversed.")
-
-(defvoo nnimap-importantize-dormant t
-  "If non-nil, mark \"dormant\" articles as \"ticked\" for other IMAP clients.
-Note that within Gnus, dormant articles will still (only) be
-marked as ticked.  This is to make \"dormant\" articles stand out,
-just like \"ticked\" articles, in other IMAP clients.")
-
-(defvoo nnimap-server-address nil
-  "Obsolete.  Use `nnimap-address'.")
-
-(defcustom nnimap-authinfo-file "~/.authinfo"
-  "Authorization information for IMAP servers.  In .netrc format."
-  :type
-  '(choice file
-	   (repeat :tag "Entries"
-		   :menu-tag "Inline"
-		   (list :format "%v"
-			 :value ("" ("login" . "") ("password" . ""))
-			 (string :tag "Host")
-			 (checklist :inline t
-				    (cons :format "%v"
-					  (const :format "" "login")
-					  (string :format "Login: %v"))
-				    (cons :format "%v"
-					  (const :format "" "password")
-					  (string :format "Password: %v"))))))
-  :group 'nnimap)
-
-(defcustom nnimap-prune-cache t
-  "If non-nil, nnimap check whether articles still exist on server before using data stored in NOV cache."
-  :type 'boolean
-  :group 'nnimap)
-
-(defvar nnimap-request-list-method 'imap-mailbox-list
-  "Method to use to request a list of all folders from the server.
-If this is 'imap-mailbox-lsub, then use a server-side subscription list to
-restrict visible folders.")
-
-(defcustom nnimap-id nil
-  "Plist with client identity to send to server upon login.
-A nil value means no information is sent, symbol `no' to disable ID query
-altogether, or plist with identifier-value pairs to send to
-server.  RFC 2971 describes the list as follows:
-
-   Any string may be sent as a field, but the following are defined to
-   describe certain values that might be sent.  Implementations are free
-   to send none, any, or all of these.  Strings are not case-sensitive.
-   Field strings MUST NOT be longer than 30 octets.  Value strings MUST
-   NOT be longer than 1024 octets.  Implementations MUST NOT send more
-   than 30 field-value pairs.
-
-     name            Name of the program
-     version         Version number of the program
-     os              Name of the operating system
-     os-version      Version of the operating system
-     vendor          Vendor of the client/server
-     support-url     URL to contact for support
-     address         Postal address of contact/vendor
-     date            Date program was released, specified as a date-time
-                       in IMAP4rev1
-     command         Command used to start the program
-     arguments       Arguments supplied on the command line, if any
-                       if any
-     environment     Description of environment, i.e., UNIX environment
-                       variables or Windows registry settings
-
-   Implementations MUST NOT send the same field name more than once.
-
-An example plist would be '(\"name\" \"Gnus\" \"version\" gnus-version-number
-\"os\" system-configuration \"vendor\" \"GNU\")."
-  :group 'nnimap
-  :type '(choice (const :tag "No information" nil)
-		 (const :tag "Disable ID query" no)
-		 (plist :key-type string :value-type string)))
-
-(defcustom nnimap-debug nil
-  "If non-nil, trace nnimap- functions into `nnimap-debug-buffer'.
-Uses `trace-function-background', so you can turn it off with,
-say, `untrace-all'.
-
-Note that username, passwords and other privacy sensitive
-information (such as e-mail) may be stored in the buffer.
-It is not written to disk, however.  Do not enable this
-variable unless you are comfortable with that.
-
-This variable only takes effect when loading the `nnimap' library.
-See also `nnimap-log'."
-  :group 'nnimap
-  :type 'boolean)
-
-;; Internal variables:
-
-(defvar nnimap-debug-buffer "*nnimap-debug*")
-(defvar nnimap-mailbox-info (gnus-make-hashtable 997))
-(defvar nnimap-current-move-server nil)
-(defvar nnimap-current-move-group nil)
-(defvar nnimap-current-move-article nil)
-(defvar nnimap-length)
-(defvar nnimap-progress-chars '(?| ?/ ?- ?\\))
-(defvar nnimap-progress-how-often 20)
-(defvar nnimap-counter)
-(defvar nnimap-server-buffer-alist nil)	;; Map server name to buffers.
-(defvar nnimap-current-server nil) ;; Current server
-(defvar nnimap-server-buffer nil) ;; Current servers' buffer
-
-
-
-(nnoo-define-basics nnimap)
-
-;; Utility functions:
-
-(defsubst nnimap-decode-group-name (group)
-  (and group
-       (gnus-group-decoded-name group)))
-
-(defsubst nnimap-encode-group-name (group)
-  (and group
-       (mm-encode-coding-string group (gnus-group-name-charset nil group))))
-
-(defun nnimap-group-prefixed-name (group &optional server)
-  (gnus-group-prefixed-name group
-			    (gnus-server-to-method
-			     (format "nnimap:%s"
-				     (or server nnimap-current-server)))))
-
-(defsubst nnimap-get-server-buffer (server)
-  "Return buffer for SERVER, if nil use current server."
-  (cadr (assoc (or server nnimap-current-server) nnimap-server-buffer-alist)))
-
-(defun nnimap-remove-server-from-buffer-alist (server list)
-  "Remove SERVER from LIST."
-  (let (l)
-    (dolist (e list)
-      (unless (equal server (car-safe e))
-	(push e l)))
-    l))
-
-(defun nnimap-possibly-change-server (server)
-  "Return buffer for SERVER, changing the current server as a side-effect.
-If SERVER is nil, uses the current server."
-  (setq nnimap-current-server (or server nnimap-current-server)
-	nnimap-server-buffer (nnimap-get-server-buffer nnimap-current-server)))
-
-(defun nnimap-verify-uidvalidity (group server)
-  "Verify stored uidvalidity match current one in GROUP on SERVER."
-  (let* ((gnusgroup (nnimap-group-prefixed-name group server))
-	 (new-uidvalidity (imap-mailbox-get 'uidvalidity))
-	 (old-uidvalidity (gnus-group-get-parameter gnusgroup 'uidvalidity))
-	 (dir (file-name-as-directory (expand-file-name nnimap-directory)))
-	 (nameuid (nnheader-translate-file-chars
-		   (concat nnimap-nov-file-name
-			   (if (equal server "")
-			       "unnamed"
-			     server) "." group "." old-uidvalidity
-			   nnimap-nov-file-name-suffix) t))
-	 (file (if (or nnmail-use-long-file-names
-		       (file-exists-p (expand-file-name nameuid dir)))
-		   (expand-file-name nameuid dir)
-		 (expand-file-name
-		  (mm-encode-coding-string
-		   (nnheader-replace-chars-in-string nameuid ?. ?/)
-		   nnmail-pathname-coding-system)
-		  dir))))
-    (if old-uidvalidity
-	(if (not (equal old-uidvalidity new-uidvalidity))
-	    ;; uidvalidity clash
-	    (progn
-	      (gnus-group-set-parameter gnusgroup 'uidvalidity new-uidvalidity)
-	      (gnus-group-remove-parameter gnusgroup 'imap-status)
-	      (gnus-sethash (gnus-group-prefixed-name group server)
-			    nil nnimap-mailbox-info)
-	      (gnus-delete-file file))
-	  t)
-      (gnus-group-add-parameter gnusgroup (cons 'uidvalidity new-uidvalidity))
-      (gnus-group-remove-parameter gnusgroup 'imap-status)
-      (gnus-sethash			; Maybe not necessary here.
-       (gnus-group-prefixed-name group server)
-       nil nnimap-mailbox-info)
-      t)))
-
-(defun nnimap-before-find-minmax-bugworkaround ()
-  "Function called before iterating through mailboxes with
-`nnimap-find-minmax-uid'."
-  (when nnimap-need-unselect-to-notice-new-mail
-    ;; XXX this is for UoW imapd problem, it doesn't notice new mail in
-    ;; currently selected mailbox without a re-select/examine.
-    (or (null (imap-current-mailbox nnimap-server-buffer))
-	(imap-mailbox-unselect nnimap-server-buffer))))
-
-(defun nnimap-find-minmax-uid (group &optional examine)
-  "Find lowest and highest active article number in GROUP.
-If EXAMINE is non-nil the group is selected read-only."
-  (with-current-buffer nnimap-server-buffer
-    (let ((decoded-group (nnimap-decode-group-name group)))
-      (when (or (string= decoded-group (imap-current-mailbox))
-		(imap-mailbox-select decoded-group examine))
-	(let (minuid maxuid)
-	  (when (> (imap-mailbox-get 'exists) 0)
-	    (imap-fetch "1:*" "UID" nil 'nouidfetch)
-	    (imap-message-map
-	     (lambda (uid Uid)
-	       (setq minuid (if minuid (min minuid uid) uid)
-		     maxuid (if maxuid (max maxuid uid) uid)))
-	     'UID))
-	  (list (imap-mailbox-get 'exists) minuid maxuid))))))
-
-(defun nnimap-possibly-change-group (group &optional server)
-  "Make GROUP the current group, and SERVER the current server."
-  (when (nnimap-possibly-change-server server)
-    (let ((decoded-group (nnimap-decode-group-name group)))
-      (with-current-buffer nnimap-server-buffer
-	(if (or (null group) (imap-current-mailbox-p decoded-group))
-	    imap-current-mailbox	; Note: utf-7 encoded.
-	  (if (imap-mailbox-select decoded-group)
-	      (if (or (nnimap-verify-uidvalidity
-		       group (or server nnimap-current-server))
-		      (zerop (imap-mailbox-get 'exists decoded-group))
-		      t ;; for OGnus to see if ignoring uidvalidity
-		      ;; changes has any bad effects.
-		      (yes-or-no-p
-		       (format
-			"nnimap: Group %s is not uidvalid.  Continue? "
-			decoded-group)))
-		  imap-current-mailbox	; Note: utf-7 encoded.
-		(imap-mailbox-unselect)
-		(error "nnimap: Group %s is not uid-valid" decoded-group))
-	    (nnheader-report 'nnimap (imap-error-text))))))))
-
-(defun nnimap-replace-whitespace (string)
-  "Return STRING with all whitespace replaced with space."
-  (when string
-    (while (string-match "[\r\n\t]+" string)
-      (setq string (replace-match " " t t string)))
-    string))
-
-;; Required backend functions
-
-(defun nnimap-retrieve-headers-progress ()
-  "Hook to insert NOV line for current article into `nntp-server-buffer'."
-  (and (numberp nnmail-large-newsgroup)
-       (zerop (% (incf nnimap-counter) nnimap-progress-how-often))
-       (> nnimap-length nnmail-large-newsgroup)
-       (nnheader-message 6 "nnimap: Retrieving headers... %c"
-			 (nth (/ (% nnimap-counter
-				    (* (length nnimap-progress-chars)
-				       nnimap-progress-how-often))
-				 nnimap-progress-how-often)
-			      nnimap-progress-chars)))
-  (with-current-buffer nntp-server-buffer
-    (let (headers lines chars uid mbx)
-      (with-current-buffer nnimap-server-buffer
-	(setq uid imap-current-message
-	      mbx (nnimap-encode-group-name (imap-current-mailbox))
-	      headers (if (imap-capability 'IMAP4rev1)
-                          ;; xxx don't just use car? alist doesn't contain
-                          ;; anything else now, but it might...
-                          (nth 2 (car (imap-message-get uid 'BODYDETAIL)))
-                        (imap-message-get uid 'RFC822.HEADER))
-	      lines (imap-body-lines (imap-message-body imap-current-message))
-	      chars (imap-message-get imap-current-message 'RFC822.SIZE)))
-      (nnheader-insert-nov
-       ;; At this stage, we only have bytes, so let's use unibyte buffers
-       ;; to make it more clear.
-       (mm-with-unibyte-buffer
-	 (buffer-disable-undo)
-	 ;; headers can be nil if article is write-only
-	 (when headers (insert headers))
-	 (let ((head (nnheader-parse-naked-head uid)))
-	   (mail-header-set-number head uid)
-	   (mail-header-set-chars head chars)
-	   (mail-header-set-lines head lines)
-	   (mail-header-set-xref
-	    head (format "%s %s:%d" (system-name) mbx uid))
-	   head))))))
-
-(defun nnimap-retrieve-which-headers (articles fetch-old)
-  "Get a range of articles to fetch based on ARTICLES and FETCH-OLD."
-  (with-current-buffer nnimap-server-buffer
-    (if (numberp (car-safe articles))
-	(imap-search
-	 (concat "UID "
-		 (imap-range-to-message-set
-		  (gnus-compress-sequence
-		   (append (gnus-uncompress-sequence
-			    (and fetch-old
-				 (cons (if (numberp fetch-old)
-					   (max 1 (- (car articles) fetch-old))
-					 1)
-				       (1- (car articles)))))
-			   articles)))))
-      (mapcar (lambda (msgid)
-		(imap-search
-		 (format "HEADER Message-Id \"%s\"" msgid)))
-	      articles))))
-
-(defun nnimap-group-overview-filename (group server)
-  "Make file name for GROUP on SERVER."
-  (let* ((dir (file-name-as-directory (expand-file-name nnimap-directory)))
-	 (uidvalidity (gnus-group-get-parameter
-		       (nnimap-group-prefixed-name group server)
-		       'uidvalidity))
-	 (name (nnheader-translate-file-chars
-		(concat nnimap-nov-file-name
-			(if (equal server "")
-			    "unnamed"
-			  server) "." group nnimap-nov-file-name-suffix) t))
-	 (nameuid (nnheader-translate-file-chars
-		   (concat nnimap-nov-file-name
-			   (if (equal server "")
-			       "unnamed"
-			     server) "." group "." uidvalidity
-			   nnimap-nov-file-name-suffix) t))
-	 (oldfile (if (or nnmail-use-long-file-names
-			  (file-exists-p (expand-file-name name dir)))
-		      (expand-file-name name dir)
-		    (expand-file-name
-		     (mm-encode-coding-string
-		      (nnheader-replace-chars-in-string name ?. ?/)
-		      nnmail-pathname-coding-system)
-		     dir)))
-	 (newfile (if (or nnmail-use-long-file-names
-			  (file-exists-p (expand-file-name nameuid dir)))
-		      (expand-file-name nameuid dir)
-		    (expand-file-name
-		     (mm-encode-coding-string
-		      (nnheader-replace-chars-in-string nameuid ?. ?/)
-		      nnmail-pathname-coding-system)
-		     dir))))
-    (when (and (file-exists-p oldfile) (not (file-exists-p newfile)))
-      (message "nnimap: Upgrading novcache filename...")
-      (sit-for 1)
-      (gnus-make-directory (file-name-directory newfile))
-      (unless (ignore-errors (rename-file oldfile newfile) t)
-	(if (ignore-errors (copy-file oldfile newfile) t)
-	    (delete-file oldfile)
-	  (error "Can't rename `%s' to `%s'" oldfile newfile))))
-    newfile))
-
-(defun nnimap-retrieve-headers-from-file (group server)
-  (with-current-buffer nntp-server-buffer
-    (let ((nov (nnimap-group-overview-filename group server)))
-      (when (file-exists-p nov)
-	(mm-insert-file-contents nov)
-	(set-buffer-modified-p nil)
-	(let ((min (ignore-errors (goto-char (point-min))
-				  (read (current-buffer))))
-	      (max (ignore-errors (goto-char (point-max))
-				  (forward-line -1)
-				  (read (current-buffer)))))
-	  (if (and (numberp min) (numberp max))
-	      (cons min max)
-	    ;; junk, remove it, it's saved later
-	    (erase-buffer)
-	    nil))))))
-
-(defun nnimap-retrieve-headers-from-server (articles group server)
-  (with-current-buffer nnimap-server-buffer
-    (let ((imap-fetch-data-hook '(nnimap-retrieve-headers-progress))
-	  (nnimap-length (gnus-range-length articles))
-	  (nnimap-counter 0))
-      (imap-fetch (imap-range-to-message-set articles)
-		  (concat "(UID RFC822.SIZE BODY "
-			  (let ((headers
-				 (append '(Subject From Date Message-Id
-						   References In-Reply-To Xref)
-					 (copy-sequence
-					  nnmail-extra-headers))))
-			    (if (imap-capability 'IMAP4rev1)
-				(format "BODY.PEEK[HEADER.FIELDS %s])" headers)
-			      (format "RFC822.HEADER.LINES %s)" headers)))))
-      (with-current-buffer nntp-server-buffer
-	(sort-numeric-fields 1 (point-min) (point-max)))
-      (and (numberp nnmail-large-newsgroup)
-	   (> nnimap-length nnmail-large-newsgroup)
-	   (nnheader-message 6 "nnimap: Retrieving headers...done")))))
-
-(defun nnimap-dont-use-nov-p (group server)
-  (or gnus-nov-is-evil nnimap-nov-is-evil
-      (unless (and (gnus-make-directory
-		    (file-name-directory
-		     (nnimap-group-overview-filename group server)))
-		   (file-writable-p
-		    (nnimap-group-overview-filename group server)))
-	(message "nnimap: Nov cache not writable, %s"
-		 (nnimap-group-overview-filename group server)))))
-
-(deffoo nnimap-retrieve-headers (articles &optional group server fetch-old)
-  (when (nnimap-possibly-change-group group server)
-    (with-current-buffer nntp-server-buffer
-      (erase-buffer)
-      (if (nnimap-dont-use-nov-p group server)
-	  (nnimap-retrieve-headers-from-server
-	   (gnus-compress-sequence articles) group server)
-	(let (uids cached low high)
-	  (when (setq uids (nnimap-retrieve-which-headers articles fetch-old)
-		      low (car uids)
-		      high (car (last uids)))
-	    (if (setq cached (nnimap-retrieve-headers-from-file group server))
-		(progn
-		  ;; fetch articles with uids before cache block
-		  (when (< low (car cached))
-		    (goto-char (point-min))
-		    (nnimap-retrieve-headers-from-server
-		     (cons low (1- (car cached))) group server))
-		  ;; fetch articles with uids after cache block
-		  (when (> high (cdr cached))
-		    (goto-char (point-max))
-		    (nnimap-retrieve-headers-from-server
-		     (cons (1+ (cdr cached)) high) group server))
-		  (when nnimap-prune-cache
-		    ;; remove nov's for articles which has expired on server
-		    (goto-char (point-min))
-		    (dolist (uid (gnus-set-difference articles uids))
-		      (when (re-search-forward (format "^%d\t" uid) nil t)
-			(gnus-delete-line)))))
-	      ;; nothing cached, fetch whole range from server
-	      (nnimap-retrieve-headers-from-server
-	       (cons low high) group server))
-	    (when (buffer-modified-p)
-	      (nnmail-write-region
-	       (point-min) (point-max)
-	       (nnimap-group-overview-filename group server) nil 'nomesg))
-	    (nnheader-nov-delete-outside-range low high))))
-      'nov)))
-
-(declare-function netrc-parse "netrc" (file))
-(declare-function netrc-machine-user-or-password "netrc"
-		  (mode authinfo-file-or-list machines ports defaults))
-
-(defun nnimap-open-connection (server)
-  ;; Note: `nnimap-open-server' that calls this function binds
-  ;; `imap-logout-timeout' to `nnimap-logout-timeout'.
-  (if (not (imap-open nnimap-address nnimap-server-port nnimap-stream
-		      nnimap-authenticator nnimap-server-buffer))
-      (nnheader-report 'nnimap "Can't open connection to server %s" server)
-    (require 'netrc)
-    (unless (or (imap-capability 'IMAP4 nnimap-server-buffer)
-		(imap-capability 'IMAP4rev1 nnimap-server-buffer))
-      (imap-close nnimap-server-buffer)
-      (nnheader-report 'nnimap "Server %s is not IMAP4 compliant" server))
-    (let* ((list (progn (gnus-message 7 "Parsing authinfo file `%s'."
-				      nnimap-authinfo-file)
-			(netrc-parse nnimap-authinfo-file)))
- 	   (port (if nnimap-server-port
-		     (int-to-string nnimap-server-port)
-		   "imap"))
-	   (auth-info
-	    (auth-source-user-or-password '("login" "password") server port))
-	   (auth-user (nth 0 auth-info))
-	   (auth-passwd (nth 1 auth-info))
-	   (user (or
-		  auth-user ; this is preferred to netrc-*
-		  (netrc-machine-user-or-password
-		   "login"
-		   list
-		   (list server
-			 (or nnimap-server-address
-			     nnimap-address))
-		   (list port)
-		   (list "imap" "imaps" "143" "993"))))
-	   (passwd (or
-		    auth-passwd ; this is preferred to netrc-*
-		    (netrc-machine-user-or-password
-		     "password"
-		     list
-		     (list server
-			   (or nnimap-server-address
-			       nnimap-address))
-		     (list port)
-		     (list "imap" "imaps" "143" "993")))))
-      (if (imap-authenticate user passwd nnimap-server-buffer)
-	  (prog2
-	      (setq nnimap-server-buffer-alist
-		    (nnimap-remove-server-from-buffer-alist
-		     server
-		     nnimap-server-buffer-alist))
-	      (push (list server nnimap-server-buffer)
-		    nnimap-server-buffer-alist)
-	    (imap-id nnimap-id nnimap-server-buffer)
-	    (nnimap-possibly-change-server server))
-	(imap-close nnimap-server-buffer)
-	(kill-buffer nnimap-server-buffer)
-	(nnheader-report 'nnimap "Could not authenticate to %s" server)))))
-
-(deffoo nnimap-open-server (server &optional defs)
-  (nnheader-init-server-buffer)
+(defstruct nnimap
+  group process commands capabilities)
+
+(defvar nnimap-object nil)
+
+(defvar nnimap-mark-alist
+  '((read "\\Seen")
+    (tick "\\Flagged")
+    (reply "\\Answered")
+    (expire "gnus-expire")
+    (dormant "gnus-dormant")
+    (score "gnus-score")
+    (save "gnus-save")
+    (download "gnus-download")
+    (forward "gnus-forward")))
+
+(defvar nnimap-split-methods nil)
+
+(defun nnimap-buffer ()
+  (nnimap-find-process-buffer nntp-server-buffer))
+
+(defun nnimap-retrieve-headers (articles &optional group server fetch-old)
+  (with-current-buffer nntp-server-buffer
+    (erase-buffer)
+    (when (nnimap-possibly-change-group group server)
+      (with-current-buffer (nnimap-buffer)
+	(nnimap-send-command "SELECT %S" (utf7-encode group t))
+	(erase-buffer)
+	(nnimap-wait-for-response
+	 (nnimap-send-command
+	  "UID FETCH %s %s"
+	  (nnimap-article-ranges (gnus-compress-sequence articles))
+	  (format "(UID RFC822.SIZE BODYSTRUCTURE %s)"
+		  (format
+		   (if (member "IMAP4REV1"
+			       (nnimap-capabilities nnimap-object))
+		       "BODY.PEEK[HEADER.FIELDS %s]"
+		     "RFC822.HEADER.LINES %s")
+		   (append '(Subject From Date Message-Id
+				     References In-Reply-To Xref)
+			   nnmail-extra-headers))))
+	 t)
+	(nnimap-transform-headers))
+      (insert-buffer-substring
+       (nnimap-find-process-buffer (current-buffer))))
+    t))
+
+(defun nnimap-transform-headers ()
+  (goto-char (point-min))
+  (let (article bytes lines)
+    (block nil
+      (while (not (eobp))
+	(while (not (looking-at "^\\* [0-9]+ FETCH.*UID \\([0-9]+\\)"))
+	  (delete-region (point) (progn (forward-line 1) (point)))
+	  (when (eobp)
+	    (return)))
+	(setq article (match-string 1)
+	      bytes (nnimap-get-length)
+	      lines nil)
+	(beginning-of-line)
+	(when (search-forward "BODYSTRUCTURE" (line-end-position) t)
+	  (let ((structure (ignore-errors (read (current-buffer)))))
+	    (while (and (consp structure)
+			(not (stringp (car structure))))
+	      (setq structure (car structure)))
+	    (setq lines (nth 7 structure))))
+	(delete-region (line-beginning-position) (line-end-position))
+	(insert (format "211 %s Article retrieved." article))
+	(forward-line 1)
+	(insert (format "Bytes: %d\n" bytes))
+	(when lines
+	  (insert (format "Lines: %s\n" lines)))
+	(re-search-forward "^\r$")
+	(delete-region (line-beginning-position) (line-end-position))
+	(insert ".")
+	(forward-line 1)))))
+
+(defun nnimap-get-length ()
+  (and (re-search-forward "{\\([0-9]+\\)}" (line-end-position) t)
+       (string-to-number (match-string 1))))
+
+(defun nnimap-article-ranges (ranges)
+  (let (result)
+    (cond
+     ((numberp ranges)
+      (number-to-string ranges))
+     ((numberp (cdr ranges))
+      (format "%d:%d" (car ranges) (cdr ranges)))
+     (t
+      (dolist (elem ranges)
+	(push
+	 (if (consp elem)
+	     (format "%d:%d" (car elem) (cdr elem))
+	   (number-to-string elem))
+	 result))
+      (mapconcat #'identity (nreverse result) ",")))))
+
+(defun nnimap-open-server (server &optional defs)
   (if (nnimap-server-opened server)
       t
-    (unless (assq 'nnimap-server-buffer defs)
-      (push (list 'nnimap-server-buffer (concat " *nnimap* " server)) defs))
-    ;; translate `nnimap-server-address' to `nnimap-address' in defs
-    ;; for people that configured nnimap with a very old version
     (unless (assq 'nnimap-address defs)
-      (if (assq 'nnimap-server-address defs)
-	  (push (list 'nnimap-address
-		      (cadr (assq 'nnimap-server-address defs))) defs)
-	(push (list 'nnimap-address server) defs)))
+      (setq defs (append defs (list (list 'nnimap-address server)))))
     (nnoo-change-server 'nnimap server defs)
-    (or nnimap-server-buffer
-	(setq nnimap-server-buffer (cadr (assq 'nnimap-server-buffer defs))))
-    (with-current-buffer (get-buffer-create nnimap-server-buffer)
-      (nnoo-change-server 'nnimap server defs))
-    (let ((imap-logout-timeout nnimap-logout-timeout))
-      (or (and nnimap-server-buffer
-	       (imap-opened nnimap-server-buffer)
-	       (if (with-current-buffer nnimap-server-buffer
-		     (memq imap-state '(auth selected examine)))
-		   t
-		 (imap-close nnimap-server-buffer)
-		 (nnimap-open-connection server)))
-	  (nnimap-open-connection server)))))
-
-(deffoo nnimap-server-opened (&optional server)
-  "Whether SERVER is opened.
-If SERVER is the current virtual server, and the connection to the
-physical server is alive, this function return a non-nil value.  If
-SERVER is nil, it is treated as the current server."
-  ;; clean up autologouts??
-  (and (or server nnimap-current-server)
-       (nnoo-server-opened 'nnimap (or server nnimap-current-server))
-       (imap-opened (nnimap-get-server-buffer server))))
-
-(deffoo nnimap-close-server (&optional server)
-  "Close connection to server and free all resources connected to it.
-Return nil if the server couldn't be closed for some reason."
-  (let ((server (or server nnimap-current-server))
-	(imap-logout-timeout nnimap-logout-timeout))
-    (when (or (nnimap-server-opened server)
-	      (imap-opened (nnimap-get-server-buffer server)))
-      (imap-close (nnimap-get-server-buffer server))
-      (kill-buffer (nnimap-get-server-buffer server))
-      (setq nnimap-server-buffer nil
-	    nnimap-current-server nil
-	    nnimap-server-buffer-alist
-	    (nnimap-remove-server-from-buffer-alist
-	     server
-	     nnimap-server-buffer-alist)))
-    (nnoo-close-server 'nnimap server)))
-
-(deffoo nnimap-request-close ()
-  "Close connection to all servers and free all resources that the backend have reserved.
-All buffers that have been created by that
-backend should be killed.  (Not the nntp-server-buffer, though.) This
-function is generally only called when Gnus is shutting down."
-  (mapc (lambda (server) (nnimap-close-server (car server)))
-	nnimap-server-buffer-alist)
-  (setq nnimap-server-buffer-alist nil))
-
-(deffoo nnimap-status-message (&optional server)
-  "This function returns the last error message from server."
-  (when (nnimap-possibly-change-server server)
-    (nnoo-status-message 'nnimap server)))
-
-;; We used to use a string-as-multibyte here, but it is really incorrect.
-;; This function is used when we're about to insert a unibyte string
-;; into a potentially multibyte buffer.  The string is either an article
-;; header or body (or both?), undecoded.  When Emacs is asked to convert
-;; a unibyte string to multibyte, it may either use the equivalent of
-;; nothing (e.g. non-Mule XEmacs), string-make-unibyte (i.e. decode using
-;; locale), string-as-multibyte (decode using emacs-internal coding system)
-;; or string-to-multibyte (keep the data undecoded as a sequence of bytes).
-;; Only the last one preserves the data such that we can reliably later on
-;; decode the text using the mime info.
-(defalias 'nnimap-demule 'mm-string-to-multibyte)
-
-(defun nnimap-make-callback (article gnus-callback buffer)
-  "Return a callback function."
-  `(lambda ()
-     (nnimap-callback ,article ,gnus-callback ,buffer)))
-
-(defun nnimap-callback (article gnus-callback buffer)
-  (when (eq article (imap-current-message))
-    (remove-hook 'imap-fetch-data-hook
-		 (nnimap-make-callback article gnus-callback buffer))
-    (with-current-buffer buffer
-      (insert
-       (with-current-buffer nnimap-server-buffer
-	 (nnimap-demule
-	  (if (imap-capability 'IMAP4rev1)
-	      ;; xxx don't just use car? alist doesn't contain
-	      ;; anything else now, but it might...
-	      (nth 2 (car (imap-message-get article 'BODYDETAIL)))
-	    (imap-message-get article 'RFC822)))))
-      (nnheader-ms-strip-cr)
-      (funcall gnus-callback t))))
-
-(defun nnimap-request-article-part (article part prop &optional
-					    group server to-buffer detail)
-  (when (nnimap-possibly-change-group group server)
-    (let ((article (if (stringp article)
-		       (car-safe (imap-search
-				  (format "HEADER Message-Id \"%s\"" article)
-				  nnimap-server-buffer))
-		     article)))
-      (when article
-	(gnus-message 10 "nnimap: Fetching (part of) article %d from %s..."
-		      article (or (nnimap-decode-group-name group)
-				  (imap-current-mailbox)
-				  (nnimap-decode-group-name
-				   gnus-newsgroup-name)))
-	(if (not nnheader-callback-function)
-	    (with-current-buffer (or to-buffer nntp-server-buffer)
-	      (erase-buffer)
-	      (let ((data (imap-fetch article part prop nil
-				      nnimap-server-buffer)))
-		;; data can be nil if article is write-only
-		(when data
-		  (insert (nnimap-demule (if detail
-					     (nth 2 (car data))
-					   data)))))
-	      (nnheader-ms-strip-cr)
-	      (gnus-message
-	       10 "nnimap: Fetching (part of) article %d from %s...done"
-	       article (or (nnimap-decode-group-name group)
-			   (imap-current-mailbox)
-			   (nnimap-decode-group-name gnus-newsgroup-name)))
-	      (if (bobp)
-		  (nnheader-report 'nnimap "No such article %d in %s: %s"
-				   article (or (nnimap-decode-group-name group)
-					       (imap-current-mailbox)
-					       (nnimap-decode-group-name
-						gnus-newsgroup-name))
-				   (imap-error-text nnimap-server-buffer))
-		(cons group article)))
-	  (add-hook 'imap-fetch-data-hook
-		    (nnimap-make-callback article
-					  nnheader-callback-function
-					  nntp-server-buffer))
-	  (imap-fetch-asynch article part nil nnimap-server-buffer)
-	  (cons group article))))))
-
-(deffoo nnimap-asynchronous-p ()
-  t)
-
-(deffoo nnimap-request-article (article &optional group server to-buffer)
-  (if (imap-capability 'IMAP4rev1 nnimap-server-buffer)
-      (nnimap-request-article-part
-       article "BODY.PEEK[]" 'BODYDETAIL group server to-buffer 'detail)
-    (nnimap-request-article-part
-     article "RFC822.PEEK" 'RFC822 group server to-buffer)))
-
-(deffoo nnimap-request-head (article &optional group server to-buffer)
-  (if (imap-capability 'IMAP4rev1 nnimap-server-buffer)
-      (nnimap-request-article-part
-       article "BODY.PEEK[HEADER]" 'BODYDETAIL group server to-buffer 'detail)
-    (nnimap-request-article-part
-     article "RFC822.HEADER" 'RFC822.HEADER group server to-buffer)))
-
-(deffoo nnimap-request-body (article &optional group server to-buffer)
-  (if (imap-capability 'IMAP4rev1 nnimap-server-buffer)
-      (nnimap-request-article-part
-       article "BODY.PEEK[TEXT]" 'BODYDETAIL group server to-buffer 'detail)
-    (nnimap-request-article-part
-     article "RFC822.TEXT.PEEK" 'RFC822.TEXT group server to-buffer)))
-
-(deffoo nnimap-request-group (group &optional server fast)
-  (nnimap-request-update-info-internal
-   group
-   (gnus-get-info (nnimap-group-prefixed-name group server))
-   server)
-  (when (nnimap-possibly-change-group group server)
-    (nnimap-before-find-minmax-bugworkaround)
-    (let (info)
-      (cond (fast group)
-	    ((null (setq info (nnimap-find-minmax-uid group t)))
-	     (nnheader-report 'nnimap "Could not get active info for %s"
-			      group))
-	    (t
-	     (nnheader-insert "211 %d %d %d %s\n" (or (nth 0 info) 0)
-			      (max 1 (or (nth 1 info) 1))
-			      (or (nth 2 info) 0) group)
-	     (nnheader-report 'nnimap "Group %s selected" group)
-	     t)))))
-
-(defun nnimap-update-unseen (group &optional server)
-  "Update the unseen count in `nnimap-mailbox-info'."
-  (gnus-sethash
-   (gnus-group-prefixed-name group server)
-   (let ((old (gnus-gethash-safe (gnus-group-prefixed-name group server)
-				 nnimap-mailbox-info)))
-     (list (nth 0 old) (nth 1 old)
-	   (imap-mailbox-status (nnimap-decode-group-name group)
-				'unseen nnimap-server-buffer)))
-   nnimap-mailbox-info))
+    (or (nnimap-find-connection nntp-server-buffer)
+	(nnimap-open-connection nntp-server-buffer))))
+
+(defun nnimap-make-process-buffer (buffer)
+  (with-current-buffer
+      (generate-new-buffer (format "*nnimap %s %s %s*"
+				   nnimap-address nnimap-server-port
+				   (gnus-buffer-exists-p buffer)))
+    (mm-disable-multibyte)
+    (buffer-disable-undo)
+    (gnus-add-buffer)
+    (set (make-local-variable 'after-change-functions) nil)
+    (set (make-local-variable 'nnimap-object) (make-nnimap))
+    (push (list buffer (current-buffer)) nnimap-connection-alist)
+    (current-buffer)))
+
+(defun nnimap-open-shell-stream (name buffer host port)
+  (let ((process (start-process name buffer shell-file-name
+				shell-command-switch
+				(format-spec
+				 nnimap-shell-program
+				 (format-spec-make
+				  ?s host
+				  ?p port)))))
+    process))
+
+(defun nnimap-open-connection (buffer)
+  (with-current-buffer (nnimap-make-process-buffer buffer)
+    (let* ((coding-system-for-read 'binary)
+	   (coding-system-for-write 'binary)
+	   (credentials
+	    (cond
+	     ((eq nnimap-stream 'network)
+	      (open-network-stream "*nnimap*" (current-buffer) nnimap-address
+				   (or nnimap-server-port
+				       (if (netrc-find-service-number "imap")
+					   "imap"
+					 "143")))
+	      (auth-source-user-or-password
+	       '("login" "password") nnimap-address "imap" nil t))
+	     ((eq nnimap-stream 'stream)
+	      (nnimap-open-shell-stream
+	       "*nnimap*" (current-buffer) nnimap-address
+	       (or nnimap-server-port "imap"))
+	      (auth-source-user-or-password
+	       '("login" "password") nnimap-address "imap" nil t))
+	     ((eq nnimap-stream 'ssl)
+	      (open-tls-stream "*nnimap*" (current-buffer) nnimap-address
+			       (or nnimap-server-port
+				   (if (netrc-find-service-number "imaps")
+				       "imaps"
+				     "993")))
+	      (or
+	       (auth-source-user-or-password
+		'("login" "password") nnimap-address "imap")
+	       (auth-source-user-or-password
+		'("login" "password") nnimap-address "imaps" nil t))))))
+      (setf (nnimap-process nnimap-object)
+	    (get-buffer-process (current-buffer)))
+      (unless credentials
+	(delete-process (nnimap-process nnimap-object)))
+      (when (and (nnimap-process nnimap-object)
+		 (memq (process-status (nnimap-process nnimap-object))
+		       '(open run)))
+	(gnus-set-process-query-on-exit-flag (nnimap-process nnimap-object) nil)
+	(let ((result (nnimap-command "LOGIN %S %S"
+				      (car credentials) (cadr credentials))))
+	  (if (not (car result))
+	      (progn
+		(delete-process (nnimap-process nnimap-object))
+		nil)
+	    (setf (nnimap-capabilities nnimap-object)
+		  (mapcar
+		   #'upcase
+		   (or (nnimap-find-parameter "CAPABILITY" (cdr result))
+		       (nnimap-find-parameter
+			"CAPABILITY" (cdr (nnimap-command "CAPABILITY"))))))
+	    (when (member "QRESYNC" (nnimap-capabilities nnimap-object))
+	      (nnimap-command "ENABLE QRESYNC"))
+	    t))))))
+
+(defun nnimap-find-parameter (parameter elems)
+  (let (result)
+    (dolist (elem elems)
+      (cond
+       ((equal (car elem) parameter)
+	(setq result (cdr elem)))
+       ((and (equal (car elem) "OK")
+	     (consp (cadr elem))
+	     (equal (caadr elem) parameter))
+	(setq result (cdr (cadr elem))))))
+    result))
+
+(defun nnimap-close-server (&optional server)
+  t)
+
+(defun nnimap-request-close ()
+  t)
+
+(defun nnimap-server-opened (&optional server)
+  (and (nnoo-current-server-p 'nnimap server)
+       nntp-server-buffer
+       (gnus-buffer-live-p nntp-server-buffer)
+       (nnimap-find-connection nntp-server-buffer)))
+
+(defun nnimap-status-message (&optional server)
+  nnimap-status-string)
+
+(defun nnimap-request-article (article &optional group server to-buffer)
+  (with-current-buffer nntp-server-buffer
+    (let ((result (nnimap-possibly-change-group group server)))
+      (when (stringp article)
+	(setq article (nnimap-find-article-by-message-id group article)))
+      (when (and result
+		 article)
+	(erase-buffer)
+	(with-current-buffer (nnimap-buffer)
+	  (erase-buffer)
+	  (setq result
+		(nnimap-command
+		 (if (member "IMAP4REV1" (nnimap-capabilities nnimap-object))
+		     "UID FETCH %d BODY.PEEK[]"
+		   "UID FETCH %d RFC822.PEEK")
+		 article)))
+	(let ((buffer (nnimap-find-process-buffer (current-buffer))))
+	  (when (car result)
+	    (with-current-buffer to-buffer
+	      (insert-buffer-substring buffer)
+	      (goto-char (point-min))
+	      (let ((bytes (nnimap-get-length)))
+		(delete-region (line-beginning-position)
+			       (progn (forward-line 1) (point)))
+		(goto-char (+ (point) bytes))
+		(delete-region (point) (point-max))
+		(nnheader-ms-strip-cr))
+	      t)))))))
+
+(defun nnimap-request-group (group &optional server dont-check)
+  (with-current-buffer nntp-server-buffer
+    (let ((result (nnimap-possibly-change-group group server))
+	  articles)
+      (when result
+	(setq articles (nnimap-get-flags "1:*"))
+	(erase-buffer)
+	(insert
+	 (format
+	  "211 %d %d %d %S\n"
+	  (length articles)
+	  (or (caar articles) 0)
+	  (or (caar (last articles)) 0)
+	  group))
+	t))))
+
+(defun nnimap-get-flags (spec)
+  (let ((articles nil)
+	elems)
+    (with-current-buffer (nnimap-buffer)
+      (erase-buffer)
+      (nnimap-wait-for-response (nnimap-send-command
+				 "UID FETCH %s FLAGS" spec))
+      (goto-char (point-min))
+      (while (re-search-forward "^\\* [0-9]+ FETCH (\\(.*\\))" nil t)
+	(setq elems (nnimap-parse-line (match-string 1)))
+	(push (cons (string-to-number (cadr (member "UID" elems)))
+		    (cadr (member "FLAGS" elems)))
+	      articles)))
+    (nreverse articles)))
 
 (defun nnimap-close-group (group &optional server)
-  (with-current-buffer nnimap-server-buffer
-    (when (and (imap-opened)
-	       (nnimap-possibly-change-group group server))
-      (nnimap-update-unseen group server)
-      (case nnimap-expunge-on-close
-	(always (progn
-		  (imap-mailbox-expunge nnimap-close-asynchronous)
-		  (unless nnimap-dont-close
-		    (imap-mailbox-close nnimap-close-asynchronous))))
-	(ask (if (and (imap-search "DELETED")
-		      (gnus-y-or-n-p (format "Expunge articles in group `%s'? "
-					     (imap-current-mailbox))))
-		 (progn
-		   (imap-mailbox-expunge nnimap-close-asynchronous)
-		   (unless nnimap-dont-close
-		     (imap-mailbox-close nnimap-close-asynchronous)))
-	       (imap-mailbox-unselect)))
-	(t (imap-mailbox-unselect)))
-      (not imap-current-mailbox))))
-
-(defun nnimap-pattern-to-list-arguments (pattern)
-  (mapcar (lambda (p)
-	    (cons (car-safe p) (or (cdr-safe p) p)))
-	  (if (and (listp pattern)
-		   (listp (cdr pattern)))
-	      pattern
-	    (list pattern))))
-
-(deffoo nnimap-request-list (&optional server)
-  (when (nnimap-possibly-change-server server)
-    (with-current-buffer nntp-server-buffer
-      (erase-buffer))
-    (gnus-message 5 "nnimap: Generating active list%s..."
-		  (if (> (length server) 0) (concat " for " server) ""))
-    (nnimap-before-find-minmax-bugworkaround)
-    (with-current-buffer nnimap-server-buffer
-      (dolist (pattern (nnimap-pattern-to-list-arguments nnimap-list-pattern))
-	(dolist (mbx (funcall nnimap-request-list-method
-			      (cdr pattern) (car pattern)))
-	  (unless (member "\\noselect"
-			  (mapcar #'downcase
-				  (imap-mailbox-get 'list-flags mbx)))
-	    (let* ((encoded-mbx (nnimap-encode-group-name mbx))
-		   (info (nnimap-find-minmax-uid encoded-mbx 'examine)))
-	      (when info
-		(with-current-buffer nntp-server-buffer
-		  (insert (format "\"%s\" %d %d y\n"
-				  encoded-mbx (or (nth 2 info) 0)
-				  (max 1 (or (nth 1 info) 1)))))))))))
-    (gnus-message 5 "nnimap: Generating active list%s...done"
-		  (if (> (length server) 0) (concat " for " server) ""))
-    t))
-
-(deffoo nnimap-request-post (&optional server)
-  (let ((success t))
-    (dolist (mbx (message-unquote-tokens
-		  (message-tokenize-header
-		   (message-fetch-field "Newsgroups") ", ")) success)
-      (let ((to-newsgroup (gnus-group-prefixed-name mbx gnus-command-method)))
-	(or (gnus-active to-newsgroup)
-	    (gnus-activate-group to-newsgroup)
-	    (if (gnus-y-or-n-p (format "No such group: %s.  Create it? "
-				       to-newsgroup))
-		(or (and (gnus-request-create-group
-			  to-newsgroup gnus-command-method)
-			 (gnus-activate-group to-newsgroup nil nil
-					      gnus-command-method))
-		    (error "Couldn't create group %s" to-newsgroup)))
-	    (error "No such group: %s" to-newsgroup))
-	(unless (nnimap-request-accept-article mbx (nth 1 gnus-command-method))
-	  (setq success nil))))))
-
-;; Optional backend functions
-
-(defun nnimap-string-lessp-numerical (s1 s2)
-  "Return t if first arg string is less than second in numerical order."
-  (cond ((string= s1 s2)
-	 nil)
-	((> (length s1) (length s2))
-	 nil)
-	((< (length s1) (length s2))
-	 t)
-	((< (string-to-number (substring s1 0 1))
-	    (string-to-number (substring s2 0 1)))
-	 t)
-	((> (string-to-number (substring s1 0 1))
-	    (string-to-number (substring s2 0 1)))
-	 nil)
-	(t
-	 (nnimap-string-lessp-numerical (substring s1 1) (substring s2 1)))))
-
-(deffoo nnimap-retrieve-groups (groups &optional server)
-  (when (nnimap-possibly-change-server server)
-    (gnus-message 5 "nnimap: Checking mailboxes...")
-    (with-current-buffer nntp-server-buffer
-      (erase-buffer)
-      (nnimap-before-find-minmax-bugworkaround)
-      (let (asyncgroups slowgroups decoded-group)
-	(if (null nnimap-retrieve-groups-asynchronous)
-	    (setq slowgroups groups)
+  t)
+
+(deffoo nnimap-request-move-article (article group server accept-form
+					     &optional last internal-move-group)
+  (when (nnimap-possibly-change-group group server)
+    ;; If the move is internal (on the same server), just do it the easy
+    ;; way.
+    (let ((message-id (message-field-value "message-id")))
+      (if internal-move-group
+	  (let ((result
+		 (with-current-buffer (nnimap-buffer)
+		   (nnimap-command "UID COPY %d %S"
+				   article
+				   (utf7-encode internal-move-group t)))))
+	    (when (car result)
+	      (nnimap-delete-article article)
+	      (cons internal-move-group
+		    (nnimap-find-article-by-message-id
+		     internal-move-group message-id))))
+	(with-temp-buffer
+	  (let ((result (eval accept-form)))
+	    (when result
+	      (nnimap-delete-article article)
+	      result)))))))
+
+(deffoo nnimap-request-expire-articles (articles group &optional server force)
+  (cond
+   ((not (nnimap-possibly-change-group group server))
+    articles)
+   (force
+    (unless (nnimap-delete-article articles)
+      (message "Article marked for deletion, but not expunged."))
+    nil)
+   (t
+    articles)))
+
+(defun nnimap-find-article-by-message-id (group message-id)
+  (when (nnimap-possibly-change-group group nil)
+    (with-current-buffer (nnimap-buffer)
+      (let ((result
+	     (nnimap-command "UID SEARCH HEADER Message-Id %S" message-id))
+	    article)
+	(when (car result)
+	  ;; Select the last instance of the message in the group.
+	  (and (setq article
+		     (car (last (assoc "SEARCH" (cdr result)))))
+	       (string-to-number article)))))))
+
+(defun nnimap-delete-article (articles)
+  (with-current-buffer (nnimap-buffer)
+    (nnimap-command "UID STORE %s +FLAGS.SILENT (\\Deleted)"
+		    (nnimap-article-ranges articles))
+    (when (member "UIDPLUS" (nnimap-capabilities nnimap-object))
+      (nnimap-send-command "UID EXPUNGE %s"
+			   (nnimap-article-ranges articles))
+      t)))
+
+(deffoo nnimap-request-scan (&optional group server)
+  (when (and (nnimap-possibly-change-group nil server)
+	     (equal group nnimap-inbox)
+	     nnimap-inbox
+	     nnimap-split-methods)
+    (nnimap-split-incoming-mail)))
+
+(defun nnimap-marks-to-flags (marks)
+  (let (flags flag)
+    (dolist (mark marks)
+      (when (setq flag (cadr (assq mark nnimap-mark-alist)))
+	(push flag flags)))
+    flags))
+
+(defun nnimap-request-set-mark (group actions &optional server)
+  (when (nnimap-possibly-change-group group server)
+    (let (sequence)
+      (with-current-buffer (nnimap-buffer)
+	;; Just send all the STORE commands without waiting for
+	;; response.  If they're successful, they're successful.
+	(dolist (action actions)
+	  (destructuring-bind (range action marks) action
+	    (let ((flags (nnimap-marks-to-flags marks)))
+	      (when flags
+		(setq sequence (nnimap-send-command
+				"UID STORE %s %sFLAGS.SILENT (%s)"
+				(nnimap-article-ranges range)
+				(if (eq action 'del)
+				    "-"
+				  "+")
+				(mapconcat #'identity flags " ")))))))
+	;; Wait for the last command to complete to avoid later
+	;; syncronisation problems with the stream.
+	(nnimap-wait-for-response sequence)))))
+
+(deffoo nnimap-request-accept-article (group &optional server last)
+  (when (nnimap-possibly-change-group nil server)
+    (nnmail-check-syntax)
+    (let ((message (buffer-string))
+	  (message-id (message-field-value "message-id"))
+	  sequence)
+      (with-current-buffer (nnimap-buffer)
+	(setq sequence (nnimap-send-command
+			"APPEND %S {%d}" (utf7-encode group t)
+			(length message)))
+	(process-send-string (get-buffer-process (current-buffer)) message)
+	(process-send-string (get-buffer-process (current-buffer)) "\r\n")
+	(let ((result (nnimap-get-response sequence)))
+	  (when result
+	    (cons group
+		  (nnimap-find-article-by-message-id group message-id))))))))
+
+(defun nnimap-add-cr ()
+  (goto-char (point-min))
+  (while (re-search-forward "\r?\n" nil t)
+    (replace-match "\r\n" t t)))
+
+(defun nnimap-get-groups ()
+  (let ((result (nnimap-command "LIST \"\" \"*\""))
+	groups)
+    (when (car result)
+      (dolist (line (cdr result))
+	(when (and (equal (car line) "LIST")
+		   (not (and (caadr line)
+			     (string-match "noselect" (caadr line)))))
+	  (push (car (last line)) groups)))
+      (nreverse groups))))
+
+(defun nnimap-request-list (&optional server)
+  (nnimap-possibly-change-group nil server)
+  (with-current-buffer nntp-server-buffer
+    (erase-buffer)
+    (let ((groups
+	   (with-current-buffer (nnimap-buffer)
+	     (nnimap-get-groups)))
+	  sequences responses)
+      (when groups
+	(with-current-buffer (nnimap-buffer)
 	  (dolist (group groups)
-	    (setq decoded-group (nnimap-decode-group-name group))
-	    (gnus-message 9 "nnimap: Quickly checking mailbox %s"
-			  decoded-group)
-	    (add-to-list (if (gnus-group-get-parameter
-			      (nnimap-group-prefixed-name group)
-			      'imap-status)
-			     'asyncgroups
-			   'slowgroups)
-			 (list group (imap-mailbox-status-asynch
-				      decoded-group
-				      '(uidvalidity uidnext unseen)
-				      nnimap-server-buffer))))
-	  (dolist (asyncgroup asyncgroups)
-	    (let* ((group (nth 0 asyncgroup))
-		   (tag   (nth 1 asyncgroup))
-		   (gnusgroup (nnimap-group-prefixed-name group))
-		   (saved-uidvalidity (gnus-group-get-parameter gnusgroup
-								'uidvalidity))
-		   (saved-imap-status (gnus-group-get-parameter gnusgroup
-								'imap-status))
-		   (saved-info (and saved-imap-status
-				    (split-string saved-imap-status " "))))
-	      (setq decoded-group (nnimap-decode-group-name group))
-	      (when (imap-ok-p (imap-wait-for-tag tag nnimap-server-buffer))
-		(if (or (not (equal
-			      saved-uidvalidity
-			      (imap-mailbox-get 'uidvalidity decoded-group
-						nnimap-server-buffer)))
-			(not (equal
-			      (nth 0 saved-info)
-			      (imap-mailbox-get 'uidnext decoded-group
-						nnimap-server-buffer))))
-		    (push (list group) slowgroups)
-		  (gnus-sethash
-		   (gnus-group-prefixed-name group server)
-		   (list (imap-mailbox-get 'uidvalidity
-					   decoded-group nnimap-server-buffer)
-			 (imap-mailbox-get 'uidnext
-					   decoded-group nnimap-server-buffer)
-			 (imap-mailbox-get 'unseen
-					   decoded-group nnimap-server-buffer))
-		   nnimap-mailbox-info)
-		  (insert (format "\"%s\" %s %s y\n" group
-				  (nth 2 saved-info)
-				  (nth 1 saved-info))))))))
-	(dolist (group slowgroups)
-	  (if nnimap-retrieve-groups-asynchronous
-	      (setq group (car group)))
-	  (setq decoded-group (nnimap-decode-group-name group))
-	  (gnus-message 7 "nnimap: Mailbox %s modified" decoded-group)
-	  (or (member "\\NoSelect" (imap-mailbox-get 'list-flags decoded-group
-						     nnimap-server-buffer))
-	      (let* ((gnusgroup (nnimap-group-prefixed-name group))
-		     (status (imap-mailbox-status
-			      decoded-group '(uidvalidity uidnext unseen)
-			      nnimap-server-buffer))
-		     (info (nnimap-find-minmax-uid group 'examine))
-		     (min-uid (max 1 (or (nth 1 info) 1)))
-		     (max-uid (or (nth 2 info) 0)))
-		(when (> (or (imap-mailbox-get 'recent decoded-group
-					       nnimap-server-buffer) 0)
-			 0)
-		  (push (list (cons decoded-group 0)) nnmail-split-history))
-		(insert (format "\"%s\" %d %d y\n" group max-uid min-uid))
-		(gnus-sethash
-		 (gnus-group-prefixed-name group server)
-		 status
-		 nnimap-mailbox-info)
-		(if (not (equal (nth 0 status)
-				(gnus-group-get-parameter gnusgroup
-							  'uidvalidity)))
-		    (nnimap-verify-uidvalidity group nnimap-current-server))
-		;; The imap-status parameter is a string on the form
-		;; "<uidnext> <min-uid> <max-uid>".
-		(gnus-group-add-parameter
-		 gnusgroup
-		 (cons 'imap-status
-		       (format "%s %s %s" (nth 1 status) min-uid max-uid))))))))
-    (gnus-message 5 "nnimap: Checking mailboxes...done")
-    'active))
-
-(deffoo nnimap-request-update-info-internal (group info &optional server)
-  (when (nnimap-possibly-change-group group server)
-    (when info ;; xxx what does this mean? should we create a info?
-      (with-current-buffer nnimap-server-buffer
-	(gnus-message 5 "nnimap: Updating info for %s..."
-		      (nnimap-decode-group-name (gnus-info-group info)))
-
-	(when (nnimap-mark-permanent-p 'read)
-	  (let (seen unseen)
-	    ;; read info could contain articles marked unread by other
-	    ;; imap clients!  we correct this
-	    (setq unseen (gnus-compress-sequence
-			  (imap-search "UNSEEN UNDELETED"))
-		  seen (gnus-range-difference (gnus-info-read info) unseen)
-		  seen (gnus-range-add seen
-				       (gnus-compress-sequence
-					(imap-search "SEEN")))
-		  seen (if (and (integerp (car seen))
-				(null (cdr seen)))
-			   (list (cons (car seen) (car seen)))
-			 seen))
-	    (gnus-info-set-read info seen)))
-
-	(dolist (pred gnus-article-mark-lists)
-	  (when (or (eq (cdr pred) 'recent)
-		    (and (nnimap-mark-permanent-p (cdr pred))
-			 (member (nnimap-mark-to-flag (cdr pred))
-				 (imap-mailbox-get 'flags))))
-	    (gnus-info-set-marks
-	     info
-	     (gnus-update-alist-soft
-	      (cdr pred)
-	      (gnus-compress-sequence
-	       (imap-search (nnimap-mark-to-predicate (cdr pred))))
-	      (gnus-info-marks info))
-	     t)))
-
-	(when nnimap-importantize-dormant
-	  ;; nnimap mark dormant article as ticked too (for other clients)
-	  ;; so we remove that mark for gnus since we support dormant
-	  (gnus-info-set-marks
-	   info
-	   (gnus-update-alist-soft
-	    'tick
-	    (gnus-remove-from-range
-	     (cdr-safe (assoc 'tick (gnus-info-marks info)))
-	     (cdr-safe (assoc 'dormant (gnus-info-marks info))))
-	    (gnus-info-marks info))
-	   t))
-
-	(gnus-message 5 "nnimap: Updating info for %s...done"
-		      (nnimap-decode-group-name (gnus-info-group info)))
-
-	info))))
-
-(deffoo nnimap-request-type (group &optional article)
-  (if (and nnimap-news-groups (string-match nnimap-news-groups group))
-      'news
-    'mail))
-
-(deffoo nnimap-request-set-mark (group actions &optional server)
-  (when (nnimap-possibly-change-group group server)
-    (with-current-buffer nnimap-server-buffer
-      (let (action)
-	(gnus-message 7 "nnimap: Setting marks in %s..."
-		      (nnimap-decode-group-name group))
-	(while (setq action (pop actions))
-	  (let ((range (nth 0 action))
-		(what  (nth 1 action))
-		(cmdmarks (nth 2 action))
-		marks)
-	    ;; bookmark can't be stored (not list/range
-	    (setq cmdmarks (delq 'bookmark cmdmarks))
-	    ;; killed can't be stored (not list/range
-	    (setq cmdmarks (delq 'killed cmdmarks))
-	    ;; unsent are for nndraft groups only
-	    (setq cmdmarks (delq 'unsent cmdmarks))
-	    ;; cache flags are pointless on the server
-	    (setq cmdmarks (delq 'cache cmdmarks))
-	    ;; seen flags are local to each gnus
-	    (setq cmdmarks (delq 'seen cmdmarks))
-	    ;; recent marks can't be set
-	    (setq cmdmarks (delq 'recent cmdmarks))
-	    (when nnimap-importantize-dormant
-	      ;; flag dormant articles as ticked
-	      (if (memq 'dormant cmdmarks)
-		  (setq cmdmarks (cons 'tick cmdmarks))))
-	    ;; remove stuff we are forbidden to store
-	    (mapc (lambda (mark)
-		    (if (imap-message-flag-permanent-p
-			 (nnimap-mark-to-flag mark))
-			(setq marks (cons mark marks))))
-		  cmdmarks)
-	    (when (and range marks)
-	      (cond ((eq what 'del)
-		     (imap-message-flags-del
-		      (imap-range-to-message-set range)
-		      (nnimap-mark-to-flag marks nil t)))
-		    ((eq what 'add)
-		     (imap-message-flags-add
-		      (imap-range-to-message-set range)
-		      (nnimap-mark-to-flag marks nil t)))
-		    ((eq what 'set)
-		     (imap-message-flags-set
-		      (imap-range-to-message-set range)
-		      (nnimap-mark-to-flag marks nil t)))))))
-	(gnus-message 7 "nnimap: Setting marks in %s...done"
-		      (nnimap-decode-group-name group)))))
+	    (push (list (nnimap-send-command "EXAMINE %S" (utf7-encode group t))
+			group)
+		  sequences))
+	  (nnimap-wait-for-response (caar sequences))
+	  (setq responses
+		(nnimap-get-responses (mapcar #'car sequences))))
+	(dolist (response responses)
+	  (let* ((sequence (car response))
+		 (response (cadr response))
+		 (group (cadr (assoc sequence sequences))))
+	    (when (and group
+		       (equal (caar response) "OK"))
+	      (let ((uidnext (nnimap-find-parameter "UIDNEXT" response))
+		    highest exists)
+		(dolist (elem response)
+		  (when (equal (cadr elem) "EXISTS")
+		    (setq exists (string-to-number (car elem)))))
+		(when uidnext
+		  (setq highest (1- (string-to-number (car uidnext)))))
+		(cond
+		 ((null highest)
+		  (insert (format "%S 0 1 y\n" (utf7-decode group t))))
+		 ((zerop exists)
+		  ;; Empty group.
+		  (insert (format "%S %d %d y\n"
+				  (utf7-decode group t) highest (1+ highest))))
+		 (t
+		  ;; Return the widest possible range.
+		  (insert (format "%S %d 1 y\n" (utf7-decode group t)
+				  (or highest exists)))))))))
+	t))))
+
+(defun nnimap-retrieve-group-data-early (server infos)
+  (when (nnimap-possibly-change-group nil server)
+    (with-current-buffer (nnimap-buffer)
+      ;; QRESYNC handling isn't implemented.
+      (let ((qresyncp (member "notQRESYNC" (nnimap-capabilities nnimap-object)))
+	    marks groups sequences)
+	;; Go through the infos and gather the data needed to know
+	;; what and how to request the data.
+	(dolist (info infos)
+	  (setq marks (gnus-info-marks info))
+	  (push (list (gnus-group-real-name (gnus-info-group info))
+		      (cdr (assq 'active marks))
+		      (cdr (assq 'uid marks)))
+		groups))
+	;; Then request the data.
+	(erase-buffer)
+	(dolist (elem groups)
+	  (if (and qresyncp
+		   (nth 2 elem))
+	      (push
+	       (list 'qresync
+		     (nnimap-send-command "EXAMINE %S (QRESYNC (%s %s))"
+					  (car elem)
+					  (car (nth 2 elem))
+					  (cdr (nth 2 elem)))
+		     nil
+		     (car elem))
+	       sequences)
+	    (let ((start
+		   (if (nth 1 elem)
+		       ;; Fetch the last 100 flags.
+		       (max 1 (- (cdr (nth 1 elem)) 100))
+		     1)))
+	      (push (list (nnimap-send-command "EXAMINE %S" (car elem))
+			  (nnimap-send-command "UID FETCH %d:* FLAGS" start)
+			  start
+			  (car elem))
+		    sequences))))
+	sequences))))
+
+(defun nnimap-finish-retrieve-group-infos (server infos sequences)
+  (when (and sequences
+	     (nnimap-possibly-change-group nil server))
+    (with-current-buffer (nnimap-buffer)
+      ;; Wait for the final data to trickle in.
+      (nnimap-wait-for-response (cadar sequences))
+      ;; Now we should have all the data we need, no matter whether
+      ;; we're QRESYNCING, fetching all the flags from scratch, or
+      ;; just fetching the last 100 flags per group.
+      (nnimap-update-infos (nnimap-flags-to-marks
+			    (nnimap-parse-flags
+			     (nreverse sequences)))
+			   infos))))
+
+(defun nnimap-update-infos (flags infos)
+  (dolist (info infos)
+    (let ((group (gnus-group-real-name (gnus-info-group info))))
+      (nnimap-update-info info (cdr (assoc group flags))))))
+
+(defun nnimap-update-info (info marks)
+  (when marks
+    (destructuring-bind (existing flags high low uidnext start-article) marks
+      (let ((group (gnus-info-group info))
+	    (completep (and start-article
+			    (= start-article 1))))
+	;; First set the active ranges based on high/low.
+	(if (or completep
+		(not (gnus-active group)))
+	    (gnus-set-active group
+			     (if high
+				 (cons low high)
+			       ;; No articles in this group.
+			       (cons (1- uidnext) uidnext)))
+	  (setcdr (gnus-active group) high))
+	;; Then update the list of read articles.
+	(let* ((unread
+		(gnus-compress-sequence
+		 (gnus-set-difference
+		  (gnus-set-difference
+		   existing
+		   (cdr (assoc "\\Seen" flags)))
+		  (cdr (assoc "\\Flagged" flags)))))
+	       (read (gnus-range-difference
+		      (cons start-article high) unread)))
+	  (when (> start-article 1)
+	    (setq read
+		  (gnus-range-nconcat
+		   (gnus-sorted-range-intersection
+		    (cons 1 start-article)
+		    (gnus-info-read info))
+		   read)))
+	  (gnus-info-set-read info read)
+	  ;; Update the marks.
+	  (setq marks (gnus-info-marks info))
+	  ;; Note the active level for the next run-through.
+	  (let ((active (assq 'active marks)))
+	    (if active
+		(setcdr active (gnus-active group))
+	      (push (cons 'active (gnus-active group)) marks)))
+	  (dolist (type (cdr nnimap-mark-alist))
+	    (let ((old-marks (assoc (car type) marks))
+		  (new-marks (gnus-compress-sequence
+			      (cdr (assoc (cadr type) flags)))))
+	      (setq marks (delq old-marks marks))
+	      (pop old-marks)
+	      (when (and old-marks
+			 (> start-article 1))
+		(setq old-marks (gnus-range-difference
+				 (cons start-article high)
+				 old-marks))
+		(setq new-marks (gnus-range-nconcat old-marks new-marks)))
+	      (when new-marks
+		(push (cons (car type) new-marks) marks)))
+	    (gnus-info-set-marks info marks)))))))
+
+(defun nnimap-flags-to-marks (groups)
+  (let (data group totalp uidnext articles start-article mark)
+    (dolist (elem groups)
+      (setq group (car elem)
+	    uidnext (cadr elem)
+	    start-article (caddr elem)
+	    articles (cdddr elem))
+      (let ((high (caar articles))
+	    marks low existing)
+	(dolist (article articles)
+	  (setq low (car article))
+	  (push (car article) existing)
+	  (dolist (flag (cdr article))
+	    (setq mark (assoc flag marks))
+	    (if (not mark)
+		(push (list flag (car article)) marks)
+	      (setcdr mark (cons (car article) (cdr mark)))))
+	  (push (list group existing marks high low uidnext start-article)
+		data))))
+    data))
+
+(defun nnimap-parse-flags (sequences)
+  (goto-char (point-min))
+  (let (start end articles groups uidnext elems)
+    (dolist (elem sequences)
+      (destructuring-bind (group-sequence flag-sequence totalp group) elem
+	;; The EXAMINE was successful.
+	(when (and (search-forward (format "\n%d OK " group-sequence) nil t)
+		   (progn
+		     (forward-line 1)
+		     (setq start (point))
+		     (if (re-search-backward "UIDNEXT \\([0-9]+\\)"
+					       (or end (point-min)) t)
+			 (setq uidnext (string-to-number (match-string 1)))
+		       (setq uidnext nil))
+		     (goto-char start))
+		   ;; The UID FETCH FLAGS was successful.
+		   (search-forward (format "\n%d OK " flag-sequence) nil t))
+	  (setq end (point))
+	  (goto-char start)
+	  (while (re-search-forward "^\\* [0-9]+ FETCH (\\(.*\\))" end t)
+	    (setq elems (nnimap-parse-line (match-string 1)))
+	    (push (cons (string-to-number (cadr (member "UID" elems)))
+			(cadr (member "FLAGS" elems)))
+		  articles))
+	  (push (nconc (list group uidnext totalp) articles) groups)
+	  (setq articles nil))))
+    groups))
+
+(defun nnimap-find-process-buffer (buffer)
+  (cadr (assoc buffer nnimap-connection-alist)))
+
+(defun nnimap-request-post (&optional server)
+  (setq nnimap-status-string "Read-only server")
   nil)
 
-(defun nnimap-split-fancy ()
-  "Like the function `nnmail-split-fancy', but uses `nnimap-split-fancy'."
-  (let ((nnmail-split-fancy nnimap-split-fancy))
-    (nnmail-split-fancy)))
-
-(defun nnimap-split-to-groups (rules)
-  ;; tries to match all rules in nnimap-split-rule against content of
-  ;; nntp-server-buffer, returns a list of groups that matched.
-  ;; Note: This function takes and returns decoded group names.
-  (with-current-buffer nntp-server-buffer
-    ;; Fold continuation lines.
-    (goto-char (point-min))
-    (while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t)
-      (replace-match " " t t))
-    (if (functionp rules)
-	(funcall rules)
-      (let (to-groups regrepp)
-	(catch 'split-done
-	  (dolist (rule rules to-groups)
-	    (let ((group (car rule))
-		  (regexp (cadr rule)))
-	      (goto-char (point-min))
-	      (when (and (if (stringp regexp)
-			     (progn
-			       (if (not (stringp group))
-				   (setq group (eval group))
-				 (setq regrepp
-				       (string-match "\\\\[0-9&]" group)))
-			       (re-search-forward regexp nil t))
-			   (funcall regexp group))
-			 ;; Don't enter the article into the same group twice.
-			 (not (assoc group to-groups)))
-		(push (if regrepp
-			  (nnmail-expand-newtext group)
-			group)
-		      to-groups)
-		(or nnimap-split-crosspost
-		    (throw 'split-done to-groups))))))))))
-
-(defun nnimap-assoc-match (key alist)
-  (let (element)
-    (while (and alist (not element))
-      (if (string-match (car (car alist)) key)
-	  (setq element (car alist)))
-      (setq alist (cdr alist)))
-    element))
-
-(defun nnimap-split-find-rule (server inbox)
-  (if (and (listp nnimap-split-rule) (listp (car nnimap-split-rule))
-	   (list (cdar nnimap-split-rule)) (listp (cadar nnimap-split-rule)))
-      ;; extended format
-      (cadr (nnimap-assoc-match inbox (cdr (nnimap-assoc-match
-					    server nnimap-split-rule))))
-    nnimap-split-rule))
-
-(defun nnimap-split-find-inbox (server)
-  (if (listp nnimap-split-inbox)
-      nnimap-split-inbox
-    (list nnimap-split-inbox)))
-
-(defun nnimap-split-articles (&optional group server)
-  ;; Note: Assumes decoded group names in nnimap-split-inbox,
-  ;; nnimap-split-rule, nnimap-split-fancy, and nnmail-split-history.
-  (when (nnimap-possibly-change-server server)
-    (with-current-buffer nnimap-server-buffer
-      (let (rule inbox removeorig
-	    (inboxes (nnimap-split-find-inbox server)))
-	;; iterate over inboxes
-	(while (and (setq inbox (pop inboxes))
-		    (nnimap-possibly-change-group
-		     (nnimap-encode-group-name inbox))) ;; SELECT
-	  ;; find split rule for this server / inbox
-	  (when (setq rule (nnimap-split-find-rule server inbox))
-	    ;; iterate over articles
-	    (dolist (article (imap-search nnimap-split-predicate))
-	      (when (if (if (eq nnimap-split-download-body 'default)
-			    nnimap-split-download-body-default
-			  nnimap-split-download-body)
-			(and (nnimap-request-article article)
-			     (with-current-buffer nntp-server-buffer (mail-narrow-to-head)))
-		      (nnimap-request-head article))
-		;; copy article to right group(s)
-		(setq removeorig nil)
-		(dolist (to-group (nnimap-split-to-groups rule))
-		  (cond ((eq to-group 'junk)
-			 (message "IMAP split removed %s:%s:%d" server inbox
-				  article)
-			 (setq removeorig t))
-			((imap-message-copy (number-to-string article)
-					    to-group nil 'nocopyuid)
-			 (message "IMAP split moved %s:%s:%d to %s" server
-				  inbox article to-group)
-			 (setq removeorig t)
-			 (when nnmail-cache-accepted-message-ids
-			   (with-current-buffer nntp-server-buffer
-			     (let (msgid)
-			       (and (setq msgid
-					  (nnmail-fetch-field "message-id"))
-				    (nnmail-cache-insert msgid
-							 (nnimap-encode-group-name to-group)
-							 (nnmail-fetch-field "subject"))))))
-			 ;; Add the group-art list to the history list.
-			 (push (list (cons to-group 0)) nnmail-split-history))
-			(t
-			 (message "IMAP split failed to move %s:%s:%d to %s"
-				  server inbox article to-group))))
-		(if (if (eq nnimap-split-download-body 'default)
-			nnimap-split-download-body-default
-		      nnimap-split-download-body)
-		    (widen))
-		;; remove article if it was successfully copied somewhere
-		(and removeorig
-		     (imap-message-flags-add (format "%d" article)
-					     "\\Seen \\Deleted")))))
-	  (when (imap-mailbox-select inbox) ;; just in case
-	    ;; todo: UID EXPUNGE (if available) to remove splitted articles
-	    (imap-mailbox-expunge)
-	    (imap-mailbox-close)))
-	(when nnmail-cache-accepted-message-ids
-	  (nnmail-cache-close))
-	t))))
-
-(deffoo nnimap-request-scan (&optional group server)
-  (nnimap-split-articles group server))
-
-(deffoo nnimap-request-newgroups (date &optional server)
-  (when (nnimap-possibly-change-server server)
-    (with-current-buffer nntp-server-buffer
-      (gnus-message 5 "nnimap: Listing subscribed mailboxes%s%s..."
-		    (if (> (length server) 0) " on " "") server)
-      (erase-buffer)
-      (nnimap-before-find-minmax-bugworkaround)
-      (dolist (pattern (nnimap-pattern-to-list-arguments
-			nnimap-list-pattern))
-	(dolist (mbx (funcall nnimap-request-list-method (cdr pattern) (car pattern) nil
-                              nnimap-server-buffer))
-	  (or (catch 'found
-		(dolist (mailbox (imap-mailbox-get 'list-flags mbx
-						   nnimap-server-buffer))
-		  (if (string= (downcase mailbox) "\\noselect")
-		      (throw 'found t)))
-		nil)
-	      (let* ((encoded-mbx (nnimap-encode-group-name mbx))
-		     (info (nnimap-find-minmax-uid encoded-mbx 'examine)))
-		(when info
-		  (insert (format "\"%s\" %d %d y\n"
-				  encoded-mbx (or (nth 2 info) 0)
-				  (max 1 (or (nth 1 info) 1)))))))))
-      (gnus-message 5 "nnimap: Listing subscribed mailboxes%s%s...done"
-		    (if (> (length server) 0) " on " "") server))
-    t))
-
-(deffoo nnimap-request-create-group (group &optional server args)
-  (when (nnimap-possibly-change-server server)
-    (let ((decoded-group (nnimap-decode-group-name group)))
-      (or (imap-mailbox-status decoded-group 'uidvalidity nnimap-server-buffer)
-	  (imap-mailbox-create decoded-group nnimap-server-buffer)
-	  (nnheader-report 'nnimap "%S"
-			   (imap-error-text nnimap-server-buffer))))))
-
-(defun nnimap-time-substract (time1 time2)
-  "Return TIME for TIME1 - TIME2."
-  (let* ((ms (- (car time1) (car time2)))
-	 (ls (- (nth 1 time1) (nth 1 time2))))
-    (if (< ls 0)
-	(list (- ms 1) (+ (expt 2 16) ls))
-      (list ms ls))))
-
-(eval-when-compile (require 'parse-time))
-(defun nnimap-date-days-ago (daysago)
-  "Return date, in format \"3-Aug-1998\", for DAYSAGO days ago."
-  (require 'parse-time)
-  (let* ((time (nnimap-time-substract (current-time) (days-to-time daysago)))
-	 (date (format-time-string
-		(format "%%d-%s-%%Y"
-			(capitalize (car (rassoc (nth 4 (decode-time time))
-						 parse-time-months))))
-		time)))
-    (if (eq ?0 (string-to-char date))
-	(substring date 1)
-      date)))
-
-(defun nnimap-request-expire-articles-progress ()
-  (gnus-message 5 "nnimap: Marking article %d for deletion..."
-		imap-current-message))
-
-(defun nnimap-expiry-target (arts group server)
-  (unless (eq nnmail-expiry-target 'delete)
+(defun nnimap-possibly-change-group (group server)
+  (let ((open-result t))
+    (when (and server
+	       (not (nnimap-server-opened server)))
+      (setq open-result (nnimap-open-server server)))
+    (cond
+     ((not open-result)
+      nil)
+     ((not group)
+      t)
+     (t
+      (with-current-buffer (nnimap-buffer)
+	(if (equal group (nnimap-group nnimap-object))
+	    t
+	  (let ((result (nnimap-command "SELECT %S" (utf7-encode group t))))
+	    (when (car result)
+	      (setf (nnimap-group nnimap-object) group)
+	      result))))))))
+
+(defun nnimap-find-connection (buffer)
+  "Find the connection delivering to BUFFER."
+  (let ((entry (assoc buffer nnimap-connection-alist)))
+    (when entry
+      (if (and (buffer-name (cadr entry))
+	       (get-buffer-process (cadr entry))
+	       (memq (process-status (get-buffer-process (cadr entry)))
+		     '(open run)))
+	  (get-buffer-process (cadr entry))
+	(setq nnimap-connection-alist (delq entry nnimap-connection-alist))
+	nil))))
+
+(defvar nnimap-sequence 0)
+
+(defun nnimap-send-command (&rest args)
+  (process-send-string
+   (get-buffer-process (current-buffer))
+   (nnimap-log-command
+    (format "%d %s\r\n"
+	    (incf nnimap-sequence)
+	    (apply #'format args))))
+  nnimap-sequence)
+
+(defun nnimap-log-command (command)
+  (with-current-buffer (get-buffer-create "*imap log*")
+    (goto-char (point-max))
+    (insert (format-time-string "%H:%M:%S") " " command))
+  command)
+
+(defun nnimap-command (&rest args)
+  (erase-buffer)
+  (let* ((sequence (apply #'nnimap-send-command args))
+	 (response (nnimap-get-response sequence)))
+    (if (equal (caar response) "OK")
+	(cons t response)
+      (nnheader-report 'nnimap "%s"
+		       (mapconcat #'identity (car response) " "))
+      nil)))
+
+(defun nnimap-get-response (sequence)
+  (nnimap-wait-for-response sequence)
+  (nnimap-parse-response))
+
+(defun nnimap-wait-for-response (sequence &optional messagep)
+  (goto-char (point-max))
+  (while (or (bobp)
+	     (progn
+	       (forward-line -1)
+	       (not (looking-at (format "^%d .*\n" sequence)))))
+    (when messagep
+      (message "Read %dKB" (/ (buffer-size) 1000)))
+    (nnheader-accept-process-output (get-buffer-process (current-buffer)))
+    (goto-char (point-max))))
+
+(defun nnimap-parse-response ()
+  (let ((lines (split-string (nnimap-last-response-string) "\r\n" t))
+	result)
+    (dolist (line lines)
+      (push (cdr (nnimap-parse-line line)) result))
+    ;; Return the OK/error code first, and then all the "continuation
+    ;; lines" afterwards.
+    (cons (pop result)
+	  (nreverse result))))
+
+;; Parse an IMAP response line lightly.  They look like
+;; "* OK [UIDVALIDITY 1164213559] UIDs valid", typically, so parse
+;; the lines into a list of strings and lists of string.
+(defun nnimap-parse-line (line)
+  (let (char result)
     (with-temp-buffer
-      (dolist (art arts)
-	(nnimap-request-article art group server (current-buffer))
-	;; hints for optimization in `nnimap-request-accept-article'
-	(let ((nnimap-current-move-article art)
-	      (nnimap-current-move-group group)
-	      (nnimap-current-move-server server))
-	  (nnmail-expiry-target-group nnmail-expiry-target group))))
-    ;; It is not clear if `nnmail-expiry-target' somehow cause the
-    ;; current group to be changed or not, so we make sure here.
-    (nnimap-possibly-change-group group server)))
-
-;; Notice that we don't actually delete anything, we just mark them deleted.
-(deffoo nnimap-request-expire-articles (articles group &optional server force)
-  (let ((artseq (gnus-compress-sequence articles)))
-    (when (and artseq (nnimap-possibly-change-group group server))
-      (with-current-buffer nnimap-server-buffer
-	(let ((days (or (and nnmail-expiry-wait-function
-			     (funcall nnmail-expiry-wait-function group))
-			nnmail-expiry-wait)))
-	  (cond ((or force (eq days 'immediate))
-		 (let ((oldarts (imap-search
-				 (concat "UID "
-					 (imap-range-to-message-set artseq)))))
-		   (when oldarts
-		     (nnimap-expiry-target oldarts group server)
-		     (when (imap-message-flags-add
-			    (imap-range-to-message-set
-			     (gnus-compress-sequence oldarts)) "\\Deleted")
-		       (setq articles (gnus-set-difference
-				       articles oldarts))))))
-		((and nnimap-search-uids-not-since-is-evil (numberp days))
-		 (let* ((all-new-articles
-			 (gnus-compress-sequence
-			  (imap-search (format "SINCE %s"
-					       (nnimap-date-days-ago days)))))
-			(oldartseq
-			 (gnus-range-difference artseq all-new-articles))
-			(oldarts (gnus-uncompress-range oldartseq)))
-		   (when oldarts
-		     (nnimap-expiry-target oldarts group server)
-		     (when (imap-message-flags-add
-			    (imap-range-to-message-set oldartseq)
-			    "\\Deleted")
-		       (setq articles (gnus-set-difference
-				       articles oldarts))))))
-		((numberp days)
-		 (let ((oldarts (imap-search
-				 (format nnimap-expunge-search-string
-					 (imap-range-to-message-set artseq)
-					 (nnimap-date-days-ago days))))
-		       (imap-fetch-data-hook
-			'(nnimap-request-expire-articles-progress)))
-		   (when oldarts
-		     (nnimap-expiry-target oldarts group server)
-		     (when (imap-message-flags-add
-			    (imap-range-to-message-set
-			     (gnus-compress-sequence oldarts)) "\\Deleted")
-		       (setq articles (gnus-set-difference
-				       articles oldarts)))))))))))
-  ;; return articles not deleted
-  articles)
-
-(deffoo nnimap-request-move-article (article group server accept-form
-					     &optional last move-is-internal)
-  (when (nnimap-possibly-change-server server)
-    (save-excursion
-      (let ((buf (get-buffer-create " *nnimap move*"))
-	    (nnimap-current-move-article article)
-	    (nnimap-current-move-group group)
-	    (nnimap-current-move-server nnimap-current-server)
-	    result)
-	(gnus-message 10 "nnimap-request-move-article: this is an %s move"
-		      (if move-is-internal
-			  "internal"
-			"external"))
-	;; request the article only when the move is NOT internal
-	(and (or move-is-internal
-		 (nnimap-request-article article group server))
-	     (with-current-buffer buf
-	       (buffer-disable-undo (current-buffer))
-	       (insert-buffer-substring nntp-server-buffer)
-	       (setq result (eval accept-form))
-	       (kill-buffer buf)
-	       result)
-	     (nnimap-possibly-change-group group server)
-	     (imap-message-flags-add
-	      (imap-range-to-message-set (list article))
-	      "\\Deleted" 'silent nnimap-server-buffer))
-	result))))
-
-(deffoo nnimap-request-accept-article (group &optional server last)
-  (when (nnimap-possibly-change-server server)
-    (let (uid)
-      (if (setq uid
-		(if (string= nnimap-current-server nnimap-current-move-server)
-		    ;; moving article within same server, speed it up...
-		    (and (nnimap-possibly-change-group
-			  nnimap-current-move-group)
-			 (imap-message-copy (number-to-string
-					     nnimap-current-move-article)
-					    (nnimap-decode-group-name group)
-					    'dontcreate nil
-					    nnimap-server-buffer))
-		  (with-current-buffer (current-buffer)
-		    (goto-char (point-min))
-		    ;; remove any 'From blabla' lines, some IMAP servers
-		    ;; reject the entire message otherwise.
-		    (when (looking-at "^From[^:]")
-		      (delete-region (point) (progn (forward-line) (point))))
-		    ;; turn into rfc822 format (\r\n eol's)
-		    (while (search-forward "\n" nil t)
-		      (replace-match "\r\n"))
-		    (when nnmail-cache-accepted-message-ids
-		      (nnmail-cache-insert (nnmail-fetch-field "message-id")
-					   group
-					   (nnmail-fetch-field "subject"))))
-		  (when (and last nnmail-cache-accepted-message-ids)
-		    (nnmail-cache-close))
-		  ;; this 'or' is for Cyrus server bug
-		  (or (null (imap-current-mailbox nnimap-server-buffer))
-		      (imap-mailbox-unselect nnimap-server-buffer))
-		  (imap-message-append (nnimap-decode-group-name group)
-				       (current-buffer) nil nil
-				       nnimap-server-buffer)))
-	  (cons group (nth 1 uid))
-	(nnheader-report 'nnimap (imap-error-text nnimap-server-buffer))))))
-
-(deffoo nnimap-request-delete-group (group force &optional server)
-  (when (nnimap-possibly-change-server server)
-    (setq group (nnimap-decode-group-name group))
-    (when (string= group (imap-current-mailbox nnimap-server-buffer))
-      (imap-mailbox-unselect nnimap-server-buffer))
-    (with-current-buffer nnimap-server-buffer
-      (if force
-	  (or (null (imap-mailbox-status group 'uidvalidity))
-	      (imap-mailbox-delete group))
-	;; UNSUBSCRIBE?
-	t))))
-
-(deffoo nnimap-request-rename-group (group new-name &optional server)
-  (when (nnimap-possibly-change-server server)
-    (imap-mailbox-rename (nnimap-decode-group-name group)
-			 (nnimap-decode-group-name new-name)
-			 nnimap-server-buffer)))
-
-(defun nnimap-expunge (mailbox server)
-  (when (nnimap-possibly-change-group mailbox server)
-    (imap-mailbox-expunge nil nnimap-server-buffer)))
-
-(defun nnimap-acl-get (mailbox server)
-  (when (nnimap-possibly-change-server server)
-    (and (imap-capability 'ACL nnimap-server-buffer)
-	 (imap-mailbox-acl-get (nnimap-decode-group-name mailbox)
-			       nnimap-server-buffer))))
-
-(defun nnimap-acl-edit (mailbox method old-acls new-acls)
-  (when (nnimap-possibly-change-server (cadr method))
-    (unless (imap-capability 'ACL nnimap-server-buffer)
-      (error "Your server does not support ACL editing"))
-    (with-current-buffer nnimap-server-buffer
-      ;; delete all removed identifiers
-      (mapc (lambda (old-acl)
-	      (unless (assoc (car old-acl) new-acls)
-		(or (imap-mailbox-acl-delete (car old-acl)
-					     (nnimap-decode-group-name mailbox))
-		    (error "Can't delete ACL for %s" (car old-acl)))))
-	    old-acls)
-      ;; set all changed acl's
-      (mapc (lambda (new-acl)
-	      (let ((new-rights (cdr new-acl))
-		    (old-rights (cdr (assoc (car new-acl) old-acls))))
-		(unless (and old-rights new-rights
-			     (string= old-rights new-rights))
-		  (or (imap-mailbox-acl-set (car new-acl) new-rights
-					    (nnimap-decode-group-name mailbox))
-		      (error "Can't set ACL for %s to %s" (car new-acl)
-			     new-rights)))))
-	    new-acls)
-      t)))
-
-
-;;; Internal functions
-
-;;
-;; This is confusing.
-;;
-;; mark      => read, tick, draft, reply etc
-;; flag      => "\\Seen", "\\Flagged", "\\Draft", "gnus-expire" etc
-;; predicate => "SEEN", "FLAGGED", "DRAFT", "KEYWORD gnus-expire" etc
-;;
-;; Mark should not really contain 'read since it's not a "mark" in the Gnus
-;; world, but we cheat.  Mark == gnus-article-mark-lists + '(read . read).
-;;
-
-(defconst nnimap-mark-to-predicate-alist
-  (mapcar
-   (lambda (pair)			; cdr is the mark
-     (or (assoc (cdr pair)
-		'((read . "SEEN")
-		  (tick . "FLAGGED")
-		  (draft . "DRAFT")
-		  (recent . "RECENT")
-		  (reply . "ANSWERED")))
-	 (cons (cdr pair)
-	       (format "KEYWORD gnus-%s" (symbol-name (cdr pair))))))
-   (cons '(read . read) gnus-article-mark-lists)))
-
-(defun nnimap-mark-to-predicate (pred)
-  "Convert a Gnus mark (a symbol such as read, tick, expire) to a IMAP predicate.
-This is a string such as \"SEEN\", \"FLAGGED\", \"KEYWORD gnus-expire\",
-to be used within a IMAP SEARCH query."
-  (cdr (assq pred nnimap-mark-to-predicate-alist)))
-
-(defconst nnimap-mark-to-flag-alist
-  (mapcar
-   (lambda (pair)
-     (or (assoc (cdr pair)
-		'((read . "\\Seen")
-		  (tick . "\\Flagged")
-		  (draft . "\\Draft")
-		  (recent . "\\Recent")
-		  (reply . "\\Answered")))
-	 (cons (cdr pair)
-	       (format "gnus-%s" (symbol-name (cdr pair))))))
-   (cons '(read . read) gnus-article-mark-lists)))
-
-(defun nnimap-mark-to-flag-1 (preds)
-  (if (and (not (null preds)) (listp preds))
-      (cons (nnimap-mark-to-flag (car preds))
-	    (nnimap-mark-to-flag (cdr preds)))
-    (cdr (assoc preds nnimap-mark-to-flag-alist))))
-
-(defun nnimap-mark-to-flag (preds &optional always-list make-string)
-  "Convert a Gnus mark (a symbol such as read, tick, expire) to a IMAP flag.
-This is a string such as \"\\Seen\", \"\\Flagged\", \"gnus-expire\", to
-be used in a STORE FLAGS command."
-  (let ((result (nnimap-mark-to-flag-1 preds)))
-    (setq result (if (and (or make-string always-list)
-			  (not (listp result)))
-		     (list result)
-		   result))
-    (if make-string
-	(mapconcat (lambda (flag)
-		     (if (listp flag)
-			 (mapconcat 'identity flag " ")
-		       flag))
-		   result " ")
-      result)))
-
-(defun nnimap-mark-permanent-p (mark &optional group)
-  "Return t if MARK can be permanently (between IMAP sessions) saved on articles, in GROUP."
-  (imap-message-flag-permanent-p (nnimap-mark-to-flag mark)))
+      (insert line)
+      (goto-char (point-min))
+      (while (not (eobp))
+	(if (eql (setq char (following-char)) ? )
+	    (forward-char 1)
+	  (push
+	   (cond
+	    ((eql char ?\[)
+	     (split-string (buffer-substring
+			    (1+ (point)) (1- (search-forward "]")))))
+	    ((eql char ?\()
+	     (split-string (buffer-substring
+			    (1+ (point)) (1- (search-forward ")")))))
+	    ((eql char ?\")
+	     (forward-char 1)
+	     (buffer-substring (point) (1- (search-forward "\""))))
+	    (t
+	     (buffer-substring (point) (if (search-forward " " nil t)
+					   (1- (point))
+					 (goto-char (point-max))))))
+	   result)))
+      (nreverse result))))
+
+(defun nnimap-last-response-string ()
+  (save-excursion
+    (forward-line 1)
+    (let ((end (point)))
+      (forward-line -1)
+      (when (not (bobp))
+	(forward-line -1)
+	(while (and (not (bobp))
+		    (eql (following-char) ?*))
+	  (forward-line -1))
+	(unless (eql (following-char) ?*)
+	  (forward-line 1)))
+      (buffer-substring (point) end))))
+
+(defun nnimap-get-responses (sequences)
+  (let (responses)
+    (dolist (sequence sequences)
+      (goto-char (point-min))
+      (when (re-search-forward (format "^%d " sequence) nil t)
+	(push (list sequence (nnimap-parse-response))
+	      responses)))
+    responses))
+
+(defvar nnimap-incoming-split-list nil)
+
+(defun nnimap-fetch-inbox (articles)
+  (erase-buffer)
+  (nnimap-wait-for-response
+   (nnimap-send-command
+    "UID FETCH %s %s"
+    (nnimap-article-ranges articles)
+    (format "(UID %s%s)"
+	    (format
+	     (if (member "IMAP4REV1"
+			 (nnimap-capabilities nnimap-object))
+		 "BODY.PEEK[HEADER] BODY.PEEK"
+	       "RFC822.PEEK"))
+	    (if nnimap-split-download-body-default
+		""
+	      "[1]")))
+   t))
+
+(defun nnimap-split-incoming-mail ()
+  (with-current-buffer (nnimap-buffer)
+    (let ((nnimap-incoming-split-list nil)
+	  (nnmail-split-methods nnimap-split-methods)
+	  (nnmail-inhibit-default-split-group t)
+	  (groups (nnimap-get-groups))
+	  new-articles)
+      (erase-buffer)
+      (nnimap-command "SELECT %S" nnimap-inbox)
+      (setq new-articles (nnimap-new-articles (nnimap-get-flags "1:*")))
+      (when new-articles
+	(nnimap-fetch-inbox new-articles)
+	(nnimap-transform-split-mail)
+	(nnheader-ms-strip-cr)
+	(nnmail-cache-open)
+	(nnmail-split-incoming (current-buffer)
+			       #'nnimap-save-mail-spec
+			       nil nil
+			       #'nnimap-dummy-active-number)
+	(when nnimap-incoming-split-list
+	  (let ((specs (nnimap-make-split-specs nnimap-incoming-split-list))
+		sequences)
+	    ;; Create any groups that doesn't already exist on the
+	    ;; server first.
+	    (dolist (spec specs)
+	      (unless (member (car spec) groups)
+		(nnimap-command "CREATE %S" (utf7-encode (car spec) t))))
+	    ;; Then copy over all the messages.
+	    (erase-buffer)
+	    (dolist (spec specs)
+	      (let ((group (car spec))
+		    (ranges (cdr spec)))
+		(push (list (nnimap-send-command "UID COPY %s %S"
+						 (nnimap-article-ranges ranges)
+						 (utf7-encode group t))
+			    ranges)
+		      sequences)))
+	    ;; Wait for the last COPY response...
+	    (when sequences
+	      (nnimap-wait-for-response (caar sequences))
+	      ;; And then mark the successful copy actions as deleted,
+	      ;; and possibly expunge them.
+	      (nnimap-mark-and-expunge-incoming
+	       (nnimap-parse-copied-articles sequences)))))))))
+
+(defun nnimap-mark-and-expunge-incoming (range)
+  (when range
+    (setq range (nnimap-article-ranges range))
+    (nnimap-send-command
+     "UID STORE %s +FLAGS.SILENT (\\Deleted)" range)
+    (cond
+     ;; If the server supports it, we now delete the message we have
+     ;; just copied over.
+     ((member "UIDPLUS" (nnimap-capabilities nnimap-object))
+      (nnimap-send-command "UID EXPUNGE %s" range))
+     ;; If it doesn't support UID EXPUNGE, then we only expunge if the
+     ;; user has configured it.
+     (nnimap-expunge-inbox
+      (nnimap-send-command "EXPUNGE")))))
+
+(defun nnimap-parse-copied-articles (sequences)
+  (let (sequence copied range)
+    (goto-char (point-min))
+    (while (re-search-forward "^\\([0-9]+\\) OK " nil t)
+      (setq sequence (string-to-number (match-string 1)))
+      (when (setq range (cadr (assq sequence sequences)))
+	(push (gnus-uncompress-range range) copied)))
+    (gnus-compress-sequence (sort (apply #'nconc copied) #'<))))
+
+(defun nnimap-new-articles (flags)
+  (let (new)
+    (dolist (elem flags)
+      (when (or (null (cdr elem))
+		(and (not (member "\\Deleted" (cdr elem)))
+		     (not (member "\\Seen" (cdr elem)))))
+	(push (car elem) new)))
+    (gnus-compress-sequence (nreverse new))))
+
+(defun nnimap-make-split-specs (list)
+  (let ((specs nil)
+	entry)
+    (dolist (elem list)
+      (destructuring-bind (article spec) elem
+	(dolist (group (delete nil (mapcar #'car spec)))
+	  (unless (setq entry (assoc group specs))
+	    (push (setq entry (list group)) specs))
+	  (setcdr entry (cons article (cdr entry))))))
+    (dolist (entry specs)
+      (setcdr entry (gnus-compress-sequence (sort (cdr entry) #'<))))
+    specs))
+
+(defun nnimap-transform-split-mail ()
+  (goto-char (point-min))
+  (let (article bytes)
+    (block nil
+      (while (not (eobp))
+	(while (not (looking-at "^\\* [0-9]+ FETCH.*UID \\([0-9]+\\)"))
+	  (delete-region (point) (progn (forward-line 1) (point)))
+	  (when (eobp)
+	    (return)))
+	(setq article (match-string 1)
+	      bytes (nnimap-get-length))
+	(delete-region (line-beginning-position) (line-end-position))
+	;; Insert MMDF separator, and a way to remember what this
+	;; article UID is.
+	(insert (format "\^A\^A\^A\^A\n\nX-nnimap-article: %s" article))
+	(forward-char (1+ bytes))
+	(setq bytes (nnimap-get-length))
+	(delete-region (line-beginning-position) (line-end-position))
+	(forward-char (1+ bytes))
+	(delete-region (line-beginning-position) (line-end-position))))))
+
+(defun nnimap-dummy-active-number (group &optional server)
+  1)
+
+(defun nnimap-save-mail-spec (group-art &optional server full-nov)
+  (let (article)
+    (goto-char (point-min))
+    (if (not (re-search-forward "X-nnimap-article: \\([0-9]+\\)" nil t))
+	(error "Invalid nnimap mail")
+      (setq article (string-to-number (match-string 1))))
+    (push (list article group-art)
+	  nnimap-incoming-split-list)))
 
 (provide 'nnimap)
 

=== modified file 'lisp/gnus/nnir.el'
--- lisp/gnus/nnir.el	2010-09-02 01:42:32 +0000
+++ lisp/gnus/nnir.el	2010-09-18 10:02:19 +0000
@@ -744,8 +744,7 @@
       nnir-artlist
     ;; Cache miss.
     (setq nnir-artlist (nnir-run-query group)))
-  (save-excursion
-    (set-buffer nntp-server-buffer)
+  (with-current-buffer nntp-server-buffer
     (if (zerop (length nnir-artlist))
 	(progn
 	  (setq nnir-current-query nil

=== modified file 'lisp/gnus/nnmail.el'
--- lisp/gnus/nnmail.el	2010-09-05 00:34:16 +0000
+++ lisp/gnus/nnmail.el	2010-09-18 10:02:19 +0000
@@ -614,6 +614,7 @@
 
 (defvar nnmail-split-tracing nil)
 (defvar nnmail-split-trace nil)
+(defvar nnmail-inhibit-default-split-group nil)
 
 
 
@@ -674,8 +675,7 @@
   "Returns an assoc of group names and active ranges.
 nn*-request-list should have been called before calling this function."
   ;; Go through all groups from the active list.
-  (save-excursion
-    (set-buffer nntp-server-buffer)
+  (with-current-buffer nntp-server-buffer
     (nnmail-parse-active)))
 
 (defun nnmail-parse-active ()
@@ -1058,7 +1058,9 @@
 (defun nnmail-split-incoming (incoming func &optional exit-func
 				       group artnum-func)
   "Go through the entire INCOMING file and pick out each individual mail.
-FUNC will be called with the buffer narrowed to each mail."
+FUNC will be called with the buffer narrowed to each mail.
+INCOMING can also be a buffer object.  In that case, the mail
+will be copied over from that buffer."
   (let ( ;; If this is a group-specific split, we bind the split
 	;; methods to just this group.
 	(nnmail-split-methods (if (and group
@@ -1066,12 +1068,13 @@
 				  (list (list group ""))
 				nnmail-split-methods))
 	(nnmail-group-names-not-encoded-p t))
-    (save-excursion
-      ;; Insert the incoming file.
-      (set-buffer (get-buffer-create nnmail-article-buffer))
+    ;; Insert the incoming file.
+    (with-current-buffer (get-buffer-create nnmail-article-buffer)
       (erase-buffer)
-      (let ((coding-system-for-read nnmail-incoming-coding-system))
-	(mm-insert-file-contents incoming))
+      (if (bufferp incoming)
+	  (insert-buffer-substring incoming)
+	(let ((coding-system-for-read nnmail-incoming-coding-system))
+	  (mm-insert-file-contents incoming)))
       (prog1
 	  (if (zerop (buffer-size))
 	      0
@@ -1100,15 +1103,15 @@
 	(obuf (current-buffer))
 	group-art method grp)
     (if (and (sequencep methods)
-	     (= (length methods) 1))
+	     (= (length methods) 1)
+	     (not nnmail-inhibit-default-split-group))
 	;; If there is only just one group to put everything in, we
 	;; just return a list with just this one method in.
 	(setq group-art
 	      (list (cons (caar methods) (funcall func (caar methods)))))
       ;; We do actual comparison.
-      (save-excursion
-	;; Copy the article into the work buffer.
-	(set-buffer nntp-server-buffer)
+      ;; Copy the article into the work buffer.
+      (with-current-buffer nntp-server-buffer
 	(erase-buffer)
 	(insert-buffer-substring obuf)
 	;; Narrow to headers.
@@ -1149,7 +1152,8 @@
 		       ;; just call this function here and use the
 		       ;; result.
 		       (or (funcall nnmail-split-methods)
-			   '("bogus"))
+			   (and (not nnmail-inhibit-default-split-group)
+				'("bogus")))
 		     (error
 		      (nnheader-message
 		       5 "Error in `nnmail-split-methods'; using `bogus' mail group: %S" error-info)
@@ -1194,12 +1198,14 @@
 			group-art))
 	      ;; This is the final group, which is used as a
 	      ;; catch-all.
-	      (unless group-art
+	      (when (and (not group-art)
+			 (not nnmail-inhibit-default-split-group))
 		(setq group-art
 		      (list (cons (car method)
 				  (funcall func (car method))))))))
 	  ;; Fall back on "bogus" if all else fails.
-	  (unless group-art
+	  (when (and (not group-art)
+		     (not nnmail-inhibit-default-split-group))
 	    (setq group-art (list (cons "bogus" (funcall func "bogus"))))))
 	;; Produce a trace if non-empty.
 	(when (and trace nnmail-split-trace)
@@ -1572,10 +1578,9 @@
 	  (and nnmail-cache-buffer
 	       (buffer-name nnmail-cache-buffer)))
       ()				; The buffer is open.
-    (save-excursion
-      (set-buffer
+    (with-current-buffer
        (setq nnmail-cache-buffer
-	     (get-buffer-create " *nnmail message-id cache*")))
+	     (get-buffer-create " *nnmail message-id cache*"))
       (gnus-add-buffer)
       (when (file-exists-p nnmail-message-id-cache-file)
 	(nnheader-insert-file-contents nnmail-message-id-cache-file))
@@ -1587,8 +1592,7 @@
 	     nnmail-treat-duplicates
 	     (buffer-name nnmail-cache-buffer)
 	     (buffer-modified-p nnmail-cache-buffer))
-    (save-excursion
-      (set-buffer nnmail-cache-buffer)
+    (with-current-buffer nnmail-cache-buffer
       ;; Weed out the excess number of Message-IDs.
       (goto-char (point-max))
       (when (search-backward "\n" nil t nnmail-message-id-cache-length)
@@ -1623,8 +1627,7 @@
       ;; pass the first (of possibly >1) group which matches. -Josh
       (unless (gnus-buffer-live-p nnmail-cache-buffer)
 	(nnmail-cache-open))
-      (save-excursion
-	(set-buffer nnmail-cache-buffer)
+      (with-current-buffer nnmail-cache-buffer
 	(goto-char (point-max))
 	(if (and grp (not (string= "" grp))
 		 (gnus-methods-equal-p gnus-command-method
@@ -1657,8 +1660,7 @@
 ;; cache.
 (defun nnmail-cache-fetch-group (id)
   (when (and nnmail-treat-duplicates nnmail-cache-buffer)
-    (save-excursion
-      (set-buffer nnmail-cache-buffer)
+    (with-current-buffer nnmail-cache-buffer
       (goto-char (point-max))
       (when (search-backward id nil t)
 	(beginning-of-line)
@@ -1702,8 +1704,7 @@
 
 (defun nnmail-cache-id-exists-p (id)
   (when nnmail-treat-duplicates
-    (save-excursion
-      (set-buffer nnmail-cache-buffer)
+    (with-current-buffer nnmail-cache-buffer
       (goto-char (point-max))
       (search-backward id nil t))))
 

=== modified file 'lisp/gnus/nnmaildir.el'
--- lisp/gnus/nnmaildir.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/nnmaildir.el	2010-09-18 10:02:19 +0000
@@ -208,20 +208,16 @@
   (eval param))
 
 (defmacro nnmaildir--with-nntp-buffer (&rest body)
-  `(save-excursion
-     (set-buffer nntp-server-buffer)
+  `(with-current-buffer nntp-server-buffer
      ,@body))
 (defmacro nnmaildir--with-work-buffer (&rest body)
-  `(save-excursion
-     (set-buffer (get-buffer-create " *nnmaildir work*"))
+  `(with-current-buffer (get-buffer-create " *nnmaildir work*")
      ,@body))
 (defmacro nnmaildir--with-nov-buffer (&rest body)
-  `(save-excursion
-     (set-buffer (get-buffer-create " *nnmaildir nov*"))
+  `(with-current-buffer (get-buffer-create " *nnmaildir nov*")
      ,@body))
 (defmacro nnmaildir--with-move-buffer (&rest body)
-  `(save-excursion
-     (set-buffer (get-buffer-create " *nnmaildir move*"))
+  `(with-current-buffer (get-buffer-create " *nnmaildir move*")
      ,@body))
 
 (defmacro nnmaildir--subdir (dir subdir)
@@ -1249,8 +1245,7 @@
 	(setf (nnmaildir--srv-error nnmaildir--cur-server)
 	      "Article has expired")
 	(throw 'return nil))
-      (save-excursion
-	(set-buffer (or to-buffer nntp-server-buffer))
+      (with-current-buffer (or to-buffer nntp-server-buffer)
 	(erase-buffer)
 	(nnheader-insert-file-contents nnmaildir-article-file-name))
       (cons gname num-msgid))))
@@ -1289,8 +1284,7 @@
 	(setf (nnmaildir--srv-error nnmaildir--cur-server)
 	      (concat "File exists: " tmpfile))
 	(throw 'return nil))
-      (save-excursion
-	(set-buffer buffer)
+      (with-current-buffer buffer
 	(gmm-write-region (point-min) (point-max) tmpfile nil 'no-message nil
 			  'excl))
       (unix-sync) ;; no fsync :(

=== modified file 'lisp/gnus/nnmairix.el'
--- lisp/gnus/nnmairix.el	2010-09-02 01:42:32 +0000
+++ lisp/gnus/nnmairix.el	2010-09-18 10:02:19 +0000
@@ -445,8 +445,7 @@
       nil)
      ((not query)
       ;; No query -> return empty group
-      (save-excursion
-	(set-buffer nntp-server-buffer)
+      (with-current-buffer nntp-server-buffer
 	(erase-buffer)
 	(insert (concat "211 0 1 0 " group))
 	t))
@@ -501,9 +500,9 @@
 	  (nnmairix-request-group-with-article-number-correction
 	   folder qualgroup)))
        ((and (= rval 1)
-	     (save-excursion (set-buffer nnmairix-mairix-output-buffer)
-			     (goto-char (point-min))
-			     (looking-at "^Matched 0 messages")))
+	     (with-current-buffer nnmairix-mairix-output-buffer
+	       (goto-char (point-min))
+	       (looking-at "^Matched 0 messages")))
 	;; No messages found -> return empty group
 	(nnheader-message 5 "Mairix: No matches found.")
 	(set-buffer nntp-server-buffer)
@@ -584,8 +583,7 @@
   (when server (nnmairix-open-server server))
   (if (nnmairix-call-backend "request-list" nnmairix-backend-server)
       (let (cpoint cur qualgroup folder)
-	(save-excursion
-	  (set-buffer nntp-server-buffer)
+	(with-current-buffer nntp-server-buffer
 	  (goto-char (point-min))
 	  (setq cpoint (point))
 	  (while (re-search-forward nnmairix-group-regexp (point-max) t)
@@ -699,8 +697,7 @@
       (when (or (eq nnmairix-propagate-marks-upon-close t)
 		(and (eq nnmairix-propagate-marks-upon-close 'ask)
 		     (y-or-n-p "Propagate marks to original articles? ")))
-      (save-excursion
-	(set-buffer gnus-group-buffer)
+      (with-current-buffer gnus-group-buffer
 	(nnmairix-propagate-marks)
 	;; update mairix group
 	(gnus-group-jump-to-group qualgroup)
@@ -998,8 +995,7 @@
     (if server
 	(if (gnus-buffer-live-p gnus-article-buffer)
 	    (progn
-	      (save-excursion
-		(set-buffer gnus-article-buffer)
+	      (with-current-buffer gnus-article-buffer
 		(gnus-summary-toggle-header 1)
 		(setq mid (message-fetch-field "Message-ID")))
 	      (while (string-match "[<>]" mid)
@@ -1021,8 +1017,7 @@
     (if server
 	(if (gnus-buffer-live-p gnus-article-buffer)
 	    (progn
-	      (save-excursion
-		(set-buffer gnus-article-buffer)
+	      (with-current-buffer gnus-article-buffer
 		(gnus-summary-toggle-header 1)
 		(setq from (cadr (gnus-extract-address-components
 				  (gnus-fetch-field "From"))))
@@ -1046,8 +1041,7 @@
 	(when (nnmairix-call-backend
 	       "request-list" nnmairix-backend-server)
 	  (let (cur qualgroup folder)
-	    (save-excursion
-	      (set-buffer nntp-server-buffer)
+	    (with-current-buffer nntp-server-buffer
 	      (goto-char (point-min))
 	      (while (re-search-forward nnmairix-group-regexp (point-max) t)
 		(setq cur (match-string 0)
@@ -1152,8 +1146,7 @@
 		(push (list (car ogroup) (list (list number) (nth 1 mid-marks) (nth 2 mid-marks)))
 		      number-cache)))))
 	;; now we set the marks
-	(save-excursion
-	  (set-buffer gnus-group-buffer)
+	(with-current-buffer gnus-group-buffer
 	  (nnheader-message 5 "nnmairix: Propagating marks...")
 	  (dolist (cur number-cache)
 	    (setq method (gnus-find-method-for-group (car cur)))
@@ -1272,9 +1265,8 @@
   "Call mairix binary with COMMAND, using FOLDER and SEARCHQUERY.
 If THREADS is non-nil, enable full threads."
   (let ((args (cons (car command) '(nil t nil))))
-    (save-excursion
-      (set-buffer
-       (get-buffer-create nnmairix-mairix-output-buffer))
+    (with-current-buffer
+       (get-buffer-create nnmairix-mairix-output-buffer)
       (erase-buffer)
       (when (> (length command) 1)
 	(setq args (append args (cdr command))))
@@ -1291,9 +1283,8 @@
 (defun nnmairix-call-mairix-binary-raw (command query)
   "Call mairix binary with COMMAND and QUERY in raw mode."
   (let ((args (cons (car command) '(nil t nil))))
-    (save-excursion
-      (set-buffer
-       (get-buffer-create nnmairix-mairix-output-buffer))
+    (with-current-buffer
+       (get-buffer-create nnmairix-mairix-output-buffer)
       (erase-buffer)
       (when (> (length command) 1)
         (setq args (append args (cdr command))))
@@ -1430,8 +1421,7 @@
 	(corr (not (zerop numc)))
 	(name (buffer-name nntp-server-buffer))
 	header cur xref)
-    (save-excursion
-      (set-buffer buf)
+    (with-current-buffer buf
       (erase-buffer)
       (set-buffer nntp-server-buffer)
       (goto-char (point-min))
@@ -1621,8 +1611,7 @@
   (let ((server (nth 1 gnus-current-select-method))
 	mid rval group allgroups)
     ;; get message id
-    (save-excursion
-      (set-buffer gnus-article-buffer)
+    (with-current-buffer gnus-article-buffer
       (gnus-summary-toggle-header 1)
       (setq mid (message-fetch-field "Message-ID"))
       ;; first check the registry (if available)
@@ -1678,8 +1667,7 @@
     (if (zerop (nnmairix-call-mairix-binary-raw
 		(split-string nnmairix-mairix-command)
 		(list (concat "m:" mid))))
-	(save-excursion
-	  (set-buffer nnmairix-mairix-output-buffer)
+	(with-current-buffer nnmairix-mairix-output-buffer
 	  (goto-char (point-min))
 	  (while (re-search-forward "^/.*$" nil t)
 	    (push (nnmairix-get-group-from-file-path (match-string 0))

=== modified file 'lisp/gnus/nnmbox.el'
--- lisp/gnus/nnmbox.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/nnmbox.el	2010-09-18 10:02:19 +0000
@@ -79,8 +79,7 @@
 (nnoo-define-basics nnmbox)
 
 (deffoo nnmbox-retrieve-headers (sequence &optional newsgroup server fetch-old)
-  (save-excursion
-    (set-buffer nntp-server-buffer)
+  (with-current-buffer nntp-server-buffer
     (erase-buffer)
     (let ((number (length sequence))
 	  (count 0)
@@ -149,8 +148,7 @@
 
 (deffoo nnmbox-request-article (article &optional newsgroup server buffer)
   (nnmbox-possibly-change-newsgroup newsgroup server)
-  (save-excursion
-    (set-buffer nnmbox-mbox-buffer)
+  (with-current-buffer nnmbox-mbox-buffer
     (when (nnmbox-find-article article)
       (let (start stop)
 	(re-search-backward (concat "^" message-unix-mail-delimiter) nil t)
@@ -208,8 +206,7 @@
   (nnmail-get-new-mail
    'nnmbox
    (lambda ()
-     (save-excursion
-       (set-buffer nnmbox-mbox-buffer)
+     (with-current-buffer nnmbox-mbox-buffer
        (nnmbox-save-buffer)))
    (file-name-directory nnmbox-mbox-file)
    group
@@ -253,8 +250,7 @@
 	 rest)
     (nnmail-activate 'nnmbox)
 
-    (save-excursion
-      (set-buffer nnmbox-mbox-buffer)
+    (with-current-buffer nnmbox-mbox-buffer
       (while (and articles is-old)
 	(when (nnmbox-find-article (car articles))
 	  (if (setq is-old
@@ -292,8 +288,7 @@
 	result)
     (and
      (nnmbox-request-article article group server)
-     (save-excursion
-       (set-buffer buf)
+     (with-current-buffer buf
        (erase-buffer)
        (insert-buffer-substring nntp-server-buffer)
        (goto-char (point-min))
@@ -364,8 +359,7 @@
 
 (deffoo nnmbox-request-replace-article (article group buffer)
   (nnmbox-possibly-change-newsgroup group)
-  (save-excursion
-    (set-buffer nnmbox-mbox-buffer)
+  (with-current-buffer nnmbox-mbox-buffer
     (if (not (nnmbox-find-article article))
 	nil
       (nnmbox-delete-mail t t)
@@ -391,8 +385,7 @@
   ;; Delete all articles in GROUP.
   (if (not force)
       ()				; Don't delete the articles.
-    (save-excursion
-      (set-buffer nnmbox-mbox-buffer)
+    (with-current-buffer nnmbox-mbox-buffer
       (goto-char (point-min))
       ;; Delete all articles in this group.
       (let ((ident (concat "\nX-Gnus-Newsgroup: " nnmbox-current-group ":"))
@@ -412,8 +405,7 @@
 
 (deffoo nnmbox-request-rename-group (group new-name &optional server)
   (nnmbox-possibly-change-newsgroup group server)
-  (save-excursion
-    (set-buffer nnmbox-mbox-buffer)
+  (with-current-buffer nnmbox-mbox-buffer
     (goto-char (point-min))
     (let ((ident (concat "\nX-Gnus-Newsgroup: " nnmbox-current-group ":"))
 	  (new-ident (concat "\nX-Gnus-Newsgroup: " new-name ":"))
@@ -633,8 +625,7 @@
   (nnmbox-create-mbox)
   (if (and nnmbox-mbox-buffer
 	   (buffer-name nnmbox-mbox-buffer)
-	   (save-excursion
-	     (set-buffer nnmbox-mbox-buffer)
+	   (with-current-buffer nnmbox-mbox-buffer
 	     (= (buffer-size) (nnheader-file-size nnmbox-mbox-file))))
       ()
     (save-excursion

=== modified file 'lisp/gnus/nnml.el'
--- lisp/gnus/nnml.el	2010-09-06 23:54:07 +0000
+++ lisp/gnus/nnml.el	2010-09-18 10:02:19 +0000
@@ -160,8 +160,7 @@
 
 (deffoo nnml-retrieve-headers (sequence &optional group server fetch-old)
   (when (nnml-possibly-change-directory group server)
-    (save-excursion
-      (set-buffer nntp-server-buffer)
+    (with-current-buffer nntp-server-buffer
       (erase-buffer)
       (let* ((file nil)
 	     (number (length sequence))
@@ -405,8 +404,7 @@
      (let (nnml-current-directory
 	   nnml-current-group
 	   nnml-article-file-alist)
-       (save-excursion
-	 (set-buffer buf)
+       (with-current-buffer buf
 	 (insert-buffer-substring nntp-server-buffer)
 	 (setq result (eval accept-form))
 	 (kill-buffer (current-buffer))
@@ -462,8 +460,7 @@
 
 (deffoo nnml-request-replace-article (article group buffer)
   (nnml-possibly-change-directory group)
-  (save-excursion
-    (set-buffer buffer)
+  (with-current-buffer buffer
     (nnml-possibly-create-directory group)
     (let ((chars (nnmail-insert-lines))
 	  (art (concat (int-to-string article) "\t"))
@@ -478,8 +475,7 @@
 	      t)
 	(setq headers (nnml-parse-head chars article))
 	;; Replace the NOV line in the NOV file.
-	(save-excursion
-	  (set-buffer (nnml-open-nov group))
+	(with-current-buffer (nnml-open-nov group)
 	  (goto-char (point-min))
 	  (if (or (looking-at art)
 		  (search-forward (concat "\n" art) nil t))
@@ -614,8 +610,7 @@
 
 ;; Find an article number in the current group given the Message-ID.
 (defun nnml-find-group-number (id server)
-  (save-excursion
-    (set-buffer (get-buffer-create " *nnml id*"))
+  (with-current-buffer (get-buffer-create " *nnml id*")
     (let ((alist nnml-group-alist)
 	  number)
       ;; We want to look through all .overview files, but we want to
@@ -657,8 +652,7 @@
       nil
     (let ((nov (expand-file-name nnml-nov-file-name nnml-current-directory)))
       (when (file-exists-p nov)
-	(save-excursion
-	  (set-buffer nntp-server-buffer)
+	(with-current-buffer nntp-server-buffer
 	  (erase-buffer)
 	  (nnheader-insert-file-contents nov)
 	  (if (and fetch-old
@@ -804,16 +798,14 @@
 
 (defun nnml-add-incremental-nov (group article headers)
   "Add a nov line for the GROUP nov headers, incrementally."
-  (save-excursion
-    (set-buffer (nnml-open-incremental-nov group))
+  (with-current-buffer (nnml-open-incremental-nov group)
     (goto-char (point-max))
     (mail-header-set-number headers article)
     (nnheader-insert-nov headers)))
 
 (defun nnml-add-nov (group article headers)
   "Add a nov line for the GROUP base."
-  (save-excursion
-    (set-buffer (nnml-open-nov group))
+  (with-current-buffer (nnml-open-nov group)
     (goto-char (point-max))
     (mail-header-set-number headers article)
     (nnheader-insert-nov headers)))
@@ -844,8 +836,7 @@
 					      "")
 					    decoded)))
 	 (file-name-coding-system nnmail-pathname-coding-system))
-    (save-excursion
-      (set-buffer buffer)
+    (with-current-buffer buffer
       (set (make-local-variable 'nnml-nov-buffer-file-name)
 	   (nnmail-group-pathname decoded nnml-directory nnml-nov-file-name))
       (erase-buffer)
@@ -942,9 +933,8 @@
 	 (nov (concat dir nnml-nov-file-name))
 	 (nov-buffer (get-buffer-create " *nov*"))
 	 chars file headers)
-    (save-excursion
+    (with-current-buffer nov-buffer
       ;; Init the nov buffer.
-      (set-buffer nov-buffer)
       (buffer-disable-undo)
       (erase-buffer)
       (set-buffer nntp-server-buffer)
@@ -964,20 +954,17 @@
 	  (unless (zerop (buffer-size))
 	    (goto-char (point-min))
 	    (setq headers (nnml-parse-head chars (caar files)))
-	    (save-excursion
-	      (set-buffer nov-buffer)
+	    (with-current-buffer nov-buffer
 	      (goto-char (point-max))
 	      (nnheader-insert-nov headers)))
 	  (widen))
 	(setq files (cdr files)))
-      (save-excursion
-	(set-buffer nov-buffer)
+      (with-current-buffer nov-buffer
 	(nnmail-write-region (point-min) (point-max) nov nil 'nomesg)
 	(kill-buffer (current-buffer))))))
 
 (defun nnml-nov-delete-article (group article)
-  (save-excursion
-    (set-buffer (nnml-open-nov group))
+  (with-current-buffer (nnml-open-nov group)
     (when (nnheader-find-nov-line article)
       (delete-region (point) (progn (forward-line 1) (point)))
       (when (bobp)
@@ -1260,8 +1247,7 @@
 		  (gnus-info-set-marks info newmarks))
 		;; 3/ Update the NOV entry for this article:
 		(unless nnml-nov-is-evil
-		  (save-excursion
-		    (set-buffer (nnml-open-nov group))
+		  (with-current-buffer (nnml-open-nov group)
 		    (when (nnheader-find-nov-line old-number)
 		      ;; Replace the article number:
 		      (looking-at old-number-string)

=== modified file 'lisp/gnus/nnnil.el'
--- lisp/gnus/nnnil.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/nnnil.el	2010-09-18 10:02:19 +0000
@@ -58,8 +58,7 @@
 
 (defun nnnil-request-group (group &optional server fast)
   (let (deactivate-mark)
-    (save-excursion
-      (set-buffer nntp-server-buffer)
+    (with-current-buffer nntp-server-buffer
       (erase-buffer)
       (insert "411 no such news group\n")))
   (setq nnnil-status-string "No such group")

=== modified file 'lisp/gnus/nnspool.el'
--- lisp/gnus/nnspool.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/nnspool.el	2010-09-18 10:02:19 +0000
@@ -109,8 +109,7 @@
 
 (deffoo nnspool-retrieve-headers (articles &optional group server fetch-old)
   "Retrieve the headers of ARTICLES."
-  (save-excursion
-    (set-buffer nntp-server-buffer)
+  (with-current-buffer nntp-server-buffer
     (erase-buffer)
     (when (nnspool-possibly-change-directory group)
       (let* ((number (length articles))
@@ -209,8 +208,7 @@
   (nnspool-possibly-change-directory group)
   (let ((res (nnspool-request-article id)))
     (when res
-      (save-excursion
-	(set-buffer nntp-server-buffer)
+      (with-current-buffer nntp-server-buffer
 	(goto-char (point-min))
 	(when (search-forward "\n\n" nil t)
 	  (delete-region (point-min) (point)))
@@ -221,8 +219,7 @@
   (nnspool-possibly-change-directory group)
   (let ((res (nnspool-request-article id)))
     (when res
-      (save-excursion
-	(set-buffer nntp-server-buffer)
+      (with-current-buffer nntp-server-buffer
 	(goto-char (point-min))
 	(when (search-forward "\n\n" nil t)
 	  (delete-region (1- (point)) (point-max)))
@@ -343,8 +340,7 @@
 ;;; Internal functions.
 
 (defun nnspool-inews-sentinel (proc status)
-  (save-excursion
-    (set-buffer (process-buffer proc))
+  (with-current-buffer (process-buffer proc)
     (goto-char (point-min))
     (if (or (zerop (buffer-size))
 	    (search-forward "spooled" nil t))
@@ -367,8 +363,7 @@
 	  last)
       (if (not (file-exists-p nov))
 	  ()
-	(save-excursion
-	  (set-buffer nntp-server-buffer)
+	(with-current-buffer nntp-server-buffer
 	  (erase-buffer)
 	  (if nnspool-sift-nov-with-sed
 	      (nnspool-sift-nov-with-sed articles nov)

=== modified file 'lisp/gnus/nntp.el'
--- lisp/gnus/nntp.el	2010-09-07 00:04:11 +0000
+++ lisp/gnus/nntp.el	2010-09-18 10:02:19 +0000
@@ -1014,7 +1014,8 @@
     (unless (assq 'nntp-address defs)
       (setq defs (append defs (list (list 'nntp-address server)))))
     (nnoo-change-server 'nntp server defs)
-    (unless connectionless
+    (if connectionless
+	t
       (or (nntp-find-connection nntp-server-buffer)
 	  (nntp-open-connection nntp-server-buffer)))))
 

=== modified file 'lisp/gnus/nnvirtual.el'
--- lisp/gnus/nnvirtual.el	2010-09-05 23:20:25 +0000
+++ lisp/gnus/nnvirtual.el	2010-09-18 10:02:19 +0000
@@ -93,8 +93,7 @@
 (deffoo nnvirtual-retrieve-headers (articles &optional newsgroup
 					     server fetch-old)
   (when (nnvirtual-possibly-change-server server)
-    (save-excursion
-      (set-buffer nntp-server-buffer)
+    (with-current-buffer nntp-server-buffer
       (erase-buffer)
       (if (stringp (car articles))
 	  'headers
@@ -170,8 +169,7 @@
 	  ;; the nntp-server-buffer, which is where Gnus expects to find
 	  ;; them.
 	  (prog1
-	      (save-excursion
-		(set-buffer nntp-server-buffer)
+	      (with-current-buffer nntp-server-buffer
 		(erase-buffer)
 		(insert-buffer-substring vbuf)
 		;; FIX FIX FIX, we should be able to sort faster than
@@ -215,8 +213,7 @@
 	 (t
 	  (setq nnvirtual-last-accessed-component-group cgroup)
 	  (if buffer
-	      (save-excursion
-		(set-buffer buffer)
+	      (with-current-buffer buffer
 		;; We bind this here to avoid double decoding.
 		(let ((gnus-article-decode-hook nil))
 		  (gnus-request-article-this-buffer (cdr amap) cgroup)))
@@ -335,8 +332,7 @@
 	 (when (not (numberp (gnus-group-unread g)))
 	   (gnus-activate-group g)))
        nnvirtual-component-groups)
-      (save-excursion
-	(set-buffer gnus-group-buffer)
+      (with-current-buffer gnus-group-buffer
 	(gnus-group-catchup-current nil all)))))
 
 

=== modified file 'lisp/gnus/nnweb.el'
--- lisp/gnus/nnweb.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/nnweb.el	2010-09-18 10:02:19 +0000
@@ -104,8 +104,7 @@
 
 (deffoo nnweb-retrieve-headers (articles &optional group server fetch-old)
   (nnweb-possibly-change-server group server)
-  (save-excursion
-    (set-buffer nntp-server-buffer)
+  (with-current-buffer nntp-server-buffer
     (erase-buffer)
     (let (article header)
       (mm-with-unibyte-current-buffer
@@ -147,16 +146,14 @@
 (deffoo nnweb-close-group (group &optional server)
   (nnweb-possibly-change-server group server)
   (when (gnus-buffer-live-p nnweb-buffer)
-    (save-excursion
-      (set-buffer nnweb-buffer)
+    (with-current-buffer nnweb-buffer
       (set-buffer-modified-p nil)
       (kill-buffer nnweb-buffer)))
   t)
 
 (deffoo nnweb-request-article (article &optional group server buffer)
   (nnweb-possibly-change-server group server)
-  (save-excursion
-    (set-buffer (or buffer nntp-server-buffer))
+  (with-current-buffer (or buffer nntp-server-buffer)
     (let* ((header (cadr (assq article nnweb-articles)))
 	   (url (and header (mail-header-xref header))))
       (when (or (and url
@@ -185,16 +182,14 @@
 (deffoo nnweb-close-server (&optional server)
   (when (and (nnweb-server-opened server)
 	     (gnus-buffer-live-p nnweb-buffer))
-    (save-excursion
-      (set-buffer nnweb-buffer)
+    (with-current-buffer nnweb-buffer
       (set-buffer-modified-p nil)
       (kill-buffer nnweb-buffer)))
   (nnoo-close-server 'nnweb server))
 
 (deffoo nnweb-request-list (&optional server)
   (nnweb-possibly-change-server nil server)
-  (save-excursion
-    (set-buffer nntp-server-buffer)
+  (with-current-buffer nntp-server-buffer
     (nnmail-generate-active (list (assoc server nnweb-group-alist)))
     t))
 
@@ -402,8 +397,7 @@
 
 (defun nnweb-google-create-mapping ()
   "Perform the search and create a number-to-url alist."
-  (save-excursion
-    (set-buffer nnweb-buffer)
+  (with-current-buffer nnweb-buffer
     (erase-buffer)
     (nnheader-message 7 "Searching google...")
     (when (funcall (nnweb-definition 'search) nnweb-search)
@@ -459,8 +453,7 @@
 ;;;
 (defun nnweb-gmane-create-mapping ()
   "Perform the search and create a number-to-url alist."
-  (save-excursion
-    (set-buffer nnweb-buffer)
+  (with-current-buffer nnweb-buffer
     (let ((case-fold-search t)
 	  (active (or (cadr (assoc nnweb-group nnweb-group-alist))
 		      (cons 1 0)))

=== modified file 'lisp/gnus/pop3.el'
--- lisp/gnus/pop3.el	2010-09-17 14:22:06 +0000
+++ lisp/gnus/pop3.el	2010-09-18 10:02:19 +0000
@@ -279,9 +279,9 @@
   (let ((coding-system-for-read 'binary)
 	(coding-system-for-write 'binary)
 	process)
-    (with-current-buffer
-        (get-buffer-create (concat " trace of POP session to "
-                                   mailhost))
+    (save-excursion
+      (set-buffer (get-buffer-create (concat " trace of POP session to "
+					     mailhost)))
       (erase-buffer)
       (setq pop3-read-point (point-min))
       (setq process
@@ -353,7 +353,8 @@
 Return the response string if optional second argument is non-nil."
   (let ((case-fold-search nil)
 	match-end)
-    (with-current-buffer (process-buffer process)
+    (save-excursion
+      (set-buffer (process-buffer process))
       (goto-char pop3-read-point)
       (while (and (memq (process-status process) '(open run))
 		  (not (search-forward "\r\n" nil t)))
@@ -510,7 +511,8 @@
     (if msg
 	(string-to-number (nth 2 (split-string response " ")))
       (let ((start pop3-read-point) end)
-	(with-current-buffer (process-buffer process)
+	(save-excursion
+	  (set-buffer (process-buffer process))
 	  (while (not (re-search-forward "^\\.\r\n" nil t))
 	    (pop3-accept-process-output process)
 	    (goto-char start))
@@ -528,7 +530,8 @@
   (pop3-send-command process (format "RETR %s" msg))
   (pop3-read-response process)
   (let ((start pop3-read-point) end)
-    (with-current-buffer (process-buffer process)
+    (save-excursion
+      (set-buffer (process-buffer process))
       (while (not (re-search-forward "^\\.\r\n" nil t))
 	(pop3-accept-process-output process)
 	(goto-char start))
@@ -544,7 +547,8 @@
       (setq end (point-marker))
       (pop3-clean-region start end)
       (pop3-munge-message-separator start end)
-      (with-current-buffer crashbuf
+      (save-excursion
+	(set-buffer crashbuf)
 	(erase-buffer))
       (copy-to-buffer crashbuf start end)
       (delete-region start end)
@@ -581,7 +585,8 @@
   (pop3-send-command process "QUIT")
   (pop3-read-response process t)
   (if process
-      (with-current-buffer (process-buffer process)
+      (save-excursion
+	(set-buffer (process-buffer process))
 	(goto-char (point-max))
 	(delete-process process))))
 

=== modified file 'lisp/gnus/smime.el'
--- lisp/gnus/smime.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/smime.el	2010-09-18 10:02:19 +0000
@@ -708,8 +708,7 @@
   "Go to the SMIME buffer."
   (interactive)
   (unless (get-buffer smime-buffer)
-    (save-excursion
-      (set-buffer (get-buffer-create smime-buffer))
+    (with-current-buffer (get-buffer-create smime-buffer)
       (smime-mode)))
   (smime-draw-buffer)
   (switch-to-buffer smime-buffer))

=== modified file 'lisp/gnus/spam-report.el'
--- lisp/gnus/spam-report.el	2010-09-07 00:04:11 +0000
+++ lisp/gnus/spam-report.el	2010-09-18 10:02:19 +0000
@@ -109,8 +109,7 @@
     ;; select this particular article
     (gnus-summary-select-article nil nil nil article)
     ;; resend it to the destination address
-    (save-excursion
-      (set-buffer gnus-original-article-buffer)
+    (with-current-buffer gnus-original-article-buffer
       (message-resend spam-report-resend-to))))
 
 (defun spam-report-resend-ham (articles)
@@ -292,8 +291,7 @@
     (gnus-message 7 "Processing requests using `%s'."
 		  spam-report-url-ping-function))
   (or file (setq file spam-report-requests-file))
-  (save-excursion
-    (set-buffer (find-file-noselect file))
+  (with-current-buffer (find-file-noselect file)
     (goto-char (point-min))
     (while (and (not (eobp))
 		(re-search-forward

=== modified file 'lisp/gnus/spam.el'
--- lisp/gnus/spam.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/spam.el	2010-09-18 10:02:19 +0000
@@ -1605,8 +1605,7 @@
        article))))
 
 (defun spam-fetch-article-header (article)
-  (save-excursion
-    (set-buffer gnus-summary-buffer)
+  (with-current-buffer gnus-summary-buffer
     (gnus-read-header article)
     (nth 3 (assq article gnus-newsgroup-data))))
 ;;}}}
@@ -2172,8 +2171,7 @@
     (with-temp-buffer
       (let ((temp-buffer-name (buffer-name))
 	    (db-param (spam-get-ifile-database-parameter)))
-	(save-excursion
-	  (set-buffer article-buffer-name)
+	(with-current-buffer article-buffer-name
 	  (apply 'call-process-region
 		 (point-min) (point-max) spam-ifile-program
 		 nil temp-buffer-name nil "-c"
@@ -2318,9 +2316,8 @@
     ;; else, we have a list of addresses here
     (unless (file-exists-p (file-name-directory file))
       (make-directory (file-name-directory file) t))
-    (save-excursion
-      (set-buffer
-       (find-file-noselect file))
+    (with-current-buffer
+       (find-file-noselect file)
       (dolist (a addresses)
 	(when (stringp a)
 	  (goto-char (point-min))
@@ -2521,8 +2518,7 @@
 	    return)
 	(with-temp-buffer
 	  (let ((temp-buffer-name (buffer-name)))
-	    (save-excursion
-	      (set-buffer article-buffer-name)
+	    (with-current-buffer article-buffer-name
 	      (apply 'call-process-region
 		     (point-min) (point-max)
 		     spam-bogofilter-program
@@ -2579,8 +2575,7 @@
   (let ((article-buffer-name (buffer-name)))
     (with-temp-buffer
       (let ((temp-buffer-name (buffer-name)))
-	(save-excursion
-	  (set-buffer article-buffer-name)
+	(with-current-buffer article-buffer-name
 	  (let ((status
 		 (apply 'call-process-region
 			(point-min) (point-max)
@@ -2656,8 +2651,7 @@
   (let ((article-buffer-name (buffer-name)))
     (with-temp-buffer
       (let ((temp-buffer-name (buffer-name)))
-	(save-excursion
-	  (set-buffer article-buffer-name)
+	(with-current-buffer article-buffer-name
 	  (apply 'call-process-region
 		 (point-min) (point-max) spam-assassin-program
 		 nil temp-buffer-name nil spam-spamassassin-arguments))
@@ -2691,8 +2685,7 @@
 	  ;; group the articles into mbox format
 	  (dolist (article articles)
 	    (let (article-string)
-	      (save-excursion
-		(set-buffer summary-buffer-name)
+	      (with-current-buffer summary-buffer-name
 		(setq article-string (spam-get-article-as-string article)))
 	      (when (stringp article-string)
 		(insert "From \n") ; mbox separator (sa-learn only checks the
@@ -2755,8 +2748,7 @@
 	return)
     (with-temp-buffer
       (let ((temp-buffer-name (buffer-name)))
-	(save-excursion
-	  (set-buffer article-buffer-name)
+	(with-current-buffer article-buffer-name
 	  (apply 'call-process-region
 		 (point-min) (point-max)
 		 spam-bsfilter-program
@@ -2841,8 +2833,7 @@
 	return)
     (with-temp-buffer
       (let ((temp-buffer-name (buffer-name)))
-	(save-excursion
-	  (set-buffer article-buffer-name)
+	(with-current-buffer article-buffer-name
 	  (apply 'call-process-region
 		 (point-min) (point-max)
 		 spam-crm114-program

=== modified file 'lisp/gnus/starttls.el'
--- lisp/gnus/starttls.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/starttls.el	2010-09-18 10:02:19 +0000
@@ -254,8 +254,7 @@
     (starttls-set-process-query-on-exit-flag process nil)
     (while (and (processp process)
 		(eq (process-status process) 'run)
-		(save-excursion
-		  (set-buffer buffer)
+		(with-current-buffer buffer
 		  (goto-char old-max)
 		  (not (setq done (re-search-forward
 				   starttls-connect nil t)))))

=== modified file 'lisp/gnus/utf7.el'
--- lisp/gnus/utf7.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/utf7.el	2010-09-18 10:02:19 +0000
@@ -205,6 +205,7 @@
   (mm-decode-coding-region (point-min) (point-max) 'iso-8859-1)
   (mm-enable-multibyte))
 
+;;;###autoload
 (defun utf7-encode (string &optional for-imap)
   "Encode UTF-7 STRING.  Use IMAP modification if FOR-IMAP is non-nil."
   (if (and (coding-system-p 'utf-7) (coding-system-p 'utf-7-imap))

=== modified file 'lisp/net/netrc.el'
--- lisp/net/netrc.el	2010-09-11 00:36:27 +0000
+++ lisp/net/netrc.el	2010-09-18 10:02:19 +0000
@@ -228,6 +228,7 @@
 			  (eq type (car (cddr service)))))))
     (cadr service)))
 
+;;;###autoload
 (defun netrc-credentials (machine &rest ports)
   "Return a user name/password pair.
 Port specifications will be prioritised in the order they are
------------------------------------------------------------
revno: 101471
committer: Eli Zaretskii <eliz@gnu.org>
branch nick: trunk
timestamp: Sat 2010-09-18 11:38:52 +0200
message:
  Mention rounding of fringe width in the doc string of fringe-mode.
  
   fringe.el (fringe-mode): Doc fix.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-18 01:25:31 +0000
+++ lisp/ChangeLog	2010-09-18 09:38:52 +0000
@@ -1,3 +1,7 @@
+2010-09-18  Eli Zaretskii  <eliz@gnu.org>
+
+	* fringe.el (fringe-mode): Doc fix.
+
 2010-09-14  Kan-Ru Chen  <kanru@kanru.info>  (tiny change)
 
 	* textmodes/nroff-mode.el (nroff-view): Kill old buffer before

=== modified file 'lisp/fringe.el'
--- lisp/fringe.el	2010-09-17 21:07:57 +0000
+++ lisp/fringe.el	2010-09-18 09:38:52 +0000
@@ -144,6 +144,9 @@
 a cons cell where car indicates width of left fringe and cdr indicates
 width of right fringe (where again 0 can be used to indicate no
 fringe).
+Note that the actual width may be rounded up to ensure that the sum of
+the width of the left and right fringes is a multiple of the frame's
+character width.  However, a fringe width of 0 is never rounded.
 To set this variable in a Lisp program, use `set-fringe-mode' to make
 it take real effect.
 Setting the variable with a customization buffer also takes effect.
------------------------------------------------------------
revno: 101470
author: Esa Peuha <esa.peuha@gmail.com>
committer: Eli Zaretskii <eliz@gnu.org>
branch nick: trunk
timestamp: Sat 2010-09-18 11:15:02 +0200
message:
  Fix typos in etc/NEWS.
diff:
=== modified file 'etc/NEWS'
--- etc/NEWS	2010-09-18 00:35:00 +0000
+++ etc/NEWS	2010-09-18 09:15:02 +0000
@@ -49,7 +49,7 @@
 
 ** There is a new configure option --enable-use-lisp-union-type.
 This is only useful for Emacs developers to debug certain types of bugs.
-These is not a new feature; only the configure flag is new.
+This is not a new feature; only the configure flag is new.
 
 ---
 ** New translation of the Emacs Tutorial in Hebrew is available
@@ -121,7 +121,7 @@
 The new function `imagemagick-types' returns a list of image file
 extensions that your installation of ImageMagick supports.  The
 function `imagemagick-register-types' enables ImageMagick support for
-these imaeg types, minus those listed in `imagemagick-types-inhibit'.
+these image types, minus those listed in `imagemagick-types-inhibit'.
 
 See the Emacs Lisp Reference Manual for more information.
 
@@ -157,7 +157,7 @@
 scroll a line instead of full screen.
 
 ** New property `scroll-command' should be set on a command's symbol to
-define it as a scroll command affected by `scroll-preserve-screen-position.
+define it as a scroll command affected by `scroll-preserve-screen-position'.
 
 ** Trash changes
 
@@ -189,8 +189,6 @@
 
 ** completion-at-point is now an alias for complete-symbol.
 
-** mouse-region-delete-keys has been deleted.
-
 ** Deletion changes
 
 *** New option `delete-active-region'.
@@ -259,6 +257,7 @@
 (setq completion-pcm-complete-word-inserts-delimiters t)
 
 ** mpc.el: Can use pseudo tags of the form tag1|tag2 as a union of two tags.
+
 ** Customize
 
 *** Customize buffers now contain a search field.
@@ -395,7 +394,7 @@
 for the users password and then connect to the Oracle database.
 
 **** Added SQL->Start... submenu when connections are defined.
-When connections have been defined, There is a submenu available that
+When connections have been defined, there is a submenu available that
 allows the user to select one to start a SQLi session.  The "Start
 SQLi Session" item moves to the "Start..." submenu when cnnections
 have been defined.
@@ -505,7 +504,7 @@
 ** prog-mode is a new major-mode meant to be the parent of programming mode.
 ** define-minor-mode accepts a new keyword :variable.
 
-** `delete-file' and `delete-directory now accept optional arg TRASH.
+** `delete-file' and `delete-directory' now accept optional arg TRASH.
 Trashing is performed if TRASH and `delete-by-moving-to-trash' are
 both non-nil.  Interactively, TRASH defaults to t, unless a prefix
 argument is supplied (see Trash changes, above).
------------------------------------------------------------
revno: 101469
author: Kan-Ru Chen <kanru@kanru.info>
committer: Chong Yidong <cyd@stupidchicken.com>
branch nick: trunk
timestamp: Fri 2010-09-17 21:25:31 -0400
message:
  * textmodes/nroff-mode.el (nroff-view): Kill old buffer before refreshing the preview buffer.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-18 00:35:00 +0000
+++ lisp/ChangeLog	2010-09-18 01:25:31 +0000
@@ -1,3 +1,8 @@
+2010-09-14  Kan-Ru Chen  <kanru@kanru.info>  (tiny change)
+
+	* textmodes/nroff-mode.el (nroff-view): Kill old buffer before
+	refreshing the preview buffer.
+
 2010-09-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* textmodes/tex-mode.el (tex-syntax-propertize-rules)

=== modified file 'lisp/textmodes/nroff-mode.el'
--- lisp/textmodes/nroff-mode.el	2010-08-31 18:04:26 +0000
+++ lisp/textmodes/nroff-mode.el	2010-09-18 01:25:31 +0000
@@ -311,10 +311,16 @@
   "Run man on this file."
   (interactive)
   (require 'man)
-  (let* ((file (buffer-file-name)))
-    (if file
-	(Man-getpage-in-background file)
-      (error "No associated file for the current buffer"))))
+  (let* ((file (buffer-file-name))
+	 (viewbuf (get-buffer (concat "*Man " file "*"))))
+    (unless file
+      (error "Buffer is not associated with any file"))
+    (and (buffer-modified-p)
+	 (y-or-n-p (format "Save buffer %s first? " (buffer-name)))
+	 (save-buffer))
+    (if viewbuf
+	(kill-buffer viewbuf))
+    (Man-getpage-in-background file)))
 
 ;; Old names that were not namespace clean.
 (define-obsolete-function-alias 'count-text-lines 'nroff-count-text-lines "22.1")
------------------------------------------------------------
revno: 101468
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Sat 2010-09-18 02:35:00 +0200
message:
  Fix and improve last syntax-propertize patch
  * lisp/emacs-lisp/syntax.el (syntax-propertize-precompile-rules): New macro.
  (syntax-propertize-rules): Add var-ref case.  Fix offset computation
  when adding surrounding \(..\).
  
  * lisp/progmodes/fortran.el (fortran--font-lock-syntactic-keywords): Remove.
  (fortran-make-syntax-propertize-function): New function; replaces
  fortran-font-lock-syntactic-keywords.
  (fortran-mode): Use it.
  (fortran-line-length): Use it.  Improve interactive spec.
  
  * lisp/progmodes/js.el (js-mode): Fix last change (bug#7054).
  
  * lisp/textmodes/tex-mode.el (tex-syntax-propertize-rules)
  (latex-syntax-propertize-rules): New consts; replace
  tex-font-lock-syntactic-keywords.
  (tex-env-mark, latex-env-before-change): New functions.
  (latex-electric-env-pair-mode): New minor mode.
  (tex-font-lock-verb): Change arguments; do move point.
  (tex-font-lock-syntactic-face-function): Adjust to new verbatim
  representation as a form of comment.
  (tex-font-lock-keywords-1): Remove workaround, now unneeded.
  (doctex-syntax-propertize-rules): New const; replaces
  doctex-font-lock-syntactic-keywords.
  (tex-common-initialization, doctex-mode): Use syntax-propertize-rules.
diff:
=== modified file 'etc/NEWS'
--- etc/NEWS	2010-09-13 15:43:33 +0000
+++ etc/NEWS	2010-09-18 00:35:00 +0000
@@ -236,6 +236,8 @@
 
 * Changes in Specialized Modes and Packages in Emacs 24.1
 
+** latex-electric-env-pair-mode keeps \begin..\end matched on the fly.
+
 ** FIXME: xdg-open for browse-url and reportbug, 2010/08.  (Close bug#4546?)
 
 ** Archive Mode has basic support to browse 7z archives.

=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-17 22:28:10 +0000
+++ lisp/ChangeLog	2010-09-18 00:35:00 +0000
@@ -1,3 +1,30 @@
+2010-09-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* textmodes/tex-mode.el (tex-syntax-propertize-rules)
+	(latex-syntax-propertize-rules): New consts; replace
+	tex-font-lock-syntactic-keywords.
+	(tex-env-mark, latex-env-before-change): New functions.
+	(latex-electric-env-pair-mode): New minor mode.
+	(tex-font-lock-verb): Change arguments; do move point.
+	(tex-font-lock-syntactic-face-function): Adjust to new verbatim
+	representation as a form of comment.
+	(tex-font-lock-keywords-1): Remove workaround, now unneeded.
+	(doctex-syntax-propertize-rules): New const; replaces
+	doctex-font-lock-syntactic-keywords.
+	(tex-common-initialization, doctex-mode): Use syntax-propertize-rules.
+
+	* progmodes/fortran.el (fortran--font-lock-syntactic-keywords): Remove.
+	(fortran-make-syntax-propertize-function): New function; replaces
+	fortran-font-lock-syntactic-keywords.
+	(fortran-mode): Use it.
+	(fortran-line-length): Use it.  Improve interactive spec.
+
+	* emacs-lisp/syntax.el (syntax-propertize-precompile-rules): New macro.
+	(syntax-propertize-rules): Add var-ref case.  Fix offset computation
+	when adding surrounding \(..\).
+
+	* progmodes/js.el (js-mode): Fix last change (bug#7054).
+
 2010-09-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* obsolete/old-whitespace.el (whitespace-rescan-files-in-buffers):

=== modified file 'lisp/emacs-lisp/syntax.el'
--- lisp/emacs-lisp/syntax.el	2010-09-10 23:13:42 +0000
+++ lisp/emacs-lisp/syntax.el	2010-09-18 00:35:00 +0000
@@ -57,7 +57,11 @@
   ;; syntax-ppss-flush-cache since that would not only flush the cache but also
   ;; reset syntax-propertize--done which should not be done in this case).
   "Mode-specific function to apply the syntax-table properties.
-Called with 2 arguments: START and END.")
+Called with 2 arguments: START and END.
+This function can call `syntax-ppss' on any position before END, but it
+should not call `syntax-ppss-flush-cache', which means that it should not
+call `syntax-ppss' on some position and later modify the buffer on some
+earlier position.")
 
 (defvar syntax-propertize-chunk-size 500)
 
@@ -109,15 +113,35 @@
       t t s 1))
    re t t))
 
+(defmacro syntax-propertize-precompile-rules (&rest rules)
+  "Return a precompiled form of RULES to pass to `syntax-propertize-rules'.
+The arg RULES can be of the same form as in `syntax-propertize-rules'.
+The return value is an object that can be passed as a rule to
+`syntax-propertize-rules'.
+I.e. this is useful only when you want to share rules among several
+syntax-propertize-functions."
+  (declare (debug syntax-propertize-rules))
+  ;; Precompile?  Yeah, right!
+  ;; Seriously, tho, this is a macro for 2 reasons:
+  ;; - we could indeed do some pre-compilation at some point in the future,
+  ;;   e.g. fi/when we switch to a DFA-based implementation of
+  ;;   syntax-propertize-rules.
+  ;; - this lets Edebug properly annotate the expressions inside RULES.
+  `',rules)
+
 (defmacro syntax-propertize-rules (&rest rules)
   "Make a function that applies RULES for use in `syntax-propertize-function'.
 The function will scan the buffer, applying the rules where they match.
 The buffer is scanned a single time, like \"lex\" would, rather than once
 per rule.
 
-Each rule has the form (REGEXP HIGHLIGHT1 ... HIGHLIGHTn), where REGEXP
-is an expression (evaluated at time of macro-expansion) that returns a regexp,
-and where HIGHLIGHTs have the form (NUMBER SYNTAX) which means to
+Each RULE can be a symbol, in which case that symbol's value should be,
+at macro-expansion time, a precompiled set of rules, as returned
+by `syntax-propertize-precompile-rules'.
+
+Otherwise, RULE should have the form (REGEXP HIGHLIGHT1 ... HIGHLIGHTn), where
+REGEXP is an expression (evaluated at time of macro-expansion) that returns
+a regexp, and where HIGHLIGHTs have the form (NUMBER SYNTAX) which means to
 apply the property SYNTAX to the chars matched by the subgroup NUMBER
 of the regular expression, if NUMBER did match.
 SYNTAX is an expression that returns a value to apply as `syntax-table'
@@ -132,11 +156,18 @@
 some parts of the text or may be applied several times to other parts.
 
 Note: back-references in REGEXPs do not work."
-  (declare (debug (&rest (form &rest
+  (declare (debug (&rest &or symbolp    ;FIXME: edebug this eval step.
+                         (form &rest
                                (numberp
-                                [&or stringp
+                                [&or stringp ;FIXME: Use &wrap
                                      ("prog1" [&or stringp def-form] def-body)
                                      def-form])))))
+  (let ((newrules nil))
+    (while rules
+      (if (symbolp (car rules))
+          (setq rules (append (symbol-value (pop rules)) rules))
+        (push (pop rules) newrules)))
+    (setq rules (nreverse newrules)))
   (let* ((offset 0)
          (branches '())
          ;; We'd like to use a real DFA-based lexer, usually, but since Emacs
@@ -145,7 +176,8 @@
          (re
           (mapconcat
            (lambda (rule)
-             (let ((re (eval (car rule))))
+             (let* ((orig-re (eval (car rule)))
+                    (re orig-re))
                (when (and (assq 0 rule) (cdr rules))
                  ;; If there's more than 1 rule, and the rule want to apply
                  ;; highlight to match 0, create an extra group to be able to
@@ -229,7 +261,7 @@
                              code))))
                  (push (cons condition (nreverse code))
                        branches))
-               (incf offset (regexp-opt-depth re))
+               (incf offset (regexp-opt-depth orig-re))
                re))
            rules
            "\\|")))

=== modified file 'lisp/progmodes/fortran.el'
--- lisp/progmodes/fortran.el	2010-09-10 23:13:42 +0000
+++ lisp/progmodes/fortran.el	2010-09-18 00:35:00 +0000
@@ -483,19 +483,27 @@
   "Maximum highlighting for Fortran mode.
 Consists of level 3 plus all other intrinsics not already highlighted.")
 
-(defvar fortran--font-lock-syntactic-keywords)
 ;; Comments are real pain in Fortran because there is no way to
 ;; represent the standard comment syntax in an Emacs syntax table.
 ;; (We can do so for F90-style).  Therefore an unmatched quote in a
 ;; standard comment will throw fontification off on the wrong track.
 ;; So we do syntactic fontification with regexps.
-(defun fortran-font-lock-syntactic-keywords ()
-  "Return a value for `font-lock-syntactic-keywords' in Fortran mode.
-This varies according to the value of `fortran-line-length'.
+(defun fortran-make-syntax-propertize-function (line-length)
+  "Return a value for `syntax-propertize-function' in Fortran mode.
+This varies according to the value of LINE-LENGTH.
 This is used to fontify fixed-format Fortran comments."
-  `(("^[cd\\*]" 0 (11))
-    (,(format "^[^cd\\*\t\n].\\{%d\\}\\([^\n]+\\)" (1- fortran-line-length))
-     1 (11))))
+  ;; This results in a non-byte-compiled function.  We could pass it through
+  ;; `byte-compile', but simple benchmarks indicate that it's probably not
+  ;; worth the trouble (about ½% of slow down).
+  (eval                         ;I hate `eval', but it's hard to avoid it here.
+   `(syntax-propertize-rules
+     ("^[cd\\*]" (0 "<"))
+     ;; We mark all chars after line-length as "comment-start", rather than
+     ;; just the first one.  This is so that a closing ' that's past the
+     ;; line-length will indeed be ignored (and will result in a string that
+     ;; leaks into subsequent lines).
+     ((format "^[^cd\\*\t\n].\\{%d\\}\\(.+\\)" (1- line-length))
+      (1 "<")))))
 
 (defvar fortran-font-lock-keywords fortran-font-lock-keywords-1
   "Default expressions to highlight in Fortran mode.")
@@ -889,10 +897,8 @@
           fortran-font-lock-keywords-4)
          nil t ((?/ . "$/") ("_$" . "w"))
          fortran-beginning-of-subprogram))
-  (set (make-local-variable 'fortran--font-lock-syntactic-keywords)
-       (fortran-make-syntax-propertize-function))
   (set (make-local-variable 'syntax-propertize-function)
-       (syntax-propertize-via-font-lock fortran--font-lock-syntactic-keywords))
+       (fortran-make-syntax-propertize-function fortran-line-length))
   (set (make-local-variable 'imenu-case-fold-search) t)
   (set (make-local-variable 'imenu-generic-expression)
        fortran-imenu-generic-expression)
@@ -912,27 +918,30 @@
   "Set the length of fixed-form Fortran lines to NCHARS.
 This normally only affects the current buffer, which must be in
 Fortran mode.  If the optional argument GLOBAL is non-nil, it
-affects all Fortran buffers, and also the default."
-  (interactive "p")
-  (let (new)
-    (mapc (lambda (buff)
-            (with-current-buffer buff
-              (when (eq major-mode 'fortran-mode)
-                (setq fortran-line-length nchars
-                      fill-column fortran-line-length
-                      new (fortran-make-syntax-propertize-function))
-                ;; Refontify only if necessary.
-                (unless (equal new fortran--font-lock-syntactic-keywords)
-                  (setq fortran--font-lock-syntactic-keywords new)
-                  (setq syntax-propertize-function
-                        (syntax-propertize-via-font-lock new))
-                  (syntax-ppss-flush-cache (point-min))
-                  (if font-lock-mode (font-lock-mode 1))))))
+affects all Fortran buffers, and also the default.
+If a numeric prefix argument is specified, it will be used as NCHARS,
+otherwise is a non-numeric prefix arg is specified, the length will be
+provided via the minibuffer, and otherwise the current column is used."
+  (interactive
+   (list (cond
+          ((numberp current-prefix-arg) current-prefix-arg)
+          (current-prefix-arg
+           (read-number "Line length: " (default-value 'fortran-line-length)))
+          (t (current-column)))))
+  (dolist (buff (if global
+                    (buffer-list)
+                  (list (current-buffer))))
+    (with-current-buffer buff
+      (when (derived-mode-p 'fortran-mode)
+        (unless (eq fortran-line-length nchars)
+          (setq fortran-line-length nchars
+                fill-column fortran-line-length
+                syntax-propertize-function
+                (fortran-make-syntax-propertize-function nchars))
+          (syntax-ppss-flush-cache (point-min))
+          (if font-lock-mode (font-lock-mode 1))))))
           (if global
-              (buffer-list)
-            (list (current-buffer))))
-    (if global
-        (setq-default fortran-line-length nchars))))
+      (setq-default fortran-line-length nchars)))
 
 (defun fortran-hack-local-variables ()
   "Fortran mode adds this to `hack-local-variables-hook'."

=== modified file 'lisp/progmodes/js.el'
--- lisp/progmodes/js.el	2010-09-10 23:13:42 +0000
+++ lisp/progmodes/js.el	2010-09-18 00:35:00 +0000
@@ -3304,7 +3304,7 @@
 
   (set (make-local-variable 'open-paren-in-column-0-is-defun-start) nil)
   (set (make-local-variable 'font-lock-defaults)
-       '(js--font-lock-keywords))
+       (list js--font-lock-keywords))
   (set (make-local-variable 'syntax-propertize-function)
        js-syntax-propertize-function)
 

=== modified file 'lisp/textmodes/tex-mode.el'
--- lisp/textmodes/tex-mode.el	2010-09-10 23:13:42 +0000
+++ lisp/textmodes/tex-mode.el	2010-09-18 00:35:00 +0000
@@ -488,10 +488,6 @@
 	   ;; (arg "\\(?:{\\(\\(?:[^{}\\]+\\|\\\\.\\|{[^}]*}\\)+\\)\\|\\\\[a-z*]+\\)"))
 	   (arg "{\\(\\(?:[^{}\\]+\\|\\\\.\\|{[^}]*}\\)+\\)"))
       (list
-       ;; tex-font-lock-syntactic-keywords causes the \ of \end{verbatim} to be
-       ;; highlighted as tex-verbatim face.  Let's undo that.
-       ;; This is ugly and brittle :-(  --Stef
-       '("^\\(\\\\\\)end" (1 (get-text-property (match-end 1) 'face) t))
        ;; display $$ math $$
        ;; We only mark the match between $$ and $$ because the $$ delimiters
        ;; themselves have already been marked (along with $..$) by syntactic
@@ -642,29 +638,90 @@
 (put 'tex-verbatim-environments 'safe-local-variable
      (lambda (x) (null (delq t (mapcar 'stringp x)))))
 
-(defvar tex-font-lock-syntactic-keywords
-  '((eval . `(,(concat "^\\\\begin *{"
-                       (regexp-opt tex-verbatim-environments t)
-                       "}.*\\(\n\\)") 2 "|"))
-    ;; Technically, we'd like to put the "|" property on the \n preceding
-    ;; the \end, but this would have 2 disadvantages:
-    ;; 1 - it's wrong if the verbatim env is empty (the same \n is used to
-    ;;     start and end the fenced-string).
-    ;; 2 - font-lock considers the preceding \n as being part of the
-    ;;     preceding line, so things gets screwed every time the previous
-    ;;     line is re-font-locked on its own.
-    ;; There's a hack in tex-font-lock-keywords-1 to remove the verbatim
-    ;; face from the \ but C-M-f still jumps to the wrong spot :-(  --Stef
-    ;; FIXME: See gud.el for an example of a solution to a similar problem.
-    (eval . `(,(concat "^\\(\\\\\\)end *{"
-                       (regexp-opt tex-verbatim-environments t)
-                       "}\\(.?\\)") (1 "|") (3 "<")))
-    ;; ("^\\(\\\\\\)begin *{comment}" 1 "< b")
-    ;; ("^\\\\end *{comment}.*\\(\n\\)" 1 "> b")
+(eval-when-compile
+  (defconst tex-syntax-propertize-rules
+    (syntax-propertize-precompile-rules
     ("\\\\verb\\**\\([^a-z@*]\\)"
-     ;; Do it last, because it uses syntax-ppss which needs the
-     ;; syntax-table properties of previous entries.
-     1 (tex-font-lock-verb (match-end 1)))))
+      (1 (prog1 "\""
+           (tex-font-lock-verb
+            (match-beginning 0) (char-after (match-beginning 1))))))))
+
+  (defconst latex-syntax-propertize-rules
+    (syntax-propertize-precompile-rules
+     tex-syntax-propertize-rules
+     ("\\\\\\(?:end\\|begin\\) *\\({[^\n{}]*}\\)"
+      (1 (ignore
+          (tex-env-mark (match-beginning 0)
+                        (match-beginning 1) (match-end 1))))))))
+
+(defun tex-env-mark (cmd start end)
+  (when (= cmd (line-beginning-position))
+    (let ((arg (buffer-substring-no-properties (1+ start) (1- end))))
+      (when (member arg tex-verbatim-environments)
+        (if (eq ?b (char-after (1+ cmd)))
+            ;; \begin
+            (put-text-property (line-end-position)
+                               (line-beginning-position 2)
+                               'syntax-table (string-to-syntax "< c"))
+          ;; In the case of an empty verbatim env, the \n after the \begin is
+          ;; the same as the \n before the \end.  Lucky for us, the "> c"
+          ;; property associated to the \end will be placed afterwards, so it
+          ;; will override the "< c".
+          (put-text-property (1- cmd) cmd
+                             'syntax-table (string-to-syntax "> c"))
+          ;; The text between \end{verbatim} and \n is ignored, so we'll treat
+          ;; it as a comment.
+          (put-text-property end (min (1+ end) (line-end-position))
+                             'syntax-table (string-to-syntax "<"))))))
+  ;; Mark env args for possible electric pairing.
+  (unless (get-char-property (1+ start) 'text-clones) ;Already paired-up.
+    (put-text-property start end 'latex-env-pair t)))
+
+(define-minor-mode latex-electric-env-pair-mode
+  "Automatically update the \\end arg when editing the \\begin one.
+And vice-versa."
+  :lighter "/e"
+  (if latex-electric-env-pair-mode
+      (add-hook 'before-change-functions
+                #'latex-env-before-change nil 'local)
+    (remove-hook 'before-change-functions
+                 #'latex-env-before-change 'local)))
+
+(defun latex-env-before-change (start end)
+  (when (get-text-property start 'latex-env-pair)
+    (condition-case err
+        (with-silent-modifications
+          ;; Remove properties even if don't find a pair.
+          (remove-text-properties
+           (previous-single-property-change (1+ start) 'latex-env-pair)
+           (next-single-property-change start 'latex-env-pair)
+           '(latex-env-pair))
+          (unless (or (get-char-property start 'text-clones)
+                      (get-char-property (1+ start) 'text-clones)
+                      (save-excursion
+                        (goto-char start)
+                        (not (re-search-backward
+                              "\\\\\\(?:end\\|begi\\(n\\)\\) *{"
+                              (line-beginning-position) t))))
+            (let ((cmd-start (match-beginning 0))
+                  (type (match-end 1))  ;nil for \end, else \begin.
+                  (arg-start (1- (match-end 0))))
+              (save-excursion
+                (goto-char (match-end 0))
+                (when (and (looking-at "[^\n{}]*}")
+                           (> (match-end 0) end))
+                  (let ((arg-end (match-end 0)))
+                    (if (null type)     ;\end
+                        (progn (goto-char arg-end)
+                               (latex-forward-sexp -1) (forward-word 1))
+                      (goto-char cmd-start)
+                      (latex-forward-sexp 1)
+                      (let (forward-sexp-function) (backward-sexp)))
+                    (when (looking-at
+                           (regexp-quote (buffer-substring arg-start arg-end)))
+                      (text-clone-create arg-start arg-end))))))))
+      (scan-error nil)
+      (error (message "Error in latex-env-before-change: %s" err)))))
 
 (defun tex-font-lock-unfontify-region (beg end)
   (font-lock-default-unfontify-region beg end)
@@ -731,37 +788,32 @@
 (define-obsolete-face-alias 'tex-verbatim-face 'tex-verbatim "22.1")
 (defvar tex-verbatim-face 'tex-verbatim)
 
-(defun tex-font-lock-verb (end)
-  "Place syntax-table properties on the \verb construct.
-END is the position of the first delimiter after \verb."
-  (unless (nth 8 (syntax-ppss end))
+(defun tex-font-lock-verb (start delim)
+  "Place syntax table properties on the \verb construct.
+START is the position of the \\ and DELIM is the delimiter char."
     ;; Do nothing if the \verb construct is itself inside a comment or
     ;; verbatim env.
-    (save-excursion
+  (unless (nth 8 (save-excursion (syntax-ppss start)))
       ;; Let's find the end and mark it.
-      ;; We used to do it inside tex-font-lock-syntactic-face-function, but
-      ;; this leads to funny effects when jumping to the end of the buffer,
-      ;; because font-lock applies font-lock-syntactic-keywords to the whole
-      ;; preceding text but font-lock-syntactic-face-function only to the
-      ;; actually displayed text.
-      (goto-char end)
-      (let ((char (char-before)))
-        (skip-chars-forward (string ?^ char)) ;; Use `end' ?
-        (when (eq (char-syntax (preceding-char)) ?/)
-          (put-text-property (1- (point)) (point) 'syntax-table '(1)))
+    ;; This may span more than a single line, but we don't bother
+    ;; placing a syntax-multiline property since such multiline verbs aren't
+    ;; valid anyway.
+    (skip-chars-forward (string ?^ delim))
         (unless (eobp)
-          (put-text-property (point) (1+ (point)) 'syntax-table '(7))
-          ;; Cause the rest of the buffer to be re-fontified.
-          ;; (remove-text-properties (1+ (point)) (point-max) '(fontified))
-          )))
-    "\""))
+      (when (eq (char-syntax (preceding-char)) ?/)
+        (put-text-property (1- (point)) (point)
+                           'syntax-table (string-to-syntax ".")))
+      (put-text-property (point) (1+ (point))
+                         'syntax-table (string-to-syntax "\"")))))
 
 ;; Use string syntax but math face for $...$.
 (defun tex-font-lock-syntactic-face-function (state)
   (let ((char (nth 3 state)))
     (cond
-     ((not char) font-lock-comment-face)
+     ((not char)
+      (if (eq 2 (nth 7 state)) tex-verbatim-face font-lock-comment-face))
      ((eq char ?$) tex-math-face)
+     ;; A \verb element.
      (t tex-verbatim-face))))
 
 
@@ -1166,7 +1218,7 @@
 	 (font-lock-unfontify-region-function
 	  . tex-font-lock-unfontify-region)))
   (set (make-local-variable 'syntax-propertize-function)
-       (syntax-propertize-via-font-lock tex-font-lock-syntactic-keywords))
+       (syntax-propertize-rules latex-syntax-propertize-rules))
   ;; TABs in verbatim environments don't do what you think.
   (set (make-local-variable 'indent-tabs-mode) nil)
   ;; Other vars that should be buffer-local.
@@ -2812,15 +2864,15 @@
 	     ;; syntax-table can't deal with.  We could turn it
 	     ;; into a non-comment, or use `\n%' or `%^' as the comment.
 	     ;; Instead, we include it in the ^^A comment.
-	     (eval-when-compile (string-to-syntax "< b"))
-	   (eval-when-compile (string-to-syntax ">"))))
+             (string-to-syntax "< b")
+           (string-to-syntax ">")))
 	(let ((end (line-end-position)))
 	  (if (< end (point-max))
 	      (put-text-property
 	       end (1+ end)
 	       'syntax-table
-	       (eval-when-compile (string-to-syntax "> b")))))
-	(eval-when-compile (string-to-syntax "< b")))))
+               (string-to-syntax "> b"))))
+        (string-to-syntax "< b"))))
 
 (defun doctex-font-lock-syntactic-face-function (state)
   ;; Mark DocTeX documentation, which is parsed as a style A comment
@@ -2832,11 +2884,12 @@
       (tex-font-lock-syntactic-face-function state)
     font-lock-doc-face))
 
-(defvar doctex-font-lock-syntactic-keywords
-  (append
-   tex-font-lock-syntactic-keywords
-   ;; For DocTeX comment-in-doc.
-   `(("\\(\\^\\)\\^A" (1 (doctex-font-lock-^^A))))))
+(eval-when-compile
+  (defconst doctex-syntax-propertize-rules
+    (syntax-propertize-precompile-rules
+     latex-syntax-propertize-rules
+     ;; For DocTeX comment-in-doc.
+     ("\\(\\^\\)\\^A" (1 (doctex-font-lock-^^A))))))
 
 (defvar doctex-font-lock-keywords
   (append tex-font-lock-keywords
@@ -2855,7 +2908,7 @@
 		   (t x)))
 	       (cdr font-lock-defaults))))
   (set (make-local-variable 'syntax-propertize-function)
-       (syntax-propertize-via-font-lock doctex-font-lock-syntactic-keywords)))
+       (syntax-propertize-rules doctex-syntax-propertize-rules)))
 
 (run-hooks 'tex-mode-load-hook)
------------------------------------------------------------
revno: 101467
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Sat 2010-09-18 00:28:10 +0200
message:
  * lisp/obsolete/old-whitespace.el (whitespace-rescan-files-in-buffers):
  Use with-current-buffer.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-17 22:09:58 +0000
+++ lisp/ChangeLog	2010-09-17 22:28:10 +0000
@@ -1,5 +1,8 @@
 2010-09-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* obsolete/old-whitespace.el (whitespace-rescan-files-in-buffers):
+	Use with-current-buffer.
+
 	* isearch.el (isearch-face): Rename from `isearch'.
 	(isearch-highlight): Use new name.
 

=== modified file 'lisp/obsolete/old-whitespace.el'
--- lisp/obsolete/old-whitespace.el	2010-09-14 14:59:42 +0000
+++ lisp/obsolete/old-whitespace.el	2010-09-17 22:28:10 +0000
@@ -725,9 +725,8 @@
 	(setq bufname (cadr thiselt))
 	(setq buf (get-buffer bufname))
 	(if (buffer-live-p buf)
-	    (save-excursion
+	    (with-current-buffer bufname
 	      ;;(message "buffer %s live" bufname)
-	      (set-buffer bufname)
 	      (if whitespace-mode
 		  (progn
 		    ;;(message "checking for whitespace in %s" bufname)
------------------------------------------------------------
revno: 101466
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Sat 2010-09-18 00:09:58 +0200
message:
  * lisp/isearch.el (isearch-face): Rename from `isearch'.
  (isearch-highlight): Use new name.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-17 21:07:57 +0000
+++ lisp/ChangeLog	2010-09-17 22:09:58 +0000
@@ -1,3 +1,8 @@
+2010-09-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* isearch.el (isearch-face): Rename from `isearch'.
+	(isearch-highlight): Use new name.
+
 2010-09-17  Eli Zaretskii  <eliz@gnu.org>
 
 	* fringe.el (fringe-mode, fringe-query-style): Use 4 pixels, not

=== modified file 'lisp/isearch.el'
--- lisp/isearch.el	2010-08-29 16:17:13 +0000
+++ lisp/isearch.el	2010-09-17 22:09:58 +0000
@@ -239,7 +239,7 @@
   "Face for highlighting Isearch matches."
   :group 'isearch
   :group 'basic-faces)
-(defvar isearch 'isearch)
+(defvar isearch-face 'isearch)
 
 (defface isearch-fail
   '((((class color) (min-colors 88) (background light))
@@ -2537,7 +2537,7 @@
 	(setq isearch-overlay (make-overlay beg end))
 	;; 1001 is higher than lazy's 1000 and ediff's 100+
 	(overlay-put isearch-overlay 'priority 1001)
-	(overlay-put isearch-overlay 'face isearch))))
+	(overlay-put isearch-overlay 'face isearch-face))))
 
 (defun isearch-dehighlight ()
   (when isearch-overlay
------------------------------------------------------------
revno: 101465
committer: Eli Zaretskii <eliz@gnu.org>
branch nick: trunk
timestamp: Fri 2010-09-17 23:34:45 +0200
message:
  Fix bug #6989.
  
   w32.c (_PROCESS_MEMORY_COUNTERS_EX): Don't define with versions
   of w32api >= 3.15.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-09-17 15:47:49 +0000
+++ src/ChangeLog	2010-09-17 21:34:45 +0000
@@ -1,3 +1,8 @@
+2010-09-17  Eli Zaretskii  <eliz@gnu.org>
+
+	* w32.c (_PROCESS_MEMORY_COUNTERS_EX): Don't define with versions
+	of w32api >= 3.15.  (Bug#6989)
+
 2010-09-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* process.c (wait_reading_process_output): Don't message about

=== modified file 'src/w32.c'
--- src/w32.c	2010-08-06 19:52:47 +0000
+++ src/w32.c	2010-09-17 21:34:45 +0000
@@ -94,8 +94,11 @@
 
 #include <tlhelp32.h>
 #include <psapi.h>
+#include <w32api.h>
+#if !defined(__MINGW32__) || __W32API_MAJOR_VERSION < 3 || (__W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION < 15)
 /* This either is not in psapi.h or guarded by higher value of
-   _WIN32_WINNT than what we use.  */
+   _WIN32_WINNT than what we use.  w32api suplied with MinGW 3.15
+   defines it in psapi.h  */
 typedef struct _PROCESS_MEMORY_COUNTERS_EX {
 	DWORD cb;
 	DWORD PageFaultCount;
@@ -109,6 +112,7 @@
 	DWORD PeakPagefileUsage;
 	DWORD PrivateUsage;
 } PROCESS_MEMORY_COUNTERS_EX,*PPROCESS_MEMORY_COUNTERS_EX;
+#endif
 
 #ifdef HAVE_SOCKETS	/* TCP connection support, if kernel can do it */
 #include <sys/socket.h>
------------------------------------------------------------
revno: 101464
committer: Eli Zaretskii <eliz@gnu.org>
branch nick: trunk
timestamp: Fri 2010-09-17 23:07:57 +0200
message:
  Fix bug #6933 regarding `half' width fringes.
  
   fringe.el (fringe-mode, fringe-query-style): Use 4 pixels, not
   5, for `half' width fringes.  (Bug#6933)
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-17 14:31:06 +0000
+++ lisp/ChangeLog	2010-09-17 21:07:57 +0000
@@ -1,3 +1,8 @@
+2010-09-17  Eli Zaretskii  <eliz@gnu.org>
+
+	* fringe.el (fringe-mode, fringe-query-style): Use 4 pixels, not
+	5, for `half' width fringes.  (Bug#6933)
+
 2010-09-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/bytecomp.el (byte-compile-file-form-defvar)

=== modified file 'lisp/fringe.el'
--- lisp/fringe.el	2010-08-29 16:17:13 +0000
+++ lisp/fringe.el	2010-09-17 21:07:57 +0000
@@ -153,7 +153,7 @@
 		 (const :tag "No fringes" 0)
 		 (const :tag "Only right" (0 . nil))
 		 (const :tag "Only left" (nil . 0))
-		 (const :tag "Half width" (5 . 5))
+		 (const :tag "Half width" (4 . 4))
 		 (const :tag "Minimal" (1 . 1))
 		 (integer :tag "Specific width")
 		 (cons :tag "Different left/right sizes"
@@ -187,7 +187,7 @@
 	  ((eq mode 'default) nil)
 	  ((eq mode 'left-only) '(nil . 0))
 	  ((eq mode 'right-only) '(0 . nil))
-	  ((eq mode 'half) '(5 . 5))
+	  ((eq mode 'half) '(4 . 4))
 	  ((eq mode 'minimal) '(1 . 1))
 	  ((eq mode (intern ""))
 	   (if (eq 0 (cdr (assq 'left-fringe
------------------------------------------------------------
revno: 101463
committer: Lars Magne Ingebrigtsen <larsi@gnus.org>
branch nick: trunk
timestamp: Fri 2010-09-17 17:47:49 +0200
message:
  * process.c (wait_reading_process_output): Don't message about
  accept-process-output unless the time limit really is zero.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-09-17 14:37:14 +0000
+++ src/ChangeLog	2010-09-17 15:47:49 +0000
@@ -1,3 +1,8 @@
+2010-09-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* process.c (wait_reading_process_output): Don't message about
+	accept-process-output unless the time limit really is zero.
+
 2010-09-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* frame.c (Ftool_bar_pixel_width): YAILOM (Yet another

=== modified file 'src/process.c'
--- src/process.c	2010-08-22 15:14:37 +0000
+++ src/process.c	2010-09-17 15:47:49 +0000
@@ -4403,7 +4403,7 @@
   FD_ZERO (&Connecting);
 #endif
 
-  if (time_limit == 0 && wait_proc && !NILP (Vinhibit_quit)
+  if (time_limit == 0 && microsecs == 0 && wait_proc && !NILP (Vinhibit_quit)
       && !(CONSP (wait_proc->status) && EQ (XCAR (wait_proc->status), Qexit)))
     message ("Blocking call to accept-process-output with quit inhibited!!");
------------------------------------------------------------
revno: 101462
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Fri 2010-09-17 16:37:14 +0200
message:
  * src/frame.c (Ftool_bar_pixel_width): YAILOM (Yet another
  int/Lisp_Object mixup).
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-09-17 09:54:28 +0000
+++ src/ChangeLog	2010-09-17 14:37:14 +0000
@@ -1,3 +1,8 @@
+2010-09-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* frame.c (Ftool_bar_pixel_width): YAILOM (Yet another
+	int/Lisp_Object mixup).
+
 2010-09-17  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* keyboard.c (parse_tool_bar_item): For QClabel, set TOOL_BAR_ITEM_LABEL
@@ -8,9 +13,10 @@
 	* frame.c (Ftool_bar_pixel_width): New function to expose tool
 	bar's pixel width to Lisp (Bug#7048).
 
- 2010-09-14  Juanma Barranquero  <lekktu@gmail.com>
-
- 	* cmds.c (syms_of_cmds) <post-self-insert-hook>: Fix typos in docstring.
+2010-09-14  Juanma Barranquero  <lekktu@gmail.com>
+
+	* cmds.c (syms_of_cmds) <post-self-insert-hook>: Fix typos in docstring.
+
 2010-09-17  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* gtkutil.c (xg_pack_tool_bar): Call gtk_handle_box_set_handle_position

=== modified file 'src/frame.c'
--- src/frame.c	2010-09-17 09:04:35 +0000
+++ src/frame.c	2010-09-17 14:37:14 +0000
@@ -2669,7 +2669,7 @@
   if (FRAME_WINDOW_P (f))
     return make_number (FRAME_TOOLBAR_WIDTH (f));
 #endif
-  return 0;
+  return make_number (0);
 }
 
 DEFUN ("set-frame-height", Fset_frame_height, Sset_frame_height, 2, 3, 0,
------------------------------------------------------------
revno: 101461
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Fri 2010-09-17 16:31:06 +0200
message:
  * lisp/emacs-lisp/bytecomp.el (byte-compile-file-form-defvar)
  (byte-compile-defvar): "foo/bar" does not lack a prefix.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-17 13:30:30 +0000
+++ lisp/ChangeLog	2010-09-17 14:31:06 +0000
@@ -1,5 +1,8 @@
 2010-09-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* emacs-lisp/bytecomp.el (byte-compile-file-form-defvar)
+	(byte-compile-defvar): "foo/bar" does not lack a prefix.
+
 	* subr.el (y-or-n-p): Add the "(y or n)" that was lost somehow.
 
 2010-09-17  Stephen Berman  <stephen.berman@gmx.net>

=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- lisp/emacs-lisp/bytecomp.el	2010-09-15 15:30:43 +0000
+++ lisp/emacs-lisp/bytecomp.el	2010-09-17 14:31:06 +0000
@@ -2154,7 +2154,7 @@
       ;; and not do a file-boundary.
       (byte-compile-keep-pending form)
     (when (and (symbolp (nth 1 form))
-               (not (string-match "[-*:$]" (symbol-name (nth 1 form))))
+               (not (string-match "[-*/:$]" (symbol-name (nth 1 form))))
                (byte-compile-warning-enabled-p 'lexical))
       (byte-compile-warn "Global/dynamic var `%s' lacks a prefix"
                          (nth 1 form)))
@@ -3810,7 +3810,7 @@
 (defun byte-compile-defvar (form)
   ;; This is not used for file-level defvar/consts with doc strings.
   (when (and (symbolp (nth 1 form))
-             (not (string-match "[-*:$]" (symbol-name (nth 1 form))))
+             (not (string-match "[-*/:$]" (symbol-name (nth 1 form))))
              (byte-compile-warning-enabled-p 'lexical))
     (byte-compile-warn "Global/dynamic var `%s' lacks a prefix"
                        (nth 1 form)))
------------------------------------------------------------
revno: 101460
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Fri 2010-09-17 16:22:06 +0200
message:
  Silence byte-compiler
  * lisp/gnus/nnrss.el (nnrss-retrieve-headers, nnrss-request-list-newsgroups)
  (nnrss-retrieve-groups):
  * lisp/gnus/pop3.el (pop3-open-server, pop3-read-response, pop3-list)
  (pop3-retr, pop3-quit): Use with-current-buffer.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-17 06:46:54 +0000
+++ lisp/gnus/ChangeLog	2010-09-17 14:22:06 +0000
@@ -1,3 +1,10 @@
+2010-09-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* nnrss.el (nnrss-retrieve-headers, nnrss-request-list-newsgroups)
+	(nnrss-retrieve-groups):
+	* pop3.el (pop3-open-server, pop3-read-response, pop3-list, pop3-retr)
+	(pop3-quit): Use with-current-buffer.
+
 2010-09-17  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* pop3.el (pop3-wait-for-messages): Use pop3-accept-process-output

=== modified file 'lisp/gnus/nnrss.el'
--- lisp/gnus/nnrss.el	2010-09-14 13:44:44 +0000
+++ lisp/gnus/nnrss.el	2010-09-17 14:22:06 +0000
@@ -134,8 +134,7 @@
   (setq group (nnrss-decode-group-name group))
   (nnrss-possibly-change-group group server)
   (let (e)
-    (save-excursion
-      (set-buffer nntp-server-buffer)
+    (with-current-buffer nntp-server-buffer
       (erase-buffer)
       (dolist (article articles)
 	(if (setq e (assq article nnrss-group-data))
@@ -384,8 +383,7 @@
 
 (deffoo nnrss-request-list-newsgroups (&optional server)
   (nnrss-possibly-change-group nil server)
-  (save-excursion
-    (set-buffer nntp-server-buffer)
+  (with-current-buffer nntp-server-buffer
     (erase-buffer)
     (dolist (elem nnrss-group-alist)
       (if (third elem)
@@ -396,8 +394,7 @@
   (nnrss-possibly-change-group nil server)
   (dolist (group groups)
     (nnrss-check-group group server))
-  (save-excursion
-    (set-buffer nntp-server-buffer)
+  (with-current-buffer nntp-server-buffer
     (erase-buffer)
     (dolist (group groups)
       (let ((elem (assoc group nnrss-server-data)))

=== modified file 'lisp/gnus/pop3.el'
--- lisp/gnus/pop3.el	2010-09-17 06:46:54 +0000
+++ lisp/gnus/pop3.el	2010-09-17 14:22:06 +0000
@@ -279,9 +279,9 @@
   (let ((coding-system-for-read 'binary)
 	(coding-system-for-write 'binary)
 	process)
-    (save-excursion
-      (set-buffer (get-buffer-create (concat " trace of POP session to "
-					     mailhost)))
+    (with-current-buffer
+        (get-buffer-create (concat " trace of POP session to "
+                                   mailhost))
       (erase-buffer)
       (setq pop3-read-point (point-min))
       (setq process
@@ -353,8 +353,7 @@
 Return the response string if optional second argument is non-nil."
   (let ((case-fold-search nil)
 	match-end)
-    (save-excursion
-      (set-buffer (process-buffer process))
+    (with-current-buffer (process-buffer process)
       (goto-char pop3-read-point)
       (while (and (memq (process-status process) '(open run))
 		  (not (search-forward "\r\n" nil t)))
@@ -511,8 +510,7 @@
     (if msg
 	(string-to-number (nth 2 (split-string response " ")))
       (let ((start pop3-read-point) end)
-	(save-excursion
-	  (set-buffer (process-buffer process))
+	(with-current-buffer (process-buffer process)
 	  (while (not (re-search-forward "^\\.\r\n" nil t))
 	    (pop3-accept-process-output process)
 	    (goto-char start))
@@ -530,8 +528,7 @@
   (pop3-send-command process (format "RETR %s" msg))
   (pop3-read-response process)
   (let ((start pop3-read-point) end)
-    (save-excursion
-      (set-buffer (process-buffer process))
+    (with-current-buffer (process-buffer process)
       (while (not (re-search-forward "^\\.\r\n" nil t))
 	(pop3-accept-process-output process)
 	(goto-char start))
@@ -547,8 +544,7 @@
       (setq end (point-marker))
       (pop3-clean-region start end)
       (pop3-munge-message-separator start end)
-      (save-excursion
-	(set-buffer crashbuf)
+      (with-current-buffer crashbuf
 	(erase-buffer))
       (copy-to-buffer crashbuf start end)
       (delete-region start end)
@@ -585,8 +581,7 @@
   (pop3-send-command process "QUIT")
   (pop3-read-response process t)
   (if process
-      (save-excursion
-	(set-buffer (process-buffer process))
+      (with-current-buffer (process-buffer process)
 	(goto-char (point-max))
 	(delete-process process))))
------------------------------------------------------------
revno: 101459
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Fri 2010-09-17 15:30:30 +0200
message:
  * lisp/subr.el (y-or-n-p): Add the "(y or n)" that was lost somehow.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-17 09:04:35 +0000
+++ lisp/ChangeLog	2010-09-17 13:30:30 +0000
@@ -1,3 +1,7 @@
+2010-09-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* subr.el (y-or-n-p): Add the "(y or n)" that was lost somehow.
+
 2010-09-17  Stephen Berman  <stephen.berman@gmx.net>
 
 	* dframe.el (dframe-reposition-frame-emacs): Use tool-bar-pixel-width
@@ -11,8 +15,7 @@
 
 2010-09-16  Chong Yidong  <cyd@stupidchicken.com>
 
-	* mail/sendmail.el: Add "*unsent mail*" to
-	same-window-buffer-names.
+	* mail/sendmail.el: Add "*unsent mail*" to same-window-buffer-names.
 
 	* term/x-win.el (x-cut-buffer-or-selection-value): Define as
 	obsolete alias for x-selection-value.
@@ -34,19 +37,19 @@
 	* net/tramp-gvfs.el (top):
 	* net/tramp-cache.el (top): Use `tramp-compat-font-lock-add-keywords'.
 
-	* net/tramp.el (tramp-progress-reporter-update): Use
-	`tramp-compat-funcall'.
+	* net/tramp.el (tramp-progress-reporter-update):
+	Use `tramp-compat-funcall'.
 
 	* net/tramp.el (tramp-process-actions):
 	* net/tramp-gvfs.el (tramp-handle-vc-registered):
 	* net/tramp-sh.el (tramp-gvfs-handler-askquestion)
-	(tramp-get-remote-stat, tramp-get-remote-readlink): Use
-	`tramp-compat-with-temp-message'.
+	(tramp-get-remote-stat, tramp-get-remote-readlink):
+	Use `tramp-compat-with-temp-message'.
 
 	* net/tramp-sh.el (top): Require 'cl.
 	(tramp-handle-start-file-process): Use `tramp-compat-process-get'.
-	(tramp-open-connection-setup-interactive-shell): Use
-	`tramp-compat-process-put'.
+	(tramp-open-connection-setup-interactive-shell):
+	Use `tramp-compat-process-put'.
 
 2010-09-15  Alan Mackenzie  <acm@muc.de>
 
@@ -269,7 +272,7 @@
 	(tramp-dissect-file-name): Don't check anymore for multi-hop
 	methods.
 	(tramp-debug-outline-regexp): Add a docstring.
-	(tramp-debug-outline-level): Renamed from `tramp-outline-level'.
+	(tramp-debug-outline-level): Rename from `tramp-outline-level'.
 	(tramp-get-debug-buffer): Use it.
 
 	* net/tramp-cache.el (top): Set tramp-autoload cookie for
@@ -289,9 +292,9 @@
 	* net/tramp-sh.el: New file, derived from tramp.el.
 	(top): Initialize `tramp-methods', `tramp-default-method-alist',
 	`tramp-default-user-alist', `tramp-foreign-file-name-handler-alist'.
-	Remove "scp1_old", "scp2_old", "ssh1_old", "ssh2_old".  Use
-	`ignore-errors' where appropriate.
-	(tramp-sh-file-name-handler-alist): Renamed from
+	Remove "scp1_old", "scp2_old", "ssh1_old", "ssh2_old".
+	Use `ignore-errors' where appropriate.
+	(tramp-sh-file-name-handler-alist): Rename from
 	`tramp-file-name-handler-alist'.
 	(tramp-send-command-and-check): Return t or nil.  Remove all
 	`zerop' checks, where called.
@@ -317,7 +320,7 @@
 
 2010-09-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-	* subr.el (y-or-n-p): New function, moved from src/fns.c.  Use read-key.
+	* subr.el (y-or-n-p): New function, moved from src/fns.c; use read-key.
 
 2010-09-12  Leo  <sdl.web@gmail.com>
 
@@ -358,12 +361,10 @@
 	(sql-comint-mysql): Handle "sql-port" as a numeric.
 	(sql-port-history): Delete unused variable.
 	(sql-get-login): Default "sql-port" to a number.
-	(sql-product-alist): Correct Postgres prompt and terminator
-	regexp.
+	(sql-product-alist): Correct Postgres prompt and terminator regexp.
 	(sql-sqlite-program): Dynamically detect presence of "sqlite" or
 	"sqlite3" executables.
-	(sql-sqlite-login-params): Add "*.sqlite[23]?" database name
-	pattern.
+	(sql-sqlite-login-params): Add "*.sqlite[23]?" database name pattern.
 	(sql-buffer-live-p): New function.
 	(sql-mode-menu, sql-send-string): Use it.
 	(sql-mode-oracle-font-lock-keywords): Improve SQL*Plus REMARK
@@ -373,7 +374,7 @@
 
 2010-09-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-	* net/netrc.el (netrc-credentials): New conveniency function.
+	* net/netrc.el (netrc-credentials): New convenience function.
 
 2010-09-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 

=== modified file 'lisp/subr.el'
--- lisp/subr.el	2010-09-14 14:41:53 +0000
+++ lisp/subr.el	2010-09-17 13:30:30 +0000
@@ -3376,19 +3376,26 @@
   ;; ¡Beware! when I tried to edebug this code, Emacs got into a weird state
   ;; where all the keys were unbound (i.e. it somehow got triggered
   ;; within read-key, apparently).  I had to kill it.
-  (let ((answer 'none)
-        (xprompt prompt))
+  (let ((answer 'recenter))
     (if (and (display-popup-menus-p)
              (listp last-nonmenu-event)
              use-dialog-box)
         (setq answer
               (x-popup-dialog t `(,prompt ("yes" . act) ("No" . skip))))
+      (setq prompt (concat prompt
+                           (if (eq ?\s (aref prompt (1- (length prompt))))
+                               "" " ")
+                           "(y or n) "))
       (while
           (let* ((key
                   (let ((cursor-in-echo-area t))
                     (when minibuffer-auto-raise
                       (raise-frame (window-frame (minibuffer-window))))
-                    (read-key (propertize xprompt 'face 'minibuffer-prompt)))))
+                    (read-key (propertize (if (eq answer 'recenter)
+                                              prompt
+                                            (concat "Please answer y or n.  "
+                                                    prompt))
+                                          'face 'minibuffer-prompt)))))
             (setq answer (lookup-key query-replace-map (vector key) t))
             (cond
              ((memq answer '(skip act)) nil)
------------------------------------------------------------
revno: 101458
committer: Eli Zaretskii <eliz@gnu.org>
branch nick: trunk
timestamp: Fri 2010-09-17 14:30:04 +0200
message:
  .bzrignore: Ignore lisp/gnus/_dir-locals.el.
diff:
=== modified file '.bzrignore'
--- .bzrignore	2010-09-15 15:30:43 +0000
+++ .bzrignore	2010-09-17 12:30:04 +0000
@@ -56,6 +56,7 @@
 lisp/cus-load.el
 lisp/eshell/esh-groups.el
 lisp/finder-inf.el
+lisp/gnus/_dir-locals.el
 nextstep/Emacs.app
 nt/config.log
 src/_dbxinit
------------------------------------------------------------
revno: 101457
committer: Jan D <jan.h.d@swipnet.se>
branch nick: trunk
timestamp: Fri 2010-09-17 11:54:28 +0200
message:
  * keyboard.c (parse_tool_bar_item): For QClabel, set TOOL_BAR_ITEM_LABEL not HELP.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-09-17 09:04:35 +0000
+++ src/ChangeLog	2010-09-17 09:54:28 +0000
@@ -1,3 +1,8 @@
+2010-09-17  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* keyboard.c (parse_tool_bar_item): For QClabel, set TOOL_BAR_ITEM_LABEL
+	not HELP.
+
 2010-09-17  Stephen Berman  <stephen.berman@gmx.net>
 
 	* frame.c (Ftool_bar_pixel_width): New function to expose tool

=== modified file 'src/keyboard.c'
--- src/keyboard.c	2010-08-31 19:42:39 +0000
+++ src/keyboard.c	2010-09-17 09:54:28 +0000
@@ -8305,7 +8305,7 @@
         {
           const char *bad_label = "!!?GARBLED ITEM?!!";
           /* `:label LABEL-STRING'.  */
-          PROP (TOOL_BAR_ITEM_HELP) = STRINGP (value)
+          PROP (TOOL_BAR_ITEM_LABEL) = STRINGP (value)
             ? value
             : make_string (bad_label, strlen (bad_label));
           have_label = 1;
------------------------------------------------------------
revno: 101456
committer: Jan D <jan.h.d@swipnet.se>
branch nick: trunk
timestamp: Fri 2010-09-17 11:04:35 +0200
message:
  Expose tool-bar pixel width to lisp and use it for speedbar (Bug#7048)
  
  * dframe.el (dframe-reposition-frame-emacs): Use tool-bar-pixel-width
  in calculating new frame position.  Add more space between new and
  parent on the left.
  
  * frame.c (Ftool_bar_pixel_width): New function to expose tool
  bar's pixel width to Lisp.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-17 07:58:07 +0000
+++ lisp/ChangeLog	2010-09-17 09:04:35 +0000
@@ -1,3 +1,9 @@
+2010-09-17  Stephen Berman  <stephen.berman@gmx.net>
+
+	* dframe.el (dframe-reposition-frame-emacs): Use tool-bar-pixel-width
+	in calculating new frame position.  Add more space between new and
+	parent on the left (Bug#7048).
+
 2010-09-17  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp-compat.el (tramp-compat-with-temp-message): Make it a

=== modified file 'lisp/dframe.el'
--- lisp/dframe.el	2010-01-13 08:35:10 +0000
+++ lisp/dframe.el	2010-09-17 09:04:35 +0000
@@ -430,7 +430,8 @@
   (unless (or (not window-system) (eq window-system 'pc))
     (let* ((pfx (dframe-frame-parameter parent-frame 'left))
 	   (pfy (dframe-frame-parameter parent-frame 'top))
-	   (pfw (frame-pixel-width parent-frame))
+	   (pfw (+ (tool-bar-pixel-width parent-frame)
+		   (frame-pixel-width parent-frame)))
 	   (pfh (frame-pixel-height parent-frame))
 	   (nfw (frame-pixel-width new-frame))
 	   (nfh (frame-pixel-height new-frame))
@@ -459,7 +460,7 @@
 		      (- (x-display-pixel-height) (car (cdr pfy)) pfh)
 		    (car (cdr pfy)))))
       (cond ((eq location 'right)
-	     (setq newleft (+ pfx pfw 5)
+	     (setq newleft (+ pfx pfw 10)
 		   newtop pfy))
 	    ((eq location 'left)
 	     (setq newleft (- pfx 10 nfw)
@@ -471,7 +472,7 @@
 		   ;; extra 10 is just dressings for window
 		   ;; decorations.
 		   (let* ((left-guess (- pfx 10 nfw))
-			  (right-guess (+ pfx pfw 5))
+			  (right-guess (+ pfx pfw 10))
 			  (left-margin left-guess)
 			  (right-margin (- (x-display-pixel-width)
 					   right-guess 5 nfw)))

=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-09-17 07:00:12 +0000
+++ src/ChangeLog	2010-09-17 09:04:35 +0000
@@ -1,3 +1,11 @@
+2010-09-17  Stephen Berman  <stephen.berman@gmx.net>
+
+	* frame.c (Ftool_bar_pixel_width): New function to expose tool
+	bar's pixel width to Lisp (Bug#7048).
+
+ 2010-09-14  Juanma Barranquero  <lekktu@gmail.com>
+
+ 	* cmds.c (syms_of_cmds) <post-self-insert-hook>: Fix typos in docstring.
 2010-09-17  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* gtkutil.c (xg_pack_tool_bar): Call gtk_handle_box_set_handle_position

=== modified file 'src/frame.c'
--- src/frame.c	2010-08-08 21:03:45 +0000
+++ src/frame.c	2010-09-17 09:04:35 +0000
@@ -2649,6 +2649,28 @@
 #endif
     return make_number (FRAME_COLS (f));
 }
+
+DEFUN ("tool-bar-pixel-width", Ftool_bar_pixel_width,
+       Stool_bar_pixel_width, 0, 1, 0,
+       doc: /* Return width in pixels of FRAME's tool bar.
+The result is greater than zero only when the tool bar is on the left
+or right side of FRAME.  If FRAME is omitted, the selected frame is
+used.  */)
+  (Lisp_Object frame)
+{
+  struct frame *f;
+
+  if (NILP (frame))
+    frame = selected_frame;
+  CHECK_FRAME (frame);
+  f = XFRAME (frame);
+
+#ifdef FRAME_TOOLBAR_WIDTH
+  if (FRAME_WINDOW_P (f))
+    return make_number (FRAME_TOOLBAR_WIDTH (f));
+#endif
+  return 0;
+}
 
 DEFUN ("set-frame-height", Fset_frame_height, Sset_frame_height, 2, 3, 0,
        doc: /* Specify that the frame FRAME has LINES lines.
@@ -4596,6 +4618,7 @@
   defsubr (&Sframe_char_width);
   defsubr (&Sframe_pixel_height);
   defsubr (&Sframe_pixel_width);
+  defsubr (&Stool_bar_pixel_width);
   defsubr (&Sset_frame_height);
   defsubr (&Sset_frame_width);
   defsubr (&Sset_frame_size);
------------------------------------------------------------
revno: 101455
committer: Michael Albinus <michael.albinus@gmx.de>
branch nick: trunk
timestamp: Fri 2010-09-17 09:58:07 +0200
message:
  * net/tramp-compat.el (tramp-compat-with-temp-message): Make it a
  defmacro.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-17 00:08:06 +0000
+++ lisp/ChangeLog	2010-09-17 07:58:07 +0000
@@ -1,3 +1,8 @@
+2010-09-17  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp-compat.el (tramp-compat-with-temp-message): Make it a
+	defmacro.
+
 2010-09-16  Chong Yidong  <cyd@stupidchicken.com>
 
 	* mail/sendmail.el: Add "*unsent mail*" to

=== modified file 'lisp/net/tramp-compat.el'
--- lisp/net/tramp-compat.el	2010-09-15 20:27:11 +0000
+++ lisp/net/tramp-compat.el	2010-09-17 07:58:07 +0000
@@ -184,7 +184,7 @@
 ;; `with-temp-message' does not exists in XEmacs.
 (if (fboundp 'with-temp-message)
     (defalias 'tramp-compat-with-temp-message 'with-temp-message)
-  (defun tramp-compat-with-temp-message (message &rest body)
+  (defmacro tramp-compat-with-temp-message (message &rest body)
     "Display MESSAGE temporarily if non-nil while BODY is evaluated."
     `(progn ,@body)))
------------------------------------------------------------
revno: 101454
committer: Jan D <jan.h.d@swipnet.se>
branch nick: trunk
timestamp: Fri 2010-09-17 09:00:12 +0200
message:
  Put handle on top for vertical toolbar, Bug#7051.
  
  * gtkutil.c (xg_pack_tool_bar): Call gtk_handle_box_set_handle_position
  with argument top/left if tool bar is vertical/horizontal (Bug#7051).
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-09-17 04:57:58 +0000
+++ src/ChangeLog	2010-09-17 07:00:12 +0000
@@ -1,3 +1,8 @@
+2010-09-17  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* gtkutil.c (xg_pack_tool_bar): Call gtk_handle_box_set_handle_position
+	with argument top/left if tool bar is vertical/horizontal (Bug#7051).
+
 2010-09-17  Kenichi Handa  <handa@m17n.org>
 
 	* ftfont.c (ftfont_check_otf): Fix previous change.

=== modified file 'src/gtkutil.c'
--- src/gtkutil.c	2010-08-18 06:30:54 +0000
+++ src/gtkutil.c	2010-09-17 07:00:12 +0000
@@ -3974,6 +3974,8 @@
 
   if (into_hbox) 
     {
+      gtk_handle_box_set_handle_position (GTK_HANDLE_BOX (x->handlebox_widget),
+                                          GTK_POS_TOP);
       gtk_box_pack_start (GTK_BOX (x->hbox_widget), x->handlebox_widget,
                           FALSE, FALSE, 0);
 
@@ -3986,6 +3988,8 @@
   else
     {
       int vbox_pos = x->menubar_widget ? 1 : 0;
+      gtk_handle_box_set_handle_position (GTK_HANDLE_BOX (x->handlebox_widget),
+                                          GTK_POS_LEFT);
       gtk_box_pack_start (GTK_BOX (x->vbox_widget), x->handlebox_widget,
                           FALSE, FALSE, 0);
------------------------------------------------------------
revno: 101453
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Fri 2010-09-17 06:46:54 +0000
message:
  pop3.el (pop3-wait-for-messages): Use pop3-accept-process-output instead of nnheader-accept-process-output.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-17 06:24:10 +0000
+++ lisp/gnus/ChangeLog	2010-09-17 06:46:54 +0000
@@ -1,5 +1,8 @@
 2010-09-17  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+	* pop3.el (pop3-wait-for-messages): Use pop3-accept-process-output
+	instead of nnheader-accept-process-output.
+
 	* gnus-html.el (gnus-html-schedule-image-fetching)
 	(gnus-html-prefetch-images): Replace process-kill-without-query by
 	gnus-set-process-query-on-exit-flag.

=== modified file 'lisp/gnus/pop3.el'
--- lisp/gnus/pop3.el	2010-09-10 00:08:31 +0000
+++ lisp/gnus/pop3.el	2010-09-17 06:46:54 +0000
@@ -168,7 +168,7 @@
 	       (truncate (/ (buffer-size) 1000))
 	       (truncate (* (/ (* (buffer-size) 1.0)
 			       total-size) 100))))
-    (nnheader-accept-process-output process)))
+    (pop3-accept-process-output process)))
 
 (defun pop3-write-to-file (file)
   (let ((pop-buffer (current-buffer))
------------------------------------------------------------
revno: 101452
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Fri 2010-09-17 06:24:10 +0000
message:
  gnus-html.el: Replace process-kill-without-query by gnus-set-process-query-on-exit-flag.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-17 05:38:38 +0000
+++ lisp/gnus/ChangeLog	2010-09-17 06:24:10 +0000
@@ -1,3 +1,9 @@
+2010-09-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-html.el (gnus-html-schedule-image-fetching)
+	(gnus-html-prefetch-images): Replace process-kill-without-query by
+	gnus-set-process-query-on-exit-flag.
+
 2010-09-16  Romain Francoise  <romain@orebokech.com>
 
 	* gnus-html.el: Require gnus-art for `gnus-with-article-buffer'.

=== modified file 'lisp/gnus/gnus-html.el'
--- lisp/gnus/gnus-html.el	2010-09-17 05:38:38 +0000
+++ lisp/gnus/gnus-html.el	2010-09-17 06:24:10 +0000
@@ -299,7 +299,7 @@
 		     "--max-time" "60"
 		     "-o" (gnus-html-image-id url)
 		     (mm-url-decode-entities-string url))))
-      (process-kill-without-query process)
+      (gnus-set-process-query-on-exit-flag process nil)
       (set-process-sentinel process 'gnus-html-curl-sentinel)
       (gnus-set-process-plist process (list 'images images
 					    'buffer buffer)))))
@@ -463,7 +463,7 @@
 		      "--location"
 		      "--max-time" "60"
 		      urls)))
-	  (process-kill-without-query process))))))
+	  (gnus-set-process-query-on-exit-flag process nil))))))
 
 (provide 'gnus-html)
------------------------------------------------------------
revno: 101451
author: Romain Francoise <romain@orebokech.com>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Fri 2010-09-17 05:38:38 +0000
message:
  gnus-html.el: Require gnus-art for `gnus-with-article-buffer'.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-14 23:14:44 +0000
+++ lisp/gnus/ChangeLog	2010-09-17 05:38:38 +0000
@@ -1,3 +1,7 @@
+2010-09-16  Romain Francoise  <romain@orebokech.com>
+
+	* gnus-html.el: Require gnus-art for `gnus-with-article-buffer'.
+
 2010-09-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus-html.el (gnus-html-schedule-image-fetching)

=== modified file 'lisp/gnus/gnus-html.el'
--- lisp/gnus/gnus-html.el	2010-09-14 23:14:44 +0000
+++ lisp/gnus/gnus-html.el	2010-09-17 05:38:38 +0000
@@ -30,6 +30,8 @@
 
 (eval-when-compile (require 'cl))
 (eval-when-compile (require 'mm-decode))
+
+(require 'gnus-art)
 (require 'mm-url)
 
 (defcustom gnus-html-cache-directory (nnheader-concat gnus-directory "html-cache/")
------------------------------------------------------------
revno: 101450 [merge]
committer: Kenichi Handa <handa@m17n.org>
branch nick: trunk
timestamp: Fri 2010-09-17 14:08:43 +0900
message:
  ftfont.c (ftfont_check_otf): Fix previous change.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-09-16 02:11:13 +0000
+++ src/ChangeLog	2010-09-17 04:57:58 +0000
@@ -1,3 +1,7 @@
+2010-09-17  Kenichi Handa  <handa@m17n.org>
+
+	* ftfont.c (ftfont_check_otf): Fix previous change.
+
 2010-09-14  Kenichi Handa  <handa@m17n.org>
 
 	* ftfont.c (ftfont_check_otf): Fix the case of checking just

=== modified file 'src/ftfont.c'
--- src/ftfont.c	2010-09-16 01:51:56 +0000
+++ src/ftfont.c	2010-09-17 04:57:58 +0000
@@ -1632,13 +1632,18 @@
 static int
 ftfont_check_otf (MFLTFont *font, MFLTOtfSpec *spec)
 {
+#define FEATURE_NONE(IDX) (! spec->features[IDX])
+
+#define FEATURE_ANY(IDX)	\
+  (spec->features[IDX]		\
+   && spec->features[IDX][0] == 0xFFFFFFFF && spec->features[IDX][1] == 0)
+
   struct MFLTFontFT *flt_font_ft = (struct MFLTFontFT *) font;
   OTF *otf = flt_font_ft->otf;
   OTF_Tag *tags;
   int i, n, negative;
 
-  if (spec->features[0] && spec->features[0][0] ==0
-      && spec->features[1] && spec->features[1][0] ==0)
+  if (FEATURE_ANY (0) && FEATURE_ANY (1))
     /* Return 1 iff any of GSUB or GPOS support the script (and language).  */
     return (otf
 	    && (OTF_check_features (otf, 0, spec->script, spec->langsys,
@@ -1647,23 +1652,25 @@
 				       NULL, 0) > 0));
 
   for (i = 0; i < 2; i++)
-    if (! spec->features[i] || spec->features[i][0] != 0)
+    if (! FEATURE_ANY (i))
       {
-	int no_feature = ! otf || OTF_get_features (otf, i == 0) < 0;
-	if (! spec->features[i])
+	if (FEATURE_NONE (i))
 	  {
-	    if (no_feature)
-	      continue;
-	    return 0;
+	    if (otf
+		&& OTF_check_features (otf, i == 0, spec->script, spec->langsys,
+				       NULL, 0) > 0)
+	      return 0;
+	    continue;
 	  }
 	if (spec->features[i][0] == 0xFFFFFFFF)
 	  {
-	    if (no_feature)
+	    if (! otf
+		|| OTF_check_features (otf, i == 0, spec->script, spec->langsys,
+				       NULL, 0) <= 0)
 	      continue;
 	  }
-	else if (no_feature)
+	else if (! otf)
 	  return 0;
-	/* Now (! no_feature) */
 	for (n = 1; spec->features[i][n]; n++);
 	tags = alloca (sizeof (OTF_Tag) * n);
 	for (n = 0, negative = 0; spec->features[i][n]; n++)
@@ -1687,6 +1694,8 @@
 #endif	/* not M17N_FLT_USE_NEW_FEATURE */
       }
   return 1;
+#undef FEATURE_NONE
+#undef FEATURE_ANY
 }
 
 #define DEVICE_DELTA(table, size)				\
------------------------------------------------------------
revno: 101449
committer: Chong Yidong <cyd@stupidchicken.com>
branch nick: trunk
timestamp: Thu 2010-09-16 20:08:06 -0400
message:
  * mail/sendmail.el: Add "*unsent mail*" to same-window-buffer-names.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-16 22:47:21 +0000
+++ lisp/ChangeLog	2010-09-17 00:08:06 +0000
@@ -1,5 +1,8 @@
 2010-09-16  Chong Yidong  <cyd@stupidchicken.com>
 
+	* mail/sendmail.el: Add "*unsent mail*" to
+	same-window-buffer-names.
+
 	* term/x-win.el (x-cut-buffer-or-selection-value): Define as
 	obsolete alias for x-selection-value.
 

=== modified file 'lisp/mail/sendmail.el'
--- lisp/mail/sendmail.el	2010-03-28 03:52:17 +0000
+++ lisp/mail/sendmail.el	2010-09-17 00:08:06 +0000
@@ -1663,6 +1663,7 @@
 ;; in middle of loading the file.
 
 ;;;###autoload (add-hook 'same-window-buffer-names (purecopy "*mail*"))
+;;;###autoload (add-hook 'same-window-buffer-names (purecopy "*unsent mail*"))
 
 ;;;###autoload
 (defun mail (&optional noerase to subject in-reply-to cc replybuffer actions)
------------------------------------------------------------
revno: 101448
committer: Chong Yidong <cyd@stupidchicken.com>
branch nick: trunk
timestamp: Thu 2010-09-16 18:47:21 -0400
message:
  Define obsolete alias x-cut-buffer-or-selection-value.
  
  * term/x-win.el (x-cut-buffer-or-selection-value): Define as
  obsolete alias for x-selection-value.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-16 22:32:54 +0000
+++ lisp/ChangeLog	2010-09-16 22:47:21 +0000
@@ -1,5 +1,8 @@
 2010-09-16  Chong Yidong  <cyd@stupidchicken.com>
 
+	* term/x-win.el (x-cut-buffer-or-selection-value): Define as
+	obsolete alias for x-selection-value.
+
 	* ido.el (ido-make-buffer-list): Fix error in 2010-08-22 merge.
 
 2010-09-16  Michael Albinus  <michael.albinus@gmx.de>

=== modified file 'lisp/term/x-win.el'
--- lisp/term/x-win.el	2010-09-02 10:17:02 +0000
+++ lisp/term/x-win.el	2010-09-16 22:47:21 +0000
@@ -1344,6 +1344,9 @@
       (or clip-text primary-text)
       )))
 
+(define-obsolete-function-alias 'x-cut-buffer-or-selection-value
+  'x-selection-value "24.1")
+
 ;; Arrange for the kill and yank functions to set and check the clipboard.
 (setq interprogram-cut-function 'x-select-text)
 (setq interprogram-paste-function 'x-selection-value)
------------------------------------------------------------
revno: 101447
committer: Chong Yidong <cyd@stupidchicken.com>
branch nick: trunk
timestamp: Thu 2010-09-16 18:32:54 -0400
message:
  * ido.el (ido-make-buffer-list): Fix error in 2010-08-22 merge.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-16 20:43:12 +0000
+++ lisp/ChangeLog	2010-09-16 22:32:54 +0000
@@ -1,3 +1,7 @@
+2010-09-16  Chong Yidong  <cyd@stupidchicken.com>
+
+	* ido.el (ido-make-buffer-list): Fix error in 2010-08-22 merge.
+
 2010-09-16  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp-cmds.el (tramp-cleanup-connection): Set tramp-autoload

=== modified file 'lisp/ido.el'
--- lisp/ido.el	2010-08-23 10:21:01 +0000
+++ lisp/ido.el	2010-09-16 22:32:54 +0000
@@ -3403,6 +3403,8 @@
     (if default
         (setq ido-temp-list
               (cons default (delete default ido-temp-list))))
+    (if ido-use-virtual-buffers
+	(ido-add-virtual-buffers-to-list))
     (run-hooks 'ido-make-buffer-list-hook)
     ido-temp-list))
------------------------------------------------------------
revno: 101446
committer: Michael Albinus <michael.albinus@gmx.de>
branch nick: trunk
timestamp: Thu 2010-09-16 22:43:12 +0200
message:
  * net/tramp-cmds.el (tramp-cleanup-connection): Set tramp-autoload cookie.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-15 20:27:11 +0000
+++ lisp/ChangeLog	2010-09-16 20:43:12 +0000
@@ -1,3 +1,8 @@
+2010-09-16  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp-cmds.el (tramp-cleanup-connection): Set tramp-autoload
+	cookie.
+
 2010-09-15  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp-compat.el (tramp-compat-with-temp-message)
@@ -9,7 +14,7 @@
 	* net/tramp-cache.el (top): Use `tramp-compat-font-lock-add-keywords'.
 
 	* net/tramp.el (tramp-progress-reporter-update): Use
-	`tramp-compat-funcall.
+	`tramp-compat-funcall'.
 
 	* net/tramp.el (tramp-process-actions):
 	* net/tramp-gvfs.el (tramp-handle-vc-registered):

=== modified file 'lisp/net/tramp-cmds.el'
--- lisp/net/tramp-cmds.el	2010-09-08 14:42:54 +0000
+++ lisp/net/tramp-cmds.el	2010-09-16 20:43:12 +0000
@@ -50,6 +50,7 @@
 	  x)))
     (buffer-list))))
 
+;;;###tramp-autoload
 (defun tramp-cleanup-connection (vec)
   "Flush all connection related objects.
 This includes password cache, file cache, connection cache, buffers.
------------------------------------------------------------
revno: 101445 [merge]
committer: Kenichi Handa <handa@m17n.org>
branch nick: trunk
timestamp: Thu 2010-09-16 11:12:27 +0900
message:
  ftfont.c (ftfont_check_otf): Fix the case of checking just existence of GSUB or GPOS.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-09-14 20:32:35 +0000
+++ src/ChangeLog	2010-09-16 02:11:13 +0000
@@ -1,3 +1,8 @@
+2010-09-14  Kenichi Handa  <handa@m17n.org>
+
+	* ftfont.c (ftfont_check_otf): Fix the case of checking just
+	existence of GSUB or GPOS.
+
 2010-09-14  Juanma Barranquero  <lekktu@gmail.com>
 
 	* cmds.c (syms_of_cmds) <post-self-insert-hook>: Fix typos in docstring.

=== modified file 'src/ftfont.c'
--- src/ftfont.c	2010-08-08 21:03:45 +0000
+++ src/ftfont.c	2010-09-16 01:51:56 +0000
@@ -1637,32 +1637,55 @@
   OTF_Tag *tags;
   int i, n, negative;
 
+  if (spec->features[0] && spec->features[0][0] ==0
+      && spec->features[1] && spec->features[1][0] ==0)
+    /* Return 1 iff any of GSUB or GPOS support the script (and language).  */
+    return (otf
+	    && (OTF_check_features (otf, 0, spec->script, spec->langsys,
+				    NULL, 0) > 0
+		|| OTF_check_features (otf, 1, spec->script, spec->langsys,
+				       NULL, 0) > 0));
+
   for (i = 0; i < 2; i++)
-    {
-      if (! spec->features[i])
-	continue;
-      for (n = 0; spec->features[i][n]; n++);
-      tags = alloca (sizeof (OTF_Tag) * n);
-      for (n = 0, negative = 0; spec->features[i][n]; n++)
-	{
-	  if (spec->features[i][n] == 0xFFFFFFFF)
-	    negative = 1;
-	  else if (negative)
-	    tags[n - 1] = spec->features[i][n] | 0x80000000;
-	  else
-	    tags[n] = spec->features[i][n];
-	}
+    if (! spec->features[i] || spec->features[i][0] != 0)
+      {
+	int no_feature = ! otf || OTF_get_features (otf, i == 0) < 0;
+	if (! spec->features[i])
+	  {
+	    if (no_feature)
+	      continue;
+	    return 0;
+	  }
+	if (spec->features[i][0] == 0xFFFFFFFF)
+	  {
+	    if (no_feature)
+	      continue;
+	  }
+	else if (no_feature)
+	  return 0;
+	/* Now (! no_feature) */
+	for (n = 1; spec->features[i][n]; n++);
+	tags = alloca (sizeof (OTF_Tag) * n);
+	for (n = 0, negative = 0; spec->features[i][n]; n++)
+	  {
+	    if (spec->features[i][n] == 0xFFFFFFFF)
+	      negative = 1;
+	    else if (negative)
+	      tags[n - 1] = spec->features[i][n] | 0x80000000;
+	    else
+	      tags[n] = spec->features[i][n];
+	  }
 #ifdef M17N_FLT_USE_NEW_FEATURE
-      if (OTF_check_features (otf, i == 0, spec->script, spec->langsys,
-			      tags, n - negative) != 1)
-	return 0;
+	if (OTF_check_features (otf, i == 0, spec->script, spec->langsys,
+				tags, n - negative) != 1)
+	  return 0;
 #else  /* not M17N_FLT_USE_NEW_FEATURE */
-      if (n - negative > 0
-	  && OTF_check_features (otf, i == 0, spec->script, spec->langsys,
-				 tags, n - negative) != 1)
-	return 0;
+	if (n - negative > 0
+	    && OTF_check_features (otf, i == 0, spec->script, spec->langsys,
+				   tags, n - negative) != 1)
+	  return 0;
 #endif	/* not M17N_FLT_USE_NEW_FEATURE */
-    }
+      }
   return 1;
 }
------------------------------------------------------------
revno: 101444
committer: Michael Albinus <michael.albinus@gmx.de>
branch nick: trunk
timestamp: Wed 2010-09-15 22:27:11 +0200
message:
  * net/tramp-compat.el (tramp-compat-with-temp-message)
  (tramp-compat-font-lock-add-keywords, tramp-compat-process-get)
  (tramp-compat-process-put): New defuns.
  
  * net/tramp.el (top):
  * net/tramp-gvfs.el (top):
  * net/tramp-cache.el (top): Use `tramp-compat-font-lock-add-keywords'.
  
  * net/tramp.el (tramp-progress-reporter-update): Use
  `tramp-compat-funcall.
  
  * net/tramp.el (tramp-process-actions):
  * net/tramp-gvfs.el (tramp-handle-vc-registered):
  * net/tramp-sh.el (tramp-gvfs-handler-askquestion)
  (tramp-get-remote-stat, tramp-get-remote-readlink): Use
  `tramp-compat-with-temp-message'.
  
  * net/tramp-sh.el (top): Require 'cl.
  (tramp-handle-start-file-process): Use `tramp-compat-process-get'.
  (tramp-open-connection-setup-interactive-shell): Use
  `tramp-compat-process-put'.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-15 18:03:25 +0000
+++ lisp/ChangeLog	2010-09-15 20:27:11 +0000
@@ -1,3 +1,27 @@
+2010-09-15  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp-compat.el (tramp-compat-with-temp-message)
+	(tramp-compat-font-lock-add-keywords, tramp-compat-process-get)
+	(tramp-compat-process-put): New defuns.
+
+	* net/tramp.el (top):
+	* net/tramp-gvfs.el (top):
+	* net/tramp-cache.el (top): Use `tramp-compat-font-lock-add-keywords'.
+
+	* net/tramp.el (tramp-progress-reporter-update): Use
+	`tramp-compat-funcall.
+
+	* net/tramp.el (tramp-process-actions):
+	* net/tramp-gvfs.el (tramp-handle-vc-registered):
+	* net/tramp-sh.el (tramp-gvfs-handler-askquestion)
+	(tramp-get-remote-stat, tramp-get-remote-readlink): Use
+	`tramp-compat-with-temp-message'.
+
+	* net/tramp-sh.el (top): Require 'cl.
+	(tramp-handle-start-file-process): Use `tramp-compat-process-get'.
+	(tramp-open-connection-setup-interactive-shell): Use
+	`tramp-compat-process-put'.
+
 2010-09-15  Alan Mackenzie  <acm@muc.de>
 
 	* progmodes/cc-engine.el (c-forward-<>-arglist-recur): Correct the
@@ -238,7 +262,7 @@
 
 	* net/tramp-sh.el: New file, derived from tramp.el.
 	(top): Initialize `tramp-methods', `tramp-default-method-alist',
-	`tramp-default-user-alist', tramp-foreign-file-name-handler-alist.
+	`tramp-default-user-alist', `tramp-foreign-file-name-handler-alist'.
 	Remove "scp1_old", "scp2_old", "ssh1_old", "ssh2_old".  Use
 	`ignore-errors' where appropriate.
 	(tramp-sh-file-name-handler-alist): Renamed from

=== modified file 'lisp/net/tramp-cache.el'
--- lisp/net/tramp-cache.el	2010-09-13 15:17:01 +0000
+++ lisp/net/tramp-cache.el	2010-09-15 20:27:11 +0000
@@ -152,8 +152,8 @@
 ;;;###tramp-autoload
 (put 'with-file-property 'lisp-indent-function 3)
 (put 'with-file-property 'edebug-form-spec t)
-;;;###tramp-autoload
-(font-lock-add-keywords 'emacs-lisp-mode '("\\<with-file-property\\>"))
+(tramp-compat-font-lock-add-keywords
+ 'emacs-lisp-mode '("\\<with-file-property\\>"))
 
 ;;;###tramp-autoload
 (defun tramp-flush-file-property (vec file)
@@ -255,8 +255,8 @@
 ;;;###tramp-autoload
 (put 'with-connection-property 'lisp-indent-function 2)
 (put 'with-connection-property 'edebug-form-spec t)
-;;;###tramp-autoload
-(font-lock-add-keywords 'emacs-lisp-mode '("\\<with-connection-property\\>"))
+(tramp-compat-font-lock-add-keywords
+ 'emacs-lisp-mode '("\\<with-connection-property\\>"))
 
 ;;;###tramp-autoload
 (defun tramp-flush-connection-property (key)

=== modified file 'lisp/net/tramp-compat.el'
--- lisp/net/tramp-compat.el	2010-09-13 15:17:01 +0000
+++ lisp/net/tramp-compat.el	2010-09-15 20:27:11 +0000
@@ -96,11 +96,6 @@
     (defvar byte-compile-not-obsolete-vars nil))
   (setq byte-compile-not-obsolete-vars '(directory-sep-char))
 
-  ;; `with-temp-message' does not exists in XEmacs.
-  (condition-case nil
-      (with-temp-message (current-message) nil)
-    (error (defmacro with-temp-message (message &rest body) `(progn ,@body))))
-
   ;; For not existing functions, or functions with a changed argument
   ;; list, there are compiler warnings.  We want to avoid them in
   ;; cases we know what we do.
@@ -114,10 +109,6 @@
   (unless (fboundp 'set-buffer-multibyte)
     (defalias 'set-buffer-multibyte 'ignore))
 
-  ;; `font-lock-add-keywords' does not exist in XEmacs.
-  (unless (fboundp 'font-lock-add-keywords)
-    (defalias 'font-lock-add-keywords 'ignore))
-
   ;; The following functions cannot be aliases of the corresponding
   ;; `tramp-handle-*' functions, because this would bypass the locking
   ;; mechanism.
@@ -190,6 +181,19 @@
 	'file-expand-wildcards 'around 'tramp-advice-file-expand-wildcards)
        (ad-activate 'file-expand-wildcards)))))
 
+;; `with-temp-message' does not exists in XEmacs.
+(if (fboundp 'with-temp-message)
+    (defalias 'tramp-compat-with-temp-message 'with-temp-message)
+  (defun tramp-compat-with-temp-message (message &rest body)
+    "Display MESSAGE temporarily if non-nil while BODY is evaluated."
+    `(progn ,@body)))
+
+;; `font-lock-add-keywords' does not exist in XEmacs.
+(defun tramp-compat-font-lock-add-keywords (mode keywords &optional how)
+  "Add highlighting KEYWORDS for MODE."
+  (ignore-errors
+    (tramp-compat-funcall 'font-lock-add-keywords mode keywords how)))
+
 (defsubst tramp-compat-line-beginning-position ()
   "Return point at beginning of line (compat function).
 Calls `line-beginning-position' or `point-at-bol' if defined, else
@@ -474,6 +478,18 @@
 	  (setenv "UNIX95" unix95)
 	  result)))))
 
+;; The following functions do not exist in XEmacs.  We ignore this;
+;; they are used for checking a remote tty.
+(defun tramp-compat-process-get (process propname)
+  "Return the value of PROCESS' PROPNAME property.
+This is the last value stored with `(process-put PROCESS PROPNAME VALUE)'."
+  (ignore-errors (tramp-compat-funcall 'process-get process propname)))
+
+(defun tramp-compat-process-put (process propname value)
+  "Change PROCESS' PROPNAME property to VALUE.
+It can be retrieved with `(process-get PROCESS PROPNAME)'."
+  (ignore-errors (tramp-compat-funcall 'process-put process propname value)))
+
 (add-hook 'tramp-unload-hook
 	  (lambda ()
 	    (unload-feature 'tramp-compat 'force)))

=== modified file 'lisp/net/tramp-gvfs.el'
--- lisp/net/tramp-gvfs.el	2010-09-13 15:17:01 +0000
+++ lisp/net/tramp-gvfs.el	2010-09-15 20:27:11 +0000
@@ -498,7 +498,8 @@
 
 (put 'with-tramp-dbus-call-method 'lisp-indent-function 2)
 (put 'with-tramp-dbus-call-method 'edebug-form-spec '(form symbolp body))
-(font-lock-add-keywords 'emacs-lisp-mode '("\\<with-tramp-dbus-call-method\\>"))
+(tramp-compat-font-lock-add-keywords
+ 'emacs-lisp-mode '("\\<with-tramp-dbus-call-method\\>"))
 
 (defmacro with-tramp-gvfs-error-message (filename handler &rest args)
   "Apply a Tramp GVFS `handler'.
@@ -519,7 +520,8 @@
 
 (put 'with-tramp-gvfs-error-message 'lisp-indent-function 2)
 (put 'with-tramp-gvfs-error-message 'edebug-form-spec '(form symbolp body))
-(font-lock-add-keywords 'emacs-lisp-mode '("\\<with-tramp-gvfs-error-message\\>"))
+(tramp-compat-font-lock-add-keywords
+ 'emacs-lisp-mode '("\\<with-tramp-gvfs-error-message\\>"))
 
 (defvar tramp-gvfs-dbus-event-vector nil
   "Current Tramp file name to be used, as vector.
@@ -973,7 +975,7 @@
 	    ;; host signature.
 	    (with-temp-buffer
 	      ;; Preserve message for `progress-reporter'.
-	      (with-temp-message ""
+	      (tramp-compat-with-temp-message ""
 		(insert message)
 		(pop-to-buffer (current-buffer))
 		(setq choice (if (yes-or-no-p (concat (car choices) " ")) 0 1))

=== modified file 'lisp/net/tramp-sh.el'
--- lisp/net/tramp-sh.el	2010-09-13 15:17:01 +0000
+++ lisp/net/tramp-sh.el	2010-09-15 20:27:11 +0000
@@ -27,6 +27,7 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))	; ignore-errors
 (require 'tramp)
 (require 'shell)
 
@@ -2855,7 +2856,8 @@
 	      (tramp-send-command v command nil t) ; nooutput
 	    ;; Check, whether a pty is associated.
 	    (tramp-maybe-open-connection v)
-	    (unless (process-get (tramp-get-connection-process v) 'remote-tty)
+	    (unless (tramp-compat-process-get
+		     (tramp-get-connection-process v) 'remote-tty)
 	      (tramp-error
 	       v 'file-error "pty association is not supported for `%s'" name)))
 	  (let ((p (tramp-get-connection-process v)))
@@ -3659,7 +3661,7 @@
 ;; any other remote command.
 (defun tramp-handle-vc-registered (file)
   "Like `vc-registered' for Tramp files."
-  (with-temp-message ""
+  (tramp-compat-with-temp-message ""
     (with-parsed-tramp-file-name file nil
       (with-progress-reporter
 	  v 3 (format "Checking `vc-registered' for %s" file)
@@ -4139,7 +4141,8 @@
   ;; Set `remote-tty' process property.
   (ignore-errors
     (let ((tty (tramp-send-command-and-read vec "echo \\\"`tty`\\\"")))
-      (unless (zerop (length tty)) (process-put proc 'remote-tty tty))))
+      (unless (zerop (length tty))
+	(tramp-compat-process-put proc 'remote-tty tty))))
 
   ;; Set the environment.
   (tramp-message vec 5 "Setting default environment")
@@ -5268,7 +5271,7 @@
       (when result
 	(setq tmp
 	      ;; We don't want to display an error message.
-	      (with-temp-message (or (current-message) "")
+	      (tramp-compat-with-temp-message (or (current-message) "")
 		(ignore-errors
 		  (tramp-send-command-and-read
 		   vec (format "%s -c '(\"%%N\" %%s)' /" result)))))
@@ -5285,7 +5288,7 @@
 		   vec "readlink" (tramp-get-remote-path vec))))
       (when (and result
 		 ;; We don't want to display an error message.
-		 (with-temp-message (or (current-message) "")
+		 (tramp-compat-with-temp-message (or (current-message) "")
 		   (ignore-errors
 		     (tramp-send-command-and-check
 		      vec (format "%s --canonicalize-missing /" result)))))

=== modified file 'lisp/net/tramp.el'
--- lisp/net/tramp.el	2010-09-13 15:17:01 +0000
+++ lisp/net/tramp.el	2010-09-15 20:27:11 +0000
@@ -1413,13 +1413,14 @@
 
 (put 'with-parsed-tramp-file-name 'lisp-indent-function 2)
 (put 'with-parsed-tramp-file-name 'edebug-form-spec '(form symbolp body))
-(font-lock-add-keywords 'emacs-lisp-mode '("\\<with-parsed-tramp-file-name\\>"))
+(tramp-compat-font-lock-add-keywords
+ 'emacs-lisp-mode '("\\<with-parsed-tramp-file-name\\>"))
 
 (defun tramp-progress-reporter-update (reporter &optional value)
   (let* ((parameters (cdr reporter))
 	 (message (aref parameters 3)))
     (when (string-match message (or (current-message) ""))
-      (funcall 'progress-reporter-update reporter value))))
+      (tramp-compat-funcall 'progress-reporter-update reporter value))))
 
 (defmacro with-progress-reporter (vec level message &rest body)
   "Executes BODY, spinning a progress reporter with MESSAGE.
@@ -1450,7 +1451,8 @@
 
 (put 'with-progress-reporter 'lisp-indent-function 3)
 (put 'with-progress-reporter 'edebug-form-spec t)
-(font-lock-add-keywords 'emacs-lisp-mode '("\\<with-progress-reporter\\>"))
+(tramp-compat-font-lock-add-keywords
+ 'emacs-lisp-mode '("\\<with-progress-reporter\\>"))
 
 (eval-and-compile			;; Silence compiler.
   (if (memq system-type '(cygwin windows-nt))
@@ -2688,7 +2690,7 @@
 (defun tramp-process-actions (proc vec actions &optional timeout)
   "Perform actions until success or TIMEOUT."
   ;; Preserve message for `progress-reporter'.
-  (with-temp-message ""
+  (tramp-compat-with-temp-message ""
     ;; Enable auth-source and password-cache.
     (tramp-set-connection-property vec "first-password-request" t)
     (let (exit)
------------------------------------------------------------
revno: 101443
committer: Alan Mackenzie <acm@muc.de>
branch nick: trunk
timestamp: Wed 2010-09-15 18:03:25 +0000
message:
  (c-forward-<>-arglist-recur): Fix an infinite recursion.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-15 17:51:15 +0000
+++ lisp/ChangeLog	2010-09-15 18:03:25 +0000
@@ -2,6 +2,7 @@
 
 	* progmodes/cc-engine.el (c-forward-<>-arglist-recur): Correct the
 	indentation.
+	(c-forward-<>-arglist-recur): Fix an infinite recursion.
 
 2010-09-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 

=== modified file 'lisp/progmodes/cc-engine.el'
--- lisp/progmodes/cc-engine.el	2010-09-15 17:51:15 +0000
+++ lisp/progmodes/cc-engine.el	2010-09-15 18:03:25 +0000
@@ -5479,16 +5479,14 @@
 
 		  (setq pos (point))
 
-		  (or
-		   ;; Note: These regexps exploit the match order in \| so
-		   ;; that "<>" is matched by "<" rather than "[^>:-]>".
-		   (c-syntactic-re-search-forward
-		    ;; Stop on ',', '|', '&', '+' and '-' to catch
-		    ;; common binary operators that could be between
-		    ;; two comparison expressions "a<b" and "c>d".
-		    "[<;{},|+&-]\\|[>)]"
-		    nil t t)
-		   t))
+		  ;; Note: These regexps exploit the match order in \| so
+		  ;; that "<>" is matched by "<" rather than "[^>:-]>".
+		  (c-syntactic-re-search-forward
+		   ;; Stop on ',', '|', '&', '+' and '-' to catch
+		   ;; common binary operators that could be between
+		   ;; two comparison expressions "a<b" and "c>d".
+		   "[<;{},|+&-]\\|[>)]"
+		   nil t t))
 
 		(cond
 		 ((eq (char-before) ?>)
------------------------------------------------------------
revno: 101442
committer: Alan Mackenzie <acm@muc.de>
branch nick: trunk
timestamp: Wed 2010-09-15 17:51:15 +0000
message:
  (c-forward-<>-arglist-recur): Correct the indentation.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-15 15:30:43 +0000
+++ lisp/ChangeLog	2010-09-15 17:51:15 +0000
@@ -1,3 +1,8 @@
+2010-09-15  Alan Mackenzie  <acm@muc.de>
+
+	* progmodes/cc-engine.el (c-forward-<>-arglist-recur): Correct the
+	indentation.
+
 2010-09-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/bytecomp.el (byte-compile-warning-types): New type

=== modified file 'lisp/progmodes/cc-engine.el'
--- lisp/progmodes/cc-engine.el	2010-08-29 16:17:13 +0000
+++ lisp/progmodes/cc-engine.el	2010-09-15 17:51:15 +0000
@@ -5449,49 +5449,49 @@
       (forward-char)
 
       (unless (looking-at c-<-op-cont-regexp)
-		(while (and
+	(while (and
 		(progn
-		      (c-forward-syntactic-ws)
-		 (let ((orig-record-found-types c-record-found-types))
-		   (when (or (and c-record-type-identifiers all-types)
-			     (c-major-mode-is 'java-mode))
-		     ;; All encountered identifiers are types, so set the
-		     ;; promote flag and parse the type.
-		     (progn
-		       (c-forward-syntactic-ws)
-		       (if (looking-at "\\?")
-			   (forward-char)
-			 (when (looking-at c-identifier-start)
-			   (let ((c-promote-possible-types t)
-				 (c-record-found-types t))
-			     (c-forward-type))))
-
-		     (c-forward-syntactic-ws)
-
-		     (when (or (looking-at "extends")
-			       (looking-at "super"))
-		       (forward-word)
-		       (c-forward-syntactic-ws)
-		       (let ((c-promote-possible-types t)
-			    (c-record-found-types t))
-			 (c-forward-type)
-			 (c-forward-syntactic-ws))))))
-
-		      (setq pos (point))
-
-		      (or
-		       ;; Note: These regexps exploit the match order in \| so
-		       ;; that "<>" is matched by "<" rather than "[^>:-]>".
-		       (c-syntactic-re-search-forward
-			;; Stop on ',', '|', '&', '+' and '-' to catch
-			;; common binary operators that could be between
-			;; two comparison expressions "a<b" and "c>d".
-			"[<;{},|+&-]\\|[>)]"
-			nil t t)
-		       t))
-
-		    (cond
-		     ((eq (char-before) ?>)
+		  (c-forward-syntactic-ws)
+		  (let ((orig-record-found-types c-record-found-types))
+		    (when (or (and c-record-type-identifiers all-types)
+			      (c-major-mode-is 'java-mode))
+		      ;; All encountered identifiers are types, so set the
+		      ;; promote flag and parse the type.
+		      (progn
+			(c-forward-syntactic-ws)
+			(if (looking-at "\\?")
+			    (forward-char)
+			  (when (looking-at c-identifier-start)
+			    (let ((c-promote-possible-types t)
+				  (c-record-found-types t))
+			      (c-forward-type))))
+
+			(c-forward-syntactic-ws)
+
+			(when (or (looking-at "extends")
+				  (looking-at "super"))
+			  (forward-word)
+			  (c-forward-syntactic-ws)
+			  (let ((c-promote-possible-types t)
+				(c-record-found-types t))
+			    (c-forward-type)
+			    (c-forward-syntactic-ws))))))
+
+		  (setq pos (point))
+
+		  (or
+		   ;; Note: These regexps exploit the match order in \| so
+		   ;; that "<>" is matched by "<" rather than "[^>:-]>".
+		   (c-syntactic-re-search-forward
+		    ;; Stop on ',', '|', '&', '+' and '-' to catch
+		    ;; common binary operators that could be between
+		    ;; two comparison expressions "a<b" and "c>d".
+		    "[<;{},|+&-]\\|[>)]"
+		    nil t t)
+		   t))
+
+		(cond
+		 ((eq (char-before) ?>)
 		  ;; Either an operator starting with '>' or the end of
 		  ;; the angle bracket arglist.
 
@@ -5532,14 +5532,14 @@
 			      (when (or (setq keyword-match
 					      (looking-at c-opt-<>-sexp-key))
 					(not (looking-at c-keywords-regexp)))
-				    (setq id-start (point))))
+				(setq id-start (point))))
 
-				(setq subres
-				      (let ((c-promote-possible-types t)
-					    (c-record-found-types t))
-					(c-forward-<>-arglist-recur
-					 (and keyword-match
-					      (c-keyword-member
+			    (setq subres
+				  (let ((c-promote-possible-types t)
+					(c-record-found-types t))
+				    (c-forward-<>-arglist-recur
+				     (and keyword-match
+					  (c-keyword-member
 					   (c-keyword-sym (match-string 1))
 					   'c-<>-type-kwds)))))
 			    )))
@@ -5560,16 +5560,16 @@
 				   (c-forward-syntactic-ws)
 				   (looking-at c-opt-identifier-concat-key)))
 			    (c-record-ref-id (cons id-start id-end))
-			      (c-record-type-id (cons id-start id-end))))))
-		      t)
+			  (c-record-type-id (cons id-start id-end))))))
+		  t)
 
-		((and (not c-restricted-<>-arglists)
-		      (or (and (eq (char-before) ?&)
-			       (not (eq (char-after) ?&)))
-			  (eq (char-before) ?,)))
-		      ;; Just another argument.	 Record the position.  The
-		      ;; type check stuff that made us stop at it is at
-		      ;; the top of the loop.
+		 ((and (not c-restricted-<>-arglists)
+		       (or (and (eq (char-before) ?&)
+				(not (eq (char-after) ?&)))
+			   (eq (char-before) ?,)))
+		  ;; Just another argument.	 Record the position.  The
+		  ;; type check stuff that made us stop at it is at
+		  ;; the top of the loop.
 		  (setq arg-start-pos (cons (point) arg-start-pos)))
 
 		 (t
------------------------------------------------------------
revno: 101441
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Wed 2010-09-15 17:30:43 +0200
message:
  * lisp/emacs-lisp/bytecomp.el (byte-compile-warning-types): New type
  `lexical' for warnings related to lexical scoping.
  (byte-compile-file-form-defvar, byte-compile-defvar): Warn about
  global vars which don't have a prefix and could hence affect lexical
  scoping in unrelated files.
diff:
=== modified file '.bzrignore'
--- .bzrignore	2010-08-30 20:34:52 +0000
+++ .bzrignore	2010-09-15 15:30:43 +0000
@@ -72,3 +72,4 @@
 src/stamp-oldxmenu
 src/temacs
 test/indent/*.new
++*

=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-14 23:14:44 +0000
+++ lisp/ChangeLog	2010-09-15 15:30:43 +0000
@@ -1,3 +1,11 @@
+2010-09-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* emacs-lisp/bytecomp.el (byte-compile-warning-types): New type
+	`lexical' for warnings related to lexical scoping.
+	(byte-compile-file-form-defvar, byte-compile-defvar): Warn about
+	global vars which don't have a prefix and could hence affect lexical
+	scoping in unrelated files.
+
 2010-09-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* net/imap.el: Revert back to version
@@ -106,8 +114,8 @@
 	* Makefile.in (TRAMP_SRC): Remove tramp-fish.el.  Add tramp-sh.el.
 
 	* net/tramp.el (top): Don't show loading message.  Require just
-	'tramp-compat, everything else is required there.  Use
-	`ignore-errors' where appropriate.
+	'tramp-compat, everything else is required there.
+	Use `ignore-errors' where appropriate.
 	(tramp-inline-compress-start-size, tramp-copy-size-limit)
 	(tramp-terminal-type, tramp-end-of-output)
 	(tramp-initial-end-of-output, tramp-completion-function-alist-rsh)

=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- lisp/emacs-lisp/bytecomp.el	2010-09-11 19:33:52 +0000
+++ lisp/emacs-lisp/bytecomp.el	2010-09-15 15:30:43 +0000
@@ -265,7 +265,7 @@
 (defconst byte-compile-warning-types
   '(redefine callargs free-vars unresolved
 	     obsolete noruntime cl-functions interactive-only
-	     make-local mapcar constants suspicious)
+	     make-local mapcar constants suspicious lexical)
   "The list of warning types used when `byte-compile-warnings' is t.")
 (defcustom byte-compile-warnings t
   "List of warnings that the byte-compiler should issue (t for all).
@@ -2153,6 +2153,11 @@
       ;; Since there is no doc string, we can compile this as a normal form,
       ;; and not do a file-boundary.
       (byte-compile-keep-pending form)
+    (when (and (symbolp (nth 1 form))
+               (not (string-match "[-*:$]" (symbol-name (nth 1 form))))
+               (byte-compile-warning-enabled-p 'lexical))
+      (byte-compile-warn "Global/dynamic var `%s' lacks a prefix"
+                         (nth 1 form)))
     (push (nth 1 form) byte-compile-bound-variables)
     (if (eq (car form) 'defconst)
 	(push (nth 1 form) byte-compile-const-variables))
@@ -3804,6 +3809,11 @@
 
 (defun byte-compile-defvar (form)
   ;; This is not used for file-level defvar/consts with doc strings.
+  (when (and (symbolp (nth 1 form))
+             (not (string-match "[-*:$]" (symbol-name (nth 1 form))))
+             (byte-compile-warning-enabled-p 'lexical))
+    (byte-compile-warn "Global/dynamic var `%s' lacks a prefix"
+                       (nth 1 form)))
   (let ((fun (nth 0 form))
 	(var (nth 1 form))
 	(value (nth 2 form))
------------------------------------------------------------
revno: 101440 [merge]
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Tue 2010-09-14 23:15:56 +0000
message:
  Merge changes made in Gnus trunk.
  
  imap.el: Revert back to version cb950ed8ff3e0f40dac437a51b269166f9ffb60d, since some of the changes seem problematic.
  
  Fix up the w3m/curl dependencies.
  mm-decode.el (mm-text-html-renderer): Don't have gnus-article-html depend on curl, which isn't essential.
  gnus-html.el (gnus-html-schedule-image-fetching, gnus-html-prefetch-images): Check for curl before using it.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-14 14:59:42 +0000
+++ lisp/ChangeLog	2010-09-14 23:14:44 +0000
@@ -1,3 +1,9 @@
+2010-09-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* net/imap.el: Revert back to version
+	cb950ed8ff3e0f40dac437a51b269166f9ffb60d, since some of the changes
+	seem problematic.
+
 2010-09-14  Juanma Barranquero  <lekktu@gmail.com>
 
 	* obsolete/old-whitespace.el (whitespace-unload-function):

=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-14 14:59:42 +0000
+++ lisp/gnus/ChangeLog	2010-09-14 23:14:44 +0000
@@ -1,3 +1,15 @@
+2010-09-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus-html.el (gnus-html-schedule-image-fetching)
+	(gnus-html-prefetch-images): Check for curl before using it.
+
+	* mm-decode.el (mm-text-html-renderer): Don't have gnus-article-html
+	depend on curl, which isn't essential.
+
+	* imap.el: Revert back to version
+	cb950ed8ff3e0f40dac437a51b269166f9ffb60d, since some of the changes
+	seem problematic.
+
 2010-09-14  Juanma Barranquero  <lekktu@gmail.com>
 
 	* gnus-registry.el (gnus-registry-install-shortcuts):

=== modified file 'lisp/gnus/gnus-html.el'
--- lisp/gnus/gnus-html.el	2010-09-10 00:07:33 +0000
+++ lisp/gnus/gnus-html.el	2010-09-14 23:14:44 +0000
@@ -288,18 +288,19 @@
 (defun gnus-html-schedule-image-fetching (buffer images)
   (gnus-message 8 "gnus-html-schedule-image-fetching: buffer %s, images %s"
                 buffer images)
-  (let* ((url (caar images))
-	 (process (start-process
-		   "images" nil "curl"
-		   "-s" "--create-dirs"
-		   "--location"
-		   "--max-time" "60"
-		   "-o" (gnus-html-image-id url)
-		   (mm-url-decode-entities-string url))))
-    (process-kill-without-query process)
-    (set-process-sentinel process 'gnus-html-curl-sentinel)
-    (gnus-set-process-plist process (list 'images images
-					  'buffer buffer))))
+  (when (executable-find "curl")
+    (let* ((url (caar images))
+	   (process (start-process
+		     "images" nil "curl"
+		     "-s" "--create-dirs"
+		     "--location"
+		     "--max-time" "60"
+		     "-o" (gnus-html-image-id url)
+		     (mm-url-decode-entities-string url))))
+      (process-kill-without-query process)
+      (set-process-sentinel process 'gnus-html-curl-sentinel)
+      (gnus-set-process-plist process (list 'images images
+					    'buffer buffer)))))
 
 (defun gnus-html-image-id (url)
   (expand-file-name (sha1 url) gnus-html-cache-directory))
@@ -441,7 +442,8 @@
 ;;;###autoload
 (defun gnus-html-prefetch-images (summary)
   (let (blocked-images urls)
-    (when (buffer-live-p summary)
+    (when (and (buffer-live-p summary)
+	       (executable-find "curl"))
       (with-current-buffer summary
 	(setq blocked-images gnus-blocked-images))
       (save-match-data

=== modified file 'lisp/gnus/mm-decode.el'
--- lisp/gnus/mm-decode.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/mm-decode.el	2010-09-14 23:14:44 +0000
@@ -105,9 +105,7 @@
 	 ,disposition ,description ,cache ,id))
 
 (defcustom mm-text-html-renderer
-  (cond ((and (executable-find "w3m")
-	      (executable-find "curl"))
-	 'gnus-article-html)
+  (cond ((executable-find "w3m") 'gnus-article-html)
 	((executable-find "links") 'links)
 	((executable-find "lynx") 'lynx)
 	((locate-library "w3") 'w3)

=== modified file 'lisp/net/imap.el'
--- lisp/net/imap.el	2010-09-06 00:10:55 +0000
+++ lisp/net/imap.el	2010-09-14 23:14:44 +0000
@@ -448,6 +448,18 @@
 The function should take two arguments, the first the IMAP tag and the
 second the status (OK, NO, BAD etc) of the command.")
 
+(defvar imap-enable-exchange-bug-workaround nil
+  "Send FETCH UID commands as *:* instead of *.
+
+When non-nil, use an alternative UIDS form.  Enabling appears to
+be required for some servers (e.g., Microsoft Exchange 2007)
+which otherwise would trigger a response 'BAD The specified
+message set is invalid.'.  We don't unconditionally use this
+form, since this is said to be significantly inefficient.
+
+This variable is set to t automatically per server if the
+canonical form fails.")
+
 
 ;; Utility functions:
 
@@ -1303,38 +1315,40 @@
 
 ;; Mailbox functions:
 
-(defun imap-mailbox-put (propname value &optional mailbox)
-  (if imap-mailbox-data
-      (put (intern (or mailbox imap-current-mailbox) imap-mailbox-data)
-	   propname value)
-    (error "Imap-mailbox-data is nil, prop %s value %s mailbox %s buffer %s"
-	   propname value mailbox (current-buffer)))
-  t)
+(defun imap-mailbox-put (propname value &optional mailbox buffer)
+  (with-current-buffer (or buffer (current-buffer))
+    (if imap-mailbox-data
+	(put (intern (or mailbox imap-current-mailbox) imap-mailbox-data)
+	     propname value)
+      (error "Imap-mailbox-data is nil, prop %s value %s mailbox %s buffer %s"
+	     propname value mailbox (current-buffer)))
+    t))
 
 (defsubst imap-mailbox-get-1 (propname &optional mailbox)
   (get (intern-soft (or mailbox imap-current-mailbox) imap-mailbox-data)
        propname))
 
 (defun imap-mailbox-get (propname &optional mailbox buffer)
+  (let ((mailbox (imap-utf7-encode mailbox)))
+    (with-current-buffer (or buffer (current-buffer))
+      (imap-mailbox-get-1 propname (or mailbox imap-current-mailbox)))))
+
+(defun imap-mailbox-map-1 (func &optional mailbox-decoder buffer)
   (with-current-buffer (or buffer (current-buffer))
-    (imap-mailbox-get-1 propname (or (imap-utf7-encode mailbox)
-				     imap-current-mailbox))))
-
-(defun imap-mailbox-map-1 (func &optional mailbox-decoder)
-  (let (result)
-    (mapatoms
-     (lambda (s)
-       (push (funcall func (if mailbox-decoder
-			       (funcall mailbox-decoder (symbol-name s))
-			     (symbol-name s))) result))
-     imap-mailbox-data)
-    result))
-
-(defun imap-mailbox-map (func)
+    (let (result)
+      (mapatoms
+       (lambda (s)
+	 (push (funcall func (if mailbox-decoder
+				 (funcall mailbox-decoder (symbol-name s))
+			       (symbol-name s))) result))
+       imap-mailbox-data)
+      result)))
+
+(defun imap-mailbox-map (func &optional buffer)
   "Map a function across each mailbox in `imap-mailbox-data', returning a list.
 Function should take a mailbox name (a string) as
 the only argument."
-  (imap-mailbox-map-1 func 'imap-utf7-decode))
+  (imap-mailbox-map-1 func 'imap-utf7-decode buffer))
 
 (defun imap-current-mailbox (&optional buffer)
   (with-current-buffer (or buffer (current-buffer))
@@ -1648,26 +1662,29 @@
 		    uids)
 	  (imap-message-get uids receive))))))
 
-(defun imap-message-put (uid propname value)
-  (if imap-message-data
-      (put (intern (number-to-string uid) imap-message-data)
-	   propname value)
-    (error "Imap-message-data is nil, uid %s prop %s value %s buffer %s"
-	   uid propname value (current-buffer)))
-  t)
-
-(defun imap-message-get (uid propname)
-  (get (intern-soft (number-to-string uid) imap-message-data)
-       propname))
-
-(defun imap-message-map (func propname)
+(defun imap-message-put (uid propname value &optional buffer)
+  (with-current-buffer (or buffer (current-buffer))
+    (if imap-message-data
+	(put (intern (number-to-string uid) imap-message-data)
+	     propname value)
+      (error "Imap-message-data is nil, uid %s prop %s value %s buffer %s"
+	     uid propname value (current-buffer)))
+    t))
+
+(defun imap-message-get (uid propname &optional buffer)
+  (with-current-buffer (or buffer (current-buffer))
+    (get (intern-soft (number-to-string uid) imap-message-data)
+	 propname)))
+
+(defun imap-message-map (func propname &optional buffer)
   "Map a function across each message in `imap-message-data', returning a list."
-  (let (result)
-    (mapatoms
-     (lambda (s)
-       (push (funcall func (get s 'UID) (get s propname)) result))
-     imap-message-data)
-    result))
+  (with-current-buffer (or buffer (current-buffer))
+    (let (result)
+      (mapatoms
+       (lambda (s)
+	 (push (funcall func (get s 'UID) (get s propname)) result))
+       imap-message-data)
+      result)))
 
 (defmacro imap-message-envelope-date (uid &optional buffer)
   `(with-current-buffer (or ,buffer (current-buffer))
@@ -1763,6 +1780,48 @@
 	 (format "String %s cannot be converted to a Lisp integer" number))
       number)))
 
+(defun imap-fetch-safe (uids props &optional receive nouidfetch buffer)
+  "Like `imap-fetch', but DTRT with Exchange 2007 bug.
+However, UIDS here is a cons, where the car is the canonical form
+of the UIDS specification, and the cdr is the one which works with
+Exchange 2007 or, potentially, other buggy servers.
+See `imap-enable-exchange-bug-workaround'."
+  ;; The first time we get here for a given, we'll try the canonical
+  ;; form.  If we get the known error from the buggy server, set the
+  ;; flag buffer-locally (to account for connections to multiple
+  ;; servers), then re-try with the alternative UIDS spec.  We don't
+  ;; unconditionally use the alternative form, since the
+  ;; currently-used alternatives are seriously inefficient with some
+  ;; servers (although they are valid).
+  ;;
+  ;; FIXME:  Maybe it would be cleaner to have a flag to not signal
+  ;; the error (which otherwise gives a message), and test
+  ;; `imap-failed-tags'.  Also, Other IMAP clients use other forms of
+  ;; request which work with Exchange, e.g. Claws does "UID FETCH 1:*
+  ;; (UID)" rather than "FETCH UID 1,*".  Is there a good reason not
+  ;; to do the same?
+  (condition-case data
+      ;; Binding `debug-on-error' allows us to get the error from
+      ;; `imap-parse-response' -- it's normally caught by Emacs around
+      ;; execution of a process filter.
+      (let ((debug-on-error t))
+	(imap-fetch (if imap-enable-exchange-bug-workaround
+			(cdr uids)
+		      (car uids))
+		    props receive nouidfetch buffer))
+    (error
+     (if (and (not imap-enable-exchange-bug-workaround)
+	      ;; This is the Exchange 2007 response.  It may be more
+	      ;; robust just to check for a BAD response to the
+	      ;; attempted fetch.
+	      (string-match "The specified message set is invalid"
+			    (cadr data)))
+	 (with-current-buffer (or buffer (current-buffer))
+	   (set (make-local-variable 'imap-enable-exchange-bug-workaround)
+		t)
+	   (imap-fetch (cdr uids) props receive nouidfetch))
+       (signal (car data) (cdr data))))))
+
 (defun imap-message-copyuid-1 (mailbox)
   (if (imap-capability 'UIDPLUS)
       (list (nth 0 (imap-mailbox-get-1 'copyuid mailbox))
@@ -1772,7 +1831,7 @@
 	  (imap-message-data (make-vector 2 0)))
       (when (imap-mailbox-examine-1 mailbox)
 	(prog1
-	    (and (imap-fetch "*:*" "UID")
+	    (and (imap-fetch-safe '("*" . "*:*") "UID")
 		 (list (imap-mailbox-get-1 'uidvalidity mailbox)
 		       (apply 'max (imap-message-map
 				    (lambda (uid prop) uid) 'UID))))
@@ -1818,7 +1877,7 @@
 	  (imap-message-data (make-vector 2 0)))
       (when (imap-mailbox-examine-1 mailbox)
 	(prog1
-	    (and (imap-fetch "*:*" "UID")
+	    (and (imap-fetch-safe '("*" . "*:*") "UID")
 		 (list (imap-mailbox-get-1 'uidvalidity mailbox)
 		       (apply 'max (imap-message-map
 				    (lambda (uid prop) uid) 'UID))))
@@ -2892,6 +2951,105 @@
 	(imap-forward)
 	(nreverse body)))))
 
+(when imap-debug			; (untrace-all)
+  (require 'trace)
+  (buffer-disable-undo (get-buffer-create imap-debug-buffer))
+  (mapc (lambda (f) (trace-function-background f imap-debug-buffer))
+	'(
+	  imap-utf7-encode
+	  imap-utf7-decode
+	  imap-error-text
+	  imap-kerberos4s-p
+	  imap-kerberos4-open
+	  imap-ssl-p
+	  imap-ssl-open
+	  imap-network-p
+	  imap-network-open
+	  imap-interactive-login
+	  imap-kerberos4a-p
+	  imap-kerberos4-auth
+	  imap-cram-md5-p
+	  imap-cram-md5-auth
+	  imap-login-p
+	  imap-login-auth
+	  imap-anonymous-p
+	  imap-anonymous-auth
+	  imap-open-1
+	  imap-open
+	  imap-opened
+	  imap-ping-server
+	  imap-authenticate
+	  imap-close
+	  imap-capability
+	  imap-namespace
+	  imap-send-command-wait
+	  imap-mailbox-put
+	  imap-mailbox-get
+	  imap-mailbox-map-1
+	  imap-mailbox-map
+	  imap-current-mailbox
+	  imap-current-mailbox-p-1
+	  imap-current-mailbox-p
+	  imap-mailbox-select-1
+	  imap-mailbox-select
+	  imap-mailbox-examine-1
+	  imap-mailbox-examine
+	  imap-mailbox-unselect
+	  imap-mailbox-expunge
+	  imap-mailbox-close
+	  imap-mailbox-create-1
+	  imap-mailbox-create
+	  imap-mailbox-delete
+	  imap-mailbox-rename
+	  imap-mailbox-lsub
+	  imap-mailbox-list
+	  imap-mailbox-subscribe
+	  imap-mailbox-unsubscribe
+	  imap-mailbox-status
+	  imap-mailbox-acl-get
+	  imap-mailbox-acl-set
+	  imap-mailbox-acl-delete
+	  imap-current-message
+	  imap-list-to-message-set
+	  imap-fetch-asynch
+	  imap-fetch
+	  imap-fetch-safe
+	  imap-message-put
+	  imap-message-get
+	  imap-message-map
+	  imap-search
+	  imap-message-flag-permanent-p
+	  imap-message-flags-set
+	  imap-message-flags-del
+	  imap-message-flags-add
+	  imap-message-copyuid-1
+	  imap-message-copyuid
+	  imap-message-copy
+	  imap-message-appenduid-1
+	  imap-message-appenduid
+	  imap-message-append
+	  imap-body-lines
+	  imap-envelope-from
+	  imap-send-command-1
+	  imap-send-command
+	  imap-wait-for-tag
+	  imap-sentinel
+	  imap-find-next-line
+	  imap-arrival-filter
+	  imap-parse-greeting
+	  imap-parse-response
+	  imap-parse-resp-text
+	  imap-parse-resp-text-code
+	  imap-parse-data-list
+	  imap-parse-fetch
+	  imap-parse-status
+	  imap-parse-acl
+	  imap-parse-flag-list
+	  imap-parse-envelope
+	  imap-parse-body-extension
+	  imap-parse-body
+	  )))
+
 (provide 'imap)
 
 ;;; imap.el ends here
------------------------------------------------------------
revno: 101439
committer: Juanma Barranquero <lekktu@gmail.com>
branch nick: trunk
timestamp: Tue 2010-09-14 22:32:35 +0200
message:
  Fix typos in comments and ChangeLogs.
diff:
=== modified file 'admin/unidata/unidata-gen.el'
--- admin/unidata/unidata-gen.el	2010-01-13 08:35:10 +0000
+++ admin/unidata/unidata-gen.el	2010-09-14 20:32:35 +0000
@@ -95,7 +95,7 @@
     (with-temp-buffer
       ;; Insert a file of this format:
       ;;   (CHAR NAME CATEGORY ...)
-      ;; where CHAR is a charater code, the following elements are strings
+      ;; where CHAR is a character code, the following elements are strings
       ;; representing character properties.
       (insert-file-contents unidata-text-file)
       (goto-char (point-min))

=== modified file 'lisp/international/ucs-normalize.el'
--- lisp/international/ucs-normalize.el	2010-01-13 08:35:10 +0000
+++ lisp/international/ucs-normalize.el	2010-09-14 20:32:35 +0000
@@ -100,7 +100,7 @@
 ;; D. Sorting and Composition  of Smaller Blocks (`ucs-normalize-block-compose-chars')
 ;;
 ;;    The block will be split to multiple samller blocks by starter
-;;    charcters.  Each block is sorted, and composed if necessary.
+;;    characters.  Each block is sorted, and composed if necessary.
 ;;
 ;; E. Composition of Entire Block (`ucs-normalize-compose-chars')
 ;;

=== modified file 'lisp/language/hebrew.el'
--- lisp/language/hebrew.el	2010-08-10 01:20:58 +0000
+++ lisp/language/hebrew.el	2010-09-14 20:32:35 +0000
@@ -88,14 +88,14 @@
 ;; corresponding glyph of FONT-OBJECT.
 (defun hebrew-font-get-precomposed (font-object)
   (let ((precomposed (font-get font-object 'hebrew-precomposed))
-	;; Vector of Hebrew precomposed charaters.
+	;; Vector of Hebrew precomposed characters.
 	(chars [#xFB2A #xFB2B #xFB2C #xFB2D #xFB2E #xFB2F #xFB30 #xFB31
 		#xFB32 #xFB33 #xFB34 #xFB35 #xFB36 #xFB38 #xFB39 #xFB3A
 		#xFB3B #xFB3C #xFB3E #xFB40 #xFB41 #xFB43 #xFB44 #xFB46
 		#xFB47 #xFB48 #xFB49 #xFB4A #xFB4B #xFB4C #xFB4D #xFB4E])
 	;; Vector of decomposition character sequences corresponding
 	;; to the above vector.
-	(decomposed 
+	(decomposed
 	 [[#x05E9 #x05C1]
 	  [#x05E9 #x05C2]
 	  [#x05E9 #x05BC #x05C1]

=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-09-14 20:17:28 +0000
+++ src/ChangeLog	2010-09-14 20:32:35 +0000
@@ -20307,7 +20307,7 @@
 
 	* search.c (search_buffer): Give up BM search on case-fold-search
 	if one of a target character has a case-equivalence of different
-	byte length even if that target charcter is an ASCII.
+	byte length even if that target character is an ASCII.
 	(simple_search): Fix calculation of byte length of matched text.
 	(boyer_moore): Fix handling of case-equivalent multibyte characters.
 

=== modified file 'src/ChangeLog.10'
--- src/ChangeLog.10	2010-07-24 11:53:19 +0000
+++ src/ChangeLog.10	2010-09-14 20:32:35 +0000
@@ -6914,7 +6914,7 @@
 
 	* search.c (search_buffer): Give up BM search on case-fold-search
 	if one of a target character has a case-equivalence of different
-	charset even if that target charcter is an ASCII.
+	charset even if that target character is an ASCII.
 
 	* casefiddle.c (casify_object): Fix for the case that case
 	conversion change the byte length.

=== modified file 'src/ChangeLog.8'
--- src/ChangeLog.8	2010-05-28 03:52:19 +0000
+++ src/ChangeLog.8	2010-09-14 20:32:35 +0000
@@ -13869,10 +13869,10 @@
 1998-08-31  Kenichi Handa  <handa@etl.go.jp>
 
 	* charset.c (unibyte_char_to_multibyte):
-	Vnonacii_translation_table will convert a 7-bit charcater.
+	Vnonacii_translation_table will convert a 7-bit character.
 	(multibyte_char_to_unibyte): Handle the case that
-	Vnonacii_translation_table converts a multibyte charcater to a
-	unibyte charcter of less than 128.
+	Vnonacii_translation_table converts a multibyte character to a
+	unibyte character of less than 128.
 	(init_charset_once): Initialize nonascii_insert_offset and
 	Vnonacii_translation_table.
 

=== modified file 'src/buffer.c'
--- src/buffer.c	2010-08-09 09:35:21 +0000
+++ src/buffer.c	2010-09-14 20:32:35 +0000
@@ -2345,7 +2345,7 @@
 	    {
 	      c = STRING_CHAR_AND_LENGTH (p, bytes);
 	      /* Delete all bytes for this 8-bit character but the
-		 last one, and change the last one to the charcter
+		 last one, and change the last one to the character
 		 code.  */
 	      bytes--;
 	      del_range_2 (pos, pos, pos + bytes, pos + bytes, 0);

=== modified file 'src/charset.c'
--- src/charset.c	2010-08-08 21:15:44 +0000
+++ src/charset.c	2010-09-14 20:32:35 +0000
@@ -427,7 +427,7 @@
 
 
 /* Read a hexadecimal number (preceded by "0x") from the file FP while
-   paying attention to comment charcter '#'.  */
+   paying attention to comment character '#'.  */
 
 static INLINE unsigned
 read_hex (FILE *fp, int *eof)

=== modified file 'src/editfns.c'
--- src/editfns.c	2010-08-09 09:35:21 +0000
+++ src/editfns.c	2010-09-14 20:32:35 +0000
@@ -3517,7 +3517,7 @@
   int multibyte = 0;
   /* When we make a multibyte string, we must pay attention to the
      byte combining problem, i.e., a byte may be combined with a
-     multibyte charcter of the previous string.  This flag tells if we
+     multibyte character of the previous string.  This flag tells if we
      must consider such a situation or not.  */
   int maybe_combine_byte;
   unsigned char *this_format;
------------------------------------------------------------
revno: 101438
committer: Juanma Barranquero <lekktu@gmail.com>
branch nick: trunk
timestamp: Tue 2010-09-14 22:17:28 +0200
message:
  src/cmds.c (syms_of_cmds) <post-self-insert-hook>: Fix typos in docstring.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-09-14 18:37:26 +0000
+++ src/ChangeLog	2010-09-14 20:17:28 +0000
@@ -1,6 +1,10 @@
+2010-09-14  Juanma Barranquero  <lekktu@gmail.com>
+
+	* cmds.c (syms_of_cmds) <post-self-insert-hook>: Fix typos in docstring.
+
 2010-09-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-	* xml.c (parse_string): Renamed to parse_string(), since that's
+	* xml.c (parse_buffer): Renamed to parse_string(), since that's
 	what it does.
 	(parse_string): Return nil when the document can't be parsed.
 
@@ -141,7 +145,7 @@
 	(x_produce_glyphs): Simplify by using the same code for ASCII and
 	non-ASCII characters.  Don't set it->char_to_display here.
 	Don't handle unibyte-display-via-language-environment here.  For a
-	charater of no glyph, use font->space_width instead of FONT_WIDTH.
+	character of no glyph, use font->space_width instead of FONT_WIDTH.
 
 2010-08-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 

=== modified file 'src/cmds.c'
--- src/cmds.c	2010-09-01 14:41:17 +0000
+++ src/cmds.c	2010-09-14 20:17:28 +0000
@@ -524,7 +524,7 @@
 
   DEFVAR_LISP ("post-self-insert-hook", &Vpost_self_insert_hook,
 	       doc: /* Hook run at the end of `self-insert-command'.
-This run is run after inserting the charater.  */);
+This is run after inserting the character.  */);
   Vpost_self_insert_hook = Qnil;
 
   defsubr (&Sforward_point);
------------------------------------------------------------
revno: 101437
committer: Lars Magne Ingebrigtsen <larsi@gnus.org>
branch nick: trunk
timestamp: Tue 2010-09-14 20:37:26 +0200
message:
  * xml.c (parse_string): Renamed to parse_string(), since that's
  what it does.
  (parse_string): Return nil when the document can't be parsed.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-09-14 14:41:53 +0000
+++ src/ChangeLog	2010-09-14 18:37:26 +0000
@@ -1,3 +1,9 @@
+2010-09-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* xml.c (parse_string): Renamed to parse_string(), since that's
+	what it does.
+	(parse_string): Return nil when the document can't be parsed.
+
 2010-09-14  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* xterm.c (get_current_vm_state): New function.

=== modified file 'src/xml.c'
--- src/xml.c	2010-09-14 07:53:39 +0000
+++ src/xml.c	2010-09-14 18:37:26 +0000
@@ -69,11 +69,11 @@
 }
 
 static Lisp_Object
-parse_buffer (Lisp_Object string, Lisp_Object base_url, int htmlp)
+parse_string (Lisp_Object string, Lisp_Object base_url, int htmlp)
 {
   xmlDoc *doc;
   xmlNode *node;
-  Lisp_Object result;
+  Lisp_Object result = Qnil;
   int ibeg, iend;
   char *burl = "";
 
@@ -114,7 +114,7 @@
 the HTML document.  */)
   (Lisp_Object string, Lisp_Object base_url)
 {
-  return parse_buffer (string, base_url, 1);
+  return parse_string (string, base_url, 1);
 }
 
 DEFUN ("xml-parse-string", Fxml_parse_string, Sxml_parse_string,
@@ -124,7 +124,7 @@
 the XML document.  */)
   (Lisp_Object string, Lisp_Object base_url)
 {
-  return parse_buffer (string, base_url, 0);
+  return parse_string (string, base_url, 0);
 }
------------------------------------------------------------
revno: 101436
committer: Juanma Barranquero <lekktu@gmail.com>
branch nick: trunk
timestamp: Tue 2010-09-14 16:59:42 +0200
message:
  Explicitly pass `obarray' to `unintern' to avoid a warning.
  
  * gnus/gnus-registry.el (gnus-registry-install-shortcuts)
  * obsolete/old-whitespace.el (whitespace-unload-function)
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-14 14:41:53 +0000
+++ lisp/ChangeLog	2010-09-14 14:59:42 +0000
@@ -1,3 +1,8 @@
+2010-09-14  Juanma Barranquero  <lekktu@gmail.com>
+
+	* obsolete/old-whitespace.el (whitespace-unload-function):
+	Explicitly pass `obarray' to `unintern' to avoid a warning.
+
 2010-09-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/byte-run.el (set-advertised-calling-convention):

=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-14 13:44:44 +0000
+++ lisp/gnus/ChangeLog	2010-09-14 14:59:42 +0000
@@ -1,3 +1,8 @@
+2010-09-14  Juanma Barranquero  <lekktu@gmail.com>
+
+	* gnus-registry.el (gnus-registry-install-shortcuts):
+	Explicitly pass `obarray' to `unintern' to avoid a warning.
+
 2010-09-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus-start.el (gnus-read-active-for-groups): Reverted the previous

=== modified file 'lisp/gnus/gnus-registry.el'
--- lisp/gnus/gnus-registry.el	2010-09-02 01:42:32 +0000
+++ lisp/gnus/gnus-registry.el	2010-09-14 14:59:42 +0000
@@ -783,7 +783,7 @@
 		  (function-name (format function-format variant-name))
 		  (shortcut (format "%c" data))
 		  (shortcut (if remove (upcase shortcut) shortcut)))
-	     (unintern function-name)
+	     (unintern function-name obarray)
 	     (eval
 	      `(defun
 		 ;; function name

=== modified file 'lisp/obsolete/old-whitespace.el'
--- lisp/obsolete/old-whitespace.el	2010-01-13 08:35:10 +0000
+++ lisp/obsolete/old-whitespace.el	2010-09-14 14:59:42 +0000
@@ -788,7 +788,7 @@
 
 (defun whitespace-unload-function ()
   "Unload the whitespace library."
-  (if (unintern "whitespace-unload-hook")
+  (if (unintern "whitespace-unload-hook" obarray)
       ;; if whitespace-unload-hook is defined, let's get rid of it
       ;; and recursively call `unload-feature'
       (progn (unload-feature 'whitespace) t)
------------------------------------------------------------
revno: 101435 [merge]
committer: Juanma Barranquero <lekktu@gmail.com>
branch nick: trunk
timestamp: Tue 2010-09-14 16:41:53 +0200
message:
  Merge changes from emacs-23 branch.
diff:
=== modified file 'doc/emacs/ChangeLog'
--- doc/emacs/ChangeLog	2010-09-09 02:12:40 +0000
+++ doc/emacs/ChangeLog	2010-09-14 14:41:53 +0000
@@ -1,3 +1,19 @@
+2010-09-14  Glenn Morris  <rgm@gnu.org>
+
+	* cal-xtra.texi (Fancy Diary Display): Emphasize that sort should be
+	the last hook item.
+
+	* calendar.texi (Appointments): Also updated when a diary include file
+	is saved.
+
+2010-09-14  Glenn Morris  <rgm@gnu.org>
+
+	* trouble.texi (Bugs): Update the section intro.
+	(Known Problems): New section.
+	(Checklist): Misc updates.  Prefer M-x report-emacs-bug.
+	(Sending Patches): Bug fixes are best as responses to existing bugs.
+	* emacs.texi (Known Problems): Add menu entry for new section.
+
 2010-09-09  Glenn Morris  <rgm@gnu.org>
 
 	* xresources.texi: Untabify.

=== modified file 'doc/emacs/cal-xtra.texi'
--- doc/emacs/cal-xtra.texi	2010-01-13 08:35:10 +0000
+++ doc/emacs/cal-xtra.texi	2010-09-14 08:02:28 +0000
@@ -613,7 +613,9 @@
 @noindent
 For each day, this sorts diary entries that begin with a recognizable
 time of day according to their times.  Diary entries without times come
-first within each day.
+first within each day.  Note how the sort command is placed at the end
+of the hook list, in case earlier members of the list change the order
+of the diary entries, or add items.
 
 @vindex diary-include-string
   Your main diary file can include other files.  This permits a group of

=== modified file 'doc/emacs/calendar.texi'
--- doc/emacs/calendar.texi	2010-06-23 02:46:43 +0000
+++ doc/emacs/calendar.texi	2010-09-14 07:34:23 +0000
@@ -1508,7 +1508,14 @@
 time by re-enabling appointment notification.  Both these actions also
 display the day's diary buffer, unless you set
 @code{appt-display-diary} to @code{nil}.  The appointments list is
-also updated whenever the diary file is saved.
+also updated whenever the diary file (or a file it includes; see
+@iftex
+@inforef{Fancy Diary Display,, emacs-xtra})
+@end iftex
+@ifnottex
+@ref{Fancy Diary Display})
+@end ifnottex
+is saved.
 
 @findex appt-add
 @findex appt-delete

=== modified file 'doc/emacs/emacs.texi'
--- doc/emacs/emacs.texi	2010-07-10 18:52:53 +0000
+++ doc/emacs/emacs.texi	2010-09-14 14:41:53 +0000
@@ -1137,6 +1137,7 @@
 
 Reporting Bugs
 
+* Known Problems::      How to read about known problems and bugs.
 * Bug Criteria::        Have you really found a bug?
 * Understanding Bug Reporting:: How to report a bug effectively.
 * Checklist::           Steps to follow for a good bug report.

=== modified file 'doc/emacs/trouble.texi'
--- doc/emacs/trouble.texi	2010-06-23 02:46:43 +0000
+++ doc/emacs/trouble.texi	2010-09-12 00:31:47 +0000
@@ -409,29 +409,76 @@
 @section Reporting Bugs
 
 @cindex bugs
-  Sometimes you will encounter a bug in Emacs.  Although we cannot
-promise we can or will fix the bug, and we might not even agree that it
-is a bug, we want to hear about problems you encounter.  Often we agree
-they are bugs and want to fix them.
-
-  To make it possible for us to fix a bug, you must report it.  In order
-to do so effectively, you must know when and how to do it.
-
-  Before reporting a bug, it is a good idea to see if it is already
-known.  You can find the list of known problems in the file
-@file{etc/PROBLEMS} in the Emacs distribution; type @kbd{C-h C-p} to read
-it.  Some additional user-level problems can be found in @ref{Bugs and
-problems, , Bugs and problems, efaq, GNU Emacs FAQ}.  Looking up your
-problem in these two documents might provide you with a solution or a
-work-around, or give you additional information about related issues.
+  If you think you have found a bug in Emacs, please report it.  We
+cannot promise to fix it, or always to agree that it is a bug, but we
+certainly want to hear about it.  The same applies for new features
+you would like to see added.  The following sections will help you to
+construct an effective bug report.
 
 @menu
+* Known Problems::               How to read about known problems and bugs.
 * Criteria:  Bug Criteria.       Have you really found a bug?
 * Understanding Bug Reporting::  How to report a bug effectively.
 * Checklist::                    Steps to follow for a good bug report.
 * Sending Patches::              How to send a patch for GNU Emacs.
 @end menu
 
+@node Known Problems
+@subsection Reading Existing Bug Reports and Known Problems
+
+  Before reporting a bug, if at all possible please check to see if it
+is already known about.  Indeed, it may already have been fixed in a
+later release of Emacs, or in the development version.  Here is a list
+of the main places you can read about known issues:
+
+@itemize
+@item
+The @file{etc/PROBLEMS} file in the Emacs distribution; type @kbd{C-h
+C-p} to read it.  This file contains a list of particularly well-known
+issues that have been encountered in compiling, installing and running
+Emacs.  Often, there are suggestions for workarounds and solutions.
+
+@item
+Some additional user-level problems can be found in @ref{Bugs and
+problems, , Bugs and problems, efaq, GNU Emacs FAQ}.
+
+@item
+The @samp{bug-gnu-emacs} mailing list (also available as the newsgroup
+@samp{gnu.emacs.bug}).  This is where you will find most Emacs bug
+reports.  You can read the list archives at
+@url{http://lists.gnu.org/mailman/listinfo/bug-gnu-emacs}.  If you
+like, you can also subscribe to the list.  Be aware that the sole
+purpose of this list is to provide the Emacs maintainers with
+information about bugs and feature requests.  Reports may contain
+fairly large amounts of data; spectators should not complain about
+this.
+
+@item
+The bug tracker at @url{http://debbugs.gnu.org}.  From early 2008,
+reports from the @samp{bug-gnu-emacs} list have been sent here.  The
+tracker contains the same information as the mailing list, just in a
+different format.  You may prefer to browse and read reports using the
+tracker.
+
+@item
+The @samp{emacs-pretest-bug} mailing list.  This list is no longer
+used, and is mainly of historical interest.  At one time, it was used
+for bug reports in development (i.e., not yet released) versions of
+Emacs.  You can read the archives for 2003 to mid 2007 at
+@url{http://lists.gnu.org/archive/html/emacs-pretest-bug/}.  From
+late 2007 to mid 2008, the address was an alias for the
+@samp{emacs-devel} mailing list.  From mid 2008 onwards, it has been
+an alias for @samp{bug-gnu-emacs}.
+
+@item
+The @samp{emacs-devel} mailing list.  Sometimes people report bugs to
+this mailing list.  This is not the main purpose of the list, however,
+and it is much better to send bug reports to the bug list.  You should
+not feel obliged to read this list before reporting a bug.
+
+@end itemize
+
+
 @node Bug Criteria
 @subsection When Is There a Bug
 
@@ -540,56 +587,81 @@
 @subsection Checklist for Bug Reports
 
 @cindex reporting bugs
-  The best way to send a bug report is to mail it electronically to the
-Emacs maintainers at @email{bug-gnu-emacs@@gnu.org}.  (If you want to
-suggest a change as an improvement, use the same address.)
-
-  If you'd like to read the bug reports, you can find them on the
-newsgroup @samp{gnu.emacs.bug}; keep in mind, however, that as a
-spectator you should not criticize anything about what you see there.
-The purpose of bug reports is to give information to the Emacs
-maintainers.  Spectators are welcome only as long as they do not
-interfere with this.  In particular, some bug reports contain fairly
-large amounts of data; spectators should not complain about this.
-
-  Please do not post bug reports using netnews; mail is more reliable
-than netnews about reporting your correct address, which we may need
-in order to ask you for more information.  If your data is more than
-500,000 bytes, please don't include it directly in the bug report;
-instead, offer to send it on request, or make it available by ftp and
-say where.
+
+  Before reporting a bug, first try to see if the problem has already
+been reported (@pxref{Known Problems}).
+
+If you are able to, try the latest release of Emacs to see if the
+problem has already been fixed.  Even better is to try the latest
+development version.  We recognize that this is not easy for some
+people, so do not feel that you absolutely must do this before making
+a report.
 
 @findex report-emacs-bug
-  A convenient way to send a bug report for Emacs is to use the command
-@kbd{M-x report-emacs-bug}.  This sets up a mail buffer (@pxref{Sending
-Mail}) and automatically inserts @emph{some} of the essential
-information.  However, it cannot supply all the necessary information;
-you should still read and follow the guidelines below, so you can enter
-the other crucial information by hand before you send the message.
+  The best way to write a bug report for Emacs is to use the command
+@kbd{M-x report-emacs-bug}.  This sets up a mail buffer
+(@pxref{Sending Mail}) and automatically inserts @emph{some} of the
+essential information.  However, it cannot supply all the necessary
+information; you should still read and follow the guidelines below, so
+you can enter the other crucial information by hand before you send
+the message.  You may feel that some of the information inserted by
+@kbd{M-x report-emacs-bug} is not relevant, but unless you are
+absolutely sure it is best to leave it, so that the developers can
+decide for themselves.
+
+When you have finished writing your report, type @kbd{C-c C-c} and it
+will be sent to the Emacs maintainers at @email{bug-gnu-emacs@@gnu.org}.
+(If you want to suggest an improvement or new feature, use the same
+address.)  If you cannot send mail from inside Emacs, you can copy the
+text of your report to your normal mail client and send it to that
+address.  Or you can simply send an email to that address describing
+the problem.
+
+Your report will be sent to the @samp{bug-gnu-emacs} mailing list, and
+stored in the tracker at @url{http://debbugs.gnu.org}.  Please try to
+include a valid reply email address, in case we need to ask you for
+more information about your report.  Submissions are moderated, so
+there may be a delay before your report appears.
+
+You do not need to know how the @url{http://debbugs.gnu.org} bug
+tracker works in order to report a bug, but if you want to, you can
+read the tracker's online documentation to see the various features
+you can use.
+
+All mail sent to the @samp{bug-gnu-emacs} mailing list is also
+gatewayed to the @samp{bug.gnu.emacs} newsgroup.  The reverse is also
+true, but we ask you not to post bug reports via the newsgroup.  It
+can make it much harder to contact you if we need to ask for more
+information, and it does not integrate well with the bug tracker.
+
+If your data is more than 500,000 bytes, please don't include it
+directly in the bug report; instead, offer to send it on request, or
+make it available by ftp and say where.
 
   To enable maintainers to investigate a bug, your report
 should include all these things:
 
 @itemize @bullet
 @item
-The version number of Emacs.  Without this, we won't know whether there
-is any point in looking for the bug in the current version of GNU
-Emacs.
+The version number of Emacs.  Without this, we won't know whether there is any
+point in looking for the bug in the current version of GNU Emacs.
 
-You can get the version number by typing @kbd{M-x emacs-version
-@key{RET}}.  If that command does not work, you probably have something
-other than GNU Emacs, so you will have to report the bug somewhere
-else.
+@kbd{M-x report-emacs-bug} includes this information automatically,
+but if you are not using that command for your report you can get the
+version number by typing @kbd{M-x emacs-version @key{RET}}.  If that
+command does not work, you probably have something other than GNU
+Emacs, so you will have to report the bug somewhere else.
 
 @item
 The type of machine you are using, and the operating system name and
-version number.  @kbd{M-x emacs-version @key{RET}} provides this
-information too.  Copy its output from the @samp{*Messages*} buffer, so
-that you get it all and get it accurately.
+version number (again, automatically included by @kbd{M-x
+report-emacs-bug}).  @kbd{M-x emacs-version @key{RET}} provides this
+information too.  Copy its output from the @samp{*Messages*} buffer,
+so that you get it all and get it accurately.
 
 @item
 The operands given to the @code{configure} command when Emacs was
-installed.
+installed (automatically included by @kbd{M-x report-emacs-bug}).
 
 @item
 A complete list of any modifications you have made to the Emacs source.
@@ -619,12 +691,15 @@
 
 @item
 The precise commands we need to type to reproduce the bug.
+If at all possible, give a full recipe for an Emacs started with the
+@samp{-Q} option (@pxref{Initial Options}).  This bypasses your
+@file{.emacs} customizations.
 
 @findex open-dribble-file
 @cindex dribble file
 @cindex logging keystrokes
-The easy way to record the input to Emacs precisely is to write a
-dribble file.  To start the file, execute the Lisp expression
+One way to record the input to Emacs precisely is to write a dribble
+file.  To start the file, execute the Lisp expression
 
 @example
 (open-dribble-file "~/dribble")
@@ -735,7 +810,7 @@
 including your @file{.emacs} file, set any variables that may affect the
 functioning of Emacs.  Also, see whether the problem happens in a
 freshly started Emacs without loading your @file{.emacs} file (start
-Emacs with the @code{-q} switch to prevent loading the init file).  If
+Emacs with the @code{-Q} switch to prevent loading the init files).  If
 the problem does @emph{not} occur then, you must report the precise
 contents of any programs that you must load into the Lisp world in order
 to cause the problem to occur.
@@ -907,12 +982,10 @@
 @itemize @bullet
 @item
 Send an explanation with your changes of what problem they fix or what
-improvement they bring about.  For a bug fix, just include a copy of the
-bug report, and explain why the change fixes the bug.
-
-(Referring to a bug report is not as good as including it, because then
-we will have to look it up, and we have probably already deleted it if
-we've already fixed the bug.)
+improvement they bring about.  For a fix for an existing bug, it is
+best to reply to the relevant discussion on the @samp{bug-gnu-emacs}
+list, or item in the @url{http://debbugs.gnu.org} tracker.  Explain
+why your change fixes the bug.
 
 @item
 Always include a proper bug report for the problem you think you have

=== modified file 'etc/NEWS.23'
--- etc/NEWS.23	2010-06-16 20:08:41 +0000
+++ etc/NEWS.23	2010-09-14 14:41:53 +0000
@@ -40,6 +40,8 @@
 
 * Lisp changes in Emacs 23.3
 
+** The use of unintern without an obarray arg is declared obsolete.
+
 ** New function byte-to-string, like char-to-string but for bytes.
 
 

=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-14 06:01:14 +0000
+++ lisp/ChangeLog	2010-09-14 14:41:53 +0000
@@ -1,3 +1,72 @@
+2010-09-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* emacs-lisp/byte-run.el (set-advertised-calling-convention):
+	Add `when' argument.  Update callers.
+
+	* subr.el (unintern): Declare the obarray arg mandatory.
+
+2010-09-14  Glenn Morris  <rgm@gnu.org>
+
+	* calendar/diary-lib.el (diary-list-entries-hook, diary-sort-entries):
+	Doc fixes.
+
+	* calendar/diary-lib.el (diary-included-files): New variable.
+	(diary-list-entries): Maybe initialize diary-included-files.
+	(diary-include-other-diary-files): Append to diary-included-files.
+	* calendar/appt.el (appt-update-list): Also check the members of
+	diary-included-files.  (Bug#6999)
+	(appt-check): Doc fix.
+
+2010-09-14  David Reitter  <david.reitter@gmail.com>
+
+	* simple.el (line-move-visual): Do not truncate goal column to
+	integer size.  (Bug#7020)
+
+2010-09-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* repeat.el (repeat): Allow repeating when the last event is a click.
+	Suggested by Drew Adams (bug#6256).
+
+2010-09-14  Sascha Wilde  <wilde@sha-bang.de>
+
+	* vc/vc-hg.el (vc-hg-state,vc-hg-working-revision):
+	Replace setting HGRCPATH to "" by some less invasive --config options.
+
+2010-09-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* font-lock.el (font-lock-beginning-of-syntax-function):
+	Mark as obsolete.
+
+2010-09-14  Glenn Morris  <rgm@gnu.org>
+
+	* menu-bar.el (menu-bar-options-save): Fix handling of menu-bar
+	and tool-bar modes.  (Bug#6211)
+	(menu-bar-mode): Move setting of standard-value after the
+	minor-mode definition, otherwise it seems to have no effect.
+
+2010-09-14  Masatake YAMATO  <yamato@redhat.com>
+
+	* progmodes/antlr-mode.el (antlr-font-lock-additional-keywords):
+	Fix typo.  (Bug#6976)
+
+2010-09-14  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+	* whitespace.el: Allow cleaning up blanks without blank
+	visualization (Bug#6651).  Adjust help window for
+	whitespace-toggle-options (Bug#6479).  Allow to use fill-column
+	instead of whitespace-line-column (from EmacsWiki).  New version 13.1.
+	(whitespace-style): Add new value 'face.  Adjust docstring.
+	(whitespace-space, whitespace-hspace, whitespace-tab):
+	Adjust foreground property face.
+	(whitespace-line-column): Adjust docstring and type declaration.
+	(whitespace-style-value-list, whitespace-toggle-option-alist)
+	(whitespace-help-text): Adjust const initialization.
+	(whitespace-toggle-options, global-whitespace-toggle-options):
+	Adjust docstring.
+	(whitespace-display-window, whitespace-interactive-char)
+	(whitespace-style-face-p, whitespace-color-on): Adjust code.
+	(whitespace-help-scroll): New fun.
+
 2010-09-14  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* calendar/time-date.el (format-seconds): Comment fix.
@@ -116,7 +185,7 @@
 	(tramp-get-remote-readlink, tramp-get-remote-trash)
 	(tramp-get-remote-id, tramp-get-remote-uid, tramp-get-remote-gid)
 	(tramp-get-local-uid, tramp-get-local-gid)
-	(tramp-get-inline-compress, tramp-get-inline-coding, ): Move to
+	(tramp-get-inline-compress, tramp-get-inline-coding): Move to
 	tramp-sh.el.
 	(tramp-methods, tramp-default-method-alist)
 	(tramp-default-user-alist, tramp-foreign-file-name-handler-alist):

=== modified file 'lisp/calendar/appt.el'
--- lisp/calendar/appt.el	2010-08-29 16:17:13 +0000
+++ lisp/calendar/appt.el	2010-09-14 14:41:53 +0000
@@ -48,8 +48,9 @@
 ;; package is activated.  Additionally, the appointments list is
 ;; recreated automatically at 12:01am for those who do not logout
 ;; every day or are programming late.  It is also updated when the
-;; `diary-file' is saved.  Calling `appt-check' with an argument (or
-;; re-enabling the package) forces a re-initialization at any time.
+;; `diary-file' (or a file it includes) is saved.  Calling
+;; `appt-check' with an argument (or re-enabling the package) forces a
+;; re-initialization at any time.
 ;;
 ;; In order to add or delete items from today's list, without
 ;; changing the diary file, use `appt-add' and `appt-delete'.
@@ -262,7 +263,7 @@
   "Check for an appointment and update any reminder display.
 If optional argument FORCE is non-nil, reparse the diary file for
 appointments.  Otherwise the diary file is only parsed once per day,
-and when saved.
+or when it (or a file it includes) is saved.
 
 Note: the time must be the first thing in the line in the diary
 for a warning to be issued.  The format of the time can be either
@@ -346,6 +347,8 @@
                           (if d-buff    ; diary buffer exists
                               (with-current-buffer d-buff
                                 diary-selective-display))))
+                    ;; FIXME why not using diary-list-entries with
+                    ;; non-nil LIST-ONLY?
                     (diary)
                     ;; If the diary buffer existed before this command,
                     ;; restore its display state.  Otherwise, kill it.
@@ -643,8 +646,10 @@
 
 (defun appt-update-list ()
   "If the current buffer is visiting the diary, update appointments.
-This function is intended for use with `write-file-functions'."
-  (and (string-equal buffer-file-name (expand-file-name diary-file))
+This function also acts on any file listed in `diary-included-files'.
+It is intended for use with `write-file-functions'."
+  (and (member buffer-file-name (append diary-included-files
+                                        (list (expand-file-name diary-file))))
        appt-timer
        (let ((appt-display-diary nil))
          (appt-check t)))

=== modified file 'lisp/calendar/diary-lib.el'
--- lisp/calendar/diary-lib.el	2010-08-14 02:23:56 +0000
+++ lisp/calendar/diary-lib.el	2010-09-14 08:02:28 +0000
@@ -187,11 +187,12 @@
 
      (setq diary-display-function 'diary-fancy-display)
      (add-hook 'diary-list-entries-hook 'diary-include-other-diary-files)
-     (add-hook 'diary-list-entries-hook 'diary-sort-entries)
+     (add-hook 'diary-list-entries-hook 'diary-sort-entries t)
 
 in your `.emacs' file to cause the fancy diary buffer to be displayed with
 diary entries from various included files, each day's entries sorted into
-lexicographic order."
+lexicographic order.  Note how the sort function is placed last,
+so that it can sort the entries included from other files."
   :type 'hook
   :options '(diary-include-other-diary-files diary-sort-entries)
   :group 'diary)
@@ -699,6 +700,10 @@
              (1+ (calendar-absolute-from-gregorian gdate))))))
   (goto-char (point-min)))
 
+(defvar diary-including) ; dynamically bound in diary-include-other-diary-files
+(defvar diary-included-files nil
+  "List of any diary files included in the last call to `diary-list-entries'.")
+
 ;; FIXME non-greg and list hooks run same number of times?
 (defun diary-list-entries (date number &optional list-only)
   "Create and display a buffer containing the relevant lines in `diary-file'.
@@ -743,6 +748,8 @@
            (date-string (calendar-date-string date))
            (diary-buffer (find-buffer-visiting diary-file))
            diary-entries-list file-glob-attrs)
+      (or (bound-and-true-p diary-including)
+          (setq diary-included-files nil))
       (message "Preparing diary...")
       (save-current-buffer
         (if (not diary-buffer)
@@ -828,11 +835,15 @@
     (let ((diary-file (match-string-no-properties 1))
           (diary-list-entries-hook 'diary-include-other-diary-files)
           (diary-display-function 'ignore)
+          (diary-including t)
           diary-hook diary-list-include-blanks)
       (if (file-exists-p diary-file)
           (if (file-readable-p diary-file)
               (unwind-protect
-                  (setq diary-entries-list
+                  (setq diary-included-files
+                        (append diary-included-files
+                                (list (expand-file-name diary-file)))
+                        diary-entries-list
                         (append diary-entries-list
                                 (diary-list-entries original-date number)))
                 (with-current-buffer (find-buffer-visiting diary-file)
@@ -1574,7 +1585,10 @@
                       (string-lessp ts1 ts2)))))))
 
 (defun diary-sort-entries ()
-  "Sort the list of diary entries by time of day."
+  "Sort the list of diary entries by time of day.
+If you add this function to `diary-list-entries-hook', it should
+be the last item in the hook, in case earlier items add diary
+entries, or change the order."
   (setq diary-entries-list (sort diary-entries-list 'diary-entry-compare)))
 
 (define-obsolete-function-alias 'sort-diary-entries 'diary-sort-entries "23.1")

=== modified file 'lisp/emacs-lisp/byte-run.el'
--- lisp/emacs-lisp/byte-run.el	2010-08-30 13:03:05 +0000
+++ lisp/emacs-lisp/byte-run.el	2010-09-14 14:41:53 +0000
@@ -108,10 +108,11 @@
 
 (defvar advertised-signature-table (make-hash-table :test 'eq :weakness 'key))
 
-(defun set-advertised-calling-convention (function signature)
+(defun set-advertised-calling-convention (function signature when)
   "Set the advertised SIGNATURE of FUNCTION.
 This will allow the byte-compiler to warn the programmer when she uses
-an obsolete calling convention."
+an obsolete calling convention.  WHEN specifies since when the calling
+convention was modified."
   (puthash (indirect-function function) signature
            advertised-signature-table))
 
@@ -132,7 +133,7 @@
   obsolete-name)
 (set-advertised-calling-convention
  ;; New code should always provide the `when' argument.
- 'make-obsolete '(obsolete-name current-name when))
+ 'make-obsolete '(obsolete-name current-name when) "23.1")
 
 (defmacro define-obsolete-function-alias (obsolete-name current-name
 						   &optional when docstring)
@@ -153,7 +154,7 @@
 (set-advertised-calling-convention
  ;; New code should always provide the `when' argument.
  'define-obsolete-function-alias
- '(obsolete-name current-name when &optional docstring))
+ '(obsolete-name current-name when &optional docstring) "23.1")
 
 (defun make-obsolete-variable (obsolete-name current-name &optional when)
   "Make the byte-compiler warn that OBSOLETE-NAME is obsolete.
@@ -175,7 +176,7 @@
   obsolete-name)
 (set-advertised-calling-convention
  ;; New code should always provide the `when' argument.
- 'make-obsolete-variable '(obsolete-name current-name when))
+ 'make-obsolete-variable '(obsolete-name current-name when) "23.1")
 
 (defmacro define-obsolete-variable-alias (obsolete-name current-name
 						 &optional when docstring)
@@ -210,7 +211,7 @@
 (set-advertised-calling-convention
  ;; New code should always provide the `when' argument.
  'define-obsolete-variable-alias
- '(obsolete-name current-name when &optional docstring))
+ '(obsolete-name current-name when &optional docstring) "23.1")
 
 ;; FIXME This is only defined in this file because the variable- and
 ;; function- versions are too.  Unlike those two, this one is not used

=== modified file 'lisp/font-lock.el'
--- lisp/font-lock.el	2010-09-10 23:13:42 +0000
+++ lisp/font-lock.el	2010-09-14 14:41:53 +0000
@@ -564,6 +564,8 @@
 we recommend setting `syntax-begin-function' instead.
 
 This is normally set via `font-lock-defaults'.")
+(make-obsolete-variable 'font-lock-beginning-of-syntax-function
+                        'syntax-begin-function "23.3")
 
 (defvar font-lock-mark-block-function nil
   "*Non-nil means use this function to mark a block of text.

=== modified file 'lisp/menu-bar.el'
--- lisp/menu-bar.el	2010-08-30 18:11:34 +0000
+++ lisp/menu-bar.el	2010-09-14 14:41:53 +0000
@@ -664,13 +664,23 @@
     ;; put on a customized-value property.
     (dolist (elt '(line-number-mode column-number-mode size-indication-mode
 		   cua-mode show-paren-mode transient-mark-mode
-		   blink-cursor-mode display-time-mode display-battery-mode))
+		   blink-cursor-mode display-time-mode display-battery-mode
+		   ;; These are set by other functions that don't set
+		   ;; the customized state.  Having them here has the
+		   ;; side-effect that turning them off via X
+		   ;; resources acts like having customized them, but
+		   ;; that seems harmless.
+		   menu-bar-mode tool-bar-mode))
+      ;; FIXME ? It's a little annoying that running this command
+      ;; always loads cua-base, paren, time, and battery, even if they
+      ;; have not been customized in any way.  (Due to custom-load-symbol.)
       (and (customize-mark-to-save elt)
 	   (setq need-save t)))
     ;; These are set with `customize-set-variable'.
     (dolist (elt '(scroll-bar-mode
 		   debug-on-quit debug-on-error
-		   tooltip-mode menu-bar-mode tool-bar-mode
+		   ;; Somehow this works, when tool-bar and menu-bar don't.
+		   tooltip-mode
 		   save-place uniquify-buffer-name-style fringe-mode
 		   indicate-empty-lines indicate-buffer-boundaries
 		   case-fold-search font-use-system-font
@@ -2037,6 +2047,16 @@
     (run-with-idle-timer 0 nil 'message
 			 "Menu-bar mode disabled.  Use M-x menu-bar-mode to make the menu bar appear.")))
 
+;;;###autoload
+;; (This does not work right unless it comes after the above definition.)
+;; This comment is taken from tool-bar.el near
+;; (put 'tool-bar-mode ...)
+;; We want to pretend the menu bar by standard is on, as this will make
+;; customize consider disabling the menu bar a customization, and save
+;; that.  We could do this for real by setting :init-value above, but
+;; that would overwrite disabling the menu bar from X resources.
+(put 'menu-bar-mode 'standard-value '(t))
+
 (defun toggle-menu-bar-mode-from-frame (&optional arg)
   "Toggle menu bar on or off, based on the status of the current frame.
 See `menu-bar-mode' for more information."

=== modified file 'lisp/progmodes/antlr-mode.el'
--- lisp/progmodes/antlr-mode.el	2010-08-29 16:17:13 +0000
+++ lisp/progmodes/antlr-mode.el	2010-09-14 14:41:53 +0000
@@ -951,7 +951,7 @@
       (3 antlr-keyword-face)
       (4 (if (member (match-string 4) '("Lexer" "Parser" "TreeParser"))
 	     antlr-keyword-face
-	   type-face)))
+	   font-lock-type-face)))
      (,(lambda (limit)
 	 (antlr-re-search-forward
 	  "\\<\\(header\\|options\\|tokens\\|exception\\|catch\\|returns\\)\\>"

=== modified file 'lisp/repeat.el'
--- lisp/repeat.el	2010-08-29 16:17:13 +0000
+++ lisp/repeat.el	2010-09-14 14:41:53 +0000
@@ -335,7 +335,12 @@
 	(setq real-last-command 'repeat)
 	(setq repeat-undo-count 1)
 	(unwind-protect
-	    (while (eq (read-event) repeat-repeat-char)
+	    (while (let ((evt (read-event))) ;FIXME: read-key maybe?
+                     ;; For clicks, we need to strip the meta-data to
+                     ;; check the underlying event name.
+                     (eq (or (car-safe evt) evt)
+                         (or (car-safe repeat-repeat-char)
+                             repeat-repeat-char)))
 	      (repeat repeat-arg))
 	  ;; Make sure `repeat-undo-count' is reset.
 	  (setq repeat-undo-count nil))

=== modified file 'lisp/simple.el'
--- lisp/simple.el	2010-09-08 16:14:44 +0000
+++ lisp/simple.el	2010-09-14 14:41:53 +0000
@@ -4343,7 +4343,7 @@
     (or (and (= (vertical-motion
 		 (cons (or goal-column
 			   (if (consp temporary-goal-column)
-			       (truncate (car temporary-goal-column))
+			       (car temporary-goal-column)
 			     temporary-goal-column))
 		       arg))
 		arg)

=== modified file 'lisp/subr.el'
--- lisp/subr.el	2010-09-12 14:35:37 +0000
+++ lisp/subr.el	2010-09-14 14:41:53 +0000
@@ -239,7 +239,7 @@
 for the sake of consistency."
   (while t
     (signal 'error (list (apply 'format args)))))
-(set-advertised-calling-convention 'error '(string &rest args))
+(set-advertised-calling-convention 'error '(string &rest args) "23.1")
 
 ;; We put this here instead of in frame.el so that it's defined even on
 ;; systems where frame.el isn't loaded.
@@ -1039,9 +1039,10 @@
 (make-obsolete 'make-variable-frame-local
 	       "explicitly check for a frame-parameter instead." "22.2")
 (make-obsolete 'interactive-p 'called-interactively-p "23.2")
-(set-advertised-calling-convention 'called-interactively-p '(kind))
+(set-advertised-calling-convention 'called-interactively-p '(kind) "23.1")
 (set-advertised-calling-convention
- 'all-completions '(string collection &optional predicate))
+ 'all-completions '(string collection &optional predicate) "23.1")
+(set-advertised-calling-convention 'unintern '(name obarray) "23.3")
 
 ;;;; Obsolescence declarations for variables, and aliases.
 
@@ -2064,7 +2065,7 @@
 		(setq read (cons t read)))
 	    (push read unread-command-events)
 	    nil))))))
-(set-advertised-calling-convention 'sit-for '(seconds &optional nodisp))
+(set-advertised-calling-convention 'sit-for '(seconds &optional nodisp) "22.1")
 
 ;;; Atomic change groups.
 
@@ -2592,7 +2593,7 @@
   (start-process name buffer shell-file-name shell-command-switch
 		 (mapconcat 'identity args " ")))
 (set-advertised-calling-convention 'start-process-shell-command
-                                   '(name buffer command))
+                                   '(name buffer command) "23.1")
 
 (defun start-file-process-shell-command (name buffer &rest args)
   "Start a program in a subprocess.  Return the process object for it.
@@ -2603,7 +2604,7 @@
    (if (file-remote-p default-directory) "-c" shell-command-switch)
    (mapconcat 'identity args " ")))
 (set-advertised-calling-convention 'start-file-process-shell-command
-                                   '(name buffer command))
+                                   '(name buffer command) "23.1")
 
 (defun call-process-shell-command (command &optional infile buffer display
 					   &rest args)

=== modified file 'lisp/url/ChangeLog'
--- lisp/url/ChangeLog	2010-09-11 01:58:42 +0000
+++ lisp/url/ChangeLog	2010-09-14 14:41:53 +0000
@@ -1,3 +1,15 @@
+2010-09-14  Julien Danjou  <julien@danjou.info>
+
+	* url-cache (url-store-in-cache): Make `buff' argument really optional.
+
+2010-09-14  Glenn Morris  <rgm@gnu.org>
+
+	* url-cookie.el (url-cookie-expired-p): Tweak previous change.
+
+2010-09-14  shawn boles  <shawn.boles@gmail.com>  (tiny change)
+
+	* url-cookie.el (url-cookie-expired-p): Simplify and fix.  (Bug#6957)
+
 2010-09-11  Glenn Morris  <rgm@gnu.org>
 
 	* url-cache.el, url-gw.el, url-history.el, url-irc.el, url-util.el:

=== modified file 'lisp/url/url-cache.el'
--- lisp/url/url-cache.el	2010-09-11 01:58:42 +0000
+++ lisp/url/url-cache.el	2010-09-14 14:41:53 +0000
@@ -62,14 +62,11 @@
 ;;;###autoload
 (defun url-store-in-cache (&optional buff)
   "Store buffer BUFF in the cache."
-  (if (not (and buff (get-buffer buff)))
-      nil
-    (save-current-buffer
-      (and buff (set-buffer buff))
-      (let* ((fname (url-cache-create-filename (url-view-url t))))
-	(if (url-cache-prepare fname)
-	    (let ((coding-system-for-write 'binary))
-	      (write-region (point-min) (point-max) fname nil 5)))))))
+    (with-current-buffer (get-buffer (or buff (current-buffer)))
+      (let ((fname (url-cache-create-filename (url-view-url t))))
+        (if (url-cache-prepare fname)
+            (let ((coding-system-for-write 'binary))
+              (write-region (point-min) (point-max) fname nil 5))))))
 
 ;;;###autoload
 (defun url-is-cached (url)

=== modified file 'lisp/url/url-cookie.el'
--- lisp/url/url-cookie.el	2010-01-13 08:35:10 +0000
+++ lisp/url/url-cookie.el	2010-09-09 05:38:43 +0000
@@ -1,7 +1,7 @@
 ;;; url-cookie.el --- Netscape Cookie support
 
-;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004, 2005, 2006, 2007, 2008,
+;;   2009, 2010  Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
@@ -24,7 +24,6 @@
 
 ;;; Code:
 
-(require 'timezone)
 (require 'url-util)
 (require 'url-parse)
 (eval-when-compile (require 'cl))
@@ -194,34 +193,9 @@
 	(setq url-cookie-storage (list (list domain tmp))))))))
 
 (defun url-cookie-expired-p (cookie)
-  (let* (
-	 (exp (url-cookie-expires cookie))
-	 (cur-date (and exp (timezone-parse-date (current-time-string))))
-	 (exp-date (and exp (timezone-parse-date exp)))
-	 (cur-greg (and cur-date (timezone-absolute-from-gregorian
-				  (string-to-number (aref cur-date 1))
-				  (string-to-number (aref cur-date 2))
-				  (string-to-number (aref cur-date 0)))))
-	 (exp-greg (and exp (timezone-absolute-from-gregorian
-			     (string-to-number (aref exp-date 1))
-			     (string-to-number (aref exp-date 2))
-			     (string-to-number (aref exp-date 0)))))
-	 (diff-in-days (and exp (- cur-greg exp-greg)))
-	 )
-    (cond
-     ((not exp)	nil)			; No expiry == expires at browser quit
-     ((< diff-in-days 0) nil)		; Expires sometime after today
-     ((> diff-in-days 0) t)		; Expired before today
-     (t					; Expires sometime today, check times
-      (let* ((cur-time (timezone-parse-time (aref cur-date 3)))
-	     (exp-time (timezone-parse-time (aref exp-date 3)))
-	     (cur-norm (+ (* 360 (string-to-number (aref cur-time 2)))
-			  (*  60 (string-to-number (aref cur-time 1)))
-			  (*   1 (string-to-number (aref cur-time 0)))))
-	     (exp-norm (+ (* 360 (string-to-number (aref exp-time 2)))
-			  (*  60 (string-to-number (aref exp-time 1)))
-			  (*   1 (string-to-number (aref exp-time 0))))))
-	(> (- cur-norm exp-norm) 1))))))
+  "Return non-nil if COOKIE is expired."
+  (let ((exp (url-cookie-expires cookie)))
+    (and exp (> (float-time) (float-time (date-to-time exp))))))
 
 (defun url-cookie-retrieve (host &optional localpart secure)
   "Retrieve all the netscape-style cookies for a specified HOST and LOCALPART."

=== modified file 'lisp/vc/vc-hg.el'
--- lisp/vc/vc-hg.el	2010-08-29 16:17:13 +0000
+++ lisp/vc/vc-hg.el	2010-09-14 14:41:53 +0000
@@ -171,10 +171,12 @@
 		      (let ((process-environment
 			     ;; Avoid localization of messages so we
 			     ;; can parse the output.
-			     (append (list "TERM=dumb" "LANGUAGE=C" "HGRCPATH=")
+			     (append (list "TERM=dumb" "LANGUAGE=C")
 				     process-environment)))
 			(process-file
 			 "hg" nil t nil
+			 "--config" "alias.status=status"
+			 "--config" "defaults.status="
 			 "status" "-A" (file-relative-name file)))
                     ;; Some problem happened.  E.g. We can't find an `hg'
                     ;; executable.
@@ -199,7 +201,7 @@
       ((status nil)
        (default-directory (file-name-directory file))
        ;; Avoid localization of messages so we can parse the output.
-       (avoid-local-env (append (list "TERM=dumb" "LANGUAGE=C" "HGRCPATH=")
+       (avoid-local-env (append (list "TERM=dumb" "LANGUAGE=C")
 				     process-environment))
        (out
         (with-output-to-string
@@ -211,6 +213,8 @@
 			;; Ignore all errors.
 			(process-file
 			 "hg" nil t nil
+			 "--config" "alias.parents=parents"
+			 "--config" "defaults.parents="
 			 "parents" "--template" "{rev}" (file-relative-name file)))
                     ;; Some problem happened.  E.g. We can't find an `hg'
                     ;; executable.

=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-09-14 07:53:39 +0000
+++ src/ChangeLog	2010-09-14 14:41:53 +0000
@@ -1,7 +1,29 @@
+2010-09-14  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* xterm.c (get_current_vm_state): New function.
+	(do_ewmh_fullscreen): Call get_current_vm_state and compare with
+	want_fullscreen so set_wm_state calls are few (Bug#7013).
+	(x_handle_net_wm_state): Move code to get_current_vm_state and
+	call that function.
+
+2010-09-14  Courtney Bane  <emacs-bugs-7626@cbane.org>  (tiny change)
+
+	* term.c (tty_set_terminal_modes): Don't initialize twice (bug#7002).
+
+2010-09-14  Kenichi Handa  <handa@m17n.org>
+
+	* coding.c (encode_coding_iso_2022): Don't optimize for ASCII if
+	we may use designation or locking-shift.
+
+2010-09-14  Kenichi Handa  <handa@m17n.org>
+
+	* coding.c (detect_coding_emacs_mule): Fix checking of multibyte
+	sequence when the source is multibyte.
+
 2010-09-14  Andreas Schwab  <schwab@linux-m68k.org>
 
-	* xml.c (Fxml_parse_string, Fxml_parse_string): Revert last
-	change.  Don't make first argument optional.  Doc fix.
+	* xml.c (Fxml_parse_string, Fxml_parse_string): Revert last change.
+	Don't make first argument optional.  Doc fix.
 
 2010-09-14  Leo  <sdl.web@gmail.com>  (tiny change)
 
@@ -111,8 +133,8 @@
 	(produce_stretch_glyph): Set it2.char_to_display too before
 	calling x_produce_glyphs.
 	(x_produce_glyphs): Simplify by using the same code for ASCII and
-	non-ASCII characters.  Don't set it->char_to_display here.  Don't
-	handle unibyte-display-via-language-environment here. For a
+	non-ASCII characters.  Don't set it->char_to_display here.
+	Don't handle unibyte-display-via-language-environment here.  For a
 	charater of no glyph, use font->space_width instead of FONT_WIDTH.
 
 2010-08-31  Stefan Monnier  <monnier@iro.umontreal.ca>

=== modified file 'src/coding.c'
--- src/coding.c	2010-08-08 21:15:44 +0000
+++ src/coding.c	2010-09-14 14:41:53 +0000
@@ -2008,7 +2008,7 @@
 	}
       else
 	{
-	  int more_bytes = emacs_mule_bytes[*src_base] - 1;
+	  int more_bytes = emacs_mule_bytes[c] - 1;
 
 	  while (more_bytes > 0)
 	    {
@@ -4490,7 +4490,10 @@
   charset_list = CODING_ATTR_CHARSET_LIST (attrs);
   coding->safe_charsets = SDATA (CODING_ATTR_SAFE_CHARSETS (attrs));
 
-  ascii_compatible = ! NILP (CODING_ATTR_ASCII_COMPAT (attrs));
+  ascii_compatible
+    = (! NILP (CODING_ATTR_ASCII_COMPAT (attrs))
+       && ! (CODING_ISO_FLAGS (coding) & (CODING_ISO_FLAG_DESIGNATION
+					  | CODING_ISO_FLAG_LOCKING_SHIFT)));
 
   while (charbuf < charbuf_end)
     {

=== modified file 'src/term.c'
--- src/term.c	2010-09-01 07:13:21 +0000
+++ src/term.c	2010-09-14 14:41:53 +0000
@@ -247,7 +247,6 @@
             cmputc ('\n');
         }
 
-      OUTPUT_IF (tty, tty->TS_termcap_modes);
       OUTPUT_IF (tty, visible_cursor ? tty->TS_cursor_visible : tty->TS_cursor_normal);
       OUTPUT_IF (tty, tty->TS_keypad_mode);
       losecursor (tty);

=== modified file 'src/xterm.c'
--- src/xterm.c	2010-09-02 09:47:08 +0000
+++ src/xterm.c	2010-09-14 14:41:53 +0000
@@ -8285,19 +8285,89 @@
                 "_NET_WM_STATE_STICKY", NULL);
 }
 
+/* Return the current _NET_WM_STATE.
+   SIZE_STATE is set to one of the FULLSCREEN_* values.
+   STICKY is set to 1 if the sticky state is set, 0 if not.  */
+
+static void
+get_current_vm_state (struct frame *f,
+                      Window window,
+                      int *size_state,
+                      int *sticky)
+{
+  Atom actual_type;
+  unsigned long actual_size, bytes_remaining;
+  int i, rc, actual_format;
+  struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
+  long max_len = 65536;
+  Display *dpy = FRAME_X_DISPLAY (f);
+  unsigned char *tmp_data = NULL;
+  Atom target_type = XA_ATOM;
+
+  *sticky = 0;
+  *size_state = FULLSCREEN_NONE;
+
+  BLOCK_INPUT;
+  x_catch_errors (dpy);
+  rc = XGetWindowProperty (dpy, window, dpyinfo->Xatom_net_wm_state,
+                           0, max_len, False, target_type,
+                           &actual_type, &actual_format, &actual_size,
+                           &bytes_remaining, &tmp_data);
+
+  if (rc != Success || actual_type != target_type || x_had_errors_p (dpy))
+    {
+      if (tmp_data) XFree (tmp_data);
+      x_uncatch_errors ();
+      UNBLOCK_INPUT;
+      return;
+    }
+
+  x_uncatch_errors ();
+
+  for (i = 0; i < actual_size; ++i)
+    {
+      Atom a = ((Atom*)tmp_data)[i];
+      if (a == dpyinfo->Xatom_net_wm_state_maximized_horz) 
+        {
+          if (*size_state == FULLSCREEN_HEIGHT)
+            *size_state = FULLSCREEN_MAXIMIZED;
+          else
+            *size_state = FULLSCREEN_WIDTH;
+        }
+      else if (a == dpyinfo->Xatom_net_wm_state_maximized_vert)
+        {
+          if (*size_state == FULLSCREEN_WIDTH)
+            *size_state = FULLSCREEN_MAXIMIZED;
+          else
+            *size_state = FULLSCREEN_HEIGHT;
+        }
+      else if (a == dpyinfo->Xatom_net_wm_state_fullscreen_atom)
+        *size_state = FULLSCREEN_BOTH;
+      else if (a == dpyinfo->Xatom_net_wm_state_sticky)
+        *sticky = 1;
+    }
+
+  if (tmp_data) XFree (tmp_data);
+  UNBLOCK_INPUT;
+}
+
 /* Do fullscreen as specified in extended window manager hints */
 
 static int
 do_ewmh_fullscreen (struct frame *f)
 {
   int have_net_atom = wm_supports (f, "_NET_WM_STATE");
+  Lisp_Object lval = get_frame_param (f, Qfullscreen);
+  int cur, dummy;
+
+  get_current_vm_state (f, FRAME_OUTER_WINDOW (f), &cur, &dummy);
 
   /* Some window managers don't say they support _NET_WM_STATE, but they do say
      they support _NET_WM_STATE_FULLSCREEN.  Try that also.  */
   if (!have_net_atom)
       have_net_atom = wm_supports (f, "_NET_WM_STATE_FULLSCREEN");
 
-  if (have_net_atom)
+  if (have_net_atom && cur != f->want_fullscreen)
     {
       Lisp_Object frame;
       const char *fs = "_NET_WM_STATE_FULLSCREEN";
@@ -8306,26 +8376,41 @@
 
       XSETFRAME (frame, f);
 
-      set_wm_state (frame, 0, fs, NULL);
-      set_wm_state (frame, 0, fh, NULL);
-      set_wm_state (frame, 0, fw, NULL);
-
-      /* If there are _NET_ atoms we assume we have extended window manager
-         hints.  */
+      /* Keep number of calls to set_wm_state as low as possible.
+         Some window managers, or possible Gtk+, hangs when too many
+         are sent at once.  */
       switch (f->want_fullscreen)
         {
         case FULLSCREEN_BOTH:
+          if (cur == FULLSCREEN_WIDTH || cur == FULLSCREEN_MAXIMIZED
+              || cur == FULLSCREEN_HEIGHT)
+            set_wm_state (frame, 0, fw, fh);
           set_wm_state (frame, 1, fs, NULL);
           break;
         case FULLSCREEN_WIDTH:
-          set_wm_state (frame, 1, fw, NULL);
+          if (cur == FULLSCREEN_BOTH || cur == FULLSCREEN_HEIGHT
+              || cur == FULLSCREEN_MAXIMIZED)
+            set_wm_state (frame, 0, fs, fh);
+          if (cur != FULLSCREEN_MAXIMIZED)
+            set_wm_state (frame, 1, fw, NULL);
           break;
         case FULLSCREEN_HEIGHT:
-          set_wm_state (frame, 1, fh, NULL);
+          if (cur == FULLSCREEN_BOTH || cur == FULLSCREEN_WIDTH
+              || cur == FULLSCREEN_MAXIMIZED)
+            set_wm_state (frame, 0, fs, fw);
+          if (cur != FULLSCREEN_MAXIMIZED)
+            set_wm_state (frame, 1, fh, NULL);
           break;
         case FULLSCREEN_MAXIMIZED:
+          if (cur == FULLSCREEN_BOTH)
+            set_wm_state (frame, 0, fs, NULL);
           set_wm_state (frame, 1, fw, fh);
           break;
+        case FULLSCREEN_NONE:
+          if (cur == FULLSCREEN_BOTH)
+            set_wm_state (frame, 0, fs, NULL);
+          else
+            set_wm_state (frame, 0, fw, fh);
         }
 
       f->want_fullscreen = FULLSCREEN_NONE;
@@ -8351,57 +8436,11 @@
 static void
 x_handle_net_wm_state (struct frame *f, XPropertyEvent *event)
 {
-  Atom actual_type;
-  unsigned long actual_size, bytes_remaining;
-  int i, rc, actual_format, value = FULLSCREEN_NONE;
-  struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
-  long max_len = 65536;
-  Display *dpy = FRAME_X_DISPLAY (f);
-  unsigned char *tmp_data = NULL;
-  Atom target_type = XA_ATOM;
+  int value = FULLSCREEN_NONE;
   Lisp_Object lval;
   int sticky = 0;
 
-  BLOCK_INPUT;
-  x_catch_errors (dpy);
-  rc = XGetWindowProperty (dpy, event->window,
-                           event->atom, 0, max_len, False, target_type,
-                           &actual_type, &actual_format, &actual_size,
-                           &bytes_remaining, &tmp_data);
-
-  if (rc != Success || actual_type != target_type || x_had_errors_p (dpy))
-    {
-      if (tmp_data) XFree (tmp_data);
-      x_uncatch_errors ();
-      UNBLOCK_INPUT;
-      return;
-    }
-
-  x_uncatch_errors ();
-
-  for (i = 0; i < actual_size; ++i)
-    {
-      Atom a = ((Atom*)tmp_data)[i];
-      if (a == dpyinfo->Xatom_net_wm_state_maximized_horz)
-        {
-          if (value == FULLSCREEN_HEIGHT)
-            value = FULLSCREEN_MAXIMIZED;
-          else
-            value = FULLSCREEN_WIDTH;
-        }
-      else if (a == dpyinfo->Xatom_net_wm_state_maximized_vert)
-        {
-          if (value == FULLSCREEN_WIDTH)
-            value = FULLSCREEN_MAXIMIZED;
-          else
-            value = FULLSCREEN_HEIGHT;
-        }
-      else if (a == dpyinfo->Xatom_net_wm_state_fullscreen_atom)
-        value = FULLSCREEN_BOTH;
-      else if (a == dpyinfo->Xatom_net_wm_state_sticky)
-        sticky = 1;
-    }
-
+  get_current_vm_state (f, event->window, &value, &sticky);
   lval = Qnil;
   switch (value)
     {
@@ -8421,9 +8460,6 @@
 
   store_frame_param (f, Qfullscreen, lval);
   store_frame_param (f, Qsticky, sticky ? Qt : Qnil);
-
-  if (tmp_data) XFree (tmp_data);
-  UNBLOCK_INPUT;
 }
 
 /* Check if we need to resize the frame due to a fullscreen request.
------------------------------------------------------------
revno: 101434
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Tue 2010-09-14 13:44:44 +0000
message:
  Fixed up nnrss group activation, and removed moreover stuff.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-14 11:50:15 +0000
+++ lisp/gnus/ChangeLog	2010-09-14 13:44:44 +0000
@@ -1,3 +1,15 @@
+2010-09-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus-start.el (gnus-read-active-for-groups): Reverted the previous
+	change.
+
+	* nnrss.el (nnrss-request-list): Removed this function and related
+	functions, including the moreover stuff.
+
+2010-09-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* nnrss.el (nnrss-retrieve-groups): New function.
+
 2010-09-14  Juanma Barranquero  <lekktu@gmail.com>
 
 	* .dir-locals.el: Add no-byte-compile cookie.

=== modified file 'lisp/gnus/gnus-start.el'
--- lisp/gnus/gnus-start.el	2010-09-14 03:40:10 +0000
+++ lisp/gnus/gnus-start.el	2010-09-14 13:44:44 +0000
@@ -1808,11 +1808,11 @@
 	 (dolist (info infos (nreverse groups))
 	   (push (gnus-group-real-name (gnus-info-group info)) groups))
 	 method)))
-     ((gnus-check-backend-function 'request-scan (car method))
+     ((gnus-check-backend-function 'request-list (car method))
       (gnus-read-active-file-1 method nil infos))
      (t
       (dolist (info infos)
-	(gnus-activate-group (gnus-info-group info) nil nil method))))))
+	(gnus-activate-group (gnus-info-group info) nil nil method t))))))
 
 ;; Create a hash table out of the newsrc alist.  The `car's of the
 ;; alist elements are used as keys.

=== modified file 'lisp/gnus/nnrss.el'
--- lisp/gnus/nnrss.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/nnrss.el	2010-09-14 13:44:44 +0000
@@ -342,11 +342,6 @@
       ;; we return the article number.
       (cons nnrss-group (car e))))))
 
-(deffoo nnrss-request-list (&optional server)
-  (nnrss-possibly-change-group nil server)
-  (nnrss-generate-active)
-  t)
-
 (deffoo nnrss-open-server (server &optional defs connectionless)
   (nnrss-read-server-data server)
   (nnoo-change-server 'nnrss server defs)
@@ -397,6 +392,18 @@
 	  (insert (car elem) "\t" (third elem) "\n"))))
   t)
 
+(deffoo nnrss-retrieve-groups (groups &optional server)
+  (nnrss-possibly-change-group nil server)
+  (dolist (group groups)
+    (nnrss-check-group group server))
+  (save-excursion
+    (set-buffer nntp-server-buffer)
+    (erase-buffer)
+    (dolist (group groups)
+      (let ((elem (assoc group nnrss-server-data)))
+	(insert (format "%S %s 1 y\n" group (or (cadr elem) 0)))))
+    'active))
+
 (nnoo-define-skeleton nnrss)
 
 ;;; Internal functions
@@ -479,20 +486,6 @@
     (nnrss-read-group-data group server)
     (setq nnrss-group group)))
 
-(defvar nnrss-extra-categories '(nnrss-snarf-moreover-categories))
-
-(defun nnrss-generate-active ()
-  (when (y-or-n-p "Fetch extra categories? ")
-    (mapc 'funcall nnrss-extra-categories))
-  (save-excursion
-    (set-buffer nntp-server-buffer)
-    (erase-buffer)
-    (dolist (elem nnrss-group-alist)
-      (insert (prin1-to-string (car elem)) " 0 1 y\n"))
-    (dolist (elem nnrss-server-data)
-      (unless (assoc (car elem) nnrss-group-alist)
-	(insert (prin1-to-string (car elem)) " 0 1 y\n")))))
-
 (autoload 'timezone-parse-date "timezone")
 
 (defun nnrss-normalize-date (date)
@@ -868,33 +861,6 @@
 	 (append nnheader-file-name-translation-alist '((?' . ?_)))))
     (nnheader-translate-file-chars name)))
 
-(defvar nnrss-moreover-url
-  "http://w.moreover.com/categories/category_list_rss.html"
-  "The url of moreover.com categories.")
-
-(defun nnrss-snarf-moreover-categories ()
-  "Snarf RSS links from moreover.com."
-  (interactive)
-  (let (category name url changed)
-    (with-temp-buffer
-      (nnrss-insert nnrss-moreover-url)
-      (goto-char (point-min))
-      (while (re-search-forward
-	      "<a name=\"\\([^\"]+\\)\">\\|<a href=\"\\(http://[^\"]*moreover\\.com[^\"]+page\\?c=\\([^\"&]+\\)&o=rss\\)" nil t)
-	(if (match-string 1)
-	    (setq category (match-string 1))
-	  (setq url (match-string 2)
-		name (mm-url-decode-entities-string
-		      (rfc2231-decode-encoded-string
-		       (match-string 3))))
-	  (if category
-	      (setq name (concat category "." name)))
-	  (unless (assoc name nnrss-server-data)
-	    (setq changed t)
-	    (push (list name 0 url) nnrss-server-data)))))
-    (if changed
-	(nnrss-save-server-data ""))))
-
 (defun nnrss-node-text (namespace local-name element)
   (let* ((node (assq (intern (concat namespace (symbol-name local-name)))
 		     element))
------------------------------------------------------------
revno: 101433
committer: Juanma Barranquero <lekktu@gmail.com>
branch nick: trunk
timestamp: Tue 2010-09-14 13:50:15 +0200
message:
  lisp/gnus/.dir-locals.el: Add no-byte-compile cookie.
diff:
=== modified file 'lisp/gnus/.dir-locals.el'
--- lisp/gnus/.dir-locals.el	2010-09-04 00:04:48 +0000
+++ lisp/gnus/.dir-locals.el	2010-09-14 11:50:15 +0000
@@ -1,1 +1,4 @@
 ((emacs-lisp-mode . ((show-trailing-whitespace . t))))
+;; Local Variables:
+;; no-byte-compile: t
+;; End:

=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-14 03:40:10 +0000
+++ lisp/gnus/ChangeLog	2010-09-14 11:50:15 +0000
@@ -1,3 +1,7 @@
+2010-09-14  Juanma Barranquero  <lekktu@gmail.com>
+
+	* .dir-locals.el: Add no-byte-compile cookie.
+
 2010-09-14  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-start.el (gnus-read-active-for-groups): Run gnus-activate-group
------------------------------------------------------------
revno: 101432
committer: Andreas Schwab <schwab@linux-m68k.org>
branch nick: emacs
timestamp: Tue 2010-09-14 09:53:39 +0200
message:
  	* xml.c (Fxml_parse_string, Fxml_parse_string): Revert last
  	change.  Don't make first argument optional.  Doc fix.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-09-14 00:08:02 +0000
+++ src/ChangeLog	2010-09-14 07:53:39 +0000
@@ -1,3 +1,8 @@
+2010-09-14  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* xml.c (Fxml_parse_string, Fxml_parse_string): Revert last
+	change.  Don't make first argument optional.  Doc fix.
+
 2010-09-14  Leo  <sdl.web@gmail.com>  (tiny change)
 
 	* xml.c (Fxml_parse_string, Fhtml_parse_string): Fix up the

=== modified file 'src/xml.c'
--- src/xml.c	2010-09-14 00:08:02 +0000
+++ src/xml.c	2010-09-14 07:53:39 +0000
@@ -108,23 +108,21 @@
 }
 
 DEFUN ("html-parse-string", Fhtml_parse_string, Shtml_parse_string,
-       0, 2, 0,
-       doc: /* Parse the string as an HTML document and return the parse tree.
+       1, 2, 0,
+       doc: /* Parse STRING as an HTML document and return the parse tree.
 If BASE-URL is non-nil, it will be used to expand relative URLs in
-the HTML document.*/)
-     (string, base_url)
-     Lisp_Object string, base_url;
+the HTML document.  */)
+  (Lisp_Object string, Lisp_Object base_url)
 {
   return parse_buffer (string, base_url, 1);
 }
 
 DEFUN ("xml-parse-string", Fxml_parse_string, Sxml_parse_string,
-       0, 2, 0,
-       doc: /* Parse the string as an XML document and return the parse tree.
+       1, 2, 0,
+       doc: /* Parse STRING as an XML document and return the parse tree.
 If BASE-URL is non-nil, it will be used to expand relative URLs in
-the XML document.*/)
-     (string, base_url)
-     Lisp_Object string, base_url;
+the XML document.  */)
+  (Lisp_Object string, Lisp_Object base_url)
 {
   return parse_buffer (string, base_url, 0);
 }
------------------------------------------------------------
revno: 101431
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Tue 2010-09-14 06:01:14 +0000
message:
  time-date.el (format-seconds): Comment fix.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-13 20:05:23 +0000
+++ lisp/ChangeLog	2010-09-14 06:01:14 +0000
@@ -1,3 +1,7 @@
+2010-09-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* calendar/time-date.el (format-seconds): Comment fix.
+
 2010-09-13  Michael R. Mauger  <mmaug@yahoo.com>
 
 	* progmodes/sql.el: Version 2.7.

=== modified file 'lisp/calendar/time-date.el'
--- lisp/calendar/time-date.el	2010-09-02 00:55:51 +0000
+++ lisp/calendar/time-date.el	2010-09-14 06:01:14 +0000
@@ -317,10 +317,10 @@
       (setq start (match-end 0)
             spec (match-string 1 string))
       (unless (string-equal spec "%")
-	;; `assoc-string' is not available in Emacs 21.  So when compiling
-	;; Gnus (`time-date.el' is part of Gnus) with Emacs 21, we get a
-	;; warning here.  But `format-seconds' is not used anywhere in Gnus so
-	;; it's not a real problem. --rsteib
+	;; `assoc-string' is not available in XEmacs or Emacs 21.  So when
+	;; compiling Gnus (`time-date.el' is part of Gnus) with XEmacs or
+	;; Emacs 21, we get a warning here.  But `format-seconds' is not
+	;; used anywhere in Gnus so it's not a real problem. --rsteib
         (or (setq match (assoc-string spec units t))
             (error "Bad format specifier: `%s'" spec))
         (if (assoc-string spec usedunits t)
------------------------------------------------------------
revno: 101430
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Tue 2010-09-14 03:40:10 +0000
message:
  gnus-start.el (gnus-read-active-for-groups): Run gnus-activate-group for back end that doesn't support request-scan.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-11 00:36:27 +0000
+++ lisp/gnus/ChangeLog	2010-09-14 03:40:10 +0000
@@ -1,3 +1,8 @@
+2010-09-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-start.el (gnus-read-active-for-groups): Run gnus-activate-group
+	for back end that doesn't support request-scan.
+
 2010-09-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus-start.el (gnus-read-active-file-1): If gnus-agent isn't set,

=== modified file 'lisp/gnus/gnus-start.el'
--- lisp/gnus/gnus-start.el	2010-09-11 00:36:27 +0000
+++ lisp/gnus/gnus-start.el	2010-09-14 03:40:10 +0000
@@ -1808,11 +1808,11 @@
 	 (dolist (info infos (nreverse groups))
 	   (push (gnus-group-real-name (gnus-info-group info)) groups))
 	 method)))
-     ((gnus-check-backend-function 'request-list (car method))
+     ((gnus-check-backend-function 'request-scan (car method))
       (gnus-read-active-file-1 method nil infos))
      (t
       (dolist (info infos)
-	(gnus-activate-group (gnus-info-group info) nil nil method t))))))
+	(gnus-activate-group (gnus-info-group info) nil nil method))))))
 
 ;; Create a hash table out of the newsrc alist.  The `car's of the
 ;; alist elements are used as keys.
------------------------------------------------------------
revno: 101429
committer: Lars Magne Ingebrigtsen <larsi@gnus.org>
branch nick: trunk
timestamp: Tue 2010-09-14 02:08:02 +0200
message:
  * xml.c (Fxml_parse_string, Fhtml_parse_string): Fix up the parameters
  for the doc string.
  
  From  Leo  <sdl.web@gmail.com>  (tiny change)
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-09-12 17:16:25 +0000
+++ src/ChangeLog	2010-09-14 00:08:02 +0000
@@ -1,3 +1,8 @@
+2010-09-14  Leo  <sdl.web@gmail.com>  (tiny change)
+
+	* xml.c (Fxml_parse_string, Fhtml_parse_string): Fix up the
+	parameters for the doc string.
+
 2010-09-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* xml.c (Fhtml_parse_string, Fxml_parse_string): Mention BASE-URL.

=== modified file 'src/xml.c'
--- src/xml.c	2010-09-12 17:16:25 +0000
+++ src/xml.c	2010-09-14 00:08:02 +0000
@@ -112,7 +112,8 @@
        doc: /* Parse the string as an HTML document and return the parse tree.
 If BASE-URL is non-nil, it will be used to expand relative URLs in
 the HTML document.*/)
-  (Lisp_Object string, Lisp_Object base_url)
+     (string, base_url)
+     Lisp_Object string, base_url;
 {
   return parse_buffer (string, base_url, 1);
 }
@@ -122,7 +123,8 @@
        doc: /* Parse the string as an XML document and return the parse tree.
 If BASE-URL is non-nil, it will be used to expand relative URLs in
 the XML document.*/)
-  (Lisp_Object string, Lisp_Object base_url)
+     (string, base_url)
+     Lisp_Object string, base_url;
 {
   return parse_buffer (string, base_url, 0);
 }
------------------------------------------------------------
revno: 101428
committer: Lars Magne Ingebrigtsen <larsi@gnus.org>
branch nick: trunk
timestamp: Tue 2010-09-14 02:04:48 +0200
message:
  Check that the libxml2 we found can be used.  This fixes a conf
  problem on Mac OS X.
diff:
=== modified file 'configure'
--- configure	2010-09-13 14:58:48 +0000
+++ configure	2010-09-14 00:04:48 +0000
@@ -11180,6 +11180,7 @@
   fi
 
   if test "${HAVE_LIBXML2}" = "yes"; then
+    LIBS="$LIBXML2_LIBS $LIBS"
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for htmlReadMemory in -lxml2" >&5
 $as_echo_n "checking for htmlReadMemory in -lxml2... " >&6; }
 if test "${ac_cv_lib_xml2_htmlReadMemory+set}" = set; then :
------------------------------------------------------------
revno: 101427
committer: Michael Mauger <mmaug@yahoo.com>
branch nick: trunk
timestamp: Mon 2010-09-13 16:05:23 -0400
message:
  SQL Mode 2.7: Code cleanup and primatives for SQL redirection
  
  	* progmodes/sql.el: Version 2.7.
  	(sql-buffer-live-p): Improve detection.
  	(sql-find-sqli-buffer, sql-set-sqli-buffer-generally)
  	(sql-set-sqli-buffer): Use it.
  	(sql-product-interactive): Run `sql-set-sqli-hook'.
  	(sql-rename-buffer): Code cleanup.
  	(sql-redirect, sql-redirect-value): New functions.  More to come.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-13 16:33:56 +0000
+++ lisp/ChangeLog	2010-09-13 20:05:23 +0000
@@ -1,3 +1,13 @@
+2010-09-13  Michael R. Mauger  <mmaug@yahoo.com>
+
+	* progmodes/sql.el: Version 2.7.
+	(sql-buffer-live-p): Improve detection.
+	(sql-find-sqli-buffer, sql-set-sqli-buffer-generally)
+	(sql-set-sqli-buffer): Use it.
+	(sql-product-interactive): Run `sql-set-sqli-hook'.
+	(sql-rename-buffer): Code cleanup.
+	(sql-redirect, sql-redirect-value): New functions.  More to come.
+
 2010-09-13  Juanma Barranquero  <lekktu@gmail.com>
 
 	Port tramp-related Makefile changes of revnos 101381, 101422 to Windows.

=== modified file 'lisp/progmodes/sql.el'
--- lisp/progmodes/sql.el	2010-09-11 03:17:02 +0000
+++ lisp/progmodes/sql.el	2010-09-13 20:05:23 +0000
@@ -5,7 +5,7 @@
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Michael Mauger <mmaug@yahoo.com>
-;; Version: 2.6
+;; Version: 2.7
 ;; Keywords: comm languages processes
 ;; URL: http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/progmodes/sql.el
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?SqlMode
@@ -1052,11 +1052,24 @@
 
 Used by `sql-rename-buffer'.")
 
-(defun sql-buffer-live-p (buffer)
-  "Returns non-nil if the process associated with buffer is live."
-  (and buffer
-       (buffer-live-p (get-buffer buffer))
-       (get-buffer-process buffer)))
+(defun sql-buffer-live-p (buffer &optional product)
+  "Returns non-nil if the process associated with buffer is live.
+
+BUFFER can be a buffer object or a buffer name.  The buffer must
+be a live buffer, have an running process attached to it, be in
+`sql-interactive-mode', and, if PRODUCT is specified, it's
+`sql-product' must match."
+
+  (when buffer
+    (setq buffer (get-buffer buffer))
+    (and buffer
+         (buffer-live-p buffer)
+         (get-buffer-process buffer)
+         (comint-check-proc buffer)
+         (with-current-buffer buffer
+           (and (derived-mode-p 'sql-product-interactive)
+                (or (not product)
+                    (eq product sql-product)))))))
 
 ;; Keymap for sql-interactive-mode.
 
@@ -2577,23 +2590,22 @@
   "Returns the name of the current default SQLi buffer or nil.
 In order to qualify, the SQLi buffer must be alive, be in
 `sql-interactive-mode' and have a process."
-  (let ((default-buffer (default-value 'sql-buffer))
-        (current-product sql-product))
-    (if (sql-buffer-live-p default-buffer)
-	default-buffer
-      (save-current-buffer
-	(let ((buflist (buffer-list))
-	      (found))
-	  (while (not (or (null buflist)
-			  found))
-	    (let ((candidate (car buflist)))
-	      (set-buffer candidate)
-	      (if (and (sql-buffer-live-p candidate)
-                       (derived-mode-p 'sql-interactive-mode)
-                       (eq sql-product current-product))
-		  (setq found (buffer-name candidate)))
-	      (setq buflist (cdr buflist))))
-	  found)))))
+  (let ((buf  sql-buffer)
+        (prod sql-product))
+    (or
+     ;; Current sql-buffer, if there is one.
+     (and (sql-buffer-live-p buf prod)
+          buf)
+     ;; Global sql-buffer
+     (and (setq buf (default-value 'sql-buffer))
+          (sql-buffer-live-p buf prod)
+          buf)
+     ;; Look thru each buffer
+     (car (apply 'append
+                 (mapcar (lambda (b)
+                           (and (sql-buffer-live-p b prod)
+                                (list (buffer-name b))))
+                         (buffer-list)))))))
 
 (defun sql-set-sqli-buffer-generally ()
   "Set SQLi buffer for all SQL buffers that have none.
@@ -2611,10 +2623,11 @@
 	(let ((candidate (car buflist)))
 	  (set-buffer candidate)
 	  (if (and (derived-mode-p 'sql-mode)
-		   (not (buffer-live-p sql-buffer)))
+		   (not (sql-buffer-live-p sql-buffer)))
 	      (progn
 		(setq sql-buffer default-buffer)
-		(run-hooks 'sql-set-sqli-hook))))
+		(when default-buffer
+                  (run-hooks 'sql-set-sqli-hook)))))
 	(setq buflist (cdr buflist))))))
 
 (defun sql-set-sqli-buffer ()
@@ -2632,19 +2645,13 @@
   (interactive)
   (let ((default-buffer (sql-find-sqli-buffer)))
     (if (null default-buffer)
-	(error "There is no suitable SQLi buffer"))
-    (let ((new-buffer
-	   (get-buffer
-	    (read-buffer "New SQLi buffer: " default-buffer t))))
-      (if (null (get-buffer-process new-buffer))
-	  (error "Buffer %s has no process" (buffer-name new-buffer)))
-      (if (null (with-current-buffer new-buffer
-		  (derived-mode-p 'sql-interactive-mode)))
-	  (error "Buffer %s is no SQLi buffer" (buffer-name new-buffer)))
-      (if new-buffer
-	  (progn
-	    (setq sql-buffer (buffer-name new-buffer))
-	    (run-hooks 'sql-set-sqli-hook))))))
+        (error "There is no suitable SQLi buffer")
+      (let ((new-buffer (read-buffer "New SQLi buffer: " default-buffer t)))
+        (if (null (sql-buffer-live-p new-buffer))
+            (error "Buffer %s is not a working SQLi buffer" new-buffer)
+          (when new-buffer
+            (setq sql-buffer new-buffer)
+            (run-hooks 'sql-set-sqli-hook)))))))
 
 (defun sql-show-sqli-buffer ()
   "Show the name of current SQLi buffer.
@@ -2742,13 +2749,13 @@
   (if (not (derived-mode-p 'sql-interactive-mode))
       (message "Current buffer is not a SQL interactive buffer")
 
-    (cond
-     ((stringp new-name)
-      (setq sql-alternate-buffer-name new-name))
-     ((listp new-name)
-      (setq sql-alternate-buffer-name
+    (setq sql-alternate-buffer-name
+          (cond
+           ((stringp new-name) new-name)
+           ((consp new-name)
             (read-string "Buffer name (\"*SQL: XXX*\"; enter `XXX'): "
-                         sql-alternate-buffer-name))))
+                         sql-alternate-buffer-name))
+           (t                  sql-alternate-buffer-name)))
 
     (rename-buffer (if (string= "" sql-alternate-buffer-name)
                        "*SQL*"
@@ -2994,6 +3001,91 @@
 
 
 
+;;; Redirect output functions
+
+(defun sql-redirect (command combuf &optional outbuf save-prior)
+  "Execute the SQL command and send output to OUTBUF.
+
+COMBUF must be an active SQL interactive buffer.  OUTBUF may be
+an existing buffer, or the name of a non-existing buffer.  If
+omitted the output is sent to a temporary buffer which will be
+killed after the command completes.  COMMAND should be a string
+of commands accepted by the SQLi program."
+
+  (with-current-buffer combuf
+    (let ((buf  (get-buffer-create (or outbuf " *SQL-Redirect*")))
+          (proc (get-buffer-process (current-buffer)))
+          (comint-prompt-regexp (sql-get-product-feature sql-product
+                                                         :prompt-regexp))
+          (start nil))
+      (with-current-buffer buf
+        (unless save-prior
+          (erase-buffer))
+        (goto-char (point-max))
+        (setq start (point)))
+
+      ;; Run the command
+      (comint-redirect-send-command-to-process command buf proc nil t)
+      (while (null comint-redirect-completed)
+	(accept-process-output nil 1))
+
+      ;; Remove echo if there was one
+      (with-current-buffer buf
+        (goto-char start)
+        (when (looking-at (concat "^" (regexp-quote command) "[\\n]"))
+          (delete-region (match-beginning 0) (match-end 0)))
+        (goto-char start)))))
+
+(defun sql-redirect-value (command combuf regexp &optional regexp-groups)
+  "Execute the SQL command and return part of result.
+
+COMBUF must be an active SQL interactive buffer.  COMMAND should
+be a string of commands accepted by the SQLi program.  From the
+output, the REGEXP is repeatedly matched and the list of
+REGEXP-GROUPS submatches is returned.  This behaves much like
+\\[comint-redirect-results-list-from-process] but instead of
+returning a single submatch it returns a list of each submatch
+for each match."
+
+  (let ((outbuf " *SQL-Redirect-values*")
+        (results nil))
+    (sql-redirect command combuf outbuf nil)
+    (with-current-buffer outbuf
+      (while (re-search-forward regexp nil t)
+	(push
+         (cond
+          ;; no groups-return all of them
+          ((null regexp-groups)
+           (let ((i 1)
+                 (r nil))
+             (while (match-beginning i)
+               (push (match-string i) r))
+             (nreverse r)))
+          ;; one group specified
+          ((numberp regexp-groups)
+           (match-string regexp-groups))
+           ;; (buffer-substring-no-properties
+           ;;  (match-beginning regexp-groups)
+           ;;  (match-end regexp-groups)))
+          ;; list of numbers; return the specified matches only
+          ((consp regexp-groups)
+           (mapcar (lambda (c)
+                     (cond
+                      ((numberp c) (match-string c))
+                      ((stringp c) (match-substitute-replacement c))
+                      (t (error "sql-redirect-value: unknown REGEXP-GROUPS value - %s" c))))
+                   regexp-groups))
+          ;; String is specified; return replacement string
+          ((stringp regexp-groups)
+           (match-substitute-replacement regexp-groups))
+          (t
+           (error "sql-redirect-value: unknown REGEXP-GROUPS value - %s"
+                  regexp-groups)))
+         results)))
+      (nreverse results)))
+
+
+
 ;;; SQL mode -- uses SQL interactive mode
 
 ;;;###autoload
@@ -3365,7 +3457,7 @@
 
   ;; Handle universal arguments if specified
   (when (not (or executing-kbd-macro noninteractive))
-    (when (and (listp product)
+    (when (and (consp product)
                (not (cdr product))
                (numberp (car product)))
       (when (>= (car product) 16)
@@ -3394,10 +3486,7 @@
         ;; If no new name specified, fall back on sql-buffer if its for
         ;; the same product
         (if (and (not new-name)
-                 sql-buffer
-                 (sql-buffer-live-p sql-buffer)
-                 (comint-check-proc sql-buffer)
-                 (eq product (with-current-buffer sql-buffer sql-product)))
+                 (sql-buffer-live-p sql-buffer product))
             (pop-to-buffer sql-buffer)
 
           ;; We have a new name or sql-buffer doesn't exist or match
@@ -3423,10 +3512,11 @@
             (when new-name
               (sql-rename-buffer new-name))
 
-            ;; Set `sql-buffer' in the start buffer
+            ;; Set `sql-buffer' in the new buffer and the start buffer
             (setq sql-buffer (buffer-name new-sqli-buffer))
             (with-current-buffer start-buffer
-              (setq sql-buffer (buffer-name new-sqli-buffer)))
+              (setq sql-buffer (buffer-name new-sqli-buffer))
+              (run-hooks 'sql-set-sqli-hook))
 
             ;; All done.
             (message "Login...done")
------------------------------------------------------------
revno: 101426
committer: Lars Magne Ingebrigtsen <larsi@gnus.org>
branch nick: trunk
timestamp: Mon 2010-09-13 21:50:30 +0200
message:
  Set the LIBS to LIBXML2_LIBS before testing for -lxml2 usability.
diff:
=== modified file 'configure.in'
--- configure.in	2010-09-13 14:58:48 +0000
+++ configure.in	2010-09-13 19:50:30 +0000
@@ -2541,6 +2541,7 @@
   ### I'm not sure what the version number should be, so I just guessed.
   PKG_CHECK_MODULES(LIBXML2, libxml-2.0 > 2.2.0, HAVE_LIBXML2=yes, HAVE_LIBXML2=no)
   if test "${HAVE_LIBXML2}" = "yes"; then
+    LIBS="$LIBXML2_LIBS $LIBS"
     AC_CHECK_LIB(xml2, htmlReadMemory, HAVE_LIBXML2=yes, HAVE_LIBXML2=no)
     if test "${HAVE_LIBXML2}" = "yes"; then
       AC_DEFINE(HAVE_LIBXML2, 1, [Define to 1 if you have the libxml library (-lxml2).])
------------------------------------------------------------
revno: 101425
committer: Juanma Barranquero <lekktu@gmail.com>
branch nick: trunk
timestamp: Mon 2010-09-13 18:33:56 +0200
message:
  Port tramp-related Makefile changes of revnos 101381, 101422 to Windows.
  
  * makefile.w32-in (LOADDEFS): Add $(lisp)/net/tramp-loaddefs.el.
    (TRAMP_SRC): New macro.
    ($(lisp)/net/tramp-loaddefs.el): New target.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-13 15:17:01 +0000
+++ lisp/ChangeLog	2010-09-13 16:33:56 +0000
@@ -1,3 +1,10 @@
+2010-09-13  Juanma Barranquero  <lekktu@gmail.com>
+
+	Port tramp-related Makefile changes of revnos 101381, 101422 to Windows.
+	* makefile.w32-in (LOADDEFS): Add $(lisp)/net/tramp-loaddefs.el.
+	(TRAMP_SRC): New macro.
+	($(lisp)/net/tramp-loaddefs.el): New target.
+
 2010-09-13  Michael Albinus  <michael.albinus@gmx.de>
 
 	Major code cleanup.  Split tramp.el into tramp.el and tramp-sh.el.

=== modified file 'lisp/makefile.w32-in'
--- lisp/makefile.w32-in	2010-08-22 21:15:20 +0000
+++ lisp/makefile.w32-in	2010-09-13 16:33:56 +0000
@@ -55,7 +55,7 @@
 # Automatically generated autoload files, apart from lisp/loaddefs.el.
 LOADDEFS = $(lisp)/calendar/cal-loaddefs.el \
 	$(lisp)/calendar/diary-loaddefs.el $(lisp)/calendar/hol-loaddefs.el \
-	$(lisp)/mh-e/mh-loaddefs.el
+	$(lisp)/mh-e/mh-loaddefs.el $(lisp)/net/tramp-loaddefs.el
 
 AUTOGENEL = $(lisp)/loaddefs.el $(LOADDEFS) $(lisp)/cus-load.el \
 	$(lisp)/finder-inf.el $(lisp)/subdirs.el $(lisp)/eshell/esh-groups.el \
@@ -403,6 +403,25 @@
 	   -f w32-batch-update-autoloads \
 	   $(ARGQUOTE)$(lisp)/mh-e/mh-loaddefs.el$(ARGQUOTE) $(MAKE) ./mh-e
 
+# Update TRAMP internal autoloads. Maybe we could move tramp*.el into
+# its own subdirectory. OTOH, it does not hurt to keep them in
+# lisp/net.
+TRAMP_SRC = $(lisp)/net/tramp.el  $(lisp)/net/tramp-cache.el  \
+	$(lisp)/net/tramp-cmds.el $(lisp)/net/tramp-compat.el \
+	$(lisp)/net/tramp-ftp.el  $(lisp)/net/tramp-gvfs.el   \
+	$(lisp)/net/tramp-gw.el   $(lisp)/net/tramp-imap.el   \
+	$(lisp)/net/tramp-sh.el   $(lisp)/net/tramp-smb.el    \
+	$(lisp)/net/tramp-uu.el   $(lisp)/net/trampver.el
+
+$(lisp)/net/tramp-loaddefs.el: $(TRAMP_SRC)
+	"$(EMACS)" $(EMACSOPT) \
+	   -l autoload \
+	   --eval $(ARGQUOTE)(setq generate-autoload-cookie $(DQUOTE);;;###tramp-autoload$(DQUOTE))$(ARGQUOTE) \
+	   --eval $(ARGQUOTE)(setq find-file-suppress-same-file-warnings t)$(ARGQUOTE) \
+	   --eval $(ARGQUOTE)(setq make-backup-files nil)$(ARGQUOTE) \
+	   -f w32-batch-update-autoloads \
+	   $(ARGQUOTE)$(lisp)/net/tramp-loaddefs.el$(ARGQUOTE) $(MAKE) ./net
+
 # Prepare a bootstrap in the lisp subdirectory.
 #
 # Build loaddefs.el to make sure it's up-to-date.  If it's not, that
------------------------------------------------------------
revno: 101424
committer: Michael Albinus <michael.albinus@gmx.de>
branch nick: trunk
timestamp: Mon 2010-09-13 17:43:33 +0200
message:
  * NEWS: Some Tramp methods are discontinued.
diff:
=== modified file 'etc/ChangeLog'
--- etc/ChangeLog	2010-09-11 02:06:11 +0000
+++ etc/ChangeLog	2010-09-13 15:43:33 +0000
@@ -1,3 +1,7 @@
+2010-09-13  Michael Albinus  <michael.albinus@gmx.de>
+
+	* NEWS: Some Tramp methods are discontinued.
+
 2010-09-11  Glenn Morris  <rgm@gnu.org>
 
 	* emacs.bash, emacs.csh, ms-kermit: Remove obsolete files (use

=== modified file 'etc/NEWS'
--- etc/NEWS	2010-09-11 13:58:57 +0000
+++ etc/NEWS	2010-09-13 15:43:33 +0000
@@ -434,6 +434,11 @@
 *** It is possible now, to access alternative buses than the default
 system or session bus.
 
+** Tramp
+
+*** The following access methods are discontinued: "ssh1_old",
+"ssh2_old", "scp1_old", "scp2_old" and "fish".
+
 
 * New Modes and Packages in Emacs 24.1
------------------------------------------------------------
revno: 101423
committer: Michael Albinus <michael.albinus@gmx.de>
branch nick: trunk
timestamp: Mon 2010-09-13 17:32:45 +0200
message:
  * tramp.texi (Inline methods): Remove "ssh1_old", "ssh2_old" and
  "fish" methods.
  (External methods): Remove "scp1_old" and "scp2_old" methods.
diff:
=== modified file 'doc/misc/ChangeLog'
--- doc/misc/ChangeLog	2010-09-09 08:04:35 +0000
+++ doc/misc/ChangeLog	2010-09-13 15:32:45 +0000
@@ -1,3 +1,9 @@
+2010-09-13  Michael Albinus  <michael.albinus@gmx.de>
+
+	* tramp.texi (Inline methods): Remove "ssh1_old", "ssh2_old" and
+	"fish" methods.
+	(External methods): Remove "scp1_old" and "scp2_old" methods.
+
 2010-09-09  Michael Albinus  <michael.albinus@gmx.de>
 
 	* tramp.texi: Remove Japanese manual.  Fix typo.

=== modified file 'doc/misc/tramp.texi'
--- doc/misc/tramp.texi	2010-09-09 08:04:35 +0000
+++ doc/misc/tramp.texi	2010-09-13 15:32:45 +0000
@@ -619,10 +619,6 @@
 @file{~/.ssh/config}, the SSH configuration file, which protocol
 should be used, and use the regular @option{ssh} method.)
 
-Two other variants, @option{ssh1_old} and @option{ssh2_old}, use the
-@command{ssh1} and @command{ssh2} commands explicitly.  If you don't
-know what these are, you do not need these options.
-
 All the methods based on @command{ssh} have an additional feature: you
 can specify a host name which looks like @file{host#42} (the real host
 name, then a hash sign, then a port number).  This means to connect to
@@ -731,19 +727,6 @@
 hasn't defined a user name.  Different port numbers must be defined in
 the session.
 
-
-@item @option{fish}
-@cindex method fish
-@cindex fish method
-
-This is an experimental implementation of the fish protocol, known from
-the GNU Midnight Commander or the KDE Konqueror.  @value{tramp} expects
-the fish server implementation from the KDE kioslave.  That means, the
-file @file{~/.fishsrv.pl} is expected to reside on the remote host.
-
-The implementation lacks good performance.  The code is offered anyway,
-maybe somebody can improve the performance.
-
 @end table
 
 
@@ -803,10 +786,6 @@
 @file{~/.ssh/config}, the SSH configuration file, which protocol
 should be used, and use the regular @option{scp} method.)
 
-Two other variants, @option{scp1_old} and @option{scp2_old}, use the
-@command{ssh1} and @command{ssh2} commands explicitly.  If you don't
-know what these are, you do not need these options.
-
 All the @command{ssh} based methods support the @samp{-p} feature
 where you can specify a port number to connect to in the host name.
 For example, the host name @file{host#42} tells @value{tramp} to
------------------------------------------------------------
revno: 101422
committer: Michael Albinus <michael.albinus@gmx.de>
branch nick: trunk
timestamp: Mon 2010-09-13 17:17:01 +0200
message:
  Major code cleanup.  Split tramp.el into tramp.el and tramp-sh.el.
  
  * Makefile.in (TRAMP_SRC): Remove tramp-fish.el.  Add tramp-sh.el.
  
  * net/tramp.el (top): Don't show loading message.  Require just
  'tramp-compat, everything else is required there.  Use
  `ignore-errors' where appropriate.
  (tramp-inline-compress-start-size, tramp-copy-size-limit)
  (tramp-terminal-type, tramp-end-of-output)
  (tramp-initial-end-of-output, tramp-completion-function-alist-rsh)
  (tramp-completion-function-alist-ssh)
  (tramp-completion-function-alist-telnet)
  (tramp-completion-function-alist-su)
  (tramp-completion-function-alist-putty, tramp-remote-path)
  (tramp-remote-process-environment, tramp-sh-extra-args)
  (tramp-actions-before-shell, tramp-uudecode)
  (tramp-perl-file-truename, tramp-perl-file-name-all-completions)
  (tramp-perl-file-attributes)
  (tramp-perl-directory-files-and-attributes)
  (tramp-perl-encode-with-module, tramp-perl-decode-with-module)
  (tramp-perl-encode, tramp-perl-decode)
  (tramp-vc-registered-read-file-names, tramp-file-mode-type-map)
  (tramp-file-name-handler-alist, tramp-make-tramp-temp-file)
  (tramp-handle-make-symbolic-link, tramp-handle-load)
  (tramp-handle-file-name-as-directory)
  (tramp-handle-file-name-directory)
  (tramp-handle-file-name-nondirectory, tramp-handle-file-truename)
  (tramp-handle-file-exists-p, tramp-handle-file-attributes)
  (tramp-do-file-attributes-with-ls)
  (tramp-do-file-attributes-with-perl)
  (tramp-do-file-attributes-with-stat)
  (tramp-handle-set-visited-file-modtime)
  (tramp-handle-verify-visited-file-modtime)
  (tramp-handle-set-file-modes, tramp-handle-set-file-times)
  (tramp-set-file-uid-gid, tramp-remote-selinux-p)
  (tramp-handle-file-selinux-context)
  (tramp-handle-set-file-selinux-context)
  (tramp-handle-file-executable-p, tramp-handle-file-readable-p)
  (tramp-handle-file-newer-than-file-p, tramp-handle-file-modes)
  (tramp-handle-file-directory-p, tramp-handle-file-regular-p)
  (tramp-handle-file-symlink-p, tramp-handle-file-writable-p)
  (tramp-handle-file-ownership-preserved-p)
  (tramp-handle-directory-file-name, tramp-handle-directory-files)
  (tramp-handle-directory-files-and-attributes)
  (tramp-do-directory-files-and-attributes-with-perl)
  (tramp-do-directory-files-and-attributes-with-stat)
  (tramp-handle-file-name-all-completions)
  (tramp-handle-file-name-completion, tramp-handle-add-name-to-file)
  (tramp-handle-copy-file, tramp-handle-copy-directory)
  (tramp-handle-rename-file, tramp-do-copy-or-rename-file)
  (tramp-do-copy-or-rename-file-via-buffer)
  (tramp-do-copy-or-rename-file-directly)
  (tramp-do-copy-or-rename-file-out-of-band)
  (tramp-handle-make-directory, tramp-handle-delete-directory)
  (tramp-handle-delete-file)
  (tramp-handle-dired-recursive-delete-directory)
  (tramp-handle-dired-compress-file, tramp-handle-dired-uncache)
  (tramp-handle-insert-directory)
  (tramp-handle-unhandled-file-name-directory)
  (tramp-handle-expand-file-name)
  (tramp-handle-substitute-in-file-name)
  (tramp-handle-executable-find, tramp-process-sentinel)
  (tramp-handle-start-file-process, tramp-handle-process-file)
  (tramp-handle-call-process-region, tramp-handle-shell-command)
  (tramp-handle-file-local-copy, tramp-handle-file-remote-p)
  (tramp-handle-insert-file-contents)
  (tramp-handle-insert-file-contents-literally)
  (tramp-handle-find-backup-file-name)
  (tramp-handle-make-auto-save-file-name, tramp-handle-write-region)
  (tramp-vc-registered-file-names, tramp-handle-vc-registered)
  (tramp-sh-file-name-handler, tramp-vc-file-name-handler)
  (tramp-maybe-send-script, tramp-set-auto-save, tramp-run-test)
  (tramp-run-test2, tramp-find-executable, tramp-set-remote-path)
  (tramp-find-file-exists-command, tramp-open-shell)
  (tramp-find-shell, tramp-barf-if-no-shell-prompt)
  (tramp-open-connection-setup-interactive-shell)
  (tramp-local-coding-commands, tramp-remote-coding-commands)
  (tramp-find-inline-encoding, tramp-call-local-coding-command)
  (tramp-inline-compress-commands, tramp-find-inline-compress)
  (tramp-compute-multi-hops, tramp-maybe-open-connection)
  (tramp-send-command , tramp-wait-for-output)
  (tramp-send-command-and-check, tramp-barf-unless-okay)
  (tramp-send-command-and-read, tramp-mode-string-to-int)
  (tramp-convert-file-attributes, tramp-check-cached-permissions)
  (tramp-file-mode-from-int, tramp-file-mode-permissions)
  (tramp-shell-case-fold, tramp-make-copy-program-file-name)
  (tramp-method-out-of-band-p, tramp-local-host-p)
  (tramp-get-remote-path, tramp-get-remote-tmpdir)
  (tramp-get-ls-command, tramp-get-ls-command-with-dired)
  (tramp-get-test-command, tramp-get-test-nt-command)
  (tramp-get-file-exists-command, tramp-get-remote-ln)
  (tramp-get-remote-perl, tramp-get-remote-stat)
  (tramp-get-remote-readlink, tramp-get-remote-trash)
  (tramp-get-remote-id, tramp-get-remote-uid, tramp-get-remote-gid)
  (tramp-get-local-uid, tramp-get-local-gid)
  (tramp-get-inline-compress, tramp-get-inline-coding, ): Move to
  tramp-sh.el.
  (tramp-methods, tramp-default-method-alist)
  (tramp-default-user-alist, tramp-foreign-file-name-handler-alist):
  Move initialization to tramp-sh.el.
  (tramp-temp-name-prefix): Make it a defconst.
  (tramp-dissect-file-name): Don't check anymore for multi-hop
  methods.
  (tramp-debug-outline-regexp): Add a docstring.
  (tramp-debug-outline-level): Renamed from `tramp-outline-level'.
  (tramp-get-debug-buffer): Use it.
  
  * net/tramp-cache.el (top): Set tramp-autoload cookie for
  initialization forms.
  (tramp-set-connection-property): Don't protect `tramp-message'
  call, it isn't necessary any longer.
  (tramp-dump-connection-properties): Use `ignore-errors'.
  
  * net/tramp-compat.el (top): Require 'advice, 'format-spec,
  'password-cache and 'auth-source.
  
  * net/tramp-gvfs.el (top):
  * net/tramp-smb.el (top): Require 'tramp-sh.
  
  * net/tramp-gw.el (tramp-gw-open-network-stream): Use `ignore-errors'.
  
  * net/tramp-sh.el: New file, derived from tramp.el.
  (top): Initialize `tramp-methods', `tramp-default-method-alist',
  `tramp-default-user-alist', tramp-foreign-file-name-handler-alist.
  Remove "scp1_old", "scp2_old", "ssh1_old", "ssh2_old".  Use
  `ignore-errors' where appropriate.
  (tramp-sh-file-name-handler-alist): Renamed from
  `tramp-file-name-handler-alist'.
  (tramp-send-command-and-check): Return t or nil.  Remove all
  `zerop' checks, where called.
  (tramp-handle-set-file-modes)
  (tramp-do-copy-or-rename-file-directly)
  (tramp-handle-delete-directory, tramp-handle-delete-file)
  (tramp-maybe-send-script, ): Use `tramp-barf-unless-okay'.
  (tramp-sh-file-name-handler, tramp-send-command-and-check)
  (tramp-get-remote-ln): Set tramp-autoload cookie.
  
  * net/tramp-fish.el: Remove file.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-13 10:44:07 +0000
+++ lisp/ChangeLog	2010-09-13 15:17:01 +0000
@@ -1,3 +1,144 @@
+2010-09-13  Michael Albinus  <michael.albinus@gmx.de>
+
+	Major code cleanup.  Split tramp.el into tramp.el and tramp-sh.el.
+
+	* Makefile.in (TRAMP_SRC): Remove tramp-fish.el.  Add tramp-sh.el.
+
+	* net/tramp.el (top): Don't show loading message.  Require just
+	'tramp-compat, everything else is required there.  Use
+	`ignore-errors' where appropriate.
+	(tramp-inline-compress-start-size, tramp-copy-size-limit)
+	(tramp-terminal-type, tramp-end-of-output)
+	(tramp-initial-end-of-output, tramp-completion-function-alist-rsh)
+	(tramp-completion-function-alist-ssh)
+	(tramp-completion-function-alist-telnet)
+	(tramp-completion-function-alist-su)
+	(tramp-completion-function-alist-putty, tramp-remote-path)
+	(tramp-remote-process-environment, tramp-sh-extra-args)
+	(tramp-actions-before-shell, tramp-uudecode)
+	(tramp-perl-file-truename, tramp-perl-file-name-all-completions)
+	(tramp-perl-file-attributes)
+	(tramp-perl-directory-files-and-attributes)
+	(tramp-perl-encode-with-module, tramp-perl-decode-with-module)
+	(tramp-perl-encode, tramp-perl-decode)
+	(tramp-vc-registered-read-file-names, tramp-file-mode-type-map)
+	(tramp-file-name-handler-alist, tramp-make-tramp-temp-file)
+	(tramp-handle-make-symbolic-link, tramp-handle-load)
+	(tramp-handle-file-name-as-directory)
+	(tramp-handle-file-name-directory)
+	(tramp-handle-file-name-nondirectory, tramp-handle-file-truename)
+	(tramp-handle-file-exists-p, tramp-handle-file-attributes)
+	(tramp-do-file-attributes-with-ls)
+	(tramp-do-file-attributes-with-perl)
+	(tramp-do-file-attributes-with-stat)
+	(tramp-handle-set-visited-file-modtime)
+	(tramp-handle-verify-visited-file-modtime)
+	(tramp-handle-set-file-modes, tramp-handle-set-file-times)
+	(tramp-set-file-uid-gid, tramp-remote-selinux-p)
+	(tramp-handle-file-selinux-context)
+	(tramp-handle-set-file-selinux-context)
+	(tramp-handle-file-executable-p, tramp-handle-file-readable-p)
+	(tramp-handle-file-newer-than-file-p, tramp-handle-file-modes)
+	(tramp-handle-file-directory-p, tramp-handle-file-regular-p)
+	(tramp-handle-file-symlink-p, tramp-handle-file-writable-p)
+	(tramp-handle-file-ownership-preserved-p)
+	(tramp-handle-directory-file-name, tramp-handle-directory-files)
+	(tramp-handle-directory-files-and-attributes)
+	(tramp-do-directory-files-and-attributes-with-perl)
+	(tramp-do-directory-files-and-attributes-with-stat)
+	(tramp-handle-file-name-all-completions)
+	(tramp-handle-file-name-completion, tramp-handle-add-name-to-file)
+	(tramp-handle-copy-file, tramp-handle-copy-directory)
+	(tramp-handle-rename-file, tramp-do-copy-or-rename-file)
+	(tramp-do-copy-or-rename-file-via-buffer)
+	(tramp-do-copy-or-rename-file-directly)
+	(tramp-do-copy-or-rename-file-out-of-band)
+	(tramp-handle-make-directory, tramp-handle-delete-directory)
+	(tramp-handle-delete-file)
+	(tramp-handle-dired-recursive-delete-directory)
+	(tramp-handle-dired-compress-file, tramp-handle-dired-uncache)
+	(tramp-handle-insert-directory)
+	(tramp-handle-unhandled-file-name-directory)
+	(tramp-handle-expand-file-name)
+	(tramp-handle-substitute-in-file-name)
+	(tramp-handle-executable-find, tramp-process-sentinel)
+	(tramp-handle-start-file-process, tramp-handle-process-file)
+	(tramp-handle-call-process-region, tramp-handle-shell-command)
+	(tramp-handle-file-local-copy, tramp-handle-file-remote-p)
+	(tramp-handle-insert-file-contents)
+	(tramp-handle-insert-file-contents-literally)
+	(tramp-handle-find-backup-file-name)
+	(tramp-handle-make-auto-save-file-name, tramp-handle-write-region)
+	(tramp-vc-registered-file-names, tramp-handle-vc-registered)
+	(tramp-sh-file-name-handler, tramp-vc-file-name-handler)
+	(tramp-maybe-send-script, tramp-set-auto-save, tramp-run-test)
+	(tramp-run-test2, tramp-find-executable, tramp-set-remote-path)
+	(tramp-find-file-exists-command, tramp-open-shell)
+	(tramp-find-shell, tramp-barf-if-no-shell-prompt)
+	(tramp-open-connection-setup-interactive-shell)
+	(tramp-local-coding-commands, tramp-remote-coding-commands)
+	(tramp-find-inline-encoding, tramp-call-local-coding-command)
+	(tramp-inline-compress-commands, tramp-find-inline-compress)
+	(tramp-compute-multi-hops, tramp-maybe-open-connection)
+	(tramp-send-command , tramp-wait-for-output)
+	(tramp-send-command-and-check, tramp-barf-unless-okay)
+	(tramp-send-command-and-read, tramp-mode-string-to-int)
+	(tramp-convert-file-attributes, tramp-check-cached-permissions)
+	(tramp-file-mode-from-int, tramp-file-mode-permissions)
+	(tramp-shell-case-fold, tramp-make-copy-program-file-name)
+	(tramp-method-out-of-band-p, tramp-local-host-p)
+	(tramp-get-remote-path, tramp-get-remote-tmpdir)
+	(tramp-get-ls-command, tramp-get-ls-command-with-dired)
+	(tramp-get-test-command, tramp-get-test-nt-command)
+	(tramp-get-file-exists-command, tramp-get-remote-ln)
+	(tramp-get-remote-perl, tramp-get-remote-stat)
+	(tramp-get-remote-readlink, tramp-get-remote-trash)
+	(tramp-get-remote-id, tramp-get-remote-uid, tramp-get-remote-gid)
+	(tramp-get-local-uid, tramp-get-local-gid)
+	(tramp-get-inline-compress, tramp-get-inline-coding, ): Move to
+	tramp-sh.el.
+	(tramp-methods, tramp-default-method-alist)
+	(tramp-default-user-alist, tramp-foreign-file-name-handler-alist):
+	Move initialization to tramp-sh.el.
+	(tramp-temp-name-prefix): Make it a defconst.
+	(tramp-dissect-file-name): Don't check anymore for multi-hop
+	methods.
+	(tramp-debug-outline-regexp): Add a docstring.
+	(tramp-debug-outline-level): Renamed from `tramp-outline-level'.
+	(tramp-get-debug-buffer): Use it.
+
+	* net/tramp-cache.el (top): Set tramp-autoload cookie for
+	initialization forms.
+	(tramp-set-connection-property): Don't protect `tramp-message'
+	call, it isn't necessary any longer.
+	(tramp-dump-connection-properties): Use `ignore-errors'.
+
+	* net/tramp-compat.el (top): Require 'advice, 'format-spec,
+	'password-cache and 'auth-source.
+
+	* net/tramp-gvfs.el (top):
+	* net/tramp-smb.el (top): Require 'tramp-sh.
+
+	* net/tramp-gw.el (tramp-gw-open-network-stream): Use `ignore-errors'.
+
+	* net/tramp-sh.el: New file, derived from tramp.el.
+	(top): Initialize `tramp-methods', `tramp-default-method-alist',
+	`tramp-default-user-alist', tramp-foreign-file-name-handler-alist.
+	Remove "scp1_old", "scp2_old", "ssh1_old", "ssh2_old".  Use
+	`ignore-errors' where appropriate.
+	(tramp-sh-file-name-handler-alist): Renamed from
+	`tramp-file-name-handler-alist'.
+	(tramp-send-command-and-check): Return t or nil.  Remove all
+	`zerop' checks, where called.
+	(tramp-handle-set-file-modes)
+	(tramp-do-copy-or-rename-file-directly)
+	(tramp-handle-delete-directory, tramp-handle-delete-file)
+	(tramp-maybe-send-script, ): Use `tramp-barf-unless-okay'.
+	(tramp-sh-file-name-handler, tramp-send-command-and-check)
+	(tramp-get-remote-ln): Set tramp-autoload cookie.
+
+	* net/tramp-fish.el: Remove file.
+
 2010-09-13  Daiki Ueno  <ueno@unixuser.org>
 
 	* epa-file.el (epa-file-insert-file-contents): If visiting, bind

=== modified file 'lisp/Makefile.in'
--- lisp/Makefile.in	2010-09-08 14:42:54 +0000
+++ lisp/Makefile.in	2010-09-13 15:17:01 +0000
@@ -336,9 +336,9 @@
 TRAMP_DIR = $(lisp)/net
 TRAMP_SRC = $(TRAMP_DIR)/tramp.el  $(TRAMP_DIR)/tramp-cache.el  \
 	$(TRAMP_DIR)/tramp-cmds.el $(TRAMP_DIR)/tramp-compat.el \
-	$(TRAMP_DIR)/tramp-fish.el $(TRAMP_DIR)/tramp-ftp.el    \
-	$(TRAMP_DIR)/tramp-gvfs.el $(TRAMP_DIR)/tramp-gw.el     \
-	$(TRAMP_DIR)/tramp-imap.el $(TRAMP_DIR)/tramp-smb.el    \
+	$(TRAMP_DIR)/tramp-ftp.el  $(TRAMP_DIR)/tramp-gvfs.el   \
+	$(TRAMP_DIR)/tramp-gw.el   $(TRAMP_DIR)/tramp-imap.el   \
+	$(TRAMP_DIR)/tramp-sh.el   $(TRAMP_DIR)/tramp-smb.el    \
 	$(TRAMP_DIR)/tramp-uu.el   $(TRAMP_DIR)/trampver.el
 
 $(TRAMP_DIR)/tramp-loaddefs.el: $(TRAMP_SRC)

=== modified file 'lisp/net/tramp-cache.el'
--- lisp/net/tramp-cache.el	2010-09-13 14:42:33 +0000
+++ lisp/net/tramp-cache.el	2010-09-13 15:17:01 +0000
@@ -149,8 +149,10 @@
 	value)
      ,@body))
 
+;;;###tramp-autoload
 (put 'with-file-property 'lisp-indent-function 3)
 (put 'with-file-property 'edebug-form-spec t)
+;;;###tramp-autoload
 (font-lock-add-keywords 'emacs-lisp-mode '("\\<with-file-property\\>"))
 
 ;;;###tramp-autoload
@@ -235,12 +237,7 @@
 			    tramp-cache-data))))
     (puthash property value hash)
     (setq tramp-cache-data-changed t)
-    ;; This function is called also during initialization of
-    ;; tramp-cache.el.  `tramp-message´ is not defined yet at this
-    ;; time, so we ignore the corresponding error.
-    (condition-case nil
-	(tramp-message key 7 "%s %s" property value)
-      (error nil))
+    (tramp-message key 7 "%s %s" property value)
     value))
 
 ;;;###tramp-autoload
@@ -255,8 +252,10 @@
       (tramp-set-connection-property ,key ,property value))
     value))
 
+;;;###tramp-autoload
 (put 'with-connection-property 'lisp-indent-function 2)
 (put 'with-connection-property 'edebug-form-spec t)
+;;;###tramp-autoload
 (font-lock-add-keywords 'emacs-lisp-mode '("\\<with-connection-property\\>"))
 
 ;;;###tramp-autoload
@@ -315,41 +314,40 @@
 (defun tramp-dump-connection-properties ()
   "Write persistent connection properties into file `tramp-persistency-file-name'."
   ;; We shouldn't fail, otherwise (X)Emacs might not be able to be closed.
-  (condition-case nil
-      (when (and (hash-table-p tramp-cache-data)
-		 (not (zerop (hash-table-count tramp-cache-data)))
-		 tramp-cache-data-changed
-		 (stringp tramp-persistency-file-name))
-	(let ((cache (copy-hash-table tramp-cache-data)))
-	  ;; Remove temporary data.
-	  (maphash
-	   '(lambda (key value)
-	      (if (and (vectorp key) (not (tramp-file-name-localname key)))
-		  (progn
-		    (remhash "process-name" value)
-		    (remhash "process-buffer" value)
-		    (remhash "first-password-request" value))
-		(remhash key cache)))
-	   cache)
-	  ;; Dump it.
-	  (with-temp-buffer
-	    (insert
-	     ";; -*- emacs-lisp -*-"
-	     ;; `time-stamp-string' might not exist in all (X)Emacs flavors.
-	     (condition-case nil
-		 (progn
-		   (format
-		    " <%s %s>\n"
-		    (time-stamp-string "%02y/%02m/%02d %02H:%02M:%02S")
-		    tramp-persistency-file-name))
-	       (error "\n"))
-	     ";; Tramp connection history.  Don't change this file.\n"
-	     ";; You can delete it, forcing Tramp to reapply the checks.\n\n"
-	     (with-output-to-string
-	       (pp (read (format "(%s)" (tramp-cache-print cache))))))
-	    (write-region
-	     (point-min) (point-max) tramp-persistency-file-name))))
-    (error nil)))
+  (ignore-errors
+    (when (and (hash-table-p tramp-cache-data)
+	       (not (zerop (hash-table-count tramp-cache-data)))
+	       tramp-cache-data-changed
+	       (stringp tramp-persistency-file-name))
+      (let ((cache (copy-hash-table tramp-cache-data)))
+	;; Remove temporary data.
+	(maphash
+	 '(lambda (key value)
+	    (if (and (vectorp key) (not (tramp-file-name-localname key)))
+		(progn
+		  (remhash "process-name" value)
+		  (remhash "process-buffer" value)
+		  (remhash "first-password-request" value))
+	      (remhash key cache)))
+	 cache)
+	;; Dump it.
+	(with-temp-buffer
+	  (insert
+	   ";; -*- emacs-lisp -*-"
+	   ;; `time-stamp-string' might not exist in all (X)Emacs flavors.
+	   (condition-case nil
+	       (progn
+		 (format
+		  " <%s %s>\n"
+		  (time-stamp-string "%02y/%02m/%02d %02H:%02M:%02S")
+		  tramp-persistency-file-name))
+	     (error "\n"))
+	   ";; Tramp connection history.  Don't change this file.\n"
+	   ";; You can delete it, forcing Tramp to reapply the checks.\n\n"
+	   (with-output-to-string
+	     (pp (read (format "(%s)" (tramp-cache-print cache))))))
+	  (write-region
+	   (point-min) (point-max) tramp-persistency-file-name))))))
 
 (add-hook 'kill-emacs-hook 'tramp-dump-connection-properties)
 (add-hook 'tramp-cache-unload-hook

=== modified file 'lisp/net/tramp-compat.el'
--- lisp/net/tramp-compat.el	2010-09-13 14:42:33 +0000
+++ lisp/net/tramp-compat.el	2010-09-13 15:17:01 +0000
@@ -38,7 +38,21 @@
 
 (eval-and-compile
 
+  (require 'advice)
   (require 'custom)
+  (require 'format-spec)
+
+  ;; As long as password.el is not part of (X)Emacs, it shouldn't be
+  ;; mandatory.
+  (if (featurep 'xemacs)
+      (load "password" 'noerror)
+    (or (require 'password-cache nil 'noerror)
+	(require 'password nil 'noerror))) ; Part of contrib.
+
+  ;; auth-source is relatively new.
+  (if (featurep 'xemacs)
+      (load "auth-source" 'noerror)
+    (require 'auth-source nil 'noerror))
 
   ;; Load the appropriate timer package.
   (if (featurep 'xemacs)

=== removed file 'lisp/net/tramp-fish.el'
--- lisp/net/tramp-fish.el	2010-09-08 14:42:54 +0000
+++ lisp/net/tramp-fish.el	1970-01-01 00:00:00 +0000
@@ -1,1186 +0,0 @@
-;;; tramp-fish.el --- Tramp access functions for FISH protocol
-
-;; Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-
-;; Author: Michael Albinus <michael.albinus@gmx.de>
-;; Keywords: comm, processes
-;; Package: tramp
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Access functions for FIles transferred over SHell protocol from Tramp.
-
-;; FISH is a protocol developped for the GNU Midnight Commander
-;; <https://savannah.gnu.org/projects/mc>.  A client connects to a
-;; remote host via ssh (or rsh, shall be configurable), and starts
-;; there a fish server via the command "start_fish_server".  All
-;; commands from the client have the form "#FISH_COMMAND\n" (always
-;; one line), followed by equivalent shell commands in case there is
-;; no fish server running.
-
-;; The fish server (or the equivalent shell commands) must return the
-;; response, which is finished by a line "### xxx  <optional text>\n".
-;; "xxx" stands for 3 digits, representing a return code.  Return
-;; codes "# 000" and "# 001" are reserved for fallback implementation
-;; with native shell commands; they are not used inside the server.  See
-;; <http://cvs.savannah.gnu.org/viewcvs/mc/vfs/README.fish?root=mc&view=markup>
-;; for details of original specification.
-
-;; The GNU Midnight Commander implements the original fish protocol
-;; version 0.0.2.  The KDE Konqueror has its own implementation, which
-;; can be found at
-;; <http://websvn.kde.org/branches/KDE/3.5/kdebase/kioslave/fish>.  It
-;; implements an extended protocol version 0.0.3.  Additionally, it
-;; provides a fish server implementation in Perl (which is the only
-;; implementation I've heard of).  The following command reference is
-;; based on that implementation.
-
-;; All commands return either "### 2xx\n" (OK) or "### 5xx <optional text>\n"
-;; (NOK).  Return codes are mentioned only if they are different from this.
-;; Spaces in any parameter must be escaped by "\ ".
-
-;; Command/Return Code			Comment
-;;
-;; #FISH				initial connection, not used
-;;					in .fishsrv.pl
-;; ### 100 transfer fish server		missing server, or wrong checksum
-;;					version 0.0.3 only
-
-;; #VER a.b.c <commands requested>
-;; VER x.y.z <commands offered>		.fishsrv.pl response is not uptodate
-
-;; #PWD
-;; /path/to/file
-
-;; #CWD /some/path
-
-;; #COPY /path/a /path/b		version 0.0.3 only
-
-;; #RENAME /path/a /path/b
-
-;; #SYMLINK /path/a /path/b
-
-;; #LINK /path/a /path/b
-
-;; #DELE /some/path
-
-;; #MKD /some/path
-
-;; #RMD /some/path
-
-;; #CHOWN user /file/name
-
-;; #CHGRP group /file/name
-
-;; #CHMOD 1234 file
-
-;; #READ <offset> <size> /path/and/filename
-;; ### 291				successful exit when reading
-;;					ended at eof
-;; ### 292				successful exit when reading
-;;					did not end at eof
-
-;; #WRITE <offset> <size> /path/and/filename
-
-;; #APPEND <size> /path/and/filename	version 0.0.3 only
-
-;; #LIST /directory
-;; <number of entries>			version 0.0.3 only
-;; ### 100				version 0.0.3 only
-;; P<unix permissions> <owner>.<group>
-;; S<size>
-;; d<3-letters month name> <day> <year or HH:MM>
-;; D<year> <month> <day> <hour> <minute> <second>[.1234]
-;; E<major-of-device>,<minor>
-;; :<filename>
-;; L<filename symlink points to>
-;; M<mimetype>				version 0.0.3 only
-;; <blank line to separate items>
-
-;; #STAT /file				version 0.0.3 only
-;;					like #LIST except for directories
-;; <number of entries>
-;; ### 100
-;; P<unix permissions> <owner>.<group>
-;; S<size>
-;; d<3-letters month name> <day> <year or HH:MM>
-;; D<year> <month> <day> <hour> <minute> <second>[.1234]
-;; E<major-of-device>,<minor>
-;; :<filename>
-;; L<filename symlink points to>
-;; <blank line to separate items>
-
-;; #RETR /some/name
-;; <filesize>
-;; ### 100
-;; <binary data>			exactly filesize bytes
-;; ### 200				with no preceding newline
-
-;; #STOR <size> /file/name
-;; ### 100
-;; <data>				exactly size bytes
-;; ### 001				partial success
-
-;; #EXEC <command> <tmpfile>		version 0.0.3 only
-;; <tmpfile> must not exists.  It contains the output of <command>.
-;; It can be retrieved afterwards.  Last line is
-;; ###RESULT: <returncode>
-
-;; This implementation is meant as proof of the concept, whether there
-;; is a better performance compared with the native ssh method.  It
-;; looks like the file information retrieval is slower, especially the
-;; #LIST command.  On the other hand, the file contents transmission
-;; seems to perform better than other inline methods, because there is
-;; no need for data encoding/decoding, and it supports the APPEND
-;; parameter of `write-region'.  Transfer of binary data fails due to
-;; Emacs' process input/output handling.
-
-;;; Code:
-
-(eval-when-compile
-  ;; Pacify byte-compiler.
-  (require 'cl))
-
-(require 'tramp)
-
-;; Define FISH method ...
-;;;###tramp-autoload
-(defconst tramp-fish-method "fish"
-  "*Method to connect via FISH protocol.")
-
-;; ... and add it to the method list.
-;;;###tramp-autoload
-(add-to-list 'tramp-methods (cons tramp-fish-method nil))
-
-;; Add a default for `tramp-default-user-alist'. Default is the local user.
-(add-to-list 'tramp-default-user-alist
-	     `(,tramp-fish-method nil ,(user-login-name)))
-
-;; Add completion function for FISH method.
-(tramp-set-completion-function
- tramp-fish-method tramp-completion-function-alist-ssh)
-
-(defconst tramp-fish-continue-prompt-regexp "^### 100.*\n"
-  "FISH return code OK.")
-
-;; It cannot be a defconst, occasionally we bind it locally.
-(defvar tramp-fish-ok-prompt-regexp "^### 200\n"
-  "FISH return code OK.")
-
-(defconst tramp-fish-error-prompt-regexp "^### \\(4\\|5\\)[0-9]+.*\n"
-  "Regexp for possible error strings of FISH servers.
-Used instead of analyzing error codes of commands.")
-
-(defcustom tramp-fish-start-fish-server-command
-  (concat "stty intr \"\" quit \"\" erase \"\" kill \"\" eof \"\" eol \"\" eol2 \"\" swtch \"\" start \"\" stop \"\" susp \"\" rprnt \"\" werase \"\" lnext \"\" flush \"\"; "
-	  "perl .fishsrv.pl "
-	    "`grep 'ARGV\\[0\\]' .fishsrv.pl | "
-	    "sed -e 's/^[^\"]*\"//' -e 's/\"[^\"]*$//'`; "
-	  "exit")
-  "*Command to connect via FISH protocol."
-  :group 'tramp
-  :type 'string)
-
-;; New handlers should be added here.
-(defconst tramp-fish-file-name-handler-alist
-  '(
-    ;; `access-file' performed by default handler
-    (add-name-to-file . tramp-fish-handle-add-name-to-file)
-    ;; `byte-compiler-base-file-name' performed by default handler
-    (copy-file . tramp-fish-handle-copy-file)
-    (delete-directory . tramp-fish-handle-delete-directory)
-    (delete-file . tramp-fish-handle-delete-file)
-    ;; `diff-latest-backup-file' performed by default handler
-    (directory-file-name . tramp-handle-directory-file-name)
-    (directory-files . tramp-handle-directory-files)
-    (directory-files-and-attributes . tramp-fish-handle-directory-files-and-attributes)
-    ;; `dired-call-process' performed by default handler
-    ;; `dired-compress-file' performed by default handler
-    (dired-uncache . tramp-handle-dired-uncache)
-    (expand-file-name . tramp-fish-handle-expand-file-name)
-    ;; `file-accessible-directory-p' performed by default handler
-    (file-attributes . tramp-fish-handle-file-attributes)
-    (file-directory-p .  tramp-fish-handle-file-directory-p)
-    (file-executable-p . tramp-fish-handle-file-executable-p)
-    (file-exists-p . tramp-fish-handle-file-exists-p)
-    (file-local-copy . tramp-fish-handle-file-local-copy)
-    (file-modes . tramp-handle-file-modes)
-    (file-name-all-completions . tramp-fish-handle-file-name-all-completions)
-    (file-name-as-directory . tramp-handle-file-name-as-directory)
-    (file-name-completion . tramp-handle-file-name-completion)
-    (file-name-directory . tramp-handle-file-name-directory)
-    (file-name-nondirectory . tramp-handle-file-name-nondirectory)
-    ;; `file-name-sans-versions' performed by default handler
-    (file-newer-than-file-p . tramp-fish-handle-file-newer-than-file-p)
-    (file-ownership-preserved-p . ignore)
-    (file-readable-p . tramp-fish-handle-file-readable-p)
-    (file-regular-p . tramp-handle-file-regular-p)
-    (file-remote-p . tramp-handle-file-remote-p)
-    ;; `file-selinux-context' performed by default handler.
-    (file-symlink-p . tramp-handle-file-symlink-p)
-    ;; `file-truename' performed by default handler
-    (file-writable-p . tramp-fish-handle-file-writable-p)
-    (find-backup-file-name . tramp-handle-find-backup-file-name)
-    ;; `find-file-noselect' performed by default handler
-    ;; `get-file-buffer' performed by default handler
-    (insert-directory . tramp-fish-handle-insert-directory)
-    (insert-file-contents . tramp-fish-handle-insert-file-contents)
-    (load . tramp-handle-load)
-    (make-directory . tramp-fish-handle-make-directory)
-    (make-directory-internal . tramp-fish-handle-make-directory-internal)
-    (make-symbolic-link . tramp-fish-handle-make-symbolic-link)
-    (rename-file . tramp-fish-handle-rename-file)
-    (set-file-modes . tramp-fish-handle-set-file-modes)
-    ;; `set-file-selinux-context' performed by default handler.
-    (set-file-times . tramp-fish-handle-set-file-times)
-    (set-visited-file-modtime . ignore)
-    (shell-command . tramp-handle-shell-command)
-    (substitute-in-file-name . tramp-handle-substitute-in-file-name)
-    (unhandled-file-name-directory . tramp-handle-unhandled-file-name-directory)
-    (vc-registered . ignore)
-    (verify-visited-file-modtime . ignore)
-    (write-region . tramp-fish-handle-write-region)
-    (executable-find . tramp-fish-handle-executable-find)
-    (start-file-process . ignore)
-    (process-file . tramp-fish-handle-process-file)
-)
-  "Alist of handler functions for Tramp FISH method.
-Operations not mentioned here will be handled by the default Emacs primitives.")
-
-;;;###tramp-autoload
-(defsubst tramp-fish-file-name-p (filename)
-  "Check if it's a filename for FISH protocol."
-  (let ((v (tramp-dissect-file-name filename)))
-    (string= (tramp-file-name-method v) tramp-fish-method)))
-
-;;;###tramp-autoload
-(defun tramp-fish-file-name-handler (operation &rest args)
-  "Invoke the FISH related OPERATION.
-First arg specifies the OPERATION, second arg is a list of arguments to
-pass to the OPERATION."
-  (let ((fn (assoc operation tramp-fish-file-name-handler-alist)))
-    (if fn
-	(save-match-data (apply (cdr fn) args))
-      (tramp-run-real-handler operation args))))
-
-;;;###tramp-autoload
-(add-to-list 'tramp-foreign-file-name-handler-alist
-	     (cons 'tramp-fish-file-name-p 'tramp-fish-file-name-handler))
-
-
-;; File name primitives
-
-(defun tramp-fish-handle-add-name-to-file
-  (filename newname &optional ok-if-already-exists)
-  "Like `add-name-to-file' for Tramp files."
-  (unless (tramp-equal-remote filename newname)
-    (with-parsed-tramp-file-name
-	(if (tramp-tramp-file-p filename) filename newname) nil
-      (tramp-error
-       v 'file-error
-       "add-name-to-file: %s"
-       "only implemented for same method, same user, same host")))
-  (with-parsed-tramp-file-name filename v1
-    (with-parsed-tramp-file-name newname v2
-      (when (and (not ok-if-already-exists)
-		 (file-exists-p newname)
-		 (not (numberp ok-if-already-exists))
-		 (y-or-n-p
-		  (format
-		   "File %s already exists; make it a new name anyway? "
-		   newname)))
-	(tramp-error
-	 v2 'file-error
-	 "add-name-to-file: file %s already exists" newname))
-      (tramp-flush-file-property v2 v2-localname)
-      (unless (tramp-fish-send-command-and-check
-	       v1 (format "#LINK %s %s" v1-localname v2-localname))
-	(tramp-error
-	 v1 'file-error "Error with add-name-to-file %s" newname)))))
-
-(defun tramp-fish-handle-copy-file
-  (filename newname &optional ok-if-already-exists keep-date
-	    preserve-uid-gid preserve-selinux-context)
-  "Like `copy-file' for Tramp files."
-  (tramp-fish-do-copy-or-rename-file
-   'copy filename newname ok-if-already-exists keep-date preserve-uid-gid))
-
-(defun tramp-fish-handle-delete-directory (directory &optional recursive)
-  "Like `delete-directory' for Tramp files."
-  (when (file-exists-p directory)
-    (if recursive
-	(mapc
-	 (lambda (file)
-	   (if (file-directory-p file)
-	       (tramp-compat-delete-directory file recursive)
-	     (delete-file file)))
-	 ;; We do not want to delete "." and "..".
-	 (directory-files
-	  directory 'full "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*")))
-    (with-parsed-tramp-file-name
-	(directory-file-name (expand-file-name directory)) nil
-      (tramp-flush-directory-property v localname)
-      (tramp-fish-send-command-and-check v (format "#RMD %s" localname)))))
-
-(defun tramp-fish-handle-delete-file (filename &optional trash)
-  "Like `delete-file' for Tramp files."
-  (when (file-exists-p filename)
-    (with-parsed-tramp-file-name (expand-file-name filename) nil
-      (tramp-flush-file-property v localname)
-      (tramp-fish-send-command-and-check v (format "#DELE %s" localname)))))
-
-(defun tramp-fish-handle-directory-files-and-attributes
-  (directory &optional full match nosort id-format)
-  "Like `directory-files-and-attributes' for Tramp files."
-  (mapcar
-   (lambda (x)
-     (cons x
-	   (tramp-compat-file-attributes
-	    (if full x (expand-file-name x directory))
-	    id-format)))
-   (directory-files directory full match nosort)))
-
-(defun tramp-fish-handle-expand-file-name (name &optional dir)
-  "Like `expand-file-name' for Tramp files."
-  ;; If DIR is not given, use DEFAULT-DIRECTORY or "/".
-  (setq dir (or dir default-directory "/"))
-  ;; Unless NAME is absolute, concat DIR and NAME.
-  (unless (file-name-absolute-p name)
-    (setq name (concat (file-name-as-directory dir) name)))
-  ;; If NAME is not a Tramp file, run the real handler,
-  (if (or (tramp-completion-mode-p) (not (tramp-tramp-file-p name)))
-      (tramp-drop-volume-letter
-       (tramp-run-real-handler 'expand-file-name (list name nil)))
-    ;; Dissect NAME.
-    (with-parsed-tramp-file-name name nil
-      (unless (tramp-run-real-handler 'file-name-absolute-p (list localname))
-	(setq localname (concat "~/" localname)))
-      ;; Tilde expansion if necessary.
-      (when (string-match "\\`\\(~[^/]*\\)\\(.*\\)\\'" localname)
-	(let ((uname (match-string 1 localname))
-	      (fname (match-string 2 localname)))
-	  ;; We cannot apply "~user/", because this is not supported
-	  ;; by the FISH protocol.
-	  (unless (string-equal uname "~")
-	    (tramp-error
-	     v 'file-error "Tilde expansion not supported for %s" name))
-	  (setq uname
-	    (with-connection-property v uname
-	      (tramp-fish-send-command-and-check v "#PWD")
-	      (with-current-buffer (tramp-get-buffer v)
-		(goto-char (point-min))
-		(buffer-substring (point) (tramp-compat-line-end-position)))))
-	  (setq localname (concat uname fname))))
-      ;; There might be a double slash, for example when "~/"
-      ;; expands to "/". Remove this.
-      (while (string-match "//" localname)
-	(setq localname (replace-match "/" t t localname)))
-      ;; No tilde characters in file name, do normal
-      ;; expand-file-name (this does "/./" and "/../").  We bind
-      ;; `directory-sep-char' here for XEmacs on Windows, which
-      ;; would otherwise use backslash.  `default-directory' is
-      ;; bound, because on Windows there would be problems with UNC
-      ;; shares or Cygwin mounts.
-      (let ((directory-sep-char ?/)
-	    (default-directory (tramp-compat-temporary-file-directory)))
-	(tramp-make-tramp-file-name
-	 method user host
-	 (tramp-drop-volume-letter
-	  (tramp-run-real-handler
-	   'expand-file-name (list localname))))))))
-
-(defun tramp-fish-handle-file-attributes (filename &optional id-format)
-  "Like `file-attributes' for Tramp files."
-  (with-parsed-tramp-file-name (expand-file-name filename) nil
-    (with-file-property v localname (format "file-attributes-%s" id-format)
-      (cdr (car (tramp-fish-get-file-entries v localname nil))))))
-
-(defun tramp-fish-handle-file-directory-p (filename)
-  "Like `file-directory-p' for Tramp files."
-  (let ((attributes (file-attributes filename)))
-    (and attributes
-	 (or (string-match "d" (nth 8 attributes))
-	     (and (file-symlink-p filename)
-		  (with-parsed-tramp-file-name filename nil
-		    (file-directory-p
-		     (tramp-make-tramp-file-name
-		      method user host (nth 0 attributes))))))
-	 t)))
-
-(defun tramp-fish-handle-file-exists-p (filename)
-  "Like `file-exists-p' for Tramp files."
-  (and (file-attributes filename) t))
-
-(defun tramp-fish-handle-file-executable-p (filename)
-  "Like `file-executable-p' for Tramp files."
-  (with-parsed-tramp-file-name (expand-file-name filename) nil
-    (with-file-property v localname "file-executable-p"
-      (when (file-exists-p filename)
-	(let ((mode-chars (string-to-vector (nth 8 (file-attributes filename))))
-	      (home-directory
-	       (tramp-make-tramp-file-name
-		method user host
-		(tramp-get-connection-property v "home-directory" nil))))
-	  (or (and (char-equal (aref mode-chars 3) ?x)
-		   (equal (nth 2 (file-attributes filename))
-			  (nth 2 (file-attributes home-directory))))
-	      (and (char-equal (aref mode-chars 6) ?x)
-		   (equal (nth 3 (file-attributes filename))
-			  (nth 3 (file-attributes home-directory))))
-	      (char-equal (aref mode-chars 9) ?x)))))))
-
-(defun tramp-fish-handle-file-readable-p (filename)
-  "Like `file-readable-p' for Tramp files."
-  (with-parsed-tramp-file-name (expand-file-name filename) nil
-    (with-file-property v localname "file-readable-p"
-      (when (file-exists-p filename)
-	(let ((mode-chars (string-to-vector (nth 8 (file-attributes filename))))
-	      (home-directory
-	       (tramp-make-tramp-file-name
-		method user host
-		(tramp-get-connection-property v "home-directory" nil))))
-	  (or (and (char-equal (aref mode-chars 1) ?r)
-		   (equal (nth 2 (file-attributes filename))
-			  (nth 2 (file-attributes home-directory))))
-	      (and (char-equal (aref mode-chars 4) ?r)
-		   (equal (nth 3 (file-attributes filename))
-			  (nth 3 (file-attributes home-directory))))
-	      (char-equal (aref mode-chars 7) ?r)))))))
-
-(defun tramp-fish-handle-file-writable-p (filename)
-  "Like `file-writable-p' for Tramp files."
-  (with-parsed-tramp-file-name (expand-file-name filename) nil
-    (with-file-property v localname "file-writable-p"
-      (if (not (file-exists-p filename))
-	  ;; If file doesn't exist, check if directory is writable.
-	  (and (file-directory-p (file-name-directory filename))
-	       (file-writable-p (file-name-directory filename)))
-	;; Existing files must be writable.
-	(let ((mode-chars (string-to-vector (nth 8 (file-attributes filename))))
-	      (home-directory
-	       (tramp-make-tramp-file-name
-		method user host
-		(tramp-get-connection-property v "home-directory" nil))))
-	  (or (and (char-equal (aref mode-chars 2) ?w)
-		   (equal (nth 2 (file-attributes filename))
-			  (nth 2 (file-attributes home-directory))))
-	      (and (char-equal (aref mode-chars 5) ?w)
-		   (equal (nth 3 (file-attributes filename))
-			  (nth 3 (file-attributes home-directory))))
-	      (char-equal (aref mode-chars 8) ?w)))))))
-
-(defun tramp-fish-handle-file-local-copy (filename)
-  "Like `file-local-copy' for Tramp files."
-  (with-parsed-tramp-file-name (expand-file-name filename) nil
-    (unless (file-exists-p filename)
-      (tramp-error
-       v 'file-error
-       "Cannot make local copy of non-existing file `%s'" filename))
-    (let ((tmpfile (tramp-compat-make-temp-file filename)))
-      (with-progress-reporter
-	  v 3 (format "Fetching %s to tmp file %s" filename tmpfile)
-	(when (tramp-fish-retrieve-data v)
-	  ;; Save file
-	  (with-current-buffer (tramp-get-buffer v)
-	    (write-region (point-min) (point-max) tmpfile))
-	  tmpfile)))))
-
-;; This function should return "foo/" for directories and "bar" for
-;; files.
-(defun tramp-fish-handle-file-name-all-completions (filename directory)
-  "Like `file-name-all-completions' for Tramp files."
-  (all-completions
-   filename
-   (with-parsed-tramp-file-name (expand-file-name directory) nil
-     (with-file-property v localname "file-name-all-completions"
-       (save-match-data
-	 (let ((entries
-		(with-file-property v localname "file-entries"
-		  (tramp-fish-get-file-entries v localname t))))
-	   (mapcar
-	    (lambda (x)
-	      (list
-	       (if (string-match "d" (nth 9 x))
-		   (file-name-as-directory (nth 0 x))
-		 (nth 0 x))))
-	    entries)))))))
-
-(defun tramp-fish-handle-file-newer-than-file-p (file1 file2)
-  "Like `file-newer-than-file-p' for Tramp files."
-  (cond
-   ((not (file-exists-p file1)) nil)
-   ((not (file-exists-p file2)) t)
-   (t (tramp-time-less-p (nth 5 (file-attributes file2))
-			 (nth 5 (file-attributes file1))))))
-
-(defun tramp-fish-handle-insert-directory
-  (filename switches &optional wildcard full-directory-p)
-  "Like `insert-directory' for Tramp files.
-WILDCARD and FULL-DIRECTORY-P are not handled."
-  (setq filename (expand-file-name filename))
-  (when (file-directory-p filename)
-    ;; This check is a little bit strange, but in `dired-add-entry'
-    ;; this function is called with a non-directory ...
-    (setq filename (file-name-as-directory filename)))
-
-  (with-parsed-tramp-file-name filename nil
-    (tramp-flush-file-property v localname)
-    (save-match-data
-      (let ((entries
-	     (with-file-property v localname "file-entries"
-	       (tramp-fish-get-file-entries v localname t))))
-
-	;; Sort entries
-	(setq entries
-	      (sort
-	       entries
-	       (lambda (x y)
-		 (if (string-match "t" switches)
-		     ;; Sort by date.
-		     (tramp-time-less-p (nth 6 y) (nth 6 x))
-		   ;; Sort by name.
-		   (string-lessp (nth 0 x) (nth 0 y))))))
-
-	;; Print entries.
-	(mapcar
-	 (lambda (x)
-	   (insert
-	    (format
-	     "%10s %3d %-8s %-8s %8s %s %s%s\n"
-	     (nth 9 x) ; mode
-	     1         ; hardlinks
-	     (nth 3 x) ; uid
-	     (nth 4 x) ; gid
-	     (nth 8 x) ; size
-	     (format-time-string
-	      (if (tramp-time-less-p
-		   (tramp-time-subtract (current-time) (nth 6 x))
-		   tramp-half-a-year)
-		  "%b %e %R"
-		"%b %e  %Y")
-	      (nth 6 x)) ; date
-	     (nth 0 x) ; file name
-	     (if (stringp (nth 1 x)) (format " -> %s" (nth 1 x)) "")))
-	   (forward-line)
-	   (beginning-of-line))
-	 entries)))))
-
-(defun tramp-fish-handle-insert-file-contents
-  (filename &optional visit beg end replace)
-  "Like `insert-file-contents' for Tramp files."
-  (barf-if-buffer-read-only)
-  (when visit
-    (setq buffer-file-name (expand-file-name filename))
-    (set-visited-file-modtime)
-    (set-buffer-modified-p nil))
-
-  (with-parsed-tramp-file-name filename nil
-    (if (not (file-exists-p filename))
-	(tramp-error
-	 v 'file-error "File %s not found on remote host" filename)
-
-      (let ((point (point))
-	    size)
-	(with-progress-reporter v 3 (format "Fetching file %s" filename)
-	  (when (tramp-fish-retrieve-data v)
-	    ;; Insert file
-	    (insert
-	     (with-current-buffer (tramp-get-buffer v)
-	       (let ((beg (or beg (point-min)))
-		     (end (min (or end (point-max)) (point-max))))
-		 (setq size (- end beg))
-		 (buffer-substring beg end))))
-	    (goto-char point)))
-
-	(list (expand-file-name filename) size)))))
-
-(defun tramp-fish-handle-make-directory (dir &optional parents)
-  "Like `make-directory' for Tramp files."
-  (setq dir (directory-file-name (expand-file-name dir)))
-  (unless (file-name-absolute-p dir)
-    (setq dir (expand-file-name dir default-directory)))
-  (with-parsed-tramp-file-name dir nil
-    (save-match-data
-      (let ((ldir (file-name-directory dir)))
-	;; Make missing directory parts
-	(when (and parents (not (file-directory-p ldir)))
-	  (make-directory ldir parents))
-	;; Just do it
-	(when (file-directory-p ldir)
-	  (make-directory-internal dir))
-	(unless (file-directory-p dir)
-	  (tramp-error v 'file-error "Couldn't make directory %s" dir))))))
-
-(defun tramp-fish-handle-make-directory-internal (directory)
-  "Like `make-directory-internal' for Tramp files."
-  (setq directory (directory-file-name (expand-file-name directory)))
-  (unless (file-name-absolute-p directory)
-    (setq directory (expand-file-name directory default-directory)))
-  (when (file-directory-p (file-name-directory directory))
-    (with-parsed-tramp-file-name directory nil
-      (save-match-data
-	(unless
-	    (tramp-fish-send-command-and-check v (format "#MKD %s" localname))
-	  (tramp-error
-	   v 'file-error "Couldn't make directory %s" directory))))))
-
-(defun tramp-fish-handle-make-symbolic-link
-  (filename linkname &optional ok-if-already-exists)
-  "Like `make-symbolic-link' for Tramp files.
-If LINKNAME is a non-Tramp file, it is used verbatim as the target of
-the symlink.  If LINKNAME is a Tramp file, only the localname component is
-used as the target of the symlink.
-
-If LINKNAME is a Tramp file and the localname component is relative, then
-it is expanded first, before the localname component is taken.  Note that
-this can give surprising results if the user/host for the source and
-target of the symlink differ."
-  (with-parsed-tramp-file-name linkname nil
-    ;; Do the 'confirm if exists' thing.
-    (when (file-exists-p linkname)
-      ;; What to do?
-      (if (or (null ok-if-already-exists) ; not allowed to exist
-	      (and (numberp ok-if-already-exists)
-		   (not (yes-or-no-p
-			 (format
-			  "File %s already exists; make it a link anyway? "
-			  localname)))))
-	  (tramp-error
-	   v 'file-already-exists "File %s already exists" localname)
-	(delete-file linkname)))
-
-    ;; If FILENAME is a Tramp name, use just the localname component.
-    (when (tramp-tramp-file-p filename)
-      (setq filename (tramp-file-name-localname
-		      (tramp-dissect-file-name (expand-file-name filename)))))
-
-    ;; Right, they are on the same host, regardless of user, method, etc.
-    ;; We now make the link on the remote machine. This will occur as the user
-    ;; that FILENAME belongs to.
-    (unless
-	(tramp-fish-send-command-and-check
-	 v (format "#SYMLINK %s %s" filename localname))
-      (tramp-error v 'file-error "Error creating symbolic link %s" linkname))))
-
-(defun tramp-fish-handle-rename-file
-  (filename newname &optional ok-if-already-exists)
-  "Like `rename-file' for Tramp files."
-  (tramp-fish-do-copy-or-rename-file
-   'rename filename newname ok-if-already-exists t))
-
-(defun tramp-fish-handle-set-file-modes (filename mode)
-  "Like `set-file-modes' for Tramp files."
-  (with-parsed-tramp-file-name filename nil
-    (tramp-flush-file-property v localname)
-    (unless (tramp-fish-send-command-and-check
-	     v (format "#CHMOD %s %s"
-		       (tramp-compat-decimal-to-octal mode)
-		       (tramp-shell-quote-argument localname)))
-      (tramp-error
-       v 'file-error "Error while changing file's mode %s" filename))))
-
-(defun tramp-fish-handle-set-file-times (filename &optional time)
-  "Like `set-file-times' for Tramp files."
-  (with-parsed-tramp-file-name filename nil
-    (let ((time (if (or (null time) (equal time '(0 0))) (current-time) time)))
-      (zerop (process-file
-	      "touch" nil nil nil "-t"
-	      (format-time-string "%Y%m%d%H%M.%S" time)
-	      (tramp-shell-quote-argument localname))))))
-
-(defun tramp-fish-handle-write-region
-  (start end filename &optional append visit lockname confirm)
-  "Like `write-region' for Tramp files."
-  (setq filename (expand-file-name filename))
-  (with-parsed-tramp-file-name filename nil
-    ;; XEmacs takes a coding system as the seventh argument, not `confirm'
-    (when (and (not (featurep 'xemacs))
-	       confirm (file-exists-p filename))
-      (unless (y-or-n-p (format "File %s exists; overwrite anyway? "
-				filename))
-	(tramp-error v 'file-error "File not overwritten")))
-
-    (tramp-flush-file-property v localname)
-
-    ;; Send command
-    (let ((tramp-fish-ok-prompt-regexp
-	   (concat
-	    tramp-fish-ok-prompt-regexp "\\|"
-	    tramp-fish-continue-prompt-regexp)))
-      (tramp-fish-send-command
-       v (format "%s %d %s\n### 100"
-		 (if append "#APPEND" "#STOR") (- end start) localname)))
-
-    ;; Send data, if there are any.
-    (when (> end start)
-      (tramp-fish-send-command v (buffer-substring-no-properties start end)))
-
-    (when (eq visit t)
-      (set-visited-file-modtime))))
-
-(defun tramp-fish-handle-executable-find (command)
-  "Like `executable-find' for Tramp files."
-  (with-temp-buffer
-    (if (zerop (process-file "which" nil t nil command))
-	(progn
-	  (goto-char (point-min))
-	  (buffer-substring (point-min) (tramp-compat-line-end-position))))))
-
-(defun tramp-fish-handle-process-file
-  (program &optional infile destination display &rest args)
-  "Like `process-file' for Tramp files."
-  ;; The implementation is not complete yet.
-  (when (and (numberp destination) (zerop destination))
-    (error "Implementation does not handle immediate return"))
-
-  (with-parsed-tramp-file-name default-directory nil
-    (let (command input tmpinput output tmpoutput stderr tmpstderr
-		  outbuf tmpfile ret)
-      ;; Compute command.
-      (setq command (mapconcat 'tramp-shell-quote-argument
-			       (cons program args) " "))
-      ;; Determine input.
-      (if (null infile)
-	  (setq input "/dev/null")
-	(setq infile (expand-file-name infile))
-	(if (tramp-equal-remote default-directory infile)
-	    ;; INFILE is on the same remote host.
-	    (setq input (with-parsed-tramp-file-name infile nil localname))
-	  ;; INFILE must be copied to remote host.
-	  (setq input (tramp-make-tramp-temp-file v)
-		tmpinput (tramp-make-tramp-file-name method user host input))
-	  (copy-file infile tmpinput t)))
-      (when input (setq command (format "%s <%s" command input)))
-
-      ;; Determine output.
-      (setq output (tramp-make-tramp-temp-file v)
-	    tmpoutput (tramp-make-tramp-file-name method user host output))
-      (cond
-       ;; Just a buffer
-       ((bufferp destination)
-	(setq outbuf destination))
-       ;; A buffer name
-       ((stringp destination)
-	(setq outbuf (get-buffer-create destination)))
-       ;; (REAL-DESTINATION ERROR-DESTINATION)
-       ((consp destination)
-	;; output
-	(cond
-	 ((bufferp (car destination))
-	  (setq outbuf (car destination)))
-	 ((stringp (car destination))
-	  (setq outbuf (get-buffer-create (car destination)))))
-	;; stderr
-	(cond
-	 ((stringp (cadr destination))
-	  (setcar (cdr destination) (expand-file-name (cadr destination)))
-	  (if (tramp-equal-remote default-directory (cadr destination))
-	      ;; stderr is on the same remote host.
-	      (setq stderr (with-parsed-tramp-file-name
-			       (cadr destination) nil localname))
-	    ;; stderr must be copied to remote host.  The temporary
-	    ;; file must be deleted after execution.
-	    (setq stderr (tramp-make-tramp-temp-file v)
-		  tmpstderr (tramp-make-tramp-file-name
-			     method user host stderr))))
-	 ;; stderr to be discarded
-	 ((null (cadr destination))
-	  (setq stderr "/dev/null"))))
-       ;; 't
-       (destination
-	(setq outbuf (current-buffer))))
-      (when stderr (setq command (format "%s 2>%s" command stderr)))
-
-      ;; Goto working directory.
-      (unless
-	  (tramp-fish-send-command-and-check
-	   v (format "#CWD %s" (tramp-shell-quote-argument localname)))
-	(tramp-error v 'file-error "No such directory: %s" default-directory))
-      ;; Send the command.  It might not return in time, so we protect it.
-      (condition-case nil
-	  (unwind-protect
-	      (unless (tramp-fish-send-command-and-check
-		       v (format
-			  "#EXEC %s %s"
-			  (tramp-shell-quote-argument command) output))
-		(error nil))
-	    ;; Check return code.
-	    (setq tmpfile
-		  (file-local-copy
-		   (tramp-make-tramp-file-name method user host output)))
-	    (with-temp-buffer
-	      (insert-file-contents tmpfile)
-	      (goto-char (point-max))
-	      (forward-line -1)
-	      (looking-at "^###RESULT: \\([0-9]+\\)")
-	      (setq ret (string-to-number (match-string 1)))
-	      (delete-region (point) (point-max))
-	      (write-region (point-min) (point-max) tmpfile))
-	    ;; We should show the output anyway.
-	    (when outbuf
-	      (with-current-buffer outbuf (insert-file-contents tmpfile))
-	      (when display (display-buffer outbuf))))
-	;; When the user did interrupt, we should do it also.
-	(error (setq ret 1)))
-
-      ;; Provide error file.
-      (when tmpstderr (rename-file tmpstderr (cadr destination) t))
-      ;; Cleanup.
-      (when tmpinput (delete-file tmpinput))
-      (when tmpoutput (delete-file tmpoutput))
-      ;; Return exit status.
-      ret)))
-
-
-;; Internal file name functions
-
-(defun tramp-fish-do-copy-or-rename-file
-  (op filename newname &optional ok-if-already-exists keep-date preserve-uid-gid)
-  "Copy or rename a remote file.
-OP must be `copy' or `rename' and indicates the operation to
-perform.  FILENAME specifies the file to copy or rename, NEWNAME
-is the name of the new file (for copy) or the new name of the
-file (for rename).  OK-IF-ALREADY-EXISTS means don't barf if
-NEWNAME exists already.  KEEP-DATE means to make sure that
-NEWNAME has the same timestamp as FILENAME.
-
-This function is invoked by `tramp-fish-handle-copy-file' and
-`tramp-fish-handle-rename-file'.  It is an error if OP is neither
-of `copy' and `rename'.  FILENAME and NEWNAME must be absolute
-file names."
-  (unless (memq op '(copy rename))
-    (error "Unknown operation `%s', must be `copy' or `rename'" op))
-  (let ((t1 (tramp-tramp-file-p filename))
-	(t2 (tramp-tramp-file-p newname)))
-
-    (unless ok-if-already-exists
-      (when (and t2 (file-exists-p newname))
-	(with-parsed-tramp-file-name newname nil
-	  (tramp-error
-	   v 'file-already-exists "File %s already exists" newname))))
-
-    (prog1
-	(cond
-	 ;; Both are Tramp files.
-	 ((and t1 t2)
-	  (cond
-	   ;; Shortcut: if method, host, user are the same for both
-	   ;; files, we invoke `cp' or `mv' on the remote host
-	   ;; directly.
-	   ((tramp-equal-remote filename newname)
-	    (tramp-fish-do-copy-or-rename-file-directly
-	     op filename newname keep-date preserve-uid-gid))
-	   ;; No shortcut was possible.  So we copy the
-	   ;; file first.  If the operation was `rename', we go
-	   ;; back and delete the original file (if the copy was
-	   ;; successful).  The approach is simple-minded: we
-	   ;; create a new buffer, insert the contents of the
-	   ;; source file into it, then write out the buffer to
-	   ;; the target file.  The advantage is that it doesn't
-	   ;; matter which filename handlers are used for the
-	   ;; source and target file.
-	   (t
-	    (tramp-do-copy-or-rename-file-via-buffer
-	     op filename newname keep-date))))
-
-	 ;; One file is a Tramp file, the other one is local.
-	 ((or t1 t2)
-	  ;; Use the generic method via a Tramp buffer.
-	  (tramp-do-copy-or-rename-file-via-buffer
-	   op filename newname keep-date))
-
-	 (t
-	  ;; One of them must be a Tramp file.
-	  (error "Tramp implementation says this cannot happen")))
-      ;; When newname did exist, we have wrong cached values.
-      (when t2
-	(with-parsed-tramp-file-name newname nil
-	  (tramp-flush-file-property v localname)
-	  (tramp-flush-file-property v (file-name-directory localname)))))))
-
-(defun tramp-fish-do-copy-or-rename-file-directly
-  (op filename newname keep-date preserve-uid-gid)
-  "Invokes `COPY' or `RENAME' on the remote system.
-OP must be one of `copy' or `rename', indicating `cp' or `mv',
-respectively.  VEC specifies the connection.  LOCALNAME1 and
-LOCALNAME2 specify the two arguments of `cp' or `mv'.  If
-KEEP-DATE is non-nil, preserve the time stamp when copying.
-PRESERVE-UID-GID is completely ignored."
-  (with-parsed-tramp-file-name filename v1
-    (with-parsed-tramp-file-name newname v2
-      (tramp-fish-send-command
-       v1
-       (format "%s %s %s"
-	       (if (eq op 'copy) "#COPY" "#RENAME")
-	       (tramp-shell-quote-argument v1-localname)
-	       (tramp-shell-quote-argument v2-localname)))))
-  ;; KEEP-DATE handling.
-  (when (and keep-date (functionp 'set-file-times))
-    (set-file-times newname (nth 5 (file-attributes filename))))
-  ;; Set the mode.
-  (set-file-modes newname (tramp-default-file-modes filename)))
-
-(defun tramp-fish-get-file-entries (vec localname list)
-  "Read entries returned by FISH server.
-When LIST is true, a #LIST command will be sent, including all entries
-of a directory.  Otherwise, #STAT is sent for just one entry.
-Result is a list of (LOCALNAME LINK COUNT UID GID ATIME MTIME CTIME
-SIZE MODE WEIRD INODE DEVICE)."
-  (block nil
-    (with-current-buffer (tramp-get-buffer vec)
-      ;; #LIST does not work properly with trailing "/", at least in
-      ;; .fishsrv.pl.
-      (when (string-match "/$" localname)
-	(setq localname (concat localname ".")))
-
-      (let ((command (format "%s %s" (if list "#LIST" "#STAT") localname))
-	    buffer-read-only num res)
-
-	;; Send command
-	(tramp-fish-send-command vec command)
-
-	;; Read number of entries
-	(goto-char (point-min))
-	(condition-case nil
-	    (unless (integerp (setq num (read (current-buffer)))) (error nil))
-	  (error (return nil)))
-	(forward-line)
-	(delete-region (point-min) (point))
-
-	;; Read return code
-	(goto-char (point-min))
-	(condition-case nil
-	    (unless (looking-at tramp-fish-continue-prompt-regexp) (error nil))
-	  (error (return nil)))
-	(forward-line)
-	(delete-region (point-min) (point))
-
-	;; Loop the listing
-	(dotimes (i num)
-	  (let ((item (tramp-fish-read-file-entry)))
-	    ;; Add inode and device.
-	    (add-to-list
-	     'res (append item
-			  (list (tramp-get-inode vec)
-				(tramp-get-device vec))))))
-
-	;; Read return code
-	(goto-char (point-min))
-	(condition-case nil
-	    (unless (looking-at tramp-fish-ok-prompt-regexp) (error nil))
-	  (error (tramp-error
-		  vec 'file-error
-		  "`%s' does not return a valid Lisp expression: `%s'"
-		  command (buffer-string))))
-	(forward-line)
-	(delete-region (point-min) (point))
-
-	res))))
-
-(defun tramp-fish-read-file-entry ()
-  "Parse entry in output buffer.
-Result is the list (LOCALNAME LINK COUNT UID GID ATIME MTIME CTIME
-SIZE MODE WEIRD)."
-  ;; We are called from `tramp-fish-get-file-entries', which sets the
-  ;; current buffer.
-  (let (buffer-read-only localname link uid gid mtime size mode)
-    (block nil
-      (while t
-	(cond
-	 ;; P<unix permissions> <owner>.<group>
-	 ((looking-at "^P\\(.+\\)\\s-\\(.+\\)\\.\\(.+\\)$")
-	  (setq mode (match-string 1))
-	  (setq uid (match-string 2))
-	  (setq gid (match-string 3))
-	  (when (string-match "^d" mode) (setq link t)))
-	 ;; S<size>
-	 ((looking-at "^S\\([0-9]+\\)$")
-	  (setq size (string-to-number (match-string 1))))
-	 ;; D<year> <month> <day> <hour> <minute> <second>[.1234]
-	 ((looking-at
-	   "^D\\([0-9]+\\)\\s-\\([0-9]+\\)\\s-\\([0-9]+\\)\\s-\\([0-9]+\\)\\s-\\([0-9]+\\)\\s-\\(\\S-+\\)$")
-	  (setq mtime
-		(encode-time
-		 (string-to-number (match-string 6))
-		 (string-to-number (match-string 5))
-		 (string-to-number (match-string 4))
-		 (string-to-number (match-string 3))
-		 (string-to-number (match-string 2))
-		 (string-to-number (match-string 1)))))
-	 ;; d<3-letters month name> <day> <year or HH:MM>
-	 ((looking-at "^d") nil)
-	 ;; E<major-of-device>,<minor>
-	 ((looking-at "^E") nil)
-	 ;; :<filename>
-	 ((looking-at "^:\\(.+\\)$")
-	  (setq localname (match-string 1)))
-	 ;; L<filename symlink points to>
-	 ((looking-at "^L\\(.+\\)$")
-	  (setq link (match-string 1)))
-	 ;; M<mimetype>
-	 ((looking-at "^M\\(.+\\)$") nil)
-	 ;; last line
-	 ((looking-at "^$")
-	  (return)))
-	;; Delete line.
-	(forward-line)
-	(delete-region (point-min) (point))))
-
-    ;; Delete trailing empty line.
-    (forward-line)
-    (delete-region (point-min) (point))
-
-    ;; Return entry in `file-attributes' format.
-    (list localname link -1 uid gid '(0 0) mtime '(0 0) size mode nil)))
-
-(defun tramp-fish-retrieve-data (vec)
-  "Reads remote data for FISH protocol.
-The data are left in the connection buffer of VEC for further processing.
-Returns the size of the data."
-  (block nil
-    (with-current-buffer (tramp-get-buffer vec)
-      ;; The retrieved data might be in binary format, without
-      ;; trailing newline.  Therefore, the OK prompt might not start
-      ;; at the beginning of a line.
-      (let ((tramp-fish-ok-prompt-regexp "### 200\n")
-	    size)
-
-	;; Send command
-	(tramp-fish-send-command
-	 vec (format "#RETR %s" (tramp-file-name-localname vec)))
-
-	;; Read filesize
-	(goto-char (point-min))
-	(condition-case nil
-	    (unless (integerp (setq size (read (current-buffer)))) (error nil))
-	  (error (return nil)))
-	(forward-line)
-	(delete-region (point-min) (point))
-
-	;; Read return code
-	(goto-char (point-min))
-	(condition-case nil
-	    (unless (looking-at tramp-fish-continue-prompt-regexp) (error nil))
-	  (error (return nil)))
-	(forward-line)
-	(delete-region (point-min) (point))
-
-	;; The received data might contain the OK prompt already, so
-	;; there might be outstanding data.
-	(while (/= (+ size (length tramp-fish-ok-prompt-regexp))
-		   (- (point-max) (point-min)))
-	  (tramp-wait-for-regexp
-	   (tramp-get-connection-process vec) nil
-	   (concat tramp-fish-ok-prompt-regexp "$")))
-
-	;; Read return code
-	(goto-char (+ (point-min) size))
-	(condition-case nil
-	    (unless (looking-at tramp-fish-ok-prompt-regexp) (error nil))
-	  (error (return nil)))
-	(delete-region (+ (point-min) size) (point-max))
-	size))))
-
-
-;; Connection functions
-
-(defun tramp-fish-maybe-open-connection (vec)
-  "Maybe open a connection VEC.
-Does not do anything if a connection is already open, but re-opens the
-connection if a previous connection has died for some reason."
-  (let ((process-connection-type tramp-process-connection-type)
-	(p (get-buffer-process (tramp-get-buffer vec))))
-
-    ;; New connection must be opened.
-    (unless (and p (processp p) (memq (process-status p) '(run open)))
-
-      ;; Set variables for computing the prompt for reading password.
-      (setq tramp-current-method (tramp-file-name-method vec)
-	    tramp-current-user (tramp-file-name-user vec)
-	    tramp-current-host (tramp-file-name-host vec))
-
-      ;; Start new process.
-      (when (and p (processp p))
-	(delete-process p))
-      (setenv "TERM" tramp-terminal-type)
-      (setenv "PS1" tramp-initial-end-of-output)
-      (with-progress-reporter
-	  vec 3
-	  (format "Opening connection for %s@%s using %s"
-		  tramp-current-user tramp-current-host tramp-current-method)
-
-	(let* ((process-connection-type tramp-process-connection-type)
-	       (inhibit-eol-conversion nil)
-	       (coding-system-for-read 'binary)
-	       (coding-system-for-write 'binary)
-	       ;; This must be done in order to avoid our file name handler.
-	       (p (let ((default-directory
-			  (tramp-compat-temporary-file-directory)))
-		    (start-process
-		     (or (tramp-get-connection-property vec "process-name" nil)
-			 (tramp-buffer-name vec))
-		     (tramp-get-connection-buffer vec)
-		     "ssh" "-l"
-		     (tramp-file-name-user vec)
-		     (tramp-file-name-host vec)))))
-	  (tramp-message
-	   vec 6 "%s" (mapconcat 'identity (process-command p) " "))
-
-	  ;; Check whether process is alive.
-	  (tramp-set-process-query-on-exit-flag p nil)
-
-	  (tramp-process-actions p vec tramp-actions-before-shell 60)
-	  (tramp-fish-send-command vec tramp-fish-start-fish-server-command)
-	  (tramp-message
-	   vec 3
-	   "Found remote shell prompt on `%s'" (tramp-file-name-host vec)))))))
-
-(defun tramp-fish-send-command (vec command)
-  "Send the COMMAND to connection VEC."
-  (tramp-fish-maybe-open-connection vec)
-  (tramp-message vec 6 "%s" command)
-  (tramp-send-string vec command)
-  (tramp-wait-for-regexp
-   (tramp-get-connection-process vec) nil
-   (concat tramp-fish-ok-prompt-regexp "\\|" tramp-fish-error-prompt-regexp)))
-
-(defun tramp-fish-send-command-and-check (vec command)
-  "Send the COMMAND to connection VEC.
-Returns nil if there has been an error message."
-
-  ;; Send command.
-  (tramp-fish-send-command vec command)
-
-  ;; Read return code.
-  (with-current-buffer (tramp-get-buffer vec)
-    (goto-char (point-min))
-    (looking-at tramp-fish-ok-prompt-regexp)))
-
-(add-hook 'tramp-unload-hook
-	  (lambda ()
-	    (unload-feature 'tramp-fish 'force)))
-
-(provide 'tramp-fish)
-;
-;;;; TODO:
-;
-;; * Evaluate the MIME information with #LIST or #STAT.
-;
-
-;; arch-tag: a66df7df-5f29-42a7-a921-643ceb29db49
-;;;; tramp-fish.el ends here

=== modified file 'lisp/net/tramp-ftp.el'
--- lisp/net/tramp-ftp.el	2010-09-08 14:42:54 +0000
+++ lisp/net/tramp-ftp.el	2010-09-13 15:17:01 +0000
@@ -219,11 +219,7 @@
 
 ;;; TODO:
 
-;; * In case of "/ftp:host:file" this works only for functions which
-;;   are defined in `tramp-file-name-handler-alist'.  Call has to be
-;;   pretended in `tramp-file-name-handler' otherwise.
-;;   Furthermore, there are no backup files on FTP hosts.
-;;   Worth further investigations.
+;; * There are no backup files on FTP hosts.
 
 ;; arch-tag: 759fb338-5c63-4b99-bd36-b4d59db91cff
 ;;; tramp-ftp.el ends here

=== modified file 'lisp/net/tramp-gvfs.el'
--- lisp/net/tramp-gvfs.el	2010-09-08 14:42:54 +0000
+++ lisp/net/tramp-gvfs.el	2010-09-13 15:17:01 +0000
@@ -103,6 +103,11 @@
   (require 'custom))
 
 (require 'tramp)
+
+;; We call several `tramp-handle-*' functions directly.  So we must
+;; reqire that package as well.
+(require 'tramp-sh)
+
 (require 'dbus)
 (require 'url-parse)
 (require 'url-util)

=== modified file 'lisp/net/tramp-gw.el'
--- lisp/net/tramp-gw.el	2010-09-08 14:42:54 +0000
+++ lisp/net/tramp-gw.el	2010-09-13 15:17:01 +0000
@@ -243,10 +243,9 @@
 	;; Trap errors to be traced in the right trace buffer.  Often,
 	;; proxies have a timeout of 60".  We wait 65" in order to
 	;; receive an answer this case.
-	(condition-case nil
-	    (let (tramp-verbose)
-	      (tramp-wait-for-regexp proc 65 "\r?\n\r?\n"))
-	  (error nil))
+	(ignore-errors
+	  (let (tramp-verbose)
+	    (tramp-wait-for-regexp proc 65 "\r?\n\r?\n")))
 	;; Check return code.
 	(goto-char (point-min))
 	(narrow-to-region

=== added file 'lisp/net/tramp-sh.el'
--- lisp/net/tramp-sh.el	1970-01-01 00:00:00 +0000
+++ lisp/net/tramp-sh.el	2010-09-13 15:17:01 +0000
@@ -0,0 +1,5506 @@
+;;; tramp-sh.el --- Tramp access functions for (s)sh-like connections
+
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+;; (copyright statements below in code to be updated with the above notice)
+
+;; Author: Kai Großjohann <kai.grossjohann@gmx.net>
+;;         Michael Albinus <michael.albinus@gmx.de>
+;; Keywords: comm, processes
+;; Package: tramp
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'tramp)
+(require 'shell)
+
+;; Pacify byte-compiler.  The function is needed on XEmacs only.  I'm
+;; not sure at all that this is the right way to do it, but let's hope
+;; it works for now, and wait for a guru to point out the Right Way to
+;; achieve this.
+;;(eval-when-compile
+;;  (unless (fboundp 'dired-insert-set-properties)
+;;    (fset 'dired-insert-set-properties 'ignore)))
+;; Gerd suggests this:
+(eval-when-compile (require 'dired))
+;; Note that dired is required at run-time, too, when it is needed.
+;; It is only needed on XEmacs for the function
+;; `dired-insert-set-properties'.
+
+(defcustom tramp-inline-compress-start-size 4096
+  "*The minimum size of compressing where inline transfer.
+When inline transfer, compress transfered data of file
+whose size is this value or above (up to `tramp-copy-size-limit').
+If it is nil, no compression at all will be applied."
+  :group 'tramp
+  :type '(choice (const nil) integer))
+
+(defcustom tramp-copy-size-limit 10240
+  "*The maximum file size where inline copying is preferred over an out-of-the-band copy.
+If it is nil, inline out-of-the-band copy will be used without a check."
+  :group 'tramp
+  :type '(choice (const nil) integer))
+
+;;;###tramp-autoload
+(defcustom tramp-terminal-type "dumb"
+  "*Value of TERM environment variable for logging in to remote host.
+Because Tramp wants to parse the output of the remote shell, it is easily
+confused by ANSI color escape sequences and suchlike.  Often, shell init
+files conditionalize this setup based on the TERM environment variable."
+  :group 'tramp
+  :type 'string)
+
+;; ksh on OpenBSD 4.5 requires, that PS1 contains a `#' character for
+;; root users.  It uses the `$' character for other users.  In order
+;; to guarantee a proper prompt, we use "#$" for the prompt.
+
+(defvar tramp-end-of-output
+  (format
+   "///%s#$"
+   (md5 (concat (prin1-to-string process-environment) (current-time-string))))
+  "String used to recognize end of output.
+The '$' character at the end is quoted; the string cannot be
+detected as prompt when being sent on echoing hosts, therefore.")
+
+;;;###tramp-autoload
+(defconst tramp-initial-end-of-output "#$ "
+  "Prompt when establishing a connection.")
+
+;; Initialize `tramp-methods' with the supported methods.
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
+  '("rcp"
+    (tramp-login-program        "rsh")
+    (tramp-login-args           (("%h") ("-l" "%u")))
+    (tramp-remote-sh            "/bin/sh")
+    (tramp-copy-program         "rcp")
+    (tramp-copy-args            (("-p" "%k") ("-r")))
+    (tramp-copy-keep-date       t)
+    (tramp-copy-recursive       t)))
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
+  '("remcp"
+    (tramp-login-program        "remsh")
+    (tramp-login-args           (("%h") ("-l" "%u")))
+    (tramp-remote-sh            "/bin/sh")
+    (tramp-copy-program         "rcp")
+    (tramp-copy-args            (("-p" "%k")))
+    (tramp-copy-keep-date       t)))
+;;;###tramp-autoload
+(add-to-list
+ 'tramp-methods
+ '("scp"   (tramp-login-program        "ssh")
+   (tramp-login-args           (("-l" "%u") ("-p" "%p")	("-e" "none") ("%h")))
+   (tramp-async-args           (("-q")))
+   (tramp-remote-sh            "/bin/sh")
+   (tramp-copy-program         "scp")
+   (tramp-copy-args            (("-P" "%p") ("-p" "%k")	("-q") ("-r")))
+   (tramp-copy-keep-date       t)
+   (tramp-copy-recursive       t)
+   (tramp-gw-args              (("-o" "GlobalKnownHostsFile=/dev/null")
+				("-o" "UserKnownHostsFile=/dev/null")
+				("-o" "StrictHostKeyChecking=no")))
+   (tramp-default-port         22)))
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
+  '("scp1"
+    (tramp-login-program        "ssh")
+    (tramp-login-args           (("-l" "%u") ("-p" "%p")
+				 ("-1") ("-e" "none") ("%h")))
+    (tramp-async-args           (("-q")))
+    (tramp-remote-sh            "/bin/sh")
+    (tramp-copy-program         "scp")
+    (tramp-copy-args            (("-1") ("-P" "%p") ("-p" "%k") ("-q") ("-r")))
+    (tramp-copy-keep-date       t)
+    (tramp-copy-recursive       t)
+    (tramp-gw-args              (("-o" "GlobalKnownHostsFile=/dev/null")
+				 ("-o" "UserKnownHostsFile=/dev/null")
+				 ("-o" "StrictHostKeyChecking=no")))
+    (tramp-default-port         22)))
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
+  '("scp2"
+    (tramp-login-program        "ssh")
+    (tramp-login-args           (("-l" "%u") ("-p" "%p")
+				 ("-2") ("-e" "none") ("%h")))
+    (tramp-async-args           (("-q")))
+    (tramp-remote-sh            "/bin/sh")
+    (tramp-copy-program         "scp")
+    (tramp-copy-args            (("-2") ("-P" "%p") ("-p" "%k") ("-q") ("-r")))
+    (tramp-copy-keep-date       t)
+    (tramp-copy-recursive       t)
+    (tramp-gw-args              (("-o" "GlobalKnownHostsFile=/dev/null")
+				 ("-o" "UserKnownHostsFile=/dev/null")
+				 ("-o" "StrictHostKeyChecking=no")))
+    (tramp-default-port         22)))
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
+  '("scpc"
+    (tramp-login-program        "ssh")
+    (tramp-login-args           (("-l" "%u") ("-p" "%p")
+				 ("-o" "ControlPath=%t.%%r@%%h:%%p")
+				 ("-o" "ControlMaster=yes")
+				 ("-e" "none") ("%h")))
+    (tramp-async-args           (("-q")))
+    (tramp-remote-sh            "/bin/sh")
+    (tramp-copy-program         "scp")
+    (tramp-copy-args            (("-P" "%p") ("-p" "%k") ("-q")
+				 ("-o" "ControlPath=%t.%%r@%%h:%%p")
+				 ("-o" "ControlMaster=auto")))
+    (tramp-copy-keep-date       t)
+    (tramp-gw-args              (("-o" "GlobalKnownHostsFile=/dev/null")
+				 ("-o" "UserKnownHostsFile=/dev/null")
+				 ("-o" "StrictHostKeyChecking=no")))
+    (tramp-default-port         22)))
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
+  '("scpx"
+    (tramp-login-program        "ssh")
+    (tramp-login-args           (("-l" "%u") ("-p" "%p")
+				 ("-e" "none") ("-t" "-t")
+				 ("%h") ("/bin/sh")))
+    (tramp-async-args           (("-q")))
+    (tramp-remote-sh            "/bin/sh")
+    (tramp-copy-program         "scp")
+    (tramp-copy-args            (("-p" "%k")))
+    (tramp-copy-keep-date       t)
+    (tramp-gw-args              (("-o" "GlobalKnownHostsFile=/dev/null")
+				 ("-o" "UserKnownHostsFile=/dev/null")
+				 ("-o" "StrictHostKeyChecking=no")))
+    (tramp-default-port         22)))
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
+  '("sftp"
+    (tramp-login-program        "ssh")
+    (tramp-login-args           (("-l" "%u") ("-p" "%p") ("-e" "none") ("%h")))
+    (tramp-async-args           (("-q")))
+    (tramp-remote-sh            "/bin/sh")
+    (tramp-copy-program         "sftp")))
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
+  '("rsync"
+    (tramp-login-program        "ssh")
+    (tramp-login-args           (("-l" "%u") ("-p" "%p") ("-e" "none") ("%h")))
+    (tramp-async-args           (("-q")))
+    (tramp-remote-sh            "/bin/sh")
+    (tramp-copy-program         "rsync")
+    (tramp-copy-args            (("-e" "ssh") ("-t" "%k") ("-r")))
+    (tramp-copy-keep-date       t)
+    (tramp-copy-keep-tmpfile    t)
+    (tramp-copy-recursive       t)))
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
+  `("rsyncc"
+    (tramp-login-program        "ssh")
+    (tramp-login-args           (("-l" "%u") ("-p" "%p")
+				 ("-o" "ControlPath=%t.%%r@%%h:%%p")
+				 ("-o" "ControlMaster=yes")
+				 ("-e" "none") ("%h")))
+    (tramp-async-args           (("-q")))
+    (tramp-remote-sh            "/bin/sh")
+    (tramp-copy-program         "rsync")
+    (tramp-copy-args            (("-t" "%k") ("-r")))
+    (tramp-copy-env             (("RSYNC_RSH")
+				 (,(concat
+				    "ssh"
+				    " -o ControlPath=%t.%%r@%%h:%%p"
+				    " -o ControlMaster=auto"))))
+    (tramp-copy-keep-date       t)
+    (tramp-copy-keep-tmpfile    t)
+    (tramp-copy-recursive       t)))
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
+  '("rsh"
+    (tramp-login-program        "rsh")
+    (tramp-login-args           (("%h") ("-l" "%u")))
+    (tramp-remote-sh            "/bin/sh")))
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
+  '("remsh"
+    (tramp-login-program        "remsh")
+    (tramp-login-args           (("%h") ("-l" "%u")))
+    (tramp-remote-sh            "/bin/sh")))
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
+  '("ssh"
+    (tramp-login-program        "ssh")
+    (tramp-login-args           (("-l" "%u") ("-p" "%p") ("-e" "none") ("%h")))
+    (tramp-async-args           (("-q")))
+    (tramp-remote-sh            "/bin/sh")
+    (tramp-gw-args              (("-o" "GlobalKnownHostsFile=/dev/null")
+				 ("-o" "UserKnownHostsFile=/dev/null")
+				 ("-o" "StrictHostKeyChecking=no")))
+    (tramp-default-port         22)))
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
+  '("ssh1"
+    (tramp-login-program        "ssh")
+    (tramp-login-args           (("-l" "%u") ("-p" "%p")
+				 ("-1") ("-e" "none") ("%h")))
+    (tramp-async-args           (("-q")))
+    (tramp-remote-sh            "/bin/sh")
+    (tramp-gw-args              (("-o" "GlobalKnownHostsFile=/dev/null")
+				 ("-o" "UserKnownHostsFile=/dev/null")
+				 ("-o" "StrictHostKeyChecking=no")))
+    (tramp-default-port         22)))
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
+  '("ssh2"
+    (tramp-login-program        "ssh")
+    (tramp-login-args           (("-l" "%u") ("-p" "%p")
+				 ("-2") ("-e" "none") ("%h")))
+    (tramp-async-args           (("-q")))
+    (tramp-remote-sh            "/bin/sh")
+    (tramp-gw-args              (("-o" "GlobalKnownHostsFile=/dev/null")
+				 ("-o" "UserKnownHostsFile=/dev/null")
+				 ("-o" "StrictHostKeyChecking=no")))
+    (tramp-default-port         22)))
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
+  '("sshx"
+    (tramp-login-program        "ssh")
+    (tramp-login-args           (("-l" "%u") ("-p" "%p")
+				 ("-e" "none") ("-t" "-t")
+				 ("%h") ("/bin/sh")))
+    (tramp-async-args           (("-q")))
+    (tramp-remote-sh            "/bin/sh")
+    (tramp-gw-args              (("-o" "GlobalKnownHostsFile=/dev/null")
+				 ("-o" "UserKnownHostsFile=/dev/null")
+				 ("-o" "StrictHostKeyChecking=no")))
+    (tramp-default-port         22)))
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
+  '("telnet"
+    (tramp-login-program        "telnet")
+    (tramp-login-args           (("%h") ("%p")))
+    (tramp-remote-sh            "/bin/sh")
+    (tramp-default-port         23)))
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
+  '("su"
+    (tramp-login-program        "su")
+    (tramp-login-args           (("-") ("%u")))
+    (tramp-remote-sh            "/bin/sh")))
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
+  '("sudo"
+    (tramp-login-program        "sudo")
+    (tramp-login-args           (("-u" "%u") ("-s") ("-H") ("-p" "Password:")))
+    (tramp-remote-sh            "/bin/sh")))
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
+  '("krlogin"
+    (tramp-login-program        "krlogin")
+    (tramp-login-args           (("%h") ("-l" "%u") ("-x")))
+    (tramp-remote-sh            "/bin/sh")))
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
+  '("plink"
+    (tramp-login-program        "plink")
+    (tramp-login-args           (("-l" "%u") ("-P" "%p") ("-ssh") ("%h")))
+    (tramp-remote-sh            "/bin/sh")
+    (tramp-password-end-of-line "xy") ;see docstring for "xy"
+    (tramp-default-port         22)))
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
+  '("plink1"
+    (tramp-login-program        "plink")
+    (tramp-login-args           (("-l" "%u") ("-P" "%p") ("-1" "-ssh") ("%h")))
+    (tramp-remote-sh            "/bin/sh")
+    (tramp-password-end-of-line "xy") ;see docstring for "xy"
+    (tramp-default-port         22)))
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
+  `("plinkx"
+    (tramp-login-program        "plink")
+    ;; ("%h") must be a single element, see
+    ;; `tramp-compute-multi-hops'.
+    (tramp-login-args           (("-load") ("%h") ("-t")
+				 (,(format
+				    "env 'TERM=%s' 'PROMPT_COMMAND=' 'PS1=%s'"
+				    tramp-terminal-type
+				    tramp-initial-end-of-output))
+				 ("/bin/sh")))
+    (tramp-remote-sh            "/bin/sh")))
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
+  '("pscp"
+    (tramp-login-program        "plink")
+    (tramp-login-args           (("-l" "%u") ("-P" "%p") ("-ssh") ("%h")))
+    (tramp-remote-sh            "/bin/sh")
+    (tramp-copy-program         "pscp")
+    (tramp-copy-args            (("-P" "%p") ("-scp") ("-p" "%k")))
+    (tramp-copy-keep-date       t)
+    (tramp-password-end-of-line "xy") ;see docstring for "xy"
+    (tramp-default-port         22)))
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
+  '("psftp"
+    (tramp-login-program        "plink")
+    (tramp-login-args           (("-l" "%u") ("-P" "%p") ("-ssh") ("%h")))
+    (tramp-remote-sh            "/bin/sh")
+    (tramp-copy-program         "pscp")
+    (tramp-copy-args            (("-P" "%p") ("-sftp") ("-p" "%k")))
+    (tramp-copy-keep-date       t)
+    (tramp-password-end-of-line "xy"))) ;see docstring for "xy"
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
+  '("fcp"
+    (tramp-login-program        "fsh")
+    (tramp-login-args           (("%h") ("-l" "%u") ("sh" "-i")))
+    (tramp-remote-sh            "/bin/sh -i")
+    (tramp-copy-program         "fcp")
+    (tramp-copy-args            (("-p" "%k")))
+    (tramp-copy-keep-date       t)))
+
+(add-to-list 'tramp-default-method-alist
+	     `(,tramp-local-host-regexp "\\`root\\'" "su"))
+
+(add-to-list 'tramp-default-user-alist
+	     '("\\`su\\(do\\)?\\'" nil "root"))
+(add-to-list 'tramp-default-user-alist
+	     `("\\`r\\(em\\)?\\(cp\\|sh\\)\\|telnet\\|plink1?\\'"
+	       nil ,(user-login-name)))
+
+(defconst tramp-completion-function-alist-rsh
+  '((tramp-parse-rhosts "/etc/hosts.equiv")
+    (tramp-parse-rhosts "~/.rhosts"))
+  "Default list of (FUNCTION FILE) pairs to be examined for rsh methods.")
+
+(defconst tramp-completion-function-alist-ssh
+  '((tramp-parse-rhosts      "/etc/hosts.equiv")
+    (tramp-parse-rhosts      "/etc/shosts.equiv")
+    (tramp-parse-shosts      "/etc/ssh_known_hosts")
+    (tramp-parse-sconfig     "/etc/ssh_config")
+    (tramp-parse-shostkeys   "/etc/ssh2/hostkeys")
+    (tramp-parse-sknownhosts "/etc/ssh2/knownhosts")
+    (tramp-parse-rhosts      "~/.rhosts")
+    (tramp-parse-rhosts      "~/.shosts")
+    (tramp-parse-shosts      "~/.ssh/known_hosts")
+    (tramp-parse-sconfig     "~/.ssh/config")
+    (tramp-parse-shostkeys   "~/.ssh2/hostkeys")
+    (tramp-parse-sknownhosts "~/.ssh2/knownhosts"))
+  "Default list of (FUNCTION FILE) pairs to be examined for ssh methods.")
+
+(defconst tramp-completion-function-alist-telnet
+  '((tramp-parse-hosts "/etc/hosts"))
+  "Default list of (FUNCTION FILE) pairs to be examined for telnet methods.")
+
+(defconst tramp-completion-function-alist-su
+  '((tramp-parse-passwd "/etc/passwd"))
+  "Default list of (FUNCTION FILE) pairs to be examined for su methods.")
+
+(defconst tramp-completion-function-alist-putty
+  '((tramp-parse-putty
+     "HKEY_CURRENT_USER\\Software\\SimonTatham\\PuTTY\\Sessions"))
+  "Default list of (FUNCTION REGISTRY) pairs to be examined for putty methods.")
+
+(tramp-set-completion-function "rcp" tramp-completion-function-alist-rsh)
+(tramp-set-completion-function "remcp" tramp-completion-function-alist-rsh)
+(tramp-set-completion-function "scp" tramp-completion-function-alist-ssh)
+(tramp-set-completion-function "scp1" tramp-completion-function-alist-ssh)
+(tramp-set-completion-function "scp2" tramp-completion-function-alist-ssh)
+(tramp-set-completion-function "scpc" tramp-completion-function-alist-ssh)
+(tramp-set-completion-function "scpx" tramp-completion-function-alist-ssh)
+(tramp-set-completion-function "sftp" tramp-completion-function-alist-ssh)
+(tramp-set-completion-function "rsync" tramp-completion-function-alist-ssh)
+(tramp-set-completion-function "rsyncc" tramp-completion-function-alist-ssh)
+(tramp-set-completion-function "rsh" tramp-completion-function-alist-rsh)
+(tramp-set-completion-function "remsh" tramp-completion-function-alist-rsh)
+(tramp-set-completion-function "ssh" tramp-completion-function-alist-ssh)
+(tramp-set-completion-function "ssh1" tramp-completion-function-alist-ssh)
+(tramp-set-completion-function "ssh2" tramp-completion-function-alist-ssh)
+(tramp-set-completion-function "ssh1_old" tramp-completion-function-alist-ssh)
+(tramp-set-completion-function "ssh2_old" tramp-completion-function-alist-ssh)
+(tramp-set-completion-function "sshx" tramp-completion-function-alist-ssh)
+(tramp-set-completion-function "telnet" tramp-completion-function-alist-telnet)
+(tramp-set-completion-function "su" tramp-completion-function-alist-su)
+(tramp-set-completion-function "sudo" tramp-completion-function-alist-su)
+(tramp-set-completion-function "krlogin" tramp-completion-function-alist-rsh)
+(tramp-set-completion-function "plink" tramp-completion-function-alist-ssh)
+(tramp-set-completion-function "plink1" tramp-completion-function-alist-ssh)
+(tramp-set-completion-function "plinkx" tramp-completion-function-alist-putty)
+(tramp-set-completion-function "pscp" tramp-completion-function-alist-ssh)
+(tramp-set-completion-function "fcp" tramp-completion-function-alist-ssh)
+
+;; "getconf PATH" yields:
+;; HP-UX: /usr/bin:/usr/ccs/bin:/opt/ansic/bin:/opt/langtools/bin:/opt/fortran/bin
+;; Solaris: /usr/xpg4/bin:/usr/ccs/bin:/usr/bin:/opt/SUNWspro/bin
+;; GNU/Linux (Debian, Suse): /bin:/usr/bin
+;; FreeBSD: /usr/bin:/bin:/usr/sbin:/sbin: - beware trailing ":"!
+;; IRIX64: /usr/bin
+(defcustom tramp-remote-path
+  '(tramp-default-remote-path "/usr/sbin" "/usr/local/bin"
+    "/local/bin" "/local/freeware/bin" "/local/gnu/bin"
+    "/usr/freeware/bin" "/usr/pkg/bin" "/usr/contrib/bin")
+  "*List of directories to search for executables on remote host.
+For every remote host, this variable will be set buffer local,
+keeping the list of existing directories on that host.
+
+You can use `~' in this list, but when searching for a shell which groks
+tilde expansion, all directory names starting with `~' will be ignored.
+
+`Default Directories' represent the list of directories given by
+the command \"getconf PATH\".  It is recommended to use this
+entry on top of this list, because these are the default
+directories for POSIX compatible commands.
+
+`Private Directories' are the settings of the $PATH environment,
+as given in your `~/.profile'."
+  :group 'tramp
+  :type '(repeat (choice
+		  (const :tag "Default Directories" tramp-default-remote-path)
+		  (const :tag "Private Directories" tramp-own-remote-path)
+		  (string :tag "Directory"))))
+
+(defcustom tramp-remote-process-environment
+  `("HISTFILE=$HOME/.tramp_history" "HISTSIZE=1" "LC_ALL=C"
+    ,(format "TERM=%s" tramp-terminal-type)
+    "EMACS=t" ;; Deprecated.
+    ,(format "INSIDE_EMACS='%s,tramp:%s'" emacs-version tramp-version)
+    "CDPATH=" "HISTORY=" "MAIL=" "MAILCHECK=" "MAILPATH="
+    "autocorrect=" "correct=")
+
+  "*List of environment variables to be set on the remote host.
+
+Each element should be a string of the form ENVVARNAME=VALUE.  An
+entry ENVVARNAME= diables the corresponding environment variable,
+which might have been set in the init files like ~/.profile.
+
+Special handling is applied to the PATH environment, which should
+not be set here. Instead of, it should be set via `tramp-remote-path'."
+  :group 'tramp
+  :type '(repeat string))
+
+(defcustom tramp-sh-extra-args '(("/bash\\'" . "-norc -noprofile"))
+  "*Alist specifying extra arguments to pass to the remote shell.
+Entries are (REGEXP . ARGS) where REGEXP is a regular expression
+matching the shell file name and ARGS is a string specifying the
+arguments.
+
+This variable is only used when Tramp needs to start up another shell
+for tilde expansion.  The extra arguments should typically prevent the
+shell from reading its init file."
+  :group 'tramp
+  ;; This might be the wrong way to test whether the widget type
+  ;; `alist' is available.  Who knows the right way to test it?
+  :type (if (get 'alist 'widget-type)
+	    '(alist :key-type string :value-type string)
+	  '(repeat (cons string string))))
+
+(defconst tramp-actions-before-shell
+  '((tramp-login-prompt-regexp tramp-action-login)
+    (tramp-password-prompt-regexp tramp-action-password)
+    (tramp-wrong-passwd-regexp tramp-action-permission-denied)
+    (shell-prompt-pattern tramp-action-succeed)
+    (tramp-shell-prompt-pattern tramp-action-succeed)
+    (tramp-yesno-prompt-regexp tramp-action-yesno)
+    (tramp-yn-prompt-regexp tramp-action-yn)
+    (tramp-terminal-prompt-regexp tramp-action-terminal)
+    (tramp-process-alive-regexp tramp-action-process-alive))
+  "List of pattern/action pairs.
+Whenever a pattern matches, the corresponding action is performed.
+Each item looks like (PATTERN ACTION).
+
+The PATTERN should be a symbol, a variable.  The value of this
+variable gives the regular expression to search for.  Note that the
+regexp must match at the end of the buffer, \"\\'\" is implicitly
+appended to it.
+
+The ACTION should also be a symbol, but a function.  When the
+corresponding PATTERN matches, the ACTION function is called.")
+
+(defconst tramp-actions-copy-out-of-band
+  '((tramp-password-prompt-regexp tramp-action-password)
+    (tramp-wrong-passwd-regexp tramp-action-permission-denied)
+    (tramp-copy-failed-regexp tramp-action-permission-denied)
+    (tramp-process-alive-regexp tramp-action-out-of-band))
+  "List of pattern/action pairs.
+This list is used for copying/renaming with out-of-band methods.
+
+See `tramp-actions-before-shell' for more info.")
+
+(defconst tramp-uudecode
+  "(echo begin 600 /tmp/tramp.$$; tail +2) | uudecode
+cat /tmp/tramp.$$
+rm -f /tmp/tramp.$$"
+  "Shell function to implement `uudecode' to standard output.
+Many systems support `uudecode -o /dev/stdout' or `uudecode -o -'
+for this or `uudecode -p', but some systems don't, and for them
+we have this shell function.")
+
+(defconst tramp-perl-file-truename
+  "%s -e '
+use File::Spec;
+use Cwd \"realpath\";
+
+sub recursive {
+    my ($volume, @dirs) = @_;
+    my $real = realpath(File::Spec->catpath(
+                   $volume, File::Spec->catdir(@dirs), \"\"));
+    if ($real) {
+        my ($vol, $dir) = File::Spec->splitpath($real, 1);
+        return ($vol, File::Spec->splitdir($dir));
+    }
+    else {
+        my $last = pop(@dirs);
+        ($volume, @dirs) = recursive($volume, @dirs);
+        push(@dirs, $last);
+        return ($volume, @dirs);
+    }
+}
+
+$result = realpath($ARGV[0]);
+if (!$result) {
+    my ($vol, $dir) = File::Spec->splitpath($ARGV[0], 1);
+    ($vol, @dirs) = recursive($vol, File::Spec->splitdir($dir));
+
+    $result = File::Spec->catpath($vol, File::Spec->catdir(@dirs), \"\");
+}
+
+if ($ARGV[0] =~ /\\/$/) {
+    $result = $result . \"/\";
+}
+
+print \"\\\"$result\\\"\\n\";
+' \"$1\" 2>/dev/null"
+  "Perl script to produce output suitable for use with `file-truename'
+on the remote file system.
+Escape sequence %s is replaced with name of Perl binary.
+This string is passed to `format', so percent characters need to be doubled.")
+
+(defconst tramp-perl-file-name-all-completions
+  "%s -e 'sub case {
+ my $str = shift;
+ if ($ARGV[2]) {
+  return lc($str);
+ }
+ else {
+  return $str;
+ }
+}
+opendir(d, $ARGV[0]) || die(\"$ARGV[0]: $!\\nfail\\n\");
+@files = readdir(d); closedir(d);
+foreach $f (@files) {
+ if (case(substr($f, 0, length($ARGV[1]))) eq case($ARGV[1])) {
+  if (-d \"$ARGV[0]/$f\") {
+   print \"$f/\\n\";
+  }
+  else {
+   print \"$f\\n\";
+  }
+ }
+}
+print \"ok\\n\"
+' \"$1\" \"$2\" \"$3\" 2>/dev/null"
+  "Perl script to produce output suitable for use with
+`file-name-all-completions' on the remote file system.  Escape
+sequence %s is replaced with name of Perl binary.  This string is
+passed to `format', so percent characters need to be doubled.")
+
+;; Perl script to implement `file-attributes' in a Lisp `read'able
+;; output.  If you are hacking on this, note that you get *no* output
+;; unless this spits out a complete line, including the '\n' at the
+;; end.
+;; The device number is returned as "-1", because there will be a virtual
+;; device number set in `tramp-handle-file-attributes'.
+(defconst tramp-perl-file-attributes
+  "%s -e '
+@stat = lstat($ARGV[0]);
+if (!@stat) {
+    print \"nil\\n\";
+    exit 0;
+}
+if (($stat[2] & 0170000) == 0120000)
+{
+    $type = readlink($ARGV[0]);
+    $type = \"\\\"$type\\\"\";
+}
+elsif (($stat[2] & 0170000) == 040000)
+{
+    $type = \"t\";
+}
+else
+{
+    $type = \"nil\"
+};
+$uid = ($ARGV[1] eq \"integer\") ? $stat[4] : \"\\\"\" . getpwuid($stat[4]) . \"\\\"\";
+$gid = ($ARGV[1] eq \"integer\") ? $stat[5] : \"\\\"\" . getgrgid($stat[5]) . \"\\\"\";
+printf(
+    \"(%%s %%u %%s %%s (%%u %%u) (%%u %%u) (%%u %%u) %%u.0 %%u t (%%u . %%u) -1)\\n\",
+    $type,
+    $stat[3],
+    $uid,
+    $gid,
+    $stat[8] >> 16 & 0xffff,
+    $stat[8] & 0xffff,
+    $stat[9] >> 16 & 0xffff,
+    $stat[9] & 0xffff,
+    $stat[10] >> 16 & 0xffff,
+    $stat[10] & 0xffff,
+    $stat[7],
+    $stat[2],
+    $stat[1] >> 16 & 0xffff,
+    $stat[1] & 0xffff
+);' \"$1\" \"$2\" 2>/dev/null"
+  "Perl script to produce output suitable for use with `file-attributes'
+on the remote file system.
+Escape sequence %s is replaced with name of Perl binary.
+This string is passed to `format', so percent characters need to be doubled.")
+
+(defconst tramp-perl-directory-files-and-attributes
+  "%s -e '
+chdir($ARGV[0]) or printf(\"\\\"Cannot change to $ARGV[0]: $''!''\\\"\\n\"), exit();
+opendir(DIR,\".\") or printf(\"\\\"Cannot open directory $ARGV[0]: $''!''\\\"\\n\"), exit();
+@list = readdir(DIR);
+closedir(DIR);
+$n = scalar(@list);
+printf(\"(\\n\");
+for($i = 0; $i < $n; $i++)
+{
+    $filename = $list[$i];
+    @stat = lstat($filename);
+    if (($stat[2] & 0170000) == 0120000)
+    {
+        $type = readlink($filename);
+        $type = \"\\\"$type\\\"\";
+    }
+    elsif (($stat[2] & 0170000) == 040000)
+    {
+        $type = \"t\";
+    }
+    else
+    {
+        $type = \"nil\"
+    };
+    $uid = ($ARGV[1] eq \"integer\") ? $stat[4] : \"\\\"\" . getpwuid($stat[4]) . \"\\\"\";
+    $gid = ($ARGV[1] eq \"integer\") ? $stat[5] : \"\\\"\" . getgrgid($stat[5]) . \"\\\"\";
+    printf(
+        \"(\\\"%%s\\\" %%s %%u %%s %%s (%%u %%u) (%%u %%u) (%%u %%u) %%u.0 %%u t (%%u . %%u) (%%u . %%u))\\n\",
+        $filename,
+        $type,
+        $stat[3],
+        $uid,
+        $gid,
+        $stat[8] >> 16 & 0xffff,
+        $stat[8] & 0xffff,
+        $stat[9] >> 16 & 0xffff,
+        $stat[9] & 0xffff,
+        $stat[10] >> 16 & 0xffff,
+        $stat[10] & 0xffff,
+        $stat[7],
+        $stat[2],
+        $stat[1] >> 16 & 0xffff,
+        $stat[1] & 0xffff,
+        $stat[0] >> 16 & 0xffff,
+        $stat[0] & 0xffff);
+}
+printf(\")\\n\");' \"$1\" \"$2\" 2>/dev/null"
+  "Perl script implementing `directory-files-attributes' as Lisp `read'able
+output.
+Escape sequence %s is replaced with name of Perl binary.
+This string is passed to `format', so percent characters need to be doubled.")
+
+;; These two use base64 encoding.
+(defconst tramp-perl-encode-with-module
+  "%s -MMIME::Base64 -0777 -ne 'print encode_base64($_)' 2>/dev/null"
+  "Perl program to use for encoding a file.
+Escape sequence %s is replaced with name of Perl binary.
+This string is passed to `format', so percent characters need to be doubled.
+This implementation requires the MIME::Base64 Perl module to be installed
+on the remote host.")
+
+(defconst tramp-perl-decode-with-module
+  "%s -MMIME::Base64 -0777 -ne 'print decode_base64($_)' 2>/dev/null"
+  "Perl program to use for decoding a file.
+Escape sequence %s is replaced with name of Perl binary.
+This string is passed to `format', so percent characters need to be doubled.
+This implementation requires the MIME::Base64 Perl module to be installed
+on the remote host.")
+
+(defconst tramp-perl-encode
+  "%s -e '
+# This script contributed by Juanma Barranquero <lektu@terra.es>.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+#   Free Software Foundation, Inc.
+use strict;
+
+my %%trans = do {
+    my $i = 0;
+    map {(substr(unpack(q(B8), chr $i++), 2, 6), $_)}
+      split //, q(ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/);
+};
+
+binmode(\\*STDIN);
+
+# We read in chunks of 54 bytes, to generate output lines
+# of 72 chars (plus end of line)
+$/ = \\54;
+
+while (my $data = <STDIN>) {
+    my $pad = q();
+
+    # Only for the last chunk, and only if did not fill the last three-byte packet
+    if (eof) {
+        my $mod = length($data) %% 3;
+        $pad = q(=) x (3 - $mod) if $mod;
+    }
+
+    # Not the fastest method, but it is simple: unpack to binary string, split
+    # by groups of 6 bits and convert back from binary to byte; then map into
+    # the translation table
+    print
+      join q(),
+        map($trans{$_},
+            (substr(unpack(q(B*), $data) . q(00000), 0, 432) =~ /....../g)),
+              $pad,
+                qq(\\n);
+}' 2>/dev/null"
+  "Perl program to use for encoding a file.
+Escape sequence %s is replaced with name of Perl binary.
+This string is passed to `format', so percent characters need to be doubled.")
+
+(defconst tramp-perl-decode
+  "%s -e '
+# This script contributed by Juanma Barranquero <lektu@terra.es>.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+#   Free Software Foundation, Inc.
+use strict;
+
+my %%trans = do {
+    my $i = 0;
+    map {($_, substr(unpack(q(B8), chr $i++), 2, 6))}
+      split //, q(ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/)
+};
+
+my %%bytes = map {(unpack(q(B8), chr $_), chr $_)} 0 .. 255;
+
+binmode(\\*STDOUT);
+
+# We are going to accumulate into $pending to accept any line length
+# (we do not check they are <= 76 chars as the RFC says)
+my $pending = q();
+
+while (my $data = <STDIN>) {
+    chomp $data;
+
+    # If we find one or two =, we have reached the end and
+    # any following data is to be discarded
+    my $finished = $data =~ s/(==?).*/$1/;
+    $pending .= $data;
+
+    my $len = length($pending);
+    my $chunk = substr($pending, 0, $len & ~3);
+    $pending = substr($pending, $len & ~3 + 1);
+
+    # Easy method: translate from chars to (pregenerated) six-bit packets, join,
+    # split in 8-bit chunks and convert back to char.
+    print join q(),
+      map $bytes{$_},
+        ((join q(), map {$trans{$_} || q()} split //, $chunk) =~ /......../g);
+
+    last if $finished;
+}' 2>/dev/null"
+  "Perl program to use for decoding a file.
+Escape sequence %s is replaced with name of Perl binary.
+This string is passed to `format', so percent characters need to be doubled.")
+
+(defconst tramp-vc-registered-read-file-names
+  "echo \"(\"
+while read file; do
+    if %s \"$file\"; then
+	echo \"(\\\"$file\\\" \\\"file-exists-p\\\" t)\"
+    else
+	echo \"(\\\"$file\\\" \\\"file-exists-p\\\" nil)\"
+    fi
+    if %s \"$file\"; then
+	echo \"(\\\"$file\\\" \\\"file-readable-p\\\" t)\"
+    else
+	echo \"(\\\"$file\\\" \\\"file-readable-p\\\" nil)\"
+    fi
+done
+echo \")\""
+  "Script to check existence of VC related files.
+It must be send formatted with two strings; the tests for file
+existence, and file readability.  Input shall be read via
+here-document, otherwise the command could exceed maximum length
+of command line.")
+
+(defconst tramp-file-mode-type-map
+  '((0  . "-")  ; Normal file (SVID-v2 and XPG2)
+    (1  . "p")  ; fifo
+    (2  . "c")  ; character device
+    (3  . "m")  ; multiplexed character device (v7)
+    (4  . "d")  ; directory
+    (5  . "?")  ; Named special file (XENIX)
+    (6  . "b")  ; block device
+    (7  . "?")  ; multiplexed block device (v7)
+    (8  . "-")  ; regular file
+    (9  . "n")  ; network special file (HP-UX)
+    (10 . "l")  ; symlink
+    (11 . "?")  ; ACL shadow inode (Solaris, not userspace)
+    (12 . "s")  ; socket
+    (13 . "D")  ; door special (Solaris)
+    (14 . "w")) ; whiteout (BSD)
+  "A list of file types returned from the `stat' system call.
+This is used to map a mode number to a permission string.")
+
+;; New handlers should be added here.  The following operations can be
+;; handled using the normal primitives: file-name-sans-versions,
+;; get-file-buffer.
+(defconst tramp-sh-file-name-handler-alist
+  '((load . tramp-handle-load)
+    (make-symbolic-link . tramp-handle-make-symbolic-link)
+    (file-name-as-directory . tramp-handle-file-name-as-directory)
+    (file-name-directory . tramp-handle-file-name-directory)
+    (file-name-nondirectory . tramp-handle-file-name-nondirectory)
+    (file-truename . tramp-handle-file-truename)
+    (file-exists-p . tramp-handle-file-exists-p)
+    (file-directory-p . tramp-handle-file-directory-p)
+    (file-executable-p . tramp-handle-file-executable-p)
+    (file-readable-p . tramp-handle-file-readable-p)
+    (file-regular-p . tramp-handle-file-regular-p)
+    (file-symlink-p . tramp-handle-file-symlink-p)
+    (file-writable-p . tramp-handle-file-writable-p)
+    (file-ownership-preserved-p . tramp-handle-file-ownership-preserved-p)
+    (file-newer-than-file-p . tramp-handle-file-newer-than-file-p)
+    (file-attributes . tramp-handle-file-attributes)
+    (file-modes . tramp-handle-file-modes)
+    (directory-files . tramp-handle-directory-files)
+    (directory-files-and-attributes . tramp-handle-directory-files-and-attributes)
+    (file-name-all-completions . tramp-handle-file-name-all-completions)
+    (file-name-completion . tramp-handle-file-name-completion)
+    (add-name-to-file . tramp-handle-add-name-to-file)
+    (copy-file . tramp-handle-copy-file)
+    (copy-directory . tramp-handle-copy-directory)
+    (rename-file . tramp-handle-rename-file)
+    (set-file-modes . tramp-handle-set-file-modes)
+    (set-file-times . tramp-handle-set-file-times)
+    (make-directory . tramp-handle-make-directory)
+    (delete-directory . tramp-handle-delete-directory)
+    (delete-file . tramp-handle-delete-file)
+    (directory-file-name . tramp-handle-directory-file-name)
+    ;; `executable-find' is not official yet.
+    (executable-find . tramp-handle-executable-find)
+    (start-file-process . tramp-handle-start-file-process)
+    (process-file . tramp-handle-process-file)
+    (shell-command . tramp-handle-shell-command)
+    (insert-directory . tramp-handle-insert-directory)
+    (expand-file-name . tramp-handle-expand-file-name)
+    (substitute-in-file-name . tramp-handle-substitute-in-file-name)
+    (file-local-copy . tramp-handle-file-local-copy)
+    (file-remote-p . tramp-handle-file-remote-p)
+    (insert-file-contents . tramp-handle-insert-file-contents)
+    (insert-file-contents-literally
+     . tramp-handle-insert-file-contents-literally)
+    (write-region . tramp-handle-write-region)
+    (find-backup-file-name . tramp-handle-find-backup-file-name)
+    (make-auto-save-file-name . tramp-handle-make-auto-save-file-name)
+    (unhandled-file-name-directory . tramp-handle-unhandled-file-name-directory)
+    (dired-compress-file . tramp-handle-dired-compress-file)
+    (dired-recursive-delete-directory
+     . tramp-handle-dired-recursive-delete-directory)
+    (dired-uncache . tramp-handle-dired-uncache)
+    (set-visited-file-modtime . tramp-handle-set-visited-file-modtime)
+    (verify-visited-file-modtime . tramp-handle-verify-visited-file-modtime)
+    (file-selinux-context . tramp-handle-file-selinux-context)
+    (set-file-selinux-context . tramp-handle-set-file-selinux-context)
+    (vc-registered . tramp-handle-vc-registered))
+  "Alist of handler functions.
+Operations not mentioned here will be handled by the normal Emacs functions.")
+
+;; This must be the last entry, because `identity' always matches.
+;;;###tramp-autoload
+(add-to-list 'tramp-foreign-file-name-handler-alist
+	     '(identity . tramp-sh-file-name-handler) 'append)
+
+;;; File Name Handler Functions:
+
+(defun tramp-handle-make-symbolic-link
+  (filename linkname &optional ok-if-already-exists)
+  "Like `make-symbolic-link' for Tramp files.
+If LINKNAME is a non-Tramp file, it is used verbatim as the target of
+the symlink.  If LINKNAME is a Tramp file, only the localname component is
+used as the target of the symlink.
+
+If LINKNAME is a Tramp file and the localname component is relative, then
+it is expanded first, before the localname component is taken.  Note that
+this can give surprising results if the user/host for the source and
+target of the symlink differ."
+  (with-parsed-tramp-file-name linkname l
+    (let ((ln (tramp-get-remote-ln l))
+	  (cwd (tramp-run-real-handler
+		'file-name-directory (list l-localname))))
+      (unless ln
+	(tramp-error
+	 l 'file-error
+	 "Making a symbolic link.  ln(1) does not exist on the remote host."))
+
+      ;; Do the 'confirm if exists' thing.
+      (when (file-exists-p linkname)
+	;; What to do?
+	(if (or (null ok-if-already-exists) ; not allowed to exist
+		(and (numberp ok-if-already-exists)
+		     (not (yes-or-no-p
+			   (format
+			    "File %s already exists; make it a link anyway? "
+			    l-localname)))))
+	    (tramp-error
+	     l 'file-already-exists "File %s already exists" l-localname)
+	  (delete-file linkname)))
+
+      ;; If FILENAME is a Tramp name, use just the localname component.
+      (when (tramp-tramp-file-p filename)
+	(setq filename
+	      (tramp-file-name-localname
+	       (tramp-dissect-file-name (expand-file-name filename)))))
+
+      (tramp-flush-file-property l (file-name-directory l-localname))
+      (tramp-flush-file-property l l-localname)
+
+      ;; Right, they are on the same host, regardless of user, method, etc.
+      ;; We now make the link on the remote machine. This will occur as the user
+      ;; that FILENAME belongs to.
+      (tramp-send-command-and-check
+       l
+       (format
+	"cd %s && %s -sf %s %s"
+	(tramp-shell-quote-argument cwd)
+	ln
+	(tramp-shell-quote-argument filename)
+	(tramp-shell-quote-argument l-localname))
+       t))))
+
+(defun tramp-handle-load (file &optional noerror nomessage nosuffix must-suffix)
+  "Like `load' for Tramp files."
+  (with-parsed-tramp-file-name (expand-file-name file) nil
+    (unless nosuffix
+      (cond ((file-exists-p (concat file ".elc"))
+	     (setq file (concat file ".elc")))
+	    ((file-exists-p (concat file ".el"))
+	     (setq file (concat file ".el")))))
+    (when must-suffix
+      ;; The first condition is always true for absolute file names.
+      ;; Included for safety's sake.
+      (unless (or (file-name-directory file)
+		  (string-match "\\.elc?\\'" file))
+	(tramp-error
+	 v 'file-error
+	 "File `%s' does not include a `.el' or `.elc' suffix" file)))
+    (unless noerror
+      (when (not (file-exists-p file))
+	(tramp-error v 'file-error "Cannot load nonexistent file `%s'" file)))
+    (if (not (file-exists-p file))
+	nil
+      (let ((tramp-message-show-message (not nomessage)))
+	(with-progress-reporter v 0 (format "Loading %s" file)
+	  (let ((local-copy (file-local-copy file)))
+	    ;; MUST-SUFFIX doesn't exist on XEmacs, so let it default to nil.
+	    (unwind-protect
+		(load local-copy noerror t t)
+	      (delete-file local-copy)))))
+      t)))
+
+;; Localname manipulation functions that grok Tramp localnames...
+(defun tramp-handle-file-name-as-directory (file)
+  "Like `file-name-as-directory' but aware of Tramp files."
+  ;; `file-name-as-directory' would be sufficient except localname is
+  ;; the empty string.
+  (let ((v (tramp-dissect-file-name file t)))
+    ;; Run the command on the localname portion only.
+    (tramp-make-tramp-file-name
+     (tramp-file-name-method v)
+     (tramp-file-name-user v)
+     (tramp-file-name-host v)
+     (tramp-run-real-handler
+      'file-name-as-directory (list (or (tramp-file-name-localname v) ""))))))
+
+(defun tramp-handle-file-name-directory (file)
+  "Like `file-name-directory' but aware of Tramp files."
+  ;; Everything except the last filename thing is the directory.  We
+  ;; cannot apply `with-parsed-tramp-file-name', because this expands
+  ;; the remote file name parts.  This is a problem when we are in
+  ;; file name completion.
+  (let ((v (tramp-dissect-file-name file t)))
+    ;; Run the command on the localname portion only.
+    (tramp-make-tramp-file-name
+     (tramp-file-name-method v)
+     (tramp-file-name-user v)
+     (tramp-file-name-host v)
+     (tramp-run-real-handler
+      'file-name-directory (list (or (tramp-file-name-localname v) ""))))))
+
+(defun tramp-handle-file-name-nondirectory (file)
+  "Like `file-name-nondirectory' but aware of Tramp files."
+  (with-parsed-tramp-file-name file nil
+    (tramp-run-real-handler 'file-name-nondirectory (list localname))))
+
+(defun tramp-handle-file-truename (filename &optional counter prev-dirs)
+  "Like `file-truename' for Tramp files."
+  (with-parsed-tramp-file-name (expand-file-name filename) nil
+    (with-file-property v localname "file-truename"
+      (let ((result nil))			; result steps in reverse order
+	(tramp-message v 4 "Finding true name for `%s'" filename)
+	(cond
+	 ;; Use GNU readlink --canonicalize-missing where available.
+	 ((tramp-get-remote-readlink v)
+	  (setq result
+		(tramp-send-command-and-read
+		 v
+		 (format "echo \"\\\"`%s --canonicalize-missing %s`\\\"\""
+			 (tramp-get-remote-readlink v)
+			 (tramp-shell-quote-argument localname)))))
+
+	 ;; Use Perl implementation.
+	 ((and (tramp-get-remote-perl v)
+	       (tramp-get-connection-property v "perl-file-spec" nil)
+	       (tramp-get-connection-property v "perl-cwd-realpath" nil))
+	  (tramp-maybe-send-script
+	   v tramp-perl-file-truename "tramp_perl_file_truename")
+	  (setq result
+		(tramp-send-command-and-read
+		 v
+		 (format "tramp_perl_file_truename %s"
+			 (tramp-shell-quote-argument localname)))))
+
+	 ;; Do it yourself.  We bind `directory-sep-char' here for
+	 ;; XEmacs on Windows, which would otherwise use backslash.
+	 (t (let* ((directory-sep-char ?/)
+		   (steps (tramp-compat-split-string localname "/"))
+		   (localnamedir (tramp-run-real-handler
+				  'file-name-as-directory (list localname)))
+		   (is-dir (string= localname localnamedir))
+		   (thisstep nil)
+		   (numchase 0)
+		   ;; Don't make the following value larger than
+		   ;; necessary.  People expect an error message in a
+		   ;; timely fashion when something is wrong;
+		   ;; otherwise they might think that Emacs is hung.
+		   ;; Of course, correctness has to come first.
+		   (numchase-limit 20)
+		   symlink-target)
+	      (while (and steps (< numchase numchase-limit))
+		(setq thisstep (pop steps))
+		(tramp-message
+		 v 5 "Check %s"
+		 (mapconcat 'identity
+			    (append '("") (reverse result) (list thisstep))
+			    "/"))
+		(setq symlink-target
+		      (nth 0 (file-attributes
+			      (tramp-make-tramp-file-name
+			       method user host
+			       (mapconcat 'identity
+					  (append '("")
+						  (reverse result)
+						  (list thisstep))
+					  "/")))))
+		(cond ((string= "." thisstep)
+		       (tramp-message v 5 "Ignoring step `.'"))
+		      ((string= ".." thisstep)
+		       (tramp-message v 5 "Processing step `..'")
+		       (pop result))
+		      ((stringp symlink-target)
+		       ;; It's a symlink, follow it.
+		       (tramp-message v 5 "Follow symlink to %s" symlink-target)
+		       (setq numchase (1+ numchase))
+		       (when (file-name-absolute-p symlink-target)
+			 (setq result nil))
+		       ;; If the symlink was absolute, we'll get a string like
+		       ;; "/user@host:/some/target"; extract the
+		       ;; "/some/target" part from it.
+		       (when (tramp-tramp-file-p symlink-target)
+			 (unless (tramp-equal-remote filename symlink-target)
+			   (tramp-error
+			    v 'file-error
+			    "Symlink target `%s' on wrong host" symlink-target))
+			 (setq symlink-target localname))
+		       (setq steps
+			     (append (tramp-compat-split-string
+				      symlink-target "/")
+				     steps)))
+		      (t
+		       ;; It's a file.
+		       (setq result (cons thisstep result)))))
+	      (when (>= numchase numchase-limit)
+		(tramp-error
+		 v 'file-error
+		 "Maximum number (%d) of symlinks exceeded" numchase-limit))
+	      (setq result (reverse result))
+	      ;; Combine list to form string.
+	      (setq result
+		    (if result
+			(mapconcat 'identity (cons "" result) "/")
+		      "/"))
+	      (when (and is-dir (or (string= "" result)
+				    (not (string= (substring result -1) "/"))))
+		(setq result (concat result "/"))))))
+
+        (tramp-message v 4 "True name of `%s' is `%s'" filename result)
+        (tramp-make-tramp-file-name method user host result)))))
+
+;; Basic functions.
+
+(defun tramp-handle-file-exists-p (filename)
+  "Like `file-exists-p' for Tramp files."
+  (with-parsed-tramp-file-name filename nil
+    (with-file-property v localname "file-exists-p"
+      (or (not (null (tramp-get-file-property
+                      v localname "file-attributes-integer" nil)))
+          (not (null (tramp-get-file-property
+                      v localname "file-attributes-string" nil)))
+	  (tramp-send-command-and-check
+	   v
+	   (format
+	    "%s %s"
+	    (tramp-get-file-exists-command v)
+	    (tramp-shell-quote-argument localname)))))))
+
+;; CCC: This should check for an error condition and signal failure
+;;      when something goes wrong.
+;; Daniel Pittman <daniel@danann.net>
+(defun tramp-handle-file-attributes (filename &optional id-format)
+  "Like `file-attributes' for Tramp files."
+  (unless id-format (setq id-format 'integer))
+  ;; Don't modify `last-coding-system-used' by accident.
+  (let ((last-coding-system-used last-coding-system-used))
+    (with-parsed-tramp-file-name (expand-file-name filename) nil
+      (with-file-property v localname (format "file-attributes-%s" id-format)
+	(save-excursion
+	  (tramp-convert-file-attributes
+	   v
+	   (cond
+	    ((tramp-get-remote-stat v)
+	     (tramp-do-file-attributes-with-stat v localname id-format))
+	    ((tramp-get-remote-perl v)
+	     (tramp-do-file-attributes-with-perl v localname id-format))
+	    (t
+	     (tramp-do-file-attributes-with-ls v localname id-format)))))))))
+
+(defun tramp-do-file-attributes-with-ls (vec localname &optional id-format)
+  "Implement `file-attributes' for Tramp files using the ls(1) command."
+  (let (symlinkp dirp
+		 res-inode res-filemodes res-numlinks
+		 res-uid res-gid res-size res-symlink-target)
+    (tramp-message vec 5 "file attributes with ls: %s" localname)
+    (tramp-send-command
+     vec
+     (format "(%s %s || %s -h %s) && %s %s %s"
+	     (tramp-get-file-exists-command vec)
+	     (tramp-shell-quote-argument localname)
+	     (tramp-get-test-command vec)
+	     (tramp-shell-quote-argument localname)
+	     (tramp-get-ls-command vec)
+	     (if (eq id-format 'integer) "-ildn" "-ild")
+	     (tramp-shell-quote-argument localname)))
+    ;; parse `ls -l' output ...
+    (with-current-buffer (tramp-get-buffer vec)
+      (when (> (buffer-size) 0)
+        (goto-char (point-min))
+        ;; ... inode
+        (setq res-inode
+              (condition-case err
+                  (read (current-buffer))
+                (invalid-read-syntax
+                 (when (and (equal (cadr err)
+                                   "Integer constant overflow in reader")
+                            (string-match
+                             "^[0-9]+\\([0-9][0-9][0-9][0-9][0-9]\\)\\'"
+                             (car (cddr err))))
+                   (let* ((big (read (substring (car (cddr err)) 0
+                                                (match-beginning 1))))
+                          (small (read (match-string 1 (car (cddr err)))))
+                          (twiddle (/ small 65536)))
+                     (cons (+ big twiddle)
+                           (- small (* twiddle 65536))))))))
+        ;; ... file mode flags
+        (setq res-filemodes (symbol-name (read (current-buffer))))
+        ;; ... number links
+        (setq res-numlinks (read (current-buffer)))
+        ;; ... uid and gid
+        (setq res-uid (read (current-buffer)))
+        (setq res-gid (read (current-buffer)))
+        (if (eq id-format 'integer)
+            (progn
+              (unless (numberp res-uid) (setq res-uid -1))
+              (unless (numberp res-gid) (setq res-gid -1)))
+          (progn
+            (unless (stringp res-uid) (setq res-uid (symbol-name res-uid)))
+            (unless (stringp res-gid) (setq res-gid (symbol-name res-gid)))))
+        ;; ... size
+        (setq res-size (read (current-buffer)))
+        ;; From the file modes, figure out other stuff.
+        (setq symlinkp (eq ?l (aref res-filemodes 0)))
+        (setq dirp (eq ?d (aref res-filemodes 0)))
+        ;; if symlink, find out file name pointed to
+        (when symlinkp
+          (search-forward "-> ")
+          (setq res-symlink-target
+                (buffer-substring (point) (tramp-compat-line-end-position))))
+        ;; return data gathered
+        (list
+         ;; 0. t for directory, string (name linked to) for symbolic
+         ;; link, or nil.
+         (or dirp res-symlink-target)
+         ;; 1. Number of links to file.
+         res-numlinks
+         ;; 2. File uid.
+         res-uid
+         ;; 3. File gid.
+         res-gid
+         ;; 4. Last access time, as a list of two integers. First
+         ;; integer has high-order 16 bits of time, second has low 16
+         ;; bits.
+         ;; 5. Last modification time, likewise.
+         ;; 6. Last status change time, likewise.
+         '(0 0) '(0 0) '(0 0)		;CCC how to find out?
+         ;; 7. Size in bytes (-1, if number is out of range).
+         res-size
+         ;; 8. File modes, as a string of ten letters or dashes as in ls -l.
+         res-filemodes
+         ;; 9. t if file's gid would change if file were deleted and
+         ;; recreated.  Will be set in `tramp-convert-file-attributes'
+         t
+         ;; 10. inode number.
+         res-inode
+         ;; 11. Device number.  Will be replaced by a virtual device number.
+         -1
+         )))))
+
+(defun tramp-do-file-attributes-with-perl
+  (vec localname &optional id-format)
+  "Implement `file-attributes' for Tramp files using a Perl script."
+  (tramp-message vec 5 "file attributes with perl: %s" localname)
+  (tramp-maybe-send-script
+   vec tramp-perl-file-attributes "tramp_perl_file_attributes")
+  (tramp-send-command-and-read
+   vec
+   (format "tramp_perl_file_attributes %s %s"
+	   (tramp-shell-quote-argument localname) id-format)))
+
+(defun tramp-do-file-attributes-with-stat
+  (vec localname &optional id-format)
+  "Implement `file-attributes' for Tramp files using stat(1) command."
+  (tramp-message vec 5 "file attributes with stat: %s" localname)
+  (tramp-send-command-and-read
+   vec
+   (format
+    ;; On Opsware, pdksh (which is the true name of ksh there) doesn't
+    ;; parse correctly the sequence "((".  Therefore, we add a space.
+    "( (%s %s || %s -h %s) && %s -c '( (\"%%N\") %%h %s %s %%X.0 %%Y.0 %%Z.0 %%s.0 \"%%A\" t %%i.0 -1)' %s || echo nil)"
+    (tramp-get-file-exists-command vec)
+    (tramp-shell-quote-argument localname)
+    (tramp-get-test-command vec)
+    (tramp-shell-quote-argument localname)
+    (tramp-get-remote-stat vec)
+    (if (eq id-format 'integer) "%u" "\"%U\"")
+    (if (eq id-format 'integer) "%g" "\"%G\"")
+    (tramp-shell-quote-argument localname))))
+
+(defun tramp-handle-set-visited-file-modtime (&optional time-list)
+  "Like `set-visited-file-modtime' for Tramp files."
+  (unless (buffer-file-name)
+    (error "Can't set-visited-file-modtime: buffer `%s' not visiting a file"
+	   (buffer-name)))
+  (if time-list
+      (tramp-run-real-handler 'set-visited-file-modtime (list time-list))
+    (let ((f (buffer-file-name))
+	  coding-system-used)
+      (with-parsed-tramp-file-name f nil
+	(let* ((attr (file-attributes f))
+	       ;; '(-1 65535) means file doesn't exists yet.
+	       (modtime (or (nth 5 attr) '(-1 65535))))
+	  (when (boundp 'last-coding-system-used)
+	    (setq coding-system-used (symbol-value 'last-coding-system-used)))
+	  ;; We use '(0 0) as a don't-know value.  See also
+	  ;; `tramp-do-file-attributes-with-ls'.
+	  (if (not (equal modtime '(0 0)))
+	      (tramp-run-real-handler 'set-visited-file-modtime (list modtime))
+	    (progn
+	      (tramp-send-command
+	       v
+	       (format "%s -ild %s"
+		       (tramp-get-ls-command v)
+		       (tramp-shell-quote-argument localname)))
+	      (setq attr (buffer-substring (point)
+					   (progn (end-of-line) (point)))))
+	    (tramp-set-file-property
+	     v localname "visited-file-modtime-ild" attr))
+	  (when (boundp 'last-coding-system-used)
+	    (set 'last-coding-system-used coding-system-used))
+	  nil)))))
+
+;; This function makes the same assumption as
+;; `tramp-handle-set-visited-file-modtime'.
+(defun tramp-handle-verify-visited-file-modtime (buf)
+  "Like `verify-visited-file-modtime' for Tramp files.
+At the time `verify-visited-file-modtime' calls this function, we
+already know that the buffer is visiting a file and that
+`visited-file-modtime' does not return 0.  Do not call this
+function directly, unless those two cases are already taken care
+of."
+  (with-current-buffer buf
+    (let ((f (buffer-file-name)))
+      ;; There is no file visiting the buffer, or the buffer has no
+      ;; recorded last modification time, or there is no established
+      ;; connection.
+      (if (or (not f)
+	      (eq (visited-file-modtime) 0)
+	      (not (tramp-file-name-handler 'file-remote-p f nil 'connected)))
+	  t
+	(with-parsed-tramp-file-name f nil
+	  (tramp-flush-file-property v localname)
+	  (let* ((attr (file-attributes f))
+		 (modtime (nth 5 attr))
+		 (mt (visited-file-modtime)))
+
+	    (cond
+	     ;; File exists, and has a known modtime.
+	     ((and attr (not (equal modtime '(0 0))))
+	      (< (abs (tramp-time-diff
+		       modtime
+		       ;; For compatibility, deal with both the old
+		       ;; (HIGH . LOW) and the new (HIGH LOW) return
+		       ;; values of `visited-file-modtime'.
+		       (if (atom (cdr mt))
+			   (list (car mt) (cdr mt))
+			 mt)))
+		 2))
+	     ;; Modtime has the don't know value.
+	     (attr
+	      (tramp-send-command
+	       v
+	       (format "%s -ild %s"
+		       (tramp-get-ls-command v)
+		       (tramp-shell-quote-argument localname)))
+	      (with-current-buffer (tramp-get-buffer v)
+		(setq attr (buffer-substring
+			    (point) (progn (end-of-line) (point)))))
+	      (equal
+	       attr
+	       (tramp-get-file-property
+		v localname "visited-file-modtime-ild" "")))
+	     ;; If file does not exist, say it is not modified if and
+	     ;; only if that agrees with the buffer's record.
+	     (t (equal mt '(-1 65535))))))))))
+
+(defun tramp-handle-set-file-modes (filename mode)
+  "Like `set-file-modes' for Tramp files."
+  (with-parsed-tramp-file-name filename nil
+    (tramp-flush-file-property v localname)
+    ;; FIXME: extract the proper text from chmod's stderr.
+    (tramp-barf-unless-okay
+     v
+     (format "chmod %s %s"
+	     (tramp-compat-decimal-to-octal mode)
+	     (tramp-shell-quote-argument localname))
+     "Error while changing file's mode %s" filename)))
+
+(defun tramp-handle-set-file-times (filename &optional time)
+  "Like `set-file-times' for Tramp files."
+  (if (file-remote-p filename)
+      (with-parsed-tramp-file-name filename nil
+	(tramp-flush-file-property v localname)
+	(let ((time (if (or (null time) (equal time '(0 0)))
+			(current-time)
+		      time))
+	      ;; With GNU Emacs, `format-time-string' has an optional
+	      ;; parameter UNIVERSAL.  This is preferred, because we
+	      ;; could handle the case when the remote host is located
+	      ;; in a different time zone as the local host.
+	      (utc (not (featurep 'xemacs))))
+	  (tramp-send-command-and-check
+	   v (format "%s touch -t %s %s"
+		     (if utc "TZ=UTC; export TZ;" "")
+		     (if utc
+			 (format-time-string "%Y%m%d%H%M.%S" time t)
+		       (format-time-string "%Y%m%d%H%M.%S" time))
+		     (tramp-shell-quote-argument localname)))))
+
+    ;; We handle also the local part, because in older Emacsen,
+    ;; without `set-file-times', this function is an alias for this.
+    ;; We are local, so we don't need the UTC settings.
+    (zerop
+     (tramp-compat-call-process
+      "touch" nil nil nil "-t"
+      (format-time-string "%Y%m%d%H%M.%S" time)
+      (tramp-shell-quote-argument filename)))))
+
+(defun tramp-set-file-uid-gid (filename &optional uid gid)
+  "Set the ownership for FILENAME.
+If UID and GID are provided, these values are used; otherwise uid
+and gid of the corresponding user is taken.  Both parameters must be integers."
+  ;; Modern Unices allow chown only for root.  So we might need
+  ;; another implementation, see `dired-do-chown'.  OTOH, it is mostly
+  ;; working with su(do)? when it is needed, so it shall succeed in
+  ;; the majority of cases.
+  ;; Don't modify `last-coding-system-used' by accident.
+  (let ((last-coding-system-used last-coding-system-used))
+    (if (file-remote-p filename)
+	(with-parsed-tramp-file-name filename nil
+	  (if (and (zerop (user-uid)) (tramp-local-host-p v))
+	      ;; If we are root on the local host, we can do it directly.
+	      (tramp-set-file-uid-gid localname uid gid)
+	    (let ((uid (or (and (integerp uid) uid)
+			   (tramp-get-remote-uid v 'integer)))
+		  (gid (or (and (integerp gid) gid)
+			   (tramp-get-remote-gid v 'integer))))
+	      (tramp-send-command
+	       v (format
+		  "chown %d:%d %s" uid gid
+		  (tramp-shell-quote-argument localname))))))
+
+      ;; We handle also the local part, because there doesn't exist
+      ;; `set-file-uid-gid'.  On W32 "chown" might not work.
+      (let ((uid (or (and (integerp uid) uid) (tramp-get-local-uid 'integer)))
+	    (gid (or (and (integerp gid) gid) (tramp-get-local-gid 'integer))))
+	(tramp-compat-call-process
+	 "chown" nil nil nil
+         (format "%d:%d" uid gid) (tramp-shell-quote-argument filename))))))
+
+(defun tramp-remote-selinux-p (vec)
+  "Check, whether SELINUX is enabled on the remote host."
+  (with-connection-property (tramp-get-connection-process vec) "selinux-p"
+    (let ((result (tramp-find-executable
+		   vec "getenforce" (tramp-get-remote-path vec) t t)))
+      (and result
+	   (string-equal
+	    (tramp-send-command-and-read
+	     vec (format "echo \\\"`%S`\\\"" result))
+	    "Enforcing")))))
+
+(defun tramp-handle-file-selinux-context (filename)
+  "Like `file-selinux-context' for Tramp files."
+  (with-parsed-tramp-file-name filename nil
+    (with-file-property v localname "file-selinux-context"
+      (let ((context '(nil nil nil nil))
+	    (regexp (concat "\\([a-z0-9_]+\\):" "\\([a-z0-9_]+\\):"
+			    "\\([a-z0-9_]+\\):" "\\([a-z0-9_]+\\)")))
+	(when (and (tramp-remote-selinux-p v)
+		   (tramp-send-command-and-check
+		    v (format
+		       "%s -d -Z %s"
+		       (tramp-get-ls-command v)
+		       (tramp-shell-quote-argument localname))))
+	  (with-current-buffer (tramp-get-connection-buffer v)
+	    (goto-char (point-min))
+	    (when (re-search-forward regexp (tramp-compat-line-end-position) t)
+	      (setq context (list (match-string 1) (match-string 2)
+				  (match-string 3) (match-string 4))))))
+	;; Return the context.
+	context))))
+
+(defun tramp-handle-set-file-selinux-context (filename context)
+  "Like `set-file-selinux-context' for Tramp files."
+  (with-parsed-tramp-file-name filename nil
+    (if (and (consp context)
+	     (tramp-remote-selinux-p v)
+	     (tramp-send-command-and-check
+	      v (format "chcon %s %s %s %s %s"
+			(if (stringp (nth 0 context))
+			    (format "--user=%s" (nth 0 context)) "")
+			(if (stringp (nth 1 context))
+			    (format "--role=%s" (nth 1 context)) "")
+			(if (stringp (nth 2 context))
+			    (format "--type=%s" (nth 2 context)) "")
+			(if (stringp (nth 3 context))
+			    (format "--range=%s" (nth 3 context)) "")
+			(tramp-shell-quote-argument localname))))
+	(tramp-set-file-property v localname "file-selinux-context" context)
+      (tramp-set-file-property v localname "file-selinux-context" 'undef)))
+  ;; We always return nil.
+  nil)
+
+;; Simple functions using the `test' command.
+
+(defun tramp-handle-file-executable-p (filename)
+  "Like `file-executable-p' for Tramp files."
+  (with-parsed-tramp-file-name filename nil
+    (with-file-property v localname "file-executable-p"
+      ;; Examine `file-attributes' cache to see if request can be
+      ;; satisfied without remote operation.
+      (or (tramp-check-cached-permissions v ?x)
+	  (tramp-run-test "-x" filename)))))
+
+(defun tramp-handle-file-readable-p (filename)
+  "Like `file-readable-p' for Tramp files."
+  (with-parsed-tramp-file-name filename nil
+    (with-file-property v localname "file-readable-p"
+      ;; Examine `file-attributes' cache to see if request can be
+      ;; satisfied without remote operation.
+      (or (tramp-check-cached-permissions v ?r)
+	  (tramp-run-test "-r" filename)))))
+
+;; When the remote shell is started, it looks for a shell which groks
+;; tilde expansion.  Here, we assume that all shells which grok tilde
+;; expansion will also provide a `test' command which groks `-nt' (for
+;; newer than).  If this breaks, tell me about it and I'll try to do
+;; something smarter about it.
+(defun tramp-handle-file-newer-than-file-p (file1 file2)
+  "Like `file-newer-than-file-p' for Tramp files."
+  (cond ((not (file-exists-p file1))
+         nil)
+        ((not (file-exists-p file2))
+         t)
+        ;; We are sure both files exist at this point.
+        (t
+         (save-excursion
+	   ;; We try to get the mtime of both files.  If they are not
+	   ;; equal to the "dont-know" value, then we subtract the times
+	   ;; and obtain the result.
+	   (let ((fa1 (file-attributes file1))
+		 (fa2 (file-attributes file2)))
+	     (if (and (not (equal (nth 5 fa1) '(0 0)))
+		      (not (equal (nth 5 fa2) '(0 0))))
+		 (> 0 (tramp-time-diff (nth 5 fa2) (nth 5 fa1)))
+	       ;; If one of them is the dont-know value, then we can
+	       ;; still try to run a shell command on the remote host.
+	       ;; However, this only works if both files are Tramp
+	       ;; files and both have the same method, same user, same
+	       ;; host.
+	       (unless (tramp-equal-remote file1 file2)
+		 (with-parsed-tramp-file-name
+		     (if (tramp-tramp-file-p file1) file1 file2) nil
+		   (tramp-error
+		    v 'file-error
+		    "Files %s and %s must have same method, user, host"
+		    file1 file2)))
+	       (with-parsed-tramp-file-name file1 nil
+		 (tramp-run-test2
+		  (tramp-get-test-nt-command v) file1 file2))))))))
+
+;; Functions implemented using the basic functions above.
+
+(defun tramp-handle-file-modes (filename)
+  "Like `file-modes' for Tramp files."
+  (let ((truename (or (file-truename filename) filename)))
+    (when (file-exists-p truename)
+      (tramp-mode-string-to-int (nth 8 (file-attributes truename))))))
+
+(defun tramp-handle-file-directory-p (filename)
+  "Like `file-directory-p' for Tramp files."
+  ;; Care must be taken that this function returns `t' for symlinks
+  ;; pointing to directories.  Surely the most obvious implementation
+  ;; would be `test -d', but that returns false for such symlinks.
+  ;; CCC: Stefan Monnier says that `test -d' follows symlinks.  And
+  ;; I now think he's right.  So we could be using `test -d', couldn't
+  ;; we?
+  ;;
+  ;; Alternatives: `cd %s', `test -d %s'
+  (with-parsed-tramp-file-name filename nil
+    (with-file-property v localname "file-directory-p"
+      (tramp-run-test "-d" filename))))
+
+(defun tramp-handle-file-regular-p (filename)
+  "Like `file-regular-p' for Tramp files."
+  (and (file-exists-p filename)
+       (eq ?- (aref (nth 8 (file-attributes filename)) 0))))
+
+(defun tramp-handle-file-symlink-p (filename)
+  "Like `file-symlink-p' for Tramp files."
+  (with-parsed-tramp-file-name filename nil
+    (let ((x (car (file-attributes filename))))
+      (when (stringp x)
+	;; When Tramp is running on VMS, then `file-name-absolute-p'
+	;; might do weird things.
+	(if (file-name-absolute-p x)
+	    (tramp-make-tramp-file-name method user host x)
+	  x)))))
+
+(defun tramp-handle-file-writable-p (filename)
+  "Like `file-writable-p' for Tramp files."
+  (with-parsed-tramp-file-name filename nil
+    (with-file-property v localname "file-writable-p"
+      (if (file-exists-p filename)
+	  ;; Examine `file-attributes' cache to see if request can be
+	  ;; satisfied without remote operation.
+          (or (tramp-check-cached-permissions v ?w)
+	      (tramp-run-test "-w" filename))
+	;; If file doesn't exist, check if directory is writable.
+	(and (tramp-run-test "-d" (file-name-directory filename))
+	     (tramp-run-test "-w" (file-name-directory filename)))))))
+
+(defun tramp-handle-file-ownership-preserved-p (filename)
+  "Like `file-ownership-preserved-p' for Tramp files."
+  (with-parsed-tramp-file-name filename nil
+    (with-file-property v localname "file-ownership-preserved-p"
+      (let ((attributes (file-attributes filename)))
+	;; Return t if the file doesn't exist, since it's true that no
+	;; information would be lost by an (attempted) delete and create.
+	(or (null attributes)
+	    (= (nth 2 attributes) (tramp-get-remote-uid v 'integer)))))))
+
+;; Other file name ops.
+
+(defun tramp-handle-directory-file-name (directory)
+  "Like `directory-file-name' for Tramp files."
+  ;; If localname component of filename is "/", leave it unchanged.
+  ;; Otherwise, remove any trailing slash from localname component.
+  ;; Method, host, etc, are unchanged.  Does it make sense to try
+  ;; to avoid parsing the filename?
+  (with-parsed-tramp-file-name directory nil
+    (if (and (not (zerop (length localname)))
+	     (eq (aref localname (1- (length localname))) ?/)
+	     (not (string= localname "/")))
+	(substring directory 0 -1)
+      directory)))
+
+;; Directory listings.
+
+(defun tramp-handle-directory-files
+  (directory &optional full match nosort files-only)
+  "Like `directory-files' for Tramp files."
+  ;; FILES-ONLY is valid for XEmacs only.
+  (when (file-directory-p directory)
+    (setq directory (file-name-as-directory (expand-file-name directory)))
+    (let ((temp (nreverse (file-name-all-completions "" directory)))
+	  result item)
+
+      (while temp
+	(setq item (directory-file-name (pop temp)))
+	(when (and (or (null match) (string-match match item))
+		   (or (null files-only)
+		       ;; Files only.
+		       (and (equal files-only t) (file-regular-p item))
+		       ;; Directories only.
+		       (file-directory-p item)))
+	  (push (if full (concat directory item) item)
+		result)))
+      (if nosort result (sort result 'string<)))))
+
+(defun tramp-handle-directory-files-and-attributes
+  (directory &optional full match nosort id-format)
+  "Like `directory-files-and-attributes' for Tramp files."
+  (unless id-format (setq id-format 'integer))
+  (when (file-directory-p directory)
+    (setq directory (expand-file-name directory))
+    (let* ((temp
+	    (copy-tree
+	     (with-parsed-tramp-file-name directory nil
+	       (with-file-property
+		   v localname
+		   (format "directory-files-and-attributes-%s" id-format)
+		 (save-excursion
+		   (mapcar
+		    (lambda (x)
+		      (cons (car x)
+			    (tramp-convert-file-attributes v (cdr x))))
+		    (cond
+		     ((tramp-get-remote-stat v)
+		      (tramp-do-directory-files-and-attributes-with-stat
+		       v localname id-format))
+		     ((tramp-get-remote-perl v)
+		      (tramp-do-directory-files-and-attributes-with-perl
+		       v localname id-format)))))))))
+	   result item)
+
+      (while temp
+	(setq item (pop temp))
+	(when (or (null match) (string-match match (car item)))
+	  (when full
+	    (setcar item (expand-file-name (car item) directory)))
+	  (push item result)))
+
+      (if nosort
+	  result
+	(sort result (lambda (x y) (string< (car x) (car y))))))))
+
+(defun tramp-do-directory-files-and-attributes-with-perl
+  (vec localname &optional id-format)
+  "Implement `directory-files-and-attributes' for Tramp files using a Perl script."
+  (tramp-message vec 5 "directory-files-and-attributes with perl: %s" localname)
+  (tramp-maybe-send-script
+   vec tramp-perl-directory-files-and-attributes
+   "tramp_perl_directory_files_and_attributes")
+  (let ((object
+	 (tramp-send-command-and-read
+	  vec
+	  (format "tramp_perl_directory_files_and_attributes %s %s"
+		  (tramp-shell-quote-argument localname) id-format))))
+    (when (stringp object) (tramp-error vec 'file-error object))
+    object))
+
+(defun tramp-do-directory-files-and-attributes-with-stat
+  (vec localname &optional id-format)
+  "Implement `directory-files-and-attributes' for Tramp files using stat(1) command."
+  (tramp-message vec 5 "directory-files-and-attributes with stat: %s" localname)
+  (tramp-send-command-and-read
+   vec
+   (format
+    (concat
+     ;; We must care about filenames with spaces, or starting with
+     ;; "-"; this would confuse xargs.  "ls -aQ" might be a solution,
+     ;; but it does not work on all remote systems.  Therefore, we
+     ;; quote the filenames via sed.
+     "cd %s; echo \"(\"; (%s -a | sed -e s/\\$/\\\"/g -e s/^/\\\"/g | xargs "
+     "%s -c '(\"%%n\" (\"%%N\") %%h %s %s %%X.0 %%Y.0 %%Z.0 %%s.0 \"%%A\" t %%i.0 -1)'); "
+     "echo \")\"")
+    (tramp-shell-quote-argument localname)
+    (tramp-get-ls-command vec)
+    (tramp-get-remote-stat vec)
+    (if (eq id-format 'integer) "%u" "\"%U\"")
+    (if (eq id-format 'integer) "%g" "\"%G\""))))
+
+;; This function should return "foo/" for directories and "bar" for
+;; files.
+(defun tramp-handle-file-name-all-completions (filename directory)
+  "Like `file-name-all-completions' for Tramp files."
+  (unless (save-match-data (string-match "/" filename))
+    (with-parsed-tramp-file-name (expand-file-name directory) nil
+
+      (all-completions
+       filename
+       (mapcar
+	'list
+        (or
+         ;; Try cache first
+         (and
+          ;; Ignore if expired
+          (or (not (integerp tramp-completion-reread-directory-timeout))
+              (<= (tramp-time-diff
+                   (current-time)
+                   (tramp-get-file-property
+                    v localname "last-completion" '(0 0 0)))
+                  tramp-completion-reread-directory-timeout))
+
+          ;; Try cache entries for filename, filename with last
+          ;; character removed, filename with last two characters
+          ;; removed, ..., and finally the empty string - all
+          ;; concatenated to the local directory name
+
+          ;; This is inefficient for very long filenames, pity
+          ;; `reduce' is not available...
+          (car
+           (apply
+            'append
+            (mapcar
+             (lambda (x)
+               (let ((cache-hit
+                      (tramp-get-file-property
+                       v
+                       (concat localname (substring filename 0 x))
+                       "file-name-all-completions"
+                       nil)))
+                 (when cache-hit (list cache-hit))))
+             (tramp-compat-number-sequence (length filename) 0 -1)))))
+
+         ;; Cache expired or no matching cache entry found so we need
+         ;; to perform a remote operation
+         (let (result)
+           ;; Get a list of directories and files, including reliably
+           ;; tagging the directories with a trailing '/'.  Because I
+           ;; rock.  --daniel@danann.net
+
+           ;; Changed to perform `cd' in the same remote op and only
+           ;; get entries starting with `filename'. Capture any `cd'
+           ;; error messages.  Ensure any `cd' and `echo' aliases are
+           ;; ignored.
+           (tramp-send-command
+            v
+            (if (tramp-get-remote-perl v)
+                (progn
+                  (tramp-maybe-send-script
+                   v tramp-perl-file-name-all-completions
+                   "tramp_perl_file_name_all_completions")
+                  (format "tramp_perl_file_name_all_completions %s %s %d"
+                          (tramp-shell-quote-argument localname)
+                          (tramp-shell-quote-argument filename)
+                          (if (symbol-value
+			       ;; `read-file-name-completion-ignore-case'
+			       ;; is introduced with Emacs 22.1.
+			       (if (boundp
+				    'read-file-name-completion-ignore-case)
+				   'read-file-name-completion-ignore-case
+				 'completion-ignore-case))
+			      1 0)))
+
+              (format (concat
+                       "(\\cd %s 2>&1 && (%s %s -a 2>/dev/null"
+                       ;; `ls' with wildcard might fail with `Argument
+                       ;; list too long' error in some corner cases; if
+                       ;; `ls' fails after `cd' succeeded, chances are
+                       ;; that's the case, so let's retry without
+                       ;; wildcard.  This will return "too many" entries
+                       ;; but that isn't harmful.
+                       " || %s -a 2>/dev/null)"
+                       " | while read f; do"
+                       " if %s -d \"$f\" 2>/dev/null;"
+                       " then \\echo \"$f/\"; else \\echo \"$f\"; fi; done"
+                       " && \\echo ok) || \\echo fail")
+                      (tramp-shell-quote-argument localname)
+                      (tramp-get-ls-command v)
+                      ;; When `filename' is empty, just `ls' without
+                      ;; filename argument is more efficient than `ls *'
+                      ;; for very large directories and might avoid the
+                      ;; `Argument list too long' error.
+                      ;;
+                      ;; With and only with wildcard, we need to add
+                      ;; `-d' to prevent `ls' from descending into
+                      ;; sub-directories.
+                      (if (zerop (length filename))
+                          "."
+                        (concat (tramp-shell-quote-argument filename) "* -d"))
+                      (tramp-get-ls-command v)
+                      (tramp-get-test-command v))))
+
+           ;; Now grab the output.
+           (with-current-buffer (tramp-get-buffer v)
+             (goto-char (point-max))
+
+             ;; Check result code, found in last line of output
+             (forward-line -1)
+             (if (looking-at "^fail$")
+                 (progn
+                   ;; Grab error message from line before last line
+                   ;; (it was put there by `cd 2>&1')
+                   (forward-line -1)
+                   (tramp-error
+                    v 'file-error
+                    "tramp-handle-file-name-all-completions: %s"
+                    (buffer-substring
+                     (point) (tramp-compat-line-end-position))))
+               ;; For peace of mind, if buffer doesn't end in `fail'
+               ;; then it should end in `ok'.  If neither are in the
+               ;; buffer something went seriously wrong on the remote
+               ;; side.
+               (unless (looking-at "^ok$")
+                 (tramp-error
+                  v 'file-error
+                  "\
+tramp-handle-file-name-all-completions: internal error accessing `%s': `%s'"
+                  (tramp-shell-quote-argument localname) (buffer-string))))
+
+             (while (zerop (forward-line -1))
+               (push (buffer-substring
+                      (point) (tramp-compat-line-end-position))
+                     result)))
+
+           ;; Because the remote op went through OK we know the
+           ;; directory we `cd'-ed to exists
+           (tramp-set-file-property
+            v localname "file-exists-p" t)
+
+           ;; Because the remote op went through OK we know every
+           ;; file listed by `ls' exists.
+           (mapc (lambda (entry)
+		   (tramp-set-file-property
+		    v (concat localname entry) "file-exists-p" t))
+		 result)
+
+           (tramp-set-file-property
+            v localname "last-completion" (current-time))
+
+           ;; Store result in the cache
+           (tramp-set-file-property
+            v (concat localname filename)
+            "file-name-all-completions"
+            result))))))))
+
+(defun tramp-handle-file-name-completion
+  (filename directory &optional predicate)
+  "Like `file-name-completion' for Tramp files."
+  (unless (tramp-tramp-file-p directory)
+    (error
+     "tramp-handle-file-name-completion invoked on non-tramp directory `%s'"
+     directory))
+  (try-completion
+   filename
+   (mapcar 'list (file-name-all-completions filename directory))
+   (when predicate
+     (lambda (x) (funcall predicate (expand-file-name (car x) directory))))))
+
+;; cp, mv and ln
+
+(defun tramp-handle-add-name-to-file
+  (filename newname &optional ok-if-already-exists)
+  "Like `add-name-to-file' for Tramp files."
+  (unless (tramp-equal-remote filename newname)
+    (with-parsed-tramp-file-name
+	(if (tramp-tramp-file-p filename) filename newname) nil
+      (tramp-error
+       v 'file-error
+       "add-name-to-file: %s"
+       "only implemented for same method, same user, same host")))
+  (with-parsed-tramp-file-name filename v1
+    (with-parsed-tramp-file-name newname v2
+      (let ((ln (when v1 (tramp-get-remote-ln v1))))
+	(when (and (not ok-if-already-exists)
+		   (file-exists-p newname)
+		   (not (numberp ok-if-already-exists))
+		   (y-or-n-p
+		    (format
+		     "File %s already exists; make it a new name anyway? "
+		     newname)))
+	  (tramp-error
+	   v2 'file-error
+	   "add-name-to-file: file %s already exists" newname))
+	(tramp-flush-file-property v2 (file-name-directory v2-localname))
+	(tramp-flush-file-property v2 v2-localname)
+	(tramp-barf-unless-okay
+	 v1
+	 (format "%s %s %s" ln (tramp-shell-quote-argument v1-localname)
+		 (tramp-shell-quote-argument v2-localname))
+	 "error with add-name-to-file, see buffer `%s' for details"
+	 (buffer-name))))))
+
+(defun tramp-handle-copy-file
+  (filename newname &optional ok-if-already-exists keep-date
+	    preserve-uid-gid preserve-selinux-context)
+  "Like `copy-file' for Tramp files."
+  (setq filename (expand-file-name filename))
+  (setq newname (expand-file-name newname))
+  (cond
+   ;; At least one file a Tramp file?
+   ((or (tramp-tramp-file-p filename)
+	(tramp-tramp-file-p newname))
+    (tramp-do-copy-or-rename-file
+     'copy filename newname ok-if-already-exists keep-date
+     preserve-uid-gid preserve-selinux-context))
+   ;; Compat section.
+   (preserve-selinux-context
+    (tramp-run-real-handler
+     'copy-file
+     (list filename newname ok-if-already-exists keep-date
+	   preserve-uid-gid preserve-selinux-context)))
+   (preserve-uid-gid
+    (tramp-run-real-handler
+     'copy-file
+     (list filename newname ok-if-already-exists keep-date preserve-uid-gid)))
+   (t
+    (tramp-run-real-handler
+     'copy-file (list filename newname ok-if-already-exists keep-date)))))
+
+(defun tramp-handle-copy-directory (dirname newname &optional keep-date parents)
+  "Like `copy-directory' for Tramp files."
+  (let ((t1 (tramp-tramp-file-p dirname))
+	(t2 (tramp-tramp-file-p newname)))
+    (with-parsed-tramp-file-name (if t1 dirname newname) nil
+      (if (and (tramp-get-method-parameter method 'tramp-copy-recursive)
+	       ;; When DIRNAME and NEWNAME are remote, they must have
+	       ;; the same method.
+	       (or (null t1) (null t2)
+		   (string-equal
+		    (tramp-file-name-method (tramp-dissect-file-name dirname))
+		    (tramp-file-name-method (tramp-dissect-file-name newname)))))
+	  ;; scp or rsync DTRT.
+	  (progn
+	    (setq dirname (directory-file-name (expand-file-name dirname))
+		  newname (directory-file-name (expand-file-name newname)))
+	    (if (and (file-directory-p newname)
+		     (not (string-equal (file-name-nondirectory dirname)
+					(file-name-nondirectory newname))))
+		(setq newname
+		      (expand-file-name
+		       (file-name-nondirectory dirname) newname)))
+	    (if (not (file-directory-p (file-name-directory newname)))
+		(make-directory (file-name-directory newname) parents))
+	    (tramp-do-copy-or-rename-file-out-of-band
+	     'copy dirname newname keep-date))
+	;; We must do it file-wise.
+	(tramp-run-real-handler
+	 'copy-directory (list dirname newname keep-date parents)))
+
+      ;; When newname did exist, we have wrong cached values.
+      (when t2
+	(with-parsed-tramp-file-name newname nil
+	  (tramp-flush-file-property v (file-name-directory localname))
+	  (tramp-flush-file-property v localname))))))
+
+(defun tramp-handle-rename-file
+  (filename newname &optional ok-if-already-exists)
+  "Like `rename-file' for Tramp files."
+  ;; Check if both files are local -- invoke normal rename-file.
+  ;; Otherwise, use Tramp from local system.
+  (setq filename (expand-file-name filename))
+  (setq newname (expand-file-name newname))
+  ;; At least one file a Tramp file?
+  (if (or (tramp-tramp-file-p filename)
+          (tramp-tramp-file-p newname))
+      (tramp-do-copy-or-rename-file
+       'rename filename newname ok-if-already-exists t t)
+    (tramp-run-real-handler
+     'rename-file (list filename newname ok-if-already-exists))))
+
+(defun tramp-do-copy-or-rename-file
+  (op filename newname &optional ok-if-already-exists keep-date
+      preserve-uid-gid preserve-selinux-context)
+  "Copy or rename a remote file.
+OP must be `copy' or `rename' and indicates the operation to perform.
+FILENAME specifies the file to copy or rename, NEWNAME is the name of
+the new file (for copy) or the new name of the file (for rename).
+OK-IF-ALREADY-EXISTS means don't barf if NEWNAME exists already.
+KEEP-DATE means to make sure that NEWNAME has the same timestamp
+as FILENAME.  PRESERVE-UID-GID, when non-nil, instructs to keep
+the uid and gid if both files are on the same host.
+PRESERVE-SELINUX-CONTEXT activates selinux commands.
+
+This function is invoked by `tramp-handle-copy-file' and
+`tramp-handle-rename-file'.  It is an error if OP is neither of `copy'
+and `rename'.  FILENAME and NEWNAME must be absolute file names."
+  (unless (memq op '(copy rename))
+    (error "Unknown operation `%s', must be `copy' or `rename'" op))
+  (let ((t1 (tramp-tramp-file-p filename))
+	(t2 (tramp-tramp-file-p newname))
+	(context (and preserve-selinux-context
+		      (apply 'file-selinux-context (list filename))))
+	pr tm)
+
+    (with-parsed-tramp-file-name (if t1 filename newname) nil
+      (when (and (not ok-if-already-exists) (file-exists-p newname))
+	(tramp-error
+	 v 'file-already-exists "File %s already exists" newname))
+
+      (with-progress-reporter
+	  v 0 (format "%s %s to %s"
+		      (if (eq op 'copy) "Copying" "Renaming")
+		      filename newname)
+
+	(cond
+	 ;; Both are Tramp files.
+	 ((and t1 t2)
+	  (with-parsed-tramp-file-name filename v1
+	    (with-parsed-tramp-file-name newname v2
+	      (cond
+	       ;; Shortcut: if method, host, user are the same for
+	       ;; both files, we invoke `cp' or `mv' on the remote
+	       ;; host directly.
+	       ((tramp-equal-remote filename newname)
+		(tramp-do-copy-or-rename-file-directly
+		 op filename newname
+		 ok-if-already-exists keep-date preserve-uid-gid))
+
+	       ;; Try out-of-band operation.
+	       ((tramp-method-out-of-band-p
+		 v1 (nth 7 (file-attributes filename)))
+		(tramp-do-copy-or-rename-file-out-of-band
+		 op filename newname keep-date))
+
+	       ;; No shortcut was possible.  So we copy the file
+	       ;; first.  If the operation was `rename', we go back
+	       ;; and delete the original file (if the copy was
+	       ;; successful).  The approach is simple-minded: we
+	       ;; create a new buffer, insert the contents of the
+	       ;; source file into it, then write out the buffer to
+	       ;; the target file.  The advantage is that it doesn't
+	       ;; matter which filename handlers are used for the
+	       ;; source and target file.
+	       (t
+		(tramp-do-copy-or-rename-file-via-buffer
+		 op filename newname keep-date))))))
+
+	 ;; One file is a Tramp file, the other one is local.
+	 ((or t1 t2)
+	  (cond
+	   ;; Fast track on local machine.
+	   ((tramp-local-host-p v)
+	    (tramp-do-copy-or-rename-file-directly
+	     op filename newname
+	     ok-if-already-exists keep-date preserve-uid-gid))
+
+	   ;; If the Tramp file has an out-of-band method, the
+	   ;; corresponding copy-program can be invoked.
+	   ((tramp-method-out-of-band-p v (nth 7 (file-attributes filename)))
+	    (tramp-do-copy-or-rename-file-out-of-band
+	     op filename newname keep-date))
+
+	   ;; Use the inline method via a Tramp buffer.
+	   (t (tramp-do-copy-or-rename-file-via-buffer
+	       op filename newname keep-date))))
+
+	 (t
+	  ;; One of them must be a Tramp file.
+	  (error "Tramp implementation says this cannot happen")))
+
+	;; Handle `preserve-selinux-context'.
+	(when context (apply 'set-file-selinux-context (list newname context)))
+
+	;; In case of `rename', we must flush the cache of the source file.
+	(when (and t1 (eq op 'rename))
+	  (with-parsed-tramp-file-name filename v1
+	    (tramp-flush-file-property v1 (file-name-directory localname))
+	    (tramp-flush-file-property v1 localname)))
+
+	;; When newname did exist, we have wrong cached values.
+	(when t2
+	  (with-parsed-tramp-file-name newname v2
+	    (tramp-flush-file-property v2 (file-name-directory localname))
+	    (tramp-flush-file-property v2 localname)))))))
+
+(defun tramp-do-copy-or-rename-file-via-buffer (op filename newname keep-date)
+  "Use an Emacs buffer to copy or rename a file.
+First arg OP is either `copy' or `rename' and indicates the operation.
+FILENAME is the source file, NEWNAME the target file.
+KEEP-DATE is non-nil if NEWNAME should have the same timestamp as FILENAME."
+  (with-temp-buffer
+    ;; We must disable multibyte, because binary data shall not be
+    ;; converted.
+    (set-buffer-multibyte nil)
+    (let ((coding-system-for-read 'binary)
+	  (jka-compr-inhibit t))
+      (insert-file-contents-literally filename))
+    ;; We don't want the target file to be compressed, so we let-bind
+    ;; `jka-compr-inhibit' to t.
+    (let ((coding-system-for-write 'binary)
+	  (jka-compr-inhibit t))
+      (write-region (point-min) (point-max) newname)))
+  ;; KEEP-DATE handling.
+  (when keep-date (set-file-times newname (nth 5 (file-attributes filename))))
+  ;; Set the mode.
+  (set-file-modes newname (tramp-default-file-modes filename))
+  ;; If the operation was `rename', delete the original file.
+  (unless (eq op 'copy) (delete-file filename)))
+
+(defun tramp-do-copy-or-rename-file-directly
+ (op filename newname ok-if-already-exists keep-date preserve-uid-gid)
+  "Invokes `cp' or `mv' on the remote system.
+OP must be one of `copy' or `rename', indicating `cp' or `mv',
+respectively.  FILENAME specifies the file to copy or rename,
+NEWNAME is the name of the new file (for copy) or the new name of
+the file (for rename).  Both files must reside on the same host.
+KEEP-DATE means to make sure that NEWNAME has the same timestamp
+as FILENAME.  PRESERVE-UID-GID, when non-nil, instructs to keep
+the uid and gid from FILENAME."
+  (let ((t1 (tramp-tramp-file-p filename))
+	(t2 (tramp-tramp-file-p newname))
+	(file-times (nth 5 (file-attributes filename)))
+	(file-modes (tramp-default-file-modes filename)))
+    (with-parsed-tramp-file-name (if t1 filename newname) nil
+      (let* ((cmd (cond ((and (eq op 'copy) preserve-uid-gid) "cp -f -p")
+			((eq op 'copy) "cp -f")
+			((eq op 'rename) "mv -f")
+			(t (tramp-error
+			    v 'file-error
+			    "Unknown operation `%s', must be `copy' or `rename'"
+			    op))))
+	     (localname1
+	      (if t1
+		  (tramp-file-name-handler 'file-remote-p filename 'localname)
+		filename))
+	     (localname2
+	      (if t2
+		  (tramp-file-name-handler 'file-remote-p newname 'localname)
+		newname))
+	     (prefix (file-remote-p (if t1 filename newname)))
+             cmd-result)
+
+	(cond
+	 ;; Both files are on a remote host, with same user.
+	 ((and t1 t2)
+          (setq cmd-result
+                (tramp-send-command-and-check
+                 v (format "%s %s %s" cmd
+			   (tramp-shell-quote-argument localname1)
+			   (tramp-shell-quote-argument localname2))))
+	  (with-current-buffer (tramp-get-buffer v)
+	    (goto-char (point-min))
+	    (unless
+		(or
+		 (and keep-date
+		      ;; Mask cp -f error.
+		      (re-search-forward
+		       tramp-operation-not-permitted-regexp nil t))
+		 cmd-result)
+	      (tramp-error-with-buffer
+	       nil v 'file-error
+	       "Copying directly failed, see buffer `%s' for details."
+	       (buffer-name)))))
+
+	 ;; We are on the local host.
+	 ((or t1 t2)
+	  (cond
+	   ;; We can do it directly.
+	   ((let (file-name-handler-alist)
+	      (and (file-readable-p localname1)
+		   (file-writable-p (file-name-directory localname2))
+		   (or (file-directory-p localname2)
+		       (file-writable-p localname2))))
+	    (if (eq op 'copy)
+		(tramp-compat-copy-file
+		 localname1 localname2 ok-if-already-exists
+		 keep-date preserve-uid-gid)
+	      (tramp-run-real-handler
+	       'rename-file (list localname1 localname2 ok-if-already-exists))))
+
+	   ;; We can do it directly with `tramp-send-command'
+	   ((and (file-readable-p (concat prefix localname1))
+		 (file-writable-p
+		  (file-name-directory (concat prefix localname2)))
+		 (or (file-directory-p (concat prefix localname2))
+		     (file-writable-p (concat prefix localname2))))
+	    (tramp-do-copy-or-rename-file-directly
+	     op (concat prefix localname1) (concat prefix localname2)
+	     ok-if-already-exists keep-date t)
+	    ;; We must change the ownership to the local user.
+	    (tramp-set-file-uid-gid
+	     (concat prefix localname2)
+	     (tramp-get-local-uid 'integer)
+	     (tramp-get-local-gid 'integer)))
+
+	   ;; We need a temporary file in between.
+	   (t
+	    ;; Create the temporary file.
+	    (let ((tmpfile (tramp-compat-make-temp-file localname1)))
+	      (unwind-protect
+		  (progn
+		    (cond
+		     (t1
+		      (tramp-barf-unless-okay
+		       v (format
+			  "%s %s %s" cmd
+			  (tramp-shell-quote-argument localname1)
+			  (tramp-shell-quote-argument tmpfile))
+		       "Copying directly failed, see buffer `%s' for details."
+		       (tramp-get-buffer v))
+		      ;; We must change the ownership as remote user.
+		      ;; Since this does not work reliable, we also
+		      ;; give read permissions.
+		      (set-file-modes
+		       (concat prefix tmpfile)
+		       (tramp-compat-octal-to-decimal "0777"))
+		      (tramp-set-file-uid-gid
+		       (concat prefix tmpfile)
+		       (tramp-get-local-uid 'integer)
+		       (tramp-get-local-gid 'integer)))
+		     (t2
+		      (if (eq op 'copy)
+			  (tramp-compat-copy-file
+			   localname1 tmpfile t
+			   keep-date preserve-uid-gid)
+			(tramp-run-real-handler
+			 'rename-file
+			 (list localname1 tmpfile t)))
+		      ;; We must change the ownership as local user.
+		      ;; Since this does not work reliable, we also
+		      ;; give read permissions.
+		      (set-file-modes
+		       tmpfile (tramp-compat-octal-to-decimal "0777"))
+		      (tramp-set-file-uid-gid
+		       tmpfile
+		       (tramp-get-remote-uid v 'integer)
+		       (tramp-get-remote-gid v 'integer))))
+
+		    ;; Move the temporary file to its destination.
+		    (cond
+		     (t2
+		      (tramp-barf-unless-okay
+		       v (format
+			  "cp -f -p %s %s"
+			  (tramp-shell-quote-argument tmpfile)
+			  (tramp-shell-quote-argument localname2))
+		       "Copying directly failed, see buffer `%s' for details."
+		       (tramp-get-buffer v)))
+		     (t1
+		      (tramp-run-real-handler
+		       'rename-file
+		       (list tmpfile localname2 ok-if-already-exists)))))
+
+		;; Save exit.
+		(condition-case nil
+		    (delete-file tmpfile)
+		  (error)))))))))
+
+      ;; Set the time and mode. Mask possible errors.
+      (condition-case nil
+	  (when keep-date
+	    (set-file-times newname file-times)
+	    (set-file-modes newname file-modes))
+	(error)))))
+
+(defun tramp-do-copy-or-rename-file-out-of-band (op filename newname keep-date)
+  "Invoke rcp program to copy.
+The method used must be an out-of-band method."
+  (let ((t1 (tramp-tramp-file-p filename))
+	(t2 (tramp-tramp-file-p newname))
+	copy-program copy-args copy-env copy-keep-date port spec
+	source target)
+
+    (with-parsed-tramp-file-name (if t1 filename newname) nil
+      (if (and t1 t2)
+
+	  ;; Both are Tramp files.  We shall optimize it, when the
+	  ;; methods for filename and newname are the same.
+	  (let* ((dir-flag (file-directory-p filename))
+		 (tmpfile (tramp-compat-make-temp-file localname dir-flag)))
+	    (if dir-flag
+		(setq tmpfile
+		      (expand-file-name
+		       (file-name-nondirectory newname) tmpfile)))
+	    (unwind-protect
+		(progn
+		  (tramp-do-copy-or-rename-file-out-of-band
+		   op filename tmpfile keep-date)
+		  (tramp-do-copy-or-rename-file-out-of-band
+		   'rename tmpfile newname keep-date))
+	      ;; Save exit.
+	      (condition-case nil
+		  (if dir-flag
+		      (tramp-compat-delete-directory
+		       (expand-file-name ".." tmpfile) 'recursive)
+		    (delete-file tmpfile))
+		(error))))
+
+	;; Expand hops.  Might be necessary for gateway methods.
+	(setq v (car (tramp-compute-multi-hops v)))
+	(aset v 3 localname)
+
+	;; Check which ones of source and target are Tramp files.
+	(setq source (if t1 (tramp-make-copy-program-file-name v) filename)
+	      target (funcall
+		      (if (and (file-directory-p filename)
+			       (string-equal
+				(file-name-nondirectory filename)
+				(file-name-nondirectory newname)))
+			  'file-name-directory
+			'identity)
+		      (if t2 (tramp-make-copy-program-file-name v) newname)))
+
+	;; Check for port number.  Until now, there's no need for handling
+	;; like method, user, host.
+	(setq host (tramp-file-name-real-host v)
+	      port (tramp-file-name-port v)
+	      port (or (and port (number-to-string port)) ""))
+
+	;; Compose copy command.
+	(setq spec (format-spec-make
+		    ?h host ?u user ?p port
+		    ?t (tramp-get-connection-property
+			(tramp-get-connection-process v) "temp-file" "")
+		    ?k (if keep-date " " ""))
+	      copy-program (tramp-get-method-parameter
+			    method 'tramp-copy-program)
+	      copy-keep-date (tramp-get-method-parameter
+			      method 'tramp-copy-keep-date)
+	      copy-args
+	      (delq
+	       nil
+	       (mapcar
+		(lambda (x)
+		  (setq
+		   x
+		   ;; " " is indication for keep-date argument.
+		   (delete " " (mapcar (lambda (y) (format-spec y spec)) x)))
+		  (unless (member "" x) (mapconcat 'identity x " ")))
+		(tramp-get-method-parameter method 'tramp-copy-args)))
+	      copy-env
+	      (delq
+	       nil
+	       (mapcar
+		(lambda (x)
+		  (setq x (mapcar (lambda (y) (format-spec y spec)) x))
+		  (unless (member "" x) (mapconcat 'identity x " ")))
+		(tramp-get-method-parameter method 'tramp-copy-env))))
+
+	;; Check for program.
+	(when (and (fboundp 'executable-find)
+		   (not (let ((default-directory
+				(tramp-compat-temporary-file-directory)))
+			  (executable-find copy-program))))
+	  (tramp-error
+	   v 'file-error "Cannot find copy program: %s" copy-program))
+
+	;; Set variables for computing the prompt for reading
+	;; password.
+	(setq tramp-current-method (tramp-file-name-method v)
+	      tramp-current-user   (tramp-file-name-user v)
+	      tramp-current-host   (tramp-file-name-host v))
+
+	(unwind-protect
+	    (with-temp-buffer
+	      ;; The default directory must be remote.
+	      (let ((default-directory
+		      (file-name-directory (if t1 filename newname)))
+		    (process-environment (copy-sequence process-environment)))
+		;; Set the transfer process properties.
+		(tramp-set-connection-property
+		 v "process-name" (buffer-name (current-buffer)))
+		(tramp-set-connection-property
+		 v "process-buffer" (current-buffer))
+		(while copy-env
+		  (tramp-message v 5 "%s=\"%s\"" (car copy-env) (cadr copy-env))
+		  (setenv (pop copy-env) (pop copy-env)))
+
+		;; Use an asynchronous process.  By this, password can
+		;; be handled.  The default directory must be local, in
+		;; order to apply the correct `copy-program'.  We don't
+		;; set a timeout, because the copying of large files can
+		;; last longer than 60 secs.
+		(let ((p (let ((default-directory
+				 (tramp-compat-temporary-file-directory)))
+			   (apply 'start-process
+				  (tramp-get-connection-property
+				   v "process-name" nil)
+				  (tramp-get-connection-property
+				   v "process-buffer" nil)
+				  copy-program
+				  (append copy-args (list source target))))))
+		  (tramp-message
+		   v 6 "%s" (mapconcat 'identity (process-command p) " "))
+		  (tramp-set-process-query-on-exit-flag p nil)
+		  (tramp-process-actions p v tramp-actions-copy-out-of-band))))
+
+	  ;; Reset the transfer process properties.
+	  (tramp-set-connection-property v "process-name" nil)
+	  (tramp-set-connection-property v "process-buffer" nil))
+
+	;; Handle KEEP-DATE argument.
+	(when (and keep-date (not copy-keep-date))
+	  (set-file-times newname (nth 5 (file-attributes filename))))
+
+	;; Set the mode.
+	(unless (and keep-date copy-keep-date)
+	  (ignore-errors
+	    (set-file-modes newname (tramp-default-file-modes filename)))))
+
+      ;; If the operation was `rename', delete the original file.
+      (unless (eq op 'copy)
+	(if (file-regular-p filename)
+	    (delete-file filename)
+	  (tramp-compat-delete-directory filename 'recursive))))))
+
+(defun tramp-handle-make-directory (dir &optional parents)
+  "Like `make-directory' for Tramp files."
+  (setq dir (expand-file-name dir))
+  (with-parsed-tramp-file-name dir nil
+    (tramp-flush-directory-property v (file-name-directory localname))
+    (save-excursion
+      (tramp-barf-unless-okay
+       v (format "%s %s"
+		 (if parents "mkdir -p" "mkdir")
+		 (tramp-shell-quote-argument localname))
+       "Couldn't make directory %s" dir))))
+
+(defun tramp-handle-delete-directory (directory &optional recursive)
+  "Like `delete-directory' for Tramp files."
+  (setq directory (expand-file-name directory))
+  (with-parsed-tramp-file-name directory nil
+    (tramp-flush-file-property v (file-name-directory localname))
+    (tramp-flush-directory-property v localname)
+    (tramp-barf-unless-okay
+     v (format "%s %s"
+	       (if recursive "rm -rf" "rmdir")
+	       (tramp-shell-quote-argument localname))
+     "Couldn't delete %s" directory)))
+
+(defun tramp-handle-delete-file (filename &optional trash)
+  "Like `delete-file' for Tramp files."
+  (setq filename (expand-file-name filename))
+  (with-parsed-tramp-file-name filename nil
+    (tramp-flush-file-property v (file-name-directory localname))
+    (tramp-flush-file-property v localname)
+    (tramp-barf-unless-okay
+     v (format "%s %s"
+	       (or (and trash (tramp-get-remote-trash v)) "rm -f")
+	       (tramp-shell-quote-argument localname))
+     "Couldn't delete %s" filename)))
+
+;; Dired.
+
+;; CCC: This does not seem to be enough. Something dies when
+;;      we try and delete two directories under Tramp :/
+(defun tramp-handle-dired-recursive-delete-directory (filename)
+  "Recursively delete the directory given.
+This is like `dired-recursive-delete-directory' for Tramp files."
+  (with-parsed-tramp-file-name filename nil
+    ;; Run a shell command 'rm -r <localname>'
+    ;; Code shamelessly stolen from the dired implementation and, um, hacked :)
+    (unless (file-exists-p filename)
+      (tramp-error v 'file-error "No such directory: %s" filename))
+    ;; Which is better, -r or -R? (-r works for me <daniel@danann.net>)
+    (tramp-send-command
+     v
+     (format "rm -rf %s" (tramp-shell-quote-argument localname))
+     ;; Don't read the output, do it explicitely.
+     nil t)
+    ;; Wait for the remote system to return to us...
+    ;; This might take a while, allow it plenty of time.
+    (tramp-wait-for-output (tramp-get-connection-process v) 120)
+    ;; Make sure that it worked...
+    (tramp-flush-file-property v (file-name-directory localname))
+    (tramp-flush-directory-property v localname)
+    (and (file-exists-p filename)
+	 (tramp-error
+	  v 'file-error "Failed to recursively delete %s" filename))))
+
+(defun tramp-handle-dired-compress-file (file &rest ok-flag)
+  "Like `dired-compress-file' for Tramp files."
+  ;; OK-FLAG is valid for XEmacs only, but not implemented.
+  ;; Code stolen mainly from dired-aux.el.
+  (with-parsed-tramp-file-name file nil
+    (tramp-flush-file-property v localname)
+    (save-excursion
+      (let ((suffixes
+	     (if (not (featurep 'xemacs))
+		 ;; Emacs case
+		 (symbol-value 'dired-compress-file-suffixes)
+	       ;; XEmacs has `dired-compression-method-alist', which is
+	       ;; transformed into `dired-compress-file-suffixes' structure.
+	       (mapcar
+		(lambda (x)
+		  (list (concat (regexp-quote (nth 1 x)) "\\'")
+			nil
+			(mapconcat 'identity (nth 3 x) " ")))
+		(symbol-value 'dired-compression-method-alist))))
+	    suffix)
+	;; See if any suffix rule matches this file name.
+	(while suffixes
+	  (let (case-fold-search)
+	    (if (string-match (car (car suffixes)) localname)
+		(setq suffix (car suffixes) suffixes nil))
+	    (setq suffixes (cdr suffixes))))
+
+	(cond ((file-symlink-p file)
+	       nil)
+	      ((and suffix (nth 2 suffix))
+	       ;; We found an uncompression rule.
+	       (with-progress-reporter v 0 (format "Uncompressing %s" file)
+		 (when (tramp-send-command-and-check
+			v (concat (nth 2 suffix) " "
+				  (tramp-shell-quote-argument localname)))
+		   ;; `dired-remove-file' is not defined in XEmacs.
+		   (tramp-compat-funcall 'dired-remove-file file)
+		   (string-match (car suffix) file)
+		   (concat (substring file 0 (match-beginning 0))))))
+	      (t
+	       ;; We don't recognize the file as compressed, so compress it.
+	       ;; Try gzip.
+	       (with-progress-reporter v 0 (format "Compressing %s" file)
+		 (when (tramp-send-command-and-check
+			v (concat "gzip -f "
+				  (tramp-shell-quote-argument localname)))
+		   ;; `dired-remove-file' is not defined in XEmacs.
+		   (tramp-compat-funcall 'dired-remove-file file)
+		   (cond ((file-exists-p (concat file ".gz"))
+			  (concat file ".gz"))
+			 ((file-exists-p (concat file ".z"))
+			  (concat file ".z"))
+			 (t nil))))))))))
+
+(defun tramp-handle-dired-uncache (dir &optional dir-p)
+  "Like `dired-uncache' for Tramp files."
+  ;; DIR-P is valid for XEmacs only.
+  (with-parsed-tramp-file-name
+      (if (or dir-p (file-directory-p dir)) dir (file-name-directory dir)) nil
+    (tramp-flush-directory-property v localname)))
+
+(defun tramp-handle-insert-directory
+  (filename switches &optional wildcard full-directory-p)
+  "Like `insert-directory' for Tramp files."
+  (setq filename (expand-file-name filename))
+  (with-parsed-tramp-file-name filename nil
+    (if (and (featurep 'ls-lisp)
+	     (not (symbol-value 'ls-lisp-use-insert-directory-program)))
+	(tramp-run-real-handler
+	 'insert-directory (list filename switches wildcard full-directory-p))
+      (when (stringp switches)
+        (setq switches (split-string switches)))
+      (when (and (member "--dired" switches)
+		 (not (tramp-get-ls-command-with-dired v)))
+	(setq switches (delete "--dired" switches)))
+      (when wildcard
+        (setq wildcard (tramp-run-real-handler
+			'file-name-nondirectory (list localname)))
+        (setq localname (tramp-run-real-handler
+			 'file-name-directory (list localname))))
+      (unless full-directory-p
+        (setq switches (add-to-list 'switches "-d" 'append)))
+      (setq switches (mapconcat 'tramp-shell-quote-argument switches " "))
+      (when wildcard
+	(setq switches (concat switches " " wildcard)))
+      (tramp-message
+       v 4 "Inserting directory `ls %s %s', wildcard %s, fulldir %s"
+       switches filename (if wildcard "yes" "no")
+       (if full-directory-p "yes" "no"))
+      ;; If `full-directory-p', we just say `ls -l FILENAME'.
+      ;; Else we chdir to the parent directory, then say `ls -ld BASENAME'.
+      (if full-directory-p
+	  (tramp-send-command
+	   v
+	   (format "%s %s %s 2>/dev/null"
+		   (tramp-get-ls-command v)
+		   switches
+		   (if wildcard
+		       localname
+		     (tramp-shell-quote-argument (concat localname ".")))))
+	(tramp-barf-unless-okay
+	 v
+	 (format "cd %s" (tramp-shell-quote-argument
+			  (tramp-run-real-handler
+			   'file-name-directory (list localname))))
+	 "Couldn't `cd %s'"
+	 (tramp-shell-quote-argument
+	  (tramp-run-real-handler 'file-name-directory (list localname))))
+	(tramp-send-command
+	 v
+	 (format "%s %s %s"
+		 (tramp-get-ls-command v)
+		 switches
+		 (if (or wildcard
+			 (zerop (length
+				 (tramp-run-real-handler
+				  'file-name-nondirectory (list localname)))))
+		     ""
+		   (tramp-shell-quote-argument
+		    (tramp-run-real-handler
+		     'file-name-nondirectory (list localname)))))))
+      (let ((beg (point)))
+	;; We cannot use `insert-buffer-substring' because the Tramp
+	;; buffer changes its contents before insertion due to calling
+	;; `expand-file' and alike.
+	(insert
+	 (with-current-buffer (tramp-get-buffer v)
+	   (buffer-string)))
+
+	;; Check for "--dired" output.
+	(forward-line -2)
+	(when (looking-at "//SUBDIRED//")
+	  (forward-line -1))
+	(when (looking-at "//DIRED//\\s-+")
+	  (let ((databeg (match-end 0))
+		(end (tramp-compat-line-end-position)))
+	    ;; Now read the numeric positions of file names.
+	    (goto-char databeg)
+	    (while (< (point) end)
+	      (let ((start (+ beg (read (current-buffer))))
+		    (end (+ beg (read (current-buffer)))))
+		(if (memq (char-after end) '(?\n ?\ ))
+		    ;; End is followed by \n or by " -> ".
+		    (put-text-property start end 'dired-filename t))))))
+	;; Remove trailing lines.
+	(goto-char (tramp-compat-line-beginning-position))
+	(while (looking-at "//")
+	  (forward-line 1)
+	  (delete-region (match-beginning 0) (point)))
+
+	;; The inserted file could be from somewhere else.
+	(when (and (not wildcard) (not full-directory-p))
+	  (goto-char (point-max))
+	  (when (file-symlink-p filename)
+	    (goto-char (search-backward "->" beg 'noerror)))
+	  (search-backward
+	   (if (zerop (length (file-name-nondirectory filename)))
+	       "."
+	     (file-name-nondirectory filename))
+	   beg 'noerror)
+	  (replace-match (file-relative-name filename) t))
+
+	(goto-char (point-max))))))
+
+(defun tramp-handle-unhandled-file-name-directory (filename)
+  "Like `unhandled-file-name-directory' for Tramp files."
+  ;; With Emacs 23, we could simply return `nil'.  But we must keep it
+  ;; for backward compatibility.
+  (expand-file-name "~/"))
+
+;; Canonicalization of file names.
+
+(defun tramp-handle-expand-file-name (name &optional dir)
+  "Like `expand-file-name' for Tramp files.
+If the localname part of the given filename starts with \"/../\" then
+the result will be a local, non-Tramp, filename."
+  ;; If DIR is not given, use DEFAULT-DIRECTORY or "/".
+  (setq dir (or dir default-directory "/"))
+  ;; Unless NAME is absolute, concat DIR and NAME.
+  (unless (file-name-absolute-p name)
+    (setq name (concat (file-name-as-directory dir) name)))
+  ;; If NAME is not a Tramp file, run the real handler.
+  (if (not (tramp-connectable-p name))
+      (tramp-run-real-handler 'expand-file-name (list name nil))
+    ;; Dissect NAME.
+    (with-parsed-tramp-file-name name nil
+      (unless (tramp-run-real-handler 'file-name-absolute-p (list localname))
+	(setq localname (concat "~/" localname)))
+      ;; Tilde expansion if necessary.  This needs a shell which
+      ;; groks tilde expansion!  The function `tramp-find-shell' is
+      ;; supposed to find such a shell on the remote host.  Please
+      ;; tell me about it when this doesn't work on your system.
+      (when (string-match "\\`\\(~[^/]*\\)\\(.*\\)\\'" localname)
+	(let ((uname (match-string 1 localname))
+	      (fname (match-string 2 localname)))
+	  ;; We cannot simply apply "~/", because under sudo "~/" is
+	  ;; expanded to the local user home directory but to the
+	  ;; root home directory.  On the other hand, using always
+	  ;; the default user name for tilde expansion is not
+	  ;; appropriate either, because ssh and companions might
+	  ;; use a user name from the config file.
+	  (when (and (string-equal uname "~")
+		     (string-match "\\`su\\(do\\)?\\'" method))
+	    (setq uname (concat uname user)))
+	  (setq uname
+		(with-connection-property v uname
+		  (tramp-send-command
+		   v (format "cd %s; pwd" (tramp-shell-quote-argument uname)))
+		  (with-current-buffer (tramp-get-buffer v)
+		    (goto-char (point-min))
+		    (buffer-substring
+		     (point) (tramp-compat-line-end-position)))))
+	  (setq localname (concat uname fname))))
+      ;; There might be a double slash, for example when "~/"
+      ;; expands to "/".  Remove this.
+      (while (string-match "//" localname)
+	(setq localname (replace-match "/" t t localname)))
+      ;; No tilde characters in file name, do normal
+      ;; `expand-file-name' (this does "/./" and "/../").  We bind
+      ;; `directory-sep-char' here for XEmacs on Windows, which would
+      ;; otherwise use backslash.  `default-directory' is bound,
+      ;; because on Windows there would be problems with UNC shares or
+      ;; Cygwin mounts.
+      (let ((directory-sep-char ?/)
+	    (default-directory (tramp-compat-temporary-file-directory)))
+	(tramp-make-tramp-file-name
+	 method user host
+	 (tramp-drop-volume-letter
+	  (tramp-run-real-handler
+	   'expand-file-name (list localname))))))))
+
+(defun tramp-handle-substitute-in-file-name (filename)
+  "Like `substitute-in-file-name' for Tramp files.
+\"//\" and \"/~\" substitute only in the local filename part.
+If the URL Tramp syntax is chosen, \"//\" as method delimeter and \"/~\" at
+beginning of local filename are not substituted."
+  ;; First, we must replace environment variables.
+  (setq filename (tramp-replace-environment-variables filename))
+  (with-parsed-tramp-file-name filename nil
+    (if (equal tramp-syntax 'url)
+	;; We need to check localname only.  The other parts cannot contain
+	;; "//" or "/~".
+	(if (and (> (length localname) 1)
+		 (or (string-match "//" localname)
+		     (string-match "/~" localname 1)))
+	    (tramp-run-real-handler 'substitute-in-file-name (list filename))
+	  (tramp-make-tramp-file-name
+	   (when method (substitute-in-file-name method))
+	   (when user (substitute-in-file-name user))
+	   (when host (substitute-in-file-name host))
+	   (when localname
+	     (tramp-run-real-handler
+	      'substitute-in-file-name (list localname)))))
+      ;; Ignore in LOCALNAME everything before "//" or "/~".
+      (when (and (stringp localname) (string-match ".+?/\\(/\\|~\\)" localname))
+	(setq filename
+	      (concat (file-remote-p filename)
+		      (replace-match "\\1" nil nil localname)))
+	;; "/m:h:~" does not work for completion.  We use "/m:h:~/".
+	(when (string-match "~$" filename)
+	  (setq filename (concat filename "/"))))
+      (tramp-run-real-handler 'substitute-in-file-name (list filename)))))
+
+;;; Remote commands:
+
+(defun tramp-handle-executable-find (command)
+  "Like `executable-find' for Tramp files."
+  (with-parsed-tramp-file-name default-directory nil
+    (tramp-find-executable v command (tramp-get-remote-path v) t)))
+
+(defun tramp-process-sentinel (proc event)
+  "Flush file caches."
+  (unless (memq (process-status proc) '(run open))
+    (let ((vec (tramp-get-connection-property proc "vector" nil)))
+      (when vec
+	(tramp-message vec 5 "Sentinel called: `%s' `%s'" proc event)
+        (tramp-flush-directory-property vec "")))))
+
+;; We use BUFFER also as connection buffer during setup. Because of
+;; this, its original contents must be saved, and restored once
+;; connection has been setup.
+(defun tramp-handle-start-file-process (name buffer program &rest args)
+  "Like `start-file-process' for Tramp files."
+  (with-parsed-tramp-file-name default-directory nil
+    (unwind-protect
+	;; When PROGRAM is nil, we just provide a tty.
+	(let ((command
+	       (when (stringp program)
+		 (format "cd %s; exec %s"
+			 (tramp-shell-quote-argument localname)
+			 (mapconcat 'tramp-shell-quote-argument
+				    (cons program args) " "))))
+	      (tramp-process-connection-type
+	       (or (null program) tramp-process-connection-type))
+	      (name1 name)
+	      (i 0))
+	  (unless buffer
+	    ;; BUFFER can be nil.  We use a temporary buffer.
+	    (setq buffer (generate-new-buffer tramp-temp-buffer-name)))
+	  (while (get-process name1)
+	    ;; NAME must be unique as process name.
+	    (setq i (1+ i)
+		  name1 (format "%s<%d>" name i)))
+	  (setq name name1)
+	  ;; Set the new process properties.
+	  (tramp-set-connection-property v "process-name" name)
+	  (tramp-set-connection-property v "process-buffer" buffer)
+	  ;; Activate narrowing in order to save BUFFER contents.
+	  ;; Clear also the modification time; otherwise we might be
+	  ;; interrupted by `verify-visited-file-modtime'.
+	  (with-current-buffer (tramp-get-connection-buffer v)
+	    (clear-visited-file-modtime)
+	    (narrow-to-region (point-max) (point-max)))
+	  (if command
+	      ;; Send the command.
+	      (tramp-send-command v command nil t) ; nooutput
+	    ;; Check, whether a pty is associated.
+	    (tramp-maybe-open-connection v)
+	    (unless (process-get (tramp-get-connection-process v) 'remote-tty)
+	      (tramp-error
+	       v 'file-error "pty association is not supported for `%s'" name)))
+	  (let ((p (tramp-get-connection-process v)))
+	    ;; Set sentinel and query flag for this process.
+	    (tramp-set-connection-property p "vector" v)
+	    (set-process-sentinel p 'tramp-process-sentinel)
+	    (tramp-set-process-query-on-exit-flag p t)
+	    ;; Return process.
+	    p))
+      ;; Save exit.
+      (with-current-buffer (tramp-get-connection-buffer v)
+	(if (string-match tramp-temp-buffer-name (buffer-name))
+	    (progn
+	      (set-process-buffer (tramp-get-connection-process v) nil)
+	      (kill-buffer (current-buffer)))
+	  (widen)
+	  (goto-char (point-max))))
+      (tramp-set-connection-property v "process-name" nil)
+      (tramp-set-connection-property v "process-buffer" nil))))
+
+(defun tramp-handle-process-file
+  (program &optional infile destination display &rest args)
+  "Like `process-file' for Tramp files."
+  ;; The implementation is not complete yet.
+  (when (and (numberp destination) (zerop destination))
+    (error "Implementation does not handle immediate return"))
+
+  (with-parsed-tramp-file-name default-directory nil
+    (let (command input tmpinput stderr tmpstderr outbuf ret)
+      ;; Compute command.
+      (setq command (mapconcat 'tramp-shell-quote-argument
+			       (cons program args) " "))
+      ;; Determine input.
+      (if (null infile)
+	  (setq input "/dev/null")
+	(setq infile (expand-file-name infile))
+	(if (tramp-equal-remote default-directory infile)
+	    ;; INFILE is on the same remote host.
+	    (setq input (with-parsed-tramp-file-name infile nil localname))
+	  ;; INFILE must be copied to remote host.
+	  (setq input (tramp-make-tramp-temp-file v)
+		tmpinput (tramp-make-tramp-file-name method user host input))
+	  (copy-file infile tmpinput t)))
+      (when input (setq command (format "%s <%s" command input)))
+
+      ;; Determine output.
+      (cond
+       ;; Just a buffer.
+       ((bufferp destination)
+	(setq outbuf destination))
+       ;; A buffer name.
+       ((stringp destination)
+	(setq outbuf (get-buffer-create destination)))
+       ;; (REAL-DESTINATION ERROR-DESTINATION)
+       ((consp destination)
+	;; output.
+	(cond
+	 ((bufferp (car destination))
+	  (setq outbuf (car destination)))
+	 ((stringp (car destination))
+	  (setq outbuf (get-buffer-create (car destination))))
+	 ((car destination)
+	  (setq outbuf (current-buffer))))
+	;; stderr.
+	(cond
+	 ((stringp (cadr destination))
+	  (setcar (cdr destination) (expand-file-name (cadr destination)))
+	  (if (tramp-equal-remote default-directory (cadr destination))
+	      ;; stderr is on the same remote host.
+	      (setq stderr (with-parsed-tramp-file-name
+			       (cadr destination) nil localname))
+	    ;; stderr must be copied to remote host.  The temporary
+	    ;; file must be deleted after execution.
+	    (setq stderr (tramp-make-tramp-temp-file v)
+		  tmpstderr (tramp-make-tramp-file-name
+			     method user host stderr))))
+	 ;; stderr to be discarded.
+	 ((null (cadr destination))
+	  (setq stderr "/dev/null"))))
+       ;; 't
+       (destination
+	(setq outbuf (current-buffer))))
+      (when stderr (setq command (format "%s 2>%s" command stderr)))
+
+      ;; Send the command.  It might not return in time, so we protect
+      ;; it.  Call it in a subshell, in order to preserve working
+      ;; directory.
+      (condition-case nil
+	  (unwind-protect
+              (setq ret
+		    (if (tramp-send-command-and-check
+			 v (format "\\cd %s; %s"
+				   (tramp-shell-quote-argument localname)
+				   command)
+			 t t)
+			0 1))
+	    ;; We should show the output anyway.
+	    (when outbuf
+	      (with-current-buffer outbuf
+                (insert
+                 (with-current-buffer (tramp-get-connection-buffer v)
+                   (buffer-string))))
+	      (when display (display-buffer outbuf))))
+	;; When the user did interrupt, we should do it also.  We use
+	;; return code -1 as marker.
+	(quit
+	 (kill-buffer (tramp-get-connection-buffer v))
+	 (setq ret -1))
+	;; Handle errors.
+	(error
+	 (kill-buffer (tramp-get-connection-buffer v))
+	 (setq ret 1)))
+
+      ;; Provide error file.
+      (when tmpstderr (rename-file tmpstderr (cadr destination) t))
+
+      ;; Cleanup.  We remove all file cache values for the connection,
+      ;; because the remote process could have changed them.
+      (when tmpinput (delete-file tmpinput))
+
+      ;; `process-file-side-effects' has been introduced with GNU
+      ;; Emacs 23.2.  If set to `nil', no remote file will be changed
+      ;; by `program'.  If it doesn't exist, we assume its default
+      ;; value 't'.
+      (unless (and (boundp 'process-file-side-effects)
+		   (not (symbol-value 'process-file-side-effects)))
+        (tramp-flush-directory-property v ""))
+
+      ;; Return exit status.
+      (if (equal ret -1)
+	  (keyboard-quit)
+	ret))))
+
+(defun tramp-handle-call-process-region
+  (start end program &optional delete buffer display &rest args)
+  "Like `call-process-region' for Tramp files."
+  (let ((tmpfile (tramp-compat-make-temp-file "")))
+    (write-region start end tmpfile)
+    (when delete (delete-region start end))
+    (unwind-protect
+	(apply 'call-process program tmpfile buffer display args)
+      (delete-file tmpfile))))
+
+(defun tramp-handle-shell-command
+  (command &optional output-buffer error-buffer)
+  "Like `shell-command' for Tramp files."
+  (let* ((asynchronous (string-match "[ \t]*&[ \t]*\\'" command))
+	 ;; We cannot use `shell-file-name' and `shell-command-switch',
+	 ;; they are variables of the local host.
+	 (args (list
+		(tramp-get-method-parameter
+		 (tramp-file-name-method
+		  (tramp-dissect-file-name default-directory))
+		 'tramp-remote-sh)
+		"-c" (substring command 0 asynchronous)))
+	 current-buffer-p
+	 (output-buffer
+	  (cond
+	   ((bufferp output-buffer) output-buffer)
+	   ((stringp output-buffer) (get-buffer-create output-buffer))
+	   (output-buffer
+	    (setq current-buffer-p t)
+	    (current-buffer))
+	   (t (get-buffer-create
+	       (if asynchronous
+		   "*Async Shell Command*"
+		 "*Shell Command Output*")))))
+	 (error-buffer
+	  (cond
+	   ((bufferp error-buffer) error-buffer)
+	   ((stringp error-buffer) (get-buffer-create error-buffer))))
+	 (buffer
+	  (if (and (not asynchronous) error-buffer)
+	      (with-parsed-tramp-file-name default-directory nil
+		(list output-buffer (tramp-make-tramp-temp-file v)))
+	    output-buffer))
+	 (p (get-buffer-process output-buffer)))
+
+    ;; Check whether there is another process running.  Tramp does not
+    ;; support 2 (asynchronous) processes in parallel.
+    (when p
+      (if (yes-or-no-p "A command is running.  Kill it? ")
+	  (ignore-errors (kill-process p))
+	(error "Shell command in progress")))
+
+    (if current-buffer-p
+	(progn
+	  (barf-if-buffer-read-only)
+	  (push-mark nil t))
+      (with-current-buffer output-buffer
+	(setq buffer-read-only nil)
+	(erase-buffer)))
+
+    (if (and (not current-buffer-p) (integerp asynchronous))
+	(prog1
+	    ;; Run the process.
+	    (apply 'start-file-process "*Async Shell*" buffer args)
+	  ;; Display output.
+	  (pop-to-buffer output-buffer)
+	  (setq mode-line-process '(":%s"))
+	  (shell-mode))
+
+      (prog1
+	  ;; Run the process.
+	  (apply 'process-file (car args) nil buffer nil (cdr args))
+	;; Insert error messages if they were separated.
+	(when (listp buffer)
+	  (with-current-buffer error-buffer
+	    (insert-file-contents (cadr buffer)))
+	  (delete-file (cadr buffer)))
+	(if current-buffer-p
+	    ;; This is like exchange-point-and-mark, but doesn't
+	    ;; activate the mark.  It is cleaner to avoid activation,
+	    ;; even though the command loop would deactivate the mark
+	    ;; because we inserted text.
+	    (goto-char (prog1 (mark t)
+			 (set-marker (mark-marker) (point)
+				     (current-buffer))))
+	  ;; There's some output, display it.
+	  (when (with-current-buffer output-buffer (> (point-max) (point-min)))
+	    (if (functionp 'display-message-or-buffer)
+		(tramp-compat-funcall 'display-message-or-buffer output-buffer)
+	      (pop-to-buffer output-buffer))))))))
+
+(defun tramp-handle-file-local-copy (filename)
+  "Like `file-local-copy' for Tramp files."
+
+  (with-parsed-tramp-file-name filename nil
+    (unless (file-exists-p filename)
+      (tramp-error
+       v 'file-error
+       "Cannot make local copy of non-existing file `%s'" filename))
+
+    (let* ((size (nth 7 (file-attributes filename)))
+	   (rem-enc (tramp-get-inline-coding v "remote-encoding" size))
+	   (loc-dec (tramp-get-inline-coding v "local-decoding" size))
+	   (tmpfile (tramp-compat-make-temp-file filename)))
+
+      (condition-case err
+	  (cond
+	   ;; `copy-file' handles direct copy and out-of-band methods.
+	   ((or (tramp-local-host-p v)
+		(tramp-method-out-of-band-p v size))
+	    (copy-file filename tmpfile t t))
+
+	   ;; Use inline encoding for file transfer.
+	   (rem-enc
+	    (save-excursion
+	      (with-progress-reporter
+	       v 3 (format "Encoding remote file %s" filename)
+	       (tramp-barf-unless-okay
+		v (format rem-enc (tramp-shell-quote-argument localname))
+		"Encoding remote file failed"))
+
+	      (if (functionp loc-dec)
+		  ;; If local decoding is a function, we call it.  We
+		  ;; must disable multibyte, because
+		  ;; `uudecode-decode-region' doesn't handle it
+		  ;; correctly.
+		  (with-temp-buffer
+		    (set-buffer-multibyte nil)
+		    (insert-buffer-substring (tramp-get-buffer v))
+		    (with-progress-reporter
+			v 3 (format "Decoding remote file %s with function %s"
+				    filename loc-dec)
+		      (funcall loc-dec (point-min) (point-max))
+		      ;; Unset `file-name-handler-alist'.  Otherwise,
+		      ;; epa-file gets confused.
+		      (let (file-name-handler-alist
+			    (coding-system-for-write 'binary))
+			(write-region (point-min) (point-max) tmpfile))))
+
+		;; If tramp-decoding-function is not defined for this
+		;; method, we invoke tramp-decoding-command instead.
+		(let ((tmpfile2 (tramp-compat-make-temp-file filename)))
+		  ;; Unset `file-name-handler-alist'.  Otherwise,
+		  ;; epa-file gets confused.
+		  (let (file-name-handler-alist
+			(coding-system-for-write 'binary))
+		    (write-region (point-min) (point-max) tmpfile2))
+		  (with-progress-reporter
+		      v 3 (format "Decoding remote file %s with command %s"
+				  filename loc-dec)
+		    (unwind-protect
+			(tramp-call-local-coding-command
+			 loc-dec tmpfile2 tmpfile)
+		      (delete-file tmpfile2)))))
+
+	      ;; Set proper permissions.
+	      (set-file-modes tmpfile (tramp-default-file-modes filename))
+	      ;; Set local user ownership.
+	      (tramp-set-file-uid-gid tmpfile)))
+
+	   ;; Oops, I don't know what to do.
+	   (t (tramp-error
+	       v 'file-error "Wrong method specification for `%s'" method)))
+
+	;; Error handling.
+	((error quit)
+	 (delete-file tmpfile)
+	 (signal (car err) (cdr err))))
+
+      (run-hooks 'tramp-handle-file-local-copy-hook)
+      tmpfile)))
+
+(defun tramp-handle-file-remote-p (filename &optional identification connected)
+  "Like `file-remote-p' for Tramp files."
+  (let ((tramp-verbose 3))
+    (when (tramp-tramp-file-p filename)
+      (let* ((v (tramp-dissect-file-name filename))
+	     (p (tramp-get-connection-process v))
+	     (c (and p (processp p) (memq (process-status p) '(run open)))))
+	;; We expand the file name only, if there is already a connection.
+	(with-parsed-tramp-file-name
+	    (if c (expand-file-name filename) filename) nil
+	  (and (or (not connected) c)
+	       (cond
+		((eq identification 'method) method)
+		((eq identification 'user) user)
+		((eq identification 'host) host)
+		((eq identification 'localname) localname)
+		(t (tramp-make-tramp-file-name method user host "")))))))))
+
+(defun tramp-handle-insert-file-contents
+  (filename &optional visit beg end replace)
+  "Like `insert-file-contents' for Tramp files."
+  (barf-if-buffer-read-only)
+  (setq filename (expand-file-name filename))
+  (let (result local-copy remote-copy)
+    (with-parsed-tramp-file-name filename nil
+      (unwind-protect
+	  (if (not (file-exists-p filename))
+	      ;; We don't raise a Tramp error, because it might be
+	      ;; suppressed, like in `find-file-noselect-1'.
+	      (signal 'file-error
+		      (list "File not found on remote host" filename))
+
+	    (if (and (tramp-local-host-p v)
+		     (let (file-name-handler-alist)
+		       (file-readable-p localname)))
+		;; Short track: if we are on the local host, we can
+		;; run directly.
+		(setq result
+		      (tramp-run-real-handler
+		       'insert-file-contents
+		       (list localname visit beg end replace)))
+
+	      ;; When we shall insert only a part of the file, we copy
+	      ;; this part.
+	      (when (or beg end)
+		(setq remote-copy (tramp-make-tramp-temp-file v))
+		(tramp-send-command
+		 v
+		 (cond
+		  ((and beg end)
+		   (format "tail -c +%d %s | head -c +%d >%s"
+			   (1+ beg) (tramp-shell-quote-argument localname)
+			   (- end beg) remote-copy))
+		  (beg
+		   (format "tail -c +%d %s >%s"
+			   (1+ beg) (tramp-shell-quote-argument localname)
+			   remote-copy))
+		  (end
+		   (format "head -c +%d %s >%s"
+			   (1+ end) (tramp-shell-quote-argument localname)
+			   remote-copy)))))
+
+	      ;; `insert-file-contents-literally' takes care to avoid
+	      ;; calling jka-compr.  By let-binding
+	      ;; `inhibit-file-name-operation', we propagate that care
+	      ;; to the `file-local-copy' operation.
+	      (setq local-copy
+		    (let ((inhibit-file-name-operation
+			   (when (eq inhibit-file-name-operation
+				     'insert-file-contents)
+			     'file-local-copy)))
+		      (cond
+		       ((stringp remote-copy)
+			(file-local-copy
+			 (tramp-make-tramp-file-name
+			  method user host remote-copy)))
+		       ((stringp tramp-temp-buffer-file-name)
+			(copy-file filename tramp-temp-buffer-file-name 'ok)
+			tramp-temp-buffer-file-name)
+		       (t (file-local-copy filename)))))
+
+	      ;; When the file is not readable for the owner, it
+	      ;; cannot be inserted, even it is redable for the group
+	      ;; or for everybody.
+	      (set-file-modes local-copy (tramp-compat-octal-to-decimal "0600"))
+
+	      (when (and (null remote-copy)
+			 (tramp-get-method-parameter
+			  method 'tramp-copy-keep-tmpfile))
+		;; We keep the local file for performance reasons,
+		;; useful for "rsync".
+		(setq tramp-temp-buffer-file-name local-copy)
+		(put 'tramp-temp-buffer-file-name 'permanent-local t))
+
+	      (with-progress-reporter
+		  v 3 (format "Inserting local temp file `%s'" local-copy)
+		;; We must ensure that `file-coding-system-alist'
+		;; matches `local-copy'.
+		(let ((file-coding-system-alist
+		       (tramp-find-file-name-coding-system-alist
+			filename local-copy)))
+		  (setq result
+			(insert-file-contents
+			 local-copy nil nil nil replace))))))
+
+	;; Save exit.
+	(progn
+	  (when visit
+	    (setq buffer-file-name filename)
+	    (setq buffer-read-only (not (file-writable-p filename)))
+	    (set-visited-file-modtime)
+	    (set-buffer-modified-p nil))
+	  (when (and (stringp local-copy)
+		     (or remote-copy (null tramp-temp-buffer-file-name)))
+	    (delete-file local-copy))
+	  (when (stringp remote-copy)
+	    (delete-file
+	     (tramp-make-tramp-file-name method user host remote-copy))))))
+
+    ;; Result.
+    (list (expand-file-name filename)
+	  (cadr result))))
+
+;; This is needed for XEmacs only.  Code stolen from files.el.
+(defun tramp-handle-insert-file-contents-literally
+  (filename &optional visit beg end replace)
+  "Like `insert-file-contents-literally' for Tramp files."
+  (let ((format-alist nil)
+	(after-insert-file-functions nil)
+	(coding-system-for-read 'no-conversion)
+	(coding-system-for-write 'no-conversion)
+	(find-buffer-file-type-function
+	 (if (fboundp 'find-buffer-file-type)
+	     (symbol-function 'find-buffer-file-type)
+	   nil))
+	(inhibit-file-name-handlers '(jka-compr-handler image-file-handler))
+	(inhibit-file-name-operation 'insert-file-contents))
+    (unwind-protect
+	(progn
+	  (fset 'find-buffer-file-type (lambda (filename) t))
+	  (insert-file-contents filename visit beg end replace))
+      ;; Save exit.
+      (if find-buffer-file-type-function
+	  (fset 'find-buffer-file-type find-buffer-file-type-function)
+	(fmakunbound 'find-buffer-file-type)))))
+
+(defun tramp-handle-find-backup-file-name (filename)
+  "Like `find-backup-file-name' for Tramp files."
+  (with-parsed-tramp-file-name filename nil
+    ;; We set both variables. It doesn't matter whether it is
+    ;; Emacs or XEmacs.
+    (let ((backup-directory-alist
+	   ;; Emacs case.
+	   (when (boundp 'backup-directory-alist)
+	     (if (symbol-value 'tramp-backup-directory-alist)
+		 (mapcar
+		  (lambda (x)
+		    (cons
+		     (car x)
+		     (if (and (stringp (cdr x))
+			      (file-name-absolute-p (cdr x))
+			      (not (tramp-file-name-p (cdr x))))
+			 (tramp-make-tramp-file-name method user host (cdr x))
+		       (cdr x))))
+		  (symbol-value 'tramp-backup-directory-alist))
+	       (symbol-value 'backup-directory-alist))))
+
+	  (bkup-backup-directory-info
+	   ;; XEmacs case.
+	   (when (boundp 'bkup-backup-directory-info)
+	     (if (symbol-value 'tramp-bkup-backup-directory-info)
+		 (mapcar
+		  (lambda (x)
+		    (nconc
+		     (list (car x))
+		     (list
+		      (if (and (stringp (car (cdr x)))
+			       (file-name-absolute-p (car (cdr x)))
+			       (not (tramp-file-name-p (car (cdr x)))))
+			  (tramp-make-tramp-file-name
+			   method user host (car (cdr x)))
+			(car (cdr x))))
+		     (cdr (cdr x))))
+		  (symbol-value 'tramp-bkup-backup-directory-info))
+	       (symbol-value 'bkup-backup-directory-info)))))
+
+      (tramp-run-real-handler 'find-backup-file-name (list filename)))))
+
+(defun tramp-handle-make-auto-save-file-name ()
+  "Like `make-auto-save-file-name' for Tramp files.
+Returns a file name in `tramp-auto-save-directory' for autosaving this file."
+  (let ((tramp-auto-save-directory tramp-auto-save-directory)
+	(buffer-file-name
+	 (tramp-subst-strs-in-string
+	  '(("_" . "|")
+	    ("/" . "_a")
+	    (":" . "_b")
+	    ("|" . "__")
+	    ("[" . "_l")
+	    ("]" . "_r"))
+	  (buffer-file-name))))
+    ;; File name must be unique.  This is ensured with Emacs 22 (see
+    ;; UNIQUIFY element of `auto-save-file-name-transforms'); but for
+    ;; all other cases we must do it ourselves.
+    (when (boundp 'auto-save-file-name-transforms)
+      (mapc
+       (lambda (x)
+	 (when (and (string-match (car x) buffer-file-name)
+		    (not (car (cddr x))))
+	   (setq tramp-auto-save-directory
+		 (or tramp-auto-save-directory
+		     (tramp-compat-temporary-file-directory)))))
+       (symbol-value 'auto-save-file-name-transforms)))
+    ;; Create directory.
+    (when tramp-auto-save-directory
+      (setq buffer-file-name
+	    (expand-file-name buffer-file-name tramp-auto-save-directory))
+      (unless (file-exists-p tramp-auto-save-directory)
+	(make-directory tramp-auto-save-directory t)))
+    ;; Run plain `make-auto-save-file-name'.  There might be an advice when
+    ;; it is not a magic file name operation (since Emacs 22).
+    ;; We must deactivate it temporarily.
+    (if (not (ad-is-active 'make-auto-save-file-name))
+	(tramp-run-real-handler 'make-auto-save-file-name nil)
+      ;; else
+      (ad-deactivate 'make-auto-save-file-name)
+      (prog1
+       (tramp-run-real-handler 'make-auto-save-file-name nil)
+       (ad-activate 'make-auto-save-file-name)))))
+
+(defvar tramp-handle-write-region-hook nil
+  "Normal hook to be run at the end of `tramp-handle-write-region'.")
+
+;; CCC grok LOCKNAME
+(defun tramp-handle-write-region
+  (start end filename &optional append visit lockname confirm)
+  "Like `write-region' for Tramp files."
+  (setq filename (expand-file-name filename))
+  (with-parsed-tramp-file-name filename nil
+    ;; Following part commented out because we don't know what to do about
+    ;; file locking, and it does not appear to be a problem to ignore it.
+    ;; Ange-ftp ignores it, too.
+    ;;  (when (and lockname (stringp lockname))
+    ;;    (setq lockname (expand-file-name lockname)))
+    ;;  (unless (or (eq lockname nil)
+    ;;              (string= lockname filename))
+    ;;    (error
+    ;;     "tramp-handle-write-region: LOCKNAME must be nil or equal FILENAME"))
+
+    ;; XEmacs takes a coding system as the seventh argument, not `confirm'.
+    (when (and (not (featurep 'xemacs)) confirm (file-exists-p filename))
+      (unless (y-or-n-p (format "File %s exists; overwrite anyway? " filename))
+	(tramp-error v 'file-error "File not overwritten")))
+
+    (let ((uid (or (nth 2 (tramp-compat-file-attributes filename 'integer))
+		   (tramp-get-remote-uid v 'integer)))
+	  (gid (or (nth 3 (tramp-compat-file-attributes filename 'integer))
+		   (tramp-get-remote-gid v 'integer))))
+
+      (if (and (tramp-local-host-p v)
+	       ;; `file-writable-p' calls `file-expand-file-name'.  We
+	       ;; cannot use `tramp-run-real-handler' therefore.
+	       (let (file-name-handler-alist)
+		 (and
+		  (file-writable-p (file-name-directory localname))
+		  (or (file-directory-p localname)
+		      (file-writable-p localname)))))
+	  ;; Short track: if we are on the local host, we can run directly.
+	  (tramp-run-real-handler
+	   'write-region
+	   (list start end localname append 'no-message lockname confirm))
+
+	(let ((modes (save-excursion (tramp-default-file-modes filename)))
+	      ;; We use this to save the value of
+	      ;; `last-coding-system-used' after writing the tmp
+	      ;; file.  At the end of the function, we set
+	      ;; `last-coding-system-used' to this saved value.  This
+	      ;; way, any intermediary coding systems used while
+	      ;; talking to the remote shell or suchlike won't hose
+	      ;; this variable.  This approach was snarfed from
+	      ;; ange-ftp.el.
+	      coding-system-used
+	      ;; Write region into a tmp file.  This isn't really
+	      ;; needed if we use an encoding function, but currently
+	      ;; we use it always because this makes the logic
+	      ;; simpler.
+	      (tmpfile (or tramp-temp-buffer-file-name
+			   (tramp-compat-make-temp-file filename))))
+
+	  ;; If `append' is non-nil, we copy the file locally, and let
+	  ;; the native `write-region' implementation do the job.
+	  (when append (copy-file filename tmpfile 'ok))
+
+	  ;; We say `no-message' here because we don't want the
+	  ;; visited file modtime data to be clobbered from the temp
+	  ;; file.  We call `set-visited-file-modtime' ourselves later
+	  ;; on.  We must ensure that `file-coding-system-alist'
+	  ;; matches `tmpfile'.
+	  (let (file-name-handler-alist
+		(file-coding-system-alist
+		 (tramp-find-file-name-coding-system-alist filename tmpfile)))
+	    (condition-case err
+		(tramp-run-real-handler
+		 'write-region
+		 (list start end tmpfile append 'no-message lockname confirm))
+	      ((error quit)
+	       (setq tramp-temp-buffer-file-name nil)
+	       (delete-file tmpfile)
+	       (signal (car err) (cdr err))))
+
+	    ;; Now, `last-coding-system-used' has the right value.  Remember it.
+	    (when (boundp 'last-coding-system-used)
+	      (setq coding-system-used
+		    (symbol-value 'last-coding-system-used))))
+
+	  ;; The permissions of the temporary file should be set.  If
+	  ;; filename does not exist (eq modes nil) it has been
+	  ;; renamed to the backup file.  This case `save-buffer'
+	  ;; handles permissions.
+	  ;; Ensure, that it is still readable.
+	  (when modes
+	    (set-file-modes
+	     tmpfile
+	     (logior (or modes 0) (tramp-compat-octal-to-decimal "0400"))))
+
+	  ;; This is a bit lengthy due to the different methods
+	  ;; possible for file transfer.  First, we check whether the
+	  ;; method uses an rcp program.  If so, we call it.
+	  ;; Otherwise, both encoding and decoding command must be
+	  ;; specified.  However, if the method _also_ specifies an
+	  ;; encoding function, then that is used for encoding the
+	  ;; contents of the tmp file.
+	  (let* ((size (nth 7 (file-attributes tmpfile)))
+		 (rem-dec (tramp-get-inline-coding v "remote-decoding" size))
+		 (loc-enc (tramp-get-inline-coding v "local-encoding" size)))
+	    (cond
+	     ;; `copy-file' handles direct copy and out-of-band methods.
+	     ((or (tramp-local-host-p v)
+		  (tramp-method-out-of-band-p v size))
+	      (if (and (not (stringp start))
+		       (= (or end (point-max)) (point-max))
+		       (= (or start (point-min)) (point-min))
+		       (tramp-get-method-parameter
+			method 'tramp-copy-keep-tmpfile))
+		  (progn
+		    (setq tramp-temp-buffer-file-name tmpfile)
+		    (condition-case err
+			;; We keep the local file for performance
+			;; reasons, useful for "rsync".
+			(copy-file tmpfile filename t)
+		      ((error quit)
+		       (setq tramp-temp-buffer-file-name nil)
+		       (delete-file tmpfile)
+		       (signal (car err) (cdr err)))))
+		(setq tramp-temp-buffer-file-name nil)
+		;; Don't rename, in order to keep context in SELinux.
+		(unwind-protect
+		    (copy-file tmpfile filename t)
+		  (delete-file tmpfile))))
+
+	     ;; Use inline file transfer.
+	     (rem-dec
+	      ;; Encode tmpfile.
+	      (unwind-protect
+		  (with-temp-buffer
+		    (set-buffer-multibyte nil)
+		    ;; Use encoding function or command.
+		    (if (functionp loc-enc)
+			(with-progress-reporter
+			    v 3 (format "Encoding region using function `%s'"
+					loc-enc)
+			  (let ((coding-system-for-read 'binary))
+			    (insert-file-contents-literally tmpfile))
+			  ;; The following `let' is a workaround for the
+			  ;; base64.el that comes with pgnus-0.84.  If
+			  ;; both of the following conditions are
+			  ;; satisfied, it tries to write to a local
+			  ;; file in default-directory, but at this
+			  ;; point, default-directory is remote.
+			  ;; (`call-process-region' can't write to
+			  ;; remote files, it seems.)  The file in
+			  ;; question is a tmp file anyway.
+			  (let ((default-directory
+				  (tramp-compat-temporary-file-directory)))
+			    (funcall loc-enc (point-min) (point-max))))
+
+		      (with-progress-reporter
+			  v 3 (format "Encoding region using command `%s'"
+				      loc-enc)
+			(unless (zerop (tramp-call-local-coding-command
+					loc-enc tmpfile t))
+			  (tramp-error
+			   v 'file-error
+			   (concat "Cannot write to `%s', "
+				   "local encoding command `%s' failed")
+			   filename loc-enc))))
+
+		    ;; Send buffer into remote decoding command which
+		    ;; writes to remote file.  Because this happens on
+		    ;; the remote host, we cannot use the function.
+		    (with-progress-reporter
+			v 3
+			(format "Decoding region into remote file %s" filename)
+		      (goto-char (point-max))
+		      (unless (bolp) (newline))
+		      (tramp-send-command
+		       v
+		       (format
+			(concat rem-dec " <<'EOF'\n%sEOF")
+			(tramp-shell-quote-argument localname)
+			(buffer-string)))
+		      (tramp-barf-unless-okay
+		       v nil
+		       "Couldn't write region to `%s', decode using `%s' failed"
+		       filename rem-dec)
+		      ;; When `file-precious-flag' is set, the region is
+		      ;; written to a temporary file.  Check that the
+		      ;; checksum is equal to that from the local tmpfile.
+		      (when file-precious-flag
+			(erase-buffer)
+			(and
+			 ;; cksum runs locally, if possible.
+			 (zerop (tramp-compat-call-process "cksum" tmpfile t))
+			 ;; cksum runs remotely.
+			 (tramp-send-command-and-check
+			  v
+			  (format
+			   "cksum <%s" (tramp-shell-quote-argument localname)))
+			 ;; ... they are different.
+			 (not
+			  (string-equal
+			   (buffer-string)
+			   (with-current-buffer (tramp-get-buffer v)
+			     (buffer-string))))
+			 (tramp-error
+			  v 'file-error
+			  (concat "Couldn't write region to `%s',"
+				  " decode using `%s' failed")
+			  filename rem-dec)))))
+
+		;; Save exit.
+		(delete-file tmpfile)))
+
+	     ;; That's not expected.
+	     (t
+	      (tramp-error
+	       v 'file-error
+	       (concat "Method `%s' should specify both encoding and "
+		       "decoding command or an rcp program")
+	       method))))
+
+	  ;; Make `last-coding-system-used' have the right value.
+	  (when coding-system-used
+	    (set 'last-coding-system-used coding-system-used))))
+
+      (tramp-flush-file-property v (file-name-directory localname))
+      (tramp-flush-file-property v localname)
+
+      ;; We must protect `last-coding-system-used', now we have set it
+      ;; to its correct value.
+      (let (last-coding-system-used (need-chown t))
+	;; Set file modification time.
+	(when (or (eq visit t) (stringp visit))
+          (let ((file-attr (file-attributes filename)))
+            (set-visited-file-modtime
+             ;; We must pass modtime explicitely, because filename can
+             ;; be different from (buffer-file-name), f.e. if
+             ;; `file-precious-flag' is set.
+             (nth 5 file-attr))
+            (when (and (eq (nth 2 file-attr) uid)
+                       (eq (nth 3 file-attr) gid))
+              (setq need-chown nil))))
+
+	;; Set the ownership.
+        (when need-chown
+          (tramp-set-file-uid-gid filename uid gid))
+	(when (or (eq visit t) (null visit) (stringp visit))
+	  (tramp-message v 0 "Wrote %s" filename))
+	(run-hooks 'tramp-handle-write-region-hook)))))
+
+(defvar tramp-vc-registered-file-names nil
+  "List used to collect file names, which are checked during `vc-registered'.")
+
+;; VC backends check for the existence of various different special
+;; files.  This is very time consuming, because every single check
+;; requires a remote command (the file cache must be invalidated).
+;; Therefore, we apply a kind of optimization.  We install the file
+;; name handler `tramp-vc-file-name-handler', which does nothing but
+;; remembers all file names for which `file-exists-p' or
+;; `file-readable-p' has been applied.  A first run of `vc-registered'
+;; is performed.  Afterwards, a script is applied for all collected
+;; file names, using just one remote command.  The result of this
+;; script is used to fill the file cache with actual values.  Now we
+;; can reset the file name handlers, and we make a second run of
+;; `vc-registered', which returns the expected result without sending
+;; any other remote command.
+(defun tramp-handle-vc-registered (file)
+  "Like `vc-registered' for Tramp files."
+  (with-temp-message ""
+    (with-parsed-tramp-file-name file nil
+      (with-progress-reporter
+	  v 3 (format "Checking `vc-registered' for %s" file)
+
+	;; There could be new files, created by the vc backend.  We
+	;; cannot reuse the old cache entries, therefore.
+	(let (tramp-vc-registered-file-names
+	      (tramp-cache-inhibit-cache (current-time))
+	      (file-name-handler-alist
+	       `((,tramp-file-name-regexp . tramp-vc-file-name-handler))))
+
+	  ;; Here we collect only file names, which need an operation.
+	  (tramp-run-real-handler 'vc-registered (list file))
+	  (tramp-message v 10 "\n%s" tramp-vc-registered-file-names)
+
+	  ;; Send just one command, in order to fill the cache.
+	  (when tramp-vc-registered-file-names
+	    (tramp-maybe-send-script
+	     v
+	     (format tramp-vc-registered-read-file-names
+		     (tramp-get-file-exists-command v)
+		     (format "%s -r" (tramp-get-test-command v)))
+	     "tramp_vc_registered_read_file_names")
+
+	    (dolist
+		(elt
+		 (tramp-send-command-and-read
+		  v
+		  (format
+		   "tramp_vc_registered_read_file_names <<'EOF'\n%s\nEOF\n"
+		   (mapconcat 'tramp-shell-quote-argument
+			      tramp-vc-registered-file-names
+			      "\n"))))
+
+	      (tramp-set-file-property
+	       v (car elt) (cadr elt) (cadr (cdr elt))))))
+
+	;; Second run.  Now all `file-exists-p' or `file-readable-p'
+	;; calls shall be answered from the file cache.  We unset
+	;; `process-file-side-effects' in order to keep the cache when
+	;; `process-file' calls appear.
+	(let (process-file-side-effects)
+	  (tramp-run-real-handler 'vc-registered (list file)))))))
+
+;;;###tramp-autoload
+(defun tramp-sh-file-name-handler (operation &rest args)
+  "Invoke remote-shell Tramp file name handler.
+Fall back to normal file name handler if no Tramp handler exists."
+  (when (and tramp-locked (not tramp-locker))
+    (setq tramp-locked nil)
+    (signal 'file-error (list "Forbidden reentrant call of Tramp")))
+  (let ((tl tramp-locked))
+    (unwind-protect
+	(progn
+	  (setq tramp-locked t)
+	  (let ((tramp-locker t))
+	    (save-match-data
+	      (let ((fn (assoc operation tramp-sh-file-name-handler-alist)))
+		(if fn
+		    (apply (cdr fn) args)
+		  (tramp-run-real-handler operation args))))))
+      (setq tramp-locked tl))))
+
+(defun tramp-vc-file-name-handler (operation &rest args)
+  "Invoke special file name handler, which collects files to be handled."
+  (save-match-data
+    (let ((filename
+	   (tramp-replace-environment-variables
+	    (apply 'tramp-file-name-for-operation operation args)))
+	  (fn (assoc operation tramp-sh-file-name-handler-alist)))
+      (with-parsed-tramp-file-name filename nil
+	(cond
+	 ;; That's what we want: file names, for which checks are
+	 ;; applied.  We assume, that VC uses only `file-exists-p' and
+	 ;; `file-readable-p' checks; otherwise we must extend the
+	 ;; list.  We do not perform any action, but return nil, in
+	 ;; order to keep `vc-registered' running.
+	 ((and fn (memq operation '(file-exists-p file-readable-p)))
+	  (add-to-list 'tramp-vc-registered-file-names localname 'append)
+	  nil)
+	 ;; Tramp file name handlers like `expand-file-name'.  They
+	 ;; must still work.
+	 (fn
+	  (save-match-data (apply (cdr fn) args)))
+	 ;; Default file name handlers, we don't care.
+	 (t (tramp-run-real-handler operation args)))))))
+
+;;; Internal Functions:
+
+(defun tramp-maybe-send-script (vec script name)
+  "Define in remote shell function NAME implemented as SCRIPT.
+Only send the definition if it has not already been done."
+  (let* ((p (tramp-get-connection-process vec))
+	 (scripts (tramp-get-connection-property p "scripts" nil)))
+    (unless (member name scripts)
+      (with-progress-reporter vec 5 (format "Sending script `%s'" name)
+	;; The script could contain a call of Perl.  This is masked with `%s'.
+	(tramp-barf-unless-okay
+	 vec
+	 (format "%s () {\n%s\n}" name
+		 (format script (tramp-get-remote-perl vec)))
+	 "Script %s sending failed" name)
+	(tramp-set-connection-property p "scripts" (cons name scripts))))))
+
+(defun tramp-set-auto-save ()
+  (when (and ;; ange-ftp has its own auto-save mechanism
+	     (eq (tramp-find-foreign-file-name-handler (buffer-file-name))
+		 'tramp-sh-file-name-handler)
+             auto-save-default)
+    (auto-save-mode 1)))
+(add-hook 'find-file-hooks 'tramp-set-auto-save t)
+(add-hook 'tramp-unload-hook
+	  (lambda ()
+	    (remove-hook 'find-file-hooks 'tramp-set-auto-save)))
+
+(defun tramp-run-test (switch filename)
+  "Run `test' on the remote system, given a SWITCH and a FILENAME.
+Returns the exit code of the `test' program."
+  (with-parsed-tramp-file-name filename nil
+    (tramp-send-command-and-check
+     v
+     (format
+      "%s %s %s"
+      (tramp-get-test-command v)
+      switch
+      (tramp-shell-quote-argument localname)))))
+
+(defun tramp-run-test2 (format-string file1 file2)
+  "Run `test'-like program on the remote system, given FILE1, FILE2.
+FORMAT-STRING contains the program name, switches, and place holders.
+Returns the exit code of the `test' program.  Barfs if the methods,
+hosts, or files, disagree."
+  (unless (tramp-equal-remote file1 file2)
+    (with-parsed-tramp-file-name (if (tramp-tramp-file-p file1) file1 file2) nil
+      (tramp-error
+       v 'file-error
+       "tramp-run-test2 only implemented for same method, user, host")))
+  (with-parsed-tramp-file-name file1 v1
+    (with-parsed-tramp-file-name file1 v2
+      (tramp-send-command-and-check
+       v1
+       (format format-string
+	       (tramp-shell-quote-argument v1-localname)
+	       (tramp-shell-quote-argument v2-localname))))))
+
+(defun tramp-find-executable
+  (vec progname dirlist &optional ignore-tilde ignore-path)
+  "Searches for PROGNAME in $PATH and all directories mentioned in DIRLIST.
+First arg VEC specifies the connection, PROGNAME is the program
+to search for, and DIRLIST gives the list of directories to
+search.  If IGNORE-TILDE is non-nil, directory names starting
+with `~' will be ignored. If IGNORE-PATH is non-nil, searches
+only in DIRLIST.
+
+Returns the absolute file name of PROGNAME, if found, and nil otherwise.
+
+This function expects to be in the right *tramp* buffer."
+  (with-current-buffer (tramp-get-connection-buffer vec)
+    (let (result)
+      ;; Check whether the executable is in $PATH. "which(1)" does not
+      ;; report always a correct error code; therefore we check the
+      ;; number of words it returns.
+      (unless ignore-path
+	(tramp-send-command vec (format "which \\%s | wc -w" progname))
+	(goto-char (point-min))
+	(if (looking-at "^\\s-*1$")
+	    (setq result (concat "\\" progname))))
+      (unless result
+	(when ignore-tilde
+	  ;; Remove all ~/foo directories from dirlist.  In XEmacs,
+	  ;; `remove' is in CL, and we want to avoid CL dependencies.
+	  (let (newdl d)
+	    (while dirlist
+	      (setq d (car dirlist))
+	      (setq dirlist (cdr dirlist))
+	      (unless (char-equal ?~ (aref d 0))
+		(setq newdl (cons d newdl))))
+	    (setq dirlist (nreverse newdl))))
+	(tramp-send-command
+	 vec
+	 (format (concat "while read d; "
+			 "do if test -x $d/%s -a -f $d/%s; "
+			 "then echo tramp_executable $d/%s; "
+			 "break; fi; done <<'EOF'\n"
+			 "%s\nEOF")
+		 progname progname progname (mapconcat 'identity dirlist "\n")))
+	(goto-char (point-max))
+	(when (search-backward "tramp_executable " nil t)
+	  (skip-chars-forward "^ ")
+	  (skip-chars-forward " ")
+	  (setq result (buffer-substring
+			(point) (tramp-compat-line-end-position)))))
+    result)))
+
+(defun tramp-set-remote-path (vec)
+  "Sets the remote environment PATH to existing directories.
+I.e., for each directory in `tramp-remote-path', it is tested
+whether it exists and if so, it is added to the environment
+variable PATH."
+  (tramp-message vec 5 (format "Setting $PATH environment variable"))
+  (tramp-send-command
+   vec (format "PATH=%s; export PATH"
+	       (mapconcat 'identity (tramp-get-remote-path vec) ":"))))
+
+;; ------------------------------------------------------------
+;; -- Communication with external shell --
+;; ------------------------------------------------------------
+
+(defun tramp-find-file-exists-command (vec)
+  "Find a command on the remote host for checking if a file exists.
+Here, we are looking for a command which has zero exit status if the
+file exists and nonzero exit status otherwise."
+  (let ((existing "/")
+        (nonexisting
+	 (tramp-shell-quote-argument "/ this file does not exist "))
+	result)
+    ;; The algorithm is as follows: we try a list of several commands.
+    ;; For each command, we first run `$cmd /' -- this should return
+    ;; true, as the root directory always exists.  And then we run
+    ;; `$cmd /this\ file\ does\ not\ exist ', hoping that the file indeed
+    ;; does not exist.  This should return false.  We use the first
+    ;; command we find that seems to work.
+    ;; The list of commands to try is as follows:
+    ;; `ls -d'            This works on most systems, but NetBSD 1.4
+    ;;                    has a bug: `ls' always returns zero exit
+    ;;                    status, even for files which don't exist.
+    ;; `test -e'          Some Bourne shells have a `test' builtin
+    ;;                    which does not know the `-e' option.
+    ;; `/bin/test -e'     For those, the `test' binary on disk normally
+    ;;                    provides the option.  Alas, the binary
+    ;;                    is sometimes `/bin/test' and sometimes it's
+    ;;                    `/usr/bin/test'.
+    ;; `/usr/bin/test -e' In case `/bin/test' does not exist.
+    (unless (or
+             (and (setq result (format "%s -e" (tramp-get-test-command vec)))
+		  (tramp-send-command-and-check
+		   vec (format "%s %s" result existing))
+                  (not (tramp-send-command-and-check
+			vec (format "%s %s" result nonexisting))))
+             (and (setq result "/bin/test -e")
+		  (tramp-send-command-and-check
+		   vec (format "%s %s" result existing))
+                  (not (tramp-send-command-and-check
+			vec (format "%s %s" result nonexisting))))
+             (and (setq result "/usr/bin/test -e")
+		  (tramp-send-command-and-check
+		   vec (format "%s %s" result existing))
+                  (not (tramp-send-command-and-check
+			vec (format "%s %s" result nonexisting))))
+             (and (setq result (format "%s -d" (tramp-get-ls-command vec)))
+		  (tramp-send-command-and-check
+		   vec (format "%s %s" result existing))
+                  (not (tramp-send-command-and-check
+			vec (format "%s %s" result nonexisting)))))
+      (tramp-error
+       vec 'file-error "Couldn't find command to check if file exists"))
+    result))
+
+(defun tramp-open-shell (vec shell)
+  "Opens shell SHELL."
+  (with-progress-reporter vec 5 (format "Opening remote shell `%s'" shell)
+    ;; Find arguments for this shell.
+    (let ((tramp-end-of-output tramp-initial-end-of-output)
+	  (alist tramp-sh-extra-args)
+	  item extra-args)
+      (while (and alist (null extra-args))
+	(setq item (pop alist))
+	(when (string-match (car item) shell)
+	  (setq extra-args (cdr item))))
+      (when extra-args (setq shell (concat shell " " extra-args)))
+      (tramp-send-command
+       vec (format "exec env ENV='' PROMPT_COMMAND='' PS1=%s PS2='' PS3='' %s"
+		   (shell-quote-argument tramp-end-of-output) shell)
+       t))
+    ;; Setting prompts.
+    (tramp-send-command
+     vec (format "PS1=%s" (shell-quote-argument tramp-end-of-output)) t)
+    (tramp-send-command vec "PS2=''" t)
+    (tramp-send-command vec "PS3=''" t)
+    (tramp-send-command vec "PROMPT_COMMAND=''" t)))
+
+(defun tramp-find-shell (vec)
+  "Opens a shell on the remote host which groks tilde expansion."
+  (unless (tramp-get-connection-property vec "remote-shell" nil)
+    (let (shell)
+      (with-current-buffer (tramp-get-buffer vec)
+	(tramp-send-command vec "echo ~root" t)
+	(cond
+	 ((or (string-match "^~root$" (buffer-string))
+	      ;; The default shell (ksh93) of OpenSolaris is buggy.
+	      (string-equal (tramp-get-connection-property vec "uname" "")
+			    "SunOS 5.11"))
+	  (setq shell
+		(or (tramp-find-executable
+		     vec "bash" (tramp-get-remote-path vec) t t)
+		    (tramp-find-executable
+		     vec "ksh" (tramp-get-remote-path vec) t t)))
+	  (unless shell
+	    (tramp-error
+	     vec 'file-error
+	     "Couldn't find a shell which groks tilde expansion"))
+	  (tramp-message
+	   vec 5 "Starting remote shell `%s' for tilde expansion" shell)
+	  (tramp-open-shell vec shell))
+
+	 (t (tramp-message
+	     vec 5 "Remote `%s' groks tilde expansion, good"
+	     (tramp-set-connection-property
+	      vec "remote-shell"
+	      (tramp-get-method-parameter
+	       (tramp-file-name-method vec) 'tramp-remote-sh)))))))))
+
+;; Utility functions.
+
+(defun tramp-barf-if-no-shell-prompt (proc timeout &rest error-args)
+  "Wait for shell prompt and barf if none appears.
+Looks at process PROC to see if a shell prompt appears in TIMEOUT
+seconds.  If not, it produces an error message with the given ERROR-ARGS."
+  (unless
+      (tramp-wait-for-regexp
+       proc timeout
+       (format
+	"\\(%s\\|%s\\)\\'" shell-prompt-pattern tramp-shell-prompt-pattern))
+    (apply 'tramp-error-with-buffer nil proc 'file-error error-args)))
+
+(defun tramp-open-connection-setup-interactive-shell (proc vec)
+  "Set up an interactive shell.
+Mainly sets the prompt and the echo correctly.  PROC is the shell
+process to set up.  VEC specifies the connection."
+  (let ((tramp-end-of-output tramp-initial-end-of-output))
+    ;; It is useful to set the prompt in the following command because
+    ;; some people have a setting for $PS1 which /bin/sh doesn't know
+    ;; about and thus /bin/sh will display a strange prompt.  For
+    ;; example, if $PS1 has "${CWD}" in the value, then ksh will
+    ;; display the current working directory but /bin/sh will display
+    ;; a dollar sign.  The following command line sets $PS1 to a sane
+    ;; value, and works under Bourne-ish shells as well as csh-like
+    ;; shells.  Daniel Pittman reports that the unusual positioning of
+    ;; the single quotes makes it work under `rc', too.  We also unset
+    ;; the variable $ENV because that is read by some sh
+    ;; implementations (eg, bash when called as sh) on startup; this
+    ;; way, we avoid the startup file clobbering $PS1.  $PROMP_COMMAND
+    ;; is another way to set the prompt in /bin/bash, it must be
+    ;; discarded as well.
+    (tramp-open-shell
+     vec
+     (tramp-get-method-parameter (tramp-file-name-method vec) 'tramp-remote-sh))
+
+    ;; Disable echo.
+    (tramp-message vec 5 "Setting up remote shell environment")
+    (tramp-send-command vec "stty -inlcr -echo kill '^U' erase '^H'" t)
+    ;; Check whether the echo has really been disabled.  Some
+    ;; implementations, like busybox of embedded GNU/Linux, don't
+    ;; support disabling.
+    (tramp-send-command vec "echo foo" t)
+    (with-current-buffer (process-buffer proc)
+      (goto-char (point-min))
+      (when (looking-at "echo foo")
+	(tramp-set-connection-property proc "remote-echo" t)
+	(tramp-message vec 5 "Remote echo still on. Ok.")
+	;; Make sure backspaces and their echo are enabled and no line
+	;; width magic interferes with them.
+	(tramp-send-command vec "stty icanon erase ^H cols 32767" t))))
+
+  (tramp-message vec 5 "Setting shell prompt")
+  (tramp-send-command
+   vec (format "PS1=%s" (shell-quote-argument tramp-end-of-output)) t)
+  (tramp-send-command vec "PS2=''" t)
+  (tramp-send-command vec "PS3=''" t)
+  (tramp-send-command vec "PROMPT_COMMAND=''" t)
+
+  ;; Try to set up the coding system correctly.
+  ;; CCC this can't be the right way to do it.  Hm.
+  (tramp-message vec 5 "Determining coding system")
+  (tramp-send-command vec "echo foo ; echo bar" t)
+  (with-current-buffer (process-buffer proc)
+    (goto-char (point-min))
+    (if (featurep 'mule)
+	;; Use MULE to select the right EOL convention for communicating
+	;; with the process.
+	(let* ((cs (or (tramp-compat-funcall 'process-coding-system proc)
+		       (cons 'undecided 'undecided)))
+	       cs-decode cs-encode)
+	  (when (symbolp cs) (setq cs (cons cs cs)))
+	  (setq cs-decode (car cs))
+	  (setq cs-encode (cdr cs))
+	  (unless cs-decode (setq cs-decode 'undecided))
+	  (unless cs-encode (setq cs-encode 'undecided))
+	  (setq cs-encode (tramp-coding-system-change-eol-conversion
+			   cs-encode 'unix))
+	  (when (search-forward "\r" nil t)
+	    (setq cs-decode (tramp-coding-system-change-eol-conversion
+			     cs-decode 'dos)))
+	  (tramp-compat-funcall
+	   'set-buffer-process-coding-system cs-decode cs-encode)
+	  (tramp-message
+	   vec 5 "Setting coding system to `%s' and `%s'" cs-decode cs-encode))
+      ;; Look for ^M and do something useful if found.
+      (when (search-forward "\r" nil t)
+	;; We have found a ^M but cannot frob the process coding system
+	;; because we're running on a non-MULE Emacs.  Let's try
+	;; stty, instead.
+	(tramp-send-command vec "stty -onlcr" t))))
+  ;; Dump stty settings in the traces.
+  (when (>= tramp-verbose 9)
+    (tramp-send-command vec "stty -a" t))
+  (tramp-send-command vec "set +o vi +o emacs" t)
+
+  ;; Check whether the output of "uname -sr" has been changed.  If
+  ;; yes, this is a strong indication that we must expire all
+  ;; connection properties.  We start again with
+  ;; `tramp-maybe-open-connection', it will be catched there.
+  (tramp-message vec 5 "Checking system information")
+  (let ((old-uname (tramp-get-connection-property vec "uname" nil))
+	(new-uname
+	 (tramp-set-connection-property
+	  vec "uname"
+	  (tramp-send-command-and-read vec "echo \\\"`uname -sr`\\\""))))
+    (when (and (stringp old-uname) (not (string-equal old-uname new-uname)))
+      (with-current-buffer (tramp-get-debug-buffer vec)
+	;; Keep the debug buffer.
+	(rename-buffer
+	 (generate-new-buffer-name tramp-temp-buffer-name) 'unique)
+	(tramp-compat-funcall 'tramp-cleanup-connection vec)
+	(if (= (point-min) (point-max))
+	    (kill-buffer nil)
+	  (rename-buffer (tramp-debug-buffer-name vec) 'unique))
+	;; We call `tramp-get-buffer' in order to keep the debug buffer.
+	(tramp-get-buffer vec)
+	(tramp-message
+	 vec 3
+	 "Connection reset, because remote host changed from `%s' to `%s'"
+	 old-uname new-uname)
+	(throw 'uname-changed (tramp-maybe-open-connection vec)))))
+
+  ;; Check whether the remote host suffers from buggy
+  ;; `send-process-string'.  This is known for FreeBSD (see comment in
+  ;; `send_process', file process.c).  I've tested sending 624 bytes
+  ;; successfully, sending 625 bytes failed.  Emacs makes a hack when
+  ;; this host type is detected locally.  It cannot handle remote
+  ;; hosts, though.
+  (with-connection-property proc "chunksize"
+    (cond
+     ((and (integerp tramp-chunksize) (> tramp-chunksize 0))
+      tramp-chunksize)
+     (t
+      (tramp-message
+       vec 5 "Checking remote host type for `send-process-string' bug")
+      (if (string-match
+	   "^FreeBSD" (tramp-get-connection-property vec "uname" ""))
+	  500 0))))
+
+  ;; Set remote PATH variable.
+  (tramp-set-remote-path vec)
+
+  ;; Search for a good shell before searching for a command which
+  ;; checks if a file exists. This is done because Tramp wants to use
+  ;; "test foo; echo $?" to check if various conditions hold, and
+  ;; there are buggy /bin/sh implementations which don't execute the
+  ;; "echo $?"  part if the "test" part has an error.  In particular,
+  ;; the OpenSolaris /bin/sh is a problem.  There are also other
+  ;; problems with /bin/sh of OpenSolaris, like redirection of stderr
+  ;; in function declarations, or changing HISTFILE in place.
+  ;; Therefore, OpenSolaris' /bin/sh is replaced by bash, when
+  ;; detected.
+  (tramp-find-shell vec)
+
+  ;; Disable unexpected output.
+  (tramp-send-command vec "mesg n; biff n" t)
+
+  ;; IRIX64 bash expands "!" even when in single quotes.  This
+  ;; destroys our shell functions, we must disable it.  See
+  ;; <http://stackoverflow.com/questions/3291692/irix-bash-shell-expands-expression-in-single-quotes-yet-shouldnt>.
+  (when (string-match "^IRIX64" (tramp-get-connection-property vec "uname" ""))
+    (tramp-send-command vec "set +H" t))
+
+  ;; Set `remote-tty' process property.
+  (ignore-errors
+    (let ((tty (tramp-send-command-and-read vec "echo \\\"`tty`\\\"")))
+      (unless (zerop (length tty)) (process-put proc 'remote-tty tty))))
+
+  ;; Set the environment.
+  (tramp-message vec 5 "Setting default environment")
+
+  (let ((env (copy-sequence tramp-remote-process-environment))
+	unset item)
+    (while env
+      (setq item (tramp-compat-split-string (car env) "="))
+      (setcdr item (mapconcat 'identity (cdr item) "="))
+      (if (and (stringp (cdr item)) (not (string-equal (cdr item) "")))
+	  (tramp-send-command
+	   vec (format "%s=%s; export %s" (car item) (cdr item) (car item)) t)
+	(push (car item) unset))
+      (setq env (cdr env)))
+    (when unset
+      (tramp-send-command
+       vec (format "unset %s" (mapconcat 'identity unset " ")) t))))
+
+;; CCC: We should either implement a Perl version of base64 encoding
+;; and decoding.  Then we just use that in the last item.  The other
+;; alternative is to use the Perl version of UU encoding.  But then
+;; we need a Lisp version of uuencode.
+;;
+;; Old text from documentation of tramp-methods:
+;; Using a uuencode/uudecode inline method is discouraged, please use one
+;; of the base64 methods instead since base64 encoding is much more
+;; reliable and the commands are more standardized between the different
+;; Unix versions.  But if you can't use base64 for some reason, please
+;; note that the default uudecode command does not work well for some
+;; Unices, in particular AIX and Irix.  For AIX, you might want to use
+;; the following command for uudecode:
+;;
+;;     sed '/^begin/d;/^[` ]$/d;/^end/d' | iconv -f uucode -t ISO8859-1
+;;
+;; For Irix, no solution is known yet.
+
+(autoload 'uudecode-decode-region "uudecode")
+
+(defconst tramp-local-coding-commands
+  '((b64 base64-encode-region base64-decode-region)
+    (uu  tramp-uuencode-region uudecode-decode-region)
+    (pack
+     "perl -e 'binmode STDIN; binmode STDOUT; print pack(q{u*}, join q{}, <>)'"
+     "perl -e 'binmode STDIN; binmode STDOUT; print unpack(q{u*}, join q{}, <>)'"))
+  "List of local coding commands for inline transfer.
+Each item is a list that looks like this:
+
+\(FORMAT ENCODING DECODING\)
+
+FORMAT is  symbol describing the encoding/decoding format.  It can be
+`b64' for base64 encoding, `uu' for uu encoding, or `pack' for simple packing.
+
+ENCODING and DECODING can be strings, giving commands, or symbols,
+giving functions.  If they are strings, then they can contain
+the \"%s\" format specifier.  If that specifier is present, the input
+filename will be put into the command line at that spot.  If the
+specifier is not present, the input should be read from standard
+input.
+
+If they are functions, they will be called with two arguments, start
+and end of region, and are expected to replace the region contents
+with the encoded or decoded results, respectively.")
+
+(defconst tramp-remote-coding-commands
+  '((b64 "base64" "base64 -d")
+    (b64 "mimencode -b" "mimencode -u -b")
+    (b64 "mmencode -b" "mmencode -u -b")
+    (b64 "recode data..base64" "recode base64..data")
+    (b64 tramp-perl-encode-with-module tramp-perl-decode-with-module)
+    (b64 tramp-perl-encode tramp-perl-decode)
+    (uu  "uuencode xxx" "uudecode -o /dev/stdout")
+    (uu  "uuencode xxx" "uudecode -o -")
+    (uu  "uuencode xxx" "uudecode -p")
+    (uu  "uuencode xxx" tramp-uudecode)
+    (pack
+     "perl -e 'binmode STDIN; binmode STDOUT; print pack(q{u*}, join q{}, <>)'"
+     "perl -e 'binmode STDIN; binmode STDOUT; print unpack(q{u*}, join q{}, <>)'"))
+  "List of remote coding commands for inline transfer.
+Each item is a list that looks like this:
+
+\(FORMAT ENCODING DECODING\)
+
+FORMAT is  symbol describing the encoding/decoding format.  It can be
+`b64' for base64 encoding, `uu' for uu encoding, or `pack' for simple packing.
+
+ENCODING and DECODING can be strings, giving commands, or symbols,
+giving variables.  If they are strings, then they can contain
+the \"%s\" format specifier.  If that specifier is present, the input
+filename will be put into the command line at that spot.  If the
+specifier is not present, the input should be read from standard
+input.
+
+If they are variables, this variable is a string containing a Perl
+implementation for this functionality.  This Perl program will be transferred
+to the remote host, and it is available as shell function with the same name.")
+
+(defun tramp-find-inline-encoding (vec)
+  "Find an inline transfer encoding that works.
+Goes through the list `tramp-local-coding-commands' and
+`tramp-remote-coding-commands'."
+  (save-excursion
+    (let ((local-commands tramp-local-coding-commands)
+	  (magic "xyzzy")
+	  loc-enc loc-dec rem-enc rem-dec litem ritem found)
+      (while (and local-commands (not found))
+	(setq litem (pop local-commands))
+	(catch 'wont-work-local
+	  (let ((format (nth 0 litem))
+		(remote-commands tramp-remote-coding-commands))
+	    (setq loc-enc (nth 1 litem))
+	    (setq loc-dec (nth 2 litem))
+	    ;; If the local encoder or decoder is a string, the
+	    ;; corresponding command has to work locally.
+	    (if (not (stringp loc-enc))
+		(tramp-message
+		 vec 5 "Checking local encoding function `%s'" loc-enc)
+	      (tramp-message
+	       vec 5 "Checking local encoding command `%s' for sanity" loc-enc)
+	      (unless (zerop (tramp-call-local-coding-command
+			      loc-enc nil nil))
+		(throw 'wont-work-local nil)))
+	    (if (not (stringp loc-dec))
+		(tramp-message
+		 vec 5 "Checking local decoding function `%s'" loc-dec)
+	      (tramp-message
+	       vec 5 "Checking local decoding command `%s' for sanity" loc-dec)
+	      (unless (zerop (tramp-call-local-coding-command
+			      loc-dec nil nil))
+		(throw 'wont-work-local nil)))
+	    ;; Search for remote coding commands with the same format
+	    (while (and remote-commands (not found))
+	      (setq ritem (pop remote-commands))
+	      (catch 'wont-work-remote
+		(when (equal format (nth 0 ritem))
+		  (setq rem-enc (nth 1 ritem))
+		  (setq rem-dec (nth 2 ritem))
+		  ;; Check if remote encoding and decoding commands can be
+		  ;; called remotely with null input and output.  This makes
+		  ;; sure there are no syntax errors and the command is really
+		  ;; found.  Note that we do not redirect stdout to /dev/null,
+		  ;; for two reasons: when checking the decoding command, we
+		  ;; actually check the output it gives.  And also, when
+		  ;; redirecting "mimencode" output to /dev/null, then as root
+		  ;; it might change the permissions of /dev/null!
+		  (when (not (stringp rem-enc))
+		    (let ((name (symbol-name rem-enc)))
+		      (while (string-match (regexp-quote "-") name)
+			(setq name (replace-match "_" nil t name)))
+		      (tramp-maybe-send-script vec (symbol-value rem-enc) name)
+		      (setq rem-enc name)))
+		  (tramp-message
+		   vec 5
+		   "Checking remote encoding command `%s' for sanity" rem-enc)
+		  (unless (tramp-send-command-and-check
+			   vec (format "%s </dev/null" rem-enc) t)
+		    (throw 'wont-work-remote nil))
+
+		  (when (not (stringp rem-dec))
+		    (let ((name (symbol-name rem-dec)))
+		      (while (string-match (regexp-quote "-") name)
+			(setq name (replace-match "_" nil t name)))
+		      (tramp-maybe-send-script vec (symbol-value rem-dec) name)
+		      (setq rem-dec name)))
+		  (tramp-message
+		   vec 5
+		   "Checking remote decoding command `%s' for sanity" rem-dec)
+		  (unless (tramp-send-command-and-check
+			   vec
+			   (format "echo %s | %s | %s" magic rem-enc rem-dec)
+			   t)
+		    (throw 'wont-work-remote nil))
+
+		  (with-current-buffer (tramp-get-buffer vec)
+		    (goto-char (point-min))
+		    (unless (looking-at (regexp-quote magic))
+		      (throw 'wont-work-remote nil)))
+
+		  ;; `rem-enc' and `rem-dec' could be a string meanwhile.
+		  (setq rem-enc (nth 1 ritem))
+		  (setq rem-dec (nth 2 ritem))
+		  (setq found t)))))))
+
+      ;; Did we find something?
+      (unless found
+	(tramp-error
+	 vec 'file-error "Couldn't find an inline transfer encoding"))
+
+      ;; Set connection properties.
+      (tramp-message vec 5 "Using local encoding `%s'" loc-enc)
+      (tramp-set-connection-property vec "local-encoding" loc-enc)
+      (tramp-message vec 5 "Using local decoding `%s'" loc-dec)
+      (tramp-set-connection-property vec "local-decoding" loc-dec)
+      (tramp-message vec 5 "Using remote encoding `%s'" rem-enc)
+      (tramp-set-connection-property vec "remote-encoding" rem-enc)
+      (tramp-message vec 5 "Using remote decoding `%s'" rem-dec)
+      (tramp-set-connection-property vec "remote-decoding" rem-dec))))
+
+(defun tramp-call-local-coding-command (cmd input output)
+  "Call the local encoding or decoding command.
+If CMD contains \"%s\", provide input file INPUT there in command.
+Otherwise, INPUT is passed via standard input.
+INPUT can also be nil which means `/dev/null'.
+OUTPUT can be a string (which specifies a filename), or t (which
+means standard output and thus the current buffer), or nil (which
+means discard it)."
+  (tramp-compat-call-process
+   tramp-encoding-shell
+   (when (and input (not (string-match "%s" cmd))) input)
+   (if (eq output t) t nil)
+   nil
+   tramp-encoding-command-switch
+   (concat
+    (if (string-match "%s" cmd) (format cmd input) cmd)
+    (if (stringp output) (concat "> " output) ""))))
+
+(defconst tramp-inline-compress-commands
+  '(("gzip" "gzip -d")
+    ("bzip2" "bzip2 -d")
+    ("compress" "compress -d"))
+  "List of compress and decompress commands for inline transfer.
+Each item is a list that looks like this:
+
+\(COMPRESS DECOMPRESS\)
+
+COMPRESS or DECOMPRESS are strings with the respective commands.")
+
+(defun tramp-find-inline-compress (vec)
+  "Find an inline transfer compress command that works.
+Goes through the list `tramp-inline-compress-commands'."
+  (save-excursion
+    (let ((commands tramp-inline-compress-commands)
+	  (magic "xyzzy")
+	  item compress decompress
+	  found)
+      (while (and commands (not found))
+	(catch 'next
+	  (setq item (pop commands)
+		compress (nth 0 item)
+		decompress (nth 1 item))
+	  (tramp-message
+	   vec 5
+	   "Checking local compress command `%s', `%s' for sanity"
+	   compress decompress)
+	  (unless (zerop (tramp-call-local-coding-command
+			  (format "echo %s | %s | %s"
+				  magic compress decompress) nil nil))
+	    (throw 'next nil))
+	  (tramp-message
+	   vec 5
+	   "Checking remote compress command `%s', `%s' for sanity"
+	   compress decompress)
+	  (unless (tramp-send-command-and-check
+		   vec (format "echo %s | %s | %s" magic compress decompress) t)
+	    (throw 'next nil))
+	  (setq found t)))
+
+      ;; Did we find something?
+      (if found
+	  (progn
+	    ;; Set connection properties.
+	    (tramp-message
+	     vec 5 "Using inline transfer compress command `%s'" compress)
+	    (tramp-set-connection-property vec "inline-compress" compress)
+	    (tramp-message
+	     vec 5 "Using inline transfer decompress command `%s'" decompress)
+	    (tramp-set-connection-property vec "inline-decompress" decompress))
+
+	(tramp-set-connection-property vec "inline-compress" nil)
+	(tramp-set-connection-property vec "inline-decompress" nil)
+	(tramp-message
+	 vec 2 "Couldn't find an inline transfer compress command")))))
+
+(defun tramp-compute-multi-hops (vec)
+  "Expands VEC according to `tramp-default-proxies-alist'.
+Gateway hops are already opened."
+  (let ((target-alist `(,vec))
+	(choices tramp-default-proxies-alist)
+	item proxy)
+
+    ;; Look for proxy hosts to be passed.
+    (while choices
+      (setq item (pop choices)
+	    proxy (eval (nth 2 item)))
+      (when (and
+	     ;; host
+	     (string-match (or (eval (nth 0 item)) "")
+			   (or (tramp-file-name-host (car target-alist)) ""))
+	     ;; user
+	     (string-match (or (eval (nth 1 item)) "")
+			   (or (tramp-file-name-user (car target-alist)) "")))
+	(if (null proxy)
+	    ;; No more hops needed.
+	    (setq choices nil)
+	  ;; Replace placeholders.
+	  (setq proxy
+		(format-spec
+		 proxy
+		 (format-spec-make
+		  ?u (or (tramp-file-name-user (car target-alist)) "")
+		  ?h (or (tramp-file-name-host (car target-alist)) ""))))
+	  (with-parsed-tramp-file-name proxy l
+	    ;; Add the hop.
+	    (add-to-list 'target-alist l)
+	    ;; Start next search.
+	    (setq choices tramp-default-proxies-alist)))))
+
+    ;; Handle gateways.
+    (when (string-match
+	   (format
+	    "^\\(%s\\|%s\\)$" tramp-gw-tunnel-method tramp-gw-socks-method)
+	   (tramp-file-name-method (car target-alist)))
+      (let ((gw (pop target-alist))
+	    (hop (pop target-alist)))
+	;; Is the method prepared for gateways?
+	(unless (tramp-get-method-parameter
+		 (tramp-file-name-method hop) 'tramp-default-port)
+	  (tramp-error
+	   vec 'file-error
+	   "Method `%s' is not supported for gateway access."
+	   (tramp-file-name-method hop)))
+	;; Add default port if needed.
+	(unless
+	    (string-match
+	     tramp-host-with-port-regexp (tramp-file-name-host hop))
+	  (aset hop 2
+		(concat
+		 (tramp-file-name-host hop) tramp-prefix-port-format
+		 (number-to-string
+		  (tramp-get-method-parameter
+		   (tramp-file-name-method hop) 'tramp-default-port)))))
+	;; Open the gateway connection.
+	(add-to-list
+	 'target-alist
+	 (vector
+	  (tramp-file-name-method hop) (tramp-file-name-user hop)
+	  (tramp-compat-funcall 'tramp-gw-open-connection vec gw hop) nil))
+	;; For the password prompt, we need the correct values.
+	;; Therefore, we must remember the gateway vector.  But we
+	;; cannot do it as connection property, because it shouldn't
+	;; be persistent.  And we have no started process yet either.
+	(tramp-set-file-property (car target-alist) "" "gateway" hop)))
+
+    ;; Foreign and out-of-band methods are not supported for multi-hops.
+    (when (cdr target-alist)
+      (setq choices target-alist)
+      (while choices
+	(setq item (pop choices))
+	(when
+	    (or
+	     (not
+	      (tramp-get-method-parameter
+	       (tramp-file-name-method item) 'tramp-login-program))
+	     (tramp-get-method-parameter
+	      (tramp-file-name-method item) 'tramp-copy-program))
+	  (tramp-error
+	   vec 'file-error
+	   "Method `%s' is not supported for multi-hops."
+	   (tramp-file-name-method item)))))
+
+    ;; In case the host name is not used for the remote shell
+    ;; command, the user could be misguided by applying a random
+    ;; hostname.
+    (let* ((v (car target-alist))
+	   (method (tramp-file-name-method v))
+	   (host (tramp-file-name-host v)))
+      (unless
+	  (or
+	   ;; There are multi-hops.
+	   (cdr target-alist)
+	   ;; The host name is used for the remote shell command.
+	   (member
+	    '("%h") (tramp-get-method-parameter method 'tramp-login-args))
+	   ;; The host is local.  We cannot use `tramp-local-host-p'
+	   ;; here, because it opens a connection as well.
+	   (string-match tramp-local-host-regexp host))
+	(tramp-error
+	 v 'file-error
+	 "Host `%s' looks like a remote host, `%s' can only use the local host"
+	 host method)))
+
+    ;; Result.
+    target-alist))
+
+(defun tramp-maybe-open-connection (vec)
+  "Maybe open a connection VEC.
+Does not do anything if a connection is already open, but re-opens the
+connection if a previous connection has died for some reason."
+  (catch 'uname-changed
+    (let ((p (tramp-get-connection-process vec))
+	  (process-name (tramp-get-connection-property vec "process-name" nil))
+	  (process-environment (copy-sequence process-environment)))
+
+      ;; If too much time has passed since last command was sent, look
+      ;; whether process is still alive.  If it isn't, kill it.  When
+      ;; using ssh, it can sometimes happen that the remote end has
+      ;; hung up but the local ssh client doesn't recognize this until
+      ;; it tries to send some data to the remote end.  So that's why
+      ;; we try to send a command from time to time, then look again
+      ;; whether the process is really alive.
+      (condition-case nil
+	  (when (and (> (tramp-time-diff
+			 (current-time)
+			 (tramp-get-connection-property
+			  p "last-cmd-time" '(0 0 0)))
+			60)
+		     p (processp p) (memq (process-status p) '(run open)))
+	    (tramp-send-command vec "echo are you awake" t t)
+	    (unless (and (memq (process-status p) '(run open))
+			 (tramp-wait-for-output p 10))
+	      ;; The error will be catched locally.
+	      (tramp-error vec 'file-error "Awake did fail")))
+	(file-error
+	 (tramp-flush-connection-property vec)
+	 (tramp-flush-connection-property p)
+	 (delete-process p)
+	 (setq p nil)))
+
+      ;; New connection must be opened.
+      (unless (and p (processp p) (memq (process-status p) '(run open)))
+
+	;; We call `tramp-get-buffer' in order to get a debug buffer for
+	;; messages from the beginning.
+	(tramp-get-buffer vec)
+	(with-progress-reporter
+	    vec 3
+	    (if (zerop (length (tramp-file-name-user vec)))
+		(format "Opening connection for %s using %s"
+			(tramp-file-name-host vec)
+			(tramp-file-name-method vec))
+	      (format "Opening connection for %s@%s using %s"
+		      (tramp-file-name-user vec)
+		      (tramp-file-name-host vec)
+		      (tramp-file-name-method vec)))
+
+	  ;; Start new process.
+	  (when (and p (processp p))
+	    (delete-process p))
+	  (setenv "TERM" tramp-terminal-type)
+	  (setenv "LC_ALL" "C")
+	  (setenv "PROMPT_COMMAND")
+	  (setenv "PS1" tramp-initial-end-of-output)
+	  (let* ((target-alist (tramp-compute-multi-hops vec))
+		 (process-connection-type tramp-process-connection-type)
+		 (process-adaptive-read-buffering nil)
+		 (coding-system-for-read nil)
+		 ;; This must be done in order to avoid our file name handler.
+		 (p (let ((default-directory
+			    (tramp-compat-temporary-file-directory)))
+		      (start-process
+		       (or process-name (tramp-buffer-name vec))
+		       (tramp-get-connection-buffer vec)
+		       tramp-encoding-shell))))
+
+	    (tramp-message
+	     vec 6 "%s" (mapconcat 'identity (process-command p) " "))
+
+	    ;; Check whether process is alive.
+	    (tramp-set-process-query-on-exit-flag p nil)
+	    (tramp-barf-if-no-shell-prompt
+	     p 60 "Couldn't find local shell prompt %s" tramp-encoding-shell)
+
+	    ;; Now do all the connections as specified.
+	    (while target-alist
+	      (let* ((hop (car target-alist))
+		     (l-method (tramp-file-name-method hop))
+		     (l-user (tramp-file-name-user hop))
+		     (l-host (tramp-file-name-host hop))
+		     (l-port nil)
+		     (login-program
+		      (tramp-get-method-parameter
+		       l-method 'tramp-login-program))
+		     (login-args
+		      (tramp-get-method-parameter l-method 'tramp-login-args))
+		     (async-args
+		      (tramp-get-method-parameter l-method 'tramp-async-args))
+		     (gw-args
+		      (tramp-get-method-parameter l-method 'tramp-gw-args))
+		     (gw (tramp-get-file-property hop "" "gateway" nil))
+		     (g-method (and gw (tramp-file-name-method gw)))
+		     (g-user (and gw (tramp-file-name-user gw)))
+		     (g-host (and gw (tramp-file-name-host gw)))
+		     (command login-program)
+		     ;; We don't create the temporary file.  In fact,
+		     ;; it is just a prefix for the ControlPath option
+		     ;; of ssh; the real temporary file has another
+		     ;; name, and it is created and protected by ssh.
+		     ;; It is also removed by ssh, when the connection
+		     ;; is closed.
+		     (tmpfile
+		      (tramp-set-connection-property
+		       p "temp-file"
+		       (make-temp-name
+			(expand-file-name
+			 tramp-temp-name-prefix
+			 (tramp-compat-temporary-file-directory)))))
+		     spec)
+
+		;; Add arguments for asynchrononous processes.
+		(when (and process-name async-args)
+		  (setq login-args (append async-args login-args)))
+
+		;; Add gateway arguments if necessary.
+		(when (and gw gw-args)
+		  (setq login-args (append gw-args login-args)))
+
+		;; Check for port number.  Until now, there's no need
+		;; for handling like method, user, host.
+		(when (string-match tramp-host-with-port-regexp l-host)
+		(setq l-port (match-string 2 l-host)
+		      l-host (match-string 1 l-host)))
+
+		;; Set variables for computing the prompt for reading
+		;; password.  They can also be derived from a gateway.
+		(setq tramp-current-method (or g-method l-method)
+		      tramp-current-user   (or g-user   l-user)
+		      tramp-current-host   (or g-host   l-host))
+
+		;; Replace login-args place holders.
+		(setq
+		 l-host (or l-host "")
+		 l-user (or l-user "")
+		 l-port (or l-port "")
+		 spec (format-spec-make
+		       ?h l-host ?u l-user ?p l-port ?t tmpfile)
+		 command
+		 (concat
+		  ;; We do not want to see the trailing local prompt in
+		  ;; `start-file-process'.
+		  (unless (memq system-type '(windows-nt)) "exec ")
+		  command " "
+		  (mapconcat
+		   (lambda (x)
+		     (setq x (mapcar (lambda (y) (format-spec y spec)) x))
+		     (unless (member "" x) (mapconcat 'identity x " ")))
+		   login-args " ")
+		  ;; Local shell could be a Windows COMSPEC.  It
+		  ;; doesn't know the ";" syntax, but we must exit
+		  ;; always for `start-file-process'.  "exec" does not
+		  ;; work either.
+		  (if (memq system-type '(windows-nt)) " && exit || exit")))
+
+		;; Send the command.
+		(tramp-message vec 3 "Sending command `%s'" command)
+		(tramp-send-command vec command t t)
+		(tramp-process-actions p vec tramp-actions-before-shell 60)
+		(tramp-message
+		 vec 3 "Found remote shell prompt on `%s'" l-host))
+	      ;; Next hop.
+	      (setq target-alist (cdr target-alist)))
+
+	    ;; Make initial shell settings.
+	    (tramp-open-connection-setup-interactive-shell p vec)))))))
+
+(defun tramp-send-command (vec command &optional neveropen nooutput)
+  "Send the COMMAND to connection VEC.
+Erases temporary buffer before sending the command.  If optional
+arg NEVEROPEN is non-nil, never try to open the connection.  This
+is meant to be used from `tramp-maybe-open-connection' only.  The
+function waits for output unless NOOUTPUT is set."
+  (unless neveropen (tramp-maybe-open-connection vec))
+  (let ((p (tramp-get-connection-process vec)))
+    (when (tramp-get-connection-property p "remote-echo" nil)
+      ;; We mark the command string that it can be erased in the output buffer.
+      (tramp-set-connection-property p "check-remote-echo" t)
+      (setq command (format "%s%s%s" tramp-echo-mark command tramp-echo-mark)))
+    (tramp-message vec 6 "%s" command)
+    (tramp-send-string vec command)
+    (unless nooutput (tramp-wait-for-output p))))
+
+(defun tramp-wait-for-output (proc &optional timeout)
+  "Wait for output from remote command."
+  (unless (buffer-live-p (process-buffer proc))
+    (delete-process proc)
+    (tramp-error proc 'file-error "Process `%s' not available, try again" proc))
+  (with-current-buffer (process-buffer proc)
+    (let* (;; Initially, `tramp-end-of-output' is "#$ ".  There might
+	   ;; be leading escape sequences, which must be ignored.
+	   (regexp (format "[^#$\n]*%s\r?$" (regexp-quote tramp-end-of-output)))
+	   ;; Sometimes, the commands do not return a newline but a
+	   ;; null byte before the shell prompt, for example "git
+	   ;; ls-files -c -z ...".
+	   (regexp1 (format "\\(^\\|\000\\)%s" regexp))
+	   (found (tramp-wait-for-regexp proc timeout regexp1)))
+      (if found
+	  (let (buffer-read-only)
+	    ;; A simple-minded busybox has sent " ^H" sequences.
+	    ;; Delete them.
+	    (goto-char (point-min))
+	    (when (re-search-forward
+		   "^\\(.\b\\)+$" (tramp-compat-line-end-position) t)
+	      (forward-line 1)
+	      (delete-region (point-min) (point)))
+	    ;; Delete the prompt.
+	    (goto-char (point-max))
+	    (re-search-backward regexp nil t)
+	    (delete-region (point) (point-max)))
+	(if timeout
+	    (tramp-error
+	     proc 'file-error
+	     "[[Remote prompt `%s' not found in %d secs]]"
+	     tramp-end-of-output timeout)
+	  (tramp-error
+	   proc 'file-error
+	   "[[Remote prompt `%s' not found]]" tramp-end-of-output)))
+      ;; Return value is whether end-of-output sentinel was found.
+      found)))
+
+(defun tramp-send-command-and-check
+  (vec command &optional subshell dont-suppress-err)
+  "Run COMMAND and check its exit status.
+Sends `echo $?' along with the COMMAND for checking the exit status.  If
+COMMAND is nil, just sends `echo $?'.  Returns the exit status found.
+
+If the optional argument SUBSHELL is non-nil, the command is
+executed in a subshell, ie surrounded by parentheses.  If
+DONT-SUPPRESS-ERR is non-nil, stderr won't be sent to /dev/null."
+  (tramp-send-command
+   vec
+   (concat (if subshell "( " "")
+	   command
+	   (if command (if dont-suppress-err "; " " 2>/dev/null; ") "")
+	   "echo tramp_exit_status $?"
+	   (if subshell " )" "")))
+  (with-current-buffer (tramp-get-connection-buffer vec)
+    (goto-char (point-max))
+    (unless (re-search-backward "tramp_exit_status [0-9]+" nil t)
+      (tramp-error
+       vec 'file-error "Couldn't find exit status of `%s'" command))
+    (skip-chars-forward "^ ")
+    (prog1
+	(zerop (read (current-buffer)))
+      (let (buffer-read-only)
+	(delete-region (match-beginning 0) (point-max))))))
+
+(defun tramp-barf-unless-okay (vec command fmt &rest args)
+  "Run COMMAND, check exit status, throw error if exit status not okay.
+Similar to `tramp-send-command-and-check' but accepts two more arguments
+FMT and ARGS which are passed to `error'."
+  (unless (tramp-send-command-and-check vec command)
+    (apply 'tramp-error vec 'file-error fmt args)))
+
+(defun tramp-send-command-and-read (vec command)
+  "Run COMMAND and return the output, which must be a Lisp expression.
+In case there is no valid Lisp expression, it raises an error"
+  (tramp-barf-unless-okay vec command "`%s' returns with error" command)
+  (with-current-buffer (tramp-get-connection-buffer vec)
+    ;; Read the expression.
+    (goto-char (point-min))
+    (condition-case nil
+	(prog1 (read (current-buffer))
+	  ;; Error handling.
+	  (when (re-search-forward "\\S-" (tramp-compat-line-end-position) t)
+	    (error nil)))
+      (error (tramp-error
+	      vec 'file-error
+	      "`%s' does not return a valid Lisp expression: `%s'"
+	      command (buffer-string))))))
+
+(defun tramp-mode-string-to-int (mode-string)
+  "Converts a ten-letter `drwxrwxrwx'-style mode string into mode bits."
+  (let* (case-fold-search
+	 (mode-chars (string-to-vector mode-string))
+         (owner-read (aref mode-chars 1))
+         (owner-write (aref mode-chars 2))
+         (owner-execute-or-setid (aref mode-chars 3))
+         (group-read (aref mode-chars 4))
+         (group-write (aref mode-chars 5))
+         (group-execute-or-setid (aref mode-chars 6))
+         (other-read (aref mode-chars 7))
+         (other-write (aref mode-chars 8))
+         (other-execute-or-sticky (aref mode-chars 9)))
+    (save-match-data
+      (logior
+       (cond
+	((char-equal owner-read ?r) (tramp-compat-octal-to-decimal "00400"))
+	((char-equal owner-read ?-) 0)
+	(t (error "Second char `%c' must be one of `r-'" owner-read)))
+       (cond
+	((char-equal owner-write ?w) (tramp-compat-octal-to-decimal "00200"))
+	((char-equal owner-write ?-) 0)
+	(t (error "Third char `%c' must be one of `w-'" owner-write)))
+       (cond
+	((char-equal owner-execute-or-setid ?x)
+	 (tramp-compat-octal-to-decimal "00100"))
+	((char-equal owner-execute-or-setid ?S)
+	 (tramp-compat-octal-to-decimal "04000"))
+	((char-equal owner-execute-or-setid ?s)
+	 (tramp-compat-octal-to-decimal "04100"))
+	((char-equal owner-execute-or-setid ?-) 0)
+	(t (error "Fourth char `%c' must be one of `xsS-'"
+		  owner-execute-or-setid)))
+       (cond
+	((char-equal group-read ?r) (tramp-compat-octal-to-decimal "00040"))
+	((char-equal group-read ?-) 0)
+	(t (error "Fifth char `%c' must be one of `r-'" group-read)))
+       (cond
+	((char-equal group-write ?w) (tramp-compat-octal-to-decimal "00020"))
+	((char-equal group-write ?-) 0)
+	(t (error "Sixth char `%c' must be one of `w-'" group-write)))
+       (cond
+	((char-equal group-execute-or-setid ?x)
+	 (tramp-compat-octal-to-decimal "00010"))
+	((char-equal group-execute-or-setid ?S)
+	 (tramp-compat-octal-to-decimal "02000"))
+	((char-equal group-execute-or-setid ?s)
+	 (tramp-compat-octal-to-decimal "02010"))
+	((char-equal group-execute-or-setid ?-) 0)
+	(t (error "Seventh char `%c' must be one of `xsS-'"
+		  group-execute-or-setid)))
+       (cond
+	((char-equal other-read ?r)
+	 (tramp-compat-octal-to-decimal "00004"))
+	((char-equal other-read ?-) 0)
+	(t (error "Eighth char `%c' must be one of `r-'" other-read)))
+       (cond
+         ((char-equal other-write ?w) (tramp-compat-octal-to-decimal "00002"))
+	 ((char-equal other-write ?-) 0)
+         (t (error "Nineth char `%c' must be one of `w-'" other-write)))
+       (cond
+	((char-equal other-execute-or-sticky ?x)
+	 (tramp-compat-octal-to-decimal "00001"))
+	((char-equal other-execute-or-sticky ?T)
+	 (tramp-compat-octal-to-decimal "01000"))
+	((char-equal other-execute-or-sticky ?t)
+	 (tramp-compat-octal-to-decimal "01001"))
+	((char-equal other-execute-or-sticky ?-) 0)
+	(t (error "Tenth char `%c' must be one of `xtT-'"
+		  other-execute-or-sticky)))))))
+
+(defun tramp-convert-file-attributes (vec attr)
+  "Convert file-attributes ATTR generated by perl script, stat or ls.
+Convert file mode bits to string and set virtual device number.
+Return ATTR."
+  (when attr
+    ;; Convert last access time.
+    (unless (listp (nth 4 attr))
+      (setcar (nthcdr 4 attr)
+              (list (floor (nth 4 attr) 65536)
+                    (floor (mod (nth 4 attr) 65536)))))
+    ;; Convert last modification time.
+    (unless (listp (nth 5 attr))
+      (setcar (nthcdr 5 attr)
+              (list (floor (nth 5 attr) 65536)
+                    (floor (mod (nth 5 attr) 65536)))))
+    ;; Convert last status change time.
+    (unless (listp (nth 6 attr))
+      (setcar (nthcdr 6 attr)
+              (list (floor (nth 6 attr) 65536)
+                    (floor (mod (nth 6 attr) 65536)))))
+    ;; Convert file size.
+    (when (< (nth 7 attr) 0)
+      (setcar (nthcdr 7 attr) -1))
+    (when (and (floatp (nth 7 attr))
+               (<= (nth 7 attr) (tramp-compat-most-positive-fixnum)))
+      (setcar (nthcdr 7 attr) (round (nth 7 attr))))
+    ;; Convert file mode bits to string.
+    (unless (stringp (nth 8 attr))
+      (setcar (nthcdr 8 attr) (tramp-file-mode-from-int (nth 8 attr)))
+      (when (stringp (car attr))
+        (aset (nth 8 attr) 0 ?l)))
+    ;; Convert directory indication bit.
+    (when (string-match "^d" (nth 8 attr))
+      (setcar attr t))
+    ;; Convert symlink from `tramp-do-file-attributes-with-stat'.
+    (when (consp (car attr))
+      (if (and (stringp (caar attr))
+               (string-match ".+ -> .\\(.+\\)." (caar attr)))
+          (setcar attr (match-string 1 (caar attr)))
+        (setcar attr nil)))
+    ;; Set file's gid change bit.
+    (setcar (nthcdr 9 attr)
+            (if (numberp (nth 3 attr))
+                (not (= (nth 3 attr)
+                        (tramp-get-remote-gid vec 'integer)))
+              (not (string-equal
+                    (nth 3 attr)
+                    (tramp-get-remote-gid vec 'string)))))
+    ;; Convert inode.
+    (unless (listp (nth 10 attr))
+      (setcar (nthcdr 10 attr)
+              (condition-case nil
+                  (cons (floor (nth 10 attr) 65536)
+                        (floor (mod (nth 10 attr) 65536)))
+                ;; Inodes can be incredible huge.  We must hide this.
+                (error (tramp-get-inode vec)))))
+    ;; Set virtual device number.
+    (setcar (nthcdr 11 attr)
+            (tramp-get-device vec))
+    attr))
+
+(defun tramp-check-cached-permissions (vec access)
+  "Check `file-attributes' caches for VEC.
+Return t if according to the cache access type ACCESS is known to
+be granted."
+  (let ((result nil)
+        (offset (cond
+                 ((eq ?r access) 1)
+                 ((eq ?w access) 2)
+                 ((eq ?x access) 3))))
+    (dolist (suffix '("string" "integer") result)
+      (setq
+       result
+       (or
+        result
+        (let ((file-attr
+               (tramp-get-file-property
+                vec (tramp-file-name-localname vec)
+                (concat "file-attributes-" suffix) nil))
+              (remote-uid
+               (tramp-get-connection-property
+                vec (concat "uid-" suffix) nil))
+              (remote-gid
+               (tramp-get-connection-property
+                vec (concat "gid-" suffix) nil)))
+          (and
+           file-attr
+           (or
+            ;; Not a symlink
+            (eq t (car file-attr))
+            (null (car file-attr)))
+           (or
+            ;; World accessible.
+            (eq access (aref (nth 8 file-attr) (+ offset 6)))
+            ;; User accessible and owned by user.
+            (and
+             (eq access (aref (nth 8 file-attr) offset))
+             (equal remote-uid (nth 2 file-attr)))
+            ;; Group accessible and owned by user's
+            ;; principal group.
+            (and
+             (eq access (aref (nth 8 file-attr) (+ offset 3)))
+             (equal remote-gid (nth 3 file-attr)))))))))))
+
+(defun tramp-file-mode-from-int (mode)
+  "Turn an integer representing a file mode into an ls(1)-like string."
+  (let ((type	(cdr
+		 (assoc (logand (lsh mode -12) 15) tramp-file-mode-type-map)))
+	(user	(logand (lsh mode -6) 7))
+	(group	(logand (lsh mode -3) 7))
+	(other	(logand (lsh mode -0) 7))
+	(suid	(> (logand (lsh mode -9) 4) 0))
+	(sgid	(> (logand (lsh mode -9) 2) 0))
+	(sticky	(> (logand (lsh mode -9) 1) 0)))
+    (setq user  (tramp-file-mode-permissions user  suid "s"))
+    (setq group (tramp-file-mode-permissions group sgid "s"))
+    (setq other (tramp-file-mode-permissions other sticky "t"))
+    (concat type user group other)))
+
+(defun tramp-file-mode-permissions (perm suid suid-text)
+  "Convert a permission bitset into a string.
+This is used internally by `tramp-file-mode-from-int'."
+  (let ((r (> (logand perm 4) 0))
+	(w (> (logand perm 2) 0))
+	(x (> (logand perm 1) 0)))
+    (concat (or (and r "r") "-")
+	    (or (and w "w") "-")
+	    (or (and suid x suid-text)	; suid, execute
+		(and suid (upcase suid-text)) ; suid, !execute
+		(and x "x") "-"))))	; !suid
+
+(defun tramp-shell-case-fold (string)
+  "Converts STRING to shell glob pattern which ignores case."
+  (mapconcat
+   (lambda (c)
+     (if (equal (downcase c) (upcase c))
+         (vector c)
+       (format "[%c%c]" (downcase c) (upcase c))))
+   string
+   ""))
+
+(defun tramp-make-copy-program-file-name (vec)
+  "Create a file name suitable to be passed to `rcp' and workalikes."
+  (let ((user (tramp-file-name-user vec))
+	(host (tramp-file-name-real-host vec))
+	(localname (tramp-shell-quote-argument
+		    (tramp-file-name-localname vec))))
+    (if (not (zerop (length user)))
+        (format "%s@%s:%s" user host localname)
+      (format "%s:%s" host localname))))
+
+(defun tramp-method-out-of-band-p (vec size)
+  "Return t if this is an out-of-band method, nil otherwise."
+  (and
+   ;; It shall be an out-of-band method.
+   (tramp-get-method-parameter (tramp-file-name-method vec) 'tramp-copy-program)
+   ;; Either the file size is large enough, or (in rare cases) there
+   ;; does not exist a remote encoding.
+   (or (null tramp-copy-size-limit)
+       (> size tramp-copy-size-limit)
+       (null (tramp-get-inline-coding vec "remote-encoding" size)))))
+
+(defun tramp-local-host-p (vec)
+  "Return t if this points to the local host, nil otherwise."
+  ;; We cannot use `tramp-file-name-real-host'.  A port is an
+  ;; indication for an ssh tunnel or alike.
+  (let ((host (tramp-file-name-host vec)))
+    (and
+     (stringp host)
+     (string-match tramp-local-host-regexp host)
+     ;; The method shall be applied to one of the shell file name
+     ;; handler.  `tramp-local-host-p' is also called for "smb" and
+     ;; alike, where it must fail.
+     (tramp-get-method-parameter
+      (tramp-file-name-method vec) 'tramp-login-program)
+     ;; The local temp directory must be writable for the other user.
+     (file-writable-p
+      (tramp-make-tramp-file-name
+       (tramp-file-name-method vec)
+       (tramp-file-name-user vec)
+       host
+       (tramp-compat-temporary-file-directory)))
+     ;; On some systems, chown runs only for root.
+     (or (zerop (user-uid))
+	 (zerop (tramp-get-remote-uid vec 'integer))))))
+
+;; Variables local to connection.
+
+(defun tramp-get-remote-path (vec)
+  (with-connection-property
+      ;; When `tramp-own-remote-path' is in `tramp-remote-path', we
+      ;; cache the result for the session only.  Otherwise, the result
+      ;; is cached persistently.
+      (if (memq 'tramp-own-remote-path tramp-remote-path)
+	  (tramp-get-connection-process vec)
+	vec)
+      "remote-path"
+    (let* ((remote-path (copy-tree tramp-remote-path))
+	   (elt1 (memq 'tramp-default-remote-path remote-path))
+	   (elt2 (memq 'tramp-own-remote-path remote-path))
+	   (default-remote-path
+	     (when elt1
+	       (condition-case nil
+		   (tramp-send-command-and-read
+		    vec "echo \\\"`getconf PATH`\\\"")
+		 ;; Default if "getconf" is not available.
+		 (error
+		  (tramp-message
+		   vec 3
+		   "`getconf PATH' not successful, using default value \"%s\"."
+		   "/bin:/usr/bin")
+		  "/bin:/usr/bin"))))
+	   (own-remote-path
+	     (when elt2
+	       (condition-case nil
+		   (tramp-send-command-and-read vec "echo \\\"$PATH\\\"")
+		 ;; Default if "getconf" is not available.
+		 (error
+		  (tramp-message
+		   vec 3 "$PATH not set, ignoring `tramp-own-remote-path'.")
+		  nil)))))
+
+      ;; Replace place holder `tramp-default-remote-path'.
+      (when elt1
+	(setcdr elt1
+		(append
+ 		 (tramp-compat-split-string default-remote-path ":")
+		 (cdr elt1)))
+	(setq remote-path (delq 'tramp-default-remote-path remote-path)))
+
+      ;; Replace place holder `tramp-own-remote-path'.
+      (when elt2
+	(setcdr elt2
+		(append
+ 		 (tramp-compat-split-string own-remote-path ":")
+		 (cdr elt2)))
+	(setq remote-path (delq 'tramp-own-remote-path remote-path)))
+
+      ;; Remove double entries.
+      (setq elt1 remote-path)
+      (while (consp elt1)
+	(while (and (car elt1) (setq elt2 (member (car elt1) (cdr elt1))))
+	  (setcar elt2 nil))
+	(setq elt1 (cdr elt1)))
+
+      ;; Remove non-existing directories.
+      (delq
+       nil
+       (mapcar
+	(lambda (x)
+	  (and
+	   (stringp x)
+	   (file-directory-p
+	    (tramp-make-tramp-file-name
+	     (tramp-file-name-method vec)
+	     (tramp-file-name-user vec)
+	     (tramp-file-name-host vec)
+	     x))
+	   x))
+	remote-path)))))
+
+(defun tramp-get-remote-tmpdir (vec)
+  (with-connection-property vec "tmp-directory"
+    (let ((dir (tramp-shell-quote-argument "/tmp")))
+      (if (and (tramp-send-command-and-check
+		vec (format "%s -d %s" (tramp-get-test-command vec) dir))
+	       (tramp-send-command-and-check
+		vec (format "%s -w %s" (tramp-get-test-command vec) dir)))
+	  dir
+	(tramp-error vec 'file-error "Directory %s not accessible" dir)))))
+
+(defun tramp-make-tramp-temp-file (vec)
+  "Create a temporary file on the remote host identified by VEC.
+Return the local name of the temporary file."
+  (let ((prefix
+	 (tramp-make-tramp-file-name
+	  (tramp-file-name-method vec)
+	  (tramp-file-name-user vec)
+	  (tramp-file-name-host vec)
+	  (tramp-drop-volume-letter
+	   (expand-file-name
+	    tramp-temp-name-prefix (tramp-get-remote-tmpdir vec)))))
+	result)
+    (while (not result)
+      ;; `make-temp-file' would be the natural choice for
+      ;; implementation.  But it calls `write-region' internally,
+      ;; which also needs a temporary file - we would end in an
+      ;; infinite loop.
+      (setq result (make-temp-name prefix))
+      (if (file-exists-p result)
+	  (setq result nil)
+	;; This creates the file by side effect.
+	(set-file-times result)
+	(set-file-modes result (tramp-compat-octal-to-decimal "0700"))))
+
+    ;; Return the local part.
+    (with-parsed-tramp-file-name result nil localname)))
+
+(defun tramp-get-ls-command (vec)
+  (with-connection-property vec "ls"
+    (tramp-message vec 5 "Finding a suitable `ls' command")
+    (or
+     (catch 'ls-found
+       (dolist (cmd '("ls" "gnuls" "gls"))
+	 (let ((dl (tramp-get-remote-path vec))
+	       result)
+	   (while (and dl (setq result (tramp-find-executable vec cmd dl t t)))
+	     ;; Check parameters.  On busybox, "ls" output coloring is
+	     ;; enabled by default sometimes.  So we try to disable it
+	     ;; when possible.  $LS_COLORING is not supported there.
+	     ;; Some "ls" versions are sensible wrt the order of
+	     ;; arguments, they fail when "-al" is after the
+	     ;; "--color=never" argument (for example on FreeBSD).
+	     (when (tramp-send-command-and-check
+		    vec (format "%s -lnd /" result))
+	       (when (tramp-send-command-and-check
+		      vec (format
+			   "%s --color=never -al /dev/null" result))
+		 (setq result (concat result " --color=never")))
+	       (throw 'ls-found result))
+	     (setq dl (cdr dl))))))
+     (tramp-error vec 'file-error "Couldn't find a proper `ls' command"))))
+
+(defun tramp-get-ls-command-with-dired (vec)
+  (save-match-data
+    (with-connection-property vec "ls-dired"
+      (tramp-message vec 5 "Checking, whether `ls --dired' works")
+      ;; Some "ls" versions are sensible wrt the order of arguments,
+      ;; they fail when "-al" is after the "--dired" argument (for
+      ;; example on FreeBSD).
+      (tramp-send-command-and-check
+       vec (format "%s --dired -al /dev/null" (tramp-get-ls-command vec))))))
+
+(defun tramp-get-test-command (vec)
+  (with-connection-property vec "test"
+    (tramp-message vec 5 "Finding a suitable `test' command")
+    (if (tramp-send-command-and-check vec "test 0")
+	"test"
+      (tramp-find-executable vec "test" (tramp-get-remote-path vec)))))
+
+(defun tramp-get-test-nt-command (vec)
+  ;; Does `test A -nt B' work?  Use abominable `find' construct if it
+  ;; doesn't.  BSD/OS 4.0 wants the parentheses around the command,
+  ;; for otherwise the shell crashes.
+  (with-connection-property vec "test-nt"
+    (or
+     (progn
+       (tramp-send-command
+	vec (format "( %s / -nt / )" (tramp-get-test-command vec)))
+       (with-current-buffer (tramp-get-buffer vec)
+	 (goto-char (point-min))
+	 (when (looking-at (regexp-quote tramp-end-of-output))
+	   (format "%s %%s -nt %%s" (tramp-get-test-command vec)))))
+     (progn
+       (tramp-send-command
+	vec
+	(format
+	 "tramp_test_nt () {\n%s -n \"`find $1 -prune -newer $2 -print`\"\n}"
+	 (tramp-get-test-command vec)))
+       "tramp_test_nt %s %s"))))
+
+(defun tramp-get-file-exists-command (vec)
+  (with-connection-property vec "file-exists"
+    (tramp-message vec 5 "Finding command to check if file exists")
+    (tramp-find-file-exists-command vec)))
+
+(defun tramp-get-remote-ln (vec)
+  (with-connection-property vec "ln"
+    (tramp-message vec 5 "Finding a suitable `ln' command")
+    (tramp-find-executable vec "ln" (tramp-get-remote-path vec))))
+
+(defun tramp-get-remote-perl (vec)
+  (with-connection-property vec "perl"
+    (tramp-message vec 5 "Finding a suitable `perl' command")
+    (let ((result
+	   (or (tramp-find-executable vec "perl5" (tramp-get-remote-path vec))
+	       (tramp-find-executable
+		vec "perl" (tramp-get-remote-path vec)))))
+      ;; We must check also for some Perl modules.
+      (when result
+	(with-connection-property vec "perl-file-spec"
+	   (tramp-send-command-and-check
+	    vec (format "%s -e 'use File::Spec;'" result)))
+	(with-connection-property vec "perl-cwd-realpath"
+	   (tramp-send-command-and-check
+	    vec (format "%s -e 'use Cwd \"realpath\";'" result))))
+      result)))
+
+(defun tramp-get-remote-stat (vec)
+  (with-connection-property vec "stat"
+    (tramp-message vec 5 "Finding a suitable `stat' command")
+    (let ((result (tramp-find-executable
+		   vec "stat" (tramp-get-remote-path vec)))
+	  tmp)
+      ;; Check whether stat(1) returns usable syntax.  %s does not
+      ;; work on older AIX systems.
+      (when result
+	(setq tmp
+	      ;; We don't want to display an error message.
+	      (with-temp-message (or (current-message) "")
+		(ignore-errors
+		  (tramp-send-command-and-read
+		   vec (format "%s -c '(\"%%N\" %%s)' /" result)))))
+	(unless (and (listp tmp) (stringp (car tmp))
+		     (string-match "^./.$" (car tmp))
+		     (integerp (cadr tmp)))
+	  (setq result nil)))
+      result)))
+
+(defun tramp-get-remote-readlink (vec)
+  (with-connection-property vec "readlink"
+    (tramp-message vec 5 "Finding a suitable `readlink' command")
+    (let ((result (tramp-find-executable
+		   vec "readlink" (tramp-get-remote-path vec))))
+      (when (and result
+		 ;; We don't want to display an error message.
+		 (with-temp-message (or (current-message) "")
+		   (ignore-errors
+		     (tramp-send-command-and-check
+		      vec (format "%s --canonicalize-missing /" result)))))
+	result))))
+
+(defun tramp-get-remote-trash (vec)
+  (with-connection-property vec "trash"
+    (tramp-message vec 5 "Finding a suitable `trash' command")
+    (tramp-find-executable vec "trash" (tramp-get-remote-path vec))))
+
+(defun tramp-get-remote-id (vec)
+  (with-connection-property vec "id"
+    (tramp-message vec 5 "Finding POSIX `id' command")
+    (or
+     (catch 'id-found
+       (let ((dl (tramp-get-remote-path vec))
+	     result)
+	 (while (and dl (setq result (tramp-find-executable vec "id" dl t t)))
+	   ;; Check POSIX parameter.
+	   (when (tramp-send-command-and-check vec (format "%s -u" result))
+	     (throw 'id-found result))
+	   (setq dl (cdr dl)))))
+     (tramp-error vec 'file-error "Couldn't find a POSIX `id' command"))))
+
+(defun tramp-get-remote-uid (vec id-format)
+  (with-connection-property vec (format "uid-%s" id-format)
+    (let ((res (tramp-send-command-and-read
+		vec
+		(format "%s -u%s %s"
+			(tramp-get-remote-id vec)
+			(if (equal id-format 'integer) "" "n")
+			(if (equal id-format 'integer)
+			    "" "| sed -e s/^/\\\"/ -e s/\$/\\\"/")))))
+      ;; The command might not always return a number.
+      (if (and (equal id-format 'integer) (not (integerp res))) -1 res))))
+
+(defun tramp-get-remote-gid (vec id-format)
+  (with-connection-property vec (format "gid-%s" id-format)
+    (let ((res (tramp-send-command-and-read
+		vec
+		(format "%s -g%s %s"
+			(tramp-get-remote-id vec)
+			(if (equal id-format 'integer) "" "n")
+			(if (equal id-format 'integer)
+			    "" "| sed -e s/^/\\\"/ -e s/\$/\\\"/")))))
+      ;; The command might not always return a number.
+      (if (and (equal id-format 'integer) (not (integerp res))) -1 res))))
+
+(defun tramp-get-local-uid (id-format)
+  (if (equal id-format 'integer) (user-uid) (user-login-name)))
+
+(defun tramp-get-local-gid (id-format)
+  (nth 3 (tramp-compat-file-attributes "~/" id-format)))
+
+;; Some predefined connection properties.
+(defun tramp-get-inline-compress (vec prop size)
+  "Return the compress command related to PROP.
+PROP is either `inline-compress' or `inline-decompress'. SIZE is
+the length of the file to be compressed.
+
+If no corresponding command is found, nil is returned."
+  (when (and (integerp tramp-inline-compress-start-size)
+	     (> size tramp-inline-compress-start-size))
+    (with-connection-property vec prop
+      (tramp-find-inline-compress vec)
+      (tramp-get-connection-property vec prop nil))))
+
+(defun tramp-get-inline-coding (vec prop size)
+  "Return the coding command related to PROP.
+PROP is either `remote-encoding', `remode-decoding',
+`local-encoding' or `local-decoding'.
+
+SIZE is the length of the file to be coded.  Depending on SIZE,
+compression might be applied.
+
+If no corresponding command is found, nil is returned.
+Otherwise, either a string is returned which contains a `%s' mark
+to be used for the respective input or output file; or a Lisp
+function cell is returned to be applied on a buffer."
+  (let ((coding
+	 (with-connection-property vec prop
+	   (tramp-find-inline-encoding vec)
+	   (tramp-get-connection-property vec prop nil)))
+	(prop1 (if (string-match "encoding" prop)
+		   "inline-compress" "inline-decompress"))
+	compress)
+    ;; The connection property might have been cached.  So we must send
+    ;; the script to the remote side - maybe.
+    (when (and coding (symbolp coding) (string-match "remote" prop))
+      (let ((name (symbol-name coding)))
+	(while (string-match (regexp-quote "-") name)
+	  (setq name (replace-match "_" nil t name)))
+	(tramp-maybe-send-script vec (symbol-value coding) name)
+	(setq coding name)))
+    (when coding
+      ;; Check for the `compress' command.
+      (setq compress (tramp-get-inline-compress vec prop1 size))
+      ;; Return the value.
+      (cond
+       ((and compress (symbolp coding))
+	(if (string-match "decompress" prop1)
+	    `(lambda (beg end)
+	       (,coding beg end)
+	       (let ((coding-system-for-write 'binary)
+		     (coding-system-for-read 'binary))
+		 (apply
+		  'call-process-region (point-min) (point-max)
+		  (car (split-string ,compress)) t t nil
+		  (cdr (split-string ,compress)))))
+	  `(lambda (beg end)
+	     (let ((coding-system-for-write 'binary)
+		   (coding-system-for-read 'binary))
+	       (apply
+		'call-process-region beg end
+		(car (split-string ,compress)) t t nil
+		(cdr (split-string ,compress))))
+	     (,coding (point-min) (point-max)))))
+       ((symbolp coding)
+	coding)
+       ((and compress (string-match "decoding" prop))
+	(format "(%s | %s >%%s)" coding compress))
+       (compress
+	(format "(%s <%%s | %s)" compress coding))
+       ((string-match "decoding" prop)
+	(format "%s >%%s" coding))
+       (t
+	(format "%s <%%s" coding))))))
+
+;;; Integration of eshell.el:
+
+(eval-when-compile
+  (defvar eshell-path-env))
+
+;; eshell.el keeps the path in `eshell-path-env'.  We must change it
+;; when `default-directory' points to another host.
+(defun tramp-eshell-directory-change ()
+  "Set `eshell-path-env' to $PATH of the host related to `default-directory'."
+  (setq eshell-path-env
+	(if (file-remote-p default-directory)
+	    (with-parsed-tramp-file-name default-directory nil
+	      (mapconcat
+	       'identity
+	       (tramp-get-remote-path v)
+	       ":"))
+	  (getenv "PATH"))))
+
+(eval-after-load "esh-util"
+  '(progn
+     (tramp-eshell-directory-change)
+     (add-hook 'eshell-directory-change-hook
+	       'tramp-eshell-directory-change)
+     (add-hook 'tramp-unload-hook
+	       (lambda ()
+		 (remove-hook 'eshell-directory-change-hook
+			      'tramp-eshell-directory-change)))))
+
+(add-hook 'tramp-unload-hook
+	  (lambda ()
+	    (unload-feature 'tramp-sh 'force)))
+
+(provide 'tramp-sh)
+
+;;; TODO:
+
+;; * Don't use globbing for directories with many files, as this is
+;;   likely to produce long command lines, and some shells choke on
+;;   long command lines.
+;; * Make it work for different encodings, and for different file name
+;;   encodings, too.  (Daniel Pittman)
+;; * Don't search for perl5 and perl.  Instead, only search for perl and
+;;   then look if it's the right version (with `perl -v').
+;; * When editing a remote CVS controlled file as a different user, VC
+;;   gets confused about the file locking status.  Try to find out why
+;;   the workaround doesn't work.
+;; * Allow out-of-band methods as _last_ multi-hop.  Open a connection
+;;   until the last but one hop via `start-file-process'.  Apply it
+;;   also for ftp and smb.
+;; * WIBNI if we had a command "trampclient"?  If I was editing in
+;;   some shell with root priviledges, it would be nice if I could
+;;   just call
+;;     trampclient filename.c
+;;   as an editor, and the _current_ shell would connect to an Emacs
+;;   server and would be used in an existing non-priviledged Emacs
+;;   session for doing the editing in question.
+;;   That way, I need not tell Emacs my password again and be afraid
+;;   that it makes it into core dumps or other ugly stuff (I had Emacs
+;;   once display a just typed password in the context of a keyboard
+;;   sequence prompt for a question immediately following in a shell
+;;   script run within Emacs -- nasty).
+;;   And if I have some ssh session running to a different computer,
+;;   having the possibility of passing a local file there to a local
+;;   Emacs session (in case I can arrange for a connection back) would
+;;   be nice.
+;;   Likely the corresponding Tramp server should not allow the
+;;   equivalent of the emacsclient -eval option in order to make this
+;;   reasonably unproblematic.  And maybe trampclient should have some
+;;   way of passing credentials, like by using an SSL socket or
+;;   something.  (David Kastrup)
+;; * Reconnect directly to a compliant shell without first going
+;;   through the user's default shell.  (Pete Forman)
+;; * How can I interrupt the remote process with a signal
+;;   (interrupt-process seems not to work)?  (Markus Triska)
+;; * Avoid the local shell entirely for starting remote processes.  If
+;;   so, I think even a signal, when delivered directly to the local
+;;   SSH instance, would correctly be propagated to the remote process
+;;   automatically; possibly SSH would have to be started with
+;;   "-t".  (Markus Triska)
+;; * It makes me wonder if tramp couldn't fall back to ssh when scp
+;;   isn't on the remote host.  (Mark A. Hershberger)
+;; * Use lsh instead of ssh.  (Alfred M. Szmidt)
+;; * Optimize out-of-band copying, when both methods are scp-like (not
+;;   rsync).
+;; * Keep a second connection open for out-of-band methods like scp or
+;;   rsync.
+;; * Try telnet+curl as new method.  It might be useful for busybox,
+;;   without built-in uuencode/uudecode.
+
+;;; tramp-sh.el ends here

=== modified file 'lisp/net/tramp-smb.el'
--- lisp/net/tramp-smb.el	2010-09-08 14:42:54 +0000
+++ lisp/net/tramp-smb.el	2010-09-13 15:17:01 +0000
@@ -31,6 +31,10 @@
 (eval-when-compile (require 'cl))	; block, return
 (require 'tramp)
 
+;; We call several `tramp-handle-*' functions directly.  So we must
+;; reqire that package as well.
+(require 'tramp-sh)
+
 ;; Define SMB method ...
 ;;;###tramp-autoload
 (defconst tramp-smb-method "smb"

=== modified file 'lisp/net/tramp.el'
--- lisp/net/tramp.el	2010-09-13 14:42:33 +0000
+++ lisp/net/tramp.el	2010-09-13 15:17:01 +0000
@@ -3,8 +3,6 @@
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
-;; (copyright statements below in code to be updated with the above notice)
-
 ;; Author: Kai Großjohann <kai.grossjohann@gmx.net>
 ;;         Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes
@@ -60,33 +58,8 @@
 
 ;;; Code:
 
-;; Since Emacs 23.1, loading messages have been disabled during
-;; autoload.  However, loading Tramp takes a while, and it could
-;; happen while typing a filename in the minibuffer.  Therefore, Tramp
-;; shall inform about.
-(when (and load-in-progress (null (current-message)))
-  (message "Loading tramp..."))
-
 (require 'tramp-compat)
 
-(require 'format-spec)
-;; As long as password.el is not part of (X)Emacs, it shouldn't
-;; be mandatory
-(if (featurep 'xemacs)
-    (load "password" 'noerror)
-  (or (require 'password-cache nil 'noerror)
-      (require 'password nil 'noerror))) ; from No Gnus, also in tar ball
-
-(require 'shell)
-(require 'advice)
-
-(eval-and-compile
-  (if (featurep 'xemacs)
-      (load "auth-source" 'noerror)
-    (require 'auth-source nil 'noerror)))
-
-(autoload 'uudecode-decode-region "uudecode")
-
 ;;; User Customizable Internal Variables:
 
 (defgroup tramp nil
@@ -202,382 +175,8 @@
   :group 'tramp
   :type 'string)
 
-(defcustom tramp-inline-compress-start-size 4096
-  "*The minimum size of compressing where inline transfer.
-When inline transfer, compress transfered data of file
-whose size is this value or above (up to `tramp-copy-size-limit').
-If it is nil, no compression at all will be applied."
-  :group 'tramp
-  :type '(choice (const nil) integer))
-
-(defcustom tramp-copy-size-limit 10240
-  "*The maximum file size where inline copying is preferred over an out-of-the-band copy.
-If it is nil, inline out-of-the-band copy will be used without a check."
-  :group 'tramp
-  :type '(choice (const nil) integer))
-
-;;;###tramp-autoload
-(defcustom tramp-terminal-type "dumb"
-  "*Value of TERM environment variable for logging in to remote host.
-Because Tramp wants to parse the output of the remote shell, it is easily
-confused by ANSI color escape sequences and suchlike.  Often, shell init
-files conditionalize this setup based on the TERM environment variable."
-  :group 'tramp
-  :type 'string)
-
-;; ksh on OpenBSD 4.5 requires, that PS1 contains a `#' character for
-;; root users.  It uses the `$' character for other users.  In order
-;; to guarantee a proper prompt, we use "#$" for the prompt.
-
-(defvar tramp-end-of-output
-  (format
-   "///%s#$"
-   (md5 (concat (prin1-to-string process-environment) (current-time-string))))
-  "String used to recognize end of output.
-The '$' character at the end is quoted; the string cannot be
-detected as prompt when being sent on echoing hosts, therefore.")
-
-;;;###tramp-autoload
-(defconst tramp-initial-end-of-output "#$ "
-  "Prompt when establishing a connection.")
-
-;;;###tramp-autoload
-(defvar tramp-methods
-  `(("rcp"   (tramp-login-program        "rsh")
-             (tramp-login-args           (("%h") ("-l" "%u")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         "rcp")
-	     (tramp-copy-args            (("-p" "%k") ("-r")))
-	     (tramp-copy-keep-date       t)
-	     (tramp-copy-recursive       t)
-	     (tramp-password-end-of-line nil))
-    ("scp"   (tramp-login-program        "ssh")
-             (tramp-login-args           (("-l" "%u") ("-p" "%p")
-					  ("-e" "none") ("%h")))
-	     (tramp-async-args           (("-q")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         "scp")
-	     (tramp-copy-args            (("-P" "%p") ("-p" "%k")
-					  ("-q") ("-r")))
-	     (tramp-copy-keep-date       t)
-	     (tramp-copy-recursive       t)
-	     (tramp-password-end-of-line nil)
-	     (tramp-gw-args              (("-o"
-					   "GlobalKnownHostsFile=/dev/null")
-					  ("-o" "UserKnownHostsFile=/dev/null")
-					  ("-o" "StrictHostKeyChecking=no")))
-	     (tramp-default-port         22))
-    ("scp1"  (tramp-login-program        "ssh")
-             (tramp-login-args           (("-l" "%u") ("-p" "%p")
-					  ("-1") ("-e" "none") ("%h")))
-	     (tramp-async-args           (("-q")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         "scp")
-	     (tramp-copy-args            (("-1") ("-P" "%p") ("-p" "%k")
-					  ("-q") ("-r")))
-	     (tramp-copy-keep-date       t)
-	     (tramp-copy-recursive       t)
-	     (tramp-password-end-of-line nil)
-	     (tramp-gw-args              (("-o"
-					   "GlobalKnownHostsFile=/dev/null")
-					  ("-o" "UserKnownHostsFile=/dev/null")
-					  ("-o" "StrictHostKeyChecking=no")))
-	     (tramp-default-port         22))
-    ("scp2"  (tramp-login-program        "ssh")
-             (tramp-login-args           (("-l" "%u") ("-p" "%p")
-					  ("-2") ("-e" "none") ("%h")))
-	     (tramp-async-args           (("-q")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         "scp")
-	     (tramp-copy-args            (("-2") ("-P" "%p") ("-p" "%k")
-					  ("-q") ("-r")))
-	     (tramp-copy-keep-date       t)
-	     (tramp-copy-recursive       t)
-	     (tramp-password-end-of-line nil)
-	     (tramp-gw-args              (("-o"
-					   "GlobalKnownHostsFile=/dev/null")
-					  ("-o" "UserKnownHostsFile=/dev/null")
-					  ("-o" "StrictHostKeyChecking=no")))
-	     (tramp-default-port         22))
-    ("scp1_old"
-             (tramp-login-program        "ssh1")
-	     (tramp-login-args           (("%h") ("-l" "%u") ("-p" "%p")
-					  ("-e" "none")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         "scp1")
-	     (tramp-copy-args            (("-p" "%k") ("-r")))
-	     (tramp-copy-keep-date       t)
-	     (tramp-copy-recursive       t)
-	     (tramp-password-end-of-line nil))
-    ("scp2_old"
-             (tramp-login-program        "ssh2")
-	     (tramp-login-args           (("%h") ("-l" "%u") ("-p" "%p")
-					  ("-e" "none")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         "scp2")
-	     (tramp-copy-args            (("-p" "%k") ("-r")))
-	     (tramp-copy-keep-date       t)
-	     (tramp-copy-recursive       t)
-	     (tramp-password-end-of-line nil))
-    ("sftp"  (tramp-login-program        "ssh")
-             (tramp-login-args           (("-l" "%u") ("-p" "%p")
-					  ("-e" "none") ("%h")))
-	     (tramp-async-args           (("-q")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         "sftp")
-	     (tramp-copy-args            nil)
-	     (tramp-copy-keep-date       nil)
-	     (tramp-password-end-of-line nil))
-    ("rsync" (tramp-login-program        "ssh")
-             (tramp-login-args           (("-l" "%u") ("-p" "%p")
-					  ("-e" "none") ("%h")))
-	     (tramp-async-args           (("-q")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         "rsync")
-	     (tramp-copy-args            (("-e" "ssh") ("-t" "%k") ("-r")))
-	     (tramp-copy-keep-date       t)
-	     (tramp-copy-keep-tmpfile    t)
-	     (tramp-copy-recursive       t)
-	     (tramp-password-end-of-line nil))
-    ("rsyncc"
-             (tramp-login-program        "ssh")
-             (tramp-login-args           (("-l" "%u") ("-p" "%p")
-					  ("-o" "ControlPath=%t.%%r@%%h:%%p")
-					  ("-o" "ControlMaster=yes")
-					  ("-e" "none") ("%h")))
-	     (tramp-async-args           (("-q")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         "rsync")
-	     (tramp-copy-args            (("-t" "%k") ("-r")))
-	     (tramp-copy-env             (("RSYNC_RSH")
-					  (,(concat
-					     "ssh"
-					     " -o ControlPath=%t.%%r@%%h:%%p"
-					     " -o ControlMaster=auto"))))
-	     (tramp-copy-keep-date       t)
-	     (tramp-copy-keep-tmpfile    t)
-	     (tramp-copy-recursive       t)
-	     (tramp-password-end-of-line nil))
-    ("remcp" (tramp-login-program        "remsh")
-             (tramp-login-args           (("%h") ("-l" "%u")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         "rcp")
-	     (tramp-copy-args            (("-p" "%k")))
-	     (tramp-copy-keep-date       t)
-	     (tramp-password-end-of-line nil))
-    ("rsh"   (tramp-login-program        "rsh")
-             (tramp-login-args           (("%h") ("-l" "%u")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         nil)
-	     (tramp-copy-args            nil)
-	     (tramp-copy-keep-date       nil)
-	     (tramp-password-end-of-line nil))
-    ("ssh"   (tramp-login-program        "ssh")
-             (tramp-login-args           (("-l" "%u") ("-p" "%p")
-					  ("-e" "none") ("%h")))
-	     (tramp-async-args           (("-q")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         nil)
-	     (tramp-copy-args            nil)
-	     (tramp-copy-keep-date       nil)
-	     (tramp-password-end-of-line nil)
-	     (tramp-gw-args              (("-o"
-					   "GlobalKnownHostsFile=/dev/null")
-					  ("-o" "UserKnownHostsFile=/dev/null")
-					  ("-o" "StrictHostKeyChecking=no")))
-	     (tramp-default-port         22))
-    ("ssh1"  (tramp-login-program        "ssh")
-             (tramp-login-args           (("-l" "%u") ("-p" "%p")
-					  ("-1") ("-e" "none") ("%h")))
-	     (tramp-async-args           (("-q")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         nil)
-	     (tramp-copy-args            nil)
-	     (tramp-copy-keep-date       nil)
-	     (tramp-password-end-of-line nil)
-	     (tramp-gw-args              (("-o"
-					   "GlobalKnownHostsFile=/dev/null")
-					  ("-o" "UserKnownHostsFile=/dev/null")
-					  ("-o" "StrictHostKeyChecking=no")))
-	     (tramp-default-port         22))
-    ("ssh2"  (tramp-login-program        "ssh")
-             (tramp-login-args           (("-l" "%u") ("-p" "%p")
-					  ("-2") ("-e" "none") ("%h")))
-	     (tramp-async-args           (("-q")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         nil)
-	     (tramp-copy-args            nil)
-	     (tramp-copy-keep-date       nil)
-	     (tramp-password-end-of-line nil)
-	     (tramp-gw-args              (("-o"
-					   "GlobalKnownHostsFile=/dev/null")
-					  ("-o" "UserKnownHostsFile=/dev/null")
-					  ("-o" "StrictHostKeyChecking=no")))
-	     (tramp-default-port         22))
-    ("ssh1_old"
-             (tramp-login-program        "ssh1")
-	     (tramp-login-args           (("%h") ("-l" "%u") ("-p" "%p")
-					  ("-e" "none")))
-	     (tramp-async-args           (("-q")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         nil)
-	     (tramp-copy-args            nil)
-	     (tramp-copy-keep-date       nil)
-	     (tramp-password-end-of-line nil))
-    ("ssh2_old"
-             (tramp-login-program        "ssh2")
-	     (tramp-login-args           (("%h") ("-l" "%u") ("-p" "%p")
-					  ("-e" "none")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         nil)
-	     (tramp-copy-args            nil)
-	     (tramp-copy-keep-date       nil)
-	     (tramp-password-end-of-line nil))
-    ("remsh" (tramp-login-program        "remsh")
-             (tramp-login-args           (("%h") ("-l" "%u")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         nil)
-	     (tramp-copy-args            nil)
-	     (tramp-copy-keep-date       nil)
-	     (tramp-password-end-of-line nil))
-    ("telnet"
-             (tramp-login-program        "telnet")
-	     (tramp-login-args           (("%h") ("%p")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         nil)
-	     (tramp-copy-args            nil)
-	     (tramp-copy-keep-date       nil)
-	     (tramp-password-end-of-line nil)
-	     (tramp-default-port         23))
-    ("su"    (tramp-login-program        "su")
-             (tramp-login-args           (("-") ("%u")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         nil)
-	     (tramp-copy-args            nil)
-	     (tramp-copy-keep-date       nil)
-	     (tramp-password-end-of-line nil))
-    ("sudo"  (tramp-login-program        "sudo")
-             (tramp-login-args           (("-u" "%u")
-					  ("-s") ("-H") ("-p" "Password:")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         nil)
-	     (tramp-copy-args            nil)
-	     (tramp-copy-keep-date       nil)
-	     (tramp-password-end-of-line nil))
-    ("scpc"  (tramp-login-program        "ssh")
-             (tramp-login-args           (("-l" "%u") ("-p" "%p")
-					  ("-o" "ControlPath=%t.%%r@%%h:%%p")
-					  ("-o" "ControlMaster=yes")
-					  ("-e" "none") ("%h")))
-	     (tramp-async-args           (("-q")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         "scp")
-	     (tramp-copy-args            (("-P" "%p") ("-p" "%k") ("-q")
-					  ("-o" "ControlPath=%t.%%r@%%h:%%p")
-					  ("-o" "ControlMaster=auto")))
-	     (tramp-copy-keep-date       t)
-	     (tramp-password-end-of-line nil)
-	     (tramp-gw-args              (("-o"
-					   "GlobalKnownHostsFile=/dev/null")
-					  ("-o" "UserKnownHostsFile=/dev/null")
-					  ("-o" "StrictHostKeyChecking=no")))
-	     (tramp-default-port         22))
-    ("scpx"  (tramp-login-program        "ssh")
-             (tramp-login-args           (("-l" "%u") ("-p" "%p")
-					  ("-e" "none") ("-t" "-t")
-					  ("%h") ("/bin/sh")))
-	     (tramp-async-args           (("-q")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         "scp")
-	     (tramp-copy-args            (("-p" "%k")))
-	     (tramp-copy-keep-date       t)
-	     (tramp-password-end-of-line nil)
-	     (tramp-gw-args              (("-o"
-					   "GlobalKnownHostsFile=/dev/null")
-					  ("-o" "UserKnownHostsFile=/dev/null")
-					  ("-o" "StrictHostKeyChecking=no")))
-	     (tramp-default-port         22))
-    ("sshx"  (tramp-login-program        "ssh")
-             (tramp-login-args           (("-l" "%u") ("-p" "%p")
-					  ("-e" "none") ("-t" "-t")
-					  ("%h") ("/bin/sh")))
-	     (tramp-async-args           (("-q")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         nil)
-	     (tramp-copy-args            nil)
-	     (tramp-copy-keep-date       nil)
-	     (tramp-password-end-of-line nil)
-	     (tramp-gw-args              (("-o"
-					   "GlobalKnownHostsFile=/dev/null")
-					  ("-o" "UserKnownHostsFile=/dev/null")
-					  ("-o" "StrictHostKeyChecking=no")))
-	     (tramp-default-port         22))
-    ("krlogin"
-	     (tramp-login-program        "krlogin")
-	     (tramp-login-args           (("%h") ("-l" "%u") ("-x")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         nil)
-	     (tramp-copy-args            nil)
-	     (tramp-copy-keep-date       nil)
-	     (tramp-password-end-of-line nil))
-    ("plink" (tramp-login-program        "plink")
-	     (tramp-login-args           (("-l" "%u") ("-P" "%p")
-					  ("-ssh") ("%h")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         nil)
-	     (tramp-copy-args            nil)
-	     (tramp-copy-keep-date       nil)
-	     (tramp-password-end-of-line "xy") ;see docstring for "xy"
-	     (tramp-default-port         22))
-    ("plink1"
-	     (tramp-login-program        "plink")
-	     (tramp-login-args           (("-l" "%u") ("-P" "%p")
-					  ("-1" "-ssh") ("%h")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         nil)
-	     (tramp-copy-args            nil)
-	     (tramp-copy-keep-date       nil)
-	     (tramp-password-end-of-line "xy") ;see docstring for "xy"
-	     (tramp-default-port         22))
-    ("plinkx"
-             (tramp-login-program        "plink")
-	     ;; ("%h") must be a single element, see
-	     ;; `tramp-compute-multi-hops'.
-	     (tramp-login-args           (("-load") ("%h") ("-t")
-					  (,(format
-					     "env 'TERM=%s' 'PROMPT_COMMAND=' 'PS1=%s'"
-					     tramp-terminal-type
-					     tramp-initial-end-of-output))
-					  ("/bin/sh")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         nil)
-	     (tramp-copy-args            nil)
-	     (tramp-copy-keep-date       nil)
-	     (tramp-password-end-of-line nil))
-    ("pscp"  (tramp-login-program        "plink")
-	     (tramp-login-args           (("-l" "%u") ("-P" "%p")
-					  ("-ssh") ("%h")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         "pscp")
-	     (tramp-copy-args            (("-P" "%p") ("-scp") ("-p" "%k")))
-	     (tramp-copy-keep-date       t)
-	     (tramp-password-end-of-line "xy") ;see docstring for "xy"
-	     (tramp-default-port         22))
-    ("psftp" (tramp-login-program        "plink")
-	     (tramp-login-args           (("-l" "%u") ("-P" "%p")
-					  ("-ssh") ("%h")))
-	     (tramp-remote-sh            "/bin/sh")
-	     (tramp-copy-program         "pscp")
-	     (tramp-copy-args            (("-P" "%p") ("-sftp") ("-p" "%k")))
-	     (tramp-copy-keep-date       t)
-	     (tramp-password-end-of-line "xy")) ;see docstring for "xy"
-    ("fcp"   (tramp-login-program        "fsh")
-             (tramp-login-args           (("%h") ("-l" "%u") ("sh" "-i")))
-	     (tramp-remote-sh            "/bin/sh -i")
-	     (tramp-copy-program         "fcp")
-	     (tramp-copy-args            (("-p" "%k")))
-	     (tramp-copy-keep-date       t)
-	     (tramp-password-end-of-line nil)))
+;;;###tramp-autoload
+(defvar tramp-methods nil
   "*Alist of methods for remote files.
 This is a list of entries of the form (NAME PARAM1 PARAM2 ...).
 Each NAME stands for a remote access method.  Each PARAM is a
@@ -719,8 +318,7 @@
   :group 'tramp
   :type 'string)
 
-(defcustom tramp-default-method-alist
-  '(("\\`localhost\\'" "\\`root\\'" "su"))
+(defcustom tramp-default-method-alist nil
   "*Default method to use for specific host/user pairs.
 This is an alist of items (HOST USER METHOD).  The first matching item
 specifies the method to use for a file name which does not specify a
@@ -737,8 +335,7 @@
 		       (regexp :tag "User regexp")
 		       (string :tag "Method"))))
 
-(defcustom tramp-default-user
-  nil
+(defcustom tramp-default-user nil
   "*Default user to use for transferring files.
 It is nil by default; otherwise settings in configuration files like
 \"~/.ssh/config\" would be overwritten.  Also see `tramp-default-user-alist'.
@@ -747,10 +344,7 @@
   :group 'tramp
   :type '(choice (const nil) string))
 
-(defcustom tramp-default-user-alist
-  `(("\\`su\\(do\\)?\\'" nil "root")
-    ("\\`r\\(em\\)?\\(cp\\|sh\\)\\|telnet\\|plink1?\\'"
-     nil ,(user-login-name)))
+(defcustom tramp-default-user-alist nil
   "*Default user to use for specific method/host pairs.
 This is an alist of items (METHOD HOST USER).  The first matching item
 specifies the user to use for a file name which does not specify a
@@ -765,8 +359,7 @@
 		       (regexp :tag "Host regexp")
 		       (string :tag "User"))))
 
-(defcustom tramp-default-host
-  (system-name)
+(defcustom tramp-default-host (system-name)
   "*Default host to use for transferring files.
 Useful for su and sudo methods mostly."
   :group 'tramp
@@ -796,39 +389,6 @@
    "^" (regexp-opt (list "localhost" (system-name) "127\.0\.0\.1" "::1") t) "$")
   "*Host names which are regarded as local host.")
 
-(defconst tramp-completion-function-alist-rsh
-  '((tramp-parse-rhosts "/etc/hosts.equiv")
-    (tramp-parse-rhosts "~/.rhosts"))
-  "Default list of (FUNCTION FILE) pairs to be examined for rsh methods.")
-
-(defconst tramp-completion-function-alist-ssh
-  '((tramp-parse-rhosts      "/etc/hosts.equiv")
-    (tramp-parse-rhosts      "/etc/shosts.equiv")
-    (tramp-parse-shosts      "/etc/ssh_known_hosts")
-    (tramp-parse-sconfig     "/etc/ssh_config")
-    (tramp-parse-shostkeys   "/etc/ssh2/hostkeys")
-    (tramp-parse-sknownhosts "/etc/ssh2/knownhosts")
-    (tramp-parse-rhosts      "~/.rhosts")
-    (tramp-parse-rhosts      "~/.shosts")
-    (tramp-parse-shosts      "~/.ssh/known_hosts")
-    (tramp-parse-sconfig     "~/.ssh/config")
-    (tramp-parse-shostkeys   "~/.ssh2/hostkeys")
-    (tramp-parse-sknownhosts "~/.ssh2/knownhosts"))
-  "Default list of (FUNCTION FILE) pairs to be examined for ssh methods.")
-
-(defconst tramp-completion-function-alist-telnet
-  '((tramp-parse-hosts "/etc/hosts"))
-  "Default list of (FUNCTION FILE) pairs to be examined for telnet methods.")
-
-(defconst tramp-completion-function-alist-su
-  '((tramp-parse-passwd "/etc/passwd"))
-  "Default list of (FUNCTION FILE) pairs to be examined for su methods.")
-
-(defconst tramp-completion-function-alist-putty
-  '((tramp-parse-putty
-     "HKEY_CURRENT_USER\\Software\\SimonTatham\\PuTTY\\Sessions"))
-  "Default list of (FUNCTION REGISTRY) pairs to be examined for putty methods.")
-
 (defvar tramp-completion-function-alist nil
   "*Alist of methods for remote files.
 This is a list of entries of the form \(NAME PAIR1 PAIR2 ...\).
@@ -849,63 +409,6 @@
 FUNCTION can also be a customer defined function.  For more details see
 the info pages.")
 
-(eval-after-load "tramp"
-  '(progn
-     (tramp-set-completion-function
-      "rcp" tramp-completion-function-alist-rsh)
-     (tramp-set-completion-function
-      "scp" tramp-completion-function-alist-ssh)
-     (tramp-set-completion-function
-      "scp1" tramp-completion-function-alist-ssh)
-     (tramp-set-completion-function
-      "scp2" tramp-completion-function-alist-ssh)
-     (tramp-set-completion-function
-      "scp1_old" tramp-completion-function-alist-ssh)
-     (tramp-set-completion-function
-      "scp2_old" tramp-completion-function-alist-ssh)
-     (tramp-set-completion-function
-      "rsync" tramp-completion-function-alist-ssh)
-     (tramp-set-completion-function
-      "rsyncc" tramp-completion-function-alist-ssh)
-     (tramp-set-completion-function
-      "remcp" tramp-completion-function-alist-rsh)
-     (tramp-set-completion-function
-      "rsh" tramp-completion-function-alist-rsh)
-     (tramp-set-completion-function
-      "ssh" tramp-completion-function-alist-ssh)
-     (tramp-set-completion-function
-      "ssh1" tramp-completion-function-alist-ssh)
-     (tramp-set-completion-function
-      "ssh2" tramp-completion-function-alist-ssh)
-     (tramp-set-completion-function
-      "ssh1_old" tramp-completion-function-alist-ssh)
-     (tramp-set-completion-function
-      "ssh2_old" tramp-completion-function-alist-ssh)
-     (tramp-set-completion-function
-      "remsh" tramp-completion-function-alist-rsh)
-     (tramp-set-completion-function
-      "telnet" tramp-completion-function-alist-telnet)
-     (tramp-set-completion-function
-      "su" tramp-completion-function-alist-su)
-     (tramp-set-completion-function
-      "sudo" tramp-completion-function-alist-su)
-     (tramp-set-completion-function
-      "scpx" tramp-completion-function-alist-ssh)
-     (tramp-set-completion-function
-      "sshx" tramp-completion-function-alist-ssh)
-     (tramp-set-completion-function
-      "krlogin" tramp-completion-function-alist-rsh)
-     (tramp-set-completion-function
-      "plink" tramp-completion-function-alist-ssh)
-     (tramp-set-completion-function
-      "plink1" tramp-completion-function-alist-ssh)
-     (tramp-set-completion-function
-      "plinkx" tramp-completion-function-alist-putty)
-     (tramp-set-completion-function
-      "pscp" tramp-completion-function-alist-ssh)
-     (tramp-set-completion-function
-      "fcp" tramp-completion-function-alist-ssh)))
-
 (defconst tramp-echo-mark-marker "_echo"
   "String marker to surround echoed commands.")
 
@@ -954,55 +457,6 @@
   :group 'tramp
   :type 'string)
 
-;; "getconf PATH" yields:
-;; HP-UX: /usr/bin:/usr/ccs/bin:/opt/ansic/bin:/opt/langtools/bin:/opt/fortran/bin
-;; Solaris: /usr/xpg4/bin:/usr/ccs/bin:/usr/bin:/opt/SUNWspro/bin
-;; GNU/Linux (Debian, Suse): /bin:/usr/bin
-;; FreeBSD: /usr/bin:/bin:/usr/sbin:/sbin: - beware trailing ":"!
-;; IRIX64: /usr/bin
-(defcustom tramp-remote-path
-  '(tramp-default-remote-path "/usr/sbin" "/usr/local/bin"
-    "/local/bin" "/local/freeware/bin" "/local/gnu/bin"
-    "/usr/freeware/bin" "/usr/pkg/bin" "/usr/contrib/bin")
-  "*List of directories to search for executables on remote host.
-For every remote host, this variable will be set buffer local,
-keeping the list of existing directories on that host.
-
-You can use `~' in this list, but when searching for a shell which groks
-tilde expansion, all directory names starting with `~' will be ignored.
-
-`Default Directories' represent the list of directories given by
-the command \"getconf PATH\".  It is recommended to use this
-entry on top of this list, because these are the default
-directories for POSIX compatible commands.
-
-`Private Directories' are the settings of the $PATH environment,
-as given in your `~/.profile'."
-  :group 'tramp
-  :type '(repeat (choice
-		  (const :tag "Default Directories" tramp-default-remote-path)
-		  (const :tag "Private Directories" tramp-own-remote-path)
-		  (string :tag "Directory"))))
-
-(defcustom tramp-remote-process-environment
-  `("HISTFILE=$HOME/.tramp_history" "HISTSIZE=1" "LC_ALL=C"
-    ,(format "TERM=%s" tramp-terminal-type)
-    "EMACS=t" ;; Deprecated.
-    ,(format "INSIDE_EMACS='%s,tramp:%s'" emacs-version tramp-version)
-    "CDPATH=" "HISTORY=" "MAIL=" "MAILCHECK=" "MAILPATH="
-    "autocorrect=" "correct=")
-
-  "*List of environment variables to be set on the remote host.
-
-Each element should be a string of the form ENVVARNAME=VALUE.  An
-entry ENVVARNAME= diables the corresponding environment variable,
-which might have been set in the init files like ~/.profile.
-
-Special handling is applied to the PATH environment, which should
-not be set here. Instead of, it should be set via `tramp-remote-path'."
-  :group 'tramp
-  :type '(repeat string))
-
 (defcustom tramp-login-prompt-regexp
   ".*ogin\\( .*\\)?: *"
   "*Regexp matching login-like prompts.
@@ -1130,15 +584,13 @@
   :group 'tramp
   :type 'regexp)
 
-(defcustom tramp-temp-name-prefix "tramp."
+(defconst tramp-temp-name-prefix "tramp."
   "*Prefix to use for temporary files.
 If this is a relative file name (such as \"tramp.\"), it is considered
 relative to the directory name returned by the function
 `tramp-compat-temporary-file-directory' (which see).  It may also be an
 absolute file name; don't forget to include a prefix for the filename
-part, though."
-  :group 'tramp
-  :type 'string)
+part, though.")
 
 (defconst tramp-temp-buffer-name " *tramp temp*"
   "Buffer name for a temporary buffer.
@@ -1149,22 +601,6 @@
 Useful for \"rsync\" like methods.")
 (make-variable-buffer-local 'tramp-temp-buffer-file-name)
 
-(defcustom tramp-sh-extra-args '(("/bash\\'" . "-norc -noprofile"))
-  "*Alist specifying extra arguments to pass to the remote shell.
-Entries are (REGEXP . ARGS) where REGEXP is a regular expression
-matching the shell file name and ARGS is a string specifying the
-arguments.
-
-This variable is only used when Tramp needs to start up another shell
-for tilde expansion.  The extra arguments should typically prevent the
-shell from reading its init file."
-  :group 'tramp
-  ;; This might be the wrong way to test whether the widget type
-  ;; `alist' is available.  Who knows the right way to test it?
-  :type (if (get 'alist 'widget-type)
-	    '(alist :key-type string :value-type string)
-	  '(repeat (cons string string))))
-
 ;; XEmacs is distributed with few Lisp packages.  Further packages are
 ;; installed using EFS.  If we use a unified filename format, then
 ;; Tramp is required in addition to EFS.  (But why can't Tramp just
@@ -1223,8 +659,7 @@
   "*Regexp matching delimeter between method and user or host names.
 Derived from `tramp-postfix-method-format'.")
 
-(defconst tramp-user-regexp
-  "[^:/ \t]+"
+(defconst tramp-user-regexp "[^:/ \t]+"
   "*Regexp matching user names.")
 
 (defconst tramp-prefix-domain-format "%"
@@ -1235,8 +670,7 @@
   "*Regexp matching delimeter between user and domain names.
 Derived from `tramp-prefix-domain-format'.")
 
-(defconst tramp-domain-regexp
-  "[-a-zA-Z0-9_.]+"
+(defconst tramp-domain-regexp "[-a-zA-Z0-9_.]+"
   "*Regexp matching domain names.")
 
 (defconst tramp-user-with-domain-regexp
@@ -1245,8 +679,7 @@
 	  "\\(" tramp-domain-regexp "\\)")
   "*Regexp matching user names with domain names.")
 
-(defconst tramp-postfix-user-format
-  "@"
+(defconst tramp-postfix-user-format "@"
   "*String matching delimeter between user and host names.
 Used in `tramp-make-tramp-file-name'.")
 
@@ -1255,8 +688,7 @@
   "*Regexp matching delimeter between user and host names.
 Derived from `tramp-postfix-user-format'.")
 
-(defconst tramp-host-regexp
-  "[a-zA-Z0-9_.-]+"
+(defconst tramp-host-regexp "[a-zA-Z0-9_.-]+"
   "*Regexp matching host names.")
 
 (defconst tramp-prefix-ipv6-format
@@ -1304,8 +736,7 @@
   "*Regexp matching delimeter between host names and port numbers.
 Derived from `tramp-prefix-port-format'.")
 
-(defconst tramp-port-regexp
-  "[0-9]+"
+(defconst tramp-port-regexp "[0-9]+"
   "*Regexp matching port numbers.")
 
 (defconst tramp-host-with-port-regexp
@@ -1327,8 +758,7 @@
   "*Regexp matching delimeter between host names and localnames.
 Derived from `tramp-postfix-host-format'.")
 
-(defconst tramp-localname-regexp
-  ".*$"
+(defconst tramp-localname-regexp ".*$"
   "*Regexp matching localnames.")
 
 ;; File name format.
@@ -1376,15 +806,13 @@
 On W32 systems, the volume letter must be ignored.")
 
 ;;;###autoload
-(defconst tramp-file-name-regexp-separate
-  "\\`/\\[.*\\]"
+(defconst tramp-file-name-regexp-separate "\\`/\\[.*\\]"
   "Value for `tramp-file-name-regexp' for separate remoting.
 XEmacs uses a separate filename syntax for Tramp and EFS.
 See `tramp-file-name-structure' for more explanations.")
 
 ;;;###autoload
-(defconst tramp-file-name-regexp-url
-  "\\`/[^/:]+://"
+(defconst tramp-file-name-regexp-url "\\`/[^/:]+://"
   "Value for `tramp-file-name-regexp' for URL-like remoting.
 See `tramp-file-name-structure' for more explanations.")
 
@@ -1458,38 +886,6 @@
 
 Also see `tramp-file-name-structure'.")
 
-(defconst tramp-actions-before-shell
-  '((tramp-login-prompt-regexp tramp-action-login)
-    (tramp-password-prompt-regexp tramp-action-password)
-    (tramp-wrong-passwd-regexp tramp-action-permission-denied)
-    (shell-prompt-pattern tramp-action-succeed)
-    (tramp-shell-prompt-pattern tramp-action-succeed)
-    (tramp-yesno-prompt-regexp tramp-action-yesno)
-    (tramp-yn-prompt-regexp tramp-action-yn)
-    (tramp-terminal-prompt-regexp tramp-action-terminal)
-    (tramp-process-alive-regexp tramp-action-process-alive))
-  "List of pattern/action pairs.
-Whenever a pattern matches, the corresponding action is performed.
-Each item looks like (PATTERN ACTION).
-
-The PATTERN should be a symbol, a variable.  The value of this
-variable gives the regular expression to search for.  Note that the
-regexp must match at the end of the buffer, \"\\'\" is implicitly
-appended to it.
-
-The ACTION should also be a symbol, but a function.  When the
-corresponding PATTERN matches, the ACTION function is called.")
-
-(defconst tramp-actions-copy-out-of-band
-  '((tramp-password-prompt-regexp tramp-action-password)
-    (tramp-wrong-passwd-regexp tramp-action-permission-denied)
-    (tramp-copy-failed-regexp tramp-action-permission-denied)
-    (tramp-process-alive-regexp tramp-action-out-of-band))
-  "List of pattern/action pairs.
-This list is used for copying/renaming with out-of-band methods.
-
-See `tramp-actions-before-shell' for more info.")
-
 ;; Chunked sending kludge.  We set this to 500 for black-listed constellations
 ;; known to have a bug in `process-send-string'; some ssh connections appear
 ;; to drop bytes when data is sent too quickly.  There is also a connection
@@ -1595,432 +991,18 @@
 (defvar tramp-current-host nil
   "Remote host for this *tramp* buffer.")
 
-(defconst tramp-uudecode
-  "(echo begin 600 /tmp/tramp.$$; tail +2) | uudecode
-cat /tmp/tramp.$$
-rm -f /tmp/tramp.$$"
-  "Shell function to implement `uudecode' to standard output.
-Many systems support `uudecode -o /dev/stdout' or `uudecode -o -'
-for this or `uudecode -p', but some systems don't, and for them
-we have this shell function.")
-
-(defconst tramp-perl-file-truename
-  "%s -e '
-use File::Spec;
-use Cwd \"realpath\";
-
-sub recursive {
-    my ($volume, @dirs) = @_;
-    my $real = realpath(File::Spec->catpath(
-                   $volume, File::Spec->catdir(@dirs), \"\"));
-    if ($real) {
-        my ($vol, $dir) = File::Spec->splitpath($real, 1);
-        return ($vol, File::Spec->splitdir($dir));
-    }
-    else {
-        my $last = pop(@dirs);
-        ($volume, @dirs) = recursive($volume, @dirs);
-        push(@dirs, $last);
-        return ($volume, @dirs);
-    }
-}
-
-$result = realpath($ARGV[0]);
-if (!$result) {
-    my ($vol, $dir) = File::Spec->splitpath($ARGV[0], 1);
-    ($vol, @dirs) = recursive($vol, File::Spec->splitdir($dir));
-
-    $result = File::Spec->catpath($vol, File::Spec->catdir(@dirs), \"\");
-}
-
-if ($ARGV[0] =~ /\\/$/) {
-    $result = $result . \"/\";
-}
-
-print \"\\\"$result\\\"\\n\";
-' \"$1\" 2>/dev/null"
-  "Perl script to produce output suitable for use with `file-truename'
-on the remote file system.
-Escape sequence %s is replaced with name of Perl binary.
-This string is passed to `format', so percent characters need to be doubled.")
-
-(defconst tramp-perl-file-name-all-completions
-  "%s -e 'sub case {
- my $str = shift;
- if ($ARGV[2]) {
-  return lc($str);
- }
- else {
-  return $str;
- }
-}
-opendir(d, $ARGV[0]) || die(\"$ARGV[0]: $!\\nfail\\n\");
-@files = readdir(d); closedir(d);
-foreach $f (@files) {
- if (case(substr($f, 0, length($ARGV[1]))) eq case($ARGV[1])) {
-  if (-d \"$ARGV[0]/$f\") {
-   print \"$f/\\n\";
-  }
-  else {
-   print \"$f\\n\";
-  }
- }
-}
-print \"ok\\n\"
-' \"$1\" \"$2\" \"$3\" 2>/dev/null"
-  "Perl script to produce output suitable for use with
-`file-name-all-completions' on the remote file system.  Escape
-sequence %s is replaced with name of Perl binary.  This string is
-passed to `format', so percent characters need to be doubled.")
-
-;; Perl script to implement `file-attributes' in a Lisp `read'able
-;; output.  If you are hacking on this, note that you get *no* output
-;; unless this spits out a complete line, including the '\n' at the
-;; end.
-;; The device number is returned as "-1", because there will be a virtual
-;; device number set in `tramp-handle-file-attributes'.
-(defconst tramp-perl-file-attributes
-  "%s -e '
-@stat = lstat($ARGV[0]);
-if (!@stat) {
-    print \"nil\\n\";
-    exit 0;
-}
-if (($stat[2] & 0170000) == 0120000)
-{
-    $type = readlink($ARGV[0]);
-    $type = \"\\\"$type\\\"\";
-}
-elsif (($stat[2] & 0170000) == 040000)
-{
-    $type = \"t\";
-}
-else
-{
-    $type = \"nil\"
-};
-$uid = ($ARGV[1] eq \"integer\") ? $stat[4] : \"\\\"\" . getpwuid($stat[4]) . \"\\\"\";
-$gid = ($ARGV[1] eq \"integer\") ? $stat[5] : \"\\\"\" . getgrgid($stat[5]) . \"\\\"\";
-printf(
-    \"(%%s %%u %%s %%s (%%u %%u) (%%u %%u) (%%u %%u) %%u.0 %%u t (%%u . %%u) -1)\\n\",
-    $type,
-    $stat[3],
-    $uid,
-    $gid,
-    $stat[8] >> 16 & 0xffff,
-    $stat[8] & 0xffff,
-    $stat[9] >> 16 & 0xffff,
-    $stat[9] & 0xffff,
-    $stat[10] >> 16 & 0xffff,
-    $stat[10] & 0xffff,
-    $stat[7],
-    $stat[2],
-    $stat[1] >> 16 & 0xffff,
-    $stat[1] & 0xffff
-);' \"$1\" \"$2\" 2>/dev/null"
-  "Perl script to produce output suitable for use with `file-attributes'
-on the remote file system.
-Escape sequence %s is replaced with name of Perl binary.
-This string is passed to `format', so percent characters need to be doubled.")
-
-(defconst tramp-perl-directory-files-and-attributes
-  "%s -e '
-chdir($ARGV[0]) or printf(\"\\\"Cannot change to $ARGV[0]: $''!''\\\"\\n\"), exit();
-opendir(DIR,\".\") or printf(\"\\\"Cannot open directory $ARGV[0]: $''!''\\\"\\n\"), exit();
-@list = readdir(DIR);
-closedir(DIR);
-$n = scalar(@list);
-printf(\"(\\n\");
-for($i = 0; $i < $n; $i++)
-{
-    $filename = $list[$i];
-    @stat = lstat($filename);
-    if (($stat[2] & 0170000) == 0120000)
-    {
-        $type = readlink($filename);
-        $type = \"\\\"$type\\\"\";
-    }
-    elsif (($stat[2] & 0170000) == 040000)
-    {
-        $type = \"t\";
-    }
-    else
-    {
-        $type = \"nil\"
-    };
-    $uid = ($ARGV[1] eq \"integer\") ? $stat[4] : \"\\\"\" . getpwuid($stat[4]) . \"\\\"\";
-    $gid = ($ARGV[1] eq \"integer\") ? $stat[5] : \"\\\"\" . getgrgid($stat[5]) . \"\\\"\";
-    printf(
-        \"(\\\"%%s\\\" %%s %%u %%s %%s (%%u %%u) (%%u %%u) (%%u %%u) %%u.0 %%u t (%%u . %%u) (%%u . %%u))\\n\",
-        $filename,
-        $type,
-        $stat[3],
-        $uid,
-        $gid,
-        $stat[8] >> 16 & 0xffff,
-        $stat[8] & 0xffff,
-        $stat[9] >> 16 & 0xffff,
-        $stat[9] & 0xffff,
-        $stat[10] >> 16 & 0xffff,
-        $stat[10] & 0xffff,
-        $stat[7],
-        $stat[2],
-        $stat[1] >> 16 & 0xffff,
-        $stat[1] & 0xffff,
-        $stat[0] >> 16 & 0xffff,
-        $stat[0] & 0xffff);
-}
-printf(\")\\n\");' \"$1\" \"$2\" 2>/dev/null"
-  "Perl script implementing `directory-files-attributes' as Lisp `read'able
-output.
-Escape sequence %s is replaced with name of Perl binary.
-This string is passed to `format', so percent characters need to be doubled.")
-
-;; ;; These two use uu encoding.
-;; (defvar tramp-perl-encode "%s -e'\
-;; print qq(begin 644 xxx\n);
-;; my $s = q();
-;; my $res = q();
-;; while (read(STDIN, $s, 45)) {
-;;     print pack(q(u), $s);
-;; }
-;; print qq(`\n);
-;; print qq(end\n);
-;; '"
-;;   "Perl program to use for encoding a file.
-;; Escape sequence %s is replaced with name of Perl binary.")
-
-;; (defvar tramp-perl-decode "%s -ne '
-;; print unpack q(u), $_;
-;; '"
-;;   "Perl program to use for decoding a file.
-;; Escape sequence %s is replaced with name of Perl binary.")
-
-;; These two use base64 encoding.
-(defconst tramp-perl-encode-with-module
-  "%s -MMIME::Base64 -0777 -ne 'print encode_base64($_)' 2>/dev/null"
-  "Perl program to use for encoding a file.
-Escape sequence %s is replaced with name of Perl binary.
-This string is passed to `format', so percent characters need to be doubled.
-This implementation requires the MIME::Base64 Perl module to be installed
-on the remote host.")
-
-(defconst tramp-perl-decode-with-module
-  "%s -MMIME::Base64 -0777 -ne 'print decode_base64($_)' 2>/dev/null"
-  "Perl program to use for decoding a file.
-Escape sequence %s is replaced with name of Perl binary.
-This string is passed to `format', so percent characters need to be doubled.
-This implementation requires the MIME::Base64 Perl module to be installed
-on the remote host.")
-
-(defconst tramp-perl-encode
-  "%s -e '
-# This script contributed by Juanma Barranquero <lektu@terra.es>.
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
-use strict;
-
-my %%trans = do {
-    my $i = 0;
-    map {(substr(unpack(q(B8), chr $i++), 2, 6), $_)}
-      split //, q(ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/);
-};
-
-binmode(\\*STDIN);
-
-# We read in chunks of 54 bytes, to generate output lines
-# of 72 chars (plus end of line)
-$/ = \\54;
-
-while (my $data = <STDIN>) {
-    my $pad = q();
-
-    # Only for the last chunk, and only if did not fill the last three-byte packet
-    if (eof) {
-        my $mod = length($data) %% 3;
-        $pad = q(=) x (3 - $mod) if $mod;
-    }
-
-    # Not the fastest method, but it is simple: unpack to binary string, split
-    # by groups of 6 bits and convert back from binary to byte; then map into
-    # the translation table
-    print
-      join q(),
-        map($trans{$_},
-            (substr(unpack(q(B*), $data) . q(00000), 0, 432) =~ /....../g)),
-              $pad,
-                qq(\\n);
-}' 2>/dev/null"
-  "Perl program to use for encoding a file.
-Escape sequence %s is replaced with name of Perl binary.
-This string is passed to `format', so percent characters need to be doubled.")
-
-(defconst tramp-perl-decode
-  "%s -e '
-# This script contributed by Juanma Barranquero <lektu@terra.es>.
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
-use strict;
-
-my %%trans = do {
-    my $i = 0;
-    map {($_, substr(unpack(q(B8), chr $i++), 2, 6))}
-      split //, q(ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/)
-};
-
-my %%bytes = map {(unpack(q(B8), chr $_), chr $_)} 0 .. 255;
-
-binmode(\\*STDOUT);
-
-# We are going to accumulate into $pending to accept any line length
-# (we do not check they are <= 76 chars as the RFC says)
-my $pending = q();
-
-while (my $data = <STDIN>) {
-    chomp $data;
-
-    # If we find one or two =, we have reached the end and
-    # any following data is to be discarded
-    my $finished = $data =~ s/(==?).*/$1/;
-    $pending .= $data;
-
-    my $len = length($pending);
-    my $chunk = substr($pending, 0, $len & ~3);
-    $pending = substr($pending, $len & ~3 + 1);
-
-    # Easy method: translate from chars to (pregenerated) six-bit packets, join,
-    # split in 8-bit chunks and convert back to char.
-    print join q(),
-      map $bytes{$_},
-        ((join q(), map {$trans{$_} || q()} split //, $chunk) =~ /......../g);
-
-    last if $finished;
-}' 2>/dev/null"
-  "Perl program to use for decoding a file.
-Escape sequence %s is replaced with name of Perl binary.
-This string is passed to `format', so percent characters need to be doubled.")
-
-(defconst tramp-vc-registered-read-file-names
-  "echo \"(\"
-while read file; do
-    if %s \"$file\"; then
-	echo \"(\\\"$file\\\" \\\"file-exists-p\\\" t)\"
-    else
-	echo \"(\\\"$file\\\" \\\"file-exists-p\\\" nil)\"
-    fi
-    if %s \"$file\"; then
-	echo \"(\\\"$file\\\" \\\"file-readable-p\\\" t)\"
-    else
-	echo \"(\\\"$file\\\" \\\"file-readable-p\\\" nil)\"
-    fi
-done
-echo \")\""
-  "Script to check existence of VC related files.
-It must be send formatted with two strings; the tests for file
-existence, and file readability.  Input shall be read via
-here-document, otherwise the command could exceed maximum length
-of command line.")
-
-(defconst tramp-file-mode-type-map
-  '((0  . "-")  ; Normal file (SVID-v2 and XPG2)
-    (1  . "p")  ; fifo
-    (2  . "c")  ; character device
-    (3  . "m")  ; multiplexed character device (v7)
-    (4  . "d")  ; directory
-    (5  . "?")  ; Named special file (XENIX)
-    (6  . "b")  ; block device
-    (7  . "?")  ; multiplexed block device (v7)
-    (8  . "-")  ; regular file
-    (9  . "n")  ; network special file (HP-UX)
-    (10 . "l")  ; symlink
-    (11 . "?")  ; ACL shadow inode (Solaris, not userspace)
-    (12 . "s")  ; socket
-    (13 . "D")  ; door special (Solaris)
-    (14 . "w")) ; whiteout (BSD)
-  "A list of file types returned from the `stat' system call.
-This is used to map a mode number to a permission string.")
-
-;; New handlers should be added here.  The following operations can be
-;; handled using the normal primitives: file-name-sans-versions,
-;; get-file-buffer.
-(defconst tramp-file-name-handler-alist
-  '((load . tramp-handle-load)
-    (make-symbolic-link . tramp-handle-make-symbolic-link)
-    (file-name-as-directory . tramp-handle-file-name-as-directory)
-    (file-name-directory . tramp-handle-file-name-directory)
-    (file-name-nondirectory . tramp-handle-file-name-nondirectory)
-    (file-truename . tramp-handle-file-truename)
-    (file-exists-p . tramp-handle-file-exists-p)
-    (file-directory-p . tramp-handle-file-directory-p)
-    (file-executable-p . tramp-handle-file-executable-p)
-    (file-readable-p . tramp-handle-file-readable-p)
-    (file-regular-p . tramp-handle-file-regular-p)
-    (file-symlink-p . tramp-handle-file-symlink-p)
-    (file-writable-p . tramp-handle-file-writable-p)
-    (file-ownership-preserved-p . tramp-handle-file-ownership-preserved-p)
-    (file-newer-than-file-p . tramp-handle-file-newer-than-file-p)
-    (file-attributes . tramp-handle-file-attributes)
-    (file-modes . tramp-handle-file-modes)
-    (directory-files . tramp-handle-directory-files)
-    (directory-files-and-attributes . tramp-handle-directory-files-and-attributes)
-    (file-name-all-completions . tramp-handle-file-name-all-completions)
-    (file-name-completion . tramp-handle-file-name-completion)
-    (add-name-to-file . tramp-handle-add-name-to-file)
-    (copy-file . tramp-handle-copy-file)
-    (copy-directory . tramp-handle-copy-directory)
-    (rename-file . tramp-handle-rename-file)
-    (set-file-modes . tramp-handle-set-file-modes)
-    (set-file-times . tramp-handle-set-file-times)
-    (make-directory . tramp-handle-make-directory)
-    (delete-directory . tramp-handle-delete-directory)
-    (delete-file . tramp-handle-delete-file)
-    (directory-file-name . tramp-handle-directory-file-name)
-    ;; `executable-find' is not official yet.
-    (executable-find . tramp-handle-executable-find)
-    (start-file-process . tramp-handle-start-file-process)
-    (process-file . tramp-handle-process-file)
-    (shell-command . tramp-handle-shell-command)
-    (insert-directory . tramp-handle-insert-directory)
-    (expand-file-name . tramp-handle-expand-file-name)
-    (substitute-in-file-name . tramp-handle-substitute-in-file-name)
-    (file-local-copy . tramp-handle-file-local-copy)
-    (file-remote-p . tramp-handle-file-remote-p)
-    (insert-file-contents . tramp-handle-insert-file-contents)
-    (insert-file-contents-literally
-     . tramp-handle-insert-file-contents-literally)
-    (write-region . tramp-handle-write-region)
-    (find-backup-file-name . tramp-handle-find-backup-file-name)
-    (make-auto-save-file-name . tramp-handle-make-auto-save-file-name)
-    (unhandled-file-name-directory . tramp-handle-unhandled-file-name-directory)
-    (dired-compress-file . tramp-handle-dired-compress-file)
-    (dired-recursive-delete-directory
-     . tramp-handle-dired-recursive-delete-directory)
-    (dired-uncache . tramp-handle-dired-uncache)
-    (set-visited-file-modtime . tramp-handle-set-visited-file-modtime)
-    (verify-visited-file-modtime . tramp-handle-verify-visited-file-modtime)
-    (file-selinux-context . tramp-handle-file-selinux-context)
-    (set-file-selinux-context . tramp-handle-set-file-selinux-context)
-    (vc-registered . tramp-handle-vc-registered))
-  "Alist of handler functions.
-Operations not mentioned here will be handled by the normal Emacs functions.")
-
-;; Handlers for partial Tramp file names.  For Emacs just
-;; `file-name-all-completions' is needed.
 ;;;###autoload
 (defconst tramp-completion-file-name-handler-alist
   '((file-name-all-completions . tramp-completion-handle-file-name-all-completions)
     (file-name-completion . tramp-completion-handle-file-name-completion))
   "Alist of completion handler functions.
-Used for file names matching `tramp-file-name-regexp'. Operations not
-mentioned here will be handled by `tramp-file-name-handler-alist' or the
-normal Emacs functions.")
+Used for file names matching `tramp-file-name-regexp'. Operations
+not mentioned here will be handled by Tramp's file name handler
+functions, or the normal Emacs functions.")
 
 ;; Handlers for foreign methods, like FTP or SMB, shall be plugged here.
 ;;;###tramp-autoload
-(defvar tramp-foreign-file-name-handler-alist
-  ;; (identity . tramp-sh-file-name-handler) should always be the last
-  ;; entry, because `identity' always matches.
-  '((identity . tramp-sh-file-name-handler))
+(defvar tramp-foreign-file-name-handler-alist nil
   "Alist of elements (FUNCTION . HANDLER) for foreign methods handled specially.
 If (FUNCTION FILENAME) returns non-nil, then all I/O on that file is done by
 calling HANDLER.")
@@ -2150,10 +1132,6 @@
 	    (user      (match-string (nth 2 tramp-file-name-structure) name))
 	    (host      (match-string (nth 3 tramp-file-name-structure) name))
 	    (localname (match-string (nth 4 tramp-file-name-structure) name)))
-	(when (member method '("multi" "multiu"))
-	  (error
-	   "`%s' method is no longer supported, see (info \"(tramp)Multi-hops\")"
-	   method))
 	(when host
 	  (when (string-match tramp-prefix-ipv6-regexp host)
 	    (setq host (replace-match "" nil t host)))
@@ -2205,7 +1183,8 @@
 	  (when (not (zerop (length host)))
 	    (concat
 	     (if (string-match tramp-ipv6-regexp host)
-		 (concat tramp-prefix-ipv6-format host tramp-postfix-ipv6-format)
+		 (concat
+		  tramp-prefix-ipv6-format host tramp-postfix-ipv6-format)
 	       host)
 	     tramp-postfix-host-format))
 	  (when localname localname)))
@@ -2251,7 +1230,15 @@
       (format "*debug tramp/%s %s*" method host))))
 
 (defconst tramp-debug-outline-regexp
-  "[0-9]+:[0-9]+:[0-9]+\\.[0-9]+ [a-z0-9-]+ (\\([0-9]+\\)) #")
+  "[0-9]+:[0-9]+:[0-9]+\\.[0-9]+ [a-z0-9-]+ (\\([0-9]+\\)) #"
+  "Used for highlighting Tramp debug buffers in `outline-mode'.")
+
+(defun tramp-debug-outline-level ()
+  "Return the depth to which a statement is nested in the outline.
+Point must be at the beginning of a header line.
+
+The outline level is equal to the verbosity of the Tramp message."
+  (1+ (string-to-number (match-string 1))))
 
 (defun tramp-get-debug-buffer (vec)
   "Get the debug buffer for VEC."
@@ -2268,16 +1255,9 @@
 	    (outline-regexp tramp-debug-outline-regexp))
 	(outline-mode))
       (set (make-local-variable 'outline-regexp) tramp-debug-outline-regexp)
-      (set (make-local-variable 'outline-level) 'tramp-outline-level))
+      (set (make-local-variable 'outline-level) 'tramp-debug-outline-level))
     (current-buffer)))
 
-(defun tramp-outline-level ()
-  "Return the depth to which a statement is nested in the outline.
-Point must be at the beginning of a header line.
-
-The outline level is equal to the verbosity of the Tramp message."
-  (1+ (string-to-number (match-string 1))))
-
 (defsubst tramp-debug-message (vec fmt-string &rest args)
   "Append message to debug buffer.
 Message is formatted with FMT-STRING as control string and the remaining
@@ -2344,36 +1324,34 @@
 Calls functions `message' and `tramp-debug-message' with FMT-STRING as
 control string and the remaining ARGS to actually emit the message (if
 applicable)."
-  (condition-case nil
-      (when (<= level tramp-verbose)
-	;; Match data must be preserved!
-	(save-match-data
-	  ;; Display only when there is a minimum level.
-	  (when (and tramp-message-show-message (<= level 3))
-	    (apply 'message
-		   (concat
-		    (cond
-		     ((= level 0) "")
-		     ((= level 1) "")
-		     ((= level 2) "Warning: ")
-		     (t           "Tramp: "))
-		    fmt-string)
-		   args))
-	  ;; Log only when there is a minimum level.
-	  (when (>= tramp-verbose 4)
-	    (when (and vec-or-proc
-		       (processp vec-or-proc)
-		       (buffer-name (process-buffer vec-or-proc)))
-	      (with-current-buffer (process-buffer vec-or-proc)
-		;; Translate proc to vec.
-		(setq vec-or-proc (tramp-dissect-file-name default-directory))))
-	    (when (and vec-or-proc (vectorp vec-or-proc))
-	      (apply 'tramp-debug-message
-		     vec-or-proc
-		     (concat (format "(%d) # " level) fmt-string)
-		     args)))))
-    ;; Suppress all errors.
-    (error nil)))
+  (ignore-errors
+    (when (<= level tramp-verbose)
+      ;; Match data must be preserved!
+      (save-match-data
+	;; Display only when there is a minimum level.
+	(when (and tramp-message-show-message (<= level 3))
+	  (apply 'message
+		 (concat
+		  (cond
+		   ((= level 0) "")
+		   ((= level 1) "")
+		   ((= level 2) "Warning: ")
+		   (t           "Tramp: "))
+		  fmt-string)
+		 args))
+	;; Log only when there is a minimum level.
+	(when (>= tramp-verbose 4)
+	  (when (and vec-or-proc
+		     (processp vec-or-proc)
+		     (buffer-name (process-buffer vec-or-proc)))
+	    (with-current-buffer (process-buffer vec-or-proc)
+	      ;; Translate proc to vec.
+	      (setq vec-or-proc (tramp-dissect-file-name default-directory))))
+	  (when (and vec-or-proc (vectorp vec-or-proc))
+	    (apply 'tramp-debug-message
+		   vec-or-proc
+		   (concat (format "(%d) # " level) fmt-string)
+		   args)))))))
 
 (defsubst tramp-error (vec-or-proc signal fmt-string &rest args)
   "Emit an error.
@@ -2455,11 +1433,10 @@
      (when (and tramp-message-show-message
 		;; Display only when there is a minimum level.
 		(<= ,level (min tramp-verbose 3)))
-       (condition-case nil
-	   (setq pr (tramp-compat-funcall 'make-progress-reporter ,message)
-		 tm (when pr
-		      (run-at-time 3 0.1 'tramp-progress-reporter-update pr)))
-	 (error nil)))
+       (ignore-errors
+	 (setq pr (tramp-compat-funcall 'make-progress-reporter ,message)
+	       tm (when pr
+		    (run-at-time 3 0.1 'tramp-progress-reporter-update pr)))))
      (unwind-protect
 	 ;; Execute the body.  Unset `tramp-message-show-message' when
 	 ;; the timer object is created, in order to suppress
@@ -2490,34 +1467,6 @@
 
     (defalias 'tramp-drop-volume-letter 'identity)))
 
-(defsubst tramp-make-tramp-temp-file (vec)
-  "Create a temporary file on the remote host identified by VEC.
-Return the local name of the temporary file."
-  (let ((prefix
-	 (tramp-make-tramp-file-name
-	  (tramp-file-name-method vec)
-	  (tramp-file-name-user vec)
-	  (tramp-file-name-host vec)
-	  (tramp-drop-volume-letter
-	   (expand-file-name
-	    tramp-temp-name-prefix (tramp-get-remote-tmpdir vec)))))
-	result)
-    (while (not result)
-      ;; `make-temp-file' would be the natural choice for
-      ;; implementation.  But it calls `write-region' internally,
-      ;; which also needs a temporary file - we would end in an
-      ;; infinite loop.
-      (setq result (make-temp-name prefix))
-      (if (file-exists-p result)
-	  (setq result nil)
-	;; This creates the file by side effect.
-	(set-file-times result)
-	(set-file-modes result (tramp-compat-octal-to-decimal "0700"))))
-
-    ;; Return the local part.
-    (with-parsed-tramp-file-name result nil localname)))
-
-
 ;;; Config Manipulation Functions:
 
 (defun tramp-set-completion-function (method function-list)
@@ -2640,279 +1589,6 @@
 	      (remove-hook 'rfn-eshadow-update-overlay-hook
 			   'tramp-rfn-eshadow-update-overlay))))
 
-
-;;; Integration of eshell.el:
-
-(eval-when-compile
-  (defvar eshell-path-env))
-
-;; eshell.el keeps the path in `eshell-path-env'.  We must change it
-;; when `default-directory' points to another host.
-(defun tramp-eshell-directory-change ()
-  "Set `eshell-path-env' to $PATH of the host related to `default-directory'."
-  (setq eshell-path-env
-	(if (file-remote-p default-directory)
-	    (with-parsed-tramp-file-name default-directory nil
-	      (mapconcat
-	       'identity
-	       (tramp-get-remote-path v)
-	       ":"))
-	  (getenv "PATH"))))
-
-(eval-after-load "esh-util"
-  '(progn
-     (tramp-eshell-directory-change)
-     (add-hook 'eshell-directory-change-hook
-	       'tramp-eshell-directory-change)
-     (add-hook 'tramp-unload-hook
-	       (lambda ()
-		 (remove-hook 'eshell-directory-change-hook
-			      'tramp-eshell-directory-change)))))
-
-
-;;; File Name Handler Functions:
-
-(defun tramp-handle-make-symbolic-link
-  (filename linkname &optional ok-if-already-exists)
-  "Like `make-symbolic-link' for Tramp files.
-If LINKNAME is a non-Tramp file, it is used verbatim as the target of
-the symlink.  If LINKNAME is a Tramp file, only the localname component is
-used as the target of the symlink.
-
-If LINKNAME is a Tramp file and the localname component is relative, then
-it is expanded first, before the localname component is taken.  Note that
-this can give surprising results if the user/host for the source and
-target of the symlink differ."
-  (with-parsed-tramp-file-name linkname l
-    (let ((ln (tramp-get-remote-ln l))
-	  (cwd (tramp-run-real-handler
-		'file-name-directory (list l-localname))))
-      (unless ln
-	(tramp-error
-	 l 'file-error
-	 "Making a symbolic link.  ln(1) does not exist on the remote host."))
-
-      ;; Do the 'confirm if exists' thing.
-      (when (file-exists-p linkname)
-	;; What to do?
-	(if (or (null ok-if-already-exists) ; not allowed to exist
-		(and (numberp ok-if-already-exists)
-		     (not (yes-or-no-p
-			   (format
-			    "File %s already exists; make it a link anyway? "
-			    l-localname)))))
-	    (tramp-error
-	     l 'file-already-exists "File %s already exists" l-localname)
-	  (delete-file linkname)))
-
-      ;; If FILENAME is a Tramp name, use just the localname component.
-      (when (tramp-tramp-file-p filename)
-	(setq filename
-	      (tramp-file-name-localname
-	       (tramp-dissect-file-name (expand-file-name filename)))))
-
-      (tramp-flush-file-property l (file-name-directory l-localname))
-      (tramp-flush-file-property l l-localname)
-
-      ;; Right, they are on the same host, regardless of user, method, etc.
-      ;; We now make the link on the remote machine. This will occur as the user
-      ;; that FILENAME belongs to.
-      (zerop
-       (tramp-send-command-and-check
-	l
-	(format
-	 "cd %s && %s -sf %s %s"
-	 (tramp-shell-quote-argument cwd)
-	 ln
-	 (tramp-shell-quote-argument filename)
-	 (tramp-shell-quote-argument l-localname))
-	t)))))
-
-(defun tramp-handle-load (file &optional noerror nomessage nosuffix must-suffix)
-  "Like `load' for Tramp files."
-  (with-parsed-tramp-file-name (expand-file-name file) nil
-    (unless nosuffix
-      (cond ((file-exists-p (concat file ".elc"))
-	     (setq file (concat file ".elc")))
-	    ((file-exists-p (concat file ".el"))
-	     (setq file (concat file ".el")))))
-    (when must-suffix
-      ;; The first condition is always true for absolute file names.
-      ;; Included for safety's sake.
-      (unless (or (file-name-directory file)
-		  (string-match "\\.elc?\\'" file))
-	(tramp-error
-	 v 'file-error
-	 "File `%s' does not include a `.el' or `.elc' suffix" file)))
-    (unless noerror
-      (when (not (file-exists-p file))
-	(tramp-error v 'file-error "Cannot load nonexistent file `%s'" file)))
-    (if (not (file-exists-p file))
-	nil
-      (let ((tramp-message-show-message (not nomessage)))
-	(with-progress-reporter v 0 (format "Loading %s" file)
-	  (let ((local-copy (file-local-copy file)))
-	    ;; MUST-SUFFIX doesn't exist on XEmacs, so let it default to nil.
-	    (unwind-protect
-		(load local-copy noerror t t)
-	      (delete-file local-copy)))))
-      t)))
-
-;; Localname manipulation functions that grok Tramp localnames...
-(defun tramp-handle-file-name-as-directory (file)
-  "Like `file-name-as-directory' but aware of Tramp files."
-  ;; `file-name-as-directory' would be sufficient except localname is
-  ;; the empty string.
-  (let ((v (tramp-dissect-file-name file t)))
-    ;; Run the command on the localname portion only.
-    (tramp-make-tramp-file-name
-     (tramp-file-name-method v)
-     (tramp-file-name-user v)
-     (tramp-file-name-host v)
-     (tramp-run-real-handler
-      'file-name-as-directory (list (or (tramp-file-name-localname v) ""))))))
-
-(defun tramp-handle-file-name-directory (file)
-  "Like `file-name-directory' but aware of Tramp files."
-  ;; Everything except the last filename thing is the directory.  We
-  ;; cannot apply `with-parsed-tramp-file-name', because this expands
-  ;; the remote file name parts.  This is a problem when we are in
-  ;; file name completion.
-  (let ((v (tramp-dissect-file-name file t)))
-    ;; Run the command on the localname portion only.
-    (tramp-make-tramp-file-name
-     (tramp-file-name-method v)
-     (tramp-file-name-user v)
-     (tramp-file-name-host v)
-     (tramp-run-real-handler
-      'file-name-directory (list (or (tramp-file-name-localname v) ""))))))
-
-(defun tramp-handle-file-name-nondirectory (file)
-  "Like `file-name-nondirectory' but aware of Tramp files."
-  (with-parsed-tramp-file-name file nil
-    (tramp-run-real-handler 'file-name-nondirectory (list localname))))
-
-(defun tramp-handle-file-truename (filename &optional counter prev-dirs)
-  "Like `file-truename' for Tramp files."
-  (with-parsed-tramp-file-name (expand-file-name filename) nil
-    (with-file-property v localname "file-truename"
-      (let ((result nil))			; result steps in reverse order
-	(tramp-message v 4 "Finding true name for `%s'" filename)
-	(cond
-	 ;; Use GNU readlink --canonicalize-missing where available.
-	 ((tramp-get-remote-readlink v)
-	  (setq result
-		(tramp-send-command-and-read
-		 v
-		 (format "echo \"\\\"`%s --canonicalize-missing %s`\\\"\""
-			 (tramp-get-remote-readlink v)
-			 (tramp-shell-quote-argument localname)))))
-
-	 ;; Use Perl implementation.
-	 ((and (tramp-get-remote-perl v)
-	       (tramp-get-connection-property v "perl-file-spec" nil)
-	       (tramp-get-connection-property v "perl-cwd-realpath" nil))
-	  (tramp-maybe-send-script
-	   v tramp-perl-file-truename "tramp_perl_file_truename")
-	  (setq result
-		(tramp-send-command-and-read
-		 v
-		 (format "tramp_perl_file_truename %s"
-			 (tramp-shell-quote-argument localname)))))
-
-	 ;; Do it yourself.  We bind `directory-sep-char' here for
-	 ;; XEmacs on Windows, which would otherwise use backslash.
-	 (t (let* ((directory-sep-char ?/)
-		   (steps (tramp-compat-split-string localname "/"))
-		   (localnamedir (tramp-run-real-handler
-				  'file-name-as-directory (list localname)))
-		   (is-dir (string= localname localnamedir))
-		   (thisstep nil)
-		   (numchase 0)
-		   ;; Don't make the following value larger than
-		   ;; necessary.  People expect an error message in a
-		   ;; timely fashion when something is wrong;
-		   ;; otherwise they might think that Emacs is hung.
-		   ;; Of course, correctness has to come first.
-		   (numchase-limit 20)
-		   symlink-target)
-	      (while (and steps (< numchase numchase-limit))
-		(setq thisstep (pop steps))
-		(tramp-message
-		 v 5 "Check %s"
-		 (mapconcat 'identity
-			    (append '("") (reverse result) (list thisstep))
-			    "/"))
-		(setq symlink-target
-		      (nth 0 (file-attributes
-			      (tramp-make-tramp-file-name
-			       method user host
-			       (mapconcat 'identity
-					  (append '("")
-						  (reverse result)
-						  (list thisstep))
-					  "/")))))
-		(cond ((string= "." thisstep)
-		       (tramp-message v 5 "Ignoring step `.'"))
-		      ((string= ".." thisstep)
-		       (tramp-message v 5 "Processing step `..'")
-		       (pop result))
-		      ((stringp symlink-target)
-		       ;; It's a symlink, follow it.
-		       (tramp-message v 5 "Follow symlink to %s" symlink-target)
-		       (setq numchase (1+ numchase))
-		       (when (file-name-absolute-p symlink-target)
-			 (setq result nil))
-		       ;; If the symlink was absolute, we'll get a string like
-		       ;; "/user@host:/some/target"; extract the
-		       ;; "/some/target" part from it.
-		       (when (tramp-tramp-file-p symlink-target)
-			 (unless (tramp-equal-remote filename symlink-target)
-			   (tramp-error
-			    v 'file-error
-			    "Symlink target `%s' on wrong host" symlink-target))
-			 (setq symlink-target localname))
-		       (setq steps
-			     (append (tramp-compat-split-string
-				      symlink-target "/")
-				     steps)))
-		      (t
-		       ;; It's a file.
-		       (setq result (cons thisstep result)))))
-	      (when (>= numchase numchase-limit)
-		(tramp-error
-		 v 'file-error
-		 "Maximum number (%d) of symlinks exceeded" numchase-limit))
-	      (setq result (reverse result))
-	      ;; Combine list to form string.
-	      (setq result
-		    (if result
-			(mapconcat 'identity (cons "" result) "/")
-		      "/"))
-	      (when (and is-dir (or (string= "" result)
-				    (not (string= (substring result -1) "/"))))
-		(setq result (concat result "/"))))))
-
-        (tramp-message v 4 "True name of `%s' is `%s'" filename result)
-        (tramp-make-tramp-file-name method user host result)))))
-
-;; Basic functions.
-
-(defun tramp-handle-file-exists-p (filename)
-  "Like `file-exists-p' for Tramp files."
-  (with-parsed-tramp-file-name filename nil
-    (with-file-property v localname "file-exists-p"
-      (or (not (null (tramp-get-file-property
-                      v localname "file-attributes-integer" nil)))
-          (not (null (tramp-get-file-property
-                      v localname "file-attributes-string" nil)))
-          (zerop (tramp-send-command-and-check
-                  v
-                  (format
-                   "%s %s"
-                   (tramp-get-file-exists-command v)
-                   (tramp-shell-quote-argument localname))))))))
-
 ;; Inodes don't exist for some file systems.  Therefore we must
 ;; generate virtual ones.  Used in `find-buffer-visiting'.  The method
 ;; applied might be not so efficient (Ange-FTP uses hashes). But
@@ -2929,428 +1605,6 @@
 (defvar tramp-devices nil
   "Keeps virtual device numbers.")
 
-;; CCC: This should check for an error condition and signal failure
-;;      when something goes wrong.
-;; Daniel Pittman <daniel@danann.net>
-(defun tramp-handle-file-attributes (filename &optional id-format)
-  "Like `file-attributes' for Tramp files."
-  (unless id-format (setq id-format 'integer))
-  ;; Don't modify `last-coding-system-used' by accident.
-  (let ((last-coding-system-used last-coding-system-used))
-    (with-parsed-tramp-file-name (expand-file-name filename) nil
-      (with-file-property v localname (format "file-attributes-%s" id-format)
-	(save-excursion
-	  (tramp-convert-file-attributes
-	   v
-	   (cond
-	    ((tramp-get-remote-stat v)
-	     (tramp-do-file-attributes-with-stat v localname id-format))
-	    ((tramp-get-remote-perl v)
-	     (tramp-do-file-attributes-with-perl v localname id-format))
-	    (t
-	     (tramp-do-file-attributes-with-ls v localname id-format)))))))))
-
-(defun tramp-do-file-attributes-with-ls (vec localname &optional id-format)
-  "Implement `file-attributes' for Tramp files using the ls(1) command."
-  (let (symlinkp dirp
-		 res-inode res-filemodes res-numlinks
-		 res-uid res-gid res-size res-symlink-target)
-    (tramp-message vec 5 "file attributes with ls: %s" localname)
-    (tramp-send-command
-     vec
-     (format "(%s %s || %s -h %s) && %s %s %s"
-	     (tramp-get-file-exists-command vec)
-	     (tramp-shell-quote-argument localname)
-	     (tramp-get-test-command vec)
-	     (tramp-shell-quote-argument localname)
-	     (tramp-get-ls-command vec)
-	     (if (eq id-format 'integer) "-ildn" "-ild")
-	     (tramp-shell-quote-argument localname)))
-    ;; parse `ls -l' output ...
-    (with-current-buffer (tramp-get-buffer vec)
-      (when (> (buffer-size) 0)
-        (goto-char (point-min))
-        ;; ... inode
-        (setq res-inode
-              (condition-case err
-                  (read (current-buffer))
-                (invalid-read-syntax
-                 (when (and (equal (cadr err)
-                                   "Integer constant overflow in reader")
-                            (string-match
-                             "^[0-9]+\\([0-9][0-9][0-9][0-9][0-9]\\)\\'"
-                             (car (cddr err))))
-                   (let* ((big (read (substring (car (cddr err)) 0
-                                                (match-beginning 1))))
-                          (small (read (match-string 1 (car (cddr err)))))
-                          (twiddle (/ small 65536)))
-                     (cons (+ big twiddle)
-                           (- small (* twiddle 65536))))))))
-        ;; ... file mode flags
-        (setq res-filemodes (symbol-name (read (current-buffer))))
-        ;; ... number links
-        (setq res-numlinks (read (current-buffer)))
-        ;; ... uid and gid
-        (setq res-uid (read (current-buffer)))
-        (setq res-gid (read (current-buffer)))
-        (if (eq id-format 'integer)
-            (progn
-              (unless (numberp res-uid) (setq res-uid -1))
-              (unless (numberp res-gid) (setq res-gid -1)))
-          (progn
-            (unless (stringp res-uid) (setq res-uid (symbol-name res-uid)))
-            (unless (stringp res-gid) (setq res-gid (symbol-name res-gid)))))
-        ;; ... size
-        (setq res-size (read (current-buffer)))
-        ;; From the file modes, figure out other stuff.
-        (setq symlinkp (eq ?l (aref res-filemodes 0)))
-        (setq dirp (eq ?d (aref res-filemodes 0)))
-        ;; if symlink, find out file name pointed to
-        (when symlinkp
-          (search-forward "-> ")
-          (setq res-symlink-target
-                (buffer-substring (point) (tramp-compat-line-end-position))))
-        ;; return data gathered
-        (list
-         ;; 0. t for directory, string (name linked to) for symbolic
-         ;; link, or nil.
-         (or dirp res-symlink-target)
-         ;; 1. Number of links to file.
-         res-numlinks
-         ;; 2. File uid.
-         res-uid
-         ;; 3. File gid.
-         res-gid
-         ;; 4. Last access time, as a list of two integers. First
-         ;; integer has high-order 16 bits of time, second has low 16
-         ;; bits.
-         ;; 5. Last modification time, likewise.
-         ;; 6. Last status change time, likewise.
-         '(0 0) '(0 0) '(0 0)		;CCC how to find out?
-         ;; 7. Size in bytes (-1, if number is out of range).
-         res-size
-         ;; 8. File modes, as a string of ten letters or dashes as in ls -l.
-         res-filemodes
-         ;; 9. t if file's gid would change if file were deleted and
-         ;; recreated.  Will be set in `tramp-convert-file-attributes'
-         t
-         ;; 10. inode number.
-         res-inode
-         ;; 11. Device number.  Will be replaced by a virtual device number.
-         -1
-         )))))
-
-(defun tramp-do-file-attributes-with-perl
-  (vec localname &optional id-format)
-  "Implement `file-attributes' for Tramp files using a Perl script."
-  (tramp-message vec 5 "file attributes with perl: %s" localname)
-  (tramp-maybe-send-script
-   vec tramp-perl-file-attributes "tramp_perl_file_attributes")
-  (tramp-send-command-and-read
-   vec
-   (format "tramp_perl_file_attributes %s %s"
-	   (tramp-shell-quote-argument localname) id-format)))
-
-(defun tramp-do-file-attributes-with-stat
-  (vec localname &optional id-format)
-  "Implement `file-attributes' for Tramp files using stat(1) command."
-  (tramp-message vec 5 "file attributes with stat: %s" localname)
-  (tramp-send-command-and-read
-   vec
-   (format
-    ;; On Opsware, pdksh (which is the true name of ksh there) doesn't
-    ;; parse correctly the sequence "((".  Therefore, we add a space.
-    "( (%s %s || %s -h %s) && %s -c '( (\"%%N\") %%h %s %s %%X.0 %%Y.0 %%Z.0 %%s.0 \"%%A\" t %%i.0 -1)' %s || echo nil)"
-    (tramp-get-file-exists-command vec)
-    (tramp-shell-quote-argument localname)
-    (tramp-get-test-command vec)
-    (tramp-shell-quote-argument localname)
-    (tramp-get-remote-stat vec)
-    (if (eq id-format 'integer) "%u" "\"%U\"")
-    (if (eq id-format 'integer) "%g" "\"%G\"")
-    (tramp-shell-quote-argument localname))))
-
-(defun tramp-handle-set-visited-file-modtime (&optional time-list)
-  "Like `set-visited-file-modtime' for Tramp files."
-  (unless (buffer-file-name)
-    (error "Can't set-visited-file-modtime: buffer `%s' not visiting a file"
-	   (buffer-name)))
-  (if time-list
-      (tramp-run-real-handler 'set-visited-file-modtime (list time-list))
-    (let ((f (buffer-file-name))
-	  coding-system-used)
-      (with-parsed-tramp-file-name f nil
-	(let* ((attr (file-attributes f))
-	       ;; '(-1 65535) means file doesn't exists yet.
-	       (modtime (or (nth 5 attr) '(-1 65535))))
-	  (when (boundp 'last-coding-system-used)
-	    (setq coding-system-used (symbol-value 'last-coding-system-used)))
-	  ;; We use '(0 0) as a don't-know value.  See also
-	  ;; `tramp-do-file-attributes-with-ls'.
-	  (if (not (equal modtime '(0 0)))
-	      (tramp-run-real-handler 'set-visited-file-modtime (list modtime))
-	    (progn
-	      (tramp-send-command
-	       v
-	       (format "%s -ild %s"
-		       (tramp-get-ls-command v)
-		       (tramp-shell-quote-argument localname)))
-	      (setq attr (buffer-substring (point)
-					   (progn (end-of-line) (point)))))
-	    (tramp-set-file-property
-	     v localname "visited-file-modtime-ild" attr))
-	  (when (boundp 'last-coding-system-used)
-	    (set 'last-coding-system-used coding-system-used))
-	  nil)))))
-
-;; This function makes the same assumption as
-;; `tramp-handle-set-visited-file-modtime'.
-(defun tramp-handle-verify-visited-file-modtime (buf)
-  "Like `verify-visited-file-modtime' for Tramp files.
-At the time `verify-visited-file-modtime' calls this function, we
-already know that the buffer is visiting a file and that
-`visited-file-modtime' does not return 0.  Do not call this
-function directly, unless those two cases are already taken care
-of."
-  (with-current-buffer buf
-    (let ((f (buffer-file-name)))
-      ;; There is no file visiting the buffer, or the buffer has no
-      ;; recorded last modification time, or there is no established
-      ;; connection.
-      (if (or (not f)
-	      (eq (visited-file-modtime) 0)
-	      (not (tramp-file-name-handler 'file-remote-p f nil 'connected)))
-	  t
-	(with-parsed-tramp-file-name f nil
-	  (tramp-flush-file-property v localname)
-	  (let* ((attr (file-attributes f))
-		 (modtime (nth 5 attr))
-		 (mt (visited-file-modtime)))
-
-	    (cond
-	     ;; File exists, and has a known modtime.
-	     ((and attr (not (equal modtime '(0 0))))
-	      (< (abs (tramp-time-diff
-		       modtime
-		       ;; For compatibility, deal with both the old
-		       ;; (HIGH . LOW) and the new (HIGH LOW) return
-		       ;; values of `visited-file-modtime'.
-		       (if (atom (cdr mt))
-			   (list (car mt) (cdr mt))
-			 mt)))
-		 2))
-	     ;; Modtime has the don't know value.
-	     (attr
-	      (tramp-send-command
-	       v
-	       (format "%s -ild %s"
-		       (tramp-get-ls-command v)
-		       (tramp-shell-quote-argument localname)))
-	      (with-current-buffer (tramp-get-buffer v)
-		(setq attr (buffer-substring
-			    (point) (progn (end-of-line) (point)))))
-	      (equal
-	       attr
-	       (tramp-get-file-property
-		v localname "visited-file-modtime-ild" "")))
-	     ;; If file does not exist, say it is not modified if and
-	     ;; only if that agrees with the buffer's record.
-	     (t (equal mt '(-1 65535))))))))))
-
-(defun tramp-handle-set-file-modes (filename mode)
-  "Like `set-file-modes' for Tramp files."
-  (with-parsed-tramp-file-name filename nil
-    (tramp-flush-file-property v localname)
-    (unless (zerop (tramp-send-command-and-check
-		    v
-		    (format "chmod %s %s"
-			    (tramp-compat-decimal-to-octal mode)
-			    (tramp-shell-quote-argument localname))))
-      ;; FIXME: extract the proper text from chmod's stderr.
-      (tramp-error
-       v 'file-error "Error while changing file's mode %s" filename))))
-
-(defun tramp-handle-set-file-times (filename &optional time)
-  "Like `set-file-times' for Tramp files."
-  (zerop
-   (if (file-remote-p filename)
-       (with-parsed-tramp-file-name filename nil
-	 (tramp-flush-file-property v localname)
-	 (let ((time (if (or (null time) (equal time '(0 0)))
-			 (current-time)
-		       time))
-	       ;; With GNU Emacs, `format-time-string' has an optional
-	       ;; parameter UNIVERSAL.  This is preferred, because we
-	       ;; could handle the case when the remote host is
-	       ;; located in a different time zone as the local host.
-	       (utc (not (featurep 'xemacs))))
-	   (tramp-send-command-and-check
-	    v (format "%s touch -t %s %s"
-		      (if utc "TZ=UTC; export TZ;" "")
-		      (if utc
-			  (format-time-string "%Y%m%d%H%M.%S" time t)
-			(format-time-string "%Y%m%d%H%M.%S" time))
-		      (tramp-shell-quote-argument localname)))))
-
-     ;; We handle also the local part, because in older Emacsen,
-     ;; without `set-file-times', this function is an alias for this.
-     ;; We are local, so we don't need the UTC settings.
-     (tramp-compat-call-process
-      "touch" nil nil nil "-t"
-      (format-time-string "%Y%m%d%H%M.%S" time)
-      (tramp-shell-quote-argument filename)))))
-
-(defun tramp-set-file-uid-gid (filename &optional uid gid)
-  "Set the ownership for FILENAME.
-If UID and GID are provided, these values are used; otherwise uid
-and gid of the corresponding user is taken.  Both parameters must be integers."
-  ;; Modern Unices allow chown only for root.  So we might need
-  ;; another implementation, see `dired-do-chown'.  OTOH, it is mostly
-  ;; working with su(do)? when it is needed, so it shall succeed in
-  ;; the majority of cases.
-  ;; Don't modify `last-coding-system-used' by accident.
-  (let ((last-coding-system-used last-coding-system-used))
-    (if (file-remote-p filename)
-	(with-parsed-tramp-file-name filename nil
-	  (if (and (zerop (user-uid)) (tramp-local-host-p v))
-	      ;; If we are root on the local host, we can do it directly.
-	      (tramp-set-file-uid-gid localname uid gid)
-	    (let ((uid (or (and (integerp uid) uid)
-			   (tramp-get-remote-uid v 'integer)))
-		  (gid (or (and (integerp gid) gid)
-			   (tramp-get-remote-gid v 'integer))))
-	      (tramp-send-command
-	       v (format
-		  "chown %d:%d %s" uid gid
-		  (tramp-shell-quote-argument localname))))))
-
-      ;; We handle also the local part, because there doesn't exist
-      ;; `set-file-uid-gid'.  On W32 "chown" might not work.
-      (let ((uid (or (and (integerp uid) uid) (tramp-get-local-uid 'integer)))
-	    (gid (or (and (integerp gid) gid) (tramp-get-local-gid 'integer))))
-	(tramp-compat-call-process
-	 "chown" nil nil nil
-         (format "%d:%d" uid gid) (tramp-shell-quote-argument filename))))))
-
-(defun tramp-remote-selinux-p (vec)
-  "Check, whether SELINUX is enabled on the remote host."
-  (with-connection-property (tramp-get-connection-process vec) "selinux-p"
-    (let ((result (tramp-find-executable
-		   vec "getenforce" (tramp-get-remote-path vec) t t)))
-      (and result
-	   (string-equal
-	    (tramp-send-command-and-read
-	     vec (format "echo \\\"`%S`\\\"" result))
-	    "Enforcing")))))
-
-(defun tramp-handle-file-selinux-context (filename)
-  "Like `file-selinux-context' for Tramp files."
-  (with-parsed-tramp-file-name filename nil
-    (with-file-property v localname "file-selinux-context"
-      (let ((context '(nil nil nil nil))
-	    (regexp (concat "\\([a-z0-9_]+\\):" "\\([a-z0-9_]+\\):"
-			    "\\([a-z0-9_]+\\):" "\\([a-z0-9_]+\\)")))
-	(when (and (tramp-remote-selinux-p v)
-		   (zerop (tramp-send-command-and-check
-			   v (format
-			      "%s -d -Z %s"
-			      (tramp-get-ls-command v)
-			      (tramp-shell-quote-argument localname)))))
-	  (with-current-buffer (tramp-get-connection-buffer v)
-	    (goto-char (point-min))
-	    (when (re-search-forward regexp (tramp-compat-line-end-position) t)
-	      (setq context (list (match-string 1) (match-string 2)
-				  (match-string 3) (match-string 4))))))
-	;; Return the context.
-	context))))
-
-(defun tramp-handle-set-file-selinux-context (filename context)
-  "Like `set-file-selinux-context' for Tramp files."
-  (with-parsed-tramp-file-name filename nil
-    (if (and (consp context)
-	     (tramp-remote-selinux-p v)
-	     (zerop (tramp-send-command-and-check
-		     v (format "chcon %s %s %s %s %s"
-			       (if (stringp (nth 0 context))
-				   (format "--user=%s" (nth 0 context)) "")
-			       (if (stringp (nth 1 context))
-				   (format "--role=%s" (nth 1 context)) "")
-			       (if (stringp (nth 2 context))
-				   (format "--type=%s" (nth 2 context)) "")
-			       (if (stringp (nth 3 context))
-				   (format "--range=%s" (nth 3 context)) "")
-			       (tramp-shell-quote-argument localname)))))
-	(tramp-set-file-property v localname "file-selinux-context" context)
-      (tramp-set-file-property v localname "file-selinux-context" 'undef)))
-  ;; We always return nil.
-  nil)
-
-;; Simple functions using the `test' command.
-
-(defun tramp-handle-file-executable-p (filename)
-  "Like `file-executable-p' for Tramp files."
-  (with-parsed-tramp-file-name filename nil
-    (with-file-property v localname "file-executable-p"
-      ;; Examine `file-attributes' cache to see if request can be
-      ;; satisfied without remote operation.
-      (or (tramp-check-cached-permissions v ?x)
-          (zerop (tramp-run-test "-x" filename))))))
-
-(defun tramp-handle-file-readable-p (filename)
-  "Like `file-readable-p' for Tramp files."
-  (with-parsed-tramp-file-name filename nil
-    (with-file-property v localname "file-readable-p"
-      ;; Examine `file-attributes' cache to see if request can be
-      ;; satisfied without remote operation.
-      (or (tramp-check-cached-permissions v ?r)
-          (zerop (tramp-run-test "-r" filename))))))
-
-;; When the remote shell is started, it looks for a shell which groks
-;; tilde expansion.  Here, we assume that all shells which grok tilde
-;; expansion will also provide a `test' command which groks `-nt' (for
-;; newer than).  If this breaks, tell me about it and I'll try to do
-;; something smarter about it.
-(defun tramp-handle-file-newer-than-file-p (file1 file2)
-  "Like `file-newer-than-file-p' for Tramp files."
-  (cond ((not (file-exists-p file1))
-         nil)
-        ((not (file-exists-p file2))
-         t)
-        ;; We are sure both files exist at this point.
-        (t
-         (save-excursion
-	   ;; We try to get the mtime of both files.  If they are not
-	   ;; equal to the "dont-know" value, then we subtract the times
-	   ;; and obtain the result.
-	   (let ((fa1 (file-attributes file1))
-		 (fa2 (file-attributes file2)))
-	     (if (and (not (equal (nth 5 fa1) '(0 0)))
-		      (not (equal (nth 5 fa2) '(0 0))))
-		 (> 0 (tramp-time-diff (nth 5 fa2) (nth 5 fa1)))
-	       ;; If one of them is the dont-know value, then we can
-	       ;; still try to run a shell command on the remote host.
-	       ;; However, this only works if both files are Tramp
-	       ;; files and both have the same method, same user, same
-	       ;; host.
-	       (unless (tramp-equal-remote file1 file2)
-		 (with-parsed-tramp-file-name
-		     (if (tramp-tramp-file-p file1) file1 file2) nil
-		   (tramp-error
-		    v 'file-error
-		    "Files %s and %s must have same method, user, host"
-		    file1 file2)))
-	       (with-parsed-tramp-file-name file1 nil
-		 (zerop (tramp-run-test2
-			 (tramp-get-test-nt-command v) file1 file2)))))))))
-
-;; Functions implemented using the basic functions above.
-
-(defun tramp-handle-file-modes (filename)
-  "Like `file-modes' for Tramp files."
-  (let ((truename (or (file-truename filename) filename)))
-    (when (file-exists-p truename)
-      (tramp-mode-string-to-int (nth 8 (file-attributes truename))))))
-
 (defun tramp-default-file-modes (filename)
   "Return file modes of FILENAME as integer.
 If the file modes of FILENAME cannot be determined, return the
@@ -3358,1212 +1612,6 @@
   (or (file-modes filename)
       (logand (default-file-modes) (tramp-compat-octal-to-decimal "0666"))))
 
-(defun tramp-handle-file-directory-p (filename)
-  "Like `file-directory-p' for Tramp files."
-  ;; Care must be taken that this function returns `t' for symlinks
-  ;; pointing to directories.  Surely the most obvious implementation
-  ;; would be `test -d', but that returns false for such symlinks.
-  ;; CCC: Stefan Monnier says that `test -d' follows symlinks.  And
-  ;; I now think he's right.  So we could be using `test -d', couldn't
-  ;; we?
-  ;;
-  ;; Alternatives: `cd %s', `test -d %s'
-  (with-parsed-tramp-file-name filename nil
-    (with-file-property v localname "file-directory-p"
-      (zerop (tramp-run-test "-d" filename)))))
-
-(defun tramp-handle-file-regular-p (filename)
-  "Like `file-regular-p' for Tramp files."
-  (and (file-exists-p filename)
-       (eq ?- (aref (nth 8 (file-attributes filename)) 0))))
-
-(defun tramp-handle-file-symlink-p (filename)
-  "Like `file-symlink-p' for Tramp files."
-  (with-parsed-tramp-file-name filename nil
-    (let ((x (car (file-attributes filename))))
-      (when (stringp x)
-	;; When Tramp is running on VMS, then `file-name-absolute-p'
-	;; might do weird things.
-	(if (file-name-absolute-p x)
-	    (tramp-make-tramp-file-name method user host x)
-	  x)))))
-
-(defun tramp-handle-file-writable-p (filename)
-  "Like `file-writable-p' for Tramp files."
-  (with-parsed-tramp-file-name filename nil
-    (with-file-property v localname "file-writable-p"
-      (if (file-exists-p filename)
-	  ;; Examine `file-attributes' cache to see if request can be
-	  ;; satisfied without remote operation.
-          (or (tramp-check-cached-permissions v ?w)
-              (zerop (tramp-run-test "-w" filename)))
-	;; If file doesn't exist, check if directory is writable.
-	(and (zerop (tramp-run-test
-		     "-d" (file-name-directory filename)))
-	     (zerop (tramp-run-test
-		     "-w" (file-name-directory filename))))))))
-
-(defun tramp-handle-file-ownership-preserved-p (filename)
-  "Like `file-ownership-preserved-p' for Tramp files."
-  (with-parsed-tramp-file-name filename nil
-    (with-file-property v localname "file-ownership-preserved-p"
-      (let ((attributes (file-attributes filename)))
-	;; Return t if the file doesn't exist, since it's true that no
-	;; information would be lost by an (attempted) delete and create.
-	(or (null attributes)
-	    (= (nth 2 attributes) (tramp-get-remote-uid v 'integer)))))))
-
-;; Other file name ops.
-
-(defun tramp-handle-directory-file-name (directory)
-  "Like `directory-file-name' for Tramp files."
-  ;; If localname component of filename is "/", leave it unchanged.
-  ;; Otherwise, remove any trailing slash from localname component.
-  ;; Method, host, etc, are unchanged.  Does it make sense to try
-  ;; to avoid parsing the filename?
-  (with-parsed-tramp-file-name directory nil
-    (if (and (not (zerop (length localname)))
-	     (eq (aref localname (1- (length localname))) ?/)
-	     (not (string= localname "/")))
-	(substring directory 0 -1)
-      directory)))
-
-;; Directory listings.
-
-(defun tramp-handle-directory-files
-  (directory &optional full match nosort files-only)
-  "Like `directory-files' for Tramp files."
-  ;; FILES-ONLY is valid for XEmacs only.
-  (when (file-directory-p directory)
-    (setq directory (file-name-as-directory (expand-file-name directory)))
-    (let ((temp (nreverse (file-name-all-completions "" directory)))
-	  result item)
-
-      (while temp
-	(setq item (directory-file-name (pop temp)))
-	(when (and (or (null match) (string-match match item))
-		   (or (null files-only)
-		       ;; Files only.
-		       (and (equal files-only t) (file-regular-p item))
-		       ;; Directories only.
-		       (file-directory-p item)))
-	  (push (if full (concat directory item) item)
-		result)))
-      (if nosort result (sort result 'string<)))))
-
-(defun tramp-handle-directory-files-and-attributes
-  (directory &optional full match nosort id-format)
-  "Like `directory-files-and-attributes' for Tramp files."
-  (unless id-format (setq id-format 'integer))
-  (when (file-directory-p directory)
-    (setq directory (expand-file-name directory))
-    (let* ((temp
-	    (copy-tree
-	     (with-parsed-tramp-file-name directory nil
-	       (with-file-property
-		   v localname
-		   (format "directory-files-and-attributes-%s" id-format)
-		 (save-excursion
-		   (mapcar
-		    (lambda (x)
-		      (cons (car x)
-			    (tramp-convert-file-attributes v (cdr x))))
-		    (cond
-		     ((tramp-get-remote-stat v)
-		      (tramp-do-directory-files-and-attributes-with-stat
-		       v localname id-format))
-		     ((tramp-get-remote-perl v)
-		      (tramp-do-directory-files-and-attributes-with-perl
-		       v localname id-format)))))))))
-	   result item)
-
-      (while temp
-	(setq item (pop temp))
-	(when (or (null match) (string-match match (car item)))
-	  (when full
-	    (setcar item (expand-file-name (car item) directory)))
-	  (push item result)))
-
-      (if nosort
-	  result
-	(sort result (lambda (x y) (string< (car x) (car y))))))))
-
-(defun tramp-do-directory-files-and-attributes-with-perl
-  (vec localname &optional id-format)
-  "Implement `directory-files-and-attributes' for Tramp files using a Perl script."
-  (tramp-message vec 5 "directory-files-and-attributes with perl: %s" localname)
-  (tramp-maybe-send-script
-   vec tramp-perl-directory-files-and-attributes
-   "tramp_perl_directory_files_and_attributes")
-  (let ((object
-	 (tramp-send-command-and-read
-	  vec
-	  (format "tramp_perl_directory_files_and_attributes %s %s"
-		  (tramp-shell-quote-argument localname) id-format))))
-    (when (stringp object) (tramp-error vec 'file-error object))
-    object))
-
-(defun tramp-do-directory-files-and-attributes-with-stat
-  (vec localname &optional id-format)
-  "Implement `directory-files-and-attributes' for Tramp files using stat(1) command."
-  (tramp-message vec 5 "directory-files-and-attributes with stat: %s" localname)
-  (tramp-send-command-and-read
-   vec
-   (format
-    (concat
-     ;; We must care about filenames with spaces, or starting with
-     ;; "-"; this would confuse xargs.  "ls -aQ" might be a solution,
-     ;; but it does not work on all remote systems.  Therefore, we
-     ;; quote the filenames via sed.
-     "cd %s; echo \"(\"; (%s -a | sed -e s/\\$/\\\"/g -e s/^/\\\"/g | xargs "
-     "%s -c '(\"%%n\" (\"%%N\") %%h %s %s %%X.0 %%Y.0 %%Z.0 %%s.0 \"%%A\" t %%i.0 -1)'); "
-     "echo \")\"")
-    (tramp-shell-quote-argument localname)
-    (tramp-get-ls-command vec)
-    (tramp-get-remote-stat vec)
-    (if (eq id-format 'integer) "%u" "\"%U\"")
-    (if (eq id-format 'integer) "%g" "\"%G\""))))
-
-;; This function should return "foo/" for directories and "bar" for
-;; files.
-(defun tramp-handle-file-name-all-completions (filename directory)
-  "Like `file-name-all-completions' for Tramp files."
-  (unless (save-match-data (string-match "/" filename))
-    (with-parsed-tramp-file-name (expand-file-name directory) nil
-
-      (all-completions
-       filename
-       (mapcar
-	'list
-        (or
-         ;; Try cache first
-         (and
-          ;; Ignore if expired
-          (or (not (integerp tramp-completion-reread-directory-timeout))
-              (<= (tramp-time-diff
-                   (current-time)
-                   (tramp-get-file-property
-                    v localname "last-completion" '(0 0 0)))
-                  tramp-completion-reread-directory-timeout))
-
-          ;; Try cache entries for filename, filename with last
-          ;; character removed, filename with last two characters
-          ;; removed, ..., and finally the empty string - all
-          ;; concatenated to the local directory name
-
-          ;; This is inefficient for very long filenames, pity
-          ;; `reduce' is not available...
-          (car
-           (apply
-            'append
-            (mapcar
-             (lambda (x)
-               (let ((cache-hit
-                      (tramp-get-file-property
-                       v
-                       (concat localname (substring filename 0 x))
-                       "file-name-all-completions"
-                       nil)))
-                 (when cache-hit (list cache-hit))))
-             (tramp-compat-number-sequence (length filename) 0 -1)))))
-
-         ;; Cache expired or no matching cache entry found so we need
-         ;; to perform a remote operation
-         (let (result)
-           ;; Get a list of directories and files, including reliably
-           ;; tagging the directories with a trailing '/'.  Because I
-           ;; rock.  --daniel@danann.net
-
-           ;; Changed to perform `cd' in the same remote op and only
-           ;; get entries starting with `filename'. Capture any `cd'
-           ;; error messages.  Ensure any `cd' and `echo' aliases are
-           ;; ignored.
-           (tramp-send-command
-            v
-            (if (tramp-get-remote-perl v)
-                (progn
-                  (tramp-maybe-send-script
-                   v tramp-perl-file-name-all-completions
-                   "tramp_perl_file_name_all_completions")
-                  (format "tramp_perl_file_name_all_completions %s %s %d"
-                          (tramp-shell-quote-argument localname)
-                          (tramp-shell-quote-argument filename)
-                          (if (symbol-value
-			       ;; `read-file-name-completion-ignore-case'
-			       ;; is introduced with Emacs 22.1.
-			       (if (boundp
-				    'read-file-name-completion-ignore-case)
-				   'read-file-name-completion-ignore-case
-				 'completion-ignore-case))
-			      1 0)))
-
-              (format (concat
-                       "(\\cd %s 2>&1 && (%s %s -a 2>/dev/null"
-                       ;; `ls' with wildcard might fail with `Argument
-                       ;; list too long' error in some corner cases; if
-                       ;; `ls' fails after `cd' succeeded, chances are
-                       ;; that's the case, so let's retry without
-                       ;; wildcard.  This will return "too many" entries
-                       ;; but that isn't harmful.
-                       " || %s -a 2>/dev/null)"
-                       " | while read f; do"
-                       " if %s -d \"$f\" 2>/dev/null;"
-                       " then \\echo \"$f/\"; else \\echo \"$f\"; fi; done"
-                       " && \\echo ok) || \\echo fail")
-                      (tramp-shell-quote-argument localname)
-                      (tramp-get-ls-command v)
-                      ;; When `filename' is empty, just `ls' without
-                      ;; filename argument is more efficient than `ls *'
-                      ;; for very large directories and might avoid the
-                      ;; `Argument list too long' error.
-                      ;;
-                      ;; With and only with wildcard, we need to add
-                      ;; `-d' to prevent `ls' from descending into
-                      ;; sub-directories.
-                      (if (zerop (length filename))
-                          "."
-                        (concat (tramp-shell-quote-argument filename) "* -d"))
-                      (tramp-get-ls-command v)
-                      (tramp-get-test-command v))))
-
-           ;; Now grab the output.
-           (with-current-buffer (tramp-get-buffer v)
-             (goto-char (point-max))
-
-             ;; Check result code, found in last line of output
-             (forward-line -1)
-             (if (looking-at "^fail$")
-                 (progn
-                   ;; Grab error message from line before last line
-                   ;; (it was put there by `cd 2>&1')
-                   (forward-line -1)
-                   (tramp-error
-                    v 'file-error
-                    "tramp-handle-file-name-all-completions: %s"
-                    (buffer-substring
-                     (point) (tramp-compat-line-end-position))))
-               ;; For peace of mind, if buffer doesn't end in `fail'
-               ;; then it should end in `ok'.  If neither are in the
-               ;; buffer something went seriously wrong on the remote
-               ;; side.
-               (unless (looking-at "^ok$")
-                 (tramp-error
-                  v 'file-error
-                  "\
-tramp-handle-file-name-all-completions: internal error accessing `%s': `%s'"
-                  (tramp-shell-quote-argument localname) (buffer-string))))
-
-             (while (zerop (forward-line -1))
-               (push (buffer-substring
-                      (point) (tramp-compat-line-end-position))
-                     result)))
-
-           ;; Because the remote op went through OK we know the
-           ;; directory we `cd'-ed to exists
-           (tramp-set-file-property
-            v localname "file-exists-p" t)
-
-           ;; Because the remote op went through OK we know every
-           ;; file listed by `ls' exists.
-           (mapc (lambda (entry)
-		   (tramp-set-file-property
-		    v (concat localname entry) "file-exists-p" t))
-		 result)
-
-           (tramp-set-file-property
-            v localname "last-completion" (current-time))
-
-           ;; Store result in the cache
-           (tramp-set-file-property
-            v (concat localname filename)
-            "file-name-all-completions"
-            result))))))))
-
-(defun tramp-handle-file-name-completion
-  (filename directory &optional predicate)
-  "Like `file-name-completion' for Tramp files."
-  (unless (tramp-tramp-file-p directory)
-    (error
-     "tramp-handle-file-name-completion invoked on non-tramp directory `%s'"
-     directory))
-  (try-completion
-   filename
-   (mapcar 'list (file-name-all-completions filename directory))
-   (when predicate
-     (lambda (x) (funcall predicate (expand-file-name (car x) directory))))))
-
-;; cp, mv and ln
-
-(defun tramp-handle-add-name-to-file
-  (filename newname &optional ok-if-already-exists)
-  "Like `add-name-to-file' for Tramp files."
-  (unless (tramp-equal-remote filename newname)
-    (with-parsed-tramp-file-name
-	(if (tramp-tramp-file-p filename) filename newname) nil
-      (tramp-error
-       v 'file-error
-       "add-name-to-file: %s"
-       "only implemented for same method, same user, same host")))
-  (with-parsed-tramp-file-name filename v1
-    (with-parsed-tramp-file-name newname v2
-      (let ((ln (when v1 (tramp-get-remote-ln v1))))
-	(when (and (not ok-if-already-exists)
-		   (file-exists-p newname)
-		   (not (numberp ok-if-already-exists))
-		   (y-or-n-p
-		    (format
-		     "File %s already exists; make it a new name anyway? "
-		     newname)))
-	  (tramp-error
-	   v2 'file-error
-	   "add-name-to-file: file %s already exists" newname))
-	(tramp-flush-file-property v2 (file-name-directory v2-localname))
-	(tramp-flush-file-property v2 v2-localname)
-	(tramp-barf-unless-okay
-	 v1
-	 (format "%s %s %s" ln (tramp-shell-quote-argument v1-localname)
-		 (tramp-shell-quote-argument v2-localname))
-	 "error with add-name-to-file, see buffer `%s' for details"
-	 (buffer-name))))))
-
-(defun tramp-handle-copy-file
-  (filename newname &optional ok-if-already-exists keep-date
-	    preserve-uid-gid preserve-selinux-context)
-  "Like `copy-file' for Tramp files."
-  (setq filename (expand-file-name filename))
-  (setq newname (expand-file-name newname))
-  (cond
-   ;; At least one file a Tramp file?
-   ((or (tramp-tramp-file-p filename)
-	(tramp-tramp-file-p newname))
-    (tramp-do-copy-or-rename-file
-     'copy filename newname ok-if-already-exists keep-date
-     preserve-uid-gid preserve-selinux-context))
-   ;; Compat section.
-   (preserve-selinux-context
-    (tramp-run-real-handler
-     'copy-file
-     (list filename newname ok-if-already-exists keep-date
-	   preserve-uid-gid preserve-selinux-context)))
-   (preserve-uid-gid
-    (tramp-run-real-handler
-     'copy-file
-     (list filename newname ok-if-already-exists keep-date preserve-uid-gid)))
-   (t
-    (tramp-run-real-handler
-     'copy-file (list filename newname ok-if-already-exists keep-date)))))
-
-(defun tramp-handle-copy-directory (dirname newname &optional keep-date parents)
-  "Like `copy-directory' for Tramp files."
-  (let ((t1 (tramp-tramp-file-p dirname))
-	(t2 (tramp-tramp-file-p newname)))
-    (with-parsed-tramp-file-name (if t1 dirname newname) nil
-      (if (and (tramp-get-method-parameter method 'tramp-copy-recursive)
-	       ;; When DIRNAME and NEWNAME are remote, they must have
-	       ;; the same method.
-	       (or (null t1) (null t2)
-		   (string-equal
-		    (tramp-file-name-method (tramp-dissect-file-name dirname))
-		    (tramp-file-name-method (tramp-dissect-file-name newname)))))
-	  ;; scp or rsync DTRT.
-	  (progn
-	    (setq dirname (directory-file-name (expand-file-name dirname))
-		  newname (directory-file-name (expand-file-name newname)))
-	    (if (and (file-directory-p newname)
-		     (not (string-equal (file-name-nondirectory dirname)
-					(file-name-nondirectory newname))))
-		(setq newname
-		      (expand-file-name
-		       (file-name-nondirectory dirname) newname)))
-	    (if (not (file-directory-p (file-name-directory newname)))
-		(make-directory (file-name-directory newname) parents))
-	    (tramp-do-copy-or-rename-file-out-of-band
-	     'copy dirname newname keep-date))
-	;; We must do it file-wise.
-	(tramp-run-real-handler
-	 'copy-directory (list dirname newname keep-date parents)))
-
-      ;; When newname did exist, we have wrong cached values.
-      (when t2
-	(with-parsed-tramp-file-name newname nil
-	  (tramp-flush-file-property v (file-name-directory localname))
-	  (tramp-flush-file-property v localname))))))
-
-(defun tramp-handle-rename-file
-  (filename newname &optional ok-if-already-exists)
-  "Like `rename-file' for Tramp files."
-  ;; Check if both files are local -- invoke normal rename-file.
-  ;; Otherwise, use Tramp from local system.
-  (setq filename (expand-file-name filename))
-  (setq newname (expand-file-name newname))
-  ;; At least one file a Tramp file?
-  (if (or (tramp-tramp-file-p filename)
-          (tramp-tramp-file-p newname))
-      (tramp-do-copy-or-rename-file
-       'rename filename newname ok-if-already-exists t t)
-    (tramp-run-real-handler
-     'rename-file (list filename newname ok-if-already-exists))))
-
-(defun tramp-do-copy-or-rename-file
-  (op filename newname &optional ok-if-already-exists keep-date
-      preserve-uid-gid preserve-selinux-context)
-  "Copy or rename a remote file.
-OP must be `copy' or `rename' and indicates the operation to perform.
-FILENAME specifies the file to copy or rename, NEWNAME is the name of
-the new file (for copy) or the new name of the file (for rename).
-OK-IF-ALREADY-EXISTS means don't barf if NEWNAME exists already.
-KEEP-DATE means to make sure that NEWNAME has the same timestamp
-as FILENAME.  PRESERVE-UID-GID, when non-nil, instructs to keep
-the uid and gid if both files are on the same host.
-PRESERVE-SELINUX-CONTEXT activates selinux commands.
-
-This function is invoked by `tramp-handle-copy-file' and
-`tramp-handle-rename-file'.  It is an error if OP is neither of `copy'
-and `rename'.  FILENAME and NEWNAME must be absolute file names."
-  (unless (memq op '(copy rename))
-    (error "Unknown operation `%s', must be `copy' or `rename'" op))
-  (let ((t1 (tramp-tramp-file-p filename))
-	(t2 (tramp-tramp-file-p newname))
-	(context (and preserve-selinux-context
-		      (apply 'file-selinux-context (list filename))))
-	pr tm)
-
-    (with-parsed-tramp-file-name (if t1 filename newname) nil
-      (when (and (not ok-if-already-exists) (file-exists-p newname))
-	(tramp-error
-	 v 'file-already-exists "File %s already exists" newname))
-
-      (with-progress-reporter
-	  v 0 (format "%s %s to %s"
-		      (if (eq op 'copy) "Copying" "Renaming")
-		      filename newname)
-
-	(cond
-	 ;; Both are Tramp files.
-	 ((and t1 t2)
-	  (with-parsed-tramp-file-name filename v1
-	    (with-parsed-tramp-file-name newname v2
-	      (cond
-	       ;; Shortcut: if method, host, user are the same for
-	       ;; both files, we invoke `cp' or `mv' on the remote
-	       ;; host directly.
-	       ((tramp-equal-remote filename newname)
-		(tramp-do-copy-or-rename-file-directly
-		 op filename newname
-		 ok-if-already-exists keep-date preserve-uid-gid))
-
-	       ;; Try out-of-band operation.
-	       ((tramp-method-out-of-band-p
-		 v1 (nth 7 (file-attributes filename)))
-		(tramp-do-copy-or-rename-file-out-of-band
-		 op filename newname keep-date))
-
-	       ;; No shortcut was possible.  So we copy the file
-	       ;; first.  If the operation was `rename', we go back
-	       ;; and delete the original file (if the copy was
-	       ;; successful).  The approach is simple-minded: we
-	       ;; create a new buffer, insert the contents of the
-	       ;; source file into it, then write out the buffer to
-	       ;; the target file.  The advantage is that it doesn't
-	       ;; matter which filename handlers are used for the
-	       ;; source and target file.
-	       (t
-		(tramp-do-copy-or-rename-file-via-buffer
-		 op filename newname keep-date))))))
-
-	 ;; One file is a Tramp file, the other one is local.
-	 ((or t1 t2)
-	  (cond
-	   ;; Fast track on local machine.
-	   ((tramp-local-host-p v)
-	    (tramp-do-copy-or-rename-file-directly
-	     op filename newname
-	     ok-if-already-exists keep-date preserve-uid-gid))
-
-	   ;; If the Tramp file has an out-of-band method, the
-	   ;; corresponding copy-program can be invoked.
-	   ((tramp-method-out-of-band-p v (nth 7 (file-attributes filename)))
-	    (tramp-do-copy-or-rename-file-out-of-band
-	     op filename newname keep-date))
-
-	   ;; Use the inline method via a Tramp buffer.
-	   (t (tramp-do-copy-or-rename-file-via-buffer
-	       op filename newname keep-date))))
-
-	 (t
-	  ;; One of them must be a Tramp file.
-	  (error "Tramp implementation says this cannot happen")))
-
-	;; Handle `preserve-selinux-context'.
-	(when context (apply 'set-file-selinux-context (list newname context)))
-
-	;; In case of `rename', we must flush the cache of the source file.
-	(when (and t1 (eq op 'rename))
-	  (with-parsed-tramp-file-name filename v1
-	    (tramp-flush-file-property v1 (file-name-directory localname))
-	    (tramp-flush-file-property v1 localname)))
-
-	;; When newname did exist, we have wrong cached values.
-	(when t2
-	  (with-parsed-tramp-file-name newname v2
-	    (tramp-flush-file-property v2 (file-name-directory localname))
-	    (tramp-flush-file-property v2 localname)))))))
-
-(defun tramp-do-copy-or-rename-file-via-buffer (op filename newname keep-date)
-  "Use an Emacs buffer to copy or rename a file.
-First arg OP is either `copy' or `rename' and indicates the operation.
-FILENAME is the source file, NEWNAME the target file.
-KEEP-DATE is non-nil if NEWNAME should have the same timestamp as FILENAME."
-  (with-temp-buffer
-    ;; We must disable multibyte, because binary data shall not be
-    ;; converted.
-    (set-buffer-multibyte nil)
-    (let ((coding-system-for-read 'binary)
-	  (jka-compr-inhibit t))
-      (insert-file-contents-literally filename))
-    ;; We don't want the target file to be compressed, so we let-bind
-    ;; `jka-compr-inhibit' to t.
-    (let ((coding-system-for-write 'binary)
-	  (jka-compr-inhibit t))
-      (write-region (point-min) (point-max) newname)))
-  ;; KEEP-DATE handling.
-  (when keep-date (set-file-times newname (nth 5 (file-attributes filename))))
-  ;; Set the mode.
-  (set-file-modes newname (tramp-default-file-modes filename))
-  ;; If the operation was `rename', delete the original file.
-  (unless (eq op 'copy) (delete-file filename)))
-
-(defun tramp-do-copy-or-rename-file-directly
- (op filename newname ok-if-already-exists keep-date preserve-uid-gid)
-  "Invokes `cp' or `mv' on the remote system.
-OP must be one of `copy' or `rename', indicating `cp' or `mv',
-respectively.  FILENAME specifies the file to copy or rename,
-NEWNAME is the name of the new file (for copy) or the new name of
-the file (for rename).  Both files must reside on the same host.
-KEEP-DATE means to make sure that NEWNAME has the same timestamp
-as FILENAME.  PRESERVE-UID-GID, when non-nil, instructs to keep
-the uid and gid from FILENAME."
-  (let ((t1 (tramp-tramp-file-p filename))
-	(t2 (tramp-tramp-file-p newname))
-	(file-times (nth 5 (file-attributes filename)))
-	(file-modes (tramp-default-file-modes filename)))
-    (with-parsed-tramp-file-name (if t1 filename newname) nil
-      (let* ((cmd (cond ((and (eq op 'copy) preserve-uid-gid) "cp -f -p")
-			((eq op 'copy) "cp -f")
-			((eq op 'rename) "mv -f")
-			(t (tramp-error
-			    v 'file-error
-			    "Unknown operation `%s', must be `copy' or `rename'"
-			    op))))
-	     (localname1
-	      (if t1
-		  (tramp-file-name-handler 'file-remote-p filename 'localname)
-		filename))
-	     (localname2
-	      (if t2
-		  (tramp-file-name-handler 'file-remote-p newname 'localname)
-		newname))
-	     (prefix (file-remote-p (if t1 filename newname)))
-             cmd-result)
-
-	(cond
-	 ;; Both files are on a remote host, with same user.
-	 ((and t1 t2)
-          (setq cmd-result
-                (tramp-send-command-and-check
-                 v
-                 (format "%s %s %s" cmd
-                         (tramp-shell-quote-argument localname1)
-                         (tramp-shell-quote-argument localname2))))
-	  (with-current-buffer (tramp-get-buffer v)
-	    (goto-char (point-min))
-	    (unless
-		(or
-		 (and keep-date
-		      ;; Mask cp -f error.
-		      (re-search-forward
-		       tramp-operation-not-permitted-regexp nil t))
-		 (zerop cmd-result))
-	      (tramp-error-with-buffer
-	       nil v 'file-error
-	       "Copying directly failed, see buffer `%s' for details."
-	       (buffer-name)))))
-
-	 ;; We are on the local host.
-	 ((or t1 t2)
-	  (cond
-	   ;; We can do it directly.
-	   ((let (file-name-handler-alist)
-	      (and (file-readable-p localname1)
-		   (file-writable-p (file-name-directory localname2))
-		   (or (file-directory-p localname2)
-		       (file-writable-p localname2))))
-	    (if (eq op 'copy)
-		(tramp-compat-copy-file
-		 localname1 localname2 ok-if-already-exists
-		 keep-date preserve-uid-gid)
-	      (tramp-run-real-handler
-	       'rename-file (list localname1 localname2 ok-if-already-exists))))
-
-	   ;; We can do it directly with `tramp-send-command'
-	   ((and (file-readable-p (concat prefix localname1))
-		 (file-writable-p
-		  (file-name-directory (concat prefix localname2)))
-		 (or (file-directory-p (concat prefix localname2))
-		     (file-writable-p (concat prefix localname2))))
-	    (tramp-do-copy-or-rename-file-directly
-	     op (concat prefix localname1) (concat prefix localname2)
-	     ok-if-already-exists keep-date t)
-	    ;; We must change the ownership to the local user.
-	    (tramp-set-file-uid-gid
-	     (concat prefix localname2)
-	     (tramp-get-local-uid 'integer)
-	     (tramp-get-local-gid 'integer)))
-
-	   ;; We need a temporary file in between.
-	   (t
-	    ;; Create the temporary file.
-	    (let ((tmpfile (tramp-compat-make-temp-file localname1)))
-	      (unwind-protect
-		  (progn
-		    (cond
-		     (t1
-		      (or
-		       (zerop
-			(tramp-send-command-and-check
-			 v (format
-			    "%s %s %s" cmd
-			    (tramp-shell-quote-argument localname1)
-			    (tramp-shell-quote-argument tmpfile))))
-		       (tramp-error-with-buffer
-			nil v 'file-error
-			"Copying directly failed, see buffer `%s' for details."
-			(tramp-get-buffer v)))
-		      ;; We must change the ownership as remote user.
-		      ;; Since this does not work reliable, we also
-		      ;; give read permissions.
-		      (set-file-modes
-		       (concat prefix tmpfile)
-		       (tramp-compat-octal-to-decimal "0777"))
-		      (tramp-set-file-uid-gid
-		       (concat prefix tmpfile)
-		       (tramp-get-local-uid 'integer)
-		       (tramp-get-local-gid 'integer)))
-		     (t2
-		      (if (eq op 'copy)
-			  (tramp-compat-copy-file
-			   localname1 tmpfile t
-			   keep-date preserve-uid-gid)
-			(tramp-run-real-handler
-			 'rename-file
-			 (list localname1 tmpfile t)))
-		      ;; We must change the ownership as local user.
-		      ;; Since this does not work reliable, we also
-		      ;; give read permissions.
-		      (set-file-modes
-		       tmpfile (tramp-compat-octal-to-decimal "0777"))
-		      (tramp-set-file-uid-gid
-		       tmpfile
-		       (tramp-get-remote-uid v 'integer)
-		       (tramp-get-remote-gid v 'integer))))
-
-		    ;; Move the temporary file to its destination.
-		    (cond
-		     (t2
-		      (or
-		       (zerop
-			(tramp-send-command-and-check
-			 v (format
-			    "cp -f -p %s %s"
-			    (tramp-shell-quote-argument tmpfile)
-			    (tramp-shell-quote-argument localname2))))
-		       (tramp-error-with-buffer
-			nil v 'file-error
-			"Copying directly failed, see buffer `%s' for details."
-			(tramp-get-buffer v))))
-		     (t1
-		      (tramp-run-real-handler
-		       'rename-file
-		       (list tmpfile localname2 ok-if-already-exists)))))
-
-		;; Save exit.
-		(condition-case nil
-		    (delete-file tmpfile)
-		  (error)))))))))
-
-      ;; Set the time and mode. Mask possible errors.
-      (condition-case nil
-	  (when keep-date
-	    (set-file-times newname file-times)
-	    (set-file-modes newname file-modes))
-	(error)))))
-
-(defun tramp-do-copy-or-rename-file-out-of-band (op filename newname keep-date)
-  "Invoke rcp program to copy.
-The method used must be an out-of-band method."
-  (let ((t1 (tramp-tramp-file-p filename))
-	(t2 (tramp-tramp-file-p newname))
-	copy-program copy-args copy-env copy-keep-date port spec
-	source target)
-
-    (with-parsed-tramp-file-name (if t1 filename newname) nil
-      (if (and t1 t2)
-
-	  ;; Both are Tramp files.  We shall optimize it, when the
-	  ;; methods for filename and newname are the same.
-	  (let* ((dir-flag (file-directory-p filename))
-		 (tmpfile (tramp-compat-make-temp-file localname dir-flag)))
-	    (if dir-flag
-		(setq tmpfile
-		      (expand-file-name
-		       (file-name-nondirectory newname) tmpfile)))
-	    (unwind-protect
-		(progn
-		  (tramp-do-copy-or-rename-file-out-of-band
-		   op filename tmpfile keep-date)
-		  (tramp-do-copy-or-rename-file-out-of-band
-		   'rename tmpfile newname keep-date))
-	      ;; Save exit.
-	      (condition-case nil
-		  (if dir-flag
-		      (tramp-compat-delete-directory
-		       (expand-file-name ".." tmpfile) 'recursive)
-		    (delete-file tmpfile))
-		(error))))
-
-	;; Expand hops.  Might be necessary for gateway methods.
-	(setq v (car (tramp-compute-multi-hops v)))
-	(aset v 3 localname)
-
-	;; Check which ones of source and target are Tramp files.
-	(setq source (if t1 (tramp-make-copy-program-file-name v) filename)
-	      target (funcall
-		      (if (and (file-directory-p filename)
-			       (string-equal
-				(file-name-nondirectory filename)
-				(file-name-nondirectory newname)))
-			  'file-name-directory
-			'identity)
-		      (if t2 (tramp-make-copy-program-file-name v) newname)))
-
-	;; Check for port number.  Until now, there's no need for handling
-	;; like method, user, host.
-	(setq host (tramp-file-name-real-host v)
-	      port (tramp-file-name-port v)
-	      port (or (and port (number-to-string port)) ""))
-
-	;; Compose copy command.
-	(setq spec (format-spec-make
-		    ?h host ?u user ?p port
-		    ?t (tramp-get-connection-property
-			(tramp-get-connection-process v) "temp-file" "")
-		    ?k (if keep-date " " ""))
-	      copy-program (tramp-get-method-parameter
-			    method 'tramp-copy-program)
-	      copy-keep-date (tramp-get-method-parameter
-			      method 'tramp-copy-keep-date)
-	      copy-args
-	      (delq
-	       nil
-	       (mapcar
-		(lambda (x)
-		  (setq
-		   x
-		   ;; " " is indication for keep-date argument.
-		   (delete " " (mapcar (lambda (y) (format-spec y spec)) x)))
-		  (unless (member "" x) (mapconcat 'identity x " ")))
-		(tramp-get-method-parameter method 'tramp-copy-args)))
-	      copy-env
-	      (delq
-	       nil
-	       (mapcar
-		(lambda (x)
-		  (setq x (mapcar (lambda (y) (format-spec y spec)) x))
-		  (unless (member "" x) (mapconcat 'identity x " ")))
-		(tramp-get-method-parameter method 'tramp-copy-env))))
-
-	;; Check for program.
-	(when (and (fboundp 'executable-find)
-		   (not (let ((default-directory
-				(tramp-compat-temporary-file-directory)))
-			  (executable-find copy-program))))
-	  (tramp-error
-	   v 'file-error "Cannot find copy program: %s" copy-program))
-
-	;; Set variables for computing the prompt for reading
-	;; password.
-	(setq tramp-current-method (tramp-file-name-method v)
-	      tramp-current-user   (tramp-file-name-user v)
-	      tramp-current-host   (tramp-file-name-host v))
-
-	(unwind-protect
-	    (with-temp-buffer
-	      ;; The default directory must be remote.
-	      (let ((default-directory
-		      (file-name-directory (if t1 filename newname)))
-		    (process-environment (copy-sequence process-environment)))
-		;; Set the transfer process properties.
-		(tramp-set-connection-property
-		 v "process-name" (buffer-name (current-buffer)))
-		(tramp-set-connection-property
-		 v "process-buffer" (current-buffer))
-		(while copy-env
-		  (tramp-message v 5 "%s=\"%s\"" (car copy-env) (cadr copy-env))
-		  (setenv (pop copy-env) (pop copy-env)))
-
-		;; Use an asynchronous process.  By this, password can
-		;; be handled.  The default directory must be local, in
-		;; order to apply the correct `copy-program'.  We don't
-		;; set a timeout, because the copying of large files can
-		;; last longer than 60 secs.
-		(let ((p (let ((default-directory
-				 (tramp-compat-temporary-file-directory)))
-			   (apply 'start-process
-				  (tramp-get-connection-property
-				   v "process-name" nil)
-				  (tramp-get-connection-property
-				   v "process-buffer" nil)
-				  copy-program
-				  (append copy-args (list source target))))))
-		  (tramp-message
-		   v 6 "%s" (mapconcat 'identity (process-command p) " "))
-		  (tramp-set-process-query-on-exit-flag p nil)
-		  (tramp-process-actions p v tramp-actions-copy-out-of-band))))
-
-	  ;; Reset the transfer process properties.
-	  (tramp-set-connection-property v "process-name" nil)
-	  (tramp-set-connection-property v "process-buffer" nil))
-
-	;; Handle KEEP-DATE argument.
-	(when (and keep-date (not copy-keep-date))
-	  (set-file-times newname (nth 5 (file-attributes filename))))
-
-	;; Set the mode.
-	(unless (and keep-date copy-keep-date)
-	  (ignore-errors
-	    (set-file-modes newname (tramp-default-file-modes filename)))))
-
-      ;; If the operation was `rename', delete the original file.
-      (unless (eq op 'copy)
-	(if (file-regular-p filename)
-	    (delete-file filename)
-	  (tramp-compat-delete-directory filename 'recursive))))))
-
-(defun tramp-handle-make-directory (dir &optional parents)
-  "Like `make-directory' for Tramp files."
-  (setq dir (expand-file-name dir))
-  (with-parsed-tramp-file-name dir nil
-    (tramp-flush-directory-property v (file-name-directory localname))
-    (save-excursion
-      (tramp-barf-unless-okay
-       v
-       (format "%s %s"
-	       (if parents "mkdir -p" "mkdir")
-	       (tramp-shell-quote-argument localname))
-       "Couldn't make directory %s" dir))))
-
-(defun tramp-handle-delete-directory (directory &optional recursive)
-  "Like `delete-directory' for Tramp files."
-  (setq directory (expand-file-name directory))
-  (with-parsed-tramp-file-name directory nil
-    (tramp-flush-file-property v (file-name-directory localname))
-    (tramp-flush-directory-property v localname)
-    (unless (zerop (tramp-send-command-and-check
-		    v
-		    (format
-		     "%s %s"
-		     (if recursive "rm -rf" "rmdir")
-		     (tramp-shell-quote-argument localname))))
-      (tramp-error v 'file-error "Couldn't delete %s" directory))))
-
-(defun tramp-handle-delete-file (filename &optional trash)
-  "Like `delete-file' for Tramp files."
-  (setq filename (expand-file-name filename))
-  (with-parsed-tramp-file-name filename nil
-    (tramp-flush-file-property v (file-name-directory localname))
-    (tramp-flush-file-property v localname)
-    (unless
-	(zerop
-	 (tramp-send-command-and-check
-	  v (format "%s %s"
-		    (or (and trash (tramp-get-remote-trash v)) "rm -f")
-		    (tramp-shell-quote-argument localname))))
-      (tramp-error v 'file-error "Couldn't delete %s" filename))))
-
-;; Dired.
-
-;; CCC: This does not seem to be enough. Something dies when
-;;      we try and delete two directories under Tramp :/
-(defun tramp-handle-dired-recursive-delete-directory (filename)
-  "Recursively delete the directory given.
-This is like `dired-recursive-delete-directory' for Tramp files."
-  (with-parsed-tramp-file-name filename nil
-    ;; Run a shell command 'rm -r <localname>'
-    ;; Code shamelessly stolen from the dired implementation and, um, hacked :)
-    (unless (file-exists-p filename)
-      (tramp-error v 'file-error "No such directory: %s" filename))
-    ;; Which is better, -r or -R? (-r works for me <daniel@danann.net>)
-    (tramp-send-command
-     v
-     (format "rm -rf %s" (tramp-shell-quote-argument localname))
-     ;; Don't read the output, do it explicitely.
-     nil t)
-    ;; Wait for the remote system to return to us...
-    ;; This might take a while, allow it plenty of time.
-    (tramp-wait-for-output (tramp-get-connection-process v) 120)
-    ;; Make sure that it worked...
-    (tramp-flush-file-property v (file-name-directory localname))
-    (tramp-flush-directory-property v localname)
-    (and (file-exists-p filename)
-	 (tramp-error
-	  v 'file-error "Failed to recursively delete %s" filename))))
-
-(defun tramp-handle-dired-compress-file (file &rest ok-flag)
-  "Like `dired-compress-file' for Tramp files."
-  ;; OK-FLAG is valid for XEmacs only, but not implemented.
-  ;; Code stolen mainly from dired-aux.el.
-  (with-parsed-tramp-file-name file nil
-    (tramp-flush-file-property v localname)
-    (save-excursion
-      (let ((suffixes
-	     (if (not (featurep 'xemacs))
-		 ;; Emacs case
-		 (symbol-value 'dired-compress-file-suffixes)
-	       ;; XEmacs has `dired-compression-method-alist', which is
-	       ;; transformed into `dired-compress-file-suffixes' structure.
-	       (mapcar
-		(lambda (x)
-		  (list (concat (regexp-quote (nth 1 x)) "\\'")
-			nil
-			(mapconcat 'identity (nth 3 x) " ")))
-		(symbol-value 'dired-compression-method-alist))))
-	    suffix)
-	;; See if any suffix rule matches this file name.
-	(while suffixes
-	  (let (case-fold-search)
-	    (if (string-match (car (car suffixes)) localname)
-		(setq suffix (car suffixes) suffixes nil))
-	    (setq suffixes (cdr suffixes))))
-
-	(cond ((file-symlink-p file)
-	       nil)
-	      ((and suffix (nth 2 suffix))
-	       ;; We found an uncompression rule.
-	       (with-progress-reporter v 0 (format "Uncompressing %s" file)
-		 (when (zerop
-			(tramp-send-command-and-check
-			 v (concat (nth 2 suffix) " "
-				   (tramp-shell-quote-argument localname))))
-		   ;; `dired-remove-file' is not defined in XEmacs.
-		   (tramp-compat-funcall 'dired-remove-file file)
-		   (string-match (car suffix) file)
-		   (concat (substring file 0 (match-beginning 0))))))
-	      (t
-	       ;; We don't recognize the file as compressed, so compress it.
-	       ;; Try gzip.
-	       (with-progress-reporter v 0 (format "Compressing %s" file)
-		 (when (zerop
-			(tramp-send-command-and-check
-			 v (concat "gzip -f "
-				   (tramp-shell-quote-argument localname))))
-		   ;; `dired-remove-file' is not defined in XEmacs.
-		   (tramp-compat-funcall 'dired-remove-file file)
-		   (cond ((file-exists-p (concat file ".gz"))
-			  (concat file ".gz"))
-			 ((file-exists-p (concat file ".z"))
-			  (concat file ".z"))
-			 (t nil))))))))))
-
-(defun tramp-handle-dired-uncache (dir &optional dir-p)
-  "Like `dired-uncache' for Tramp files."
-  ;; DIR-P is valid for XEmacs only.
-  (with-parsed-tramp-file-name
-      (if (or dir-p (file-directory-p dir)) dir (file-name-directory dir)) nil
-    (tramp-flush-directory-property v localname)))
-
-;; Pacify byte-compiler.  The function is needed on XEmacs only.  I'm
-;; not sure at all that this is the right way to do it, but let's hope
-;; it works for now, and wait for a guru to point out the Right Way to
-;; achieve this.
-;;(eval-when-compile
-;;  (unless (fboundp 'dired-insert-set-properties)
-;;    (fset 'dired-insert-set-properties 'ignore)))
-;; Gerd suggests this:
-(eval-when-compile (require 'dired))
-;; Note that dired is required at run-time, too, when it is needed.
-;; It is only needed on XEmacs for the function
-;; `dired-insert-set-properties'.
-
-(defun tramp-handle-insert-directory
-  (filename switches &optional wildcard full-directory-p)
-  "Like `insert-directory' for Tramp files."
-  (setq filename (expand-file-name filename))
-  (with-parsed-tramp-file-name filename nil
-    (if (and (featurep 'ls-lisp)
-	     (not (symbol-value 'ls-lisp-use-insert-directory-program)))
-	(tramp-run-real-handler
-	 'insert-directory (list filename switches wildcard full-directory-p))
-      (when (stringp switches)
-        (setq switches (split-string switches)))
-      (when (and (member "--dired" switches)
-		 (not (tramp-get-ls-command-with-dired v)))
-	(setq switches (delete "--dired" switches)))
-      (when wildcard
-        (setq wildcard (tramp-run-real-handler
-			'file-name-nondirectory (list localname)))
-        (setq localname (tramp-run-real-handler
-			 'file-name-directory (list localname))))
-      (unless full-directory-p
-        (setq switches (add-to-list 'switches "-d" 'append)))
-      (setq switches (mapconcat 'tramp-shell-quote-argument switches " "))
-      (when wildcard
-	(setq switches (concat switches " " wildcard)))
-      (tramp-message
-       v 4 "Inserting directory `ls %s %s', wildcard %s, fulldir %s"
-       switches filename (if wildcard "yes" "no")
-       (if full-directory-p "yes" "no"))
-      ;; If `full-directory-p', we just say `ls -l FILENAME'.
-      ;; Else we chdir to the parent directory, then say `ls -ld BASENAME'.
-      (if full-directory-p
-	  (tramp-send-command
-	   v
-	   (format "%s %s %s 2>/dev/null"
-		   (tramp-get-ls-command v)
-		   switches
-		   (if wildcard
-		       localname
-		     (tramp-shell-quote-argument (concat localname ".")))))
-	(tramp-barf-unless-okay
-	 v
-	 (format "cd %s" (tramp-shell-quote-argument
-			  (tramp-run-real-handler
-			   'file-name-directory (list localname))))
-	 "Couldn't `cd %s'"
-	 (tramp-shell-quote-argument
-	  (tramp-run-real-handler 'file-name-directory (list localname))))
-	(tramp-send-command
-	 v
-	 (format "%s %s %s"
-		 (tramp-get-ls-command v)
-		 switches
-		 (if (or wildcard
-			 (zerop (length
-				 (tramp-run-real-handler
-				  'file-name-nondirectory (list localname)))))
-		     ""
-		   (tramp-shell-quote-argument
-		    (tramp-run-real-handler
-		     'file-name-nondirectory (list localname)))))))
-      (let ((beg (point)))
-	;; We cannot use `insert-buffer-substring' because the Tramp
-	;; buffer changes its contents before insertion due to calling
-	;; `expand-file' and alike.
-	(insert
-	 (with-current-buffer (tramp-get-buffer v)
-	   (buffer-string)))
-
-	;; Check for "--dired" output.
-	(forward-line -2)
-	(when (looking-at "//SUBDIRED//")
-	  (forward-line -1))
-	(when (looking-at "//DIRED//\\s-+")
-	  (let ((databeg (match-end 0))
-		(end (tramp-compat-line-end-position)))
-	    ;; Now read the numeric positions of file names.
-	    (goto-char databeg)
-	    (while (< (point) end)
-	      (let ((start (+ beg (read (current-buffer))))
-		    (end (+ beg (read (current-buffer)))))
-		(if (memq (char-after end) '(?\n ?\ ))
-		    ;; End is followed by \n or by " -> ".
-		    (put-text-property start end 'dired-filename t))))))
-	;; Remove trailing lines.
-	(goto-char (tramp-compat-line-beginning-position))
-	(while (looking-at "//")
-	  (forward-line 1)
-	  (delete-region (match-beginning 0) (point)))
-
-	;; The inserted file could be from somewhere else.
-	(when (and (not wildcard) (not full-directory-p))
-	  (goto-char (point-max))
-	  (when (file-symlink-p filename)
-	    (goto-char (search-backward "->" beg 'noerror)))
-	  (search-backward
-	   (if (zerop (length (file-name-nondirectory filename)))
-	       "."
-	     (file-name-nondirectory filename))
-	   beg 'noerror)
-	  (replace-match (file-relative-name filename) t))
-
-	(goto-char (point-max))))))
-
-(defun tramp-handle-unhandled-file-name-directory (filename)
-  "Like `unhandled-file-name-directory' for Tramp files."
-  ;; With Emacs 23, we could simply return `nil'.  But we must keep it
-  ;; for backward compatibility.
-  (expand-file-name "~/"))
-
-;; Canonicalization of file names.
-
-(defun tramp-handle-expand-file-name (name &optional dir)
-  "Like `expand-file-name' for Tramp files.
-If the localname part of the given filename starts with \"/../\" then
-the result will be a local, non-Tramp, filename."
-  ;; If DIR is not given, use DEFAULT-DIRECTORY or "/".
-  (setq dir (or dir default-directory "/"))
-  ;; Unless NAME is absolute, concat DIR and NAME.
-  (unless (file-name-absolute-p name)
-    (setq name (concat (file-name-as-directory dir) name)))
-  ;; If NAME is not a Tramp file, run the real handler.
-  (if (not (tramp-connectable-p name))
-      (tramp-run-real-handler 'expand-file-name (list name nil))
-    ;; Dissect NAME.
-    (with-parsed-tramp-file-name name nil
-      (unless (tramp-run-real-handler 'file-name-absolute-p (list localname))
-	(setq localname (concat "~/" localname)))
-      ;; Tilde expansion if necessary.  This needs a shell which
-      ;; groks tilde expansion!  The function `tramp-find-shell' is
-      ;; supposed to find such a shell on the remote host.  Please
-      ;; tell me about it when this doesn't work on your system.
-      (when (string-match "\\`\\(~[^/]*\\)\\(.*\\)\\'" localname)
-	(let ((uname (match-string 1 localname))
-	      (fname (match-string 2 localname)))
-	  ;; We cannot simply apply "~/", because under sudo "~/" is
-	  ;; expanded to the local user home directory but to the
-	  ;; root home directory.  On the other hand, using always
-	  ;; the default user name for tilde expansion is not
-	  ;; appropriate either, because ssh and companions might
-	  ;; use a user name from the config file.
-	  (when (and (string-equal uname "~")
-		     (string-match "\\`su\\(do\\)?\\'" method))
-	    (setq uname (concat uname user)))
-	  (setq uname
-		(with-connection-property v uname
-		  (tramp-send-command
-		   v (format "cd %s; pwd" (tramp-shell-quote-argument uname)))
-		  (with-current-buffer (tramp-get-buffer v)
-		    (goto-char (point-min))
-		    (buffer-substring
-		     (point) (tramp-compat-line-end-position)))))
-	  (setq localname (concat uname fname))))
-      ;; There might be a double slash, for example when "~/"
-      ;; expands to "/".  Remove this.
-      (while (string-match "//" localname)
-	(setq localname (replace-match "/" t t localname)))
-      ;; No tilde characters in file name, do normal
-      ;; `expand-file-name' (this does "/./" and "/../").  We bind
-      ;; `directory-sep-char' here for XEmacs on Windows, which would
-      ;; otherwise use backslash.  `default-directory' is bound,
-      ;; because on Windows there would be problems with UNC shares or
-      ;; Cygwin mounts.
-      (let ((directory-sep-char ?/)
-	    (default-directory (tramp-compat-temporary-file-directory)))
-	(tramp-make-tramp-file-name
-	 method user host
-	 (tramp-drop-volume-letter
-	  (tramp-run-real-handler
-	   'expand-file-name (list localname))))))))
-
 (defun tramp-replace-environment-variables (filename)
   "Replace environment variables in FILENAME.
 Return the string with the replaced variables."
@@ -4579,38 +1627,6 @@
 	       t nil filename)))
       filename)))
 
-(defun tramp-handle-substitute-in-file-name (filename)
-  "Like `substitute-in-file-name' for Tramp files.
-\"//\" and \"/~\" substitute only in the local filename part.
-If the URL Tramp syntax is chosen, \"//\" as method delimeter and \"/~\" at
-beginning of local filename are not substituted."
-  ;; First, we must replace environment variables.
-  (setq filename (tramp-replace-environment-variables filename))
-  (with-parsed-tramp-file-name filename nil
-    (if (equal tramp-syntax 'url)
-	;; We need to check localname only.  The other parts cannot contain
-	;; "//" or "/~".
-	(if (and (> (length localname) 1)
-		 (or (string-match "//" localname)
-		     (string-match "/~" localname 1)))
-	    (tramp-run-real-handler 'substitute-in-file-name (list filename))
-	  (tramp-make-tramp-file-name
-	   (when method (substitute-in-file-name method))
-	   (when user (substitute-in-file-name user))
-	   (when host (substitute-in-file-name host))
-	   (when localname
-	     (tramp-run-real-handler
-	      'substitute-in-file-name (list localname)))))
-      ;; Ignore in LOCALNAME everything before "//" or "/~".
-      (when (and (stringp localname) (string-match ".+?/\\(/\\|~\\)" localname))
-	(setq filename
-	      (concat (file-remote-p filename)
-		      (replace-match "\\1" nil nil localname)))
-	;; "/m:h:~" does not work for completion.  We use "/m:h:~/".
-	(when (string-match "~$" filename)
-	  (setq filename (concat filename "/"))))
-      (tramp-run-real-handler 'substitute-in-file-name (list filename)))))
-
 ;; In XEmacs, electricity is implemented via a key map for ?/ and ?~,
 ;; which calls corresponding functions (see minibuf.el).
 (when (fboundp 'minibuffer-electric-separator)
@@ -4640,392 +1656,9 @@
    '(minibuffer-electric-separator
      minibuffer-electric-tilde)))
 
-
-;;; Remote commands:
-
-(defun tramp-handle-executable-find (command)
-  "Like `executable-find' for Tramp files."
-  (with-parsed-tramp-file-name default-directory nil
-    (tramp-find-executable v command (tramp-get-remote-path v) t)))
-
-(defun tramp-process-sentinel (proc event)
-  "Flush file caches."
-  (unless (memq (process-status proc) '(run open))
-    (let ((vec (tramp-get-connection-property proc "vector" nil)))
-      (when vec
-	(tramp-message vec 5 "Sentinel called: `%s' `%s'" proc event)
-        (tramp-flush-directory-property vec "")))))
-
-;; We use BUFFER also as connection buffer during setup. Because of
-;; this, its original contents must be saved, and restored once
-;; connection has been setup.
-(defun tramp-handle-start-file-process (name buffer program &rest args)
-  "Like `start-file-process' for Tramp files."
-  (with-parsed-tramp-file-name default-directory nil
-    (unwind-protect
-	;; When PROGRAM is nil, we just provide a tty.
-	(let ((command
-	       (when (stringp program)
-		 (format "cd %s; exec %s"
-			 (tramp-shell-quote-argument localname)
-			 (mapconcat 'tramp-shell-quote-argument
-				    (cons program args) " "))))
-	      (tramp-process-connection-type
-	       (or (null program) tramp-process-connection-type))
-	      (name1 name)
-	      (i 0))
-	  (unless buffer
-	    ;; BUFFER can be nil.  We use a temporary buffer.
-	    (setq buffer (generate-new-buffer tramp-temp-buffer-name)))
-	  (while (get-process name1)
-	    ;; NAME must be unique as process name.
-	    (setq i (1+ i)
-		  name1 (format "%s<%d>" name i)))
-	  (setq name name1)
-	  ;; Set the new process properties.
-	  (tramp-set-connection-property v "process-name" name)
-	  (tramp-set-connection-property v "process-buffer" buffer)
-	  ;; Activate narrowing in order to save BUFFER contents.
-	  ;; Clear also the modification time; otherwise we might be
-	  ;; interrupted by `verify-visited-file-modtime'.
-	  (with-current-buffer (tramp-get-connection-buffer v)
-	    (clear-visited-file-modtime)
-	    (narrow-to-region (point-max) (point-max)))
-	  (if command
-	      ;; Send the command.
-	      (tramp-send-command v command nil t) ; nooutput
-	    ;; Check, whether a pty is associated.
-	    (tramp-maybe-open-connection v)
-	    (unless (process-get (tramp-get-connection-process v) 'remote-tty)
-	      (tramp-error
-	       v 'file-error "pty association is not supported for `%s'" name)))
-	  (let ((p (tramp-get-connection-process v)))
-	    ;; Set sentinel and query flag for this process.
-	    (tramp-set-connection-property p "vector" v)
-	    (set-process-sentinel p 'tramp-process-sentinel)
-	    (tramp-set-process-query-on-exit-flag p t)
-	    ;; Return process.
-	    p))
-      ;; Save exit.
-      (with-current-buffer (tramp-get-connection-buffer v)
-	(if (string-match tramp-temp-buffer-name (buffer-name))
-	    (progn
-	      (set-process-buffer (tramp-get-connection-process v) nil)
-	      (kill-buffer (current-buffer)))
-	  (widen)
-	  (goto-char (point-max))))
-      (tramp-set-connection-property v "process-name" nil)
-      (tramp-set-connection-property v "process-buffer" nil))))
-
-(defun tramp-handle-process-file
-  (program &optional infile destination display &rest args)
-  "Like `process-file' for Tramp files."
-  ;; The implementation is not complete yet.
-  (when (and (numberp destination) (zerop destination))
-    (error "Implementation does not handle immediate return"))
-
-  (with-parsed-tramp-file-name default-directory nil
-    (let (command input tmpinput stderr tmpstderr outbuf ret)
-      ;; Compute command.
-      (setq command (mapconcat 'tramp-shell-quote-argument
-			       (cons program args) " "))
-      ;; Determine input.
-      (if (null infile)
-	  (setq input "/dev/null")
-	(setq infile (expand-file-name infile))
-	(if (tramp-equal-remote default-directory infile)
-	    ;; INFILE is on the same remote host.
-	    (setq input (with-parsed-tramp-file-name infile nil localname))
-	  ;; INFILE must be copied to remote host.
-	  (setq input (tramp-make-tramp-temp-file v)
-		tmpinput (tramp-make-tramp-file-name method user host input))
-	  (copy-file infile tmpinput t)))
-      (when input (setq command (format "%s <%s" command input)))
-
-      ;; Determine output.
-      (cond
-       ;; Just a buffer.
-       ((bufferp destination)
-	(setq outbuf destination))
-       ;; A buffer name.
-       ((stringp destination)
-	(setq outbuf (get-buffer-create destination)))
-       ;; (REAL-DESTINATION ERROR-DESTINATION)
-       ((consp destination)
-	;; output.
-	(cond
-	 ((bufferp (car destination))
-	  (setq outbuf (car destination)))
-	 ((stringp (car destination))
-	  (setq outbuf (get-buffer-create (car destination))))
-	 ((car destination)
-	  (setq outbuf (current-buffer))))
-	;; stderr.
-	(cond
-	 ((stringp (cadr destination))
-	  (setcar (cdr destination) (expand-file-name (cadr destination)))
-	  (if (tramp-equal-remote default-directory (cadr destination))
-	      ;; stderr is on the same remote host.
-	      (setq stderr (with-parsed-tramp-file-name
-			       (cadr destination) nil localname))
-	    ;; stderr must be copied to remote host.  The temporary
-	    ;; file must be deleted after execution.
-	    (setq stderr (tramp-make-tramp-temp-file v)
-		  tmpstderr (tramp-make-tramp-file-name
-			     method user host stderr))))
-	 ;; stderr to be discarded.
-	 ((null (cadr destination))
-	  (setq stderr "/dev/null"))))
-       ;; 't
-       (destination
-	(setq outbuf (current-buffer))))
-      (when stderr (setq command (format "%s 2>%s" command stderr)))
-
-      ;; Send the command.  It might not return in time, so we protect
-      ;; it.  Call it in a subshell, in order to preserve working
-      ;; directory.
-      (condition-case nil
-	  (unwind-protect
-              (setq ret
-                    (tramp-send-command-and-check
-                     v (format "\\cd %s; %s"
-                               (tramp-shell-quote-argument localname)
-                               command)
-		     t t))
-	    ;; We should show the output anyway.
-	    (when outbuf
-	      (with-current-buffer outbuf
-                (insert
-                 (with-current-buffer (tramp-get-connection-buffer v)
-                   (buffer-string))))
-	      (when display (display-buffer outbuf))))
-	;; When the user did interrupt, we should do it also.  We use
-	;; return code -1 as marker.
-	(quit
-	 (kill-buffer (tramp-get-connection-buffer v))
-	 (setq ret -1))
-	;; Handle errors.
-	(error
-	 (kill-buffer (tramp-get-connection-buffer v))
-	 (setq ret 1)))
-
-      ;; Provide error file.
-      (when tmpstderr (rename-file tmpstderr (cadr destination) t))
-
-      ;; Cleanup.  We remove all file cache values for the connection,
-      ;; because the remote process could have changed them.
-      (when tmpinput (delete-file tmpinput))
-
-      ;; `process-file-side-effects' has been introduced with GNU
-      ;; Emacs 23.2.  If set to `nil', no remote file will be changed
-      ;; by `program'.  If it doesn't exist, we assume its default
-      ;; value 't'.
-      (unless (and (boundp 'process-file-side-effects)
-		   (not (symbol-value 'process-file-side-effects)))
-        (tramp-flush-directory-property v ""))
-
-      ;; Return exit status.
-      (if (equal ret -1)
-	  (keyboard-quit)
-	ret))))
-
-(defun tramp-handle-call-process-region
-  (start end program &optional delete buffer display &rest args)
-  "Like `call-process-region' for Tramp files."
-  (let ((tmpfile (tramp-compat-make-temp-file "")))
-    (write-region start end tmpfile)
-    (when delete (delete-region start end))
-    (unwind-protect
-	(apply 'call-process program tmpfile buffer display args)
-      (delete-file tmpfile))))
-
-(defun tramp-handle-shell-command
-  (command &optional output-buffer error-buffer)
-  "Like `shell-command' for Tramp files."
-  (let* ((asynchronous (string-match "[ \t]*&[ \t]*\\'" command))
-	 ;; We cannot use `shell-file-name' and `shell-command-switch',
-	 ;; they are variables of the local host.
-	 (args (list
-		(tramp-get-method-parameter
-		 (tramp-file-name-method
-		  (tramp-dissect-file-name default-directory))
-		 'tramp-remote-sh)
-		"-c" (substring command 0 asynchronous)))
-	 current-buffer-p
-	 (output-buffer
-	  (cond
-	   ((bufferp output-buffer) output-buffer)
-	   ((stringp output-buffer) (get-buffer-create output-buffer))
-	   (output-buffer
-	    (setq current-buffer-p t)
-	    (current-buffer))
-	   (t (get-buffer-create
-	       (if asynchronous
-		   "*Async Shell Command*"
-		 "*Shell Command Output*")))))
-	 (error-buffer
-	  (cond
-	   ((bufferp error-buffer) error-buffer)
-	   ((stringp error-buffer) (get-buffer-create error-buffer))))
-	 (buffer
-	  (if (and (not asynchronous) error-buffer)
-	      (with-parsed-tramp-file-name default-directory nil
-		(list output-buffer (tramp-make-tramp-temp-file v)))
-	    output-buffer))
-	 (p (get-buffer-process output-buffer)))
-
-    ;; Check whether there is another process running.  Tramp does not
-    ;; support 2 (asynchronous) processes in parallel.
-    (when p
-      (if (yes-or-no-p "A command is running.  Kill it? ")
-	  (condition-case nil
-	      (kill-process p)
-	    (error nil))
-	(error "Shell command in progress")))
-
-    (if current-buffer-p
-	(progn
-	  (barf-if-buffer-read-only)
-	  (push-mark nil t))
-      (with-current-buffer output-buffer
-	(setq buffer-read-only nil)
-	(erase-buffer)))
-
-    (if (and (not current-buffer-p) (integerp asynchronous))
-	(prog1
-	    ;; Run the process.
-	    (apply 'start-file-process "*Async Shell*" buffer args)
-	  ;; Display output.
-	  (pop-to-buffer output-buffer)
-	  (setq mode-line-process '(":%s"))
-	  (shell-mode))
-
-      (prog1
-	  ;; Run the process.
-	  (apply 'process-file (car args) nil buffer nil (cdr args))
-	;; Insert error messages if they were separated.
-	(when (listp buffer)
-	  (with-current-buffer error-buffer
-	    (insert-file-contents (cadr buffer)))
-	  (delete-file (cadr buffer)))
-	(if current-buffer-p
-	    ;; This is like exchange-point-and-mark, but doesn't
-	    ;; activate the mark.  It is cleaner to avoid activation,
-	    ;; even though the command loop would deactivate the mark
-	    ;; because we inserted text.
-	    (goto-char (prog1 (mark t)
-			 (set-marker (mark-marker) (point)
-				     (current-buffer))))
-	  ;; There's some output, display it.
-	  (when (with-current-buffer output-buffer (> (point-max) (point-min)))
-	    (if (functionp 'display-message-or-buffer)
-		(tramp-compat-funcall 'display-message-or-buffer output-buffer)
-	      (pop-to-buffer output-buffer))))))))
-
-;; File Editing.
-
 (defvar tramp-handle-file-local-copy-hook nil
   "Normal hook to be run at the end of `tramp-handle-file-local-copy'.")
 
-(defun tramp-handle-file-local-copy (filename)
-  "Like `file-local-copy' for Tramp files."
-
-  (with-parsed-tramp-file-name filename nil
-    (unless (file-exists-p filename)
-      (tramp-error
-       v 'file-error
-       "Cannot make local copy of non-existing file `%s'" filename))
-
-    (let* ((size (nth 7 (file-attributes filename)))
-	   (rem-enc (tramp-get-inline-coding v "remote-encoding" size))
-	   (loc-dec (tramp-get-inline-coding v "local-decoding" size))
-	   (tmpfile (tramp-compat-make-temp-file filename)))
-
-      (condition-case err
-	  (cond
-	   ;; `copy-file' handles direct copy and out-of-band methods.
-	   ((or (tramp-local-host-p v)
-		(tramp-method-out-of-band-p v size))
-	    (copy-file filename tmpfile t t))
-
-	   ;; Use inline encoding for file transfer.
-	   (rem-enc
-	    (save-excursion
-	      (with-progress-reporter
-	       v 3 (format "Encoding remote file %s" filename)
-	       (tramp-barf-unless-okay
-		v (format rem-enc (tramp-shell-quote-argument localname))
-		"Encoding remote file failed"))
-
-	      (if (functionp loc-dec)
-		  ;; If local decoding is a function, we call it.  We
-		  ;; must disable multibyte, because
-		  ;; `uudecode-decode-region' doesn't handle it
-		  ;; correctly.
-		  (with-temp-buffer
-		    (set-buffer-multibyte nil)
-		    (insert-buffer-substring (tramp-get-buffer v))
-		    (with-progress-reporter
-			v 3 (format "Decoding remote file %s with function %s"
-				    filename loc-dec)
-		      (funcall loc-dec (point-min) (point-max))
-		      ;; Unset `file-name-handler-alist'.  Otherwise,
-		      ;; epa-file gets confused.
-		      (let (file-name-handler-alist
-			    (coding-system-for-write 'binary))
-			(write-region (point-min) (point-max) tmpfile))))
-
-		;; If tramp-decoding-function is not defined for this
-		;; method, we invoke tramp-decoding-command instead.
-		(let ((tmpfile2 (tramp-compat-make-temp-file filename)))
-		  ;; Unset `file-name-handler-alist'.  Otherwise,
-		  ;; epa-file gets confused.
-		  (let (file-name-handler-alist
-			(coding-system-for-write 'binary))
-		    (write-region (point-min) (point-max) tmpfile2))
-		  (with-progress-reporter
-		      v 3 (format "Decoding remote file %s with command %s"
-				  filename loc-dec)
-		    (unwind-protect
-			(tramp-call-local-coding-command
-			 loc-dec tmpfile2 tmpfile)
-		      (delete-file tmpfile2)))))
-
-	      ;; Set proper permissions.
-	      (set-file-modes tmpfile (tramp-default-file-modes filename))
-	      ;; Set local user ownership.
-	      (tramp-set-file-uid-gid tmpfile)))
-
-	   ;; Oops, I don't know what to do.
-	   (t (tramp-error
-	       v 'file-error "Wrong method specification for `%s'" method)))
-
-	;; Error handling.
-	((error quit)
-	 (delete-file tmpfile)
-	 (signal (car err) (cdr err))))
-
-      (run-hooks 'tramp-handle-file-local-copy-hook)
-      tmpfile)))
-
-(defun tramp-handle-file-remote-p (filename &optional identification connected)
-  "Like `file-remote-p' for Tramp files."
-  (let ((tramp-verbose 3))
-    (when (tramp-tramp-file-p filename)
-      (let* ((v (tramp-dissect-file-name filename))
-	     (p (tramp-get-connection-process v))
-	     (c (and p (processp p) (memq (process-status p) '(run open)))))
-	;; We expand the file name only, if there is already a connection.
-	(with-parsed-tramp-file-name
-	    (if c (expand-file-name filename) filename) nil
-	  (and (or (not connected) c)
-	       (cond
-		((eq identification 'method) method)
-		((eq identification 'user) user)
-		((eq identification 'host) host)
-		((eq identification 'localname) localname)
-		(t (tramp-make-tramp-file-name method user host "")))))))))
-
 (defun tramp-find-file-name-coding-system-alist (filename tmpname)
   "Like `find-operation-coding-system' for Tramp filenames.
 Tramp's `insert-file-contents' and `write-region' work over
@@ -5041,533 +1674,6 @@
 	(add-to-list
 	 'result (cons (regexp-quote tmpname) (cdr elt)) 'append)))))
 
-(defun tramp-handle-insert-file-contents
-  (filename &optional visit beg end replace)
-  "Like `insert-file-contents' for Tramp files."
-  (barf-if-buffer-read-only)
-  (setq filename (expand-file-name filename))
-  (let (result local-copy remote-copy)
-    (with-parsed-tramp-file-name filename nil
-      (unwind-protect
-	  (if (not (file-exists-p filename))
-	      ;; We don't raise a Tramp error, because it might be
-	      ;; suppressed, like in `find-file-noselect-1'.
-	      (signal 'file-error
-		      (list "File not found on remote host" filename))
-
-	    (if (and (tramp-local-host-p v)
-		     (let (file-name-handler-alist)
-		       (file-readable-p localname)))
-		;; Short track: if we are on the local host, we can
-		;; run directly.
-		(setq result
-		      (tramp-run-real-handler
-		       'insert-file-contents
-		       (list localname visit beg end replace)))
-
-	      ;; When we shall insert only a part of the file, we copy
-	      ;; this part.
-	      (when (or beg end)
-		(setq remote-copy (tramp-make-tramp-temp-file v))
-		(tramp-send-command
-		 v
-		 (cond
-		  ((and beg end)
-		   (format "tail -c +%d %s | head -c +%d >%s"
-			   (1+ beg) (tramp-shell-quote-argument localname)
-			   (- end beg) remote-copy))
-		  (beg
-		   (format "tail -c +%d %s >%s"
-			   (1+ beg) (tramp-shell-quote-argument localname)
-			   remote-copy))
-		  (end
-		   (format "head -c +%d %s >%s"
-			   (1+ end) (tramp-shell-quote-argument localname)
-			   remote-copy)))))
-
-	      ;; `insert-file-contents-literally' takes care to avoid
-	      ;; calling jka-compr.  By let-binding
-	      ;; `inhibit-file-name-operation', we propagate that care
-	      ;; to the `file-local-copy' operation.
-	      (setq local-copy
-		    (let ((inhibit-file-name-operation
-			   (when (eq inhibit-file-name-operation
-				     'insert-file-contents)
-			     'file-local-copy)))
-		      (cond
-		       ((stringp remote-copy)
-			(file-local-copy
-			 (tramp-make-tramp-file-name
-			  method user host remote-copy)))
-		       ((stringp tramp-temp-buffer-file-name)
-			(copy-file filename tramp-temp-buffer-file-name 'ok)
-			tramp-temp-buffer-file-name)
-		       (t (file-local-copy filename)))))
-
-	      ;; When the file is not readable for the owner, it
-	      ;; cannot be inserted, even it is redable for the group
-	      ;; or for everybody.
-	      (set-file-modes local-copy (tramp-compat-octal-to-decimal "0600"))
-
-	      (when (and (null remote-copy)
-			 (tramp-get-method-parameter
-			  method 'tramp-copy-keep-tmpfile))
-		;; We keep the local file for performance reasons,
-		;; useful for "rsync".
-		(setq tramp-temp-buffer-file-name local-copy)
-		(put 'tramp-temp-buffer-file-name 'permanent-local t))
-
-	      (with-progress-reporter
-		  v 3 (format "Inserting local temp file `%s'" local-copy)
-		;; We must ensure that `file-coding-system-alist'
-		;; matches `local-copy'.
-		(let ((file-coding-system-alist
-		       (tramp-find-file-name-coding-system-alist
-			filename local-copy)))
-		  (setq result
-			(insert-file-contents
-			 local-copy nil nil nil replace))))))
-
-	;; Save exit.
-	(progn
-	  (when visit
-	    (setq buffer-file-name filename)
-	    (setq buffer-read-only (not (file-writable-p filename)))
-	    (set-visited-file-modtime)
-	    (set-buffer-modified-p nil))
-	  (when (and (stringp local-copy)
-		     (or remote-copy (null tramp-temp-buffer-file-name)))
-	    (delete-file local-copy))
-	  (when (stringp remote-copy)
-	    (delete-file
-	     (tramp-make-tramp-file-name method user host remote-copy))))))
-
-    ;; Result.
-    (list (expand-file-name filename)
-	  (cadr result))))
-
-;; This is needed for XEmacs only.  Code stolen from files.el.
-(defun tramp-handle-insert-file-contents-literally
-  (filename &optional visit beg end replace)
-  "Like `insert-file-contents-literally' for Tramp files."
-  (let ((format-alist nil)
-	(after-insert-file-functions nil)
-	(coding-system-for-read 'no-conversion)
-	(coding-system-for-write 'no-conversion)
-	(find-buffer-file-type-function
-	 (if (fboundp 'find-buffer-file-type)
-	     (symbol-function 'find-buffer-file-type)
-	   nil))
-	(inhibit-file-name-handlers '(jka-compr-handler image-file-handler))
-	(inhibit-file-name-operation 'insert-file-contents))
-    (unwind-protect
-	(progn
-	  (fset 'find-buffer-file-type (lambda (filename) t))
-	  (insert-file-contents filename visit beg end replace))
-      ;; Save exit.
-      (if find-buffer-file-type-function
-	  (fset 'find-buffer-file-type find-buffer-file-type-function)
-	(fmakunbound 'find-buffer-file-type)))))
-
-(defun tramp-handle-find-backup-file-name (filename)
-  "Like `find-backup-file-name' for Tramp files."
-  (with-parsed-tramp-file-name filename nil
-    ;; We set both variables. It doesn't matter whether it is
-    ;; Emacs or XEmacs.
-    (let ((backup-directory-alist
-	   ;; Emacs case.
-	   (when (boundp 'backup-directory-alist)
-	     (if (symbol-value 'tramp-backup-directory-alist)
-		 (mapcar
-		  (lambda (x)
-		    (cons
-		     (car x)
-		     (if (and (stringp (cdr x))
-			      (file-name-absolute-p (cdr x))
-			      (not (tramp-file-name-p (cdr x))))
-			 (tramp-make-tramp-file-name method user host (cdr x))
-		       (cdr x))))
-		  (symbol-value 'tramp-backup-directory-alist))
-	       (symbol-value 'backup-directory-alist))))
-
-	  (bkup-backup-directory-info
-	   ;; XEmacs case.
-	   (when (boundp 'bkup-backup-directory-info)
-	     (if (symbol-value 'tramp-bkup-backup-directory-info)
-		 (mapcar
-		  (lambda (x)
-		    (nconc
-		     (list (car x))
-		     (list
-		      (if (and (stringp (car (cdr x)))
-			       (file-name-absolute-p (car (cdr x)))
-			       (not (tramp-file-name-p (car (cdr x)))))
-			  (tramp-make-tramp-file-name
-			   method user host (car (cdr x)))
-			(car (cdr x))))
-		     (cdr (cdr x))))
-		  (symbol-value 'tramp-bkup-backup-directory-info))
-	       (symbol-value 'bkup-backup-directory-info)))))
-
-      (tramp-run-real-handler 'find-backup-file-name (list filename)))))
-
-(defun tramp-handle-make-auto-save-file-name ()
-  "Like `make-auto-save-file-name' for Tramp files.
-Returns a file name in `tramp-auto-save-directory' for autosaving this file."
-  (let ((tramp-auto-save-directory tramp-auto-save-directory)
-	(buffer-file-name
-	 (tramp-subst-strs-in-string
-	  '(("_" . "|")
-	    ("/" . "_a")
-	    (":" . "_b")
-	    ("|" . "__")
-	    ("[" . "_l")
-	    ("]" . "_r"))
-	  (buffer-file-name))))
-    ;; File name must be unique.  This is ensured with Emacs 22 (see
-    ;; UNIQUIFY element of `auto-save-file-name-transforms'); but for
-    ;; all other cases we must do it ourselves.
-    (when (boundp 'auto-save-file-name-transforms)
-      (mapc
-       (lambda (x)
-	 (when (and (string-match (car x) buffer-file-name)
-		    (not (car (cddr x))))
-	   (setq tramp-auto-save-directory
-		 (or tramp-auto-save-directory
-		     (tramp-compat-temporary-file-directory)))))
-       (symbol-value 'auto-save-file-name-transforms)))
-    ;; Create directory.
-    (when tramp-auto-save-directory
-      (setq buffer-file-name
-	    (expand-file-name buffer-file-name tramp-auto-save-directory))
-      (unless (file-exists-p tramp-auto-save-directory)
-	(make-directory tramp-auto-save-directory t)))
-    ;; Run plain `make-auto-save-file-name'.  There might be an advice when
-    ;; it is not a magic file name operation (since Emacs 22).
-    ;; We must deactivate it temporarily.
-    (if (not (ad-is-active 'make-auto-save-file-name))
-	(tramp-run-real-handler 'make-auto-save-file-name nil)
-      ;; else
-      (ad-deactivate 'make-auto-save-file-name)
-      (prog1
-       (tramp-run-real-handler 'make-auto-save-file-name nil)
-       (ad-activate 'make-auto-save-file-name)))))
-
-(defvar tramp-handle-write-region-hook nil
-  "Normal hook to be run at the end of `tramp-handle-write-region'.")
-
-;; CCC grok LOCKNAME
-(defun tramp-handle-write-region
-  (start end filename &optional append visit lockname confirm)
-  "Like `write-region' for Tramp files."
-  (setq filename (expand-file-name filename))
-  (with-parsed-tramp-file-name filename nil
-    ;; Following part commented out because we don't know what to do about
-    ;; file locking, and it does not appear to be a problem to ignore it.
-    ;; Ange-ftp ignores it, too.
-    ;;  (when (and lockname (stringp lockname))
-    ;;    (setq lockname (expand-file-name lockname)))
-    ;;  (unless (or (eq lockname nil)
-    ;;              (string= lockname filename))
-    ;;    (error
-    ;;     "tramp-handle-write-region: LOCKNAME must be nil or equal FILENAME"))
-
-    ;; XEmacs takes a coding system as the seventh argument, not `confirm'.
-    (when (and (not (featurep 'xemacs)) confirm (file-exists-p filename))
-      (unless (y-or-n-p (format "File %s exists; overwrite anyway? " filename))
-	(tramp-error v 'file-error "File not overwritten")))
-
-    (let ((uid (or (nth 2 (tramp-compat-file-attributes filename 'integer))
-		   (tramp-get-remote-uid v 'integer)))
-	  (gid (or (nth 3 (tramp-compat-file-attributes filename 'integer))
-		   (tramp-get-remote-gid v 'integer))))
-
-      (if (and (tramp-local-host-p v)
-	       ;; `file-writable-p' calls `file-expand-file-name'.  We
-	       ;; cannot use `tramp-run-real-handler' therefore.
-	       (let (file-name-handler-alist)
-		 (and
-		  (file-writable-p (file-name-directory localname))
-		  (or (file-directory-p localname)
-		      (file-writable-p localname)))))
-	  ;; Short track: if we are on the local host, we can run directly.
-	  (tramp-run-real-handler
-	   'write-region
-	   (list start end localname append 'no-message lockname confirm))
-
-	(let ((modes (save-excursion (tramp-default-file-modes filename)))
-	      ;; We use this to save the value of
-	      ;; `last-coding-system-used' after writing the tmp
-	      ;; file.  At the end of the function, we set
-	      ;; `last-coding-system-used' to this saved value.  This
-	      ;; way, any intermediary coding systems used while
-	      ;; talking to the remote shell or suchlike won't hose
-	      ;; this variable.  This approach was snarfed from
-	      ;; ange-ftp.el.
-	      coding-system-used
-	      ;; Write region into a tmp file.  This isn't really
-	      ;; needed if we use an encoding function, but currently
-	      ;; we use it always because this makes the logic
-	      ;; simpler.
-	      (tmpfile (or tramp-temp-buffer-file-name
-			   (tramp-compat-make-temp-file filename))))
-
-	  ;; If `append' is non-nil, we copy the file locally, and let
-	  ;; the native `write-region' implementation do the job.
-	  (when append (copy-file filename tmpfile 'ok))
-
-	  ;; We say `no-message' here because we don't want the
-	  ;; visited file modtime data to be clobbered from the temp
-	  ;; file.  We call `set-visited-file-modtime' ourselves later
-	  ;; on.  We must ensure that `file-coding-system-alist'
-	  ;; matches `tmpfile'.
-	  (let (file-name-handler-alist
-		(file-coding-system-alist
-		 (tramp-find-file-name-coding-system-alist filename tmpfile)))
-	    (condition-case err
-		(tramp-run-real-handler
-		 'write-region
-		 (list start end tmpfile append 'no-message lockname confirm))
-	      ((error quit)
-	       (setq tramp-temp-buffer-file-name nil)
-	       (delete-file tmpfile)
-	       (signal (car err) (cdr err))))
-
-	    ;; Now, `last-coding-system-used' has the right value.  Remember it.
-	    (when (boundp 'last-coding-system-used)
-	      (setq coding-system-used
-		    (symbol-value 'last-coding-system-used))))
-
-	  ;; The permissions of the temporary file should be set.  If
-	  ;; filename does not exist (eq modes nil) it has been
-	  ;; renamed to the backup file.  This case `save-buffer'
-	  ;; handles permissions.
-	  ;; Ensure, that it is still readable.
-	  (when modes
-	    (set-file-modes
-	     tmpfile
-	     (logior (or modes 0) (tramp-compat-octal-to-decimal "0400"))))
-
-	  ;; This is a bit lengthy due to the different methods
-	  ;; possible for file transfer.  First, we check whether the
-	  ;; method uses an rcp program.  If so, we call it.
-	  ;; Otherwise, both encoding and decoding command must be
-	  ;; specified.  However, if the method _also_ specifies an
-	  ;; encoding function, then that is used for encoding the
-	  ;; contents of the tmp file.
-	  (let* ((size (nth 7 (file-attributes tmpfile)))
-		 (rem-dec (tramp-get-inline-coding v "remote-decoding" size))
-		 (loc-enc (tramp-get-inline-coding v "local-encoding" size)))
-	    (cond
-	     ;; `copy-file' handles direct copy and out-of-band methods.
-	     ((or (tramp-local-host-p v)
-		  (tramp-method-out-of-band-p v size))
-	      (if (and (not (stringp start))
-		       (= (or end (point-max)) (point-max))
-		       (= (or start (point-min)) (point-min))
-		       (tramp-get-method-parameter
-			method 'tramp-copy-keep-tmpfile))
-		  (progn
-		    (setq tramp-temp-buffer-file-name tmpfile)
-		    (condition-case err
-			;; We keep the local file for performance
-			;; reasons, useful for "rsync".
-			(copy-file tmpfile filename t)
-		      ((error quit)
-		       (setq tramp-temp-buffer-file-name nil)
-		       (delete-file tmpfile)
-		       (signal (car err) (cdr err)))))
-		(setq tramp-temp-buffer-file-name nil)
-		;; Don't rename, in order to keep context in SELinux.
-		(unwind-protect
-		    (copy-file tmpfile filename t)
-		  (delete-file tmpfile))))
-
-	     ;; Use inline file transfer.
-	     (rem-dec
-	      ;; Encode tmpfile.
-	      (unwind-protect
-		  (with-temp-buffer
-		    (set-buffer-multibyte nil)
-		    ;; Use encoding function or command.
-		    (if (functionp loc-enc)
-			(with-progress-reporter
-			    v 3 (format "Encoding region using function `%s'"
-					loc-enc)
-			  (let ((coding-system-for-read 'binary))
-			    (insert-file-contents-literally tmpfile))
-			  ;; The following `let' is a workaround for the
-			  ;; base64.el that comes with pgnus-0.84.  If
-			  ;; both of the following conditions are
-			  ;; satisfied, it tries to write to a local
-			  ;; file in default-directory, but at this
-			  ;; point, default-directory is remote.
-			  ;; (`call-process-region' can't write to
-			  ;; remote files, it seems.)  The file in
-			  ;; question is a tmp file anyway.
-			  (let ((default-directory
-				  (tramp-compat-temporary-file-directory)))
-			    (funcall loc-enc (point-min) (point-max))))
-
-		      (with-progress-reporter
-			  v 3 (format "Encoding region using command `%s'"
-				      loc-enc)
-			(unless (zerop (tramp-call-local-coding-command
-					loc-enc tmpfile t))
-			  (tramp-error
-			   v 'file-error
-			   (concat "Cannot write to `%s', "
-				   "local encoding command `%s' failed")
-			   filename loc-enc))))
-
-		    ;; Send buffer into remote decoding command which
-		    ;; writes to remote file.  Because this happens on
-		    ;; the remote host, we cannot use the function.
-		    (with-progress-reporter
-			v 3
-			(format "Decoding region into remote file %s" filename)
-		      (goto-char (point-max))
-		      (unless (bolp) (newline))
-		      (tramp-send-command
-		       v
-		       (format
-			(concat rem-dec " <<'EOF'\n%sEOF")
-			(tramp-shell-quote-argument localname)
-			(buffer-string)))
-		      (tramp-barf-unless-okay
-		       v nil
-		       "Couldn't write region to `%s', decode using `%s' failed"
-		       filename rem-dec)
-		      ;; When `file-precious-flag' is set, the region is
-		      ;; written to a temporary file.  Check that the
-		      ;; checksum is equal to that from the local tmpfile.
-		      (when file-precious-flag
-			(erase-buffer)
-			(and
-			 ;; cksum runs locally, if possible.
-			 (zerop (tramp-compat-call-process "cksum" tmpfile t))
-			 ;; cksum runs remotely.
-			 (zerop
-			  (tramp-send-command-and-check
-			   v
-			   (format
-			    "cksum <%s"
-			    (tramp-shell-quote-argument localname))))
-			 ;; ... they are different.
-			 (not
-			  (string-equal
-			   (buffer-string)
-			   (with-current-buffer (tramp-get-buffer v)
-			     (buffer-string))))
-			 (tramp-error
-			  v 'file-error
-			  (concat "Couldn't write region to `%s',"
-				  " decode using `%s' failed")
-			  filename rem-dec)))))
-
-		;; Save exit.
-		(delete-file tmpfile)))
-
-	     ;; That's not expected.
-	     (t
-	      (tramp-error
-	       v 'file-error
-	       (concat "Method `%s' should specify both encoding and "
-		       "decoding command or an rcp program")
-	       method))))
-
-	  ;; Make `last-coding-system-used' have the right value.
-	  (when coding-system-used
-	    (set 'last-coding-system-used coding-system-used))))
-
-      (tramp-flush-file-property v (file-name-directory localname))
-      (tramp-flush-file-property v localname)
-
-      ;; We must protect `last-coding-system-used', now we have set it
-      ;; to its correct value.
-      (let (last-coding-system-used (need-chown t))
-	;; Set file modification time.
-	(when (or (eq visit t) (stringp visit))
-          (let ((file-attr (file-attributes filename)))
-            (set-visited-file-modtime
-             ;; We must pass modtime explicitely, because filename can
-             ;; be different from (buffer-file-name), f.e. if
-             ;; `file-precious-flag' is set.
-             (nth 5 file-attr))
-            (when (and (eq (nth 2 file-attr) uid)
-                       (eq (nth 3 file-attr) gid))
-              (setq need-chown nil))))
-
-	;; Set the ownership.
-        (when need-chown
-          (tramp-set-file-uid-gid filename uid gid))
-	(when (or (eq visit t) (null visit) (stringp visit))
-	  (tramp-message v 0 "Wrote %s" filename))
-	(run-hooks 'tramp-handle-write-region-hook)))))
-
-(defvar tramp-vc-registered-file-names nil
-  "List used to collect file names, which are checked during `vc-registered'.")
-
-;; VC backends check for the existence of various different special
-;; files.  This is very time consuming, because every single check
-;; requires a remote command (the file cache must be invalidated).
-;; Therefore, we apply a kind of optimization.  We install the file
-;; name handler `tramp-vc-file-name-handler', which does nothing but
-;; remembers all file names for which `file-exists-p' or
-;; `file-readable-p' has been applied.  A first run of `vc-registered'
-;; is performed.  Afterwards, a script is applied for all collected
-;; file names, using just one remote command.  The result of this
-;; script is used to fill the file cache with actual values.  Now we
-;; can reset the file name handlers, and we make a second run of
-;; `vc-registered', which returns the expected result without sending
-;; any other remote command.
-(defun tramp-handle-vc-registered (file)
-  "Like `vc-registered' for Tramp files."
-  (with-temp-message ""
-    (with-parsed-tramp-file-name file nil
-      (with-progress-reporter
-	  v 3 (format "Checking `vc-registered' for %s" file)
-
-	;; There could be new files, created by the vc backend.  We
-	;; cannot reuse the old cache entries, therefore.
-	(let (tramp-vc-registered-file-names
-	      (tramp-cache-inhibit-cache (current-time))
-	      (file-name-handler-alist
-	       `((,tramp-file-name-regexp . tramp-vc-file-name-handler))))
-
-	  ;; Here we collect only file names, which need an operation.
-	  (tramp-run-real-handler 'vc-registered (list file))
-	  (tramp-message v 10 "\n%s" tramp-vc-registered-file-names)
-
-	  ;; Send just one command, in order to fill the cache.
-	  (when tramp-vc-registered-file-names
-	    (tramp-maybe-send-script
-	     v
-	     (format tramp-vc-registered-read-file-names
-		     (tramp-get-file-exists-command v)
-		     (format "%s -r" (tramp-get-test-command v)))
-	     "tramp_vc_registered_read_file_names")
-
-	    (dolist
-		(elt
-		 (tramp-send-command-and-read
-		  v
-		  (format
-		   "tramp_vc_registered_read_file_names <<'EOF'\n%s\nEOF\n"
-		   (mapconcat 'tramp-shell-quote-argument
-			      tramp-vc-registered-file-names
-			      "\n"))))
-
-	      (tramp-set-file-property
-	       v (car elt) (cadr elt) (cadr (cdr elt))))))
-
-	;; Second run.  Now all `file-exists-p' or `file-readable-p'
-	;; calls shall be answered from the file cache.  We unset
-	;; `process-file-side-effects' in order to keep the cache when
-	;; `process-file' calls appear.
-	(let (process-file-side-effects)
-	  (tramp-run-real-handler 'vc-registered (list file)))))))
-
 ;;;###autoload
 (progn (defun tramp-run-real-handler (operation args)
   "Invoke normal file name handler for OPERATION.
@@ -5728,8 +1834,7 @@
 		(condition-case err
 		    (apply foreign operation args)
 
-		  ;; Trace that somebody has interrupted the
-		  ;; operation.
+		  ;; Trace, that somebody has interrupted the operation.
 		  (quit
 		   (let (tramp-message-show-message)
 		     (tramp-message
@@ -5787,48 +1892,6 @@
 Together with `tramp-locked', this implements a locking mechanism
 preventing reentrant calls of Tramp.")
 
-(defun tramp-sh-file-name-handler (operation &rest args)
-  "Invoke remote-shell Tramp file name handler.
-Fall back to normal file name handler if no Tramp handler exists."
-  (when (and tramp-locked (not tramp-locker))
-    (setq tramp-locked nil)
-    (signal 'file-error (list "Forbidden reentrant call of Tramp")))
-  (let ((tl tramp-locked))
-    (unwind-protect
-	(progn
-	  (setq tramp-locked t)
-	  (let ((tramp-locker t))
-	    (save-match-data
-	      (let ((fn (assoc operation tramp-file-name-handler-alist)))
-		(if fn
-		    (apply (cdr fn) args)
-		  (tramp-run-real-handler operation args))))))
-      (setq tramp-locked tl))))
-
-(defun tramp-vc-file-name-handler (operation &rest args)
-  "Invoke special file name handler, which collects files to be handled."
-  (save-match-data
-    (let ((filename
-	   (tramp-replace-environment-variables
-	    (apply 'tramp-file-name-for-operation operation args)))
-	  (fn (assoc operation tramp-file-name-handler-alist)))
-      (with-parsed-tramp-file-name filename nil
-	(cond
-	 ;; That's what we want: file names, for which checks are
-	 ;; applied.  We assume, that VC uses only `file-exists-p' and
-	 ;; `file-readable-p' checks; otherwise we must extend the
-	 ;; list.  We do not perform any action, but return nil, in
-	 ;; order to keep `vc-registered' running.
-	 ((and fn (memq operation '(file-exists-p file-readable-p)))
-	  (add-to-list 'tramp-vc-registered-file-names localname 'append)
-	  nil)
-	 ;; Tramp file name handlers like `expand-file-name'.  They
-	 ;; must still work.
-	 (fn
-	  (save-match-data (apply (cdr fn) args)))
-	 ;; Default file name handlers, we don't care.
-	 (t (tramp-run-real-handler operation args)))))))
-
 ;;;###autoload
 (progn (defun tramp-completion-file-name-handler (operation &rest args)
   "Invoke Tramp file name completion handler.
@@ -6027,12 +2090,11 @@
     ;; Complete local parts.
     (append
      result1
-     (condition-case nil
-	 (apply (if (tramp-connectable-p fullname)
-		    'tramp-completion-run-real-handler
-		  'tramp-run-real-handler)
-		'file-name-all-completions (list (list filename directory)))
-       (error nil)))))
+     (ignore-errors
+       (apply (if (tramp-connectable-p fullname)
+		  'tramp-completion-run-real-handler
+		'tramp-run-real-handler)
+	      'file-name-all-completions (list (list filename directory)))))))
 
 ;; Method, host name and user name completion for a file.
 ;;;###autoload
@@ -6490,69 +2552,10 @@
      (forward-line 1)
      result))
 
-;;; Internal Functions:
-
-(defun tramp-maybe-send-script (vec script name)
-  "Define in remote shell function NAME implemented as SCRIPT.
-Only send the definition if it has not already been done."
-  (let* ((p (tramp-get-connection-process vec))
-	 (scripts (tramp-get-connection-property p "scripts" nil)))
-    (unless (member name scripts)
-      (with-progress-reporter vec 5 (format "Sending script `%s'" name)
-	;; The script could contain a call of Perl.  This is masked with `%s'.
-	(tramp-send-command-and-check
-	 vec
-	 (format "%s () {\n%s\n}" name
-		 (format script (tramp-get-remote-perl vec))))
-	(tramp-set-connection-property p "scripts" (cons name scripts))))))
-
-(defun tramp-set-auto-save ()
-  (when (and ;; ange-ftp has its own auto-save mechanism
-	     (eq (tramp-find-foreign-file-name-handler (buffer-file-name))
-		 'tramp-sh-file-name-handler)
-             auto-save-default)
-    (auto-save-mode 1)))
-(add-hook 'find-file-hooks 'tramp-set-auto-save t)
-(add-hook 'tramp-unload-hook
-	  (lambda ()
-	    (remove-hook 'find-file-hooks 'tramp-set-auto-save)))
-
-(defun tramp-run-test (switch filename)
-  "Run `test' on the remote system, given a SWITCH and a FILENAME.
-Returns the exit code of the `test' program."
-  (with-parsed-tramp-file-name filename nil
-    (tramp-send-command-and-check
-     v
-     (format
-      "%s %s %s"
-      (tramp-get-test-command v)
-      switch
-      (tramp-shell-quote-argument localname)))))
-
-(defun tramp-run-test2 (format-string file1 file2)
-  "Run `test'-like program on the remote system, given FILE1, FILE2.
-FORMAT-STRING contains the program name, switches, and place holders.
-Returns the exit code of the `test' program.  Barfs if the methods,
-hosts, or files, disagree."
-  (unless (tramp-equal-remote file1 file2)
-    (with-parsed-tramp-file-name (if (tramp-tramp-file-p file1) file1 file2) nil
-      (tramp-error
-       v 'file-error
-       "tramp-run-test2 only implemented for same method, user, host")))
-  (with-parsed-tramp-file-name file1 v1
-    (with-parsed-tramp-file-name file1 v2
-      (tramp-send-command-and-check
-       v1
-       (format format-string
-	       (tramp-shell-quote-argument v1-localname)
-	       (tramp-shell-quote-argument v2-localname))))))
-
 (defun tramp-delete-temp-file-function ()
   "Remove temporary files related to current buffer."
   (when (stringp tramp-temp-buffer-file-name)
-    (condition-case nil
-	(delete-file tramp-temp-buffer-file-name)
-      (error nil))))
+    (ignore-errors (delete-file tramp-temp-buffer-file-name))))
 
 (add-hook 'kill-buffer-hook 'tramp-delete-temp-file-function)
 (add-hook 'tramp-cache-unload-hook
@@ -6560,173 +2563,6 @@
 	    (remove-hook 'kill-buffer-hook
 			 'tramp-delete-temp-file-function)))
 
-(defun tramp-find-executable
-  (vec progname dirlist &optional ignore-tilde ignore-path)
-  "Searches for PROGNAME in $PATH and all directories mentioned in DIRLIST.
-First arg VEC specifies the connection, PROGNAME is the program
-to search for, and DIRLIST gives the list of directories to
-search.  If IGNORE-TILDE is non-nil, directory names starting
-with `~' will be ignored. If IGNORE-PATH is non-nil, searches
-only in DIRLIST.
-
-Returns the absolute file name of PROGNAME, if found, and nil otherwise.
-
-This function expects to be in the right *tramp* buffer."
-  (with-current-buffer (tramp-get-connection-buffer vec)
-    (let (result)
-      ;; Check whether the executable is in $PATH. "which(1)" does not
-      ;; report always a correct error code; therefore we check the
-      ;; number of words it returns.
-      (unless ignore-path
-	(tramp-send-command vec (format "which \\%s | wc -w" progname))
-	(goto-char (point-min))
-	(if (looking-at "^\\s-*1$")
-	    (setq result (concat "\\" progname))))
-      (unless result
-	(when ignore-tilde
-	  ;; Remove all ~/foo directories from dirlist.  In XEmacs,
-	  ;; `remove' is in CL, and we want to avoid CL dependencies.
-	  (let (newdl d)
-	    (while dirlist
-	      (setq d (car dirlist))
-	      (setq dirlist (cdr dirlist))
-	      (unless (char-equal ?~ (aref d 0))
-		(setq newdl (cons d newdl))))
-	    (setq dirlist (nreverse newdl))))
-	(tramp-send-command
-	 vec
-	 (format (concat "while read d; "
-			 "do if test -x $d/%s -a -f $d/%s; "
-			 "then echo tramp_executable $d/%s; "
-			 "break; fi; done <<'EOF'\n"
-			 "%s\nEOF")
-		 progname progname progname (mapconcat 'identity dirlist "\n")))
-	(goto-char (point-max))
-	(when (search-backward "tramp_executable " nil t)
-	  (skip-chars-forward "^ ")
-	  (skip-chars-forward " ")
-	  (setq result (buffer-substring
-			(point) (tramp-compat-line-end-position)))))
-    result)))
-
-(defun tramp-set-remote-path (vec)
-  "Sets the remote environment PATH to existing directories.
-I.e., for each directory in `tramp-remote-path', it is tested
-whether it exists and if so, it is added to the environment
-variable PATH."
-  (tramp-message vec 5 (format "Setting $PATH environment variable"))
-  (tramp-send-command
-   vec (format "PATH=%s; export PATH"
-	       (mapconcat 'identity (tramp-get-remote-path vec) ":"))))
-
-;; ------------------------------------------------------------
-;; -- Communication with external shell --
-;; ------------------------------------------------------------
-
-(defun tramp-find-file-exists-command (vec)
-  "Find a command on the remote host for checking if a file exists.
-Here, we are looking for a command which has zero exit status if the
-file exists and nonzero exit status otherwise."
-  (let ((existing "/")
-        (nonexisting
-	 (tramp-shell-quote-argument "/ this file does not exist "))
-	result)
-    ;; The algorithm is as follows: we try a list of several commands.
-    ;; For each command, we first run `$cmd /' -- this should return
-    ;; true, as the root directory always exists.  And then we run
-    ;; `$cmd /this\ file\ does\ not\ exist ', hoping that the file indeed
-    ;; does not exist.  This should return false.  We use the first
-    ;; command we find that seems to work.
-    ;; The list of commands to try is as follows:
-    ;; `ls -d'            This works on most systems, but NetBSD 1.4
-    ;;                    has a bug: `ls' always returns zero exit
-    ;;                    status, even for files which don't exist.
-    ;; `test -e'          Some Bourne shells have a `test' builtin
-    ;;                    which does not know the `-e' option.
-    ;; `/bin/test -e'     For those, the `test' binary on disk normally
-    ;;                    provides the option.  Alas, the binary
-    ;;                    is sometimes `/bin/test' and sometimes it's
-    ;;                    `/usr/bin/test'.
-    ;; `/usr/bin/test -e' In case `/bin/test' does not exist.
-    (unless (or
-             (and (setq result (format "%s -e" (tramp-get-test-command vec)))
-		  (zerop (tramp-send-command-and-check
-			  vec (format "%s %s" result existing)))
-                  (not (zerop (tramp-send-command-and-check
-			       vec (format "%s %s" result nonexisting)))))
-             (and (setq result "/bin/test -e")
-		  (zerop (tramp-send-command-and-check
-			  vec (format "%s %s" result existing)))
-                  (not (zerop (tramp-send-command-and-check
-			       vec (format "%s %s" result nonexisting)))))
-             (and (setq result "/usr/bin/test -e")
-		  (zerop (tramp-send-command-and-check
-			  vec (format "%s %s" result existing)))
-                  (not (zerop (tramp-send-command-and-check
-			       vec (format "%s %s" result nonexisting)))))
-             (and (setq result (format "%s -d" (tramp-get-ls-command vec)))
-		  (zerop (tramp-send-command-and-check
-			  vec (format "%s %s" result existing)))
-                  (not (zerop (tramp-send-command-and-check
-			       vec (format "%s %s" result nonexisting))))))
-      (tramp-error
-       vec 'file-error "Couldn't find command to check if file exists"))
-    result))
-
-(defun tramp-open-shell (vec shell)
-  "Opens shell SHELL."
-  (with-progress-reporter vec 5 (format "Opening remote shell `%s'" shell)
-    ;; Find arguments for this shell.
-    (let ((tramp-end-of-output tramp-initial-end-of-output)
-	  (alist tramp-sh-extra-args)
-	  item extra-args)
-      (while (and alist (null extra-args))
-	(setq item (pop alist))
-	(when (string-match (car item) shell)
-	  (setq extra-args (cdr item))))
-      (when extra-args (setq shell (concat shell " " extra-args)))
-      (tramp-send-command
-       vec (format "exec env ENV='' PROMPT_COMMAND='' PS1=%s PS2='' PS3='' %s"
-		   (shell-quote-argument tramp-end-of-output) shell)
-       t))
-    ;; Setting prompts.
-    (tramp-send-command
-     vec (format "PS1=%s" (shell-quote-argument tramp-end-of-output)) t)
-    (tramp-send-command vec "PS2=''" t)
-    (tramp-send-command vec "PS3=''" t)
-    (tramp-send-command vec "PROMPT_COMMAND=''" t)))
-
-(defun tramp-find-shell (vec)
-  "Opens a shell on the remote host which groks tilde expansion."
-  (unless (tramp-get-connection-property vec "remote-shell" nil)
-    (let (shell)
-      (with-current-buffer (tramp-get-buffer vec)
-	(tramp-send-command vec "echo ~root" t)
-	(cond
-	 ((or (string-match "^~root$" (buffer-string))
-	      ;; The default shell (ksh93) of OpenSolaris is buggy.
-	      (string-equal (tramp-get-connection-property vec "uname" "")
-			    "SunOS 5.11"))
-	  (setq shell
-		(or (tramp-find-executable
-		     vec "bash" (tramp-get-remote-path vec) t t)
-		    (tramp-find-executable
-		     vec "ksh" (tramp-get-remote-path vec) t t)))
-	  (unless shell
-	    (tramp-error
-	     vec 'file-error
-	     "Couldn't find a shell which groks tilde expansion"))
-	  (tramp-message
-	   vec 5 "Starting remote shell `%s' for tilde expansion" shell)
-	  (tramp-open-shell vec shell))
-
-	 (t (tramp-message
-	     vec 5 "Remote `%s' groks tilde expansion, good"
-	     (tramp-set-connection-property
-	      vec "remote-shell"
-	      (tramp-get-method-parameter
-	       (tramp-file-name-method vec) 'tramp-remote-sh)))))))))
-
 ;; ------------------------------------------------------------
 ;; -- Functions for establishing connection --
 ;; ------------------------------------------------------------
@@ -6960,17 +2796,6 @@
 	  (tramp-error proc 'file-error "[[Regexp `%s' not found]]" regexp)))
       found)))
 
-(defun tramp-barf-if-no-shell-prompt (proc timeout &rest error-args)
-  "Wait for shell prompt and barf if none appears.
-Looks at process PROC to see if a shell prompt appears in TIMEOUT
-seconds.  If not, it produces an error message with the given ERROR-ARGS."
-  (unless
-      (tramp-wait-for-regexp
-       proc timeout
-       (format
-	"\\(%s\\|%s\\)\\'" shell-prompt-pattern tramp-shell-prompt-pattern))
-    (apply 'tramp-error-with-buffer nil proc 'file-error error-args)))
-
 ;; We don't call `tramp-send-string' in order to hide the password
 ;; from the debug buffer, and because end-of-line handling of the
 ;; string.
@@ -6983,819 +2808,6 @@
 		     'tramp-password-end-of-line)
 		    tramp-default-password-end-of-line))))
 
-(defun tramp-open-connection-setup-interactive-shell (proc vec)
-  "Set up an interactive shell.
-Mainly sets the prompt and the echo correctly.  PROC is the shell
-process to set up.  VEC specifies the connection."
-  (let ((tramp-end-of-output tramp-initial-end-of-output))
-    ;; It is useful to set the prompt in the following command because
-    ;; some people have a setting for $PS1 which /bin/sh doesn't know
-    ;; about and thus /bin/sh will display a strange prompt.  For
-    ;; example, if $PS1 has "${CWD}" in the value, then ksh will
-    ;; display the current working directory but /bin/sh will display
-    ;; a dollar sign.  The following command line sets $PS1 to a sane
-    ;; value, and works under Bourne-ish shells as well as csh-like
-    ;; shells.  Daniel Pittman reports that the unusual positioning of
-    ;; the single quotes makes it work under `rc', too.  We also unset
-    ;; the variable $ENV because that is read by some sh
-    ;; implementations (eg, bash when called as sh) on startup; this
-    ;; way, we avoid the startup file clobbering $PS1.  $PROMP_COMMAND
-    ;; is another way to set the prompt in /bin/bash, it must be
-    ;; discarded as well.
-    (tramp-open-shell
-     vec
-     (tramp-get-method-parameter (tramp-file-name-method vec) 'tramp-remote-sh))
-
-    ;; Disable echo.
-    (tramp-message vec 5 "Setting up remote shell environment")
-    (tramp-send-command vec "stty -inlcr -echo kill '^U' erase '^H'" t)
-    ;; Check whether the echo has really been disabled.  Some
-    ;; implementations, like busybox of embedded GNU/Linux, don't
-    ;; support disabling.
-    (tramp-send-command vec "echo foo" t)
-    (with-current-buffer (process-buffer proc)
-      (goto-char (point-min))
-      (when (looking-at "echo foo")
-	(tramp-set-connection-property proc "remote-echo" t)
-	(tramp-message vec 5 "Remote echo still on. Ok.")
-	;; Make sure backspaces and their echo are enabled and no line
-	;; width magic interferes with them.
-	(tramp-send-command vec "stty icanon erase ^H cols 32767" t))))
-
-  (tramp-message vec 5 "Setting shell prompt")
-  (tramp-send-command
-   vec (format "PS1=%s" (shell-quote-argument tramp-end-of-output)) t)
-  (tramp-send-command vec "PS2=''" t)
-  (tramp-send-command vec "PS3=''" t)
-  (tramp-send-command vec "PROMPT_COMMAND=''" t)
-
-  ;; Try to set up the coding system correctly.
-  ;; CCC this can't be the right way to do it.  Hm.
-  (tramp-message vec 5 "Determining coding system")
-  (tramp-send-command vec "echo foo ; echo bar" t)
-  (with-current-buffer (process-buffer proc)
-    (goto-char (point-min))
-    (if (featurep 'mule)
-	;; Use MULE to select the right EOL convention for communicating
-	;; with the process.
-	(let* ((cs (or (tramp-compat-funcall 'process-coding-system proc)
-		       (cons 'undecided 'undecided)))
-	       cs-decode cs-encode)
-	  (when (symbolp cs) (setq cs (cons cs cs)))
-	  (setq cs-decode (car cs))
-	  (setq cs-encode (cdr cs))
-	  (unless cs-decode (setq cs-decode 'undecided))
-	  (unless cs-encode (setq cs-encode 'undecided))
-	  (setq cs-encode (tramp-coding-system-change-eol-conversion
-			   cs-encode 'unix))
-	  (when (search-forward "\r" nil t)
-	    (setq cs-decode (tramp-coding-system-change-eol-conversion
-			     cs-decode 'dos)))
-	  (tramp-compat-funcall
-	   'set-buffer-process-coding-system cs-decode cs-encode)
-	  (tramp-message
-	   vec 5 "Setting coding system to `%s' and `%s'" cs-decode cs-encode))
-      ;; Look for ^M and do something useful if found.
-      (when (search-forward "\r" nil t)
-	;; We have found a ^M but cannot frob the process coding system
-	;; because we're running on a non-MULE Emacs.  Let's try
-	;; stty, instead.
-	(tramp-send-command vec "stty -onlcr" t))))
-  ;; Dump stty settings in the traces.
-  (when (>= tramp-verbose 9)
-    (tramp-send-command vec "stty -a" t))
-  (tramp-send-command vec "set +o vi +o emacs" t)
-
-  ;; Check whether the output of "uname -sr" has been changed.  If
-  ;; yes, this is a strong indication that we must expire all
-  ;; connection properties.  We start again with
-  ;; `tramp-maybe-open-connection', it will be catched there.
-  (tramp-message vec 5 "Checking system information")
-  (let ((old-uname (tramp-get-connection-property vec "uname" nil))
-	(new-uname
-	 (tramp-set-connection-property
-	  vec "uname"
-	  (tramp-send-command-and-read vec "echo \\\"`uname -sr`\\\""))))
-    (when (and (stringp old-uname) (not (string-equal old-uname new-uname)))
-      (with-current-buffer (tramp-get-debug-buffer vec)
-	;; Keep the debug buffer.
-	(rename-buffer
-	 (generate-new-buffer-name tramp-temp-buffer-name) 'unique)
-	(tramp-compat-funcall 'tramp-cleanup-connection vec)
-	(if (= (point-min) (point-max))
-	    (kill-buffer nil)
-	  (rename-buffer (tramp-debug-buffer-name vec) 'unique))
-	;; We call `tramp-get-buffer' in order to keep the debug buffer.
-	(tramp-get-buffer vec)
-	(tramp-message
-	 vec 3
-	 "Connection reset, because remote host changed from `%s' to `%s'"
-	 old-uname new-uname)
-	(throw 'uname-changed (tramp-maybe-open-connection vec)))))
-
-  ;; Check whether the remote host suffers from buggy
-  ;; `send-process-string'.  This is known for FreeBSD (see comment in
-  ;; `send_process', file process.c).  I've tested sending 624 bytes
-  ;; successfully, sending 625 bytes failed.  Emacs makes a hack when
-  ;; this host type is detected locally.  It cannot handle remote
-  ;; hosts, though.
-  (with-connection-property proc "chunksize"
-    (cond
-     ((and (integerp tramp-chunksize) (> tramp-chunksize 0))
-      tramp-chunksize)
-     (t
-      (tramp-message
-       vec 5 "Checking remote host type for `send-process-string' bug")
-      (if (string-match
-	   "^FreeBSD" (tramp-get-connection-property vec "uname" ""))
-	  500 0))))
-
-  ;; Set remote PATH variable.
-  (tramp-set-remote-path vec)
-
-  ;; Search for a good shell before searching for a command which
-  ;; checks if a file exists. This is done because Tramp wants to use
-  ;; "test foo; echo $?" to check if various conditions hold, and
-  ;; there are buggy /bin/sh implementations which don't execute the
-  ;; "echo $?"  part if the "test" part has an error.  In particular,
-  ;; the OpenSolaris /bin/sh is a problem.  There are also other
-  ;; problems with /bin/sh of OpenSolaris, like redirection of stderr
-  ;; in function declarations, or changing HISTFILE in place.
-  ;; Therefore, OpenSolaris' /bin/sh is replaced by bash, when
-  ;; detected.
-  (tramp-find-shell vec)
-
-  ;; Disable unexpected output.
-  (tramp-send-command vec "mesg n; biff n" t)
-
-  ;; IRIX64 bash expands "!" even when in single quotes.  This
-  ;; destroys our shell functions, we must disable it.  See
-  ;; <http://stackoverflow.com/questions/3291692/irix-bash-shell-expands-expression-in-single-quotes-yet-shouldnt>.
-  (when (string-match "^IRIX64" (tramp-get-connection-property vec "uname" ""))
-    (tramp-send-command vec "set +H" t))
-
-  ;; Set `remote-tty' process property.
-  (ignore-errors
-    (let ((tty (tramp-send-command-and-read vec "echo \\\"`tty`\\\"")))
-      (unless (zerop (length tty)) (process-put proc 'remote-tty tty))))
-
-  ;; Set the environment.
-  (tramp-message vec 5 "Setting default environment")
-
-  (let ((env (copy-sequence tramp-remote-process-environment))
-	unset item)
-    (while env
-      (setq item (tramp-compat-split-string (car env) "="))
-      (setcdr item (mapconcat 'identity (cdr item) "="))
-      (if (and (stringp (cdr item)) (not (string-equal (cdr item) "")))
-	  (tramp-send-command
-	   vec (format "%s=%s; export %s" (car item) (cdr item) (car item)) t)
-	(push (car item) unset))
-      (setq env (cdr env)))
-    (when unset
-      (tramp-send-command
-       vec (format "unset %s" (mapconcat 'identity unset " ")) t))))
-
-;; CCC: We should either implement a Perl version of base64 encoding
-;; and decoding.  Then we just use that in the last item.  The other
-;; alternative is to use the Perl version of UU encoding.  But then
-;; we need a Lisp version of uuencode.
-;;
-;; Old text from documentation of tramp-methods:
-;; Using a uuencode/uudecode inline method is discouraged, please use one
-;; of the base64 methods instead since base64 encoding is much more
-;; reliable and the commands are more standardized between the different
-;; Unix versions.  But if you can't use base64 for some reason, please
-;; note that the default uudecode command does not work well for some
-;; Unices, in particular AIX and Irix.  For AIX, you might want to use
-;; the following command for uudecode:
-;;
-;;     sed '/^begin/d;/^[` ]$/d;/^end/d' | iconv -f uucode -t ISO8859-1
-;;
-;; For Irix, no solution is known yet.
-
-(defconst tramp-local-coding-commands
-  '((b64 base64-encode-region base64-decode-region)
-    (uu  tramp-uuencode-region uudecode-decode-region)
-    (pack
-     "perl -e 'binmode STDIN; binmode STDOUT; print pack(q{u*}, join q{}, <>)'"
-     "perl -e 'binmode STDIN; binmode STDOUT; print unpack(q{u*}, join q{}, <>)'"))
-  "List of local coding commands for inline transfer.
-Each item is a list that looks like this:
-
-\(FORMAT ENCODING DECODING\)
-
-FORMAT is  symbol describing the encoding/decoding format.  It can be
-`b64' for base64 encoding, `uu' for uu encoding, or `pack' for simple packing.
-
-ENCODING and DECODING can be strings, giving commands, or symbols,
-giving functions.  If they are strings, then they can contain
-the \"%s\" format specifier.  If that specifier is present, the input
-filename will be put into the command line at that spot.  If the
-specifier is not present, the input should be read from standard
-input.
-
-If they are functions, they will be called with two arguments, start
-and end of region, and are expected to replace the region contents
-with the encoded or decoded results, respectively.")
-
-(defconst tramp-remote-coding-commands
-  '((b64 "base64" "base64 -d")
-    (b64 "mimencode -b" "mimencode -u -b")
-    (b64 "mmencode -b" "mmencode -u -b")
-    (b64 "recode data..base64" "recode base64..data")
-    (b64 tramp-perl-encode-with-module tramp-perl-decode-with-module)
-    (b64 tramp-perl-encode tramp-perl-decode)
-    (uu  "uuencode xxx" "uudecode -o /dev/stdout")
-    (uu  "uuencode xxx" "uudecode -o -")
-    (uu  "uuencode xxx" "uudecode -p")
-    (uu  "uuencode xxx" tramp-uudecode)
-    (pack
-     "perl -e 'binmode STDIN; binmode STDOUT; print pack(q{u*}, join q{}, <>)'"
-     "perl -e 'binmode STDIN; binmode STDOUT; print unpack(q{u*}, join q{}, <>)'"))
-  "List of remote coding commands for inline transfer.
-Each item is a list that looks like this:
-
-\(FORMAT ENCODING DECODING\)
-
-FORMAT is  symbol describing the encoding/decoding format.  It can be
-`b64' for base64 encoding, `uu' for uu encoding, or `pack' for simple packing.
-
-ENCODING and DECODING can be strings, giving commands, or symbols,
-giving variables.  If they are strings, then they can contain
-the \"%s\" format specifier.  If that specifier is present, the input
-filename will be put into the command line at that spot.  If the
-specifier is not present, the input should be read from standard
-input.
-
-If they are variables, this variable is a string containing a Perl
-implementation for this functionality.  This Perl program will be transferred
-to the remote host, and it is available as shell function with the same name.")
-
-(defun tramp-find-inline-encoding (vec)
-  "Find an inline transfer encoding that works.
-Goes through the list `tramp-local-coding-commands' and
-`tramp-remote-coding-commands'."
-  (save-excursion
-    (let ((local-commands tramp-local-coding-commands)
-	  (magic "xyzzy")
-	  loc-enc loc-dec rem-enc rem-dec litem ritem found)
-      (while (and local-commands (not found))
-	(setq litem (pop local-commands))
-	(catch 'wont-work-local
-	  (let ((format (nth 0 litem))
-		(remote-commands tramp-remote-coding-commands))
-	    (setq loc-enc (nth 1 litem))
-	    (setq loc-dec (nth 2 litem))
-	    ;; If the local encoder or decoder is a string, the
-	    ;; corresponding command has to work locally.
-	    (if (not (stringp loc-enc))
-		(tramp-message
-		 vec 5 "Checking local encoding function `%s'" loc-enc)
-	      (tramp-message
-	       vec 5 "Checking local encoding command `%s' for sanity" loc-enc)
-	      (unless (zerop (tramp-call-local-coding-command
-			      loc-enc nil nil))
-		(throw 'wont-work-local nil)))
-	    (if (not (stringp loc-dec))
-		(tramp-message
-		 vec 5 "Checking local decoding function `%s'" loc-dec)
-	      (tramp-message
-	       vec 5 "Checking local decoding command `%s' for sanity" loc-dec)
-	      (unless (zerop (tramp-call-local-coding-command
-			      loc-dec nil nil))
-		(throw 'wont-work-local nil)))
-	    ;; Search for remote coding commands with the same format
-	    (while (and remote-commands (not found))
-	      (setq ritem (pop remote-commands))
-	      (catch 'wont-work-remote
-		(when (equal format (nth 0 ritem))
-		  (setq rem-enc (nth 1 ritem))
-		  (setq rem-dec (nth 2 ritem))
-		  ;; Check if remote encoding and decoding commands can be
-		  ;; called remotely with null input and output.  This makes
-		  ;; sure there are no syntax errors and the command is really
-		  ;; found.  Note that we do not redirect stdout to /dev/null,
-		  ;; for two reasons: when checking the decoding command, we
-		  ;; actually check the output it gives.  And also, when
-		  ;; redirecting "mimencode" output to /dev/null, then as root
-		  ;; it might change the permissions of /dev/null!
-		  (when (not (stringp rem-enc))
-		    (let ((name (symbol-name rem-enc)))
-		      (while (string-match (regexp-quote "-") name)
-			(setq name (replace-match "_" nil t name)))
-		      (tramp-maybe-send-script vec (symbol-value rem-enc) name)
-		      (setq rem-enc name)))
-		  (tramp-message
-		   vec 5
-		   "Checking remote encoding command `%s' for sanity" rem-enc)
-		  (unless (zerop (tramp-send-command-and-check
-				  vec (format "%s </dev/null" rem-enc) t))
-		    (throw 'wont-work-remote nil))
-
-		  (when (not (stringp rem-dec))
-		    (let ((name (symbol-name rem-dec)))
-		      (while (string-match (regexp-quote "-") name)
-			(setq name (replace-match "_" nil t name)))
-		      (tramp-maybe-send-script vec (symbol-value rem-dec) name)
-		      (setq rem-dec name)))
-		  (tramp-message
-		   vec 5
-		   "Checking remote decoding command `%s' for sanity" rem-dec)
-		  (unless (zerop (tramp-send-command-and-check
-				  vec
-				  (format "echo %s | %s | %s"
-					  magic rem-enc rem-dec)
-				  t))
-		    (throw 'wont-work-remote nil))
-
-		  (with-current-buffer (tramp-get-buffer vec)
-		    (goto-char (point-min))
-		    (unless (looking-at (regexp-quote magic))
-		      (throw 'wont-work-remote nil)))
-
-		  ;; `rem-enc' and `rem-dec' could be a string meanwhile.
-		  (setq rem-enc (nth 1 ritem))
-		  (setq rem-dec (nth 2 ritem))
-		  (setq found t)))))))
-
-      ;; Did we find something?
-      (unless found
-	(tramp-error
-	 vec 'file-error "Couldn't find an inline transfer encoding"))
-
-      ;; Set connection properties.
-      (tramp-message vec 5 "Using local encoding `%s'" loc-enc)
-      (tramp-set-connection-property vec "local-encoding" loc-enc)
-      (tramp-message vec 5 "Using local decoding `%s'" loc-dec)
-      (tramp-set-connection-property vec "local-decoding" loc-dec)
-      (tramp-message vec 5 "Using remote encoding `%s'" rem-enc)
-      (tramp-set-connection-property vec "remote-encoding" rem-enc)
-      (tramp-message vec 5 "Using remote decoding `%s'" rem-dec)
-      (tramp-set-connection-property vec "remote-decoding" rem-dec))))
-
-(defun tramp-call-local-coding-command (cmd input output)
-  "Call the local encoding or decoding command.
-If CMD contains \"%s\", provide input file INPUT there in command.
-Otherwise, INPUT is passed via standard input.
-INPUT can also be nil which means `/dev/null'.
-OUTPUT can be a string (which specifies a filename), or t (which
-means standard output and thus the current buffer), or nil (which
-means discard it)."
-  (tramp-compat-call-process
-   tramp-encoding-shell
-   (when (and input (not (string-match "%s" cmd))) input)
-   (if (eq output t) t nil)
-   nil
-   tramp-encoding-command-switch
-   (concat
-    (if (string-match "%s" cmd) (format cmd input) cmd)
-    (if (stringp output) (concat "> " output) ""))))
-
-(defconst tramp-inline-compress-commands
-  '(("gzip" "gzip -d")
-    ("bzip2" "bzip2 -d")
-    ("compress" "compress -d"))
-  "List of compress and decompress commands for inline transfer.
-Each item is a list that looks like this:
-
-\(COMPRESS DECOMPRESS\)
-
-COMPRESS or DECOMPRESS are strings with the respective commands.")
-
-(defun tramp-find-inline-compress (vec)
-  "Find an inline transfer compress command that works.
-Goes through the list `tramp-inline-compress-commands'."
-  (save-excursion
-    (let ((commands tramp-inline-compress-commands)
-	  (magic "xyzzy")
-	  item compress decompress
-	  found)
-      (while (and commands (not found))
-	(catch 'next
-	  (setq item (pop commands)
-		compress (nth 0 item)
-		decompress (nth 1 item))
-	  (tramp-message
-	   vec 5
-	   "Checking local compress command `%s', `%s' for sanity"
-	   compress decompress)
-	  (unless (zerop (tramp-call-local-coding-command
-			  (format "echo %s | %s | %s"
-				  magic compress decompress) nil nil))
-	    (throw 'next nil))
-	  (tramp-message
-	   vec 5
-	   "Checking remote compress command `%s', `%s' for sanity"
-	   compress decompress)
-	  (unless (zerop (tramp-send-command-and-check
-			  vec (format "echo %s | %s | %s"
-				      magic compress decompress) t))
-	    (throw 'next nil))
-	  (setq found t)))
-
-      ;; Did we find something?
-      (if found
-	  (progn
-	    ;; Set connection properties.
-	    (tramp-message
-	     vec 5 "Using inline transfer compress command `%s'" compress)
-	    (tramp-set-connection-property vec "inline-compress" compress)
-	    (tramp-message
-	     vec 5 "Using inline transfer decompress command `%s'" decompress)
-	    (tramp-set-connection-property vec "inline-decompress" decompress))
-
-	(tramp-set-connection-property vec "inline-compress" nil)
-	(tramp-set-connection-property vec "inline-decompress" nil)
-	(tramp-message
-	 vec 2 "Couldn't find an inline transfer compress command")))))
-
-(defun tramp-compute-multi-hops (vec)
-  "Expands VEC according to `tramp-default-proxies-alist'.
-Gateway hops are already opened."
-  (let ((target-alist `(,vec))
-	(choices tramp-default-proxies-alist)
-	item proxy)
-
-    ;; Look for proxy hosts to be passed.
-    (while choices
-      (setq item (pop choices)
-	    proxy (eval (nth 2 item)))
-      (when (and
-	     ;; host
-	     (string-match (or (eval (nth 0 item)) "")
-			   (or (tramp-file-name-host (car target-alist)) ""))
-	     ;; user
-	     (string-match (or (eval (nth 1 item)) "")
-			   (or (tramp-file-name-user (car target-alist)) "")))
-	(if (null proxy)
-	    ;; No more hops needed.
-	    (setq choices nil)
-	  ;; Replace placeholders.
-	  (setq proxy
-		(format-spec
-		 proxy
-		 (format-spec-make
-		  ?u (or (tramp-file-name-user (car target-alist)) "")
-		  ?h (or (tramp-file-name-host (car target-alist)) ""))))
-	  (with-parsed-tramp-file-name proxy l
-	    ;; Add the hop.
-	    (add-to-list 'target-alist l)
-	    ;; Start next search.
-	    (setq choices tramp-default-proxies-alist)))))
-
-    ;; Handle gateways.
-    (when (string-match
-	   (format
-	    "^\\(%s\\|%s\\)$" tramp-gw-tunnel-method tramp-gw-socks-method)
-	   (tramp-file-name-method (car target-alist)))
-      (let ((gw (pop target-alist))
-	    (hop (pop target-alist)))
-	;; Is the method prepared for gateways?
-	(unless (tramp-get-method-parameter
-		 (tramp-file-name-method hop) 'tramp-default-port)
-	  (tramp-error
-	   vec 'file-error
-	   "Method `%s' is not supported for gateway access."
-	   (tramp-file-name-method hop)))
-	;; Add default port if needed.
-	(unless
-	    (string-match
-	     tramp-host-with-port-regexp (tramp-file-name-host hop))
-	  (aset hop 2
-		(concat
-		 (tramp-file-name-host hop) tramp-prefix-port-format
-		 (number-to-string
-		  (tramp-get-method-parameter
-		   (tramp-file-name-method hop) 'tramp-default-port)))))
-	;; Open the gateway connection.
-	(add-to-list
-	 'target-alist
-	 (vector
-	  (tramp-file-name-method hop) (tramp-file-name-user hop)
-	  (tramp-compat-funcall 'tramp-gw-open-connection vec gw hop) nil))
-	;; For the password prompt, we need the correct values.
-	;; Therefore, we must remember the gateway vector.  But we
-	;; cannot do it as connection property, because it shouldn't
-	;; be persistent.  And we have no started process yet either.
-	(tramp-set-file-property (car target-alist) "" "gateway" hop)))
-
-    ;; Foreign and out-of-band methods are not supported for multi-hops.
-    (when (cdr target-alist)
-      (setq choices target-alist)
-      (while choices
-	(setq item (pop choices))
-	(when
-	    (or
-	     (not
-	      (tramp-get-method-parameter
-	       (tramp-file-name-method item) 'tramp-login-program))
-	     (tramp-get-method-parameter
-	      (tramp-file-name-method item) 'tramp-copy-program))
-	  (tramp-error
-	   vec 'file-error
-	   "Method `%s' is not supported for multi-hops."
-	   (tramp-file-name-method item)))))
-
-    ;; In case the host name is not used for the remote shell
-    ;; command, the user could be misguided by applying a random
-    ;; hostname.
-    (let* ((v (car target-alist))
-	   (method (tramp-file-name-method v))
-	   (host (tramp-file-name-host v)))
-      (unless
-	  (or
-	   ;; There are multi-hops.
-	   (cdr target-alist)
-	   ;; The host name is used for the remote shell command.
-	   (member
-	    '("%h") (tramp-get-method-parameter method 'tramp-login-args))
-	   ;; The host is local.  We cannot use `tramp-local-host-p'
-	   ;; here, because it opens a connection as well.
-	   (string-match tramp-local-host-regexp host))
-	(tramp-error
-	 v 'file-error
-	 "Host `%s' looks like a remote host, `%s' can only use the local host"
-	 host method)))
-
-    ;; Result.
-    target-alist))
-
-(defun tramp-maybe-open-connection (vec)
-  "Maybe open a connection VEC.
-Does not do anything if a connection is already open, but re-opens the
-connection if a previous connection has died for some reason."
-  (catch 'uname-changed
-    (let ((p (tramp-get-connection-process vec))
-	  (process-name (tramp-get-connection-property vec "process-name" nil))
-	  (process-environment (copy-sequence process-environment)))
-
-      ;; If too much time has passed since last command was sent, look
-      ;; whether process is still alive.  If it isn't, kill it.  When
-      ;; using ssh, it can sometimes happen that the remote end has
-      ;; hung up but the local ssh client doesn't recognize this until
-      ;; it tries to send some data to the remote end.  So that's why
-      ;; we try to send a command from time to time, then look again
-      ;; whether the process is really alive.
-      (condition-case nil
-	  (when (and (> (tramp-time-diff
-			 (current-time)
-			 (tramp-get-connection-property
-			  p "last-cmd-time" '(0 0 0)))
-			60)
-		     p (processp p) (memq (process-status p) '(run open)))
-	    (tramp-send-command vec "echo are you awake" t t)
-	    (unless (and (memq (process-status p) '(run open))
-			 (tramp-wait-for-output p 10))
-	      ;; The error will be catched locally.
-	      (tramp-error vec 'file-error "Awake did fail")))
-	(file-error
-	 (tramp-flush-connection-property vec)
-	 (tramp-flush-connection-property p)
-	 (delete-process p)
-	 (setq p nil)))
-
-      ;; New connection must be opened.
-      (unless (and p (processp p) (memq (process-status p) '(run open)))
-
-	;; We call `tramp-get-buffer' in order to get a debug buffer for
-	;; messages from the beginning.
-	(tramp-get-buffer vec)
-	(with-progress-reporter
-	    vec 3
-	    (if (zerop (length (tramp-file-name-user vec)))
-		(format "Opening connection for %s using %s"
-			(tramp-file-name-host vec)
-			(tramp-file-name-method vec))
-	      (format "Opening connection for %s@%s using %s"
-		      (tramp-file-name-user vec)
-		      (tramp-file-name-host vec)
-		      (tramp-file-name-method vec)))
-
-	  ;; Start new process.
-	  (when (and p (processp p))
-	    (delete-process p))
-	  (setenv "TERM" tramp-terminal-type)
-	  (setenv "LC_ALL" "C")
-	  (setenv "PROMPT_COMMAND")
-	  (setenv "PS1" tramp-initial-end-of-output)
-	  (let* ((target-alist (tramp-compute-multi-hops vec))
-		 (process-connection-type tramp-process-connection-type)
-		 (process-adaptive-read-buffering nil)
-		 (coding-system-for-read nil)
-		 ;; This must be done in order to avoid our file name handler.
-		 (p (let ((default-directory
-			    (tramp-compat-temporary-file-directory)))
-		      (start-process
-		       (or process-name (tramp-buffer-name vec))
-		       (tramp-get-connection-buffer vec)
-		       tramp-encoding-shell))))
-
-	    (tramp-message
-	     vec 6 "%s" (mapconcat 'identity (process-command p) " "))
-
-	    ;; Check whether process is alive.
-	    (tramp-set-process-query-on-exit-flag p nil)
-	    (tramp-barf-if-no-shell-prompt
-	     p 60 "Couldn't find local shell prompt %s" tramp-encoding-shell)
-
-	    ;; Now do all the connections as specified.
-	    (while target-alist
-	      (let* ((hop (car target-alist))
-		     (l-method (tramp-file-name-method hop))
-		     (l-user (tramp-file-name-user hop))
-		     (l-host (tramp-file-name-host hop))
-		     (l-port nil)
-		     (login-program
-		      (tramp-get-method-parameter
-		       l-method 'tramp-login-program))
-		     (login-args
-		      (tramp-get-method-parameter l-method 'tramp-login-args))
-		     (async-args
-		      (tramp-get-method-parameter l-method 'tramp-async-args))
-		     (gw-args
-		      (tramp-get-method-parameter l-method 'tramp-gw-args))
-		     (gw (tramp-get-file-property hop "" "gateway" nil))
-		     (g-method (and gw (tramp-file-name-method gw)))
-		     (g-user (and gw (tramp-file-name-user gw)))
-		     (g-host (and gw (tramp-file-name-host gw)))
-		     (command login-program)
-		     ;; We don't create the temporary file.  In fact,
-		     ;; it is just a prefix for the ControlPath option
-		     ;; of ssh; the real temporary file has another
-		     ;; name, and it is created and protected by ssh.
-		     ;; It is also removed by ssh, when the connection
-		     ;; is closed.
-		     (tmpfile
-		      (tramp-set-connection-property
-		       p "temp-file"
-		       (make-temp-name
-			(expand-file-name
-			 tramp-temp-name-prefix
-			 (tramp-compat-temporary-file-directory)))))
-		     spec)
-
-		;; Add arguments for asynchrononous processes.
-		(when (and process-name async-args)
-		  (setq login-args (append async-args login-args)))
-
-		;; Add gateway arguments if necessary.
-		(when (and gw gw-args)
-		  (setq login-args (append gw-args login-args)))
-
-		;; Check for port number.  Until now, there's no need
-		;; for handling like method, user, host.
-		(when (string-match tramp-host-with-port-regexp l-host)
-		(setq l-port (match-string 2 l-host)
-		      l-host (match-string 1 l-host)))
-
-		;; Set variables for computing the prompt for reading
-		;; password.  They can also be derived from a gateway.
-		(setq tramp-current-method (or g-method l-method)
-		      tramp-current-user   (or g-user   l-user)
-		      tramp-current-host   (or g-host   l-host))
-
-		;; Replace login-args place holders.
-		(setq
-		 l-host (or l-host "")
-		 l-user (or l-user "")
-		 l-port (or l-port "")
-		 spec (format-spec-make
-		       ?h l-host ?u l-user ?p l-port ?t tmpfile)
-		 command
-		 (concat
-		  ;; We do not want to see the trailing local prompt in
-		  ;; `start-file-process'.
-		  (unless (memq system-type '(windows-nt)) "exec ")
-		  command " "
-		  (mapconcat
-		   (lambda (x)
-		     (setq x (mapcar (lambda (y) (format-spec y spec)) x))
-		     (unless (member "" x) (mapconcat 'identity x " ")))
-		   login-args " ")
-		  ;; Local shell could be a Windows COMSPEC.  It
-		  ;; doesn't know the ";" syntax, but we must exit
-		  ;; always for `start-file-process'.  "exec" does not
-		  ;; work either.
-		  (if (memq system-type '(windows-nt)) " && exit || exit")))
-
-		;; Send the command.
-		(tramp-message vec 3 "Sending command `%s'" command)
-		(tramp-send-command vec command t t)
-		(tramp-process-actions p vec tramp-actions-before-shell 60)
-		(tramp-message
-		 vec 3 "Found remote shell prompt on `%s'" l-host))
-	      ;; Next hop.
-	      (setq target-alist (cdr target-alist)))
-
-	    ;; Make initial shell settings.
-	    (tramp-open-connection-setup-interactive-shell p vec)))))))
-
-(defun tramp-send-command (vec command &optional neveropen nooutput)
-  "Send the COMMAND to connection VEC.
-Erases temporary buffer before sending the command.  If optional
-arg NEVEROPEN is non-nil, never try to open the connection.  This
-is meant to be used from `tramp-maybe-open-connection' only.  The
-function waits for output unless NOOUTPUT is set."
-  (unless neveropen (tramp-maybe-open-connection vec))
-  (let ((p (tramp-get-connection-process vec)))
-    (when (tramp-get-connection-property p "remote-echo" nil)
-      ;; We mark the command string that it can be erased in the output buffer.
-      (tramp-set-connection-property p "check-remote-echo" t)
-      (setq command (format "%s%s%s" tramp-echo-mark command tramp-echo-mark)))
-    (tramp-message vec 6 "%s" command)
-    (tramp-send-string vec command)
-    (unless nooutput (tramp-wait-for-output p))))
-
-(defun tramp-wait-for-output (proc &optional timeout)
-  "Wait for output from remote command."
-  (unless (buffer-live-p (process-buffer proc))
-    (delete-process proc)
-    (tramp-error proc 'file-error "Process `%s' not available, try again" proc))
-  (with-current-buffer (process-buffer proc)
-    (let* (;; Initially, `tramp-end-of-output' is "#$ ".  There might
-	   ;; be leading escape sequences, which must be ignored.
-	   (regexp (format "[^#$\n]*%s\r?$" (regexp-quote tramp-end-of-output)))
-	   ;; Sometimes, the commands do not return a newline but a
-	   ;; null byte before the shell prompt, for example "git
-	   ;; ls-files -c -z ...".
-	   (regexp1 (format "\\(^\\|\000\\)%s" regexp))
-	   (found (tramp-wait-for-regexp proc timeout regexp1)))
-      (if found
-	  (let (buffer-read-only)
-	    ;; A simple-minded busybox has sent " ^H" sequences.
-	    ;; Delete them.
-	    (goto-char (point-min))
-	    (when (re-search-forward
-		   "^\\(.\b\\)+$" (tramp-compat-line-end-position) t)
-	      (forward-line 1)
-	      (delete-region (point-min) (point)))
-	    ;; Delete the prompt.
-	    (goto-char (point-max))
-	    (re-search-backward regexp nil t)
-	    (delete-region (point) (point-max)))
-	(if timeout
-	    (tramp-error
-	     proc 'file-error
-	     "[[Remote prompt `%s' not found in %d secs]]"
-	     tramp-end-of-output timeout)
-	  (tramp-error
-	   proc 'file-error
-	   "[[Remote prompt `%s' not found]]" tramp-end-of-output)))
-      ;; Return value is whether end-of-output sentinel was found.
-      found)))
-
-;;;###tramp-autoload
-(defun tramp-send-command-and-check
-  (vec command &optional subshell dont-suppress-err)
-  "Run COMMAND and check its exit status.
-Sends `echo $?' along with the COMMAND for checking the exit status.  If
-COMMAND is nil, just sends `echo $?'.  Returns the exit status found.
-
-If the optional argument SUBSHELL is non-nil, the command is
-executed in a subshell, ie surrounded by parentheses.  If
-DONT-SUPPRESS-ERR is non-nil, stderr won't be sent to /dev/null."
-  (tramp-send-command
-   vec
-   (concat (if subshell "( " "")
-	   command
-	   (if command (if dont-suppress-err "; " " 2>/dev/null; ") "")
-	   "echo tramp_exit_status $?"
-	   (if subshell " )" "")))
-  (with-current-buffer (tramp-get-connection-buffer vec)
-    (goto-char (point-max))
-    (unless (re-search-backward "tramp_exit_status [0-9]+" nil t)
-      (tramp-error
-       vec 'file-error "Couldn't find exit status of `%s'" command))
-    (skip-chars-forward "^ ")
-    (prog1
-     (read (current-buffer))
-     (let (buffer-read-only) (delete-region (match-beginning 0) (point-max))))))
-
-(defun tramp-barf-unless-okay (vec command fmt &rest args)
-  "Run COMMAND, check exit status, throw error if exit status not okay.
-Similar to `tramp-send-command-and-check' but accepts two more arguments
-FMT and ARGS which are passed to `error'."
-  (unless (zerop (tramp-send-command-and-check vec command))
-    (apply 'tramp-error vec 'file-error fmt args)))
-
-(defun tramp-send-command-and-read (vec command)
-  "Run COMMAND and return the output, which must be a Lisp expression.
-In case there is no valid Lisp expression, it raises an error"
-  (tramp-barf-unless-okay vec command "`%s' returns with error" command)
-  (with-current-buffer (tramp-get-connection-buffer vec)
-    ;; Read the expression.
-    (goto-char (point-min))
-    (condition-case nil
-	(prog1 (read (current-buffer))
-	  ;; Error handling.
-	  (when (re-search-forward "\\S-" (tramp-compat-line-end-position) t)
-	    (error nil)))
-      (error (tramp-error
-	      vec 'file-error
-	      "`%s' does not return a valid Lisp expression: `%s'"
-	      command (buffer-string))))))
-
 ;; It seems that Tru64 Unix does not like it if long strings are sent
 ;; to it in one go.  (This happens when sending the Perl
 ;; `file-attributes' implementation, for instance.)  Therefore, we
@@ -7838,181 +2850,6 @@
 	      (setq pos (+ pos chunksize))))
 	(process-send-string p string)))))
 
-(defun tramp-mode-string-to-int (mode-string)
-  "Converts a ten-letter `drwxrwxrwx'-style mode string into mode bits."
-  (let* (case-fold-search
-	 (mode-chars (string-to-vector mode-string))
-         (owner-read (aref mode-chars 1))
-         (owner-write (aref mode-chars 2))
-         (owner-execute-or-setid (aref mode-chars 3))
-         (group-read (aref mode-chars 4))
-         (group-write (aref mode-chars 5))
-         (group-execute-or-setid (aref mode-chars 6))
-         (other-read (aref mode-chars 7))
-         (other-write (aref mode-chars 8))
-         (other-execute-or-sticky (aref mode-chars 9)))
-    (save-match-data
-      (logior
-       (cond
-	((char-equal owner-read ?r) (tramp-compat-octal-to-decimal "00400"))
-	((char-equal owner-read ?-) 0)
-	(t (error "Second char `%c' must be one of `r-'" owner-read)))
-       (cond
-	((char-equal owner-write ?w) (tramp-compat-octal-to-decimal "00200"))
-	((char-equal owner-write ?-) 0)
-	(t (error "Third char `%c' must be one of `w-'" owner-write)))
-       (cond
-	((char-equal owner-execute-or-setid ?x)
-	 (tramp-compat-octal-to-decimal "00100"))
-	((char-equal owner-execute-or-setid ?S)
-	 (tramp-compat-octal-to-decimal "04000"))
-	((char-equal owner-execute-or-setid ?s)
-	 (tramp-compat-octal-to-decimal "04100"))
-	((char-equal owner-execute-or-setid ?-) 0)
-	(t (error "Fourth char `%c' must be one of `xsS-'"
-		  owner-execute-or-setid)))
-       (cond
-	((char-equal group-read ?r) (tramp-compat-octal-to-decimal "00040"))
-	((char-equal group-read ?-) 0)
-	(t (error "Fifth char `%c' must be one of `r-'" group-read)))
-       (cond
-	((char-equal group-write ?w) (tramp-compat-octal-to-decimal "00020"))
-	((char-equal group-write ?-) 0)
-	(t (error "Sixth char `%c' must be one of `w-'" group-write)))
-       (cond
-	((char-equal group-execute-or-setid ?x)
-	 (tramp-compat-octal-to-decimal "00010"))
-	((char-equal group-execute-or-setid ?S)
-	 (tramp-compat-octal-to-decimal "02000"))
-	((char-equal group-execute-or-setid ?s)
-	 (tramp-compat-octal-to-decimal "02010"))
-	((char-equal group-execute-or-setid ?-) 0)
-	(t (error "Seventh char `%c' must be one of `xsS-'"
-		  group-execute-or-setid)))
-       (cond
-	((char-equal other-read ?r)
-	 (tramp-compat-octal-to-decimal "00004"))
-	((char-equal other-read ?-) 0)
-	(t (error "Eighth char `%c' must be one of `r-'" other-read)))
-       (cond
-         ((char-equal other-write ?w) (tramp-compat-octal-to-decimal "00002"))
-	 ((char-equal other-write ?-) 0)
-         (t (error "Nineth char `%c' must be one of `w-'" other-write)))
-       (cond
-	((char-equal other-execute-or-sticky ?x)
-	 (tramp-compat-octal-to-decimal "00001"))
-	((char-equal other-execute-or-sticky ?T)
-	 (tramp-compat-octal-to-decimal "01000"))
-	((char-equal other-execute-or-sticky ?t)
-	 (tramp-compat-octal-to-decimal "01001"))
-	((char-equal other-execute-or-sticky ?-) 0)
-	(t (error "Tenth char `%c' must be one of `xtT-'"
-		  other-execute-or-sticky)))))))
-
-(defun tramp-convert-file-attributes (vec attr)
-  "Convert file-attributes ATTR generated by perl script, stat or ls.
-Convert file mode bits to string and set virtual device number.
-Return ATTR."
-  (when attr
-    ;; Convert last access time.
-    (unless (listp (nth 4 attr))
-      (setcar (nthcdr 4 attr)
-              (list (floor (nth 4 attr) 65536)
-                    (floor (mod (nth 4 attr) 65536)))))
-    ;; Convert last modification time.
-    (unless (listp (nth 5 attr))
-      (setcar (nthcdr 5 attr)
-              (list (floor (nth 5 attr) 65536)
-                    (floor (mod (nth 5 attr) 65536)))))
-    ;; Convert last status change time.
-    (unless (listp (nth 6 attr))
-      (setcar (nthcdr 6 attr)
-              (list (floor (nth 6 attr) 65536)
-                    (floor (mod (nth 6 attr) 65536)))))
-    ;; Convert file size.
-    (when (< (nth 7 attr) 0)
-      (setcar (nthcdr 7 attr) -1))
-    (when (and (floatp (nth 7 attr))
-               (<= (nth 7 attr) (tramp-compat-most-positive-fixnum)))
-      (setcar (nthcdr 7 attr) (round (nth 7 attr))))
-    ;; Convert file mode bits to string.
-    (unless (stringp (nth 8 attr))
-      (setcar (nthcdr 8 attr) (tramp-file-mode-from-int (nth 8 attr)))
-      (when (stringp (car attr))
-        (aset (nth 8 attr) 0 ?l)))
-    ;; Convert directory indication bit.
-    (when (string-match "^d" (nth 8 attr))
-      (setcar attr t))
-    ;; Convert symlink from `tramp-do-file-attributes-with-stat'.
-    (when (consp (car attr))
-      (if (and (stringp (caar attr))
-               (string-match ".+ -> .\\(.+\\)." (caar attr)))
-          (setcar attr (match-string 1 (caar attr)))
-        (setcar attr nil)))
-    ;; Set file's gid change bit.
-    (setcar (nthcdr 9 attr)
-            (if (numberp (nth 3 attr))
-                (not (= (nth 3 attr)
-                        (tramp-get-remote-gid vec 'integer)))
-              (not (string-equal
-                    (nth 3 attr)
-                    (tramp-get-remote-gid vec 'string)))))
-    ;; Convert inode.
-    (unless (listp (nth 10 attr))
-      (setcar (nthcdr 10 attr)
-              (condition-case nil
-                  (cons (floor (nth 10 attr) 65536)
-                        (floor (mod (nth 10 attr) 65536)))
-                ;; Inodes can be incredible huge.  We must hide this.
-                (error (tramp-get-inode vec)))))
-    ;; Set virtual device number.
-    (setcar (nthcdr 11 attr)
-            (tramp-get-device vec))
-    attr))
-
-(defun tramp-check-cached-permissions (vec access)
-  "Check `file-attributes' caches for VEC.
-Return t if according to the cache access type ACCESS is known to
-be granted."
-  (let ((result nil)
-        (offset (cond
-                 ((eq ?r access) 1)
-                 ((eq ?w access) 2)
-                 ((eq ?x access) 3))))
-    (dolist (suffix '("string" "integer") result)
-      (setq
-       result
-       (or
-        result
-        (let ((file-attr
-               (tramp-get-file-property
-                vec (tramp-file-name-localname vec)
-                (concat "file-attributes-" suffix) nil))
-              (remote-uid
-               (tramp-get-connection-property
-                vec (concat "uid-" suffix) nil))
-              (remote-gid
-               (tramp-get-connection-property
-                vec (concat "gid-" suffix) nil)))
-          (and
-           file-attr
-           (or
-            ;; Not a symlink
-            (eq t (car file-attr))
-            (null (car file-attr)))
-           (or
-            ;; World accessible.
-            (eq access (aref (nth 8 file-attr) (+ offset 6)))
-            ;; User accessible and owned by user.
-            (and
-             (eq access (aref (nth 8 file-attr) offset))
-             (equal remote-uid (nth 2 file-attr)))
-            ;; Group accessible and owned by user's
-            ;; principal group.
-            (and
-             (eq access (aref (nth 8 file-attr) (+ offset 3)))
-             (equal remote-gid (nth 3 file-attr)))))))))))
-
 (defun tramp-get-inode (vec)
   "Returns the virtual inode number.
 If it doesn't exist, generate a new one."
@@ -8039,42 +2876,6 @@
 		   (list string (length tramp-devices))))
     (cons -1 (nth 1 (assoc string tramp-devices)))))
 
-(defun tramp-file-mode-from-int (mode)
-  "Turn an integer representing a file mode into an ls(1)-like string."
-  (let ((type	(cdr (assoc (logand (lsh mode -12) 15) tramp-file-mode-type-map)))
-	(user	(logand (lsh mode -6) 7))
-	(group	(logand (lsh mode -3) 7))
-	(other	(logand (lsh mode -0) 7))
-	(suid	(> (logand (lsh mode -9) 4) 0))
-	(sgid	(> (logand (lsh mode -9) 2) 0))
-	(sticky	(> (logand (lsh mode -9) 1) 0)))
-    (setq user  (tramp-file-mode-permissions user  suid "s"))
-    (setq group (tramp-file-mode-permissions group sgid "s"))
-    (setq other (tramp-file-mode-permissions other sticky "t"))
-    (concat type user group other)))
-
-(defun tramp-file-mode-permissions (perm suid suid-text)
-  "Convert a permission bitset into a string.
-This is used internally by `tramp-file-mode-from-int'."
-  (let ((r (> (logand perm 4) 0))
-	(w (> (logand perm 2) 0))
-	(x (> (logand perm 1) 0)))
-    (concat (or (and r "r") "-")
-	    (or (and w "w") "-")
-	    (or (and suid x suid-text)	; suid, execute
-		(and suid (upcase suid-text)) ; suid, !execute
-		(and x "x") "-"))))	; !suid
-
-(defun tramp-shell-case-fold (string)
-  "Converts STRING to shell glob pattern which ignores case."
-  (mapconcat
-   (lambda (c)
-     (if (equal (downcase c) (upcase c))
-         (vector c)
-       (format "[%c%c]" (downcase c) (upcase c))))
-   string
-   ""))
-
 (defun tramp-equal-remote (file1 file2)
   "Check, whether the remote parts of FILE1 and FILE2 are identical.
 The check depends on method, user and host name of the files.  If
@@ -8093,395 +2894,6 @@
        (stringp (file-remote-p file2))
        (string-equal (file-remote-p file1) (file-remote-p file2))))
 
-(defun tramp-make-copy-program-file-name (vec)
-  "Create a file name suitable to be passed to `rcp' and workalikes."
-  (let ((user (tramp-file-name-user vec))
-	(host (tramp-file-name-real-host vec))
-	(localname (tramp-shell-quote-argument
-		    (tramp-file-name-localname vec))))
-    (if (not (zerop (length user)))
-        (format "%s@%s:%s" user host localname)
-      (format "%s:%s" host localname))))
-
-(defun tramp-method-out-of-band-p (vec size)
-  "Return t if this is an out-of-band method, nil otherwise."
-  (and
-   ;; It shall be an out-of-band method.
-   (tramp-get-method-parameter (tramp-file-name-method vec) 'tramp-copy-program)
-   ;; Either the file size is large enough, or (in rare cases) there
-   ;; does not exist a remote encoding.
-   (or (null tramp-copy-size-limit)
-       (> size tramp-copy-size-limit)
-       (null (tramp-get-inline-coding vec "remote-encoding" size)))))
-
-(defun tramp-local-host-p (vec)
-  "Return t if this points to the local host, nil otherwise."
-  ;; We cannot use `tramp-file-name-real-host'.  A port is an
-  ;; indication for an ssh tunnel or alike.
-  (let ((host (tramp-file-name-host vec)))
-    (and
-     (stringp host)
-     (string-match tramp-local-host-regexp host)
-     ;; The method shall be applied to one of the shell file name
-     ;; handler.  `tramp-local-host-p' is also called for "smb" and
-     ;; alike, where it must fail.
-     (tramp-get-method-parameter
-      (tramp-file-name-method vec) 'tramp-login-program)
-     ;; The local temp directory must be writable for the other user.
-     (file-writable-p
-      (tramp-make-tramp-file-name
-       (tramp-file-name-method vec)
-       (tramp-file-name-user vec)
-       host
-       (tramp-compat-temporary-file-directory)))
-     ;; On some systems, chown runs only for root.
-     (or (zerop (user-uid))
-	 (zerop (tramp-get-remote-uid vec 'integer))))))
-
-;; Variables local to connection.
-
-;;;###tramp-autoload
-(defun tramp-get-remote-path (vec)
-  (with-connection-property
-      ;; When `tramp-own-remote-path' is in `tramp-remote-path', we
-      ;; cache the result for the session only.  Otherwise, the result
-      ;; is cached persistently.
-      (if (memq 'tramp-own-remote-path tramp-remote-path)
-	  (tramp-get-connection-process vec)
-	vec)
-      "remote-path"
-    (let* ((remote-path (copy-tree tramp-remote-path))
-	   (elt1 (memq 'tramp-default-remote-path remote-path))
-	   (elt2 (memq 'tramp-own-remote-path remote-path))
-	   (default-remote-path
-	     (when elt1
-	       (condition-case nil
-		   (tramp-send-command-and-read
-		    vec "echo \\\"`getconf PATH`\\\"")
-		 ;; Default if "getconf" is not available.
-		 (error
-		  (tramp-message
-		   vec 3
-		   "`getconf PATH' not successful, using default value \"%s\"."
-		   "/bin:/usr/bin")
-		  "/bin:/usr/bin"))))
-	   (own-remote-path
-	     (when elt2
-	       (condition-case nil
-		   (tramp-send-command-and-read vec "echo \\\"$PATH\\\"")
-		 ;; Default if "getconf" is not available.
-		 (error
-		  (tramp-message
-		   vec 3 "$PATH not set, ignoring `tramp-own-remote-path'.")
-		  nil)))))
-
-      ;; Replace place holder `tramp-default-remote-path'.
-      (when elt1
-	(setcdr elt1
-		(append
- 		 (tramp-compat-split-string default-remote-path ":")
-		 (cdr elt1)))
-	(setq remote-path (delq 'tramp-default-remote-path remote-path)))
-
-      ;; Replace place holder `tramp-own-remote-path'.
-      (when elt2
-	(setcdr elt2
-		(append
- 		 (tramp-compat-split-string own-remote-path ":")
-		 (cdr elt2)))
-	(setq remote-path (delq 'tramp-own-remote-path remote-path)))
-
-      ;; Remove double entries.
-      (setq elt1 remote-path)
-      (while (consp elt1)
-	(while (and (car elt1) (setq elt2 (member (car elt1) (cdr elt1))))
-	  (setcar elt2 nil))
-	(setq elt1 (cdr elt1)))
-
-      ;; Remove non-existing directories.
-      (delq
-       nil
-       (mapcar
-	(lambda (x)
-	  (and
-	   (stringp x)
-	   (file-directory-p
-	    (tramp-make-tramp-file-name
-	     (tramp-file-name-method vec)
-	     (tramp-file-name-user vec)
-	     (tramp-file-name-host vec)
-	     x))
-	   x))
-	remote-path)))))
-
-;;;###tramp-autoload
-(defun tramp-get-remote-tmpdir (vec)
-  (with-connection-property vec "tmp-directory"
-    (let ((dir (tramp-shell-quote-argument "/tmp")))
-      (if (and (zerop
-		(tramp-send-command-and-check
-		 vec (format "%s -d %s" (tramp-get-test-command vec) dir)))
-	       (zerop
-		(tramp-send-command-and-check
-		 vec (format "%s -w %s" (tramp-get-test-command vec) dir))))
-	  dir
-	(tramp-error vec 'file-error "Directory %s not accessible" dir)))))
-
-(defun tramp-get-ls-command (vec)
-  (with-connection-property vec "ls"
-    (tramp-message vec 5 "Finding a suitable `ls' command")
-    (or
-     (catch 'ls-found
-       (dolist (cmd '("ls" "gnuls" "gls"))
-	 (let ((dl (tramp-get-remote-path vec))
-	       result)
-	   (while (and dl (setq result (tramp-find-executable vec cmd dl t t)))
-	     ;; Check parameters.  On busybox, "ls" output coloring is
-	     ;; enabled by default sometimes.  So we try to disable it
-	     ;; when possible.  $LS_COLORING is not supported there.
-	     ;; Some "ls" versions are sensible wrt the order of
-	     ;; arguments, they fail when "-al" is after the
-	     ;; "--color=never" argument (for example on FreeBSD).
-	     (when (zerop (tramp-send-command-and-check
-			   vec (format "%s -lnd /" result)))
-	       (when (zerop (tramp-send-command-and-check
-			     vec (format
-				  "%s --color=never -al /dev/null" result)))
-		 (setq result (concat result " --color=never")))
-	       (throw 'ls-found result))
-	     (setq dl (cdr dl))))))
-     (tramp-error vec 'file-error "Couldn't find a proper `ls' command"))))
-
-(defun tramp-get-ls-command-with-dired (vec)
-  (save-match-data
-    (with-connection-property vec "ls-dired"
-      (tramp-message vec 5 "Checking, whether `ls --dired' works")
-      ;; Some "ls" versions are sensible wrt the order of arguments,
-      ;; they fail when "-al" is after the "--dired" argument (for
-      ;; example on FreeBSD).
-      (zerop (tramp-send-command-and-check
-	      vec (format "%s --dired -al /dev/null"
-			  (tramp-get-ls-command vec)))))))
-
-(defun tramp-get-test-command (vec)
-  (with-connection-property vec "test"
-    (tramp-message vec 5 "Finding a suitable `test' command")
-    (if (zerop (tramp-send-command-and-check vec "test 0"))
-	"test"
-      (tramp-find-executable vec "test" (tramp-get-remote-path vec)))))
-
-(defun tramp-get-test-nt-command (vec)
-  ;; Does `test A -nt B' work?  Use abominable `find' construct if it
-  ;; doesn't.  BSD/OS 4.0 wants the parentheses around the command,
-  ;; for otherwise the shell crashes.
-  (with-connection-property vec "test-nt"
-    (or
-     (progn
-       (tramp-send-command
-	vec (format "( %s / -nt / )" (tramp-get-test-command vec)))
-       (with-current-buffer (tramp-get-buffer vec)
-	 (goto-char (point-min))
-	 (when (looking-at (regexp-quote tramp-end-of-output))
-	   (format "%s %%s -nt %%s" (tramp-get-test-command vec)))))
-     (progn
-       (tramp-send-command
-	vec
-	(format
-	 "tramp_test_nt () {\n%s -n \"`find $1 -prune -newer $2 -print`\"\n}"
-	 (tramp-get-test-command vec)))
-       "tramp_test_nt %s %s"))))
-
-(defun tramp-get-file-exists-command (vec)
-  (with-connection-property vec "file-exists"
-    (tramp-message vec 5 "Finding command to check if file exists")
-    (tramp-find-file-exists-command vec)))
-
-;;;###tramp-autoload
-(defun tramp-get-remote-ln (vec)
-  (with-connection-property vec "ln"
-    (tramp-message vec 5 "Finding a suitable `ln' command")
-    (tramp-find-executable vec "ln" (tramp-get-remote-path vec))))
-
-(defun tramp-get-remote-perl (vec)
-  (with-connection-property vec "perl"
-    (tramp-message vec 5 "Finding a suitable `perl' command")
-    (let ((result
-	   (or (tramp-find-executable vec "perl5" (tramp-get-remote-path vec))
-	       (tramp-find-executable
-		vec "perl" (tramp-get-remote-path vec)))))
-      ;; We must check also for some Perl modules.
-      (when result
-	(with-connection-property vec "perl-file-spec"
-	  (zerop
-	   (tramp-send-command-and-check
-	    vec (format "%s -e 'use File::Spec;'" result))))
-	(with-connection-property vec "perl-cwd-realpath"
-	  (zerop
-	   (tramp-send-command-and-check
-	    vec (format "%s -e 'use Cwd \"realpath\";'" result)))))
-      result)))
-
-(defun tramp-get-remote-stat (vec)
-  (with-connection-property vec "stat"
-    (tramp-message vec 5 "Finding a suitable `stat' command")
-    (let ((result (tramp-find-executable
-		   vec "stat" (tramp-get-remote-path vec)))
-	  tmp)
-      ;; Check whether stat(1) returns usable syntax.  %s does not
-      ;; work on older AIX systems.
-      (when result
-	(setq tmp
-	      ;; We don't want to display an error message.
-	      (with-temp-message (or (current-message) "")
-		(condition-case nil
-		    (tramp-send-command-and-read
-		     vec (format "%s -c '(\"%%N\" %%s)' /" result))
-		  (error nil))))
-	(unless (and (listp tmp) (stringp (car tmp))
-		     (string-match "^./.$" (car tmp))
-		     (integerp (cadr tmp)))
-	  (setq result nil)))
-      result)))
-
-(defun tramp-get-remote-readlink (vec)
-  (with-connection-property vec "readlink"
-    (tramp-message vec 5 "Finding a suitable `readlink' command")
-    (let ((result (tramp-find-executable
-		   vec "readlink" (tramp-get-remote-path vec))))
-      (when (and result
-		 ;; We don't want to display an error message.
-		 (with-temp-message (or (current-message) "")
-		   (condition-case nil
-		       (zerop
-			(tramp-send-command-and-check
-			 vec (format "%s --canonicalize-missing /" result)))
-		     (error nil))))
-	result))))
-
-(defun tramp-get-remote-trash (vec)
-  (with-connection-property vec "trash"
-    (tramp-message vec 5 "Finding a suitable `trash' command")
-    (tramp-find-executable vec "trash" (tramp-get-remote-path vec))))
-
-(defun tramp-get-remote-id (vec)
-  (with-connection-property vec "id"
-    (tramp-message vec 5 "Finding POSIX `id' command")
-    (or
-     (catch 'id-found
-       (let ((dl (tramp-get-remote-path vec))
-	     result)
-	 (while (and dl (setq result (tramp-find-executable vec "id" dl t t)))
-	   ;; Check POSIX parameter.
-	   (when (zerop (tramp-send-command-and-check
-			 vec (format "%s -u" result)))
-	     (throw 'id-found result))
-	   (setq dl (cdr dl)))))
-     (tramp-error vec 'file-error "Couldn't find a POSIX `id' command"))))
-
-(defun tramp-get-remote-uid (vec id-format)
-  (with-connection-property vec (format "uid-%s" id-format)
-    (let ((res (tramp-send-command-and-read
-		vec
-		(format "%s -u%s %s"
-			(tramp-get-remote-id vec)
-			(if (equal id-format 'integer) "" "n")
-			(if (equal id-format 'integer)
-			    "" "| sed -e s/^/\\\"/ -e s/\$/\\\"/")))))
-      ;; The command might not always return a number.
-      (if (and (equal id-format 'integer) (not (integerp res))) -1 res))))
-
-(defun tramp-get-remote-gid (vec id-format)
-  (with-connection-property vec (format "gid-%s" id-format)
-    (let ((res (tramp-send-command-and-read
-		vec
-		(format "%s -g%s %s"
-			(tramp-get-remote-id vec)
-			(if (equal id-format 'integer) "" "n")
-			(if (equal id-format 'integer)
-			    "" "| sed -e s/^/\\\"/ -e s/\$/\\\"/")))))
-      ;; The command might not always return a number.
-      (if (and (equal id-format 'integer) (not (integerp res))) -1 res))))
-
-(defun tramp-get-local-uid (id-format)
-  (if (equal id-format 'integer) (user-uid) (user-login-name)))
-
-(defun tramp-get-local-gid (id-format)
-  (nth 3 (tramp-compat-file-attributes "~/" id-format)))
-
-;; Some predefined connection properties.
-(defun tramp-get-inline-compress (vec prop size)
-  "Return the compress command related to PROP.
-PROP is either `inline-compress' or `inline-decompress'. SIZE is
-the length of the file to be compressed.
-
-If no corresponding command is found, nil is returned."
-  (when (and (integerp tramp-inline-compress-start-size)
-	     (> size tramp-inline-compress-start-size))
-    (with-connection-property vec prop
-      (tramp-find-inline-compress vec)
-      (tramp-get-connection-property vec prop nil))))
-
-(defun tramp-get-inline-coding (vec prop size)
-  "Return the coding command related to PROP.
-PROP is either `remote-encoding', `remode-decoding',
-`local-encoding' or `local-decoding'.
-
-SIZE is the length of the file to be coded.  Depending on SIZE,
-compression might be applied.
-
-If no corresponding command is found, nil is returned.
-Otherwise, either a string is returned which contains a `%s' mark
-to be used for the respective input or output file; or a Lisp
-function cell is returned to be applied on a buffer."
-  (let ((coding
-	 (with-connection-property vec prop
-	   (tramp-find-inline-encoding vec)
-	   (tramp-get-connection-property vec prop nil)))
-	(prop1 (if (string-match "encoding" prop)
-		   "inline-compress" "inline-decompress"))
-	compress)
-    ;; The connection property might have been cached.  So we must send
-    ;; the script to the remote side - maybe.
-    (when (and coding (symbolp coding) (string-match "remote" prop))
-      (let ((name (symbol-name coding)))
-	(while (string-match (regexp-quote "-") name)
-	  (setq name (replace-match "_" nil t name)))
-	(tramp-maybe-send-script vec (symbol-value coding) name)
-	(setq coding name)))
-    (when coding
-      ;; Check for the `compress' command.
-      (setq compress (tramp-get-inline-compress vec prop1 size))
-      ;; Return the value.
-      (cond
-       ((and compress (symbolp coding))
-	(if (string-match "decompress" prop1)
-	    `(lambda (beg end)
-	       (,coding beg end)
-	       (let ((coding-system-for-write 'binary)
-		     (coding-system-for-read 'binary))
-		 (apply
-		  'call-process-region (point-min) (point-max)
-		  (car (split-string ,compress)) t t nil
-		  (cdr (split-string ,compress)))))
-	  `(lambda (beg end)
-	     (let ((coding-system-for-write 'binary)
-		   (coding-system-for-read 'binary))
-	       (apply
-		'call-process-region beg end
-		(car (split-string ,compress)) t t nil
-		(cdr (split-string ,compress))))
-	     (,coding (point-min) (point-max)))))
-       ((symbolp coding)
-	coding)
-       ((and compress (string-match "decoding" prop))
-	(format "(%s | %s >%%s)" coding compress))
-       (compress
-	(format "(%s <%%s | %s)" compress coding))
-       ((string-match "decoding" prop)
-	(format "%s >%%s" coding))
-       (t
-	(format "%s <%%s" coding))))))
-
 (defun tramp-get-method-parameter (method param)
   "Return the method parameter PARAM.
 If the `tramp-methods' entry does not exist, return nil."
@@ -8494,27 +2906,26 @@
   "Check, whether OPERATION runs a file name handler."
   ;; The file name handler is determined on base of either an
   ;; argument, `buffer-file-name', or `default-directory'.
-  (condition-case nil
-      (let* ((buffer-file-name "/")
-	     (default-directory "/")
-	     (fnha file-name-handler-alist)
-	     (check-file-name-operation operation)
-	     (file-name-handler-alist
-	      (list
-	       (cons "/"
-		     (lambda (operation &rest args)
-		       "Returns OPERATION if it is the one to be checked."
-		       (if (equal check-file-name-operation operation)
-			   operation
-			 (let ((file-name-handler-alist fnha))
-			   (apply operation args))))))))
-	(equal (apply operation args) operation))
-    (error nil)))
+  (ignore-errors
+    (let* ((buffer-file-name "/")
+	   (default-directory "/")
+	   (fnha file-name-handler-alist)
+	   (check-file-name-operation operation)
+	   (file-name-handler-alist
+	    (list
+	     (cons "/"
+		   (lambda (operation &rest args)
+		     "Returns OPERATION if it is the one to be checked."
+		     (if (equal check-file-name-operation operation)
+			 operation
+		       (let ((file-name-handler-alist fnha))
+			 (apply operation args))))))))
+      (equal (apply operation args) operation))))
 
 (unless (tramp-exists-file-name-handler 'make-auto-save-file-name)
   (defadvice make-auto-save-file-name
     (around tramp-advice-make-auto-save-file-name () activate)
-    "Invoke `tramp-handle-make-auto-save-file-name' for Tramp files."
+    "Invoke `tramp-*-handle-make-auto-save-file-name' for Tramp files."
     (if (tramp-tramp-file-p (buffer-file-name))
 	;; We cannot call `tramp-handle-make-auto-save-file-name'
 	;; directly, because this would bypass the locking mechanism.
@@ -8754,106 +3165,39 @@
   ;; ange-ftp settings must be enabled.
   (tramp-compat-funcall 'tramp-ftp-enable-ange-ftp)
   ;; Maybe it's not loaded yet.
-  (condition-case nil
-      (unload-feature 'tramp 'force)
-    (error nil)))
-
-(when (and load-in-progress
-	   (string-match "Loading tramp..." (or (current-message) "")))
-  (message "Loading tramp...done"))
+  (ignore-errors (unload-feature 'tramp 'force)))
 
 (provide 'tramp)
 
 ;;; TODO:
 
-;; * Handle nonlocal exits such as C-g.
-;; * But it would probably be better to use with-local-quit at the
-;;   place where it's actually needed: around any potentially
-;;   indefinitely blocking piece of code.  In this case it would be
-;;   within Tramp around one of its calls to accept-process-output (or
-;;   around one of the loops that calls accept-process-output)
-;;   (Stefan Monnier).
 ;; * Rewrite `tramp-shell-quote-argument' to abstain from using
 ;;   `shell-quote-argument'.
 ;; * In Emacs 21, `insert-directory' shows total number of bytes used
 ;;   by the files in that directory.  Add this here.
 ;; * Avoid screen blanking when hitting `g' in dired.  (Eli Tziperman)
 ;; * Make ffap.el grok Tramp filenames.  (Eli Tziperman)
-;; * Don't use globbing for directories with many files, as this is
-;;   likely to produce long command lines, and some shells choke on
-;;   long command lines.
-;; * How to deal with MULE in `insert-file-contents' and `write-region'?
 ;; * abbreviate-file-name
 ;; * Better error checking.  At least whenever we see something
 ;;   strange when doing zerop, we should kill the process and start
 ;;   again.  (Greg Stark)
-;; * Remove unneeded parameters from methods.
-;; * Make it work for different encodings, and for different file name
-;;   encodings, too.  (Daniel Pittman)
-;; * Don't search for perl5 and perl.  Instead, only search for perl and
-;;   then look if it's the right version (with `perl -v').
-;; * When editing a remote CVS controlled file as a different user, VC
-;;   gets confused about the file locking status.  Try to find out why
-;;   the workaround doesn't work.
 ;; * Username and hostname completion.
 ;; ** Try to avoid usage of `last-input-event' in `tramp-completion-mode-p'.
 ;; ** Unify `tramp-parse-{rhosts,shosts,sconfig,hosts,passwd,netrc}'.
 ;;    Code is nearly identical.
-;; * Allow out-of-band methods as _last_ multi-hop.  Open a connection
-;;   until the last but one hop via `start-file-process'.  Apply it
-;;   also for ftp and smb.
-;; * WIBNI if we had a command "trampclient"?  If I was editing in
-;;   some shell with root priviledges, it would be nice if I could
-;;   just call
-;;     trampclient filename.c
-;;   as an editor, and the _current_ shell would connect to an Emacs
-;;   server and would be used in an existing non-priviledged Emacs
-;;   session for doing the editing in question.
-;;   That way, I need not tell Emacs my password again and be afraid
-;;   that it makes it into core dumps or other ugly stuff (I had Emacs
-;;   once display a just typed password in the context of a keyboard
-;;   sequence prompt for a question immediately following in a shell
-;;   script run within Emacs -- nasty).
-;;   And if I have some ssh session running to a different computer,
-;;   having the possibility of passing a local file there to a local
-;;   Emacs session (in case I can arrange for a connection back) would
-;;   be nice.
-;;   Likely the corresponding Tramp server should not allow the
-;;   equivalent of the emacsclient -eval option in order to make this
-;;   reasonably unproblematic.  And maybe trampclient should have some
-;;   way of passing credentials, like by using an SSL socket or
-;;   something.  (David Kastrup)
-;; * Reconnect directly to a compliant shell without first going
-;;   through the user's default shell.  (Pete Forman)
 ;; * Make `tramp-default-user' obsolete.
-;; * How can I interrupt the remote process with a signal
-;;   (interrupt-process seems not to work)?  (Markus Triska)
-;; * Avoid the local shell entirely for starting remote processes.  If
-;;   so, I think even a signal, when delivered directly to the local
-;;   SSH instance, would correctly be propagated to the remote process
-;;   automatically; possibly SSH would have to be started with
-;;   "-t".  (Markus Triska)
-;; * It makes me wonder if tramp couldn't fall back to ssh when scp
-;;   isn't on the remote host.  (Mark A. Hershberger)
-;; * Use lsh instead of ssh.  (Alfred M. Szmidt)
 ;; * Implement a general server-local-variable mechanism, as there are
 ;;   probably other variables that need different values for different
 ;;   servers too.  The user could then configure a variable (such as
 ;;   tramp-server-local-variable-alist) to define any such variables
 ;;   that they need to, which would then be let bound as appropriate
 ;;   in tramp functions.  (Jason Rumney)
-;; * Optimize out-of-band copying, when both methods are scp-like (not
-;;   rsync).
-;; * Keep a second connection open for out-of-band methods like scp or
-;;   rsync.
 ;; * IMHO, it's a drawback that currently Tramp doesn't support
 ;;   Unicode in Dired file names by default.  Is it possible to
 ;;   improve Tramp to set LC_ALL to "C" only for commands where Tramp
 ;;   expects English?  Or just to set LC_MESSAGES to "C" if Tramp
 ;;   expects only English messages?  (Juri Linkov)
 ;; * Make shadowfile.el grok Tramp filenames.  (Bug#4526, Bug#4846)
-;; * Try telnet+curl as new method.  It might be useful for busybox,
-;;   without built-in uuencode/uudecode.
 ;; * Load ~/.emacs_SHELLNAME on the remote host for `shell'.
 ;; * I was wondering it it would be possible to use tramp even if I'm
 ;;   actually using sshfs.  But when I launch a command I would like
------------------------------------------------------------
revno: 101421
committer: Lars Magne Ingebrigtsen <larsi@gnus.org>
branch nick: trunk
timestamp: Mon 2010-09-13 16:58:48 +0200
message:
  * configure.in (HAVE_LIBXML2): Check that the libxml2 we found can
  be used.  This fixes a conf problem on Mac OS X.
diff:
=== modified file 'ChangeLog'
--- ChangeLog	2010-09-10 16:44:35 +0000
+++ ChangeLog	2010-09-13 14:58:48 +0000
@@ -1,3 +1,8 @@
+2010-09-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* configure.in (HAVE_LIBXML2): Check that the libxml2 we found can
+	be used.  This fixes a conf problem on Mac OS X.
+
 2010-09-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* configure.in: Check for libxml2.

=== modified file 'configure'
--- configure	2010-09-13 14:42:33 +0000
+++ configure	2010-09-13 14:58:48 +0000
@@ -11180,9 +11180,56 @@
   fi
 
   if test "${HAVE_LIBXML2}" = "yes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for htmlReadMemory in -lxml2" >&5
+$as_echo_n "checking for htmlReadMemory in -lxml2... " >&6; }
+if test "${ac_cv_lib_xml2_htmlReadMemory+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lxml2  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char htmlReadMemory ();
+int
+main ()
+{
+return htmlReadMemory ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_xml2_htmlReadMemory=yes
+else
+  ac_cv_lib_xml2_htmlReadMemory=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml2_htmlReadMemory" >&5
+$as_echo "$ac_cv_lib_xml2_htmlReadMemory" >&6; }
+if test "x$ac_cv_lib_xml2_htmlReadMemory" = x""yes; then :
+  HAVE_LIBXML2=yes
+else
+  HAVE_LIBXML2=no
+fi
+
+    if test "${HAVE_LIBXML2}" = "yes"; then
 
 $as_echo "#define HAVE_LIBXML2 1" >>confdefs.h
 
+    else
+      LIBXML2_LIBS=""
+      LIBXML2_CFLAGS=""
+    fi
   fi
 fi
 

=== modified file 'configure.in'
--- configure.in	2010-09-10 16:44:35 +0000
+++ configure.in	2010-09-13 14:58:48 +0000
@@ -2541,7 +2541,13 @@
   ### I'm not sure what the version number should be, so I just guessed.
   PKG_CHECK_MODULES(LIBXML2, libxml-2.0 > 2.2.0, HAVE_LIBXML2=yes, HAVE_LIBXML2=no)
   if test "${HAVE_LIBXML2}" = "yes"; then
-    AC_DEFINE(HAVE_LIBXML2, 1, [Define to 1 if you have the libxml library (-lxml2).])
+    AC_CHECK_LIB(xml2, htmlReadMemory, HAVE_LIBXML2=yes, HAVE_LIBXML2=no)
+    if test "${HAVE_LIBXML2}" = "yes"; then
+      AC_DEFINE(HAVE_LIBXML2, 1, [Define to 1 if you have the libxml library (-lxml2).])
+    else
+      LIBXML2_LIBS=""
+      LIBXML2_CFLAGS=""
+    fi
   fi
 fi
 AC_SUBST(LIBXML2_LIBS)
------------------------------------------------------------
revno: 101420
committer: Eli Zaretskii <eliz@gnu.org>
branch nick: trunk
timestamp: Mon 2010-09-13 16:42:33 +0200
message:
  Revert revno 101418 by Bob Chassel.
diff:
=== modified file 'configure'
--- configure	2010-09-13 10:14:52 +0000
+++ configure	2010-09-13 14:42:33 +0000
@@ -1,11 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for emacs 24.0.50.
+# Generated by GNU Autoconf 2.65 for emacs 24.0.50.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -316,7 +316,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -356,19 +356,19 @@
 fi # as_fn_arith
 
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
   fi
-  $as_echo "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $1" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -530,7 +530,7 @@
 exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -910,9 +910,8 @@
   fi
 
   case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -957,7 +956,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -983,7 +982,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1187,7 +1186,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1203,7 +1202,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1233,8 +1232,8 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+  -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
     ;;
 
   *=*)
@@ -1242,7 +1241,7 @@
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1260,13 +1259,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
+  as_fn_error "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1289,7 +1288,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1303,8 +1302,8 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1319,9 +1318,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
+  as_fn_error "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
+  as_fn_error "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1360,11 +1359,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1404,7 +1403,7 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
+  -q, --quiet, --silent   do not print \`checking...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1622,9 +1621,9 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 emacs configure 24.0.50
-generated by GNU Autoconf 2.67
+generated by GNU Autoconf 2.65
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1740,7 +1739,7 @@
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
+  test $ac_status = 0; } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -1764,10 +1763,10 @@
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval "test \"\${$3+set}\"" = set; then :
+  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -1803,7 +1802,7 @@
 else
   ac_header_preproc=no
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 
@@ -1830,7 +1829,7 @@
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -1894,7 +1893,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1916,18 +1915,15 @@
 
 } # ac_fn_c_check_header_compile
 
-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-# ---------------------------------------------
-# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly.
+# ac_fn_c_check_decl LINENO SYMBOL VAR
+# ------------------------------------
+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
 ac_fn_c_check_decl ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  as_decl_name=`echo $2|sed 's/ *(.*//'`
-  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
+$as_echo_n "checking whether $2 is declared... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1936,12 +1932,8 @@
 int
 main ()
 {
-#ifndef $as_decl_name
-#ifdef __cplusplus
-  (void) $as_decl_use;
-#else
-  (void) $as_decl_name;
-#endif
+#ifndef $2
+  (void) $2;
 #endif
 
   ;
@@ -1970,7 +1962,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1982,7 +1974,7 @@
 else
   eval "$3=no"
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -2000,7 +1992,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
 $as_echo_n "checking for $2.$3... " >&6; }
-if eval "test \"\${$4+set}\"" = set; then :
+if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2056,7 +2048,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2124,7 +2116,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=no"
@@ -2173,7 +2165,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by emacs $as_me 24.0.50, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
 
@@ -2283,9 +2275,11 @@
   {
     echo
 
-    $as_echo "## ---------------- ##
+    cat <<\_ASBOX
+## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -2319,9 +2313,11 @@
 )
     echo
 
-    $as_echo "## ----------------- ##
+    cat <<\_ASBOX
+## ----------------- ##
 ## Output variables. ##
-## ----------------- ##"
+## ----------------- ##
+_ASBOX
     echo
     for ac_var in $ac_subst_vars
     do
@@ -2334,9 +2330,11 @@
     echo
 
     if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
+      cat <<\_ASBOX
+## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##"
+## ------------------- ##
+_ASBOX
       echo
       for ac_var in $ac_subst_files
       do
@@ -2350,9 +2348,11 @@
     fi
 
     if test -s confdefs.h; then
-      $as_echo "## ----------- ##
+      cat <<\_ASBOX
+## ----------- ##
 ## confdefs.h. ##
-## ----------- ##"
+## ----------- ##
+_ASBOX
       echo
       cat confdefs.h
       echo
@@ -2407,12 +2407,7 @@
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -2427,11 +2422,7 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+    . "$ac_site_file"
   fi
 done
 
@@ -2512,7 +2503,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2686,7 +2677,7 @@
 	    g | gt | gtk  )	val=gtk ;;
 	    gtk3  )	val=gtk3 ;;
 	    * )
-as_fn_error $? "\`--with-x-toolkit=$withval' is invalid;
+as_fn_error "\`--with-x-toolkit=$withval' is invalid;
 this option's value should be \`yes', \`no', \`lucid', \`athena', \`motif', \`gtk' or
 \`gtk3'.  \`yes' and \`gtk' are synonyms. \`athena' and \`lucid' are synonyms." "$LINENO" 5
 	    ;;
@@ -2981,7 +2972,7 @@
 	stringfreelist) ac_gc_check_string_free_list=1 ;;
 	xmallocoverrun)	ac_xmalloc_overrun=1 ;;
 	conslist)	ac_gc_check_cons_list=1 ;;
-	*)	as_fn_error $? "unknown check category $check" "$LINENO" 5  ;;
+	*)	as_fn_error "unknown check category $check" "$LINENO" 5 ;;
 	esac
 done
 IFS="$ac_save_IFS"
@@ -3099,22 +3090,16 @@
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
+  for ac_t in install-sh install.sh shtool; do
+    if test -f "$ac_dir/$ac_t"; then
+      ac_aux_dir=$ac_dir
+      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      break 2
+    fi
+  done
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3128,7 +3113,7 @@
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
@@ -3139,16 +3124,16 @@
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -3173,7 +3158,7 @@
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -3181,7 +3166,7 @@
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -3475,7 +3460,7 @@
 
 
 if test $unported = yes; then
-  as_fn_error $? "Emacs hasn't been ported to \`${canonical}' systems.
+  as_fn_error "Emacs hasn't been ported to \`${canonical}' systems.
 Check \`etc/MACHINES' for recognized configuration names." "$LINENO" 5
 fi
 
@@ -3789,8 +3774,8 @@
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3904,8 +3889,9 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -3947,8 +3933,8 @@
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -4005,9 +3991,9 @@
     else
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
+as_fn_error "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
     fi
   fi
 fi
@@ -4058,8 +4044,8 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -4391,7 +4377,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -4407,11 +4393,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -4450,7 +4436,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -4466,18 +4452,18 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -4538,7 +4524,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
@@ -4604,7 +4590,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -4736,7 +4722,8 @@
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -4980,7 +4967,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -4996,11 +4983,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -5039,7 +5026,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -5055,18 +5042,18 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -5503,7 +5490,7 @@
   if test "x${with_makeinfo}" = "xno"; then
     MAKEINFO=off
   elif test ! -e $srcdir/info/emacs; then
-    as_fn_error $? "You do not seem to have makeinfo >= 4.6, and your
+    as_fn_error "You do not seem to have makeinfo >= 4.6, and your
 source tree does not seem to have pre-built manuals in the \`info' directory.
 Either install a suitable version of makeinfo, or re-run configure
 with the \`--without-makeinfo' option to build without the manuals. " "$LINENO" 5
@@ -5657,7 +5644,7 @@
     if test "x$GCC" = "xyes"; then
       C_SWITCH_MACHINE="-fno-common"
     else
-      as_fn_error $? "What gives?  Fix me if DEC Unix supports ELF now." "$LINENO" 5
+      as_fn_error "What gives?  Fix me if DEC Unix supports ELF now." "$LINENO" 5
     fi
   else
     UNEXEC_OBJ=unexalpha.o
@@ -5935,7 +5922,7 @@
   ## Some platforms don't use any of these files, so it is not
   ## appropriate to put this test outside the if block.
   test -e $CRT_DIR/crtn.o || test -e $CRT_DIR/crt0.o || \
-    as_fn_error $? "crt*.o not found in specified location." "$LINENO" 5
+    as_fn_error "crt*.o not found in specified location." "$LINENO" 5
 
 fi
 
@@ -5990,7 +5977,8 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -6181,7 +6169,7 @@
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
       if test "$emacs_alsa_subdir" != yes; then
-        as_fn_error $? "pkg-config found alsa, but it does not compile.  See config.log for error messages." "$LINENO" 5
+        as_fn_error "pkg-config found alsa, but it does not compile.  See config.log for error messages." "$LINENO" 5
       fi
       ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
     fi
@@ -6216,7 +6204,8 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -7271,8 +7260,8 @@
 
      ;; #(
    *)
-     as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5  ;;
+     as_fn_error "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
  esac
 
 
@@ -7280,7 +7269,7 @@
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -7288,7 +7277,7 @@
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -7424,7 +7413,7 @@
   have_x=disabled
 else
   case $x_includes,$x_libraries in #(
-    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
+    *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
     *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7442,7 +7431,7 @@
 	@echo libdir='${LIBDIR}'
 _ACEOF
   if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
-    # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
     for ac_var in incroot usrlibdir libdir; do
       eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
     done
@@ -7528,7 +7517,7 @@
   fi
 done
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 fi # $ac_x_includes = no
 
 if test "$ac_x_libraries" = no; then
@@ -7711,7 +7700,7 @@
 if test "x$ac_cv_header_AppKit_AppKit_h" = x""yes; then :
   HAVE_NS=yes
 else
-  as_fn_error $? "\`--with-ns' was specified, but the include
+  as_fn_error "\`--with-ns' was specified, but the include
   files are missing or cannot be compiled." "$LINENO" 5
 fi
 
@@ -7827,7 +7816,7 @@
    if test "$HAVE_XSERVER" = true ||
       test -n "$DISPLAY" ||
       test "`echo /usr/lib/libX11.*`" != "/usr/lib/libX11.*"; then
-        as_fn_error $? "You seem to be running X, but no X development libraries
+        as_fn_error "You seem to be running X, but no X development libraries
 were found.  You should install the relevant development files for X
 and for the toolkit you want, such as Gtk+, Lesstif or Motif.  Also make
 sure you have development files for image handling, i.e.
@@ -7950,7 +7939,8 @@
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -8457,7 +8447,8 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -8857,7 +8848,7 @@
   fi
 
   if test "$pkg_check_gtk" = "no" && test "$USE_X_TOOLKIT" != "maybe"; then
-     as_fn_error $? "$GTK_PKG_ERRORS" "$LINENO" 5
+     as_fn_error "$GTK_PKG_ERRORS" "$LINENO" 5
   fi
 fi
 
@@ -8963,7 +8954,7 @@
   fi
 
   if test "$pkg_check_gtk" = "no" && test "$USE_X_TOOLKIT" != "maybe"; then
-     as_fn_error $? "$GTK_PKG_ERRORS" "$LINENO" 5
+     as_fn_error "$GTK_PKG_ERRORS" "$LINENO" 5
   fi
 fi
 fi
@@ -8990,7 +8981,7 @@
 
   if test "${GTK_COMPILES}" != "yes"; then
     if test "$USE_X_TOOLKIT" != "maybe"; then
-      as_fn_error $? "Gtk+ wanted, but it does not compile, see config.log.  Maybe some x11-devel files missing?" "$LINENO" 5 ;
+      as_fn_error "Gtk+ wanted, but it does not compile, see config.log.  Maybe some x11-devel files missing?" "$LINENO" 5;
     fi
   else
     HAVE_GTK=yes
@@ -9120,7 +9111,8 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -9485,7 +9477,7 @@
       USE_X_TOOLKIT=LUCID
       LUCID_LIBW=-lXaw
     elif test x"${USE_X_TOOLKIT}" = xLUCID; then
-      as_fn_error $? "Lucid toolkit requires X11/Xaw include files" "$LINENO" 5
+      as_fn_error "Lucid toolkit requires X11/Xaw include files" "$LINENO" 5
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no; do not use toolkit by default" >&5
 $as_echo "no; do not use toolkit by default" >&6; }
@@ -10662,7 +10654,8 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -10914,7 +10907,7 @@
     MISSING="$MISSING libtiff" && WITH_NO="$WITH_NO --with-tiff=no"
 
   if test "X${MISSING}" != X; then
-    as_fn_error $? "The following required libraries were not found:
+    as_fn_error "The following required libraries were not found:
     $MISSING
 Maybe some development libraries/packages are missing?
 If you don't want to link with them give
@@ -11355,7 +11348,8 @@
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
@@ -11419,7 +11413,7 @@
 
 
 if test x"$ac_cv_func_alloca_works" != xyes; then
-   as_fn_error $? "a system implementation of alloca is required " "$LINENO" 5
+   as_fn_error "a system implementation of alloca is required " "$LINENO" 5
 fi
 
 # fmod, logb, and frexp are found in -lm on most systems.
@@ -11615,7 +11609,7 @@
 
 
   if test $ac_cv_prog_liblockfile = yes; then
-    as_fn_error $? "Shared liblockfile found but can't link against it.
+    as_fn_error "Shared liblockfile found but can't link against it.
 This probably means that movemail could lose mail.
 There may be a \`development' package to install containing liblockfile." "$LINENO" 5
   fi
@@ -11704,7 +11698,8 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -11735,7 +11730,8 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -11787,8 +11783,8 @@
 static time_t time_t_min;
 
 /* Values we'll use to set the TZ environment variable.  */
-static const char *tz_strings[] = {
-  (const char *) 0, "TZ=GMT0", "TZ=JST-9",
+static char *tz_strings[] = {
+  (char *) 0, "TZ=GMT0", "TZ=JST-9",
   "TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00"
 };
 #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
@@ -11805,7 +11801,7 @@
      instead of "TZ=America/Vancouver" in order to detect the bug even
      on systems that don't support the Olson extension, or don't have the
      full zoneinfo tables installed.  */
-  putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0");
+  putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
 
   tm.tm_year = 98;
   tm.tm_mon = 3;
@@ -11818,14 +11814,16 @@
 }
 
 static int
-mktime_test1 (time_t now)
+mktime_test1 (now)
+     time_t now;
 {
   struct tm *lt;
   return ! (lt = localtime (&now)) || mktime (lt) == now;
 }
 
 static int
-mktime_test (time_t now)
+mktime_test (now)
+     time_t now;
 {
   return (mktime_test1 (now)
 	  && mktime_test1 ((time_t) (time_t_max - now))
@@ -11849,7 +11847,8 @@
 }
 
 static int
-bigtime_test (int j)
+bigtime_test (j)
+     int j;
 {
   struct tm tm;
   time_t now;
@@ -11893,7 +11892,7 @@
      instead of "TZ=America/Vancouver" in order to detect the bug even
      on systems that don't support the Olson extension, or don't have the
      full zoneinfo tables installed.  */
-  putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0");
+  putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
 
   t = mktime (&tm);
 
@@ -11928,7 +11927,7 @@
   for (i = 0; i < N_STRINGS; i++)
     {
       if (tz_strings[i])
-	putenv ((char*) tz_strings[i]);
+	putenv (tz_strings[i]);
 
       for (t = 0; t <= time_t_max - delta; t += delta)
 	if (! mktime_test (t))
@@ -11980,7 +11979,7 @@
 
 # Make sure getloadavg.c is where it belongs, at configure-time.
 test -f "$srcdir/$ac_config_libobj_dir/getloadavg.c" ||
-  as_fn_error $? "$srcdir/$ac_config_libobj_dir/getloadavg.c is missing" "$LINENO" 5
+  as_fn_error "$srcdir/$ac_config_libobj_dir/getloadavg.c is missing" "$LINENO" 5
 
 ac_save_LIBS=$LIBS
 
@@ -12849,7 +12848,7 @@
 fi
 
 if test "$have_tputs_et_al" != true; then
-  as_fn_error $? "I couldn't find termcap functions (tputs and friends).
+  as_fn_error "I couldn't find termcap functions (tputs and friends).
 Maybe some development libraries/packages are missing?  Try installing
 libncurses-dev(el), libterminfo-dev(el) or similar." "$LINENO" 5
 fi
@@ -13996,7 +13995,8 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -14370,14 +14370,14 @@
    && test x"`$CC --version 2> /dev/null | grep 'gcc.* 4.5.0'`" != x \
    && test x"`echo $CFLAGS | grep '\-O[23]'`" != x \
    && test x"`echo $CFLAGS | grep '\-fno-optimize-sibling-calls'`" = x; then
-   as_fn_error $? "GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS'." "$LINENO" 5
+   as_fn_error "GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS'." "$LINENO" 5
 fi
 
 #### Find out which version of Emacs this is.
 version=`grep 'const char emacs_version' ${srcdir}/src/emacs.c \
 	 | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
 if test x"${version}" = x; then
-  as_fn_error $? "can't find current emacs version in \`${srcdir}/src/emacs.c'." "$LINENO" 5
+  as_fn_error "can't find current emacs version in \`${srcdir}/src/emacs.c'." "$LINENO" 5
 fi
 if test x"${version}" != x"$PACKAGE_VERSION"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: version mismatch between \`${srcdir}/configure.in' and \`${srcdir}/src/emacs.c'." >&5
@@ -14936,7 +14936,6 @@
 
 ac_libobjs=
 ac_ltlibobjs=
-U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -15099,19 +15098,19 @@
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
   fi
-  $as_echo "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $1" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -15307,7 +15306,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -15361,7 +15360,7 @@
 # values after options handling.
 ac_log="
 This file was extended by emacs $as_me 24.0.50, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -15427,10 +15426,10 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 emacs config.status 24.0.50
-configured by $0, generated by GNU Autoconf 2.67,
+configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -15446,16 +15445,11 @@
 while test $# != 0
 do
   case $1 in
-  --*=?*)
+  --*=*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -15477,7 +15471,6 @@
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -15490,7 +15483,7 @@
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
+    as_fn_error "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -15499,7 +15492,7 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
+  -*) as_fn_error "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -15567,7 +15560,7 @@
     "leim/Makefile") CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -15605,7 +15598,7 @@
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -15639,7 +15632,7 @@
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
+  ac_cs_awk_cr='\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
@@ -15656,7 +15649,7 @@
   echo "_ACEOF"
 } >conf$$files.sh &&
 . ./conf$$files.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 rm -f conf$$files.sh
 
 {
@@ -15664,18 +15657,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -15770,28 +15763,20 @@
 else
   cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
 s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -15819,7 +15804,7 @@
   if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -15904,7 +15889,7 @@
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -15917,7 +15902,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -15945,7 +15930,7 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -15972,7 +15957,7 @@
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -16108,22 +16093,22 @@
 else
   $AWK -f "$tmp/subs.awk" | $SHELL
 fi >$tmp/out \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
+which seems to be undefined.  Please make sure it is defined." >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
+which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
   -) cat "$tmp/out" && rm -f "$tmp/out";;
   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -16134,19 +16119,19 @@
       $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
     } >"$tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+      || as_fn_error "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+	|| as_fn_error "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
+      || as_fn_error "could not create -" "$LINENO" 5
   fi
  ;;
 
@@ -16183,7 +16168,7 @@
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -16204,7 +16189,7 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
+  $ac_cs_success || as_fn_exit $?
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5

=== modified file 'doc/misc/ediff.texi'
--- doc/misc/ediff.texi	2010-09-13 10:14:52 +0000
+++ doc/misc/ediff.texi	2010-09-13 14:42:33 +0000
@@ -1986,7 +1986,8 @@
 this:
 
 @comment Use @set to avoid triggering merge conflict detectors like CVS.
-@set seven-left 
+@set seven-left <<<<<<<
+@set seven-right >>>>>>>
 @example
 @value{seven-left} variant A
 the difference region from buffer A

=== modified file 'lisp/files.el'
--- lisp/files.el	2010-09-13 10:14:52 +0000
+++ lisp/files.el	2010-09-13 14:42:33 +0000
@@ -1,18 +1,3 @@
-;;  (defun auto-save-mode (arg)
-;;   "Toggle auto-saving of contents of current buffer.
-;; With prefix argument ARG, turn auto-saving on if positive, else off."
-;;     (interactive)
-;;     (if (> arg 0) auto-save (null auto-save)))
-
-
-;; (defun auto-fill-mode (arg)
-;;   "Toggle Auto Fill mode.
-;; With ARG, turn Auto Fill mode on if and only if ARG is positive.
-;; In Auto Fill mode, inserting a space at a column beyond `current-fill-column'
-;; automatically breaks the line at a previous space."
-;;    (interactive)
-;;    (if (> arg 0) auto-fill (null auto-fill)))
-
 ;;; files.el --- file input and output commands for Emacs
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994, 1995, 1996,

=== modified file 'lisp/ldefs-boot.el'
--- lisp/ldefs-boot.el	2010-09-13 10:14:52 +0000
+++ lisp/ldefs-boot.el	2010-09-13 14:42:33 +0000
@@ -10464,6 +10464,7 @@
 
 ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off
 ;;;;;;  turn-off-flyspell turn-on-flyspell flyspell-mode flyspell-prog-mode)
+;;;;;;  "flyspell" "textmodes/flyspell.el" (19370 36541))
 ;;; Generated autoloads from textmodes/flyspell.el
 
 (autoload 'flyspell-prog-mode "flyspell" "\

=== modified file 'lisp/net/tramp-cache.el'
--- lisp/net/tramp-cache.el	2010-09-13 10:14:52 +0000
+++ lisp/net/tramp-cache.el	2010-09-13 14:42:33 +0000
@@ -1,5 +1,3 @@
-(setq tramp-version 24)
-
 ;;; tramp-cache.el --- file information caching for Tramp
 
 ;; Copyright (C) 2000, 2005, 2006, 2007, 2008, 2009,
@@ -53,8 +51,6 @@
 ;;; Code:
 
 (require 'tramp)
-; bob, 2010 Sep 11
-; (require 'trampver.el)
 (autoload 'time-stamp-string "time-stamp")
 
 ;;; -- Cache --

=== modified file 'lisp/net/tramp-compat.el'
--- lisp/net/tramp-compat.el	2010-09-13 10:14:52 +0000
+++ lisp/net/tramp-compat.el	2010-09-13 14:42:33 +0000
@@ -29,9 +29,7 @@
 
 ;;; Code:
 
-(eval-when-compile
-
-  (require 'tramp-loaddefs))
+(require 'tramp-loaddefs)
 
 (eval-when-compile
 

=== modified file 'lisp/net/tramp.el'
--- lisp/net/tramp.el	2010-09-13 10:14:52 +0000
+++ lisp/net/tramp.el	2010-09-13 14:42:33 +0000
@@ -1,4 +1,3 @@
-(setq tramp-version 24)
 ;;; tramp.el --- Transparent Remote Access, Multiple Protocol
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,

=== modified file 'lisp/textmodes/page.el'
--- lisp/textmodes/page.el	2010-09-13 10:14:52 +0000
+++ lisp/textmodes/page.el	2010-09-13 14:42:33 +0000
@@ -1,10 +1,3 @@
-;; (push-mark (point) t)  needed at the end of forward-page 
-;; The documentation in simple.el for set-mark says
-;;   To remember a location for internal use in the Lisp program,
-;;   store it in a Lisp variable.  Example:
-;;      (let ((beg (point))) (forward-line 1) (delete-region beg (point)))."
-
-
 ;;; page.el --- page motion commands for Emacs
 
 ;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,

=== removed directory 'share'
=== removed directory 'share/emacs'
=== removed directory 'share/emacs/site-lisp'
=== removed directory 'share/emacs/site-lisp/w3m'
=== removed file 'share/emacs/site-lisp/w3m/ChangeLog'
--- share/emacs/site-lisp/w3m/ChangeLog	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/ChangeLog	1970-01-01 00:00:00 +0000
@@ -1,10524 +0,0 @@
-2010-09-09  Leo  <sdl.web@gmail.com>
-
-	* w3m.el (w3m-input-url): Pass DEFAULT argument to completing-read,
-	instead of replacing its return value, to enable a user to edit.
-
-2010-09-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-active-region-or-url-at-point): Remove only newlines and
-	leading and trailing whitespace in region string.
-	(w3m-input-url): Treat INITIAL if it is "" as nil but don't mind region
-	even if it is active; treat DEFAULT if it is "" as nil but don't regard
-	to w3m-home-page; always show DEFAULT if any within prompt string.
-	Suggested by Leo <sdl.web@gmail.com>.
-
-2010-09-06  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-lnum.el (w3m-read-int-interactive): Make it work for XEmacs
-	(note: `?<' is not `eq' to `60' in XEmacs, for example).
-
-2010-09-06  Andrey Kotlarski  <m00naticus@gmail.com>
-
-	* w3m-lnum.el (w3m-linknum-remove-overlays): Simplified.
-	(w3m-link-numbering-mode): Using `or' instead of `unless'.
-	(w3m-read-int-interactive): Added ability to scroll page while
-	selecting number.
-
-2010-09-06  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-input-url): Move cursor to place where a user likely
-	begins to edit.
-
-2010-09-02  TAKAHASHI Kaoru  <kaoru@kaisei.org>
-
-	* doc/ptexinfmt.el (texinfo-multitable-widths): Use `make-char'
-	instead of KANJI literal.
-
-2010-08-24  TAKAHASHI Kaoru  <kaoru@kaisei.org>
-
-	* doc/ptexinfmt.el (texinfo-format-verb): Use (delete-char -1)
-	instead of (delete-backward-char 1); For Emacs24.
-
-2010-08-20  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-entity-table): Reverte last change.
-	(w3m-extra-numeric-character-reference): New variable.
-	(w3m-entity-value): Use it.
-
-2010-08-18  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* octet.el (octet-find-file)
-	* w3m-form.el (w3m-fontify-textareas, w3m-form-replace)
-	* w3m-proc.el (w3m-process-filter)
-	* w3m-session.el (w3m-session-select-list-all-sessions)
-	(w3m-session-select-list-session-group, w3m-session-select-next)
-	* w3m.el (w3m-idle-images-show, w3m-toggle-inline-images-internal)
-	(w3m-resize-inline-image-internal, w3m-fontify, w3m-refontify-anchor)
-	(w3m-cache-remove-oldest, w3m-cache-remove, w3m-cache-contents)
-	(w3m-cache-request-contents, w3m-create-text-page)
-	(w3m-create-image-page, w3m-select-buffer-generate-contents)
-	(w3m-select-buffer-recheck): Replace let-bindings of buffer-read-only
-	to nil with inhibit-read-only to t.
-
-2010-08-18  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-search.el (w3m-search-engine-alist): Fix `google news' url forms
-	used to non-Japanese utf-8 environments.
-
-	* w3m.el (w3m-entity-table): Add table for "&#149;".
-	(w3m-entity-value): Prefer "&#NUM;" type entities specified in
-	w3m-entity-table.
-
-2010-08-17  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-safe-view-this-url): Never query "Are you sure..." if
-	prefix arg is given.
-
-2010-08-10  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-create-text-page): Make point and window start be the
-	start of contents, especially for text/plain pages.
-
-2010-08-05  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-relationship-estimate-rules): Update regexps for Google.
-
-2010-07-30  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el: Autoload w3m-bookmark-add.
-
-	* w3m-lnum.el (w3m-read-int-interactive): Ignore mouse event in XEmacs.
-
-2010-07-29  Andrey Kotlarski  <m00naticus@gmail.com>
-
-	* w3m.el (autoload, w3m-linknum-map):
-	`w3m-linknum-bookmark-add-this-url', `w3m-linknum-zoom-in-image'
-	and `w3m-linknum-zoom-out-image' added.
-
-	* w3m-lnum.el (w3m-link-numbering-mode-map):
-	`w3m-linknum-bookmark-add-this-url', `w3m-linknum-zoom-in-image'
-	and `w3m-linknum-zoom-out-image' added.
-	(w3m-link-numbering-mode, w3m-with-linknum)
-	(w3m-linknum-get-action): Use `zerop'.
-	(w3m-link-numbering): Simplify argument list and checks assosiated
-	with it.
-	(w3m-read-int-interactive): Add <escape> for quit.
-	(w3m-linknum-follow): Add position to history when visiting url in
-	curent page.  Change message when no valid anchor is selected.
-	(w3m-linknum-view-image, w3m-linknum-save-image): Rewrite using
-	`cond'.
-	(w3m-linknum-zoom-image): New macro.
-	(w3m-linknum-zoom-in-image, w3m-linknum-zoom-out-image)
-	(w3m-linknum-bookmark-add-this-url): New functions.
-
-2010-07-25  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-auto-show): Guard error if this-command is not a symbol.
-	Thanks to IRIE Shinsuke san. cf. [emacs-w3m:11282]
-
-2010-07-23  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-goto-url): Save positions iff called interactively.
-	(w3m-goto-url-new-session): Save positions.
-
-	* w3m-bookmark.el (w3m-bookmark-view): Save positions.
-
-	* w3m-hist.el (w3m-history-copy): Copy positions.
-
-2010-07-13  Andrey Kotlarski  <m00naticus@gmail.com>
-
-	* w3m-lnum.el (w3m-link-numbering-mode): Using `buffer-list' instead of
-	`w3m-list-buffers' as the latter does unnecessary stuff.
-	(w3m-linknum-read-url): Removed. It's now equivalent to:
-	(car (w3m-linknum-get-action prompt 1))
-	(w3m-linknum-toggle-inline-image): If no url under selected image,
-	move over it and toggle it.
-	(w3m-linknum-external-view-this-url, w3m-linknum-edit-this-url):
-	Using `w3m-linknum-get-action' instead of `w3m-linknum-read-url'.
-
-	* w3m.el (autoload): Added `w3m-link-numbering-mode', removed
-	`w3m-linknum-read-url'.
-
-2010-07-13  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-lnum.el (w3m-linknum-minibuffer-prompt): Make face config valid
-	for XEmacs as well.
-	(w3m-linknum-match): New face.
-	(w3m-read-int-interactive): Make it work for XEmacs as well.
-	(w3m-highlight-numbered-anchor): Use w3m-linknum-match face.
-
-2010-07-12  Andrey Kotlarski  <m00naticus@gmail.com>
-
-	* w3m-lnum.el: Updated commentary and usage sections.
-	(w3m-substitute-key-definitions): New macro.
-	(w3m-link-numbering-mode-map): Changed keybindings.
-	(w3m-link-numbering-mode): Added mode-line indicator. Don't
-	activate numbering overlays. Changing status mode causes all other
-	w3m buffers to change status as well.
-	(w3m-move-numbered-anchor): Removed.
-	(w3m-with-linknum): Numbering overlays should never be active
-	before invoking linknum functions thus less bookkeeping.
-	(w3m-go-to-linknum, w3m-linknum-follow): Add mark for previous
-	position.
-
-2010-07-09  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-lnum.el (w3m-read-int-interactive): Add keys to exit event loop,
-	C-m & C-j.
-
-2010-07-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-ctl-c-map, w3m-redisplay-map)
-	(w3m-linknum-map): New sub-keymaps.
-	(w3m-lynx-like-map, w3m-info-like-map): Move `C-c' prefixed commands
-	and `C' prefixed commands to w3m-ctl-c-map and w3m-redisplay-map
-	respectively.
-
-2010-07-09  Andrey Kotlarski  <m00naticus@gmail.com>
-
-	* w3m.el: Autoload w3m-linknum-follow, w3m-linknum-read-url,
-	w3m-linknum-toggle-inline-image, w3m-linknum-view-image,
-	w3m-linknum-external-view-this-url, w3m-linknum-edit-this-url,
-	w3m-linknum-print-this-url, w3m-linknum-download-this-url.
-
-	* w3m-lnum.el: Update usage comment.
-	(w3m-link-numbering-mode): Cosmetic change.
-	(w3m-get-anchor-info): Added w3m-image-alt char property to return
-	list.
-	(w3m-go-to-linknum, w3m-linknum-get-action): On 0 input select
-	location url.
-	(w3m-linknum-follow): Changed prompt and using w3m-message.
-	(w3m-linknum-toggle-inline-image): Renamed from
-	w3m-linknum-toggle-image and using w3m-message.  When image on
-	point, toggle it.
-	(w3m-linknum-view-image, w3m-linknum-save-image)
-	(w3m-linknum-external-view-this-url)
-	(w3m-linknum-edit-this-url, w3m-linknum-print-this-url)
-	(w3m-linknum-download-this-url): New commands.
-
-2010-07-08  Andrey Kotlarski  <m00naticus@gmail.com>
-
-	* w3m-lnum.el: Update usage comment.
-	(w3m-linknum-minibuffer-prompt): New face.
-	(w3m-linknum-remove-overlays): Quit immediately when it finds and
-	deletes temporary match overlay.
-	(w3m-link-numbering-mode): Pass prefix arg, which makes this function
-	index only images if it is 2, to w3m-link-numbering. Remove
-	interactive declaration and autoload cookie.
-	(w3m-link-numbering, w3m-with-linknum): Vary function according to arg;
-	index only images if it is 2.
-	(w3m-read-int-interactive): Change prompt face to
-	w3m-linknum-minibuffer-prompt.
-	(w3m-highlight-numbered-anchor): Use next-single-property-change.
-	(w3m-get-anchor-info): New function. Renamed from
-	w3m-get-numbered-url. Using macrolet for less clutter.
-	(w3m-go-to-linknum): Rewrote it more in style with the other
-	user commands.
-	(w3m-linknum-get-action): Added optional type argument to
-	determine numbering scheme.
-	(w3m-linknum-follow): Rewrite to use the new
-	w3m-linknum-get-action return format.
-	(w3m-linknum-read-url): Rewrite using w3m-linknum-get-action.
-	(w3m-linknum-toggle-image): New function.
-
-2010-07-06  Andrey Kotlarski  <m00naticus@gmail.com>
-
-	* w3m-lnum.el: Update usage comment.
-	(w3m-linknum-remove-overlays): New function.
-	(w3m-link-numbering-mode): Turn mode off if prefix arg is 0;
-	index forms as well as url links if prefix arg is 4.
-	(w3m-link-numbering): Index forms as well if prefix arg is given.
-	(w3m-move-numbered-anchor): Fix grammar in error message.
-	(w3m-read-int-interactive): New function.
-	(w3m-with-linknum): New macro.
-	(w3m-highlight-numbered-anchor, w3m-get-numbered-url): New functions.
-	(w3m-go-to-linknum): Add autoload cookie; turn on form numbers as well;
-	don't highlight current link if prefix arg is given.
-	(w3m-linknum-get-action, w3m-linknum-follow, w3m-linknum-read-url): New
-	functions.
-
-2010-06-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-toggle-inline-image)
-	(w3m-toggle-inline-images): Fix query logic about safe url.
-
-2010-06-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-menubar): Add w3m-pipe-source.
-	(w3m-lynx-like-map, w3m-info-like-map): Bind "|" to w3m-pipe-source.
-	(w3m-pipe-source): New command.
-
-2010-06-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-update-files-autoloads): Strip subdirectory name
-	that Emacs 24 doesn't strip from load-name.
-
-2010-06-03  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* octet.el (octet-w3m-region): Set to unibyte string for base64
-	encoding.
-
-2010-05-24  Fedor Khod'kov  <fedor76@istra.ru>
-
-	* w3m-cookie.el (w3m-cookie-trusted-host-p): Don't bother to add
-	excessive "$" to a regexp that w3m-cookie-reject-domains specifies.
-
-2010-05-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-relationship-estimate-rules): Update regexps for Google.
-
-2010-04-21  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-view-previous-page): Save positions.
-
-2010-03-29  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-fontify-images): Use the identical Lisp object for a
-	string used as w3m-image's property in order to enable XEmacs to
-	display images in shimbun articles properly.
-
-2010-03-29  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-active-region-or-url-at-point): Check availability of
-	w3m-current-url.
-
-2010-03-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-ems.el (w3m-ems-create-image): New function that's an alias to
-	create-animated-image or create-image.
-	(w3m-create-image): Use it.
-
-	* w3m.el (w3m-emacs-w3m-icon): Replace it with data not optimized.
-
-2010-03-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* aclocal.m4 (AC_PATH_EMACS): Support Emacs 24.
-	(AC_ADD_LOAD_PATH): Pipe stderr to /dev/null when running
-	w3mhack-print-status.
-
-2010-03-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-ignored-image-url-regexp): Fix custom type.
-
-2010-03-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-view-this-url-1): Don't recenter if page is not changed.
-	(w3m-goto-url): Don't move point to the top unless redisplaying page.
-
-2010-03-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el: Suppress compiler warnings that Emacs<22.2 and XEmacs issue
-	against image-mode functions.
-
-2010-03-02  Naohiro Aota  <naota@elisp.net>
-
-	* w3m.el (top): Require image-mode if available.
-	(w3m-image-page-displayed-p): New function.
-	(w3m-create-image-page): Setup image-mode's variable if possible.
-	(w3m-scroll-up-or-next-url, w3m-scroll-down-or-previous-url)
-	(w3m-shift-left, w3m-shift-right, w3m-beginning-of-line)
-	(w3m-end-of-line): Call image-mode functions if possible and needed.
-
-2010-02-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-goto-url): Turn truncate-lines off for text/plain pages.
-
-2010-02-18  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-fontify-images): Add menu to images.
-	(w3m-download-this-image, w3m-print-this-image-url): New functions.
-	(w3m-link-menu): Add them; enable menu only when url or image is there.
-
-2010-02-13  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-window-hscroll): Revert 2010-01-13 change.
-
-2010-02-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-cache-available-p): Now, pages with neither Last-Modified
-	header and ETag header are treated as dynamically-generated pages.
-	(w3m-cache-header-delete-variable-part): Contination lines are also
-	removed.
-
-2010-02-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-local-dirlist-cgi, w3m-set-display-ins-del):
-	Honor w3m-command-environment.
-	Suggested by Toru TSUNEYOSHI <t_tuneyosi@hotmail.com>.
-
-2010-02-01  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-redisplay-this-page): Save positions.
-
-2010-02-01  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-reload-this-page): Save positions.
-
-	* w3m-hist.el (w3m-history-store-position)
-	(w3m-history-restore-position): Use line number and column number to
-	save positions.
-
-2010-01-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-view-previous-page): Restore positions as well when
-	jumping within a page.
-	(w3m-view-this-url-1): Reset hscroll after retrieving a new page.
-	(w3m-view-this-url): Save positions first.
-	(w3m-delete-buffer): Restore positions in a page being left.
-	(w3m-goto-url): Don't save positions here.
-
-	* w3m-util.el (w3m-popup-buffer): Restore positions only when buffer to
-	be displayed is hidden, not always.
-
-2010-01-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-next-anchor, w3m-previous-anchor, w3m-next-form)
-	(w3m-previous-form, w3m-next-image, w3m-previous-image): Remove unused
-	var `st'.
-
-2010-01-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-goto-url): Make it work as before for group: urls.
-
-2010-01-15  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-doc-view-map): New variable.
-	(w3m-view-this-url-1): Improve the way to keep the window configuration
-	for the case where w3m-new-session-in-background is non-nil.
-	(w3m-doc-view): Use w3m-doc-view-map.
-	(w3m-doc-view-quit): New function.
-
-2010-01-13  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bug.el (report-emacs-w3m-bug)
-	* w3m-session.el (w3m-session-save, w3m-session-automatic-save)
-	(w3m-session-deleted-save, w3m-session-crash-recovery-save)
-	* w3m.el (w3m-key-binding): Use save-current-buffer instead of
-	save-excursion.
-
-	* mew-w3m.el (mew-w3m-view-inline-image, mew-mime-text/html-w3m)
-	* w3m-xmas.el (w3m-window-hscroll)
-	* w3mhack.el (toplevel, w3mhack-generate-load-file): Use
-	with-current-buffer rather than save-excursion + set-buffer.
-
-	* w3m-cookie.el (w3m-cookie-parse-args): Use with-current-buffer rather
-	than save-excursion + set-buffer; no need to use save-restriction and
-	narrow-to-region; remove duplicate set-syntax-table.
-
-2010-01-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-print-this-url): Exclude empty image-alt string.
-
-	* w3m-form.el (w3m-form-parse-and-fontify): Strip text props from
-	string elements contained in w3m-current-forms so as to enable XEmacs
-	to read ~/.w3m/.sessions file.
-
-2010-01-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-refontify-anchor, w3m-cache-setup)
-	(w3m-cache-remove-oldest, w3m-cache-remove, w3m-cache-contents)
-	(w3m-cache-request-contents, w3m-view-this-url-1)
-	(w3m-download-this-url, w3m-goto-url)
-	* w3m-session.el (w3m-session-save)
-	* w3m-bookmark.el (w3m-bookmark-sections, w3m-bookmark-write-file)
-	(w3m-bookmark-kill-entries, w3m-bookmark-undo, w3m-bookmark-iterator)
-	* w3m-util.el (w3m-unseen-buffer-p): Use with-current-buffer rather
-	than save-excursion + set-buffer.
-
-	* w3m.el (toplevel, w3m-highlight-current-anchor-1): Use point-at-eol
-	rather than `(save-excursion (end-of-line) (point))'.
-
-	* w3m-util.el: Autoload w3m-history-restore-position when compiling;
-	autoload w3m-fb-frame-parameter only when compiling.
-
-2010-01-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-next-buffer): Save and restore positions.
-	(w3m-close-window): Save positions.
-
-	* w3m-hist.el (w3m-history-store-position)
-	(w3m-history-restore-position): Save and restore hscroll.
-
-	* w3m-util.el (w3m-popup-buffer): Restore positions.
-
-2009-11-06  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-antenna.el (w3m-antenna-check-rss): Ignore future entries to
-	display site announcements.
-
-2009-11-03  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* mew-w3m.el (mew-w3m-region-cite-mark): Add new selection.
-	(mew-w3m-region): Rewrite.
-
-2009-11-02  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* mew-w3m.el (mew-w3m-region-cite-mark): New option.
-	(mew-w3m-region): New function.
-	(mew-mime-text/html-w3m): Use `mew-w3m-region' instead of `w3m-region'.
-
-2009-09-02  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-image.el (w3m-imagick-convert-program-available-p): If someone
-	set `w3m-imagick-convert-program' to nil before load emacs-w3m, do not
-	show warning message for ImageMagick's `convert'.
-
-2009-09-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-mail.el (w3m-mail-embed-base-url, w3m-mail-compose-with-mml)
-	(w3m-mail-compose-with-vm): Don't use
-	default-enable-multibyte-characters that is obsolete in Emacs 23.2.
-
-2009-09-01  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-content-type-alist): Support
-	`browse-url-default-windows|macosx-browser'. Thanks to Leo.
-	Cf. [emacs-w3m:11035].
-
-	* w3m-ems.el (w3m-form-button, w3m-form-button-mouse)
-	(w3m-form-button-pressed, w3m-tab-unselected)
-	(w3m-tab-unselected-retrieving, w3m-tab-unselected-unseen)
-	(w3m-tab-selected, w3m-tab-selected-retrieving, w3m-tab-background)
-	(w3m-tab-selected-background, w3m-tab-mouse): Add type ns. Thanks to
-	Leo. Cf. [emacs-w3m:11034].
-
-2009-08-25  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-toggle-inline-images-internal): Do not display image, if
-	its url is local and current url is not local.
-
-2009-08-24  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-output-coding-system): Use `utf-8' except for emacs-21
-	under Japaese environment.
-
-2009-08-19  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-use-symbol): Set nil with emacs-23 or later.
-	cf. [emacs-w3m:11002].
-
-2009-08-18  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-util.el (w3m-puny-decode-url): Decode the part of hostname only.
-	Add doc-strings.
-	(w3m-puny-encode-url): Add doc-strings.
-
-2009-08-17  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-puny-utf-16be): New variable.
-	(w3m-url-readable-string): Call `w3m-puny-decode-url'.
-	(w3m-url-transfer-encode-string): Call `w3m-puny-encode-url'.
-	(w3m-header-line-insert): Call `w3m-puny-decode-url'.
-	(w3m-input-url): Call `w3m-puny-decode-url' for initial URL.
-
-	* w3m-util.el (top): Add the variable definition of `w3m-puny-utf-16be'
-	to avoid byte-compile warnings.
-	(w3m-puny-code-regex, w3m-puny-code-nonascii, w3m-puny-base)
-	(w3m-puny-tmin, w3m-puny-tmax, w3m-puny-damp, w3m-puny-skew)
-	(w3m-puny-initial-bias, w3m-puny-initial-n, w3m-puny-delimiter): New
-	constants.
-	(w3m-puny-adapt, w3m-puny-decode-digit, w3m-puny-encode-digit)
-	(w3m-puny-decode1, w3m-puny-decode, w3m-puny-decode-url)
-	(w3m-puny-encode1, w3m-puny-encode, w3m-puny-encode-url): New
-	functions.
-
-2009-08-04  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-decode-anchor-string): Convert contol-characters to
-	space.
-
-2009-07-17  Naohiro Aota  <naota@elisp.net>
-
-	* w3m.el (w3m-about-retrieve): When type is `nil', decode cached
-	contents to display source of 404 page.  Reported by Dan Jacobson
-	<jidanni@jidanni.org>.
-	(w3m-do-cleanup-temp-files): New customize variable.
-	(w3m-cleanup-temp-files): Use it.
-	(toplevel): Call it when emacs-w3m shutdown.
-
-2009-07-04  Naohiro Aota  <naota@elisp.net>
-
-	* w3m-search.el (w3m-search-thing-at-point-arg): New variable.
-	(w3m-search-read-query): Use it.
-
-	* w3m-util.el (w3m-current-title): Set title to "<retrieving>>" when
-	w3m is retrieving a page.
-
-2009-06-13  Kevin Ryde  <user42@zip.com.au>
-
-	* w3m.el (w3m-view-recenter): Only nil,t,integer, not a cons.
-	(w3m-search-name-anchor, w3m-view-this-url-1): No arg to w3m-recenter.
-	(w3m-next-anchor, w3m-previous-anchor, w3m-next-form,
-	w3m-previous-form, w3m-next-image, w3m-previous-image): Don't
-	recenter, leave recentering just for following a link, not Tab etc
-	within the buffer.
-	(w3m-recenter): Remove NAME arg, believe don't need to differentiate
-	URLs with an anchor or not since with no anchor `point' is at the
-	start of the buffer and can't be recentered anyway.
-	Use C-u style "(recenter '(4))" for the `t' middle-of-screen case.
-	No need for code to avoid redisplay, `recenter' doesn't redisplay in
-	the integer or C-u cases.
-
-2009-06-13  Naohiro Aota  <naota@elisp.net>
-
-	* w3m.el (w3m-fontify-anchors): Decode entities of name anchor.
-
-2009-05-25  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-cache-available-p): Analyze the cache-control header more
-	strictly.
-	(w3m-scroll-up-or-next-url): Bind w3m-prefer-cache to `t' when goto
-	the w3m-next-url.
-	(w3m-scroll-down-or-previous-url): Bind w3m-prefer-cache to `t' when
-	goto the w3m-previous-url.
-
-2009-05-23  Naohiro Aota  <naota@elisp.net>
-
-	* w3m.el (w3m-reload-this-page): Add new argument `no-popup'; Call
-	w3m-goto-url() with the argument.
-	(w3m-goto-url-with-timer): Use it.
-
-2009-04-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bookmark.el (w3m-bookmark-make-item)
-	* w3m-cookie.el (w3m-cookie-create)
-	* w3m-dtree.el (w3m-dtree-expand-file-name, w3m-dtree-directory-name)
-	* w3m-form.el (w3m-form-normalize-action, w3m-form-p)
-	(w3m-form-set-method, w3m-form-put-property, w3m-form-field-parse)
-	(w3m-form-real-reset)
-	* w3m-hist.el (w3m-history-set-current)
-	* w3m-namazu.el (w3m-namazu-call-process)
-	* w3m-proc.el (w3m-process-p, w3m-process-kill-process)
-	(w3m-process-error-handler)
-	* w3m-session.el (w3m-session-history-to-save, w3m-session-make-item)
-	* w3m-tabmenu.el (w3m-tab-menubar-make-items-1)
-	* w3m-util.el (w3m-get-buffer-create, w3m-kill-buffer)
-	(w3m-current-title, w3m-buffer-title, w3m-buffer-number)
-	(w3m-buffer-set-number, w3m-buffer-name-add-title)
-	(w3m-generate-new-buffer, w3m-lefttab-exist-p, w3m-righttab-exist-p)
-	(w3m-url-valid, w3m-time-newer-p, w3m-time-lapse-seconds)
-	(w3m-url-local-p, w3m-url-authinfo, w3m-url-strip-authinfo)
-	(w3m-url-strip-fragment, w3m-url-strip-query, w3m-which-command)
-	(w3m-assoc-ignore-case, w3m-unseen-buffer-p)
-	* w3m-xmas.el (w3m-make-glyph)
-	* w3m.el (w3m-clear-local-variables, w3m-copy-local-variables)
-	(w3m-arrived-p, w3m-arrived-put, w3m-arrived-get)
-	(w3m-url-transfer-encode-string, w3m-entity-value)
-	(w3m-decode-anchor-string, w3m-toggle-inline-images-internal)
-	(w3m-canonicalize-url, w3m-cache-header-delete-variable-part)
-	(w3m-w3m-canonicalize-url, w3m-view-this-url-1)
-	* mime-w3m.el (mime-w3m-setup): Don't use defsubst.
-
-	* w3m-hist.el (w3m-history-plist-put, w3m-history-remove-properties):
-	Don't inline w3m-history-add-properties.
-
-2009-04-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-cache-available-p): Work around too large integer in
-	Cache-Control header.
-
-2009-04-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-url-to-file-name): Fix regexp used for stripping
-	localhost part; make url a Tramp name if it is guessed.
-
-2009-04-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-url-to-file-name): Allow "file:/foo.html" in addition to
-	"file://foo.html" and "file:///foo.html".
-
-2009-04-23  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bookmark.el (w3m-bookmark-buffer): Use the time 0 as modtime of
-	the bookmark buffer by default.
-
-2009-04-22  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-view-this-url-1): Pass url to sentinel.
-	(w3m-recenter): Save excursion.
-
-2009-04-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-view-recenter): New user option.
-	(w3m-recenter): New function.
-	(w3m-search-name-anchor, w3m-view-this-url-1, w3m-next-anchor)
-	(w3m-previous-anchor, w3m-next-form, w3m-previous-form, w3m-next-image)
-	(w3m-previous-image): Use it.
-
-2009-04-20  Kevin Ryde  <user42@zip.com.au>
-
-	* w3m.el (w3m-local-find-file-regexps): Make regexp-opt group regexps
-	explicitly.
-
-2009-04-14  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-cache-available-p): The control of expire is added.
-	(w3m-w3m-retrieve-1): The case where the option "no_cache=1" is put has
-	been increased.
-
-2009-04-12  Naohiro Aota  <naota@elisp.net>
-
-	* w3m.el (w3m-select-buffer-delete-buffer, w3m-goto-url)
-	(w3m-delete-buffers): Unqueue image retrieving process manually.
-	(w3m-idle-images-show): Widen narrowing.
-
-	* w3m-proc.el (w3m-process-stop): Don't unqueue image retrieving
-	process.
-
-	* w3m.el (w3m-message-silent): New variable.
-	(w3m-message): Use it: when the variable is `t', don't show a message.
-	(w3m-idle-images-show): Use it.
-	(w3m-w3m-dump-head): lexical-let it.
-	(w3m-w3m-dump-extra): Ditto.
-	(w3m-w3m-retrieve): Ditto.
-	(w3m-retrieve-and-render): Ditto.
-	(w3m-refresh-minimum-interval): New variable.
-	(w3m-check-refresh-attribute): Use it.
-	(w3m-view-previous-page): When visiting pages by history-back or
-	history-next, don't just ignore refresh, but wait for a while.
-	(w3m-idle-images-show): When there are events pended, re-create the
-	idle timer; Check current position's item every time loop starts.
-	(w3m-idle-images-show-unqueue): Set w3m-idle-images-show-timer
-	properly.
-	(w3m-arrived-add): Revert recent changes.
-
-	* w3m-favicon.el (w3m-favicon-retrieve): lexical-let w3m-message-silent.
-
-2009-04-02  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-arrived-add): If url has a multi-byte character, do not
-	do recursive-call itself. If decoded url does not have a multi-byte
-	character, do not do recursive-call itself.
-
-2009-03-28  Naohiro Aota  <naota@elisp.net>
-
-	* w3m.el (w3m-goto-url-with-timer): When going to the same url, use
-	`w3m-reload-this-page'.
-	(w3m-image-no-idle-timer): New variable.
-	(w3m-toggle-inline-images-internal): Use it.
-	(w3m-arrived-add): Add also decoded url.
-	(w3m-goto-url): Restore forms also when url is local.
-
-2009-03-18  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-link-menu): Always provide title string.  Suggested by
-	David Abrahams <dave@boostpro.com>.
-	Cf. <URL:http://news.gmane.org/group/gmane.emacs.w3m/thread=8126>.
-
-2009-03-17  Victor Ren  <victor.ren@ericsson.com>
-
-	* w3m.el (w3m-url-to-file-name): Support "file://c:/" in addition to
-	"file:///c:/".
-
-2009-03-12  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-w3m-parse-header): The value of w3m-document-charset is
-	not used excluding x-moe-internal.
-
-2009-03-04  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-decode-buffer): If context-charset is x-moe-internal,
-	x-moe-internal is used as charset regardless of w3m-type.
-	(w3m-w3m-parse-header): Add w3m-document-charset to handle of the
-	headers. If w3m-document-charset is x-moe-internal, charset sets to
-	x-moe-internal compulsorily. If x-w3m-content-encoding is exist, the
-	value of x-w3m-content-encoding is used as encoding method regardless
-	of w3m-type.
-
-2009-03-03  Naohiro Aota  <naota@elisp.net>
-
-	* w3m-hist.el (w3m-history-slimmed-history-flat, w3m-history-slim): New
-	functions.
-
-	* w3m-session.el (w3m-session-history-to-save): Use it.
-
-2009-02-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el: Require w3m-session instead of autoloading it.
-
-	* w3m-session.el: Don't require w3m; require w3m-util; silent warnings.
-	(w3m-session-select): Use w3m-get-buffer-create instead of
-	get-buffer-create to kill the session select buffer when quitting.
-
-	* w3m-util.el (w3m-delete-frames-and-windows): Delete frames if the
-	other windows visit buffers being related to emacs-w3m or the session
-	select buffer.
-	(w3m-replace-in-string): eval-and-compile.
-
-2009-02-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el: Autoload w3m-go-to-linknum.
-	(w3m-lynx-like-map, w3m-info-like-map): Bind `C-c C-l' to it.
-	(w3m-mode): Mention w3m-go-to-linknum in doc string.
-
-	* w3m-util.el (w3m-read-number): New function.
-
-	* w3m-lnum.el (w3m-go-to-linknum): Use w3m-read-number.
-
-2008-04-12  Jose A. Ortega Ruiz  <jao@gnu.org>
-
-	* w3m-lnum.el (w3m-go-to-linknum): New function.
-
-2009-02-23  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-session.el (w3m-session-ignore-errors): New macro.
-	(w3m-session-save, w3m-session-automatic-save)
-	(w3m-session-deleted-save, w3m-session-crash-recovery-save)
-	(w3m-session-crash-recovery-remove, w3m-session-select-mode)
-	(w3m-session-select, w3m-session-make-menu-items)
-	(w3m-session-last-autosave-session, w3m-session-last-crashed-session):
-	Use it.
-
-	(toplevel): Require cl when compiling.
-	(w3m-session-crash-recovery-save)
-	(w3m-session-select-list-all-sessions): Remove unused variables.
-
-2009-02-16  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-session.el (w3m-session-last-crashed-session): Fix tiny typo.
-
-2009-02-15  Naohiro Aota  <naota@elisp.net>
-
-	* w3m.el (w3m-idle-images-show): If detect deleted buffer, unqueue
-	processes related to the buffer.
-
-	* w3m-session.el (w3m-session-crash-recovery): Change the default to t.
-
-2009-02-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-buffer-setup): Add keymap that cycles buffers as usual to
-	mode-line-buffer-identification.
-
-2009-02-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bookmark.el (w3m-bookmark-view, w3m-bookmark-view-new-session)
-	(w3m-bookmark-make-menu-items): Check if bookmark file exists.
-
-2009-02-04  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-header-line-insert): Don't decode url containing
-	non-ASCII characters already.  e.g. about://weather/WHERE
-
-2009-02-03  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* mew-w3m.el (mew-w3m-cid-retrieve): Remove a wrong set-buffer().
-
-2009-02-03  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-input-url): Offer decoded url in the minibuffer.
-	(w3m-copy-buffer): Copy w3m-current-coding-system.
-	(w3m-header-line-insert): Display decoded url.
-
-2009-02-02  Naohiro Aota  <naota@elisp.net>
-
-	* w3m.el (w3m-idle-images-show): Change the order of image retrieving.
-	(w3m-toggle-inline-images-internal): Use `w3m-idle-image-item'
-	text-property.
-	(w3m-goto-url): Add new argument `no-popup'.
-	(w3m-goto-url-with-timer): Call w3m-goto-url with `no-popup' nil.
-
-2009-02-01  Naohiro Aota  <naota@elisp.net>
-
-	* w3m.el (w3m-toggle-inline-images-internal): Add new argument
-	`safe-regexp'.
-	(w3m-toggle-inline-images): Pass `safe-regexp' to
-	w3m-toggle-inline-images-internal when called non-interactively.
-
-2009-01-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-proc.el: Autoload w3m-idle-images-show-unqueue when compiling.
-
-2009-01-27  Naohiro Aota  <naota@elisp.net>
-
-	* w3m-proc.el (w3m-process-stop): Call `w3m-idle-images-show-unqueue'.
-
-	* w3m.el (w3m-idle-images-show-timer, w3m-idle-images-show-list)
-	(w3m-idle-images-show-interval): New variables.
-	(w3m-idle-images-show, w3m-idle-images-show-unqueue): New functions.
-	(w3m-toggle-inline-images-internal): Use them.
-
-2009-01-26  Naohiro Aota  <naota@elisp.net>
-
-	* w3m.el (w3m-content-type-alist): Add "application/x-pdf" content
-	type.
-
-2009-01-21  Kevin Ryde  <user42@zip.com.au>
-
-	* w3m.el (w3m-search-name-anchor): Return true meaning "found" if
-	point is already at the anchor position.
-
-2009-01-21  Naohiro Aota  <naota@elisp.net>
-
-	* w3m-session.el (w3m-session-last-autosave-session): Check if
-	autosaved sessions set exists before asking whether to load the last
-	sessions set; Search older sessions sets when the last sessions set
-	doesn't exist (maybe it is removed by user); Load autosaved sessions
-	set when w3m-session-load-last-sessions is non-nil.
-	(w3m-session-load-last-sessions): Fix docstring; Change `auto' to `t'.
-	(w3m-session-crash-recovery-title): New variable.
-	(w3m-session-load-crashed-sessions): Ditto.
-	(w3m-session-crash-recovery-save): New function.
-
-	* w3m.el (w3m-goto-url): Save sessions set for crash recovering.
-	(w3m-delete-buffer): Ditto.
-	(w3m): Load crashed sessions if necessary.  Suggested by Samuel Wales
-	<samologist@gmail.com>.
-
-2009-01-20  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-fontify-anchors): Use new `w3m-balloon-help'
-	text-property for balloon help.
-	(w3m-fontify-images): Ditto and create help together href, alt and URL
-	of image.
-
-2009-01-19  Naohiro Aota  <naota@elisp.net>
-
-	* w3m.el (w3m-image-anchor): Fix docstring.
-	(toplevel): Fix w3m-image-anchor-face's alias.
-
-2009-01-15  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-fontify-images): Put the 'full alt text' on new
-	'w3m-image-alt' property.
-	(w3m-print-this-url): Print the content of 'w3m-image-alt'.
-
-	* w3m-util.el (w3m-image-alt): New macro.
-
-2009-01-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* doc/Makefile.in (.texi.info): Use --no-split.
-
-2009-01-11  Naohiro Aota  <naota@elisp.net>
-
-	* w3m.el (w3m): Move last session restoring asking afterward, so that
-	the restoring wouldn't be avoided by w3m-input-url's input.
-
-	* w3m-session.el (w3m-session-last-autosave-session): Follow the above
-	change.
-
-2009-01-10  Naohiro Aota  <naota@elisp.net>
-
-	* w3m.el (w3m): Check whether to load the last autosaved
-	sessions.  Suggested by Samuel Wales <samologist@gmail.com>.
-
-	* w3m-session.el (w3m-session-automatic-keep-number): New variable.
-	Suggested by Samuel Wales <samologist@gmail.com>.
-	(w3m-session-automatic-save): Use it.
-	(w3m-session-last-autosave-session): New function.
-	(w3m-session-load-last-sessions): New variable.
-
-	* w3m.el (w3m-image-anchor): New face.
-	(w3m-fontify-images): Use it.
-
-2009-01-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-language): Allow the value like "Japanese (UTF-8)" of
-	current-language-environment.
-
-	* w3m-symbol.el (w3m-symbol): Ditto.
-
-	* w3mhack.el (w3mhack-makeinfo): Use locale-coding-system for Emacs to
-	encode Japanese messages.
-
-2009-01-09  Naohiro Aota  <naota@elisp.net>
-
-	* w3m.el (w3m-create-text-page, w3m-goto-url): Check if the url is
-	arrived before getting real-url.
-
-2009-01-06  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (top): Add the variable definitions of
-	`w3m-tab-menubar-make-items-preitems' and `w3m-session-menu-items-pre'
-	to avoid byte-compile warnings.
-	(w3m-setup-menu): Move the postion of session menu.
-	(w3m-mouse-major-mode-menu): Add session menu.
-
-	* w3m-xmas.el (autoload): Add w3m-setup-session-menu.
-	(w3m-menu-on-forefront): Treat "Session" menu.
-	(w3m-setup-menu): Call `w3m-setup-session-menu'.
-
-2008-12-30  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-select-buffer-mode-map): Bind `w3m-select-buffer-quit' to
-	C-g.
-
-	* w3m-session.el (w3m-session-select-mode-map): Bind
-	`w3m-session-select-quit' to C-g.
-
-	* w3m-form.el (w3m-form-input-select-keymap): Bind
-	`w3m-form-input-select-keymap' to C-g.
-	(w3m-form-input-map-keymap): Bind `w3m-form-input-map-exit' to C-g.
-
-2008-12-17  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-session.el (w3m-session-select-mode-map): Add new key.
-	(w3m-session-select-mode): Modify doc-string.
-	(w3m-session-select-rename): New command.
-	(w3m-session-rename): New function.
-
-2008-12-17  Naohiro Aota  <naota@elisp.net>
-
-	* w3m.el (autoload): Add w3m-setup-session-menu.
-	(w3m-menubar): Moved session menu to w3m-session-menu-items.
-	(top): Call w3m-setup-session-menu.
-
-	* w3m-session.el: Change to use major mode; Add session menu.
-	(w3m-session-unknown-title): New option.
-
-2008-12-15  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-compatible-encoding-alist): Add (gb2312 . gbk).
-
-2008-12-12  David Engster  <dengste@eml.cc>
-
-	* w3m-proc.el (w3m-process-wait-process): Reduce sit-for time.
-	(w3m-process-sentinel): Wait for process output (on Emacs only).
-
-2008-12-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-show-redirection-error-information): Improve the
-	error message.
-
-2008-12-10  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-next-anchor): Go to the first anchor when next
-	anchor is not found.
-	(w3m-previous-anchor): Go to the last anchor when previous anchor
-	is not found.
-	(w3m-url-encode-string): Encode SPC only when encode-space is
-	non-nil.
-
-	* w3m-form.el (w3m-form-make-form-data): Follow the above change.
-
-	* w3m.el (w3m-gmane-url-at-point): Ditto.
-	(w3m-canonicalize-url): Ditto.
-
-2008-12-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-ems.el (w3m-make-ccl-coding-system): Use define-coding-system if
-	it is available.
-
-2008-12-06  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-show-redirection-error-information): New function.
-	(w3m-retrieve-and-render): Use it.
-	(w3m-w3m-retrieve-1): Return 'redirection-exceeded if redirect counter
-	exceeded.
-	(w3m-w3m-retrieve): Return "X-w3m-error/redirection" if attr eq
-	'redirection-exceeded.
-	(w3m-w3m-attributes-1): Return dummy attribute if redirect counter
-	exceeded.
-
-2008-12-05  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m-form.el (w3m-same-window-p): New function.
-	(w3m-form-input-textarea): Use it.
-
-	* w3m.el (w3m-local-find-file-regexps): Try to open with emacs-w3m as
-	many types as possible.
-
-2008-12-03  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-fontify): Remove hidden anchors like "<a href=url> </a>".
-	cf. [emacs-w3m:10484]
-
-2008-12-01  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m-form.el (w3m-form-input-textarea): Use the whole current window
-	for the textarea when `same-window-buffer-names' contains the buffer
-	name "*w3m form textarea*"; simplify the window size calculation.
-
-2008-11-21  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-w3m-parse-header): Also remove parameters when charset is
-	specified.
-
-2008-11-11  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el (w3m-visited-file-modtime): New function.
-
-	* w3m-bookmark.el (w3m-bookmark-file-modtime): Just return result of
-	file-attributes().
-
-2008-11-11  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m-antenna.el (w3m-antenna-check-rss): Support RSS2.0. Check also
-	items.
-	(w3m-antenna-alist): Update site-class if needed.
-
-	* w3m-bookmark.el (w3m-bookmark-buffer, w3m-bookmark-verify-modtime):
-	Replace visited-file-modtime with w3m-visited-file-modtime.
-
-2008-10-28  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-view-header): Check if current page is source of
-	about:something.
-
-2008-10-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-active-region-or-url-at-point): Take notice of the link
-	under the point as well; return the url of the current page by default
-	if the new optional argument `default=current' is given.
-	(w3m-input-url): Make w3m-active-region-or-url-at-point return the url
-	of the current page by default; modify the prompt string according to
-	whether there is an initial input.
-	(w3m-download, w3m-goto-url, w3m-goto-url-new-session): Simplify args
-	passed to w3m-input-url.
-	(w3m-view-this-url): Make w3m-active-region-or-url-at-point return the
-	url of the current page by default.
-
-2008-10-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-italic): Make it be a underline face on a non-window
-	system by default.
-
-2008-09-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-toggle-inline-images-internal)
-	(w3m-resize-inline-image-internal): Confirm whether to retrieve
-	insecure image only once, or don't confirm it if
-	w3m-confirm-leaving-secure-page is nil.  Suggested by Dan Jacobson
-	<jidanni@jidanni.org>.
-	(w3m-confirm-leaving-secure-page): Doc fix.
-
-	* w3mhack.el (w3mhack-makeinfo): Remove Emacs 19 stuff; remove TeX
-	directives first; don't call texinfo-mode.
-
-2008-09-21  Akinori MUSHA  <knu@iDaemons.org>
-
-	* doc/emacs-w3m.texi (Image Variables): Fix syntax error.
-
-	* doc/emacs-w3m-ja.texi (Image Variables): Ditto.
-
-2008-09-17  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-buffer-local-url): New constant variable.
-	(w3m-buffer-local-url-p): New function.
-	(w3m-goto-url): Also process buffer local url.
-	(w3m-region): Use w3m-buffer-local-url as url if it is not set.
-	(w3m-safe-view-this-url, w3m-mouse-safe-view-this-url): Check if url is
-	buffer local.
-
-2008-09-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-download): Add doc string.
-	(w3m-lynx-like-map): Bind M-d key to w3m-download.
-	(w3m-mode): Add w3m-download to major mode info; clarify description of
-	w3m-download-this-url.
-
-2008-09-11  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-gmane-url-at-point): Return a url used for asking Gmane
-	for the thread that begins with the current article instead of the
-	whole thread if it is run on the Message-ID header.
-	(w3m-examine-command-line-args): Make it an alias to `(lambda nil)'
-	instead of `ignore' after it is run for the first time in order to
-	silence the byte compiler.
-
-2008-09-01  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-use-favicon): Assume w3m-image.elc is always loaded.
-	(w3m-resize-inline-image-internal): Change it to a normal function from
-	an inline function; remove interactive.
-	(w3m-zoom-in-image, w3m-zoom-out-image): Error if ImageMagick's convert
-	program is not available; improve doc string.
-	(w3m-auto-show): Don't make the cursor position disappear after
-	executing beginning-of-buffer and end-of-buffer.
-
-2008-08-25  David Hansen  <david.hansen@gmx.net>
-
-	* w3m.el (w3m-about-header): Fixed typo.
-
-2008-08-05  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-view-source, w3m-view-header): Save points positioned
-	last in pages.  Suggested by Dan Jacobson <jidanni@jidanni.org>.
-
-2008-07-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-ems.el: Bind w3m-image-default-background when compiling.
-
-2008-07-20  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m-hist.el (w3m-history-restore-position): Run
-	w3m-after-cursor-move-hook after restoring cursor position.
-
-2008-07-18  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-image-default-background): New variable.
-
-	* w3m-ems.el (w3m-create-image): Use it.
-	(w3m-initialize-graphic-icons): Check if xpm is available.  Reported by
-	Diego 'Flameeyes' Petten,Ar(B <flameeyes@gmail.com>.
-
-	* w3m-filter.el (w3m-filter-wikipedia): Improve regexp.
-
-2008-07-01  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-search.el (w3m-search-engine-alist): Test if mule-version is
-	bound (XEmacs does not provide it).
-
-2008-06-30  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m-form.el (w3m-form-input, w3m-form-input-password): Process
-	readonly attribute.
-
-2008-06-25  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-toggle-inline-images-internal): Make it non-interactive.
-
-	* w3m-form.el (w3m-form-input-textarea): Make buffer unmodified when
-	user selected to reuse saved text; parse readonly attribute; kill newly
-	generated buffer when the reusing question aborted.
-	(w3m-form-textarea-info): Also provide readonly info.
-	(w3m-fontify-textareas): Parse readonly attribute.
-	(w3m-form-parse-and-fontify): Ditto.
-	(w3m-form-input): Ignore cursor moving while read from minibuffer.
-	(w3m-form-input-password): Ditto.
-	(w3m-form-input-file): Ditto.
-
-	* w3m.el (w3m-toggle-inline-image): Don't toggle images that are
-	outside of the region even if they are identical to the ones in the
-	region; don't do recursive call of itself; rearrange the source code.
-	(w3m-toggle-inline-images): Check whether images are safe even if it is
-	called with w3m-display-inline-images=t and force=t; rearrange the
-	source code.
-	(w3m-toggle-inline-images-internal): Add new optional argument:
-	`begin-pos' and `end-pos'. Only process region from `begin-pos' to
-	`end-pos'.
-
-2008-06-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-toggle-inline-image): Work for an image in which there is
-	the region end within its anchor.  Reported by Dan Jacobson
-	<jidanni@jidanni.org>.
-
-	* w3m-util.el (w3m-deactivate-region): Use zmacs-deactivate-region for
-	XEmacs.
-
-2008-06-22  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m-search.el (w3m-search-engine-alist): Improve detection of utf-8
-	capability.
-	(w3m-search-engine-alist): Abolish `yahoo beta' entry; Improve `blog'
-	entry to work like `google' entry.
-
-	* w3m-session.el: Add coding cookie.
-
-2008-06-18  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-submit-form-safety-check): New user option.  Suggested by
-	Dan Jacobson <jidanni@jidanni.org>.
-	(w3m-submit-form): Use it.
-
-2008-06-12  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-auto-show): Scrool horizontally after executing a search
-	command.
-
-2008-06-07  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-use-header-line-title): Modify the doc-string.
-
-2008-06-06  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-select-buffer): Don't delete other windows.
-
-	* w3m-filter.el (w3m-filter-wikipedia): New function.
-	(w3m-filter-rules): Add w3m-filter-wikipedia.
-
-2008-06-03  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el: Add coding cookie.
-
-2008-06-02  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-detect-meta-charset): Use also ';' as delimiter.
-
-2008-05-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-examine-command-line-args): Treat the null string given
-	as a url in the command line args as `w3m-home-page' or "about:".
-
-2008-05-28  Naohiro Aota  <nao.aota@gmail.com>
-
-	* doc/emacs-w3m.texi (Inline Images): Update.
-
-	* doc/emacs-w3m-ja.texi (Inline Images): Ditto.
-
-2008-05-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-url-readable-string): Don't decode url if it looks not to
-	have been encoded.
-	(w3m-current-longest-line): New variable.
-	(w3m-set-current-longest-line): New function.
-	(w3m-scroll-left, w3m-shift-left): Don't scroll the window endlessly;
-	beep if the window can't be scrolled any more.
-	(w3m-scroll-right, w3m-shift-right): Beep if the window can't be
-	scrolled any more.
-
-2008-05-25  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-relationship-estimate-rules): Fix regexp for Google
-	search within EmacsWiki.
-
-2008-05-20  Naohiro Aota  <nao.aota@gmail.com>
-
-	* README: Add information about how to create `configure' script.
-
-	* README.ja: Ditto.
-
-	* w3m.el (w3m-goto-url): Delayed encoding of fragment part.
-
-2008-05-18  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m-cookie.el (w3m-cookie-save-current-site-cookies): New function.
-	(w3m-cookie-save): Add optional argument "domain".
-
-2008-05-16  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* mew-w3m.el (mew-w3m-add-text-properties): New inline macro.
-	(mew-w3m-view-inline-image): Use `mew-w3m-add-text-properties'.
-	(mew-mime-text/html-w3m): Ditto.
-
-2008-05-09  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m-cookie.el (w3m-cookie-save): Make it interactive function.
-	(w3m-cookie-save-cookies): New variable.
-	(w3m-cookie-shutdown): Use it.
-
-	* w3m.el (toplevel): Shutdown cookie system when exiting emacs.
-
-2008-05-08  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m-cookie.el (w3m-cookie-shutdown): Fixed docstring.
-
-2008-05-08  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-filter.el (w3m-filter-amazon): Fix string to search the body.
-
-2008-04-30  Naohiro Aota  <nao.aota@gmail.com>
-
-	* doc/emacs-w3m-ja.texi: Update translation.
-
-	* w3m.el (w3m-goto-url): Use w3m-current-coding-system first to encode
-	url if available; Also encode name part when url is local.
-	(w3m-ignored-image-url-regexp): New variable.
-	(w3m-toggle-inline-images-internal): Don't display image whose url
-	match `w3m-ignored-image-url-regexp'.
-	(w3m-decode-entities, w3m-decode-entities-string): Replace
-	"(match-beginning 2)" with "(match-end 1)" to deal with emacs-21's
-	strange behavior.
-
-2008-04-24  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-filter.el (w3m-filter-rules): Support Mixi with SSL.
-
-2008-04-22  TAKAHASHI Kaoru  <kaoru@kaisei.org>
-
-	* doc/ptexinfmt.el: Fix Comments.
-	(texinfo-format-geq, texinfo-format-leq,): Support @geq and @leq.
-
-2008-04-18  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-filter.el (w3m-filter-rules): Add rule for the site of Allatanys.
-	(w3m-filter-allatanys): New function.
-
-	* w3m.el (w3m-relationship-estimate-rules): Fix regexp for Google
-	search within EmacsWiki. Add rule for Google Mobile Proxy.
-
-2008-04-17  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (top): Add the variables definition of `w3m-bookmark-mode',
-	`w3m-bookmark-menu-items', `w3m-bookmark-menu-items-pre' and
-	`w3m-tab-menubar-make-items-preitems' avoid byte-compile warnings.
-	(w3m-rmouse-menubar): New user option.
-	(w3m-setup-menu): Add the setup of `w3m-rmouse-menubar'.
-	(w3m-mouse-major-mode-menu): Rewrite to use `w3m-rmouse-menubar'.
-	(w3m-link-menu): Add `w3m-external-view-this-url'.
-
-2008-04-15  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-turnoff-inline-images): New command.
-	(w3m-toggle-inline-images): If force is 'turnoff, turn off to display
-	images.
-	(w3m-menubar): Add w3m-turnoff-inline-images.
-	(w3m-lynx-like-map): Ditto.
-	(w3m-info-like-map): Ditto.
-	(w3m-mode): Ditto.
-
-2008-04-07  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-relationship-estimate-rules): Fix custom type.
-
-2008-04-03  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-relationship-estimate-rules): Support Google search
-	within EmacsWiki.  cf. [emacs-w3m:10067]
-
-2008-03-17  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-mouse-safe-view-this-url): Remove redundant confirmation
-	of whether to follow link.
-
-2008-03-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-doc-view-content-types): New variable.
-	(w3m-doc-view): New function.
-	(w3m-create-page): Use it.
-	(w3m-content-type-alist): Add application/dvi.
-	(w3m-delete-buffer): Save windows layout.
-
-2008-03-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-image.el (w3m-imagick-convert-program-available-p): Don't use
-	w3m-imagick-convert-data which may issue a warning when checking
-	whether the convert program supports png32.  cf. [emacs-w3m:10048]
-
-2008-03-03  Naohiro Aota  <nao.aota@gmail.com>
-
-	* doc/emacs-w3m.texi (Inline Images): Updated.
-
-	* doc/emacs-w3m-ja.texi (Inline Images): Ditto.
-
-	* w3m.el (w3m-toggle-inline-images): Only toggle in the region if
-	Transient Mark mode.
-	(w3m-toggle-inline-image): Ditto.
-
-2008-02-20  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-arrived-intern): Protect against null string.  It enables
-	url completion even for null string.  Suggested by Aota-san.
-
-2008-02-07  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-expand-path-name): New function.
-	(w3m-expand-url): Remove useless expanded path-name check.
-
-2008-02-06  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* Makefile.in (install-lisp, install-icons, install-icons30): Quote
-	directory name that might contain whitespace.
-
-	* doc/Makefile.in (install): Ditto.
-
-	* aclocal.m4 (AC_PATH_LISPDIR): Ditto; always report prefix name.
-
-	* mkinstalldirs: Replace it with the 2006-05-11.19 version.
-
-2008-01-30  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-fontify-anchors): Don't expand icon's url when it is nil.
-
-2008-01-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-safe-url-regexp): Add note to doc string.
-	(w3m-fontify): Hold the value of w3m-safe-url-regexp with the
-	w3m-safe-url-regexp text-property.
-	(w3m-toggle-inline-image, w3m-toggle-inline-images)
-	(w3m-safe-view-this-url, w3m-mouse-safe-view-this-url): Check whether
-	url is safe by comparing it with the value of the w3m-safe-url-regexp
-	text property; prompt a user to confirm whether to proceed.
-	(w3m-safe-toggle-inline-image, w3m-safe-toggle-inline-images): Abolish.
-	(w3m-minor-mode-command-alist): Map w3m-toggle-inline-image and
-	w3m-toggle-inline-images to themselves.
-
-2008-01-20  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-search-name-anchor): Accept and optional argument
-	`no-record'.
-	(w3m-goto-url): Going other page's anchor, call
-	`w3m-search-name-anchor' with 3rd argument t.
-
-2008-01-16  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m-form.el (w3m-form-input-textarea-coding-system): Revert.
-	(w3m-form-input-textarea): Set w3m-form-input-textarea-coding-system to
-	use in w3m-form-coding-system-accept-region-p.
-
-2008-01-15  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m-form.el (w3m-form-textarea-file-coding-system): New variable.
-	(w3m-form-input-textarea-save): Use it.
-	(w3m-form-input-textarea): Ditto.
-	(w3m-form-input-textarea-coding-system): Abolish.
-
-2008-01-11  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m-filter.el (w3m-filter-iframe): New function.
-	(w3m-filter-rules): Add rule for inserting link to the url iframe
-	displays.
-
-2008-01-09  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m-form.el (w3m-form-coding-system-accept-region-p): Abolish.
-
-	* w3m-ems.el (w3m-form-coding-system-accept-region-p): Use
-	select-safe-coding-system if unencodable-char-position is not
-	available.
-
-	* w3m-xmas.el (w3m-form-coding-system-accept-region-p): Use
-	decode-coding-string and encode-coding-string instead of
-	unencodable-char-position; Only warn coding-system problem.
-
-2008-01-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-url-decode-string): Don't replace +'s with spaces.
-
-2007-12-27  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m-form.el (w3m-form-coding-system-accept-region-p): New function.
-	(w3m-form-input-textarea-save, w3m-form-input-textarea-set): Use it.
-
-2007-12-24  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-session.el (w3m-session-goto-session): Go to the current w3m
-	buffer in data of session.
-
-2007-12-24  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m-session.el (w3m-session-history-to-save): New function.
-	(w3m-session-save): Also record history data.
-	(w3m-session-automatic-save, w3m-session-deleted-save): Ditto.
-	(w3m-session-select): Follow the format change.
-	(w3m-session-goto-session): Also restore history data.
-
-2007-12-23  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-tabmenu.el (w3m-tab-menubar-force-update): New function.
-	(top): Register `w3m-tab-menubar-force-update' to
-	`w3m-display-functions'.
-
-2007-12-20  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-lynx-like-map): Bind `w3m-move-unseen-buffer'.
-	(w3m-info-like-map): Ditto.
-	(w3m-buffer-unseen): New buffer local variable.
-	(w3m-set-buffer-unseen): New function.
-	(w3m-set-buffer-seen): Ditto.
-	(w3m-move-unseen-buffer): Ditto.
-	(w3m-remove-local-hook): Ditto.
-	(w3m-goto-url): Set buffer to unseen.
-	(w3m-select-buffer-generate-contents): Support `unseen'.
-
-	* w3m-util.el (top): Add the variable definition of `w3m-buffer-unseen'
-	to avoid byte-compile warnings.
-	(w3m-unseen-buffer-p): New inline macro.
-
-	* w3m-tabmenu.el (w3m-tab-menubar-make-items-1): Support `unseen'.
-
-	* w3m-ems.el (w3m-remove-local-hook): New function.
-	(w3m-tab-unselected-unseen): New face.
-	(w3m-tab-line): Support `unseen'.
-
-2007-12-20  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-mode): Set show-trailing-whitespace to nil.
-
-2007-12-18  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-favicon.el (w3m-favicon-default-background): New user option.
-	(w3m-favicon-set-image): Don't set background color of favicon here.
-	(w3m-favicon-convert): Set the background color of favicon according to
-	w3m-favicon-default-background.
-
-	* w3m-ems.el (w3m-tab-line): Don't set the background color of favicon
-	here.
-
-	* w3m-image.el (w3m-imagick-identify-program): New user option.
-
-2007-12-17  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-proc.el (w3m-process-kill-stray-processes): Do not kill
-	process when the buffer associated to it is alive.
-	(w3m-process-sentinel): Do not call a handler when its parent
-	buffer have been killed.
-
-2007-12-15  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m-form.el (w3m-form-submit): Remove query part from the form's
-	action url when using get method.
-
-2007-12-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-favicon.el (w3m-favicon-size): Change the value form into
-	the cons of WIDTH and HEIGHT.
-	(w3m-favicon-convert-args): New user option.
-	(w3m-favicon-convert): Pass it to convert.
-
-	* w3m-ems.el (w3m-tab-mouse-track-selected-tab): Follow change of
-	w3m-favicon-size.
-
-2007-12-13  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-ems.el (w3m-tab-line): Set the background color of favicon
-	for Emacs 22+.
-
-	* w3m-favicon.el (w3m-favicon-set-image): Ditto.
-
-	* w3m-image.el (w3m-imagick-convert-program-available-p): Check
-	whether the convert program supports the image type png32 for
-	Emacs 22+.
-	(w3m-imagick-convert-buffer, w3m-imagick-start-convert-buffer):
-	Use png32 if it is available.
-
-2007-12-11  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-favicon.el (w3m-favicon-convert): Make last change revert.
-
-2007-12-11  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-favicon.el (w3m-favicon-convert): Apply the background color
-	of header line or mode line to pixels of which the color is
-	transparent.
-
-2007-12-06  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-goto-url): Canonicalize the url when it is called
-	non-interactively.
-
-2007-12-01  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-name-anchor-from-hist): New buffer-local variable.
-	(w3m-clear-local-variables): Also clear w3m-name-anchor-from-hist.
-	(w3m-goto-url): Save and restoe w3m-name-anchor-from-hist.
-	(w3m-search-name-anchor): Record (point)s of before and after
-	following a name-anchor.
-	(w3m-view-previous-page): If possible, move back the cursor to the
-	point where it was before following name-anchors.
-
-2007-11-30  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m-proc.el (w3m-process-y-or-n-p): Ignore space to avoid
-	answering y without intention.
-
-2007-11-29  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-goto-url-new-session): Use
-	w3m-active-region-or-url-at-point.  Reported by Naohiro Aota.
-
-	* w3m-ems.el (w3m-create-image): Don't modify case-fold-search.
-
-	* w3m-xmas.el (w3m-create-image): Ditto; parse image data to
-	identify its type in the beginning position.
-
-2007-11-29  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-w3m-dump-extra, w3m-w3m-retrieve): Removed image
-	data type tests.
-
-	* w3m-xmas.el (w3m-create-image): Parse image data first, use
-	server's content-type when it failed to identify type.
-
-	* w3m-ems.el (w3m-create-image): Ditto.
-
-2007-11-29  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-search.el (w3m-search-engine-alist): Fix google news entry.
-
-	* w3m-ems.el (w3m-create-image): Parse image data if it failed in
-	identifying type.
-
-	* w3m-xmas.el (w3m-create-image): Ditto.
-
-2007-11-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-resize-inline-image-internal): Validate image url.
-	Reported by Naohiro Aota <nao.aota@gmail.com>.
-
-2007-11-27  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-toggle-inline-images-internal): Confirm retrieving
-	non-secure image.
-	(w3m-resize-inline-image-internal): Ditto.
-
-2007-11-27  Katsumi Yamaoka  <yamaoka@jpl.org>,
-	    TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-retrieve-and-render): Permit leaving safe pages
-	without confirmation for several safe commands.
-
-2007-11-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-symbol.el: Autoload w3m-mule-unicode-p when compiling.
-
-	* w3m-proc.el: Update the way to suppress compile warning for gensym.
-
-2007-11-26  Trent W. Buck  <trentbuck@gmail.com>
-
-	* w3m.el (w3m-confirm-leaving-secure-page): New user option.
-	(w3m-retrieve-and-render): Use it.
-
-2007-11-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-use-japanese-menu): Default to nil for XEmacs 21.4 and
-	SXEmacs.
-	(w3m-link-map): New variable.
-	(w3m-fontify-anchors): Add menu to links.
-	(w3m-read-file-name): Don't use default file name if it is "".
-	(w3m-link-menu): Define.
-
-2007-11-06  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-redisplay-with-charset): Strip first 'about://source/'
-	before setf w3m-arrived-content-charset.
-	(w3m-redisplay-and-reset): Ditto.
-
-2007-11-05  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m-filter.el (w3m-filter-rules): Add rule for the site of imepita.
-	(w3m-filter-imepita): New function.
-
-2007-11-03  David Hansen  <david.hansen@gmx.net>
-
-	* w3m-proc.el (w3m-process-wait-process): Preserve the current buffer
-	\(work around an Emacs bug\).
-
-2007-11-03  David Hansen  <david.hansen@gmx.net>
-
-	* w3m.el (w3m-relationship-oddmuse-estimate): Follow new page layout.
-
-2007-11-01  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-ucs-to-char): Alias to unicode-to-char, ucs-to-char,
-	or int-to-char.
-
-	* w3m-ems.el (w3m-ucs-to-char): Always define it.
-
-	* w3m.el (w3m-ucs-to-char): Abolish.
-
-2007-10-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-module-list): Don't compile mew-w3m.el and
-	mew-shimbun.el if there is only the official Mew XEmacs package that is
-	extremely old.
-
-	* w3m-proc.el: Update the way to suppress compile warning for gensym.
-
-	* w3m-util.el (w3m-list-buffers): Check if w3m-fb-mode is bound.
-
-	* w3m.el (w3m-copy-buffer, w3m-mouse-major-mode-menu): Remove unused
-	let-bound variables.
-
-2007-10-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* Makefile.in (install-lisp): Don't install w3m-ems.el for XEmacs and
-	w3m-xmas.el for GNU Emacs.
-
-2007-10-17  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* *, doc/*: Fix expressions of the copyright notices.
-
-	* w3mhack.el (w3mhack-makeinfo): Don't split Info file to pieces.
-
-	* doc/emacs-w3m.texi, doc/emacs-w3m-ja.texi: Use @copying and
-	@insertcopying to put up the copyright notice.
-	(Coding convention of Shimbun): Don't use @itemx with @@multitable.
-
-	* doc/ptexinfmt.el (texinfo-copying-text, texinfo-copying)
-	(texinfo-insertcopying, texinfo-format-scan): Add them for old Emacsen.
-
-	* doc/Makefile.in (install): Remove installed *.info-[0-9] files;
-	install only *.info files.
-	(.texi.dvi): Don't specify "-l ja" to texi2dvi.
-	(clean): No need to remove *.info-[0-9] and *.info-[0-9][0-9] files.
-
-2007-10-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-find-coding-system): Return symbol, not coding
-	system object.
-
-2007-10-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-entity-regexp, w3m-entity-value): Accept case-insensitive
-	numeric character references.
-
-2007-10-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-message): Work with XEmacs.
-
-2007-10-04  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-ems.el: Bind w3m-use-title-buffer-name (see the comment).
-
-	* Makefile.in (very-slow): Add missing semicolon.
-
-2007-10-03  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* Makefile.in (install-lisp): Don't install ChangeLog~.
-
-2007-10-02  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-show-error-information): When emacs-w3m cannot find
-	host, set charset to us-ascii.
-
-2007-10-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-show-decoded-url): Add entry for nikkei.co.jp.
-
-2007-09-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-decode-buffer): Don't decode escaped URLs.
-	(w3m-toggle-inline-images-internal): Escape non-ASCII characters in the
-	URL of the image before retrieving it.
-
-2007-09-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-safe-view-this-url): When a function which is
-	specified by `w3m-goto-article-function' returns the
-	`w3m-goto-url' symbol, it falls back to emacs-w3m displaying
-	functions.  Cf. [emacs-w3m:09660]
-	(w3m-goto-article-function): Its comment is updated to follow the
-	above change.
-	(w3m-entity-value, w3m-decode-entities-string): Change to save
-	working memory.
-
-2007-09-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-entity-regexp): Bind max-specpdl-size for old Emacsen.
-	(w3m): Revert 2007-09-19 change.
-
-2007-09-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* NEWS: New file.
-
-2007-09-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-examine-command-line-args): Don't pass negative number to
-	nthcdr.
-
-	* w3m-session.el (w3m-session-save, w3m-session-select): Use mapc
-	instead of mapcar.
-
-2007-09-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Changes to stricten entities decoded by
-	`w3m-decode-entities'.
-	(w3m-entity-table, w3m-entity-reverse-table): New constants.
-	(w3m-entity-regexp): Stricten.
-	(w3m-entity-alist, w3m-entity-db, w3m-entity-db-size): Abolished.
-	(w3m-entity-value, w3m-decode-entities, w3m-decode-entities-string,
-	w3m-encode-specials-string): Rewritten to use the above constants.
-
-2007-09-21  TAKAHASHI Kaoru  <kaoru@kaisei.org>
-
-	* doc/ptexinfmt.el: Support @fonttextsize, @textdegree.
-
-2007-09-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-examine-command-line-args): Rewrite.
-	(w3m): Always call it; set the 2nd arg new-session when Emacs 21 or
-	XEmacs runs in the batch mode.
-
-2007-09-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-examine-command-line-args): Inhibit Emacs head from
-	displaying startup screen when emacs-w3m runs in the batch mode;
-	improve parsing of arguments.
-
-2007-09-13  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-expand-path-name): Save the matched data surely.
-
-2007-09-09  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-expand-url): Use "/" as path when it of base-uri is not
-	defined; Clear query of base-uri when empty query exist; Changes to
-	follow RFC3986.
-
-2007-09-07  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-ems.el (w3m-euc-japan-encoder, w3m-iso-latin-1-encoder): Use
-	mule-version to decide whether to redefine them.
-
-	* w3m.el: Use emacs-version instead of emacs-major-version to show the
-	version of Emacs that emacs-w3m doesn't support.
-
-2007-09-03  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-local-file-type): Regard news:* urls as text/html.
-	(w3m-w3m-retrieve): Return nil if retrieving failed.
-	(w3m-show-error-information): Improve error message for news:* urls.
-
-2007-09-03  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* aclocal.m4 (AC_PATH_EMACS): Improve expression of Emacs version.
-
-	* doc/ptexinfmt.el (ptexinfmt-broken-facility)
-	(ptexinfmt-defun-if-broken, ptexinfmt-defun-if-void)
-	(ptexinfmt-defvar-if-void): Don't use old-style backquotes.
-	(texinfo-format-cedilla-accent): Quote `,'.
-
-	* w3m-antenna.el (w3m-antenna-site-key, w3m-antenna-site-title)
-	(w3m-antenna-site-class, w3m-antenna-site-url)
-	(w3m-antenna-site-last-modified, w3m-antenna-site-size)
-	(w3m-antenna-site-size-detected): Don't use old-style backquotes.
-
-	* w3m-ccl.el (w3m-ccl-write-repeat, w3m-euc-japan-decoder)
-	(w3m-euc-japan-encoder, w3m-iso-latin-1-decoder)
-	(w3m-iso-latin-1-encoder): Don't use old-style backquotes.
-
-	* w3m-dtree.el (w3m-dtree-has-child): Don't use old-style backquotes.
-
-	* w3m-form.el (w3m-form-method, w3m-form-action, w3m-form-charlst)
-	(w3m-form-enctype, w3m-form-plist, w3m-form-get-property, w3m-form-put)
-	(w3m-form-get): Don't use old-style backquotes.
-
-	* w3m-namazu.el (w3m-namazu-default-index-customize-spec): Don't use
-	old-style backquotes.
-
-	* w3m-util.el (w3m-static-if, w3m-static-when, w3m-static-unless)
-	(w3m-condition-case, w3m-add-text-properties)
-	(w3m-get-text-property-around, w3m-action, w3m-anchor, w3m-image)
-	(w3m-submit, w3m-anchor-sequence): Don't use old-style backquotes.
-
-	* w3m.el (w3m-dirlist-cgi-program): Don't use old-style backquotes.
-
-	* w3mhack.el (char-before, match-string-no-properties)
-	(set-text-properties): Don't use old-style backquotes.
-
-	* w3m-filter.el: Set file's coding-system to euc-japan in order to
-	enable non-Mule XEmacsen to byte-compile this module.
-
-2007-08-31  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (top): Remove unnecessary space at the line end.
-	(w3m-use-title-buffer-name): New option.
-	(w3m-copy-buffer): Use `w3m-generate-new-buffer' instead of
-	`generate-new-buffer'.
-	(w3m-pack-buffer-numbers): Call `w3m-form-set-number' with new name of
-	buffer.
-	(w3m-buffer-setup): Use `w3m-generate-new-buffer' instead of
-	`generate-new-buffer'.
-	(w3m-buffer-setup): Do not display title if w3m-use-title-buffer-name
-	is non-nil.
-	(w3m-modeline-title): Retrun "" if w3m-use-title-buffer-name is
-	non-nil.
-	(w3m-goto-url): Call `w3m-buffer-name-add-title' when display.
-	(w3m): Use `w3m-generate-new-buffer' instead of `generate-new-buffer'.
-	(w3m-use-header-line-title): New option.
-
-	* w3m-form.el (w3m-form-set-number): Change 2'nd argument to `newname'
-	from `count'.
-
-	* w3m-util.el (top): Add the variable definition of
-	`w3m-use-title-buffer-name' to avoid byte-compile warnings.
-	(w3m-buffer-number): Support the feature of buffer-name with title.
-	(w3m-buffer-set-number): Ditto.
-	(w3m-generate-new-buffer): Ditto.
-	(w3m-buffer-name-lessp): Ditto.
-	(w3m-buffer-name-add-title): New inline macro.
-
-	* w3m-ems.el (top): Add the variable definition of
-	`w3m-use-header-line-title' to avoid byte-compile warnings.
-	(w3m-setup-header-line): If `w3m-use-header-line-title' is not nil,
-	display title and URI.
-
-2007-08-30  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-proc.el (top): Add the function definition of
-	`w3m-decode-coding-string-with-priority' to avoid byte-compile
-	warnings.
-
-	* w3m-ems.el (top): Add the variable definition of
-	`w3m-default-coding-system' and `w3m-coding-system' to avoid
-	byte-compile warnings.
-
-	* w3m-xmas.el (top): Add the variable definition of `w3m-coding-system'
-	to avoid byte-compile warnings.
-
-2007-08-29  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m-proc.el (w3m-process-filter): Decode realm string.
-
-	* w3m.el (w3m-url-decode-string): Define latter half as a function :
-	w3m-decode-coding-string-with-priority ,and use it.
-
-	* w3m-ems.el (w3m-decode-coding-string-with-priority): New function.
-
-	* w3m-xmas.el (w3m-decode-coding-string-with-priority): Return string
-	itself unless find-coding-system is defined as built-in function.
-
-2007-08-28  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-uri-replace-alist): Add key of "alc:".
-	(w3m-relationship-estimate-rules): Add alc's rule.
-	(w3m-relationship-alc-estimate): New function.
-
-	* w3m-search.el (w3m-search-engine-alist): Add rule of
-	http://eow.alc.co.jp/.
-
-	* w3m-filter.el (w3m-filter-rules): Add w3m-filter-alc.
-	(w3m-filter-alc): New function. Supper `goFairWord'.
-
-2007-08-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-goto-mailto-url): Make it work even with no rfc2368.el.
-
-2007-08-21  Eugene Oleinik  <eo@aoizora.org>
-
-	* w3m-filter.el (w3m-filter-google-separator): New user option.
-	(w3m-filter-google): Replace hard-coded ones with it.
-	(w3m-filter): Iterate through all cases in w3m-filter-rules.
-	(w3m-filter-replace-regexp): New function.
-
-2007-08-20  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-detect-xml-type): New function that treats
-	application/xml looking like xhtml+xml as text/html.
-	(w3m-content-type-alist): Use it for application/xml.
-	(w3m-w3m-parse-header): Parse Alternates header for a real url.
-	(w3m-w3m-retrieve-1): Retrieve real url according to Alternates header.
-	(w3m-external-view): Treat xhtml+xml as html.
-
-2007-07-30  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m-form.el: Changes to download contents after submitting form.
-	(w3m-form-download): New variable.
-	(w3m-fontify-textareas, w3m-form-parse-and-fontify): Combine the above
-	variable into expressions which represent form actions.
-	(w3m-form-submit): Accept and optional argument `download'.
-
-	* w3m.el: Changes to download contents after submitting form.
-	(w3m-download): Accept and optional argument `post-data'.
-	(w3m-download-this-url): `w3m-form-download' is binded locally.
-	(w3m-view-this-url): Ditto.
-	(w3m-submit-form): Ditto.
-
-2007-07-30  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-ucs.el (font-ccl-encoder-alist): Bind it for XEmacs 21.5.
-
-2007-07-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-relationship-estimate-rules): Make Google rule support
-	images.
-
-2007-07-23  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-session.el (w3m-session-select, w3m-session-selected): Add spec
-	for dark tty.
-	(w3m-session-select): Use read-key-sequence rather than read-event or
-	next-command-event in order to enable it to read arrow keys in tty.
-
-2007-07-17  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-form.el (w3m-form-make-button): Make it work.
-
-	* w3m-ems.el (w3m-form-make-button): Work when w3m-form-use-fancy-faces
-	is nil.
-
-2007-07-04  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-goto-article-function): Change the default function into
-	browse-url; doc fix.
-	(w3m-safe-view-this-url): Catch a signal from function which is set to
-	w3m-goto-article-function, and don't run the default function if it is
-	nil.
-
-2007-07-03  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-goto-article-function): Use defcustom; doc fix.
-	(w3m-safe-view-this-url): Use functionp instead of fboundp to check the
-	value of w3m-goto-article-function.
-
-	* w3m-favicon.el, w3m-namazu.el, w3m-perldoc.el, w3m-xmas.el, w3m.el:
-	Use custom-set-default instead of set-default in defcustom forms.
-
-2007-07-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-make-help-echo): Make the function for Emacs bind
-	deactivate-mark to nil.
-
-2007-06-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-ems.el, w3m-form.el, w3m-lnum.el, w3m-search.el, w3m-session.el
-	* w3m.el: Rename w3m-FOO-face with w3m-FOO.
-
-2007-06-21  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-makeinfo): Format @key{...}.
-
-2007-06-20  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-lynx-like-map, w3m-info-like-map): Bind [backtab] to
-	w3m-previous-anchor.
-
-2007-06-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-local-retrieve, w3m-w3m-retrieve, w3m-about-retrieve)
-	(w3m-cid-retrieve, w3m-data-retrieve, w3m-retrieve, w3m-about-header):
-	Change the term and the symbol name `no-decode' into `no-uncompress'.
-
-2007-06-08  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-w3m-retrieve): Check if content-type is wrong after
-	decoding encoded contents.
-
-	* w3m-ems.el (w3m-create-image, w3m-create-resized-image): Decode
-	content retrieving image.
-
-	* w3m-xmas.el (w3m-create-image, w3m-create-resized-image): Ditto.
-
-2007-06-07  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m-search.el (w3m-search-engine-alist): Add output encoding argument
-	to google search.
-
-2007-06-06  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-image.el (w3m-imagick-convert-program, w3m-resize-images): Reset
-	them if convert program is not really available.
-	(w3m-imagick-convert-program-available-p): New function.
-	(w3m-imagick-convert-buffer, w3m-imagick-start-convert-data): Use it.
-
-2007-06-05  Yoichi NAKAYAMA  <yoichi@geiin.org>
-
-	* w3m-image.el (w3m-imagick-start-convert-data): Clarify message which
-	is issued when convert program is not available.
-
-2007-06-05  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-filter.el (w3m-filter-mixi): Follow the change of Mixi's HTML.
-
-2007-06-01  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* attic/vm-w3m.el, attic/vm-7.19.patch: Remove.  They have been
-	integrated into VM 8.x.
-
-2007-05-17  Tatsuya Kinoshita  <tats@vega.ocn.ne.jp>
-
-	* w3m.el (w3m-view-this-url-1): Check whether the marker buffer exists.
-
-2007-05-17  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-ems.el (w3m-switch-to-buffer, w3m-subst-switch-to-buffer-keys):
-	Remove.
-
-2007-05-17  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-expand-url): Guard error in aref when url is "".
-
-2007-05-16  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-expand-url): Remove query strings when expanding URL like
-	"foo.cgi?#bar"; add "./" to top of URL when expanding "?hoge".
-
-2007-05-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-ems.el (w3m-switch-to-buffer): Work just like switch-to-buffer.
-	Suggested by Robert J. Chassell <bob@rattlesnake.com>.
-
-2007-05-11  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-url-encode-string, w3m-url-transfer-encode-string): Use
-	uppercase letters in hexadecimal string.  Suggested by Lukasz Demianiuk
-	<ldemianiuk@gmail.com>.
-
-2007-05-09  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-header-line-url): New function.
-	(w3m-url-at-point): Call w3m-header-line-url after
-	w3m-gmane-url-at-point.
-	(w3m-goto-url-with-timer): Execute w3m-goto-url if its buffer does not
-	exist foreground.
-
-2007-05-08  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (all): Revert SHIRAI's 2007-04-24 changes and fix it to
-	accompany Ito-san's patch [w3m-dev 04233].
-	(w3m-display-ins-del): New option.
-	(w3m-support-emacs-w3m): Remove this variable.
-	(w3m-strike-through-face): Modify.
-	(w3m-insert-face): Ditto.
-	(w3m-strike-through-face-no-windowsystem): Remove this face.
-	(w3m-fontify-insert): Remove this variable.
-	(w3m-halfdump-command-arguments): Remove w3m-support-emacs-w3m.
-	(w3m-halfdump-command-common-arguments): Add w3m-display-ins-del
-	support.
-	(w3m-fontify-strike-through): Rewrite.
-	(w3m-fontify-insert): Ditto.
-	(w3m-set-display-ins-del): New function.
-	(w3m-rendering-half-dump): Call w3m-set-display-ins-del.
-
-2007-04-30  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m-form.el (w3m-form-resume): Also resume contents of forms without
-	name.
-	(w3m-fontify-textareas): Also fontify textareas without name.
-	(w3m-form-field-parse): Also parse form fields without name.
-
-2007-04-28  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-decode-buffer): Use w3m-url-transfer-encode-string
-	instead of w3m-url-encode-string.
-
-2007-04-27  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-view-this-url): Check if w3m-current-url is string before
-	matching.
-
-2007-04-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-decode-buffer): Fully decode a source by default.
-	(w3m-view-source): Doc fix.
-
-2007-04-26  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-goto-url): Redisplay to search an anchor sure with
-	goto-new-session.
-
-2007-04-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-view-source-decode-level): New variable.
-	(w3m-decode-buffer): Control how much it decodes an html source
-	according to w3m-view-source-decode-level.
-	(w3m-view-source): Bind w3m-view-source-decode-level with prefix arg.
-
-2007-04-25  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-decode-buffer): Encode urls containing non-ASCII
-	characters quoted with '' as well as those quoted with "".
-	(w3m-goto-url): Decode urls when url is local.
-
-	characters when displaying an html source.
-
-2007-04-24  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-decode-buffer): Use charset specified in meta tag even
-	for decoding html source.
-
-2007-04-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* Makefile.in (install-lisp): Install shimbun/ChangeLog file.
-
-2007-04-24  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-support-emacs-w3m): New variable.
-	(w3m-compile-options): Set w3m-support-emacs-w3m to t if w3m compiled
-	with emacsdump.
-	(w3m-strike-through-face-no-windowsystem): New face.
-	(w3m-halfdump-command-arguments): Use '-emacsdump' instead of
-	'-halfdump' when w3m has it.
-	(w3m-fontify-strike-through): Support w3m-support-emacs-w3m.
-	(w3m-fontify-insert): Ditto.
-
-2007-04-24  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-goto-url): Set truncate-lines to nil, if a source or
-	header view.
-	(w3m-view-source): Remove to set truncate-lines.
-	(w3m-view-header): Ditto.
-
-2007-04-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* ChangeLog, ChangeLog.1: Separate shimbun entries.
-	(Local Variables): Set fill-column to 79.
-
-2007-04-19  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-form.el (w3m-form-input-textarea-filename): Use MD5 first.
-
-2007-04-14  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m-form.el (w3m-form-input-textarea-filename): Truncate filename
-	into less than or equal to 255 bytes long.
-
-2007-04-06  Matt Hodges  <M.P.Hodges@rl.ac.uk>
-
-	* w3m.el (w3m-next-buffer): Fix last change when w3m-fb-mode.
-
-2007-04-04  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-view-parent-page): Use numbered prefix argument to move
-	the parent directory according to input number.
-
-2007-03-31  Andreas Seltenreich  <seltenreich@gmx.de>
-
-	* w3m.el (w3m-external-view-file): Actually kill the temporary buffer.
-
-2007-03-30  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-ems.el (w3m-tab-mouse-track-selected-tab): Sleep anyway.
-	(w3m-tab-make-keymap): Add key-bindings for mouse wheel-up|down to
-	w3m-mode-map.
-
-2007-03-30  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bug.el (report-emacs-w3m-bug-system-informations): Add gtk.
-	(report-emacs-w3m-bug): Bind print-quoted to t.
-
-	* w3m-ems.el (w3m-force-window-update): Do split-window-vertically
-	instead of performing enlarge-window/shrink-window for Emacs 21.
-	(w3m-tab-mouse-track-selected-tab): Add `decelerate' argument; use it
-	instead of to check the value of this-command.
-	(w3m-tab-move-right): Set it.
-	(w3m-tab-make-keymap): Rearrange.
-	(w3m-update-tab-line): Remove.
-
-	* w3m.el (w3m-select-buffer-update): Use w3m-force-window-update
-	instead of w3m-update-tab-line.
-
-2007-03-29  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-ems.el (w3m-tab-mouse-track-selected-tab): Tiny fix.
-	(w3m-tab-make-keymap): Use next|previous-buffer-action instead of
-	w3m-tab-next|previous-buffer.
-
-2007-03-29  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-ems.el (w3m-tab-mouse-track-selected-tab): Ignore mouse position
-	info if mouse points to other frame; recognize wheel-up and wheel-down
-	in addition to mouse-4 and mouse-5; don't respond to too fast operation
-	of mouse wheel for moving a tab.
-
-2007-03-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-ems.el (w3m-tab-track-mouse): New variable.
-	(w3m-tab-mouse-position-adjuster): Express the values in pixel units
-	rather than the number of characters.
-	(w3m-tab-mouse-track-selected-tab): Be controlled by
-	w3m-tab-track-mouse; calculate the mouse position in pixel units rather
-	than the number of characters.
-	(w3m-tab-make-keymap): Make the buffer selected by a tab the current
-	buffer before performing w3m-tab-move-(left|right).
-	(w3m-tab-separator-map): New keymap.
-	(w3m-tab-separator): Use it as the local-map property.
-	(w3m-tab-line): Use it as the local-map property in trailing space.
-
-2007-03-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-ems.el (w3m-tab-unselected-face)
-	(w3m-tab-unselected-retrieving-face, w3m-tab-selected-face)
-	(w3m-tab-selected-retrieving-face, w3m-tab-mouse-face): Make background
-	colors bright.
-	(w3m-tab-mouse-position-adjuster): New variable.
-	(w3m-tab-mouse-track-selected-tab, w3m-tab-next-buffer)
-	(w3m-tab-previous-buffer, w3m-tab-move-right, w3m-tab-move-left): New
-	functions.
-	(w3m-tab-map): Bind C-wheel-up and C-mouse-4 to w3m-tab-move-left; bind
-	C-wheel-down and C-mouse-5 to w3m-tab-move-right; use
-	w3m-tab-previous-buffer and w3m-tab-next-buffer instead of
-	w3m-previous-buffer and w3m-next-buffer.
-	(w3m-tab-separator): Add tab-separator property.
-
-	* w3m.el (w3m-next-buffer): Fix calculation.
-	(w3m-lynx-like-map, w3m-info-like-map): Bind `C-c C-,' and `C-c C-<' to
-	w3m-tab-move-left, and bind `C-c C-.' and `C-c C->' to
-	w3m-tab-move-right for GNU Emacs.
-
-2007-03-27  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-add-tab-number): New user option.
-
-	* w3m-ems.el (top): Add w3m-add-tab-number to avoid byte-compile
-	warnings.
-	(w3m-tab-line): Display sequential number on tab title when
-	w3m-add-tab-number is not nil.
-
-	* w3m.el (w3m-menubar): Add w3m-session-save and w3m-session-select.
-	(w3m-tab-button-menu-commands): Ditto.
-
-2007-03-23  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-ems.el: New file merging w3m-e21.el, w3m-e23.el and w3m-fsf.el.
-	(image-size): No need to silence the byte compiler.
-	(w3m-ccl-get-ucs-codepoint-with-emacs-unicode): Remove.
-	(w3m-euc-japan-encoder, w3m-euc-japan-encoder)
-	(w3m-iso-latin-1-encoder, w3m-iso-latin-1-encoder): Redefine them only
-	for Emacs 22 and earlier.
-
-	* w3m-e21.el, w3m-e23.el, w3m-fsf.el: Remove.
-
-	* w3m.el: Load w3m-ems.el instead of w3m-e21.el or w3m-e23.el.
-	(w3m-fontify-strike-through): Remove variable.
-
-	* w3mhack.el (w3mhack-mdelete): Remove.
-	(w3mhack-module-list): Use w3m-ems.el instead of w3m-fsf.el and
-	w3m-e21.el or w3m-e23.el.
-
-	* Makefile.in (tarball): No need to exclude w3m-e23.el.
-
-2007-03-23  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* aclocal.m4 (AC_SET_XEMACSDEBUG): Fix the way to quote the value of
-	XEMACSDEBUG.  Reported by Norbert Koch <nk@viteno.net>.
-
-2007-03-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* aclocal.m4 (AC_SET_XEMACSDEBUG): Quote VANILLA_FLAG.
-
-2007-03-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* aclocal.m4 (AC_SET_XEMACSDEBUG): New function; set XEMACSDEBUG
-	environment variable, which is eval'd when XEmacs 21.5 starts, to the
-	Lisp form, which sets `log-warning-minimum-level' to `error', in order
-	to suppress warnings for Lisp shadows when XEmacs 21.5 starts.
-	(AC_PATH_EMACS): Run AC_SET_XEMACSDEBUG.
-	(AC_EMACS_LISP, AC_ADD_LOAD_PATH): Use XEMACSDEBUG.
-
-	* Makefile.in (XEMACSDEBUG): New variable.
-	(lisp, what-where, install-package, install-package-ja, dist)
-	(.el.elc, slow, very-slow): Use it.
-
-	* doc/Makefile.in (XEMACSDEBUG): New variable.
-	(EMACSINFO, version.texi, install-en, install-ja): Use it.
-
-	* w3mhack.el: Reset `log-warning-minimum-level' to `info'.
-
-2007-03-15  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-session.el (w3m-session-deleted-save): Sort buffers to use their
-	name.
-
-2007-03-13  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (autoload): Add w3m-session-deleted-save.
-	(w3m-delete-buffer): Call w3m-session-deleted-save.
-	(w3m-delete-other-buffers): Call w3m-delete-buffers instead of piece of
-	code.
-	(w3m-delete-buffers): Call w3m-session-deleted-save.
-
-	* w3m-session.el (w3m-session-deleted-save): New option.
-	(w3m-session-deleted-title): Ditto.
-	(w3m-session-deleted-keep-number): Ditto.
-	(w3m-session-deleted-save): New function.
-	(w3m-session-select): Display URLs.
-	(w3m-session-select): Add key assignment; `k' and `j'.
-
-2007-03-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bug.el (report-emacs-w3m-bug): Use a new buffer to compose a mail
-	if at least mail-user-agent is sendmail-user-agent that is the default.
-	cf. http://article.gmane.org/gmane.emacs.devel/67501
-
-2007-03-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-generate-load-file): Advise make-autoload to
-	support define-minor-mode if it should be necessary.
-
-2007-03-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-async-exec-with-many-urls): New variable; default to t
-	except for XEmacs 21.5.
-	(w3m-goto-url): Bind w3m-async-exec to nil when retrieving group:* urls
-	if w3m-async-exec-with-many-urls is nil.
-
-	* w3m-session.el (w3m-session-goto-session): Bind w3m-async-exec to nil
-	if w3m-async-exec-with-many-urls is nil.
-
-2007-03-08  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-session.el (w3m-session-select): Use next-command-event and
-	event-key for XEmacs with checked surely.
-
-2007-03-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-session.el (w3m-session-automatic-save): Remove unused vars.
-	(w3m-session-select): Use next-command-event for XEmacs; clear the echo
-	area after entering command.
-
-2007-03-08  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (autoload): Add w3m-session-select, w3m-session-save and
-	w3m-session-automatic-save.
-	(w3m-lynx-like-map): Add w3m-session-select and w3m-session-save to
-	map.
-	(w3m-info-like-map): Ditto.
-	(w3m-arrived-shutdown-functions): Add w3m-session-automatic-save.
-	(w3m-quit): Call w3m-session-automatic-save.
-
-	* w3m-session.el: New file.
-
-2007-02-28  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-filter.el (w3m-filter-rules): Add rules for the site of Amazon
-	and Mixi.
-	(w3m-filter-amazon-regxp): New option.
-	(w3m-filter-amazon-short-url-bottom): Ditto.
-	(w3m-filter-google): Add doc-string.
-	(w3m-filter-amazon): New function.
-	(w3m-filter-mixi): New function.
-
-2007-02-24  Tatsuya Kinoshita  <tats@vega.ocn.ne.jp>
-
-	* Makefile.in, doc/Makefile.in (clean): Remove doc/version.texi.
-
-2007-02-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-decode-buffer): Improve further regexp matching urls
-	containing non-ASCII characters.
-
-2007-02-21  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-decode-buffer): Improve regexp matching urls containing
-	non-ASCII characters.
-
-2007-02-20  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-decode-buffer): Encode urls containing non-ASCII
-	characters.
-
-2007-02-06  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-decode-entities): Don't decode things like entities in
-	forms of the text or the select type having the name property.
-
-2007-02-05  Naohiro Aota  <nao.aota@gmail.com>
-
-	* w3m.el (w3m-fontify): Don't delete things like tags in forms of
-	type=text as well as of type=textarea.
-
-2007-02-05  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-arrived-intern): New macro, that normalizes urls by
-	stripping last `/'s.
-	(w3m-arrived-add, w3m-arrived-p, w3m-arrived-time)
-	(w3m-arrived-put, w3m-arrived-get): Use it.
-	(w3m-create-text-page): Make sure to set w3m-current-title.
-
-2007-02-04  David Hansen  <david.hansen@physik.fu-berlin.de>
-
-	* w3m.el (w3m-relationship-estimate-rules): Added
-	`w3m-relationship-slashdot-estimate'.
-	(w3m-relationship-slashdot-estimate): New function.
-
-2007-02-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-menu-on-forefront): New variable.
-	(w3m-setup-menu): Use it.
-
-	* w3m-e21.el (w3m-menu-on-forefront): New function.
-
-	* w3m-xmas.el (w3m-menu-on-forefront): New function.
-	(w3m-setup-menu): Use it.
-
-	* w3m-bookmark.el (w3m-setup-bookmark-menu): Don't arrange the order of
-	the menu items here.
-	* w3m-tabmenu.el (w3m-setup-tab-menu): Ditto.
-
-2007-02-01  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* Makefile.in, doc/Makefile.in: Add datarootdir setting that is
-	required for newer autoconfs.
-
-	* w3m.el (w3m-lynx-like-map, w3m-info-like-map): Use (featurep 'gtk)
-	instead of (boundp 'gtk-version-string); use down-mouse-3 instead of
-	mouse-3, and bind drag-mouse-3 and mouse-3 to undefined for GTK Emacs.
-
-	* w3m-e21.el (w3m-use-toolbar)
-	(w3m-toolbar-icon-preferred-image-types): Use (featurep 'gtk) instead
-	of (boundp 'gtk-version-string).
-	(w3m-toolbar-configurations): Select frame visiting buffer which is
-	about to apply configurations; use (featurep 'gtk) instead of \(boundp
-	'gtk-version-string); enable it for GTK Emacs; exclude
-	auto-resize-tool-bars and auto-raise-tool-bar-buttons.
-
-2007-01-31  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-clean-hook-options): Remove.
-
-2007-01-31  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-search.el (w3m-search-read-query): Check that face property is
-	`list' to avoid argument error.
-
-2007-01-30  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-define-w3m-make-ccl-coding-system): Rename from
-	w3m-xmas-define-w3m-make-ccl-coding-system.
-	(w3m-toolbar-make-buttons): Rename from w3m-xmas-make-toolbar-buttons.
-	(w3m-define-missing-widgets): Rename from
-	w3m-xmas-define-missing-widgets.
-	(w3m-show-current-title-in-buffer-tab): Rename from
-	w3m-xmas-show-current-title-in-buffer-tab.
-	(w3m-setup-tab-in-gutter): Rename from w3m-xmas-setup-tab-in-gutter.
-	(w3m-update-tab-in-gutter): Rename from w3m-xmas-update-tab-in-gutter.
-
-	* w3m-e21.el (w3m-toolbar-icon-preferred-image-types)
-	(w3m-toolbar-icon-preferred-image-types): Use w3m-update-toolbars
-	instead of w3m-setup-toolbar.
-	(w3m-toolbar-configurations): Rename from
-	w3m-e21-toolbar-configurations; make it customizable for LUCID Emacs.
-	(w3m-toolbar-define-keys): Rename from w3m-e21-setup-toolbar; don't
-	apply w3m-toolbar-configurations here.
-	(w3m-toolbar-make-buttons): Rename from w3m-e21-make-toolbar-buttons.
-	(w3m-toolbar-set-configurations): New function.
-	(w3m-setup-toolbar): Remove force argument; apply
-	w3m-toolbar-configurations here.
-	(w3m-update-toolbars): New function.
-	(w3m-switch-to-buffer): Rename from w3m-e21-switch-to-buffer.
-	(w3m-subst-switch-to-buffer-keys): Rename from
-	w3m-e21-subst-switch-to-buffer-keys.
-
-	* w3m.el (w3m-message): Clear previous message only if it is longer
-	than the window width and running Emacs 22 and greater.
-
-2007-01-29  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-toolbar-icon-preferred-image-types)
-	(w3m-toolbar-use-single-image-per-icon): New variables.
-	(w3m-find-image): New function.
-	(w3m-xmas-make-toolbar-buttons): Use it; add force argument.
-	(w3m-setup-toolbar): Use it; add force and buffer arguments.
-	(w3m-initialize-graphic-icons): Use it.
-
-	* w3m-e21.el (w3m-toolbar-icon-preferred-image-types)
-	(w3m-toolbar-use-single-image-per-icon): Apply customized value to tool
-	bar immediately.
-	(w3m-e21-make-toolbar-buttons, w3m-setup-toolbar): Add force arg.
-
-2007-01-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* icons/*.png, icons30/*.png: New files.
-
-	* Makefile.in (install-icons, install-icons30): Install png files.
-
-	* w3mhack.el (w3mhack-nonunix-install, w3mhack-make-package): Install
-	png files.
-	(w3mhack-what-where): Update for png files.
-
-	* w3m-e21.el (w3m-use-toolbar): Check whether tool-bar and
-	gtk-version-string are available.
-	(w3m-toolbar-icon-preferred-image-types)
-	(w3m-toolbar-use-single-image-per-icon): New variables.
-	(w3m-find-image): New function.
-	(w3m-e21-make-toolbar-buttons, w3m-setup-toolbar)
-	(w3m-initialize-graphic-icons): Use it.
-
-2007-01-24  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-halfdump-command-arguments): Generate the right values
-	for non-Mule XEmacs.
-
-2007-01-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-message): Clear previous message first.  Suggested by
-	David Hansen <david.hansen@gmx.net>.
-
-2007-01-18  Friedrich Delgado Friedrichs  <delgado@dfn-cert.de>
-
-	* w3m-proc.el (w3m-process-ssl-passphrase): New variable.
-	(w3m-process-filter): Enable w3m to authenticate itself with a client
-	certificate.
-
-2007-01-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el: Autoload iswitchb-read-buffer when compiling.
-
-2007-01-10  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el (w3m-e21-switch-to-buffer): Add iswitchb-mode support.
-
-2007-01-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-modeline-title): Don't use w3m-force-window-update which
-	obstructs viewing of large images.  Reported by Chris Moore
-	<dooglus@gmail.com>.
-
-2006-12-21  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-filter.el (w3m-filter-rules): Add rule for the site of Google.
-	(w3m-filter-google-use-utf8): New user option.
-	(w3m-filter-google-use-ruled-line): Ditto.
-	(w3m-filter-google): New function.
-
-2006-12-13  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-search.el (w3m-search-engine-alist): Fix amazon entry.
-
-2006-12-11  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* aclocal.m4 (AC_EXAMINE_PACKAGEDIR): Check for
-	(early|late|last)-package-hierarchies as well as
-	(early|late|last)-packages; prefer them to configure-package-path.
-
-2006-12-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-form.el: Changes to create a new session after submitting form.
-	(w3m-form-new-session): New variable.
-	(w3m-fontify-textareas, w3m-form-parse-and-fontify): Combine the above
-	variable into expressions which represent form actions.
-	(w3m-form-submit): Accept and optional argument `new-session'.
-
-	* w3m.el: Changes to create a new session after submitting form.
-	(w3m-submit-form): Accept and optional argument `new-session'.
-	`w3m-form-new-session' is binded locally.
-	(w3m-view-this-url): `w3m-form-new-session' is binded locally.
-
-2006-12-08  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-view-parent-page): Add prefix argument `TOP'. If TOP is
-	non-nil, visit the top of this site."
-	(w3m-parent-page-available-p): Fix regexp.
-
-2006-12-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* patches/README: Update.
-	* patches/italic-text.patch: New file.
-	* patches/dot-domain.patch: New file.
-	* patches/file-progress.patch: Renew.
-	* patches/w3m-0.2.1-inu-1.5-solaris-xemacs.patch: Remove.
-	* patches/no-proxy.patch: Remove.
-
-2006-12-07  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-italic-face): New face.
-	(w3m-fontify-italic): New function.
-	(w3m-fontify): Use it.
-
-2006-11-25  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* mew-w3m.el (w3m-mail-compose-with-mew): Refrain handling of
-	`current-prefix-arg'.
-
-2006-11-14  Ren Lifeng  <lfren@cad.zju.edu.cn>
-
-	* w3m-cookie.el (w3m-cookie-1-acceptable-p): Accept cookie whose domain
-	attribute is ".foo.barz.bar" from host "foo.barz.bar".
-	(w3m-cookie-retrieve): Send cookie whose domain attribute is
-	".foo.barz.bar" when requesting host "foo.barz.bar".
-
-2006-11-20  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-mail.el (w3m-mail-compose-with-vm): Require vm-startup.
-
-2006-11-20  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
-
-	* w3m-mail.el (w3m-mail-compose-with-semi): Require mime-edit.
-
-2006-10-11  David Hansen  <david.hansen@physik.fu-berlin.de>
-
-	* w3m.el (w3m-relationship-estimate-rules): Support for google code
-	search added.
-
-2006-10-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el, w3m-bookmarks.el, w3m-search.el: Remove misadded Luca Capello
-	from the Authors field.
-
-2006-10-06  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-compatible-encoding-alist): Add iso-8859-8/windows-1255
-	and iso-8859-9/windows-1254.
-
-2006-10-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-mail.el (w3m-mail-compose-with-vm): Treat source as binary data
-	for images; encode source according to charset; use mail-send-actions
-	to kill source buffer.
-	(w3m-mail): Examine charset when the page is displayed normally.
-
-	* w3m-util.el (w3m-coding-system-to-mime-charset): Rename to
-	w3m-coding-system-to-charset and move to w3m.el
-
-	* w3m.el (w3m-coding-system-to-charset): Move from w3m-util.el.
-	(w3m-buffer): New function.
-
-2006-09-29  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-mail-user-agents): Add vm-user-agent.
-
-	* w3m-mail.el (w3m-mail-user-agent-compose-function-alist): Add
-	vm-user-agent.
-	(w3m-mail-compose-with-vm): New function.
-	(w3m-mail-goto-body-and-clear-body): New function.
-	(w3m-mail-position-point): New function.
-	(w3m-mail-compose-with-mml, w3m-mail-compose-with-semi): Use them.
-
-2006-09-29  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* mew-w3m.el (w3m-mail-compose-with-mew): Handle coding-system and
-	charset accurately. When call with `current-prefix-arg', try to use
-	existing draft buffer.
-
-	* w3m-mail.el (w3m-mail): Bind `w3m-history-reuse-history-elements' to
-	'reload.
-
-2006-09-29  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
-
-	* w3m-mail.el (w3m-mail-compose-with-semi): Handle types other than
-	text/html as well. Decide the charset when the charset is nil though
-	the content-type is a text.
-
-2006-09-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-mail.el (w3m-mail-compose-with-mml): Treat source as binary data
-	for images (we will probably have to do so for some more types); pass
-	content-type argument to MML.
-
-2006-09-28  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-mail-user-agents): Add mew-user-agent.
-
-	* w3m-mail.el (top): Autoload w3m-mail-compose-with-mew
-	(w3m-mail-user-agent-compose-function-alist): Add mew-user-agent.
-	(w3m-mail-compose-with-mml): Add `content-type' argument
-	(w3m-mail-compose-with-semi): Ditto.
-	(w3m-mail): Handle `content-type' and `about://header/'.
-
-	* mew-w3m.el (w3m-mail-compose-with-mew): New function.  Add
-	`content-type' argument and handle it.
-
-2006-09-28  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
-
-	* w3m-mail.el (w3m-mail-user-agent-compose-function-alist): Add
-	wl-user-agent.
-	(w3m-mail-compose-with-semi): New function.
-
-	* w3m.el (w3m-mail-user-agents): Add wl-user-agent.
-
-2006-09-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el (w3m-coding-system-to-mime-charset): New function.
-
-	* w3m-mail.el (w3m-mail-compose-with-mml): Bind gnus-newsgroup-name to
-	nil while composing mail if gnus-user-agent is used instead of removing
-	X-Draft-From header.
-	(w3m-mail): Use w3m-coding-system-to-mime-charset.
-
-2006-09-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-mail.el (w3m-mail-compose-with-mml): Remove X-Draft-From header;
-	make charset argument a string.
-	(w3m-mail): Make charset argument to be passed to composer a symbol.
-
-2006-09-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-mail.el: New file.
-
-	* w3m.el: Autoload w3m-mail.
-	(w3m-mail-user-agents): New variable.
-	(w3m-menubar): Add w3m-mail.
-
-2006-09-26  Luca Capello  <luca@pca.it>
-
-	* w3m-search.el (w3m-search-new-session): New command.
-	(w3m-search-read-variables): Ditto.
-	(w3m-search-do-search): Ditto.
-	(w3m-search): Rewrite to use the new commands above; add myself to the
-	authors list.
-
-	* w3m.el (autoload): Add w3m-search-new-session.
-	(w3m-menubar): Add w3m-search-new-session.
-	(w3m-info-like-map): Add w3m-search-new-session at the place of the
-	called-interactively w3m-search to be compliant with the other
-	*-new-session key-bindings.
-	(w3m-mode): Add description of w3m-search-new-session to docstring.
-
-2006-09-25  Luca Capello  <luca@pca.it>
-
-	* w3m-bookmark.el: Add myself to the authors list, forgotten when
-	submitting the patch for w3m-bookmark-view-new-session.
-
-	* w3m.el: Ditto.
-
-2006-09-22  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-e21.el (w3m-tab-make-keymap): Support mouse wheel on the tab.
-
-	* w3m-e23.el (w3m-tab-make-keymap): Ditto.
-
-2006-09-20  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-fb.el: Bind w3m-delete-buffer, w3m-fb-frame-parameter,
-	w3m-list-buffers, w3m-next-buffer, and w3m-pop-up-frames when
-	compiling.
-
-2006-09-16  David Hansen  <david.hansen@physik.fu-berlin.de>
-
-	* w3m.el (w3m-relationship-estimate-rules): Changed freshmeat URL
-	regexp.
-
-2006-09-13  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-lynx-like-map, w3m-info-like-map): Don't bind M-g key
-	because Emacs 22 uses it as a prefix command in global map.  Suggested
-	by David Hansen <david.hansen@gmx.net>.
-
-2006-09-09  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
-
-	* w3m-search.el (w3m-search-engine-alist): Instruct explicitly Google
-	to return English pages for google-en.
-
-2006-09-07  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-default-directory): New variable.
-	(w3m-current-directory): Use it.
-
-2006-09-05  David Hansen  <david.hansen@gmx.net>
-
-	* w3m.el (w3m-local-find-file-regexps): Default to '(nil
-	. "\\.[sx]?html?\\'").
-
-2006-08-31  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-enable-google-feeling-lucky): New variable.
-	(w3m-input-url): Disable the Google feeling lucky feature if it is nil.
-
-2006-08-30  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-show-decoded-url): Add entry for ohmynews.co.jp.
-
-2006-08-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-relationship-search-patterns): Call
-	`w3m-decode-anchor-string' in order to decode "&amp;" in anchor
-	strings.
-	(w3m-relationship-freshmeat-estimate): Removed.
-	(w3m-relationship-estimate-rules): Use
-	`w3m-relationship-simple-estimate' instead of the above, to simplify
-	related codes.
-
-2006-08-11  David Hansen  <david.hansen@pysik.fu-berlin.de>
-
-	* w3m.el (w3m-relationship-oddmuse-estimate): New function.
-	(w3m-relationship-freshmeat-estimate): New function.
-	(w3m-relationship-estimate-rules): Fixed regexp for google groups.
-	Added above new functions.
-
-2006-07-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el (w3m-truncate-string): Don't autoload mule-util.el.
-
-2006-06-19  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-tabmenu.el (w3m-tab-menubar-make-items-precbuf): New internal
-	variable.
-	(w3m-tab-menubar-make-items-prebuflst): Ditto.
-	(w3m-tab-menubar-make-items-preurl): Ditto.
-	(w3m-tab-menubar-make-items-preitems): Ditto.
-	(w3m-tab-menubar-make-items): Set an use previous variables to used for
-	the speed improvement.
-
-	* w3m-util.el (w3m-make-menu-commands-keys): New internal variable.
-	(w3m-make-menu-commands): Set and use `w3m-make-menu-commands-keys to
-	used for the speed improvement.
-
-2006-06-15  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* attic/rfc2368.el: Copy from Emacs 22; modify rfc2368-unhexify-string
-	to work with both Emacs and XEmacs.
-
-2006-05-31  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-view-this-url-1): Set 5th argument of `w3m-copy-buffer'
-	to `w3m-new-session-in-background'.
-	(w3m-copy-buffer): Add `background' argument. When URL is null and
-	`background' is not non-nil, stay the current buffer.
-
-2006-05-31  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-search.el (w3m-search-read-query): Ignore page title only in
-	w3m-mode buffers.
-
-2006-05-30  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-search.el (w3m-search-read-query): Assume there's not only a list
-	of faces but also just a face.
-
-2006-05-30  Yoichi NAKAYAMA  <yoichi@geiin.org>
-
-	* w3m.el (w3m-copy-buffer): Create empty w3m buffer when url is not
-	set.  Cause error on meaningless combination of arguments.
-
-2006-05-28  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-e21.el (w3m-tab-selected-background-face): New face.
-	(w3m-tab-separator): Put `mouse-face' for the shape of a mouse button.
-	(w3m-tab-line): Ditto.
-
-	* w3m-e23.el (w3m-tab-selected-background-face): New face.
-	(w3m-tab-separator): Put `mouse-face' for the shape of a mouse button.
-	(w3m-tab-line): Ditto.
-
-2006-05-26  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-tab-button-menu-commands): Disable same items if
-	`w3m-tab-button-menu-current-buffer' is nil.
-	(w3m-tab-button-menu2): New function.
-
-	* w3m-e21.el (top): Add the variables and function to avoid
-	byte-compile warnings.
-	(w3m-tab-drag-mouse-function): Support drag & drop to out of the
-	frame. Don't call `bury-buffer'.
-	(w3m-tab-click-mouse-function): Don't call `bury-buffer'.
-	(w3m-tab-double-click-mouse1-function): new function.
-	(w3m-tab-double-click-mouse2-function): Ditto.
-	(w3m-tab-make-keymap): Add some methods.
-
-	* w3m-e23.el (top): Add the variables and function to avoid
-	byte-compile warnings.
-	(w3m-tab-drag-mouse-function): Support drag & drop to out of the
-	frame. Don't call `bury-buffer'.
-	(w3m-tab-click-mouse-function): Don't call `bury-buffer'.
-	(w3m-tab-double-click-mouse1-function): new function.
-	(w3m-tab-double-click-mouse2-function): Ditto.
-	(w3m-tab-make-keymap): Add some methods.
-
-	* w3m.el (w3m-tab-button-menu-commands): Change position some items.
-
-2006-05-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el (w3m-widget-type-convert-widget): New function.
-
-	* w3m.el (w3m-home-page, w3m-new-session-url)
-	(w3m-uri-replace-alist): Use it.
-
-	* w3m-dtree.el (w3m-dtree-indent-strings, w3m-dtree-stop-strings): Use
-	it.
-
-	* w3m-symbol.el (w3m-symbol-custom-type): Use it.
-
-2006-05-21  Yoichi NAKAYAMA  <yoichi@geiin.org>
-
-	* w3m.el (autoload): `w3m-bookmark-view-new-sessiont' ->
-	`w3m-bookmark-view-new-session'.
-
-2006-05-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-home-page): Rewrite :convert-widget function.
-	(w3m-new-session-url): Ditto.
-
-2006-05-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-new-session-url): Doc fix; improve custom type.
-	(w3m-new-session-in-background): Doc fix.
-
-2006-05-19  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-new-session-url): Rename from
-	`w3m-tab-button-new-session-url'.
-	(w3m-tab-button-focus-new-tab): Delete.
-	(w3m-view-this-url-new-session-in-background): This option sets
-	obsolete.
-	(w3m-new-session-in-background): New option.
-	(w3m-menubar): Change and add Some items.
-	(w3m-copy-buffer): If call-interactively, set `just-copy' to `t'.  If
-	`w3m-new-session-in-background' and `just-copy' is non-nil, swith to
-	original buffer when finished.
-	(w3m-lynx-like-map): Add `w3m-bookmark-view-new-session'.
-	(w3m-tab-button-menu-commands): Use `w3m-new-session-in-background'
-	insted of `w3m-tab-button-focus-new-tab'.
-	(w3m-goto-new-session-url): New command.
-	(w3m-goto-url-new-session): Call `w3m-copy-buffer' with
-	`w3m-new-session-in-background'.
-	(w3m-select-buffer-generate-contents): Add prefix number to beginning
-	of title name.
-
-	* w3m-tabmenu.el (w3m-tab-menubar-items-sub-coeff): New variable.
-	(w3m-tab-menubar-items-width): Ditto.
-	(w3m-tab-menubar-make-items-1): New inline macro and trancate string of
-	tab's title if over `w3m-tab-menubar-items-width'.
-	(w3m-tab-menubar-make-items): Use `w3m-tab-menubar-make-items-1'.  If
-	the number of tabs over `(- (frame-height)
-	w3m-tab-menubar-items-sub-coeff)', make sub-menu.
-
-	* w3m-bookmark.el (w3m-bookmark-view-new-session): Use
-	w3m-view-this-url-1 instead of w3m-goto-url; warn if w3m-mode does not
-	run.
-	(w3m-bookmark-menu-items): Add w3m-bookmark-view-new-session.
-
-2006-05-18  Luca Capello  <luca@pca.it>
-
-	* w3m-bookmark.el (w3m-bookmark-view): Add docstring.
-	(w3m-bookmark-view-new-session): New command.
-
-	* w3m.el (autoload): Add docstring to w3m-bookmark-view; add
-	w3m-bookmark-view-new-session.
-	(w3m-menubar): Add Bookmark submenu and w3m-bookmark-view-new-session.
-	(w3m-info-like-map): Add w3m-bookmark-view-new-session.
-	(w3m-mode): Add description of w3m-bookmark-view-new-session to
-	docstring.
-
-2006-05-18  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-tab-button-focus-new-tab): New option.
-	(w3m-menubar): Add some items.
-	(w3m-external-view-this-url): New command.
-	(w3m-external-view-current-url): Ditto.
-	(w3m-tab-button-menu-commands): Use `w3m-tab-button-focus-new-tab' on
-	`w3m-goto-url-new-session' and `w3m-copy-buffer'.
-	(w3m-tab-button-menu): Make with `w3m-make-menu-commands'.
-
-	* w3m-util.el (top): Add the variable definition of `w3m-mode-map' to
-	avoid byte-compile warnings.
-	(w3m-make-menu-commands): New function.
-
-	* w3m-tabmenu.el (w3m-tab-menubar-make-items): Use
-	`w3m-make-menu-commands'.
-
-2006-05-18  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-view-url-with-external-browser): Add optional url
-	argument.
-	(w3m-tab-button-menu-commands): Make w3m-copy-buffer and
-	w3m-view-url-with-external-browser select the buffer; pass url to
-	w3m-view-url-with-external-browser.
-
-2006-05-18  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bookmark.el (w3m-bookmark-add-all-urls): New function.
-
-	* w3m.el: Autoload w3m-bookmark-add-all-urls.
-	(w3m-menubar): Add w3m-reload-all-pages.
-	(w3m-lynx-like-map): Add w3m-reload-all-pages and
-	w3m-bookmark-add-all-urls.
-	(w3m-info-like-map): Ditto.
-	(w3m-tab-button-menu-commands): Make it enable to pass arguments to
-	function items; use w3m-goto-url-new-session, w3m-reload-all-pages, and
-	w3m-bookmark-add-all-urls instead of lambda forms.
-	(w3m-tab-button-menu): Pass arguments to functions defined in
-	w3m-tab-button-menu-commands.
-	(w3m-mode): Add descriptions about w3m-reload-all-pages and
-	w3m-bookmark-add-all-urls to docstring.
-	(w3m-reload-all-pages): New function.
-
-2006-05-18  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-lynx-like-map): Define `w3m-mouse-major-mode-menu' to
-	mouse-3.
-	(w3m-info-like-map): Ditto.
-	(w3m-mouse-major-mode-menu): New command.
-
-	* w3m-util.el (top): Add the variable definition of
-	`w3m-use-japanese-menu' to avoid byte-compile warnings.
-	(w3m-make-menu-item): Change method to take measures for garbage
-	characters on XEmacs.
-
-	* w3m-bookmark.el (w3m-bookmark-make-item-xmas): New variable.
-	(w3m-bookmark-make-item): New inline macro.
-	(w3m-bookmark-make-menu-items): Use `w3m-bookmark-make-item'.
-
-2006-05-18  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-menubar): Use `w3m-make-menu-item'.
-	(w3m-tab-button-menu-current-buffer): Enable always.
-	(w3m-tab-button-menu-commands): Ditto. Use `w3m-make-menu-item'.
-
-	* w3m-util.el (w3m-make-menu-item): New function.
-
-	* w3m-tabmenu.el (w3m-tab-menubar-make-items): Handle
-	`w3m-tab-button-menu-commands' always.
-
-	* w3m-bookmark.el (w3m-bookmark-menu-items): Use `w3m-make-menu-item'.
-
-2006-05-17  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-use-japanese-menu): Change default value.
-	(w3m-menubar): Simplify the rule to use Japanese menu.
-	(w3m-tab-button-menu-commands): Ditto.
-
-	* w3m-bookmark.el (w3m-bookmark-menu-items): Simplify the rule to use
-	Japanese menu.
-
-2006-05-17  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-menubar): Escape the Japanese katakana `a' which breaks
-	the string syntax in non-Mule XEmacs.
-
-	* w3m-bookmark.el (w3m-bookmark-menu-items): Escape the Japanese kanji
-	`etsu' which breaks the string syntax in non-Mule XEmacs.
-
-2006-05-17  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-use-japanese-menu): New option.
-	(w3m-menubar): Add Japanese menu.
-	(w3m-tab-button-menu-commands): Change the way to check Japanse or
-	others.
-
-	* w3m-bookmark.el (w3m-bookmark-menu-items): Add Japanese menu.
-
-2006-05-17  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-tab-button-new-session-url): New option.
-	(w3m-delete-other-buffers): New command.
-	(w3m-delete-left-tabs): Ditto.
-	(w3m-delete-right-tabs): Ditto.
-	(w3m-delete-buffers): New function.
-	(w3m-lynx-like-map): Add `w3m-delete-left|right-tabs'.
-	(w3m-tab-button-menu-commands): New new items.
-
-	* w3m-util.el (w3m-lefttab-exist-p): New inline function.
-	(w3m-righttab-exist-p): Ditto.
-
-	* w3m-tabmenu.el (w3m-tab-menubar-make-items): Handle
-	`w3m-tab-button-menu-commands' if possible.
-
-2006-05-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-tab-button-menu-commands): New variable.
-	(w3m-tab-button-menu-current-buffer): New variable.
-	(w3m-tab-button-menu): New variable.
-	(w3m-tab-button-menu): New function.
-
-	* w3m-e21.el (w3m-tab-make-keymap): Bind mouse-3 to menu.
-
-2006-05-14  Tsuyoshi CHO  <tsuyoshi_cho@ybb.ne.jp>
-
-	* w3m.el (w3m-refontify-anchor): Improve parameter check.
-	(w3m-create-image-page): Use `w3m-add-face-property' instead
-	`put-text-property'/`add-text-properties'/`w3m-add-text-properties'.
-	(w3m-history-highlight-current-url): Ditto.
-	(w3m-header-line-insert): Ditto.
-
-	* w3m-search.el (w3m-search-read-query): Improve parameter check.
-
-	* w3m-lnum.el (w3m-link-numbering): Use `w3m-add-face-property' instead
-	`put-text-property'.
-
-	* w3m-form.el (w3m-form-make-button): Use `w3m-add-face-property'
-	instead `add-text-properties'.
-	(w3m-fontify-textareas): Ditto.
-	(w3m-form-parse-and-fontify): Ditto.
-
-	* w3m-e21.el,w3m-e23.el (w3m-form-make-button): Improve face property
-	append method.
-	(w3m-setup-header-line): Ditto.
-	(w3m-tab-line): Ditto.
-	(w3m-tab-separator): Modify `face' value to list.
-
-2006-05-11  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-search.el (w3m-search-engine-alist): Use utf-8 for google if
-	possible.
-
-2006-05-10  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-show-decoded-url): Add entry for hatena.ne.jp.
-
-2006-05-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* aclocal.m4 (AC_SET_VANILLA_FLAG): Add --no-unibyte option so as to
-	invalidate EMACS_UNIBYTE environment variable.
-
-2006-05-07  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-symbol.el: Bind w3m-use-symbol when compiling.
-	(w3m-use-symbol): New function.
-	(w3m-replace-symbol): Use it.
-
-	* w3m.el (w3m-use-symbol): Changed its default value when
-	w3m-output-coding-system is utf-8.
-
-2006-05-07  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-util.el (w3m-device-on-window-system-p): New function.
-	(w3m-popup-frame-p): Use it.
-
-	* w3m-search.el (w3m-search-engine-alist): Ditto.
-
-	* w3m.el (w3m-fontify-strike-through): Ditto.
-
-2006-05-06  Yoichi NAKAYAMA  <yoichi@geiin.org>
-
-	* w3m-search.el (w3m-search-engine-alist): Remove lycos-ja.
-
-2006-05-01  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-search.el (w3m-search-engine-history): New variable.
-	(w3m-search): Use it.
-
-2006-05-01  David Hansen  <david.hansen@gmx.net>
-
-	* w3m-search.el (w3m-search-engine-alist): Add freshmeat.
-
-2006-04-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-url-decode-string): Don't perform find-coding-system on a
-	list of coding system in XEmacs.
-
-2006-04-28  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-google-feeling-lucky-charset): New user option.
-	(w3m-canonicalize-url): Support search-keyword for "I'm Feeling Lucky
-	on Google". Add 2nd argument.
-	(w3m-input-url): Suport "I'm Feeling Lucky".  Add 5th argument
-	`feeling-lucky'.  Bind key to `self-insert-command' if `feeling-lucky'.
-	Call `w3m-canonicalize-url' with `feeling-lucky'.
-	(w3m-view-this-url): Call `w3m-input-url' with `feeling-lucky'.
-	(w3m-goto-url-new-session): Ditto.
-	(w3m): Ditto.
-
-2006-04-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el: Require APEL XEmacs package 1.32 and later.
-
-2006-04-22  Yoichi NAKAYAMA  <yoichi@geiin.org>
-
-	* w3m-search.el (w3m-search-engine-alist): Add msdn.
-
-2006-04-21  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-url-decode-string): Support non-Mule XEmacs
-	superficially.
-
-	* w3m-util.el (w3m-replace-in-string): Prefer replace-regexp-in-string
-	over of replace-in-string.  It was done in Gnus by Reiner Steib.
-
-2006-04-20  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* w3m-search.el (w3m-search-engine-alist): Fix url for ja.wikipedia.
-
-2006-04-20  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-search.el (w3m-search-engine-alist): Add ja.wikipedia.
-
-2006-04-20  David Hansen  <david.hansen@gmx.net>
-
-	* w3m-search.el (w3m-search-engine-alist): Add wikipedia, en.wikipedia
-	and de.wikipedia.
-
-2006-04-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-download): Clear minibuffer after y-or-n-p.
-
-2006-04-06  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* attic/vm-w3m.el (vm-w3m-use-w3m-minor-mode-map): New variable.
-	(vm-mime-display-internal-text/html): Use it.
-
-2006-04-04  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-url-decode-string): Make string unibyte before decoding.
-
-2006-03-16  Tsuyoshi CHO  <tsuyoshi_cho@ybb.ne.jp>
-
-	* w3m.el (w3m-data-retrieve): New function.
-	(w3m-attributes, w3m-retrieve): Add support `data:' scheme handled by
-	`w3m-data-retrieve'.
-
-2006-03-15  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-ccl.el (charset-id): Define it as a macro instead of an alias to
-	charset-id-internal if Emacs doesn't provide it.
-
-2006-03-12  Tsuyoshi CHO  <tsuyoshi_cho@ybb.ne.jp>
-
-	* w3m.el (w3m-insert-face): New face.
-	(w3m-fontify-insert): New variable.
-	(w3m-fontify-insert): New function.
-	(w3m-fontify): Add calling `w3m-fontify-insert'.
-
-2006-02-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-decode-buffer): Decode buffer's string outside the
-	buffer.
-
-2006-02-26  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-w3m-parse-header): When the url matchs to ftp, rewrite
-	type and charset.
-	(w3m-w3m-attributes-1): Don't rewrite type and charset.
-	(w3m-w3m-retrieve): Don't check status code when the url does not match
-	to http.
-
-2006-02-01  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-url-components-regexp): Move to w3m-util.el.
-	(w3m-fontify-anchors, w3m-canonicalize-url, w3m-add-referer-p)
-	(w3m-expand-url, w3m-view-this-url-1, w3m-goto-url)
-	(w3m-goto-url-new-session): Use w3m-string-match-url-components rather
-	than to run string-match with w3m-url-components-regexp.
-	cf. <URL:http://emacs-w3m.namazu.org/ml/msg08412.html>.
-
-	* w3m-form.el (w3m-form-normalize-action): Ditto.
-
-	* w3m-cookie.el (w3m-parse-http-url): Ditto.
-
-	* w3m-util.el (w3m-string-match-url-components-1): New function.
-	(w3m-url-components-regexp): Move from w3m.el.
-	(w3m-string-match-url-components): New macro.
-
-2006-01-19  Tsuyoshi CHO  <tsuyoshi_cho@ybb.ne.jp>
-
-	* w3m.el (w3m-fontify-strike-through): Improve matching point.
-
-2006-01-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* doc/Makefile.in: Add rules to make pdf files.
-
-	* configure.in: Check for dvipdfmx and texi2pdf.
-
-2005-12-31  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-util.el (top): Add the variable definition of `w3m-mode-hook' to
-	avoid byte-compile warnings.
-
-2005-12-30  Tsuyoshi CHO  <tsuyoshi_cho@ybb.ne.jp>
-
-	* w3m.el (w3m-fontify-strike-through): Fix multi `<del>' problem.
-
-2005-12-23  Matt Hodges  <MPHodges@member.fsf.org>
-
-	* w3m-util.el (w3m-list-buffers): Ensure disabling the w3m-fb-mode
-	after a careless (setq w3m-fb-mode t).
-
-2005-12-22  Tsuyoshi CHO  <tsuyoshi_cho@ybb.ne.jp>
-
-	* w3m-antenna.el (w3m-antenna-refresh-interval): Add new customize
-	variable.
-	(w3m-antenna-make-contents): Add new generation rule for refresh
-	interval replacing `%R' to META Refresh tag and contents value are
-	`w3m-antenna-refresh-interval'.
-	(w3m-antenna-html-skelton): Add %R rule.
-
-2005-12-19  Matt Hodges  <MPHodges@member.fsf.org>
-
-	* w3m-util.el (w3m-list-buffers): Further fix against the case where
-	someone did (setq w3m-fb-mode t).
-
-2005-12-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-fb.el (w3m-fb-mode): Never activate w3m-fb-mode if
-	w3m-pop-up-frames is non-nil.
-
-	* w3m-util.el (w3m-list-buffers): Reset w3m-fb-mode if it seems to have
-	been set thoughtlessly.
-
-2005-12-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-fb.el: Don't require w3m.
-	(w3m-fb-frame-parameter): Always define.
-	(w3m-fb-delete-frame-functions): Ditto.
-	(w3m-fb-select-buffer): Fix the 2nd clause of cond.
-	(w3m-fb-advised-functions): Remove.
-	(w3m-list-buffers): Move advice code to w3m-fb.el.
-	(w3m-close-window): Move advice code to w3m.el.
-	(w3m-delete-buffer): Ditto.
-	(w3m-quit): Ditto.
-	(w3m-fb-mode): Remove w3m-fb-advised-functions stuff.
-
-	* w3m.el (w3m-fb): Require.
-	(w3m-delete-buffer, w3m-quit, w3m-close-window): Merge the codes which
-	were formerly provided as advices in w3m-fb.el.
-
-	* w3m-util.el (w3m-fb-list-buffers-frame, w3m-fb-mode): Bind them when
-	compiling.
-	(w3m-fb-frame-parameter): Autoload.
-	(w3m-list-buffers): Merge the code which was formerly provided as an
-	advice in w3m-fb.el.
-
-2005-11-26  Matt Hodges  <MPHodges@member.fsf.org>
-
-	* w3m-fb.el: New file.
-
-2005-12-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-form.el (w3m-form-submit): Use the post method for the
-	multipart/form-data enctype according to the proposal of RFC2070 even
-	if the form specifies the get method.
-
-2005-11-24  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-form.el (w3m-form-submit): If anchor exists, go to the uri.
-
-2005-11-21  Tsuyoshi CHO  <tsuyoshi_cho@ybb.ne.jp>
-
-	* w3m-favicon.el (w3m-favicon-type): Renew default image type list.
-
-2005-11-19  Tsuyoshi CHO  <tsuyoshi_cho@ybb.ne.jp>
-
-	* w3m.el (w3m-menubar): Renew enable/disable condition for `[Copy This
-	Session]',`[Download This URL]', and Append `[Toggle This Image]'.
-
-	* w3m-bookmark.el (w3m-bookmark-menu-items): Renew enable/disable
-	condition for `[Add This URL to Bookmark]'.
-
-2005-11-16  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-open-all-links-in-new-session): Reverse the list of URLs.
-
-2005-10-21  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el (w3m-tab-drag-mouse-function): Lower the buffer displayed
-	before moving to the other tab.
-	(w3m-tab-click-mouse-function): Ditto.
-
-2005-10-17  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-util.el (w3m-add-face-property): Simplified.
-
-2005-10-15  Tsuyoshi CHO  <tsuyoshi_cho@ybb.ne.jp>
-
-	* w3m-util.el (w3m-add-face-property): Add new functions.
-	(w3m-remove-face-property): Ditto.
-
-	* w3m.el (w3m-fontify-bold, w3m-fontify-underline)
-	(w3m-fontify-strike-through, w3m-fontify-anchors)
-	(w3m-fontify-images): Replace `w3m-add-text-properties' to
-	`w3m-add-face-property' at FACE.
-	(w3m-refontify-anchor): Change for FACE properly is list type.
-
-2005-10-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el (w3m-insert-image): Make it work with a face text property
-	whose value is a list.
-	(w3m-remove-image): Remove useless text property.
-	* w3m-e23.el (w3m-insert-image,w3m-remove-image): Same as w3m-e21.el's
-	modification.
-
-2005-09-29  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-proc.el (w3m-process-filter): Fixed regexp.
-
-2005-09-27  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-proc.el (w3m-process-filter): Remove SSL warning message for
-	basic authentication over SSL.
-
-2005-09-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-fontify): Remove empty lines at the beginning of the
-	buffer (see the comment).
-
-2005-09-21  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* mime-w3m.el (mime-w3m-preview-text/html): Revert.
-
-2005-09-21  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* mime-w3m.el (mime-w3m-preview-text/html): Bind w3m-treat-image-size
-	to avoid inserting excessive newlines.
-
-2005-09-18  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
-
-	* w3m.el (w3m-relationship-estimate-rules): Add a rule for Google Blog
-	Search.
-
-	* w3m-search.el (w3m-search-engine-alist): Use
-	`http://blogsearch.google.com/' instead of `http://search.blogger.com/'
-	for "blog-*" search, because search.blogger.com does not have a
-	explicit link to previous search result page.
-
-2005-09-16  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-redisplay-this-page): Use the cache always.
-
-2005-09-15  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
-
-	* w3m-search.el (w3m-search-engine-alist): Add "blog-*" entries.
-
-2005-09-02  TAKAHASHI Kaoru  <kaoru@kaisei.org>
-
-	* doc/ptexinfmt.el: Support @frenchspacing, @euro, @sansserif.
-	(texinfo-format-ordf): Fix typo.
-
-2005-09-01  Hiroshi Fujishima  <hiroshi.fujishima@gmail.com>
-
-	* w3m-search.el (w3m-search-engine-alist): Update goo-ja, waei, eiwa,
-	kokugo URL.
-
-2005-08-29  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-ucs.el: Enable XEmacs 21.5-Mule to compile it anyway.
-
-2005-08-29  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-fontify-anchors): Put the encoded anchor names instead of
-	the itself.
-
-2005-08-01  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* octet.el (octet-insert-buffer): Use insert-buffer-substring instead
-	of insert-buffer.
-
-	* w3m-bookmark.el (w3m-about-bookmark): Ditto.
-
-	* w3m-proc.el (w3m-process-sentinel): Ditto.
-
-2005-07-29  Kevin Rodgers  <kevin.rodgers@ihs.com>
-
-	* w3m.el (w3m-content-type-alist): Add the text/sgml entry.
-
-2005-07-29  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-scroll-up-1): New function.
-	(w3m-lynx-like-map): Use it for the J command.
-	(w3m-scroll-up-or-next-url): Use it.
-
-2005-07-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-current-message): New internal variable.
-	(w3m-message): Use the above variable to keep the last displayed
-	message, to decide that this function can override the current message
-	in the echo area.
-	(w3m-make-help-echo): Use `message' instead of `w3m-message' to clear
-	the echo area in the foreground context.
-	(w3m-quit): Ditto.
-	(w3m-goto-ftp-url): Ditto.
-	(w3m-select-buffer-show-this-line-and-switch): Ditto.
-
-	* w3m-proc.el (w3m-process-background): New internal variable.
-	(w3m-process-sentinel): Set t to the above variable.
-
-2005-07-13  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-message): Bury messages when the cursor in the echo area
-	which is used by `y-or-n-p' etc.
-	(w3m-view-parent-page): Refer both `start' link element and `content'
-	start element before checking a parent URL.
-
-2005-07-11  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bookmark.el (w3m-bookmark-menu-dummy-item): Remove.
-	(w3m-bookmark-menubar-dummy): Remove.
-	(w3m-bookmark-menu-items): Also define the menu for the case where
-	w3m-bookmark-mode is turned on.
-	(w3m-setup-bookmark-menu): Rewrite it so as to work properly with Emacs
-	22.
-	(w3m-bookmark-menubar-update): Ditto; remove the iswitchb section.
-	(w3m-bookmark-make-menu-items): Return nil if there's no bookmark.
-
-	* w3m-tabmenu.el (w3m-tab-menubar-dummy): Remove.
-	(w3m-setup-tab-menu): Rewrite it so as to work properly with Emacs 22.
-	(w3m-tab-menubar-update): Ditto; remove the iswitchb section.
-
-2005-07-11  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-bookmark.el (w3m-bookmark-buffer): Disable undo before modify the
-	buffer.
-	(w3m-bookmark-menu-items-pre): New variable.
-	(w3m-bookmark-menu-items-time): Ditto.
-	(w3m-bookmark-make-menu-items): Use previous items if it available.
-
-2005-07-09  Tsuyoshi CHO  <tsuyoshi_cho@yahoo.co.jp>
-
-	* w3m-xmas.el (top): Add `w3m-setup-bookmark-menu' to autoload list at
-	compiled time.
-	(w3m-setup-menu): Append bookmark menu setup calling.
-
-	* w3m-bookmark.el (top): Add requirement `easymenu' and
-	`easy-menu-remove-item' autoload at compiled time.
-	(w3m-bookmark-menu-open-new-session): Add new customize variable.
-	(w3m-bookmark-menu-dummy-item): Add new const variable.
-	(w3m-bookmark-menubar-dummy): Ditto.
-	(w3m-bookmark-menu-items): Ditto, Define Bookmark const menu items.
-	(w3m-setup-bookmark-menu): Add new autoload function.
-	(w3m-bookmark-menubar-update): Add new function.
-	(w3m-bookmark-iterator): Ditto.
-	(w3m-bookmark-menu-open-item): Ditto.
-	(w3m-bookmark-make-menu-items): Ditto.
-
-	* w3m.el (top): Add `w3m-setup-bookmark-menu' to autoload list at
-	compiled time.
-	(w3m-menubar): Remove "Bookmark" menu item.
-
-2005-07-08  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-print-current-url): Bind deactivate-mark.
-	(w3m-print-this-url): Ditto.
-
-2005-07-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-check-current-position): Bind deactivate-mark.  (cf.
-	http://news.gmane.org/group/gmane.emacs.pretest.bugs/thread=8335).
-
-2005-07-05  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
-
-	* ChangeLog: Add file local variables to set fill-column 74 and
-	indent-tabs-mode t.
-
-2005-07-03  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
-
-	* w3m-search.el (w3m-search-engine-alist): Add "technorati-*" entries.
-
-2005-07-01  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el (w3m-which-command): Make sure the command is not a
-	directory.  cf. <URL:http://emacs-w3m.namazu.org/ml/msg08113.html>.
-
-2005-06-26  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
-
-	* w3m.el (w3m-relationship-estimate-rules): Add a rule for Yahoo Search
-	Beta.
-
-2005-06-26  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
-
-	* w3m.el (w3m-relationship-estimate-rules): Improve regexp for Google
-	in order to make the scroll-to-next-page feature work on Google News as
-	well.
-
-2005-06-26  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
-	    TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-search.el (w3m-search-engine-alist): Add Yahoo Beta.
-
-2005-06-18  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
-
-	* w3m-search.el (w3m-search-engine-alist): Search Google News in US by
-	"google news-en".
-
-2005-06-17  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
-
-	* w3m-search.el (w3m-search-engine-alist): Add "google news" entry.
-
-2005-06-13  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* aclocal.m4 (AC_PATH_EMACS): Check whether XEmacs works with the shy
-	group regexp and runs call-process-region correctly.
-
-	* w3m-perldoc.el (w3m-about-perldoc): Don't relieve buggy XEmacs 21.5
-	for call-process-region.
-
-	* w3m-xmas.el (w3m-fix-gif): Ditto.
-	(w3m-initialize-graphic-icons): Ditto.
-
-	* w3m.el (w3m-decode-encoded-contents): Ditto.
-	(w3m-x-moe-decode-buffer): Ditto.
-	(w3m-rendering-half-dump): Ditto.
-
-	* w3mhack.el: Advise byte-optimize-form-code-walker to avoid the
-	``...called for effect'' warnings for Emacs 21.4 as well as 21.3; don't
-	relieve buggy XEmacs 21.5 for call-process-region.
-
-2005-06-10  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	Make emacs-w3m not support the XEmacs versions older than 21.4.17
-	or 21.5-b19.
-
-	* aclocal.m4 (AC_PATH_EMACS): Check whether XEmacs runs the timer
-	functions correctly.
-
-	* w3m-util.el (w3m-cancel-refresh-timer): Use delete-itimer instead of
-	cancel-timer under XEmacs.
-
-	* w3m-xmas.el (call-process-region): Don't advise it.
-	(w3m-run-at-time): Remove.
-
-	* w3m.el (w3m-refresh-at-time): Use run-at-time instead of
-	w3m-run-at-time.
-
-	* w3mhack.el (w3mhack-byte-optimize-letX): Doc fix.
-
-2005-06-09  Tsuyoshi CHO  <tsuyoshi_cho@ybb.ne.jp>
-
-	* w3m.el: Update my mail address.
-
-2005-06-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-antenna.el (w3m-antenna-mapcar): Remove unused temp var.
-
-	* w3m-bookmark.el (w3m-bookmark-buffer): Remove
-	file-coding-system-for-read.
-
-	* w3m-form.el (w3m-form-input-textarea-save): Remove
-	file-coding-system.
-	(w3m-form-input-textarea): Ditto.
-
-	* w3m-image.el (w3m-imagick-convert-buffer): Remove file-coding-system.
-	(w3m-imagick-start-convert-buffer): Remove file-coding-system and
-	jam-zcat-filename-list.
-
-	* w3m.el (w3m-load-list): Remove file-coding-system-for-read.
-	(w3m-save-list): Remove file-coding-system.
-	(w3m-local-retrieve): Remove file-coding-system-for-read and
-	jam-zcat-filename-list.
-	(w3m-download): Remove file-coding-system and jam-zcat-filename-list.
-	(w3m-copy-buffer): Remove unused temp var.
-
-	* w3mhack.el (w3mhack-byte-optimize-letX): Remove file-coding-system,
-	file-coding-system-for-read and pathname-coding-system.
-
-2005-06-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el (w3m-replace-in-string): Don't use eval-and-compile.
-	(w3m-compare-strings): Ditto.
-	(w3m-force-window-update): Alias to ignore if it is not defined.
-	(w3m-force-window-update-later): New function.
-
-	* w3m-favicon.el (w3m-favicon-retrieve): Use
-	w3m-force-window-update-later.
-
-	* w3m-proc.el (w3m-process-stop): Use w3m-force-window-update-later.
-
-	* w3m.el (w3m-retrieve-and-render): Use w3m-force-window-update-later.
-	(w3m-select-buffer-show-this-line): Always run w3m-force-window-update.
-
-2005-06-09  Masatake YAMATO  <jet@gyve.org>
-
-	* w3m-e21.el (w3m-initialize-graphic-icons): Highlight icon under
-	mouse.
-
-2005-06-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el (w3m-tab-mouse-face): New face.
-	(w3m-setup-header-line): Use highlight face for bg color.
-	(w3m-tab-line): Use w3m-tab-mouse-face.
-
-2005-06-08  Masatake YAMATO  <jet@gyve.org>
-
-	* w3m-e21.el (w3m-setup-header-line): Highlight url under mouse.
-	(w3m-tab-line): Highlight tab under mouse.
-
-2005-05-30  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el (w3m-run-mode-hooks): New function.
-
-	* w3m-form.el (w3m-form-input-select-mode): Use it.
-	(w3m-form-input-map-mode): Use it.
-
-	* w3m.el (w3m-mode): Use it.
-
-2005-05-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el (w3m-truncate-string): Autoload mule-util for
-	truncate-string-to-width.
-
-2005-05-26  Yoichi NAKAYAMA  <yoichi@geiin.org>
-
-	* w3m.el (w3m-safe-view-this-url): `unsecure' -> `insecure'.
-	(w3m-safe-toggle-inline-image): Ditto.
-	(w3m-safe-toggle-inline-images): Ditto.
-
-2005-05-20  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-menubar): Add the "Close Other Sessions" button.
-	(w3m-delete-other-buffers): Run w3m-force-window-update.
-
-2005-05-18  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* attic/vm-w3m.el (vm-w3m): Provide the feature.
-
-	* attic/vm-7.19.patch: New file.
-
-2005-05-12  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-open-all-links-in-new-session): Fix regexp.
-
-2005-05-11  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bookmark.el (w3m-about-bookmark): Use shy group in regexp.
-
-	* w3m-cookie.el (w3m-cookie-two-dot-domains-regexp): Ditto.
-	(w3m-cookie-set): Ditto.
-
-	* w3m-dtree.el (w3m-dtree-directory-name): Ditto.
-	(w3m-about-dtree): Ditto.
-
-	* w3m-favicon.el (w3m-favicon-setup): Ditto.
-
-	* w3m-namazu.el (w3m-about-namazu): Ditto.
-
-	* w3m-proc.el (w3m-process-filter): Ditto.
-
-	* w3m-rss.el (w3m-rss-parse-date-string): Ditto.
-
-	* w3m-util.el (w3m-html-string-regexp): Remove useless quotes.
-	(w3m-parse-attributes): Don't use old fashioned backquotes; use shy
-	group in regexp.
-	(w3m-url-authinfo-regexp): Use shy group in regexp.
-
-	* w3m-weather.el (w3m-weather-completion-table): Ditto.
-	(w3m-weather-area-completion): Ditto.
-
-	* w3m-xmas.el (w3m-fix-gif): Ditto.
-
-	* w3m.el: Use shy group in regexp when examining w3m-command.
-	(w3m-content-type-alist): Use shy group in regexp.
-	(w3m-show-decoded-url): Ditto.
-	(w3m-add-referer): Ditto.
-	(w3m-relationship-estimate-rules): Ditto.
-	(w3m-arrived-ignored-regexp): Ditto.
-	(w3m-history-ignored-regexp): Ditto.
-	(w3m-url-to-file-name): Ditto.
-	(w3m-fontify-strike-through): Ditto.
-	(w3m-fontify): Ditto.
-	(w3m-url-completion): Ditto.
-	(w3m-gmane-url-at-point): Ditto.
-	(w3m-cache-header-delete-variable-part): Ditto.
-	(w3m-cache-available-p): Ditto.
-	(w3m-decode-buffer): Ditto.
-	(w3m-local-dirlist-cgi): Ditto.
-	(w3m-w3m-canonicalize-url): Ditto.
-	(w3m-additional-command-arguments): Ditto.
-	(w3m-download): Ditto.
-	(w3m-check-header-tags): Ditto.
-	(w3m-retrieve-and-render): Ditto.
-	(w3m-create-text-page): Ditto.
-	(w3m-view-this-url): Ditto.
-	(w3m-open-all-links-in-new-session): Ditto.
-	(w3m-external-view-file): Ditto.
-	(w3m-edit-url): Ditto.
-	(w3m-convert-ftp-url-for-emacsen): Ditto.
-	(w3m-goto-url): Ditto.
-	(w3m-goto-url-new-session): Ditto.
-	(w3m-about-db-history): Ditto.
-	(w3m-history-highlight-current-url): Ditto.
-
-	* w3mhack.el: Fix the section adding dirs to load-path.
-	(w3mhack-make-package): Use shy group in regexp.
-	(w3mhack-makeinfo): Ditto.
-
-2005-05-10  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* Makefile.in (clean): Don't remove w3m-kwds.el.
-	(.el.elc): Use batch-byte-compile instead of w3mhack-batch-compile.
-	(very-slow): Don't run keywords.
-	(keywords): Remove.
-
-	* aclocal.m4 (AC_PATH_EMACS): Don't support Emacs 19 and 20.
-	(AC_PATH_LISPDIR): Follow the change of the EMACS_FLAVOR value.
-	(AC_PATH_ICONDIR): Ditto.
-	(AC_CHECK_ELISP): Remove.
-	(AC_CHECK_XML): Remove.
-
-	* configure.in: Don't check for regexp-opt; don't run AC_CHECK_XML.
-
-	* mime-w3m.el (mime-w3m-mode-map): Remove.
-	(mime-w3m-local-map-property): Remove.
-	(mime-w3m-preview-text/html): Don't use it.
-
-	* octet.el (octet-decode-image): Ignore Emacs 19 and 20.
-
-	* w3m-bitmap.el: Remove.
-
-	* w3m-bookmark.el (w3m-bookmark-sections): Use point-at-eol.
-	(w3m-bookmark-safe-string): Don't support Mule 2.3.
-	(w3m-bookmark-current-number): Use point-at-eol.
-	(w3m-bookmark-kill-entries): Use point-at-bol.
-
-	* w3m-bug.el: Don't require w3m-om or w3m-e19.
-
-	* w3m-ccl.el: Don't require w3m-om.
-
-	* w3m-e19.el: Remove.
-
-	* w3m-e20.el: Remove.
-
-	* w3m-hist.el: Don't load w3m-kwds.el.
-
-	* w3m-lnum.el (w3m-link-numbering): Don't support Emacs 20.
-
-	* w3m-om.el: Remove.
-
-	* w3m-proc.el: Don't require w3m-om or w3m-e19.
-
-	* w3m-search.el (w3m-search-read-query): Use point-at-bol.
-
-	* w3m-ucs.el: Ignore Emacs 20.
-
-	* w3m-util.el: Don't load w3m-kwds.el; don't support Emacs 19.
-	(w3m-use-tab-p): Ignore Emacs 19 and 20.
-	(w3m-popup-window-p): Ditto.
-	(w3m-add-w3m-initial-frames): Don't support Emacs 19.
-	(after-make-frame-hook): Don't use it.
-	(delete-frame): Don't advise it for Emacs 19 or 20.
-	(w3m-truncate-string): Don't support Emacs 19 and 20.
-	(w3m-default-face-colors): Remove.
-	(w3m-replace-in-string): Don't support Emacs 19 and 20.
-
-	* w3m-xmas.el (w3m-should-unoptimize-animated-gifs): Default to always
-	t.
-	(w3m-make-glyph): Use string-to-number instead of string-to-int.
-
-	* w3m.el: Don't require w3m-e20, w3m-om or w3m-e19.
-	(emacs-w3m-version): Reset to 1.4.50.
-	(w3m-language): Ignore Mule 2.3.
-	(w3m-history-current-url-face): Don't require wid-edit.
-	(w3m-bold-face): Don't use w3m-default-face-colors.
-	(w3m-underline-face): Ditto.
-	(w3m-strike-through-face): Ditto.
-	(w3m-use-symbol): Ignore Emacs 19 and 20.
-	(w3m-show-decoded-url): Ditto.
-	(w3m-use-tab): Doc fix.
-	(w3m-entity-alist): Don't support Mule 2.3.
-	(w3m-make-help-echo): Ignore Emacs version.
-	(w3m-toggle-inline-images-internal): Ignore bitmap images.
-	(w3m-resize-inline-image-internal): Don't support Emacs 19 and 20.
-	(w3m-url-at-point): Always use ffap.
-	(w3m-about-retrieve): Consider base64 codec is always available.
-	(w3m-close-window): Don't support Emacs 19 and 20.
-	(w3m-store-current-position): Use point-at-bol and point-at-eol.
-	(w3m-buffer-setup): Ditto.
-	(w3m-make-separator): Don't support Mule 2.3.
-	(w3m-select-buffer-current-buffer): Use point-at-bol.
-	(w3m-header-line-insert): Don't support Emacs 19 and 20.
-
-	* w3mhack.el: Consider w3mhack-batch-compile is not used.
-	(locate-library): Don't redefine it for Emacs 19.
-	(APEL): Don't check for it for Emacs.
-	(w3mhack-colon-keywords-file): Remove.
-	(w3mhack-module-list): Ignore Emacs 19, 20, old XEmacsen and
-	BITMAP-MULE.
-	(w3mhack-shimbun-modules-using-rss): Remove.
-	(current-column): Don't take care of it for old Emacsen.
-	(w3mhack-compile): Don't run w3mhack-check-colon-keywords-file.
-	(w3mhack-batch-compile): Remove.
-	(w3mhack-nonunix-install): Ignore Emacs 19 and 20.
-	(custom-declare-variable): Don't take care of it for Emacs 19.
-	(locate-library): Ditto.
-	(w3mhack-generate-colon-keywords-file): Remove.
-	(w3mhack-check-colon-keywords-file): Remove.
-	(w3mhack-load-path): Ignore Emacs 19, 20 and old XEmacsen.
-	(w3mhack-makeinfo): Ignore Mule 2.3.
-
-	* attic/regexp-opt.el: Remove.
-
-	* attic/xml.el: Remove.
-
-	* patches/mule-2.3@19.34.patch: Remove.
-
-2005-04-20  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-remove-invisible-image-alt): New function.
-	(w3m-rendering-buffer): Use it.
-
-2005-04-13  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-decode-buffer): Decode "\240" into "&nbsp;".
-
-2005-04-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-decode-buffer): Decode `&#nnn;' entities in 128..159.
-
-2005-04-07  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-detect-xml-charset): Return nil if the data don't look
-	like xml contents.
-	(w3m-compatible-encoding-alist): New variable.
-	(w3m-decode-buffer): Always use w3m-detect-xml-charset; use a
-	compatible encoding according to w3m-compatible-encoding-alist.
-
-	* w3m-xmas.el (w3m-find-coding-system): Don't return binary for the nil
-	argument.
-
-
-2005-03-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* Release emacs-w3m-1.4.4 from emacs-w3m-1_4 branch.
-
-2005-03-23  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-setup-toolbar): Make sure icon files exist.
-	(w3m-update-toolbar): Make sure toolbar items have been specified.
-	(w3m-initialize-graphic-icons): Make sure icon files exist.
-
-	* w3m-e21.el (w3m-setup-toolbar): Make sure icon files exist.
-	(w3m-initialize-graphic-icons): Ditto.
-
-2005-03-23  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Makefile.in (tarball): Remove `w3m-e23.el' instead of `w3m-e22.el'.
-
-	* w3m.el (w3m-url-readable-string): Decide a scheme to guess encodings
-	based on the target URL, instead of the current URL.
-	(w3m-show-decoded-url): Doc fix to follow the above change.
-	(w3m-copy-buffer): Do not set `w3m-current-url' and
-	`w3m-current-coding-system'.
-	(w3m-goto-url-new-session): Simplified.
-
-2005-03-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el (display-images-p): Remove alias.
-
-2005-03-18  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* Makefile.in (very-slow): Don't mv non-existent files.
-
-	* w3m-e19.el (easy-menu-remove-item): Don't autoload it.
-
-	* w3m-om.el (easy-menu-remove-item): Ditto.
-
-	* w3m-rss.el (match-string-no-properties): Avoid warning for Emacs 19
-	and XEmacs.
-	(split-string): Avoid warning for Emacs 19.
-
-	* w3m-symbol.el: Require cl when compiling.
-
-	* w3m-tabmenu.el (easy-menu-remove-item): Aautoload it for Emacs 19.
-
-	* w3m.el: Autoload widget-get to avoid compile warning for Emacs 19.
-	(w3m): Remove unused bound variable.
-
-	* w3mhack.el: Bind executable-binary-suffixes to the proper value for
-	OS/2 and emx while checking for the shell command; cause an error only
-	when compiling or formatting files.
-
-	* attic/addpath.el: Make it work with old Emacsen even if cl is not
-	loaded; load custom, bind defcustom'ed variables and make the
-	locate-library function run quietly for Emacs 19; synch the code
-	testing the shell command with w3mhack.el.
-	(char-after): Add a byte-optimizer for Emacs 19.
-
-	* w3m-ccl.el: Load w3m-om instead of autoloading it for charset-id.
-
-	* w3m-util.el: Load cl independently when compiling.
-
-2005-03-18  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el: Check whether the shell command can be used.
-
-	* attic/addpath.el: Ditto; add early-package-load-path to load-path for
-	XEmacs 21.5.
-
-2005-03-17  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-favicon.el: Add autoload of `w3m-url-readable-string'.
-
-2005-03-17  Tsuyoshi CHO  <tsuyoshi_cho@ybb.ne.jp>
-
-	* w3m.el (w3m-check-header-tags): Check abnormal `base' url.
-
-2005-03-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el: Add early-package-load-path to load-path for XEmacs 21.5.
-
-	* w3m-xmas.el: Fbind coding-system-type to ignore if it is void.
-
-2005-03-15  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-form.el (w3m-form-mee-new): Display clear signs of coding-system
-	for `w3m-url-decode-string'.
-	(w3m-form-mee-select-value): Ditto.
-	(w3m-form-parse-and-fontify): Ditto.
-
-	* w3m.el (w3m-decode-buffer): Decode the buffer within buffer set the
-	`multibyte'.
-
-2005-03-13  MIYOSHI Masanori  <miyoshi@meadowy.org>
-
-	* doc/emacs-w3m-ja.texi (Sport Sites Supported by Shimbun): Update.
-
-	* doc/emacs-w3m.texi (Sport Sites Supported by Shimbun): Ditto.
-
-2005-03-12  MIYOSHI Masanori  <miyoshi@meadowy.org>
-
-	* doc/emacs-w3m-ja.texi (Sport Sites Supported by Shimbun): Update.
-
-	* doc/emacs-w3m.texi (Sport Sites Supported by Shimbun): Ditto.
-
-2005-03-10  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el: Load w3m-e23.el(c) that exists in the same directory as
-	w3m.el(c) so as to exclude ones in other places; report the precise
-	error message if it doesn't exist.
-
-2005-03-10  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-decode-coding-string-with-priority): Ignore
-	`undecided' so as not to use it for the priority list.
-
-2005-03-10  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-fsf.el (w3m-detect-coding-region): Guard error for `undecided'.
-
-2005-03-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el: Remove the byte-optimizer which replaces truncate-string
-	with truncate-string-to-width.
-
-2005-03-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-modeline-title): Replace truncate-string-to-width with
-	w3m-truncate-string.
-
-	* w3m-util.el (w3m-truncate-string): Use truncate-string-to-width if it
-	is available.
-
-2005-03-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-info-like-map): Bind the `y' key to the
-	w3m-print-current-url command; bind the `Y' key to the
-	w3m-print-this-url command; don't bind the `c' key.
-
-2005-03-04  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-make-help-echo): Fix the backquote form.
-	(w3m-make-balloon-help): Ditto.
-
-	* w3m-util.el (w3m-set-match-data): Use existing markers.
-
-2005-03-04  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-url-readable-string): Save matching data.  Check whether
-	`w3m-current-url' is string before checking it.
-	(w3m-goto-url-new-session, w3m-copy-buffer): Call `w3m-goto-url' with
-	`redisplay' option to enforce redisplaying the certain content.
-
-	* w3m-favicon.el (w3m-favicon-retrieve): Decode an URL when displaying
-	it.
-
-	* w3m-form.el (w3m-form-input-textarea-mode-setup): An expression is
-	evaluated without checking type, and save matching data.
-
-2005-03-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-url-readable-string): Check whether
-	`w3m-current-coding-system' is valid before calling
-	`w3m-url-decode-string'.
-	(w3m-local-dirlist-cgi, w3m-w3m-dump-extra): Use
-	`w3m-url-readable-string'.
-	(w3m-copy-buffer): Copy all buffer-local variables, and do not cancel
-	them even if `empty' option is set.
-	(w3m-display-progress-message): Import from w3m-util.el to suppress
-	byte-compile warnings.
-
-	* w3m-util.el (w3m-parse-attributes): Accept XHTML format of boolean
-	atttibutes.
-	(w3m-display-progress-message): Export to w3m.el.
-
-2005-03-03  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-url-readable-string): An expression is evaluated without
-	checking type.
-
-2005-03-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-show-decoded-url): Update its customize spec to use it as
-	the rule set to decode URIs when displaying them.  Changed its default
-	value.
-	(w3m-url-readable-string): New function to process the above option.
-	(w3m-make-help-echo, w3m-make-balloon-help): Do not accept `url-decode'
-	option, and use the above function to decore URIs.
-	(w3m-fontify-anchors): Follow the above change.
-	(w3m-print-current-url, w3m-print-this-url): Call the above function.
-	(w3m-make-url-decode-function): Removed.
-	(w3m-entity-alist, w3m-about-history): Remove redundant `function'.
-	For more detail, see http://www.mew.org/~kazu/doc/elisp/function.html.
-
-2005-03-03  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-modeline-title-string): New variable.
-	(w3m-modeline-title-timer): New variable.
-	(w3m-modeline-title): New function used to truncate the title string
-	not to cut the right end of the mode line.  Works only with Emacs 22
-	and newer.
-	(w3m-buffer-setup): Use it.
-
-2005-03-03  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-make-help-echo): Make it work with XEmacs.
-	(w3m-make-balloon-help): Support decoding URIs.
-	(w3m-fontify-anchors): Make the balloon-help show decoded URIs.
-
-2005-03-02  ARISAWA Akihiro  <ari@mbf.ocn.ne.jp>
-
-	* w3m.el (w3m-show-decoded-url): New user option.
-	(w3m-make-url-decode-function): New inline function.
-	(w3m-make-help-echo): Use it.
-	(w3m-fontify-anchors): The function of help-echo property has an
-	ability to decode url.
-
-2005-03-01  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-decode-coding-string-with-priority): New function.
-
-	* w3m.el (w3m-url-decode-string): Use it.
-
-2005-03-01  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-w3m-attributes-1): Support `300 Multiple Choices'.
-	(w3m-w3m-retrieve): Ditto.
-	(w3m-w3m-retrieve-1): Ditto.
-
-2005-02-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-detect-coding-region): Use the name of the coding
-	system instead of the coding category if it is void.
-
-	* w3m-util.el (w3m-set-match-data): New macro which converts points
-	into markers under XEmacs.
-	(w3m-search-tag-1): Use it.
-
-	* w3m-e19.el: Autoload easymenu in order to avoid compile warning.
-	* w3m-om.el: Ditto.
-
-2005-02-25  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (all): Use `w3m-form-set-number' and `w3m-form-kill-buffer'
-	instead of `w3m-form-textarea-set-number' and
-	`w3m-form-textarea-kill-buffer'
-
-	* w3m-form.el (w3m-form-input-select-urlid): New buffer local variable.
-	(w3m-form-input-map-urlname): Ditto.
-	(w3m-form-set-number): Rename from `w3m-form-textarea-set-number' and
-	treate buffers of `select' and `map'.
-	(w3m-form-kill-buffer): Ditto.
-	(w3m-form-input-select-set): Allways remove own buffer.
-	(w3m-form-input-select-exit): Ditto.
-	(w3m-form-input-map-set): Ditto.
-	(w3m-form-input-map-exit): Ditto.
-	(w3m-form-input-select): When exists same from buffer, use it.
-	(w3m-form-input-map): Ditto.
-
-2005-02-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-what-where): Fix the form.
-	(w3mhack-makeinfo): Silence it when formatting @multitable section.
-
-2005-02-25  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (top): Add autoloads of `w3m-form-textarea-kill-buffer' and
-	`w3m-form-textarea-set-number' to avoid byte-compile warnings.
-	(w3m-delete-buffer): Call `w3m-form-textarea-kill-buffer' when use
-	form.
-	(w3m-delete-other-buffers): Ditto.
-	(w3m-quit): Ditto.
-	(w3m-select-buffer-delete-buffer): Ditto.
-	(w3m-pack-buffer-numbers): Call `w3m-form-textarea-set-number' when use
-	form.
-
-	* w3m-form.el (top): Move all buffer local variables on the top to
-	avoid byte-compile warnings.
-	(w3m-form-parse-and-fontify): Set `w3m-form-use-textarea-backup-p' to
-	nil.
-	(w3m-form-input-textarea-save): Use `w3m-form-use-textarea-backup-p'
-	instead of `w3m-form-use-textarea-backup'.
-	(w3m-form-input-textarea-set): Allways remove textarea buffer and
-	window.
-	(w3m-form-input-textarea-exit): Ditto.
-	(w3m-form-input-textarea): Check to call for backup. Check identity of
-	existed textarea buffer and w3m buffer. Treat
-	`w3m-form-use-textarea-backup-p'.
-	(w3m-form-use-textarea-backup-p): New function.
-	(w3m-form-textarea-set-number): Ditto.
-	(w3m-form-textarea-kill-buffer): Ditto.
-	(w3m-form-submit-get-textarea-files): If no backup, return nil.
-
-2005-02-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el: Autoload cancel-timer for XEmacs.
-
-	* w3m-xmas.el (w3m-run-at-time): Use run-at-time which comes from
-	timer-funcs.el if it seems to work correctly.
-	(cancel-timer): Defun if it is void.
-
-2005-02-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* doc/ptexinfmt.el (texinfo-multitable-widths): Reverse the logic that
-	shows whether it is broken.
-
-	* w3m-util.el: Autoload regexp-opt for Emacs 19.
-
-	* w3mhack.el (w3mhack-makeinfo): Load poe for Emacs 19.
-
-2005-02-24  Romain Francoise  <romain@orebokech.com>
-
-	* w3m.el (w3m-lynx-like-map): Bind [follow-link] so as to make mouse-1
-	work in Emacs 22 like mouse-2.
-	(w3m-info-like-map): Ditto.
-
-2005-02-23  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-antenna.el (w3m-antenna-check-rss): Parse all date fields.
-
-2005-02-21  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-form.el (w3m-form-input-textarea): Fix.
-
-2005-02-21  Tsuyoshi CHO  <tsuyoshi_cho@ybb.ne.jp>,
-	Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-form.el (w3m-form-input-textarea-mode-setup): Fix.
-	(w3m-form-input-textarea): Follow the above change.
-
-2005-02-21  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-form.el (w3m-form-textarea-edit-mode): Changed its default value
-	to `text-mode'.
-
-2005-02-21  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* Makefile.in (install-package): Change the default directory in which
-	icon files will be installed from `etc/w3m/icons/' into
-	`etc/images/w3m/' following the most recent Emacs and Gnus.
-	(install-package-ja): Ditto.
-
-	* aclocal.m4 (AC_EXAMINE_PACKAGEDIR): Use configure-package-path.
-	(AC_PATH_ICONDIR): Change the default directory in which icon files
-	will be installed from `etc/w3m/icons/' into `etc/images/w3m/'
-	following the most recent Emacs and Gnus.
-
-	* w3m.el (w3m-icon-directory): Improve the way to determin the default
-	value.
-
-	* w3mhack.el (w3mhack-nonunix-install): Change the default directory in
-	which icon files will be installed from `etc/w3m/icons/' into
-	`etc/images/w3m/' following the most recent Emacs and Gnus.
-	(w3mhack-make-package): Ditto.
-	(w3mhack-what-where): Ditto.
-
-2005-02-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-lnum.el: Rename from w3m-link-numbering.el.
-
-	* mime-w3m.el: Load mime-parse.el before mime.el and w3m.el when
-	compiling rather than always loading mime.el and w3m.el.
-
-2005-02-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-form.el: Changes to define `w3m-form-input-textarea-mode' as a
-	minor mode.
-	(w3m-form-textarea-edit-mode): New option.
-	(w3m-form-input-textarea-map): Renamed from
-	`w3m-form-input-textarea-keymap'.
-	(w3m-form-input-textarea-mode) [variable]: New internal variable.
-	(w3m-form-input-textarea-mode) [function]: Reconstructed.
-	(w3m-form-input-textarea-mode-setup): New function.
-	(w3m-form-input-textarea): Clean up.
-
-2005-02-15  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* aclocal.m4 (AC_PATH_EMACS): Show the correct Emacs version.
-
-	* mime-w3m.el: Always require mime and w3m instead of to autoload
-	mime-parse.el.
-
-	* w3m-bitmap.el: Bind w3m-work-buffer-list when compiling.
-
-	* w3m-proc.el: Silence the byte compiler complaining against gensym.
-
-	* w3m-rss.el: Use eval-and-compile in order to autoload timezone.el.
-
-	* w3m.el (w3m-treat-drive-letter): Use eval-and-compile.
-	(w3m-touch-file-available-p): Move forward.
-	(w3m-touch-file): Ditto.
-	(w3m-expand-path-name): Use eval-and-compile.
-	(w3m-window-hscroll): Ditto.
-	(w3m-current-column): Ditto.
-	(w3m-set-window-hscroll): Ditto.
-	(w3m-add-local-hook): Silence the byte compiler.
-	(w3m-run-at-time): Use eval-and-compile.
-
-	* w3mhack.el: Remove the code used to silence the byte compiler which
-	complains make-local-hook is obsolete.
-	(w3mhack-makeinfo): Silence XEmacs when formatting Infos.
-
-	* octet.el: Require cl when compiling.
-	* w3m-filter.el: Ditto.
-	* w3m-fsf.el: Ditto.
-	* w3m-link-numbering.el: Ditto.
-	* w3m-namazu.el: Ditto.
-
-2005-02-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el: Load w3m-e23.el for Emacs 23.
-
-	* w3mhack.el (w3mhack-module-list): Use w3m-e23.el for Emacs 23.
-
-	* w3m-e23.el: Rename from w3m-e22.el.
-
-2005-02-10  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el: Load w3m-e21.el even if the version of Emacs is 22.x when the
-	Emacs CVS HEAD is used.
-
-	* w3mhack.el (w3mhack-module-list): Prefer w3m-e21.el rather than
-	w3m-e22.el if the Emacs CVS HEAD is used.
-
-2005-02-06  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-antenna.el (w3m-antenna-html-skelton): Fix typo.
-	(w3m-antenna-make-contents): Replace %D to the modified time of
-	`w3m-antenna-file'.
-
-2005-02-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-gmane-url-at-point): New function.
-	(w3m-url-at-point): Use it.
-
-2005-01-30  Yoichi NAKAYAMA  <yoichi@geiin.org>
-
-	* w3m.el (w3m-attributes): Support cid urls.
-	(w3m-external-view): Ditto.
-
-2005-01-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el (w3m-force-window-update): Make it work whatever the value
-	for the resize-mini-windows variable is.
-	(w3m-update-tab-line): Ditto.
-
-2005-01-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-rss.el (w3m-rss-parse-date-string): Support the date format in
-	the RFC822 style which RSS 2.0 allows.  Suggested by David Hansen
-	<david.hansen@physik.fu-berlin.de>.
-
-2005-01-23  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-e21.el (w3m-force-window-update, w3m-update-tab-line): Call
-	`enlarge-window' before calling `shrink-window', in order to avoid
-	deleting sole window.
-
-2005-01-19  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-content-type-alist): Check if "fiber.exe" is exist.
-
-2005-01-17  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-form.el (w3m-form-parse-and-fontify): Check if w3m-current-url is
-	available.
-
-2004-07-24  Tsuyoshi CHO  <mfalcon_sky@emailuser.net>
-
-	* w3m.el (w3m-menubar): Rearrange it hierarchical.
-	(w3m-setup-menu): Use easymenu.
-
-2005-01-10  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-form.el (w3m-form-input-textarea): Modify string of the inquiry.
-
-2005-01-07  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-goto-url): Call `w3m-form-textarea-files-remove' if
-	necessary.
-
-	* w3m-util.el (w3m-compare-strings): New define.
-
-	* w3m-form.el (w3m-form-textarea-file-expire-date): Modify Document.
-	(w3m-fontify-textareas): Put `w3m-form-file-name' property.
-	(w3m-form-textarea-files, w3m-form-textarea-post-files): New buffer
-	local variable.
-	(w3m-form-parse-and-fontify): Set `w3m-form-textarea-files'. Put
-	`w3m-form-file-name' property on the form of textarea.
-	(w3m-form-input-textarea): Use same textarea buffer if exist.  Don't
-	ask user if don't modify its area without tailed white space.  Visible
-	the editted text when ask user. Guard against 'C-g'.  Added
-	`w3m-form-textarea-file-cleanup' to hook as `kill-emacs-hook'
-	(w3m-form-textarea-same-check): New function.
-	(w3m-form-textarea-file-cleanup): Remove myself from `kill-emacs-hook'.
-	(w3m-form-textarea-files-remove): New function.
-	(w3m-form-submit-get-textarea-files): Ditto.
-	(w3m-form-submit): Set `w3m-form-textarea-post-files' for removing
-	files.
-	(w3m-form-resume): Check `selects' is cons.
-
-2005-01-05  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* doc/Makefile.in (.texi.info): Set LC_ALL=C.
-
-2004-12-29  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-quit): Call `w3m-form-textarea-file-cleanup'.
-	(w3m-view-this-url-1): Revert final change.
-
-	* w3m-form.el (w3m-form-textarea-file-expire-date): New user option.
-	(w3m-form-textarea-file-cleanup): New function.
-
-2004-12-28  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-form.el (w3m-form-use-textarea-backup): New user option.
-	(w3m-form-textarea-directory): Ditto.
-	(w3m-form-get-coding-system): New function.
-	(w3m-form-make-form-data): Use `w3m-form-get-coding-system'.
-	(w3m-form-input-textarea-keymap): Define "C-xC-s" to
-	`w3m-form-input-textarea-save'.
-	(w3m-form-input-textarea-file): New variable.
-	(w3m-form-input-textarea-coding-system): Ditto.
-	(w3m-form-input-textarea-filename): New function.
-	(w3m-form-input-textarea-save): Ditto.
-	(w3m-form-input-textarea-set): Call `w3m-form-input-textarea-save'.
-	(w3m-form-input-textarea-exit): Ditto.
-	(w3m-form-input-textarea-mode): Modify doc-string.
-	(w3m-form-input-textarea): Handling filename and coding-system.
-
-2004-12-27  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-view-this-url-1): Revert 2004-12-17 change.  The buffer
-	seems empty killed before to restore window configuration.  Restore the
-	position and window-start if last window equal current-window.
-
-2004-12-24  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-hist.el (w3m-history-restore-position): Handling the window of
-	w3m for sure absolutely.
-
-2004-12-23  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-makeinfo): Revert.
-
-2004-12-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-makeinfo): Bind undo-outer-limit.
-
-2004-12-17  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-fontify-anchors): Local file is given special treatment
-	for `href'. Fix match data of `href'.
-	(w3m-view-this-url-1): If the points of window was treated in
-	w3m-goto-url(), now reconstruct window configuration.
-
-2004-12-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el (w3m-update-tab-line): Wobble the window size instead of
-	setting the cursor color.
-
-2004-12-15  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-namazu.el (w3m-namazu): Added optional argument `reload'.
-
-2004-12-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el (w3m-tag-regexp-of): Remove.
-	(w3m-search-tag-1): New function.
-	(w3m-search-tag): New macro.
-
-	* w3m-form.el (w3m-form-parse-and-fontify): Use w3m-search-tag instead
-	of w3m-tag-regexp-of.
-
-2004-12-10  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-fontify-anchors): Use 'w3m-name-anchor2 property to avoid
-	overriding 'w3m-name-anchor property.
-	(w3m-search-name-anchor): Search 'w3m-name-anchor2 property if not
-	detect 'w3m-name-anchor property.
-
-2004-12-03  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-form.el (w3m-form-parse-and-fontify): Ignore a select form in the
-	case where w3mmee is running if its value is not specified.  Reported
-	by Clemens Fischer <ino-qc@spotteswoode.de.eu.org>.
-
-	* w3mhack.el (labels): Remove.
-
-2004-11-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (labels): A temporary substitution against the Emacs CVS
-	bug.
-
-2004-11-26  TSUCHIYA Masatoshi  <tsuchiya@pine.kuee.kyoto-u.ac.jp>
-
-	* w3m-form.el (w3m-form-resume): Check whether a form exists, before
-	resuming its values from its history.
-
-2004-11-21  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-rss.el: New file.
-
-	* w3m-antenna.el (w3m-antenna-check-rss): New function.
-	(w3m-antenna-sites): Improve its customize spec to support
-	`w3m-antenna-check-rss'.
-
-	* w3m.el (w3m-content-type-alist): Add text/xml, application/xml,
-	application/rdf+xml, and application/rss+xml.
-	(w3m-detect-xml-charset): New function.
-	(w3m-decode-buffer): Use the above function when decoding XML contents.
-
-2004-11-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-redisplay-this-page): Don't make a new history.
-
-2004-11-17  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-output-coding-system): Use `utf-8' if Emacs has internal
-	utf-8 only.
-	(w3m-input-coding-system): Revert last change.
-	(w3m-halfdump-command-arguments): Bind `fix_width_conv' and
-	`use_jisx0201' when w3m-m17n.
-
-2004-11-16  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-input-coding-system): Use `utf-8' if Emacs has internal
-	utf-8, it has no Mule-UCS and w3m-type is `w3m-m17n'.
-
-2004-11-15  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-form.el (w3m-char-to-int, w3m-string-to-char-list,
-	w3m-int-to-char): Silence byte-compiler.
-	* w3m-ccl.el (charset-id): Ditto.
-
-	* w3m-tabmenu.el (w3m-tab-menubar-update): Don't let iswitchb manage
-	the w3m tab menubar.
-
-2004-10-27  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-check-refresh-attribute): Support own page reload.
-	(w3m-goto-url-with-timer): Ditto.
-
-2004-10-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* aclocal.m4 (AC_ADD_LOAD_PATH): Clarify the error message.
-
-2004-10-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (call-process-region): Add an advice in order to fix an
-	XEmacs 21.5.18 bug.
-	* w3mhack.el (call-process-region): Ditto.
-
-2004-10-25  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-check-refresh-attribute): Fix to analyze the URL.
-
-2004-10-21  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-touch-file): Protect against the absence of
-	file-name-coding-system and default-file-name-coding-system.
-
-2004-10-20  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-buffer-setup): Modify `mode-line-buffer-identification';
-	display "Loading..." instead of `w3m-current-titile' when process of
-	w3m active.
-
-2004-10-16  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-touch-file): Use `set-file-times' if available; bind
-	`coding-system-for-write' while calling `w3m-touch-command'.
-
-2004-10-08  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-perldoc.el (w3m-perldoc-input-coding-system)
-	(w3m-perldoc-output-coding-system): New options.
-	(w3m-about-perldoc): Use the above options, to display both modules
-	encoded in EUC-JP and ones encoded in UTF-8 correctly.
-
-2004-10-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el (w3m-tab-line): Replace "%" with "%%" in
-	w3m-tab-line-format.
-
-2004-10-07  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-retrieve): Add autoload cookie.
-
-2004-10-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-search.el (w3m-search-engine-alist): Add the parameter
-	`ie=Shift_JIS' to Google for Japanese users.
-
-2004-09-21  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-antenna.el (w3m-about-antenna): Revert 2004-09-16 change.
-
-2004-09-16  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-antenna.el (w3m-about-antenna): Change the method to compare an
-	arrived time to a last-modified time.
-
-2004-09-07  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-goto-url): Don't make a new history when reloading.
-	(w3m-reload-this-page): Ditto.
-
-	* w3m-hist.el (w3m-history-restore-position): Don't cause an error even
-	if a page has shrunk.
-
-
-2004-08-17  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Release emacs-w3m-1.4.3 from emacs-w3m-1_4 branch.
-
-2004-08-15  Kazuhiro UCHIDA  <kayoujin@yahoo.co.jp>
-
-	* w3m.el (w3m-remove-meta-charset-tags): Check that a content field has
-	a valid value before parsing it.
-
-2004-08-12  Romain Francoise  <romain@orebokech.com>
-
-	* w3m.el (w3m-relationship-estimate-rules): Improve regexp for Google
-	in order to make the scroll-to-next-page feature work on Google Groups
-	as well.
-
-2004-08-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-relationship-estimate-rules): Fix regexp for Google.
-	Suggested by Romain Francoise <romain@orebokech.com>.
-
-2004-08-02  TAKAHASHI Kaoru  <kaoru@kaisei.org>
-
-	* doc/ptexinfmt.el (slanted): Rename @s to @slanted.
-
-2004-07-30  Romain Francoise  <romain@orebokech.com>
-
-	Enable emacs-w3m to be built with Emacs --without-x.
-
-	* w3m-e21.el (image-size): Alias to ignore if it is not available.
-
-	* w3m-favicon.el (w3m-favicon-type): Don't use image-types if it is not
-	available.
-
-	* w3m.el (mouse-set-point): Autoload mouse.elc.
-
-2004-07-20  TAKAHASHI Kaoru  <kaoru@kaisei.org>
-
-	* doc/ptexinfmt.el: Support @s.
-
-
-2004-07-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Release emacs-w3m-1.4.2 from emacs-w3m-1_4 branch.
-
-	* w3m.el (w3m-w3m-canonicalize-url): Revival.
-	(w3m-w3m-attributes, w3m-w3m-retrieve): Call the above.
-	(w3m-canonicalize-url): Do not check a slash.
-
-2004-07-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-detect-meta-charset): Check that a content field has a
-	valid value before parsing it.
-
-2004-07-08  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-	Suggested by Tatsuya Kinoshita <tats@vega.ocn.ne.jp>
-
-	* w3m.el (w3m-correct-charset-alist): Reverse "windows-125x" and
-	"cp125x".
-
-
-2004-07-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Release emacs-w3m-1.4.1 from emacs-w3m-1_4 branch.
-
-2004-07-06  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-weather.el: Reconstructed to follow the change of site design.
-	(w3m-weather-completion-table, w3m-weather-filter-functions): Update.
-	(w3m-weather-extract-contents, w3m-weather-adjust-contents): New
-	functions.
-	(w3m-weather-remove-headers, w3m-weather-remove-footers,
-	w3m-weather-get-seikatu-sisu, w3m-weather-insert-seikatu-sisu):
-	Removed.
-
-2004-06-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-canonicalize-url): Don't make sure arg is a string.
-	(w3m-input-url): Don't use w3m-canonicalize-url for non-string url
-	which may be the symbol popup.
-
-2004-06-25  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-canonicalize-url): New function.
-	(w3m-input-url, w3m-browse-url): Call the above.
-	(w3m-w3m-canonicalize-url): Abolished.
-	(w3m-w3m-attributes, w3m-w3m-retrieve): Do not call the abolished
-	function.
-	(w3m-url-hierarchical-schemes): Add `ftps'.
-
-2004-06-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el (w3m-add-w3m-initial-frames): Share the opened frame in
-	w3m-initial-frames over all emacs-w3m buffers if w3m-use-tab is
-	non-nil.
-	(w3m-delete-w3m-initial-frames): New function; add it to
-	delete-frame-functions or delete-frame-hook, or merge into delete-frame
-	using defadvice.
-	(w3m-delete-frames-and-windows): Return to the former buffer after
-	performing walk-windows; don't manage w3m-initial-frames.
-
-	* w3m.el (w3m-delete-buffer): Don't manage w3m-initial-frames.
-
-2004-06-14  Yoichi NAKAYAMA  <yoichi@geiin.org>
-
-	* w3m.el (TopLevel): Display meaningful message when w3m-command is
-	nil.
-
-2004-06-21  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-fontify): Call `w3m-replace-symbol' before
-	`w3m-fontify-anchors' in order not to lose text properties.
-
-2004-06-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m): Run w3m-mode before popping to the newly created buffer
-	up.
-
-2004-06-12  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-output-coding-system): Change default value for w3m-m17n.
-
-	* w3m-bug.el (report-emacs-w3m-bug-system-informations): Add
-	w3m-input-coding-system and w3m-output-coding-system.
-
-2004-06-11  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-meta-content-type-charset-regexp)
-	(w3m-meta-charset-content-type-regexp)
-	(w3m-meta-refresh-content-regexp)
-	(w3m-meta-content-refresh-regexp): Removed.
-	(w3m-detect-meta-charset, w3m-remove-meta-charset-tags)
-	(w3m-check-refresh-attribute): Use `w3m-parse-attributes' instead of
-	above regexp.
-	(w3m-rendering-buffer): Don't call `w3m-remove-meta-charset-tags' for
-	w3m-m17n.
-
-2004-06-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-make-new-session): Doc fix.
-	(w3m-safe-view-this-url): Use w3m-goto-url-new-session only when a user
-	invokes this command in a buffer not being running the w3m-mode.
-
-2004-06-07  Masatake YAMATO  <jet@gyve.org>
-
-	* w3m-hist.el (w3m-history-store-position): Fix a wrong message.
-
-2004-06-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-filter.el (w3m-filter-rules): Relax the condition.
-
-2004-06-07  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-make-new-session): Doc fix.
-	(w3m-safe-view-this-url): Use w3m-goto-url-new-session instead of
-	w3m-goto-url when w3m-make-new-session is non-nil.
-
-2004-06-04  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-make-new-session): New user option.
-	(w3m): Make a new emacs-w3m buffer if w3m-make-new-session is non-nil
-	and a user specifies a url string.
-
-2004-06-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el (w3m-popup-buffer): Don't use focus-frame in Emacs.
-
-2004-06-01  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-proc.el (w3m-process-wait-discard-input): Abolish.
-	(w3m-process-wait-process): Don't use accept-process-output to make it
-	possible to show progress messages; discard key press events while
-	waiting for finishing of a process.
-
-2004-05-24  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-form.el (w3m-form-put-by-name): Overwrite ID value when a name is
-	found.
-
-2004-05-22  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-fontify): Remove tags in the form element except for
-	textarea.
-
-2004-05-18  Katsumi Yamaoka  <yamaoka@jpl.org>
-	Suggested by Yoichi NAKAYAMA <yoichi@geiin.org>
-
-	* w3m-util.el (w3m-replace-in-string): New function which is a copy of
-	shimbun-replace-in-string.
-	* w3m.el (w3m-active-region-or-url-at-point): Use it; remove all
-	whitespace in region.
-
-2004-05-18  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* mew-w3m.el (mew-w3m-view-inline-image): Bind mew-use-text/html as t.
-
-2004-05-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-home-page): Improve the customizing widget.
-
-2004-05-13  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-expand-url): Bind file-name-handler-alist as nil.
-
-2004-05-13  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-arrived-ignored-regexp): Add about:blank.
-	(w3m-history-ignored-regexp): Ditto.
-	(w3m-about-retrieve): Ditto.
-	(w3m-buffer-setup): Prefer the last visited emacs-w3m buffer.
-
-2004-05-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-filter.el (w3m-filter-rules): Update its default value and its
-	customize spec.
-
-2004-05-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-w3m-dump-extra): Examine image data briefly to detect
-	only gif, jpeg and png by itself.
-
-	* w3m-util.el (w3m-image-type-from-data): Abolish.
-
-2004-05-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-w3m-dump-extra): Check only 300 bytes at the top of the
-	data.
-
-2004-05-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el (w3m-image-type-from-data): New function.  Suggested by
-	KOSEKI Yoshinori <kose@meadowy.org>.
-
-	* w3m.el (w3m-w3m-dump-extra): Use it.
-
-2004-05-11  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-proc.el (w3m-process-start-process): Use
-	set-process-query-on-exit-flag if it is available.
-
-	* w3m.el (w3m-w3m-dump-extra): Trust the magic at the beginning of
-	image data rather than the content-type header.
-
-2004-05-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-copy-buffer): Prefer cached contents without checking
-	their validity.
-
-2004-05-01  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-proc.el (w3m-process-waited): Revival.
-	(w3m-process-with-wait-handler): Set t to the above.
-
-	* w3m.el (w3m-w3m-dump-extra): Check the above.
-
-2004-04-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (emacs-w3m-version): Reset.
-
-
-2004-04-29  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Release emacs-w3m-1.4 from emacs-w3m-1_4 branch.
-
-	* Makefile.in (install-package): Install w3m-load.el.
-	(dist, tarball): Reimplemented, in order to keep time stamps of source
-	files.
-
-	* w3mhack.el (w3mhack-generate-xemacs-load-file): Simplified.
-
-2004-04-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-generate-xemacs-load-file): Replace
-	`replace-string' with basic functions.
-
-2004-04-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3mhack.el (w3mhack-generate-xemacs-load-file): New function.
-	(w3mhack-make-package): Use `w3mhack-generate-xemacs-load-file.
-
-2004-04-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-update-files-autoloads): New function.
-	(w3mhack-generate-load-file): Use `w3mhack-update-files-autoloads'.
-
-2004-04-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Makefile.in (tarball): Remove w3m-kwds.el and w3m-load.el.
-
-	* configure.in, aclocal.m4: Add `--with-xml' option.
-
-	* w3mhack.el (w3mhack-module-list): New function.
-	(w3mhack-examine-modules): Use the above.
-	(w3mhack-compile): Use `w3mhack-module-list' instead of
-	`w3mhack-examine-modules'.
-	(w3mhack-generate-load-file): Likewise; Insert ^L to avoid an error of
-	`update-file-autoloads' of old emacsen.
-
-2004-04-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-treat-image-size): Default to t.
-
-	* w3m-filter.el (w3m-filter-asahi-shimbun): Use marker to limit the
-	search bound.
-
-2004-04-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-generate-load-file): Save w3m-load.el file before
-	performing `update-file-autoloads'.
-
-2004-04-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Makefile.in (install-lisp): Do not install w3mhack.el.
-	(install-package): Install neither w3mhack.el nor w3m-load.el.
-
-2004-04-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-treat-image-size): Default to nil.
-	(w3m-rendering-half-dump): Fix a logic determining whether to specify
-	`-ppl' and `-ppc' options to the w3m command.
-
-2004-04-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3mhack.el: Create w3m-load.el.
-	(w3mhack-load-file): New variable.
-	(w3mhack-examine-modules): Ignore `w3mhack-load-file'.
-	(w3mhack-generate-load-file): New function.
-	(w3mhack-compile): Call the above.
-
-	* .cvsignore: Ignore w3m-load.el.
-
-	* Makefile.in (clean): Remove w3m-load.el.
-
-2004-04-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-expand-path-name): In Emacs, don't bind
-	directory-sep-char which is an obsolete variable.
-
-2004-04-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el, w3m-favicon.el: Move snippets managing
-	`w3m-arrived-setup-functions' and `w3m-arrived-shutdown-functions' from
-	w3m.el into w3m-favicon.el.
-
-2004-04-23  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-antenna.el (w3m-antenna-hns-last-modified): Use 32400 as a
-	correct timezone instead of JST (suggested by YAMAOKA-san).
-
-2004-04-22  Christian Schmitt  <Christian.Schmitt@Dresdner-Bank.com>
-
-	* w3m.el (w3m-expand-path-name): Bind directory-sep-char to `?/'.  It
-	is `?\' by default in XEmacs on Windows (native, not Cygwin).
-
-2004-04-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-use-symbol): Don't activate it in Emacs 20.  Advised by
-	Arisawa-san.
-
-2004-04-21  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Simplify the rule of sending referers.
-	(w3m-add-referer-regexps): Abolished.
-	(w3m-add-referer-predicate-function): Abolished.
-	(w3m-add-referer): New option.
-	(w3m-add-referer-p): New function.
-	(w3m-add-referer-predicate-by-referer-regexps): Removed.
-	(w3m-add-referer-predicate-by-hosts): Removed.
-	(w3m-request-arguments, w3m-header-arguments): Follow the above
-	changes.
-
-2004-04-21  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el (w3m-add-w3m-initial-frames): Get the correct value for
-	the newly created frame in Emacs 19.
-
-	* w3m.el (w3m-about-retrieve): Load base64 for Emacs 19.
-	(w3m-minor-mode-command-alist): Add w3m-print-this-url.
-
-	* w3m-bitmap.el (w3m-bitmap-image-insert): Don't put the evaporate
-	property on empty overlays (revert 2004-04-07 change).
-
-2004-04-20  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-link-numbering.el (w3m-view-numbered-link): Removed.
-	(w3m-move-numbered-anchor): New command.
-	(w3m-link-numbering-mode-map): Use `w3m-move-numbered-anchor' instead
-	of `w3m-view-numbered-link'.
-
-2004-04-19  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-input-coding-system): Use `w3m-output-coding-system' as
-	its default value for w3m-m17n and w3mmee.
-	(w3m-halfdump-command-arguments): Use "-I" option to disable
-	automatic-detection of coding systems for w3m-m17n and w3mmee.
-
-2004-04-16  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-meta-refresh-content-regexp): Allow quoted string as url.
-	(w3m-meta-content-refresh-regexp): Ditto.
-	(w3m-check-refresh-attribute): Decode entities.
-
-2004-04-15  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-link-numbering.el (w3m-link-numbering): Quit when links have
-	already been numbered.
-
-2004-04-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-link-numbering.el (w3m-link-numbering-mode): Delete all overlays
-	that display link numbers, when deactivating.
-
-2004-04-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-link-numbering.el (w3m-link-numbering): Add face to before-string
-	correctly under XEmacs; don't bother to delete overlays (suggested by
-	TSUCHIYA-san).
-
-2004-04-14  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-link-numbering.el (w3m-link-numbering-face): New face.
-	(w3m-link-numbering): Use it.
-
-2004-04-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-link-numbering.el: New file.
-
-	* w3m.el (w3m-browse-url): Load `browse-url' before calling
-	`browse-url-interactive-arg'.
-
-2004-04-12  TAKAHASHI Kaoru  <kaoru@kaisei.org>
-
-	* doc/ptexinfmt.el: Support @indicateurl, @LaTeX, @ordf, @ordm.  @url
-	is now a synonym for @uref.
-
-2004-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-fontify-anchors): No need to enable evaporation of
-	overlays in XEmacs.
-
-2004-04-08  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
-
-	* w3m.el (w3m-delete-all-overlays): Revert.
-	(w3m-highlight-current-anchor): Ditto.
-
-2004-04-07  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-delete-all-overlays): Remove.
-
-2004-04-07  Masatake YAMATO  <jet@gyve.org>
-
-	* w3m-bitmap.el (w3m-bitmap-image-insert): Enable the evaporate
-	property on overlays.
-
-	* w3m-e21.el (w3m-form-make-button): Enable the evaporate property on
-	buttun overlays.
-
-	* w3m.el (w3m-fontify-anchors): Ditto.
-	(w3m-create-text-page): No need to delete zombie overlays.
-	(w3m-create-image-page): Ditto.
-	(w3m-highlight-current-anchor-1): Enable the evaporate property on
-	overlays.
-	(w3m-highlight-current-anchor): No need to delete overlays.
-
-2004-04-07  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-rendering-extract-title): Remove too much whitespace.
-
-2004-04-05  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-delete-all-overlays): Simply delete all overlays if the
-	optional arg is given.
-	(w3m-create-text-page): Delete zombie overlays.
-	(w3m-create-image-page): Ditto.
-
-2004-04-04  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-search.el (w3m-search-engine-alist): Improve custom.
-
-2004-04-04  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-search.el (w3m-search-engine-alist): Add "amazon" entry.
-
-2004-03-31  Yuya Nishida  <yuya@j96.org>
-
-	* w3m-search.el (w3m-search-engine-alist): Add "amazon-ja" entry;
-	"PostData" can be specified.
-	(w3m-search): Support post-data.
-
-2004-04-04  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-header-arguments): Set unibyte at work buffer.
-
-	* w3m-form.el (w3m-form-make-form-data): Set unibyte at work buffer;
-	Encode form data.
-
-2004-03-22  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-type): Check if w3m-compile-options contains "m17n".
-
-2004-03-19  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-add-referer-regexps): Fix typo.
-	(w3m-add-referer-predicate-function): New user option.
-	(w3m-add-referer-predicate-by-referer-regexps): New function.
-	(w3m-add-referer-predicate-by-hosts): Ditto.
-	(w3m-request-arguments): Call w3m-add-referer-predicate-function.
-	(w3m-header-arguments): Ditto.
-
-	* octet.el (mime-view-octet): Avoid redundant invocation of
-	`mime-entity-content'.
-
-2004-03-14  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-symbol.el (w3m-mule-unicode-symbol): Fixed 32th character.
-	Thanks to Taichi KAWABATA for his report.
-
-2004-03-06  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-weather.el (w3m-weather-get-seikatu-sisu): Relax regular
-	expressions to extract indices, to follow the change of the site
-	design.
-
-2004-03-01  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el (w3m-force-window-update): New function.
-	(w3m-tab-drag-mouse-function, w3m-tab-click-mouse-function,
-	w3m-tab-line, w3m-e21-switch-to-buffer, w3m-select-buffer-hook): Use
-	`w3m-force-window-update' instead of `w3m-e21-wobble-window-size'.
-	(w3m-e21-wobble-window-size): Abolish.
-
-	* w3m-favicon.el (w3m-favicon-retrieve): Use `w3m-force-window-update'.
-
-	* w3m-proc.el: Autoload `w3m-force-window-update' when compiling.
-	(w3m-process-stop): Use `w3m-force-window-update'.
-
-	* w3m.el (w3m-select-buffer-show-this-line): Use
-	`w3m-force-window-update'.
-
-
-2004-02-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (emacs-w3m-version): Release 1.3.85.
-
-2004-02-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el (w3m-tab-drag-mouse-function): Call
-	`w3m-e21-wobble-window-size'.
-	(w3m-tab-click-mouse-function): New function.
-	(w3m-tab-make-keymap): Use it.
-
-2004-02-27  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-form.el (w3m-form-mee-new): Use `w3m-form-normalize-action' for
-	action.
-
-2004-02-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-select-buffer-show-this-line): Call
-	`w3m-e21-wobble-window-size' when Emacs 21 or 22 is running.
-
-	* w3m-e21.el (w3m-tab-line-format): Make it buffer-local variable.
-	(w3m-tab-timer): Ditto.
-	(w3m-e21-wobble-window-size): New function.
-	(w3m-tab-line): Make `w3m-tab-timer' hold boolean value; let a timer
-	function run certainly in a buffer in which a timer started; use
-	`w3m-e21-wobble-window-size'.
-	(w3m-e21-switch-to-buffer): New command.
-	(w3m-e21-subst-switch-to-buffer-keys): New function.
-	(w3m-mode-setup-functions): Add `w3m-e21-subst-switch-to-buffer-keys'.
-	(w3m-select-buffer-hook): Add `w3m-e21-wobble-window-size'.
-	(w3m-spinner-image-index): Make it buffer-local variable.
-
-2004-02-25  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-form.el (w3m-form-make-form-data): Align form by the number of
-	`hseq'.
-
-2004-02-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-antenna.el (w3m-antenna-sites): Add
-	`w3m-antenna-check-another-page' to its customize spec.
-	(w3m-antenna-check-another-page): New function.
-	(w3m-about-antenna): Relaxed the condition to check changed sites.
-	(w3m-antenna-add): Add a new site at the end of `w3m-antenna-sites'
-	instead of adding it at the top.
-
-2004-02-20  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-antenna.el (w3m-antenna-function): New widget.
-	(w3m-antenna-sites): Use it.
-
-2004-02-20  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-expand-path-name): Protect expand-file-name from
-	cygwin-mount.el's behavior on Windows.
-
-	* w3m-antenna.el (w3m-about-antenna): Check arrived-time if no
-	last-modified.
-
-2004-02-20  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-antenna.el (w3m-antenna-sites): Fix mis-implemented customizing
-	widgets in Emacs 20.7 through 21.3 and XEmacs.
-	(w3m-antenna-add): Support Emacs 20.
-
-	* w3m-util.el (widget-default-get): Remove advice.
-
-2004-02-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el (widget-default-get): Advise the function to fix a bug in
-	Emacs 21.1 through 21.3.
-
-2004-02-17  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-form.el (w3m-form-resume): Fix for checkbox.
-
-2004-02-11  TAKAHASHI Kaoru  <kaoru@kaisei.org>
-
-	* doc/ptexinfmt.el: Support @docbook, @ifdocbook, @ifnotdocbook, and
-	@registeredsymbol.
-
-2004-02-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-active-region-or-url-at-point): Move the point backward
-	from the end of the active region instead of moving it forward, in
-	order to avoid enlarging the region.
-
-2004-02-10  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-active-region-or-url-at-point): Find a url-like string in
-	the region instead of extracting the whole substring when the region is
-	active.  Don't use `w3m-url-at-point' for that since it doesn't work
-	for all url string.
-	(w3m-quit): Delete frames seemingly fast.
-
-2004-02-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-favicon.el (w3m-favicon-retrieve): Because some broken servers
-	provide empty contents as their favicons, check the length of the
-	retrieved content, before calling `w3m-favicon-convert'.
-
-2004-02-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Changes to validate cached contents.
-	(w3m-follow-cache-control-header): Abolished.
-	(w3m-prefer-cache): New option.
-	(w3m-cache-available-p): Check whether a cached header includes cache
-	control headers.
-	(w3m-w3m-dump-extra): Always cache both a header and a content.
-	(w3m-w3m-retrieve-1): Check whether a cache is available, before using
-	it.
-	(w3m-view-this-url): When visiting history pages, prefer cached
-	contents without checking their validity.
-	(w3m-view-previous-page, w3m-view-source, w3m-view-header): Prefer
-	cached contents without checking their validity.
-
-2004-02-05  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-show-error-information): Decode cache contents if
-	necessary.
-
-2004-02-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-edit-url): Define as a command.
-
-2004-02-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-examine-modules): Exclude w3m-e22.el except for
-	Emacs 22.
-
-2004-01-31  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-edit-function-alist): New option.
-	(w3m-edit-url): Refer the above alist to find a suitable function for
-	editing a specified page.
-	(w3m-edit-function, w3m-edit-current-url): Its docstring is modified to
-	follow the above change.
-	(w3m-edit-this-url): Its docstring is modified likewise, and it is
-	simplified.
-	(w3m-goto-url): Ignore cached form data when reloading.
-
-	* w3m.el (w3m-safe-view-this-url): Call `w3m-goto-url' when a function
-	set to `w3m-goto-article-function' returns nil.
-
-2004-01-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Changes to follow anchors that point Shimbun articles.
-	(w3m-goto-article-function): New variable.
-	(w3m-safe-view-this-url): Refer the above.
-
-2004-01-29  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-follow-cache-control-header): New option.
-	(w3m-w3m-dump-extra): If `w3m-follow-cache-control-header' is nil, do
-	not follow the chache control headers.
-
-2004-01-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Makefile.in (tarball): Because Emacs-22 has not been released, remove
-	w3m-e22.el from the creating tarball.
-
-2004-01-27  Taichi KAWABATA  <batta@beige.ocn.ne.jp>
-
-	* w3m-e22.el: New file.  This file is simply the copy of w3m-e21.el
-	except that the ccl section has been removed.
-
-	* w3m.el: Require w3m-e22 when Emacs 22 is running.
-
-2004-01-26  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-after-cursor-move-hook): Add :group keyword.
-	(w3m-auto-show): Check `truncate-lines' before scrolling.
-	(w3m-check-current-position): Do not check `truncate-lines'.
-
-	* mime-w3m.el: Changes to display URI of the current anchor.
-	(mime-w3m-after-cursor-move-hook): New option.
-	(mime-w3m-add-local-hook): New advice.
-	(mime-w3m-check-current-position): New funcion.
-
-2004-01-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-proc.el (w3m-process-start-and-wait): Abolished.
-	(w3m-process-with-wait-handler): Reimplemented.
-
-	* w3m.el (w3m-input-url): Accept other symbols than `popup'.
-	(w3m-copy-buffer): Fix the bug that drops an asynchronous handler
-	returned by `w3m-goto-url'.
-
-2004-01-23  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-goto-url): Register a url to the history even if it is
-	failed to retrieve.  Suggested by Fujishima-san.
-
-2004-01-23  Hiroshi Fujishima  <pooh@nature.tsukuba.ac.jp>
-
-	* w3m.el (w3m-input-url): Fix a bug which causes an error when there's
-	neither a frame nor a window for the emacs-w3m session and `url' is the
-	symbol `popup' (it is because there's a url-like text around the cursor
-	but deleted by a user in the minibuffer).
-
-2004-01-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-input-url): Add "http://" to its return value, when its
-	return value contains no scheme part.
-
-2004-01-18  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-w3m-dump-extra): Check cache control headers before
-	caching headers and contents.  This change is suggested by Mr. Amagai
-	in [emacs-w3m:06255].
-	(w3m-message): Make it verbose, even if a buffer related to emacs-w3m
-	is not displayed.  w3m-print-this-url() has been broken in buffers
-	displaying text/html messages, because w3m-message() was too silent.
-
-2004-01-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-safe-view-this-url): Bind `w3m-pop-up-windows' to nil
-	locally, in order to keep MUA's window configuration.
-
-	* w3m-proc.el (w3m-process-do-with-temp-buffer): Save the current
-	buffer while executing an asynchronous body.
-
-	* w3m-util.el (w3m-insert-string): Define its `edebug-form-spec'.
-
-2004-01-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-util.el (w3m-keep-region-active): Renamed from
-	`w3m-activate-zmacs-regions'.
-	(w3m-deactivate-region): Declared as a macro.
-
-	* w3m-search.el (w3m-search-read-query): Call `w3m-deactivate-region'
-	instead of `w3m-deactivate-mark'; Call `region-beginning' and
-	`region-end' instead of `point' and `mark'.
-
-	* w3m.el (w3m-next-anchor, w3m-previous-anchor, w3m-next-form,
-	w3m-previous-form, w3m-next-image, w3m-previous-image,
-	w3m-scroll-up-or-next-url, w3m-scroll-down-or-previous-url,
-	w3m-beginning-of-line, w3m-end-of-line): Call `w3m-keep-region-active'
-	instead of `w3m-activate-zmacs-regions'.
-	(w3m-active-region-or-url-at-point): Call `region-beginning' and
-	`region-end' instead of `point' and `mark'.
-
-2004-01-07  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-proc.el (w3m-process-wait-discard-input): New variable.
-	(w3m-process-wait-process): If `w3m-process-wait-discard-input' is
-	non-nil, call `discard-input'.
-
-2004-01-05  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el (w3m-deactivate-mark): New function alias.
-
-	* w3m.el (w3m-active-region-or-url-at-point): Use it.
-	(w3m-open-all-links-in-new-session): Use it.
-
-	* w3m-search.el (w3m-search-read-query): Use it.
-
-2004-01-04  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-active-region-or-url-at-point): New function.
-	(w3m-input-url, w3m-view-this-url, w3m-goto-url): Call
-	`w3m-active-region-or-url-at-point' instead of `w3m-url-at-point'.
-
-2004-01-04  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-util.el (w3m-region-active-p): New macro.
-
-	* w3m.el (w3m-open-all-links-in-new-session): Deactivate the mark when
-	it is active.
-	(w3m-view-this-url-new-session): Use `w3m-region-active-p'.
-
-	* w3m-search.el (w3m-search-read-query): Use `w3m-region-active-p'.
-
-	* w3m-namazu.el (w3m-namazu): Use `w3m-search-read-query' to read a
-	query from the minibuffer.
-
-	* w3m-search.el (w3m-search-read-query): New function.
-	(w3m-search): Use the above function.
-
-2004-01-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-search.el (w3m-search): Use the region as an initial string if
-	Transient Mark mode.
-	(w3m-search-word-at-point): Follow the above change in its docstring.
-
-	* w3m-e21.el (w3m-tab-line): Check the length of the current title,
-	before checking the breadth of its first character.
-
-2003-12-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-accept-languages): Split the option of w3m with a comma
-	surrounded by some spaces.
-	(w3m-dump-head-source-command-arguments): Use a comma instead of a
-	white space to concatenate elements of `w3m-accept-languages'.
-	Cf. Section 14.4 of RFC2047.
-
-2003-12-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el: Add an advice to byte-optimize-form-code-walker to avoid
-	the warning ``...called for effect'' for the pop form when running
-	Emacs 21.3.
-
-2003-12-26  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-create-text-page): Use the last directory as a title of
-	text/plain page when its uri is terminated by a slash.
-
-
-2003-12-26  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (emacs-w3m-version): Release 1.3.80.
-
-2003-12-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-proc.el (w3m-process-wait-process): Return exit status; Use
-	`accept-process-output' instead of `sit-for' in order to flush pending
-	output.
-	(w3m-process-with-wait-handler): Follow the above change.
-
-2003-12-21  Masatake YAMATO  <jet@gyve.org>
-
-	* w3m.el (w3m-mode): Small doc fix.
-	(w3m-relationship-estimate-rules): Relax the regular expression to
-	detect result pages of Google.
-
-2003-12-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-safe-toggle-inline-image): New function.
-	(w3m-toggle-inline-images): Revoke the recent changes.
-	(w3m-safe-toggle-inline-images): New function.
-	(w3m-safe-view-this-url): Doc fix.
-	(w3m-minor-mode-command-alist): Use `w3m-safe-toggle-inline-image' and
-	`w3m-safe-toggle-inline-images'.
-
-	* w3m-util.el (w3m-find-w3m-buffer): Abolish.
-	(w3m-with-w3m-buffer): Abolish.
-
-	* mew-w3m.el (mew-w3m-view-inline-image): Revert.
-
-	* attic/vm-w3m.el (vm-w3m-safe-toggle-inline-images): New function.
-
-2003-12-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-toggle-inline-images): Ignore `w3m-safe-url-regexp' when
-	the prefix argument is given.
-
-	* w3m-util.el (w3m-find-w3m-buffer): Bind `w3m-safe-url-regexp' to the
-	value specified peculiarly by each MUA.
-	(w3m-with-w3m-buffer): Ditto.
-
-	* mew-w3m.el (mew-w3m-view-inline-image): Don't bind
-	`w3m-safe-url-regexp' there.
-
-2003-12-19  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* mew-w3m.el (mew-w3m-view-inline-image): Fix last change.
-
-2003-12-18  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* mew-w3m.el (mew-w3m-view-inline-image): Use
-	`w3m-toggle-inline-images'.
-	(mew-mime-text/html-w3m): Put the `w3m-images' text property in the
-	message buffer.
-
-	* w3m-util.el (w3m-find-w3m-buffer): Fix for Mew.
-
-2003-12-18  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-toggle-inline-images): Wrap it with
-	`w3m-with-w3m-buffer'.
-
-	* w3m-util.el (w3m-find-w3m-buffer): New function.
-	(w3m-with-w3m-buffer): New macro.
-
-2003-12-13  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-antenna.el (w3m-antenna-string): Renamed from
-	`string-with-default'.
-	(w3m-antenna-string-create): Renamed from
-	`string-with-default-value-create'.
-	(w3m-antenna-sites): Change its customize spec.
-
-	* w3m-xmas.el (w3m-window-hscroll, w3m-current-column,
-	w3m-set-window-hscroll): Import definitions from w3m.el.
-	(w3m-run-at-time): Renamed from `w3m-xmas-run-at-time'.
-
-	* w3m.el (w3m-window-hscroll, w3m-current-column,
-	w3m-set-window-hscroll): Export definitions for XEmacs to w3m-xmas.el.
-
-2003-12-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* aclocal.m4 (AC_SET_VANILLA_FLAG): New function specifying the
-	`VANILLA_FLAG' variavle.  XEmacs 21.5 needs to be given `-vanilla'
-	rather than `-q -no-site-file'.
-	(AC_EMACS_LISP): Use `VANILLA_FLAG'.
-	(AC_PATH_EMACS): Call `AC_SET_VANILLA_FLAG'.
-	(AC_ADD_LOAD_PATH): Use `VANILLA_FLAG'.
-	(AC_CHECK_ELISP): Ditto.
-
-	* configure.in: Check for `EGREP' before calling `AC_PATH_EMACS'.
-
-	* Makefile.in (VANILLA_FLAG): New variable.
-	(FLAGS): Use it.
-	(very-slow): Use it.
-
-	* doc/Makefile.in (VANILLA_FLAG): New variable.
-	(FLAGS): Use it.
-
-	* w3m-xmas.el (w3m-xmas-run-at-time): Use a simple function definition
-	if there is not a bug in `start-itimer'.
-
-2003-12-11  KAMO Tomoyuki <kamo@ITmanage.co.jp>
-
-	* octet.el (octet-suffix-type-alist): Add suffix of bzip-ed files.
-	(octet-type-filter-alist): Add an entry of bzip2.
-	(octet-guess-type-from-name): Relax the regular expression to detect
-	suffix, in order to handle bzip-ed files.
-
-2003-12-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Experimentally implement the estimation layer of
-	relationships between pages.
-	(w3m-relationship-estimate-rules): New option.
-	(w3m-relationship-estimate, w3m-relationship-simple-estimate,
-	w3m-relationship-magicpoint-estimate,
-	w3m-relationship-search-patterns): New functions.
-	(w3m-use-filter): Cancel the last change; its default value is changed
-	to nil.
-
-	* w3m-filter.el (w3m-filter-rules): Remove rules to find relationships.
-	(w3m-filter-find-relationships): Abolished.
-
-	* w3m-util.el (w3m-html-string-regexp): Import from w3m.el.
-
-2003-12-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-use-filter): Change its default value to t.
-
-	* w3m-filter.el: Reconstructed completely.
-	(w3m-filter-rules): Change its spec and its default value.
-	(w3m-filter): Reimplemented.
-	(w3m-filter-delete-regions, w3m-filter-find-relationships): New
-	functions.
-	(w3m-filter-db, w3m-filter-db-size, w3m-filter-server-regexp,
-	w3m-filter-setup, w3m-filter-delete-region, w3m-filter-lwn.net,
-	w3m-filter-google.com, w3m-filter-www.zdnet.co.jp): Removed.
-
-2003-12-10  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-xmas-run-at-time): Rewrite w/o using fsf-compat.
-
-	* w3m.el (w3m-run-at-time): New function alias.
-	(w3m-refresh-at-time): Use it.
-
-2003-12-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-xmas-run-at-time): New function.
-
-	* w3m.el (w3m-refresh-at-time): Use it.
-
-2003-12-04  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-view-this-url-new-session): Abolish the optional arg.
-	(w3m-mouse-view-this-url-new-session): Ditto.
-
-2003-12-03  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-buffer-setup): Use `defun' instead of `defsubst'.
-
-2003-12-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-current-anchor-face): Replace backquote with quote.
-	(w3m-select-buffer-current-buffer): Ditto.
-	(w3m-header-line-insert): Ditto.
-	(w3m-about-retrieve): Use `defun' instead of `defsubst'.
-	(w3m-cid-retrieve): Ditto.
-	(w3m-current-column): Make it a function, not a macro.
-
-2003-11-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-minor-mode): Run hooks only when this minor mode is
-	enabled.
-	* w3m-bookmark.el (w3m-bookmark-mode): Ditto.
-	* w3m-antenna.el (w3m-antenna-mode): Ditto.
-
-	* w3m-antenna.el (w3m-antenna-alist): Simplified.
-
-2003-11-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-antenna.el: Define a new minor mode `w3m-antenna-mode'.
-	(w3m-antenna-mode-map, w3m-antenna-mode): New variables.
-	(w3m-antenna-mode, w3m-antenna-mode-setter, w3m-antenna-edit): New
-	functions.
-
-	* w3m-bookmark.el (w3m-bookmark-mode): Change its interactive spec, and
-	improve its document.
-
-	* w3m-favicon.el (w3m-favicon-retrieve): Abolish the 4th argument
-	`handler' and wrap the asynchronous processing forms with
-	`w3m-process-with-null-handler', in order to clarify this function's
-	purpose.
-
-	* w3m.el (w3m-message): Use `walk-windows' instead of `window-list',
-	because the latter is not available at Meadow and Mule2.
-	(w3m-w3m-retrieve): Check the status code.
-	(w3m-show-error-information): Also use retrieved error pages.
-	(w3m-minor-mode): Change its interactive spec.
-
-2003-11-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-favicon.el (w3m-favicon-convert): Make sure data of the ico type
-	contains the correct magic numbers.
-
-2003-11-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-util.el (w3m-last-visited-buffer): Abolished.
-	(w3m-popup-buffer): Do not reset the above variable.
-
-	* w3m.el (w3m-close-window): Do not set the above variable.
-	(w3m): Do not refer the above variable.
-
-2003-11-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-retrieve-and-render): Use `w3m-message' instead of
-	`message'; don't let it be controlled by `w3m-verbose'.
-	(w3m-alive-p): Don't sort the return value of `list-buffers' so that it
-	returns the last visited emacs-w3m buffer as much as possible; don't
-	inline the `w3m-list-buffers' function.
-
-2003-11-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-verbose): Change its default value to nil.
-	(w3m-message): When `w3m-verbose' is nil, display messages without
-	logging.
-	(w3m-make-help-echo, w3m-toggle-inline-image, w3m-zoom-in-image,
-	w3m-zoom-out-image, w3m-view-this-url, w3m-submit-form, w3m-view-image,
-	w3m-save-image, w3m-view-url-with-external-browser,
-	w3m-download-this-url, w3m-print-this-url, w3m-edit-current-url,
-	w3m-edit-this-url, w3m-quit, w3m-goto-ftp-url, w3m-select-buffer,
-	w3m-select-buffer-show-this-line,
-	w3m-select-buffer-show-this-line-and-switch): Call `w3m-message'
-	instead of `w3m-display-message'.
-
-	* w3m-util.el (w3m-display-message): Removed.
-	(w3m-display-message-enable-logging): Abolished.
-
-2003-11-26  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-message): Silent when the cursor is in minibuffer.
-
-	* w3m-util.el (w3m-display-message): Ditto.
-
-2003-11-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-html-string-regexp): Fix my fault; enclose it with
-	`eval-and-compile' which is needed for compiling since it is used in a
-	macro.
-
-2003-11-25  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-proc.el (w3m-process-wait-process): Invert the return value of
-	sit-for() that waits an asynchronous process.
-	(w3m-process-kill-process): Relax the condition that checks whether a
-	given process has already finished or not.
-
-2003-11-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-search.el (w3m-search): Use `w3m-goto-url' instead of `w3m'.
-	* w3m-weather.el (w3m-weather): Ditto.
-
-	* w3m.el (w3m-obey-w3m-pop-up-frames): Abolish.
-	(w3m-goto-url-new-session): Find an existing emacs-w3m buffer and then
-	make a copy of it; use `w3m-goto-url' instead of `w3m' if there is no
-	emacs-w3m buffer.
-	(w3m-browse-url): Revert last change; rename the optional arg to
-	`new-session'; call `w3m-goto-url-new-session' or `w3m-goto-url'.
-	(w3m-select-buffer): Use `w3m-goto-url' instead of `w3m'.
-	(w3m-safe-view-this-url): Ditto.
-
-2003-11-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-antenna.el (w3m-antenna): Don't pass the interactive flag to
-	`w3m-goto-url'.
-	* w3m-bookmark.el (w3m-bookmark-view): Ditto.
-	* w3m-cookie.el (w3m-cookie): Ditto.
-	* w3m-dtree.el (w3m-dtree): Ditto.
-	* w3m-namazu.el (w3m-namazu): Ditto.
-	* w3m-perldoc.el (w3m-perldoc): Ditto.
-
-	* w3m.el (w3m-copy-buffer): Don't pop up a window or a frame if
-	`w3m-goto-url' is called.
-	(w3m-goto-url): Abolish the 8th arg `interactive-p'; pop up a window or
-	a frame anyway.
-	(w3m-goto-url-new-session): Abolish the `interactive-p' argument; don't
-	pass it to `w3m-goto-url'.
-	(w3m-gohome): Ditto.
-	(w3m): Don't pop up a window or a frame there.
-	(w3m-browse-url): Make it work as `browse-url-w3'.
-
-2003-11-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-proc.el (w3m-process-wait-process): Don't specify 3 args to
-	`sit-for' for XEmacs.
-
-2003-11-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-antenna.el (w3m-antenna-sites): Change its default value.  Allow
-	a list that consists of a function and its options, as the third
-	element of each site.
-	(w3m-antenna-html-skeleton): Remove the link to the antenna editor.
-	(w3m-antenna-setup): Removed.
-	(w3m-antenna-shutdown): Removed.
-	(w3m-antenna-alist): New function.
-	(w3m-antenna-site-update): Ditto.
-	(w3m-antenna-check-hns): Ditto.
-	(w3m-antenna-check-anchor): Ditto.
-	(w3m-antenna-check-page): Ditto.
-	(w3m-antenna-check-site): Use the above three functions.
-	(w3m-antenna-check-all-sites): Follow the above change.  Use
-	w3m-antenna-alist() and w3m-save-list() instead of w3m-antenna-setup()
-	and w3m-antenna-shutdown().
-	(w3m-antenna-check-site-after): Removed.
-	(w3m-antenna-make-summary): Use a key attribute instead of an url
-	attribute, when the latter is not set.
-	(w3m-antenna-make-summary-like-natsumican): Ditto.
-	(w3m-about-antenna): Call w3m-antenna-alist() instead of
-	w3m-load-list().
-	(w3m-about-antenna-edit): Removed.
-	(w3m-antenna-edit-reset-post-data): Ditto.
-
-2003-11-21  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-antenna.el (w3m-antenna): Pass the interactive flag to
-	`w3m-goto-url'.
-	* w3m-bookmark.el (w3m-bookmark-view): Ditto.
-	* w3m-cookie.el (w3m-cookie): Ditto.
-	* w3m-dtree.el (w3m-dtree): Ditto.
-	* w3m-namazu.el (w3m-namazu): Ditto.
-	* w3m-perldoc.el (w3m-perldoc): Ditto.
-	* w3m.el (w3m-gohome): Ditto.
-	(w3m-browse-url): Ditto.
-
-2003-11-21  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-rendering-half-dump): Move point to the end of the region
-	in order to avoid a bug of `call-process-region' in XEmacs 21.5.7+ (see
-	the comment).
-	(w3m-decode-encoded-contents): Ditto.
-	(w3m-x-moe-decode-buffer): Ditto.
-
-	* w3m-perldoc.el (w3m-about-perldoc): Ditto.
-
-	* w3m-xmas.el (w3m-initialize-graphic-icons): Ditto.
-
-	* w3m-favicon.el (w3m-favicon-retrieve): Say "no favicon" if it is not
-	available.
-
-	* w3m-proc.el (w3m-process-with-environment): Rely on the
-	`temp-directory' function and modify TEMP and TMPDIR env vars for
-	XEmacs.
-
-2003-11-20  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-form.el (w3m-form-normalize-action): New inline function.
-	(w3m-form-parse-and-fontify): Use it.
-	(w3m-form-new): Simply set action.
-	(w3m-form-submit): Don't treat !CURRENT_URL! here.
-
-2003-11-20  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* aclocal.m4 (AC_ADD_LOAD_PATH): Refine the help message for the
-	--with-attic option.
-
-2003-11-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-buffer-setup): Make sure that `truncate-lines' is t.
-	(w3m-view-source): Don't set `truncate-lines' to nil when quitting
-	viewing a source.
-	(w3m-view-header): Set `truncate-lines' to nil when viewing a header.
-
-2003-11-18  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-form.el (w3m-form-put-by-name): New function.
-	(w3m-form-resume): Use w3m-form-get-by-name and w3m-form-put-by-name
-	instead of w3m-form-get and w3m-form-put for radio buttons.
-	(w3m-form-parse-and-fontify): Ditto.
-	(w3m-form-input-radio): Ditto.
-
-2003-11-18  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-check-current-position): Don't allow horizontal scrolling
-	when `truncate-lines' is nil.
-	(w3m-view-source): Set `truncate-lines' to nil.
-
-	* w3m-favicon.el (w3m-favicon-setup): Retrieve favicon even when
-	viewing the header or the page source.
-
-2003-11-18  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* Makefile.in (very-slow): Fix echo messages.
-
-	* w3m.el (w3m-follow-redirection): Fix customization type.
-
-	* w3m-e21.el: Bind `w3m-current-title' when compiling.
-
-	* /: Bind `w3m-work-buffer-list' when compiling in: w3m-e21.el,
-	w3m-favicon.el, w3m-image.el, w3m-proc.el and w3m-xmas.el.
-
-	* /: Require `cl' when compiling in: w3m-cookie.el, w3m-form.el and
-	w3m-tabmenu.el.
-
-	* /: Remove unused non-global variables in: octet.el, w3m-cookie.el,
-	w3m-tabmenu.el and w3m-weather.el.
-
-2003-11-17  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-goto-url): Make `w3m-local-find-file-function' don't
-	handle directories.
-
-2003-11-17  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el: Bind `w3m-current-process', `w3m-pop-up-frames',
-	`w3m-pop-up-windows', `w3m-popup-frame-parameters',
-	`w3m-select-buffer-name' and `w3m-use-tab', and fbind
-	`select-frame-set-input-focus' when compiling.
-	(w3m-popup-frame-parameters): Move from w3m.el.
-	(w3m-popup-frame-p): Ditto.
-	(w3m-use-tab-p): Ditto.
-	(w3m-popup-window-p): Ditto.
-	(w3m-initial-frames): Ditto.
-	(w3m-last-visited-buffer): Ditto.
-	(w3m-popup-buffer): Ditto; also move the program to make
-	`select-frame-set-input-focus' unbound from w3m.el.
-	(w3m-add-w3m-initial-frames): Ditto; also move the program to add it to
-	`create-frame-hook', `after-make-frame-functions' or
-	`after-make-frame-hook' from w3m.el.
-	(w3m-delete-frames-and-windows): Ditto.
-	(w3m-display-progress-message): Mark a progress message with the
-	`w3m-progress-message' text property.
-
-	* w3m.el: Don't fbind `select-frame-set-input-focus'.
-	(w3m-local-find-file-function): Use `w3m-popup-frame-p'.
-	(w3m-initial-frames): Move to w3m-util.el.
-	(w3m-popup-frame-parameters): Ditto.
-	(w3m-popup-frame-p): Ditto.
-	(w3m-use-tab-p): Ditto.
-	(w3m-popup-window-p): Ditto.
-	(w3m-last-visited-buffer): Ditto.
-	(w3m-popup-buffer): Ditto; also move the program to make
-	`select-frame-set-input-focus' unbound to w3m-util.el.
-	(w3m-add-w3m-initial-frames): Ditto; also move the program to add it to
-	`create-frame-hook', `after-make-frame-functions' or
-	`after-make-frame-hook' to w3m-util.el.
-	(w3m-delete-frames-and-windows): Ditto.
-	(w3m-delete-buffer-if-empty): New function.
-	(w3m-view-this-url-1): Use it.
-	(w3m-goto-url-new-session): Use it.
-	(w3m): Use it.
-
-	* w3m-e21.el (w3m-euc-japan-encoder): Compute the ccl program in each
-	time to load w3m-e21.elc to keep the compatibility of the module with
-	Emacs 21.3 and the later versions.
-	(w3m-iso-latin-1-encoder): Ditto.
-
-2003-11-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-horizontal-scroll-division): Mega doc fix; eliminate
-	illegal values.
-	(w3m-horizontal-on-screen): Rearrange.
-
-2003-11-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-last-visited-buffer): New variable.
-	(w3m-popup-buffer): Clear `w3m-last-visited-buffer'.
-	(w3m-close-window): Set the last emacs-w3m buffer as
-	`w3m-last-visited-buffer'.
-	(w3m): Preferably use the last emacs-w3m buffer kept in
-	`w3m-last-visited-buffer'.
-
-2003-11-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-horizontal-recenter): Do nothing besides resetting the
-	window's hscroll if `truncate-lines' is nil.
-	(w3m-beginning-of-line): Replace `w3m-set-window-hscroll' with
-	`set-window-hscroll'.
-	(w3m-end-of-line): Make it work identically as `end-of-line' if
-	`truncate-lines' is nil.
-	(w3m-display-width): Move downward (see the comment).
-
-2003-11-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-w3m-parse-header): Because a broken server returns a
-	relative URL in the location field, convert a URL to absolute.
-
-	* w3m-proc.el (w3m-process-wait-process): New function.
-	(w3m-process-start-and-wait): Call the above function.
-
-	* w3m-weather.el (w3m-weather-run-filter-functions): New function to
-	call filter functions asynchronously.
-	(w3m-about-weather): Call the above.
-	(w3m-weather-get-seikatu-sisu): Asynchronized.
-	(w3m-weather-insert-seikatu-sisu): Ditto.
-
-2003-11-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-initial-frames): Rename from `w3m-initial-frame'; keep a
-	list of the frame-IDs.
-	(w3m-popup-window-p): Return nil if there is the selection window.
-	(w3m-popup-buffer): Copy a copy of `w3m-initial-frames' from a visible
-	emacs-w3m buffer to a popped-up emacs-w3m buffer; don't set
-	`w3m-initial-frames' for newly created frames there.
-	(w3m-add-w3m-initial-frames): New function; add it to
-	`create-frame-hook', `after-make-frame-functions' or
-	`after-make-frame-hook'.
-	(w3m-copy-buffer): Copy a copy of `w3m-initial-frames'.
-	(w3m-delete-buffer): Pop up another emacs-w3m buffer instead of
-	deleting a frame; remove a deleted frame from `w3m-initial-frames'.
-	(w3m-delete-frames-and-windows): Also allow a window or a frame as the
-	optional argument; emulate XEmacs version's `one-window-p'.
-	(w3m): Set the value for `w3m-initial-frames' even if it is invoked in
-	the batch mode.
-	(w3m-select-buffer): Delete other emacs-w3m frames and windows.
-	(w3m-select-buffer-copy-buffer): Revert the 2003-11-11 change.
-	(w3m-select-buffer-delete-buffer): Simplify.
-
-	(w3m-display-width): New function for showing pages as if there is no
-	selection window.
-	(w3m-halfdump-command-common-arguments): Use it.
-	(w3m-make-separator): Use it.
-	(w3m-about-db-history): Use it.
-	(w3m-header-line-insert): Work as if there is no selection window.
-
-	* w3mhack.el (w3mhack-generate-colon-keywords-file): Preset
-	`:strike-through' and `:strikethru' which aren't supported by the old
-	cus-face.el.
-
-2003-11-11  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-popup-buffer): Reuse an existing window or frame if it
-	exists; set the value for `w3m-initial-frame' properly; raise, select
-	and focus the new frame.
-	(TopLevel): Make `select-frame-set-input-focus' unbound if it is a
-	dummy.
-	(w3m-view-this-url-1): Show a progress message.
-	(w3m-copy-buffer): Simplify the code to call `w3m-popup-buffer'.
-	(w3m-alive-p): Add an optional arg `visible' (see docs); use inlining
-	`w3m-list-buffers'.
-	(w3m): Simplify the code using `w3m-popup-buffer'; specify the optional
-	arg to `w3m-alive-p'; protect against the case of no url.
-	(w3m-select-buffer-copy-buffer): Bind `w3m-pop-up-windows' to nil.
-
-	* w3m-util.el (w3m-list-buffers): Make it into a normal function; don't
-	call itself recursively.
-
-2003-11-10  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el (w3m-function-max-args): Move to mew-shimbun.el.
-
-	* w3m.el (w3m-popup-buffer): New function (it still needs to improved
-	in order for the `w3m' function to use).
-	(w3m-view-this-url-1): Specify the value of
-	`w3m-view-this-url-new-session-in-background' to the 3rd arg of
-	`w3m-copy-buffer'; don't pop up a window or a frame there.
-	(w3m-copy-buffer): Change the meaning of the 3rd arg (see docs); don't
-	pop up a window or a frame if it is non-nil, otherwise call
-	`w3m-popup-buffer'.
-	(w3m-goto-url): Change the name of the 8th arg to `interactive-p';
-	don't pop up a window or a frame unless this function is called
-	interactively, otherwise call `w3m-popup-buffer'.
-	(w3m-goto-url-new-session): Specify nil to the 3rd arg of
-	`w3m-copy-buffer'.
-	(w3m-select-buffer-saved-window-config): Abolish.
-	(w3m-select-buffer): Revert the 2003-11-05 change; delete other windows
-	except for the current emacs-w3m window or create a new emacs-w3m
-	buffer when it is called initially.
-	(w3m-select-buffer-current-buffer): Use `line-beginning-position'.
-	(w3m-select-buffer-copy-buffer): Revert the 2003-11-05 change;
-	simplify.
-	(w3m-select-buffer-delete-buffer): Call `w3m-quit' if there is the sole
-	emacs-w3m buffer.
-	(w3m-select-buffer-delete-other-buffers): Revert the 2003-11-07 change.
-	(w3m-select-buffer-quit): Revert the 2003-11-05 change; bind
-	`pop-up-frames'.
-
-2003-11-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-proc.el (w3m-process-stop): Change `w3m-current-process' in the
-	buffer specified in the argument, instead of changing it in the current
-	buffer.
-
-2003-11-08  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-w3m-canonicalize-url): New function.
-	(w3m-w3m-attributes-1): New function.
-	(w3m-w3m-attributes): Call the above functions to follow redirection.
-	(w3m-w3m-retrieve): Call `w3m-w3m-canonicalize-url' before retrieving.
-
-	* w3m-proc.el (w3m-process-start-process): Check the value of
-	`w3m-current-url' before calling `w3m-url-authinfo'.
-	(w3m-process-start-and-wait): Make sure synchronization with
-	sub-process.
-	(w3m-process-do-with-temp-buffer): Call `w3m-kill-buffer' instead of
-	calling `kill-buffer' directly.
-
-	* w3m-antenna.el (w3m-antenna-mapcar): Simplified and follow the change
-	of `w3m-process-do-with-temp-buffer'.
-	(w3m-antenna-mapcar-after): Ditto.
-
-2003-11-07  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-delete-other-buffers): Use
-	`w3m-delete-frames-and-windows'.
-	(w3m-delete-frames-and-windows): Take an optional argument for the
-	exception; assume a buffer may be at two or more windows.
-	(w3m-close-window): Assume a buffer may be at two or more windows.
-	(w3m-select-buffer-delete-other-buffers): Save-window-excursion.
-
-2003-11-06  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-popup-frame-parameters): Rename from
-	`w3m-pop-up-frame-parameters' to make it easy to complete the
-	`w3m-pop-up-frames' variable name.
-	(w3m-popup-frame-parameters): Rename from
-	`w3m-pop-up-frame-parameters'.
-	(w3m-popup-frame-p): Make it a generic macro.
-	(w3m-use-tab-p): New macro.
-	(w3m-popup-window-p): Use `w3m-use-tab-p'.
-	(w3m-view-this-url-1): Use `w3m-use-tab-p' and `w3m-popup-frame-p'.
-	(w3m-copy-buffer): Ditto.
-	(w3m-delete-buffer): Use `w3m-use-tab-p'.
-	(w3m-goto-url): Use `w3m-use-tab-p' and `w3m-popup-frame-p'.
-	(w3m): Modify to use new `w3m-popup-frame-p'.
-	(w3m-header-line-insert): Use `w3m-use-tab-p'.
-
-2003-11-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-current-redirect): Abolished.
-	(w3m-clear-local-variables, w3m-copy-local-variables): Follow the above
-	change.
-
-	* w3m-proc.el (w3m-process-do-with-temp-buffer): Keep the current
-	buffer after given FORM and BODY are evaluated.
-
-2003-11-06  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-follow-redirection): Fix its docstring.
-	(w3m-w3m-retrieve): When the above option is equal to nil, it is
-	treated as 0.
-	(w3m-retrieve-and-render): Check content type and charsets with
-	redirected real URI instead of user-specified URI.
-
-	* w3m-antenna.el (w3m-antenna-hns-last-modified): Do not accept
-	`no-cache' argument.
-	(w3m-antenna-check-site): Ditto.
-	(w3m-antenna-mapcar, w3m-antenna-mapcar-after): New functions.
-	(w3m-antenna-check-all-sites): Use the above functions.
-
-2003-11-06  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-delete-buffer): New implementation.
-	(w3m-delete-frame-maybe): Abolish.
-	(w3m-delete-frames-and-windows): New function.
-	(w3m-quit): Use it.
-	(w3m-close-window): New implementation.
-	(w3m-select-buffer-show-this-line): Specify the 1st arg to
-	`one-window-p'.
-	(w3m-select-buffer-quit): Ditto.
-	(w3m-select-buffer-close-window): Ditto.
-
-2003-11-06  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-fontify-strike-through): Support <strike> element.
-	(w3m-fontify): Change the turn `w3m-fontify-strike-through' and
-	`w3m-fontify-underline'.
-
-2003-11-06  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* attic/vm-w3m.el: New file.
-
-2003-11-05  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el: Fbind `select-frame-set-input-focus' when compiling.
-	(w3m-popup-window-p): Rename from `w3m-pop-up-window-p'; use
-	'emacs-major-version' instead of `MULE' to examine the version.
-	(w3m-view-this-url-1): Use `pop-to-buffer' instead of
-	`switch-to-buffer' in order to be able to popup a window or a frame.
-	(w3m-copy-buffer): Ditto; set the `w3m-initial-frame' variable only
-	when `w3m-pop-up-frames' is non-nil.
-	(w3m-delete-buffer): Select the most suitable buffer.
-	(w3m-goto-url): Use `pop-to-buffer' instead of `switch-to-buffer' in
-	order to be able to popup a window or a frame.
-	(w3m): Ditto; rearrange the source code.
-	(w3m-select-buffer-saved-window-config): New variable.
-	(w3m-select-buffer): Save the window configuration.
-	(w3m-select-buffer-copy-buffer): Bind `pop-up-frames'.
-	(w3m-select-buffer-quit): Restore the window configuration; protect
-	agains the absence of an emacs-w3m buffer.
-
-	* w3m-xmas.el: Bind `w3m-use-tab' when compiling.
-	(w3m-xmas-show-current-title-in-buffer-tab): Examine the value for the
-	`gutter-buffers-tab-enabled' variable directly.
-	(w3m-xmas-setup-tab-in-gutter): New function; add it to
-	`w3m-mode-setup-functions' and `w3m-select-buffer-mode-hook'.
-	(w3m-xmas-update-tab-in-gutter): Do update only when `w3m-use-tab' and
-	`gutter-buffers-tab-enabled' are non-nil; always add it to
-	`w3m-display-functions'.
-
-	* octet.el: Don't make sure the `emacs-major-version' variable is
-	bound.
-	* w3m-bitmap: Ditto.
-	* w3m-bug.el: Ditto.
-	* w3m-proc.el: Ditto.
-	* w3m-ucs.el: Ditto.
-	* w3m-util.el: Ditto.
-	* w3m.el: Ditto.
-	* w3mhack.el: Ditto.
-
-2003-11-05  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-delete-buffer, w3m-delete-other-buffers)
-	(w3m-select-buffer-delete-buffer): Call `w3m-process-stop'.
-
-	* w3m-proc.el (w3m-process-kill-stray-processes): New function.
-	(w3m-process-start-queued-processes): Call
-	`w3m-process-kill-stray-processes'.
-	(w3m-process-filter): When parent-buffer was killed, call
-	`w3m-process-kill-stray-processes'
-
-2003-11-04  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-pop-up-windows): Default to t.
-	(w3m-pop-up-window-p): New macro examining the value for the
-	`w3m-use-tab' variable and the present situation.
-	(w3m-copy-buffer): Use it.
-
-2003-11-04  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-meta-content-type-charset-regexp)
-	(w3m-meta-charset-content-type-regexp)
-	(w3m-meta-refresh-content-regexp)
-	(w3m-meta-content-refresh-regexp): Allow `\n' as whitespaces.
-
-2003-10-31  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-hist.el (w3m-history-backward): Return the current history if the
-	number zero is given as an argument.
-
-2003-10-29  OHASHI Akira  <bg66@koka-in.org>
-
-	* w3m.el (w3m-process-connection-type): Set t when system is darwin
-	version 7.0.0 or later.
-
-2003-10-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-fontify-strike-through (var)): Make it into the variable
-	which is not a user option.
-	(w3m-fontify-strike-through (fn)): Check dynamically whether the window
-	system is used.
-	(w3m-url-at-point): Unify iso646 chars to ascii on XEmacs-mule.
-
-	* mew-w3m.el: Silence the compile warning for `mew-coding-system-p' for
-	people having the Mew XEmacs package installed.
-
-2003-10-23  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-obey-w3m-pop-up-frames): New variable.
-	(w3m-copy-buffer): Inherit the value of `w3m-initial-frame' into the
-	new buffer if a new frame is not created for the new buffer.
-	(w3m-delete-frame-maybe): Simplify it in the different way.
-
-	* w3m-search.el (w3m-search): Specify the 3rd arg of `w3m'.
-
-2003-10-23  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el: Revive `w3m-initial-frame' throughout.
-	(w3m-delete-frame-maybe): Revert 2003-10-20 change.
-
-2003-10-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-strike-through-face): Use the :strikethru attribute in
-	XEmacs.
-	(w3m-fontify-strike-through): Enable it also for XEmacs.
-
-2003-10-21  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-w3m-retrieve): Insert no data when either retrieval or
-	decoding is failed.
-	(w3m-w3m-parse-header): Do not return a base URI of retrieved page.
-
-2003-10-20  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el: Fix some comments and docstrings (to be continued).
-	(w3m-copy-local-variables, w3m-open-all-links-in-new-session,
-	w3m-horizontal-scroll): Remove unused non-global variables.
-
-2003-10-20  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el: Abolish `w3m-initial-frame' throughout.
-	(w3m-delete-frame-maybe): Simplify.
-
-2003-10-19  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-base-url): Removed.
-	(w3m-attributes, w3m-local-attributes, w3m-w3m-attributes): Do not
-	return a base URI of retrieved page.
-
-2003-10-14  Jose A. Ortega Ruiz  <jao@gnu.org>
-
-	* w3m.el (w3m-decode-entities-string): Move `save-match-data' to the
-	exterior of `with-temp-buffer'.
-
-2003-10-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el (w3m-tab-half-space, w3m-tab-separator): Use `:width'
-	instead of `:relative-width' to specify the space width.
-	(w3m-tab-line): Tidy it up.
-
-	* w3m-favicon.el (w3m-favicon-set-image): Use `:width' instead of
-	`:relative-width' to specify the space width.
-
-2003-10-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el (w3m-tab-unselected-face,
-	w3m-tab-unselected-retrieving-face, w3m-tab-selected-face,
-	w3m-tab-selected-face): Exchange the default TTY colors between
-	selected faces and unselected faces.
-	(w3m-tab-drag-mouse-function): Compare buffer objects instead of buffer
-	names.
-	(w3m-tab-make-keymap): Use buffer objects instead of buffer names.
-	(w3m-tab-line): Make all tab widths the same even if there are wide
-	characters; never use graphic icons in TTY; close the left margin
-	unless there's an icon; add a keymap to favicon; don't put mouse-face
-	on icons.
-	(w3m-initialize-graphic-icons): Don't make graphic icons for TTY; don't
-	put mouse-face on icons.
-
-	* w3m-favicon.el: Bind `w3m-modeline-favicon' when compiling.
-	(w3m-favicon-set-image): Add a half space after favicon.
-
-	* w3m-util.el (w3m-current-title): New function.
-	(w3m-buffer-title): Use it.
-
-	* w3m.el: Silence the byte-compiler for `w3m-info-like-map',
-	`w3m-lynx-like-map', `w3m-minor-mode-map', `w3m-mode-map', and
-	`w3m-setup-menu'.
-
-2003-10-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-favicon.el: Silence the compile warning for `w3m-message'.
-
-	* w3m.el (w3m-url-to-file-name): Enable it to interpret
-	file://localhost/ urls.
-
-2003-10-07  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-form.el (w3m-form-parse-and-fontify): Fix for textarea on w3mmee.
-
-2003-10-07  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el (frame-current-scroll-bars): Alias to `ignore' if it is
-	not available.
-	(window-fringes): Ditto.
-	(w3m-tab-width): Protect against setting illegal values.
-	(w3m-tab-unselected-face): Don't specify the underline color.
-	(w3m-tab-unselected-retrieving-face): Ditto.
-	(w3m-tab-selected-face): Ditto.
-	(w3m-tab-selected-retrieving-face): Ditto.
-	(w3m-tab-background-face): Ditto.
-	(w3m-tab-timer): Rename from `w3m-tab-line-timer'.
-	(w3m-tab-half-space): New variable.
-	(w3m-tab-separator): New variable.
-	(w3m-tab-line): Show many tabs as far as possible.
-
-	* w3m-favicon.el (w3m-favicon-retrieve): Clear the minibuffer after
-	retrieving favicon.
-
-2003-10-06  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	We shouldn't use too simple elements like ".+" in the deep nested
-	regexps.  It may cause high cpu or may make Emacs hang.
-
-2003-10-06  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-use-favicon): Modify the doc-string.
-	(w3m-show-graphic-icons-in-mode-line): New variable.
-	(w3m-show-graphic-icons-in-header-line): New variable.
-	(w3m-buffer-setup): Modify the value for
-	`mode-line-buffer-identification' not to show favicon if
-	`w3m-show-graphic-icons-in-mode-line' is nil.
-
-	* w3m-e21.el: Bind `w3m-show-graphic-icons-in-header-line' and
-	`w3m-show-graphic-icons-in-mode-line' when compiling.
-	(w3m-tab-line): Don't show spinners nor favicons if
-	`w3m-show-graphic-icons-in-header-line' is nil; call
-	`w3m-make-spinner-image' only once.
-	(w3m-initialize-graphic-icons): Don't make graphic icons if
-	`w3m-show-graphic-icons-in-mode-line' is nil.
-
-	* w3m-xmas.el: Bind `w3m-show-graphic-icons-in-mode-line' when
-	compiling.
-	(w3m-initialize-graphic-icons): Don't make graphic icons if
-	`w3m-show-graphic-icons-in-mode-line' is nil.
-
-2003-10-05  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-form.el (w3m-form-replace): Call `set-buffer-modified-p'.
-	(w3m-form-field-parse): Do nothing when fid is nil.
-	(w3m-form-input-radio): Likewise.
-	(w3m-form-get-by-name): New function.
-	(w3m-form-input-map): Use it.
-
-2003-10-04  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el (w3m-tab-line): Fix the logic determining whether to
-	display favicon.
-
-2003-10-03  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el (w3m-spinner-map-on-header-line): Abolish.
-	(w3m-modeline-spinner-map): Rename from `w3m-spinner-map-on-mode-line'.
-	(w3m-setup-header-line): Don't initialize
-	`w3m-spinner-map-on-header-line'.
-	(w3m-tab-spinner-map): New variable.
-	(w3m-tab-make-keymap): Initialize it.
-	(w3m-tab-line): Use it.
-
-2003-10-03  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-modeline-separator): New variable.
-	(w3m-modeline-favicon): New variable.
-	(w3m-favicon-image): Move from w3m-favicon.el.
-	(w3m-buffer-setup): Also call `w3m-initialize-graphic-icons' when Emacs
-	21 is running; simplify the value for
-	`mode-line-buffer-identification'.
-
-	* w3m-e21.el: Bind `w3m-favicon-image' and
-	`w3m-modeline-process-status-on' when compiling.
-	(w3m-spinner-map-on-header-line): New variable.
-	(w3m-spinner-map-on-mode-line): New variable.
-	(w3m-spinner-map-help-echo): New variable.
-	(w3m-setup-header-line): Initialize the value for
-	`w3m-spinner-map-on-header-line'; remove an excessive `list' from the
-	value for `header-line-format'.
-	(w3m-tab-map): New variable.
-	(w3m-tab-make-keymap): Set the value for `w3m-tab-map' in the current
-	buffer.
-	(w3m-tab-line): Add a keymap to the spinner; don't call
-	`w3m-tab-make-keymap', use `w3m-tab-map' instead.
-	(TopLevel): Add-hook `w3m-tab-make-keymap' to
-	`w3m-mode-setup-functions'.
-	(w3m-space-before-modeline-icon): New variable.
-	(w3m-modeline-process-status-on-icon,
-	w3m-modeline-image-status-on-icon, w3m-modeline-status-off-icon,
-	w3m-modeline-ssl-image-status-on-icon,
-	w3m-modeline-ssl-status-off-icon): New variables.
-	(w3m-initialize-graphic-icons): New function.
-	(w3m-make-spinner-image): Don't initialize the value for
-	`w3m-spinner-image-file' here; set the value for
-	`w3m-modeline-process-status-on-icon'.
-
-	* w3m-favicon.el: Bind `w3m-favicon-image' when compiling.
-	(w3m-favicon-image): Move to w3m.el.
-	(w3m-space-before-favicon): Move from w3m-xmas.el.
-	(TopLevel): Make `w3m-modeline-favicon' and `w3m-favicon-image'
-	buffer-local; modify the value or put the `risky-local-variable'
-	property for `w3m-modeline-favicon'.
-	(w3m-favicon-set-image): New macro.
-	(w3m-favicon-setup): Use it.
-	(w3m-favicon-retrieve): Use it.
-
-	* w3m-xmas.el (w3m-xmas-space-before-favicon): Move to w3m-favicon.el
-	and rename to `w3m-space-before-favicon'.
-	(w3m-space-before-modeline-icon): Rename from
-	`w3m-xmas-space-before-modeline-icon'.
-
-2003-10-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-proc.el (w3m-process-filter): Relax the regular expression to
-	detect progress status.
-
-2003-10-02  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-w3m-expand-arguments): Redefine as a function rather than
-	a macro.
-	(w3m-dump-head-source-command-arguments): Simplify.
-	(w3m-halfdump-command-arguments): Ditto.
-
-2003-10-02  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-proc.el (w3m-process-filter): Check return value of
-	`w3m-process-handler-parent-buffer' to move current buffer safely.
-
-2003-10-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-modeline-image-status-on, w3m-modeline-process-status-on,
-	w3m-modeline-ssl-image-status-on, w3m-modeline-ssl-status-off,
-	w3m-modeline-status-off): Use `defvar' instead of `defconst'.
-	(w3m-buffer-setup): Call `w3m-initialize-graphic-icons' instead of
-	`w3m-make-spinner-image'; simplify the value for
-	`mode-line-buffer-identification'.
-
-	* w3m-xmas.el (w3m-xmas-space-before-modeline-icon): Rename from
-	`w3m-xmas-space-before-spinner'.
-	(w3m-modeline-process-status-on-icon,
-	w3m-modeline-image-status-on-icon, w3m-modeline-status-off-icon,
-	w3m-modeline-ssl-image-status-on-icon,
-	w3m-modeline-ssl-status-off-icon): New variables.
-	(w3m-spinner-image): Abolish.
-	(w3m-make-spinner-image): Abolish.
-	(w3m-initialize-graphic-icons): New function.
-
-	* icons/state-00.xpm:
-	* icons/state-01.xpm:
-	* icons/state-10.xpm:
-	* icons/state-11.xpm: New files.
-
-2003-10-02  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-halfdump-command-arguments): Add "ucs_conv" option when
-	using w3m-m17n; check w3m-output-coding-system at run time.
-
-2003-10-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-proc.el (w3m-process-start-after): Make sure the value for
-	`w3m-current-buffer' is non-nil.
-
-2003-10-02  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-process-modeline-format): New option.
-	(w3m-buffer-setup): Set `mode-line-process'.
-
-	* w3m-proc.el: Bind `w3m-process-modeline-format' to suppress
-	byte-compile warning.
-	(w3m-process-modeline-string): New buffer-local variable.
-	(w3m-process-start-after): Reset the above variable.
-	(w3m-process-filter): Check size of retrieved data and set the above
-	variable.
-	(w3m-process-modeline-format): New function.
-
-2003-10-01  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-make-spinner-image): Make sure the gifsicle program
-	is available.
-
-2003-09-30  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-use-symbol): Use `w3m-mule-unicode-p'.
-
-	* w3m-symbol.el (w3m-mule-unicode-symbol): Ditto.
-
-2003-09-30  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-proc.el (w3m-process-stop): Redisplay the header-line.
-
-	* w3m-e21.el (w3m-tab-line-format, w3m-tab-line-timer, w3m-tab-line):
-	Revive the timer operation.
-	(w3m-tab-line): Wobble the window size to force redisplay of the
-	header-line using a timer; include spinner images in the return value
-	when external processes are running.
-	(w3m-spinner-image-file): New variable.
-	(w3m-spinner-image-frames): New variable.
-	(w3m-spinner-image-index): New variable.
-	(w3m-make-spinner-image): New function.
-
-	* w3m-favicon.el (w3m-favicon-retrieve): Always redraw Emacs frame
-	using the timer; wobble the window size instead of redrawing; increase
-	the delay time for the timer.
-
-2003-09-30  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-form.el (w3m-form-parse-and-fontify): Fix problem when form_int
-	appears after input_alt and action is specified.
-
-2003-09-29  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-symbol.el (w3m-mule-unicode-symbol): Fix customization type.
-
-2003-09-29  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-symbol.el: Bind `w3m-output-coding-system' when compiling.
-	(w3m-mule-unicode-symbol): New variable.
-	(w3m-symbol): Add it for candidate.
-	(w3m-symbol): Use it.
-
-	* w3m.el (w3m-use-symbol): Check capability for
-	`w3m-mule-unicode-symbol'.
-
-2003-09-29  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el (w3m-tab-line-format, w3m-tab-line-timer, w3m-tab-line):
-	Remove the timer operation temporally.
-
-2003-09-26  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-xmas.el (w3m-make-spinner-image): Bind `format-alist' to nil.
-
-2003-09-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el (w3m-tab-line-timer): New variable.
-	(w3m-tab-line): Use it to control this function running too frequently;
-	simplify the source code.
-
-	* w3m-favicon.el (w3m-favicon-image-of): Abolish.
-	(w3m-favicon-retrieve): Use a timer to redraw Emacs frame.
-
-	* w3m-xmas.el (w3m-xmas-space-before-favicon): New user option.
-	(w3m-xmas-space-before-spinner): New user option.
-	(w3m-make-spinner-image): Make sure the `gif' feature is available.
-
-	* w3m.el (w3m-buffer-setup): Use `w3m-xmas-space-before-spinner' and
-	`w3m-xmas-space-before-favicon'.
-
-2003-09-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* icons/spinner.gif: New file (without LZW compression).
-	* icons30/spinner.gif: Ditto.
-
-	* Makefile.in (install-icons, install-icons30): Also install gifs.
-
-	* w3m-xmas.el (w3m-make-spinner-image): Use the spinner.gif file.
-
-	* w3m-e21.el (w3m-tab-line-format): New variable (see doc-string).
-	(w3m-tab-line): Use it; use a timer to suppress this function running
-	too frequently.
-
-2003-09-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-spinner-image): New variable.
-	(w3m-make-spinner-image): New function.
-
-	* w3m.el (w3m-buffer-setup): Call `w3m-make-spinner-image', show a
-	spinner in the modeline under XEmacs.
-
-2003-09-24  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-form.el (w3m-form-put-property): Don't call intern if it is not a
-	string.
-	(w3m-form-get-property): Ditto.
-	(w3m-form-put): Added argument ID.
-	(w3m-form-get): Changed argument from NAME to ID.
-	(w3m-form-make-form-data): Changed process to get NAME and VALUE.
-	(w3m-form-resume): Follow the API change in w3m-form-put and
-	w3m-form-get.
-	(w3m-fontify-textareas): Ditto.
-	(w3m-form-parse-and-fontify): Ditto.
-	(w3m-form-input): Ditto.
-	(w3m-form-input-password): Ditto.
-	(w3m-form-input-checkbox): Ditto.
-	(w3m-form-input-radio): Ditto.
-	(w3m-form-input-file): Ditto.
-	(w3m-form-input-textarea-set): Ditto.
-	(w3m-form-textarea-info): Ditto.
-	(w3m-form-input-select): Ditto.
-	(w3m-form-submit): Ditto.
-	(w3m-form-real-reset): Follow the structure change.
-	(w3m-form-input-select-id): New buffer local variable.
-	(w3m-form-input-select-set): Use it.
-	(w3m-form-field-parse): New inline function.
-	(w3m-form-parse-and-fontify): Put id for selectinfo.
-	(w3m-form-resume): Fixed regexp.
-	(w3m-form-input-textarea): Fixed line number.
-	(w3m-fontify-textareas): Put w3m-form-id property.
-	(w3m-form-parse-and-fontify): Store id to the textareainfo.
-
-2003-09-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-favicon.el (w3m-favicon-retrieve): Redisplay Emacs frame; rename
-	from `w3m-retrieve-favicon'.
-	(w3m-favicon-image): Rename from `w3m-current-favicon-image'.
-	(w3m-favicon-setup): Rename from `w3m-setup-favicon'.
-	(w3m-favicon-image-of): Rename from `w3m-buffer-favicon'.
-	(w3m-favicon-convert): Rename from `w3m-convert-favicon'.
-	(w3m-favicon-retrieve): Rename from `w3m-retrieve-favicon'.
-
-	* w3m-e21.el (w3m-tab-line): Rename `w3m-buffer-favicon' with
-	`w3m-favicon-image-of'.
-
-	* w3m.el (w3m-clean-hook-options): Rename `w3m-setup-favicon' with
-	`w3m-favicon-setup'.
-	(w3m-buffer-setup): Rename `w3m-current-favicon-image' with
-	`w3m-favicon-image'.
-
-2003-09-23  OHASHI Akira  <bg66@koka-in.org>
-
-	* w3m.el (w3m-process-connection-type): Set nil when system-type is
-	darwin.
-
-2003-09-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-favicon.el: Bind `w3m-icon-data' when compiling.
-	(w3m-current-favicon-data): Abolish.
-	(w3m-favicon-converted): Abolish.
-	(w3m-favicon-cache-data): Contain image data.
-	(w3m-favicon-cache-favicon): Return an image instead of raw data.
-	(w3m-setup-favicon): Fix the condition to check whether Emacs can
-	display images; set the value of `w3m-current-favicon-image' instead of
-	`w3m-current-favicon-data' for the about: pages.
-	(w3m-buffer-favicon): Make it simply get the value of
-	`w3m-current-favicon-image'.
-	(w3m-convert-favicon): Accept raw data and type; simply return an
-	image.
-	(w3m-retrieve-favicon): Rearrange the arguments to accept url and type
-	independently; set the value of `w3m-current-favicon-image' instead of
-	`w3m-current-favicon-data'; store an image into
-	`w3m-favicon-cache-data'.
-	(w3m-favicon-save-cache-file): Save data only if they contained images;
-	strip images from the cache for saving.
-	(w3m-favicon-load-cache-file): Create images for all the cache.
-
-	* w3m.el (w3m-buffer-setup): Use `w3m-current-favicon-image' instead of
-	`w3m-favicon-converted' for `mode-line-buffer-identification' under
-	XEmacs in order to check whether the favicon image is available.
-	(w3m-examine-command-line-args): Use `member' instead of `memq' under
-	XEmacs to check whether `command-line-args' contains the same string as
-	the car of `command-line-args-left'.
-
-2003-09-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-favicon.el: Autoload w3m for `w3m-expand-url' when compiling.
-	(w3m-setup-favicon): Fix the change of 2003-09-12 which was gone to
-	far.
-
-	* w3m.el (w3m-open-all-links-in-new-session): Improve the regexp.
-	(w3m-examine-command-line-args): Don't let it misunderstand the next
-	command as a url string; modify the arguments in `command-line-args'
-	instead of removing them.
-	(w3m): Use `w3m-examine-command-line-args' even if it is called
-	non-interactively.
-
-2003-09-21  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-open-all-links-in-new-session): Don't use
-	`w3m-select-buffer'.
-
-2003-09-21  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-popup-frame-p): Make it accept the `interactive-p'
-	argument.
-	(w3m-examine-command-line-args): New function.
-	(w3m): Use it.
-
-2003-09-20  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-favicon.el: Bind some external variables when compiling.
-
-2003-09-19  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-form.el (w3m-form-make-form-data): Insert "--" before the
-	multipart post boundary.
-
-2003-09-19  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-underline-face): New face.
-	(w3m-strike-through-face): New user variable.
-	(w3m-fontify-strike-through): New function.
-	(w3m-fontify): Call `w3m-fontify-strike-through'
-
-2003-09-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-favicon.el (w3m-setup-favicon): Convert favicon data to an image
-	for the about: pages using `w3m-convert-favicon'.
-	(w3m-buffer-favicon): Move the data conversion procedure to
-	`w3m-convert-favicon'.
-	(w3m-convert-favicon): New function detached from `w3m-buffer-favicon';
-	make it work synchronously.
-	(w3m-retrieve-favicon): Convert favicon data to an image.
-
-	* w3m-image.el (w3m-imagick-convert-buffer): Erase buffer before
-	calling the convert program.
-
-	* w3m.el (w3m-buffer-setup): Modify the value for
-	`mode-line-buffer-identification' in order to make it possible to show
-	favicon under XEmacs.
-
-2003-09-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-open-all-links-in-new-session): New function.  Suggested
-	by Yoichi NAKAYAMA <yoichi@geiin.org>.
-	(w3m-view-this-url-new-session): Call
-	`w3m-open-all-links-in-new-session' if the region is active.
-
-2003-09-18  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-key-binding): Don't use `custom-set-default'.
-	(w3m-use-favicon): Ditto.
-	* w3m-favicon.el (w3m-favicon-size): Ditto.
-
-	* icons/*.xpm: Remove text.
-
-2003-09-17  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-form.el (w3m-form-new): Use `application/x-www-form-urlencoded'
-	instead of `urlencoded'.
-	(w3m-form-parse-and-fontify): Ditto.
-	(w3m-form-make-form-data): Use `multipart/form-data' instead of
-	`multipart'.
-	(w3m-form-mee-new): Likewise.
-
-2003-09-17  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el (w3m-e21-toolbar-configurations): Don't modify the values
-	for `tool-bar-button-margin' and `tool-bar-button-relief'.
-
-	* w3mhack.el (w3mhack-nonunix-install): Use icons30 for XEmacs.
-	(w3mhack-make-package): Use icons30.
-
-	* Makefile.in (SUBDIRS): Add icons30.
-	(install-icons30): New rule.
-	(install-package, install-package-ja): Use it.
-
-	* icons/*.xpm: Shrink the size of all icons.
-	* icons30/: Old icons are here.
-
-2003-09-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el (w3m-activate-zmacs-regions): New macro.
-	* w3m.el (w3m-next-anchor, w3m-previous-anchor, w3m-next-form,
-	w3m-previous-form, w3m-next-image, w3m-previous-image,
-	w3m-scroll-up-or-next-url, w3m-scroll-down-or-previous-url,
-	w3m-beginning-of-line, w3m-end-of-line): Use it.
-
-2003-09-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-hist.el (w3m-history-backward): Return nil if there is no
-	previous element.
-
-	* w3m.el (w3m-view-previous-page): Skip the current page if it seems
-	broken; warn if there's no more history.
-	(w3m-copy-buffer): Use the current history for the url string if the
-	current page seems broken.
-	(w3m-goto-url): Use `lexical-let' to pass the history position data to
-	the asynchronous w3m process.
-
-2003-09-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el: Move the favicon stuff to w3m-favicon.el.
-
-	* w3m-favicon.el: New file detached from w3m-e21.el.
-	(w3m-favicon-type): Adapt it to XEmacs as well.
-	(w3m-setup-favicon): Ditto.
-	(w3m-buffer-favicon): Ditto.
-	(w3m-retrieve-favicon): Replace `float-time' with `w3m-float-time'.
-	(w3m-arrived-setup-functions): Don't add-hook it here.
-	(w3m-arrived-shutdown-functions): Ditto.
-
-	* w3m-xmas.el: Require `w3m-favicon'.
-
-	* w3m.el (w3m-arrived-setup-functions): Add
-	`w3m-favicon-load-cache-file' if w3m-favicon is loaded.
-	(w3m-arrived-shutdown-functions): Add `w3m-favicon-save-cache-file' if
-	w3m-favicon is loaded.
-
-	* w3m-util.el (w3m-float-time): New function.
-
-	* w3mhack.el (w3mhack-examine-modules): Exclude w3m-favicon.el from the
-	files to be byte-compiled.
-
-2003-09-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-view-this-url-1): Fix a window configuration only when
-	the buffer's major mode has changed from the w3m-mode to another.
-	(w3m-goto-url): Don't erase a buffer when retrieving a local file.
-
-2003-08-29  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-copy-buffer): Copy the history before visiting a page in
-	order to show the about://history/ page correctly; adjust the position
-	in the history after copying.
-	(w3m-goto-url): Use buffer-local properties instead of global
-	properties for form data.
-	(w3m-reload-this-page): Specify the history element to the
-	`w3m-goto-url' function in order to submit the form data.
-
-2003-08-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-view-this-url-1): Don't kill the emacs-w3m buffer when a
-	process is in progress.
-	(w3m-goto-url-new-session): Ditto.
-
-2003-08-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-view-previous-page): Specify a history element of the
-	previous page to the `w3m-goto-url' function as the 7th arg.
-	(w3m-goto-url): Accept a history element as the 7th argument; specify
-	nil as the 7th argument when recursively calling itself; use a given
-	history element to examine the form data of the url to be visited.
-	(w3m-goto-url-new-session): Specify nil to the `w3m-goto-url' function
-	as the 7th argument.
-	(w3m): Ditto.
-
-2003-08-15  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-hist.el (w3m-history-minimize-in-new-session): New user option.
-	(w3m-history-set-current): Redefine as an inline function rather than a
-	macro.
-	(w3m-history-current-1): Abolish the function.
-	(w3m-history-current-2): Abolish the function.
-	(w3m-history-element): New function.
-	(w3m-history-current): Abolish the funtction.
-	(w3m-history-backward): Don't modify the current position pointer in
-	the `w3m-history' variable.
-	(w3m-history-forward): Simplify using `w3m-history-backward'.
-	(w3m-history-copy): Minimize the history when
-	`w3m-history-minimize-in-new-session' is non-nil.
-	(w3m-history-plist-get): Abolish the `url' argument; complement the
-	meaning of the `local' argument.
-	(w3m-history-add-properties): Ditto.
-	(w3m-history-plist-put): Ditto.
-	(w3m-history-remove-properties): Ditto.
-	(w3m-history-store-position): Don't specify the optional arguments to
-	`w3m-history-add-properties'.
-	(w3m-history-restore-position): Abolish the `url' argument; don't
-	specify the optional arguments to `w3m-history-plist-get'.
-	(w3m-history-minimize): Simplify using `w3m-history-element'.
-
-	* w3m.el (w3m-view-previous-page): Don't specify the optional arguments
-	to `w3m-history-plist-get' and `w3m-history-restore-position'.
-	(w3m-goto-url): Don't specify the optional arguments to
-	`w3m-history-plist-put', `w3m-history-plist-get',
-	`w3m-history-remove-properties' and `w3m-history-add-properties'.
-	(w3m-reload-this-page): Don't specify the optional arguments to
-	`w3m-history-plist-get' and `w3m-history-remove-properties'.
-
-2003-08-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-hist.el (w3m-history-flat): Reduce the deepness of local
-	prpoerties in the list structure.
-	(w3m-history-assoc): Simplify; redefine as an inline function.
-	(w3m-history-with-element): Abolish the macro.
-	(w3m-history-current-2): New function.
-	(w3m-history-set-plist): New function.
-	(w3m-history-modify-properties): Rewrite.
-	(w3m-history-seek-properties): Abolish the function.
-	(w3m-history-seek-element): New function.
-	(w3m-history-share-properties): Abolish the function.
-	(w3m-history-tree): Tiny change.
-	(w3m-history-push): Rewrite.
-	(w3m-history-copy): Tiny change.
-	(w3m-history-plist-get): Synch to the change of `w3m-history-flat'.
-	(w3m-history-plist-put): Rewrite.
-	(w3m-history-add-properties): Rewrite.
-	(w3m-history-remove-properties): Rewrite.
-	(w3m-history-rename-url): Abolish the function.
-	(w3m-history-store-position): Abolish the optional argument.
-	(w3m-history-minimize): New command.
-
-2003-08-13  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-hist.el (w3m-history-current-1): Redefine as a function rather
-	than a macro.
-	(w3m-history-previous-position): Ditto.
-	(w3m-history-next-position): Ditto.
-	(w3m-history-modify-properties): Ditto.
-	(w3m-history-save-position): Abolish the macro.
-	(w3m-history-forward-1): Ditto.
-	(w3m-history-backward-1): Ditto.
-	(w3m-history-with-element): Abolish the `set-current' argument.
-	(w3m-history-assoc): Ditto.
-	(w3m-history-plist-get): Ditto.
-	(w3m-history-plist-put): Ditto.
-	(w3m-history-add-properties): Ditto.
-	(w3m-history-remove-properties): Ditto.
-	(w3m-history-rename-url): Ditto.
-	(w3m-history-set-current): New macro.
-	(w3m-history-forward): Abolish the `set-current' argument; use
-	`w3m-history-set-current'.
-	(w3m-history-backward): Ditto.
-	(w3m-history-tree): Use `w3m-history-set-current' instead of
-	`w3m-history-forward-1'.
-	(w3m-history-push): Use `w3m-history-set-current'.
-	(w3m-history-store-position): Don't specify the `set-current' argument
-	to `w3m-history-add-properties'.
-	(w3m-history-restore-position): Don't specify the `set-current'
-	argument to `w3m-history-plist-get'.
-
-	* w3m.el (w3m-view-previous-page): Don't specify the `set-current'
-	argument to `w3m-history-plist-get'.
-	(w3m-goto-url): Don't specify the `set-current' argument to
-	`w3m-history-plist-put', `w3m-history-plist-get',
-	`w3m-history-remove-properties' and `w3m-history-add-properties'.
-	(w3m-reload-this-page): Don't specify the `set-current' argument to
-	`w3m-history-plist-get' and `w3m-history-remove-properties'.
-
-2003-08-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-view-this-url-1): Fix a window configuration if a new
-	buffer visiting the specified url is not in the `w3m-mode'; remove a
-	newly created buffer if it is useless.
-	(w3m-goto-url): Don't use `save-excursion' when performing find-file
-	directly.
-	(w3m-goto-url-new-session): Remove a newly created buffer if it is
-	useless.
-
-2003-08-12  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* Makefile.in (what-where): Add space to avoid error on Solaris.
-
-	* w3m-namazu.el (w3m-about-namazu): Fix last change.
-
-2003-08-11  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-hist.el (w3m-history-previous-position): New macro.
-	(w3m-history-next-position): New macro.
-	(w3m-history-forward-1): Simplified using new macro(s).
-	(w3m-history-backward-1): Ditto.
-	(w3m-history-regenerate-pointers): Ditto.
-	(w3m-history-assoc): Ditto.
-	(w3m-history-current-1): Don't use old-fashioned backquotes.
-	(w3m-history-save-position): Ditto.
-	(w3m-history-modify-properties): Ditto.
-	(w3m-history-with-element): Ditto.
-
-2003-08-10  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-namazu.el (w3m-about-namazu): Fixed problem when further links
-	contain "&amp;".
-
-2003-08-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-w3m-get-header): Removed.
-	(w3m-w3m-parse-header, w3m-w3m-dump-head): New function.
-	(w3m-w3m-attributes): Call the above functions.
-	(w3m-w3m-dump-head-source): Removed.
-	(w3m-w3m-dump-extra): New function.
-	(w3m-w3m-retrieve, w3m-w3m-retrieve-1): Reimplemented.
-	(w3m-about-header): Call `w3m-w3m-dump-head' instead of
-	`w3m-w3m-get-header'.
-
-	* w3m-proc.el: Changes to support recursive call of functions creating
-	asynchronous processes.
-	(w3m-process-waited): Abolished.
-	(w3m-process-handler-new): Add result slot.
-	(w3m-process-handler-functions): Renamed from
-	`w3m-process-handler-function'.
-	(w3m-process-handler-result): New macro.
-	(w3m-process-with-null-handler): Reimplemented.
-	(w3m-process-start-and-wait): New function.
-	(w3m-process-with-wait-handler): Reimplemented.
-	(w3m-process-do): Reimplemented.
-	(w3m-process-do-with-temp-buffer): Reimplemented.
-	(w3m-process-sentinel): Accept the 3rd argument.  Follow the above
-	changes.
-
-2003-08-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-hist.el (w3m-history-reuse-history-elements): New user option.
-	(w3m-history-forward): Return a cons of a new history element and new
-	position pointers of a history.
-	(w3m-history-backward): Ditto.
-	(w3m-history-regenerate-pointers): New function.
-	(w3m-history-push): If `w3m-history-reuse-history-elements' is nil,
-	sprout a new history branch even if history elements for the same url
-	already exist.
-	(w3m-history-add-arrived-db): Abolish the optional argument; bind
-	`w3m-history-reuse-history-elements' to t.
-
-	* w3m.el (w3m-view-previous-page): Assume `w3m-history-backward'
-	returns cons data; bind `w3m-history-reuse-history-elements' to t; fix
-	position pointers of a history after visiting a page.
-	(w3m-goto-url): Fix position pointers of a history when a page is
-	referred to by the about://history/ page.
-	(w3m-about-history): Include position pointers in an html form.
-	(w3m-history-highlight-current-url): Make history position data
-	invisible.
-
-2003-07-30  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-decode-entities): Don't trust in the `match-data' after
-	the `w3m-entity-value' function is performed.
-
-2003-07-29  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-command, w3m-user-agent, w3m-command-arguments,
-	w3m-command-arguments-alist, w3m-no-proxy-domains,
-	w3m-command-environment, w3m-fill-column, w3m-mailto-url-function,
-	w3m-mailto-url-popup-function-alist, w3m-imitate-widget-button,
-	w3m-pixels-per-character, w3m-coding-system,
-	w3m-terminal-coding-system, w3m-input-coding-system,
-	w3m-output-coding-system, w3m-file-coding-system,
-	w3m-file-name-coding-system, w3m-default-coding-system,
-	w3m-coding-system-priority-list, w3m-profile-directory, w3m-init-file,
-	w3m-default-save-directory, w3m-accept-languages, w3m-icon-directory,
-	w3m-home-page, w3m-arrived-file, w3m-keep-arrived-urls,
-	w3m-keep-cache-size, w3m-follow-redirection, w3m-resize-image-scale,
-	w3m-default-content-type, w3m-content-type-alist,
-	w3m-encoding-type-alist, w3m-decoder-alist,
-	w3m-charset-coding-system-alist, w3m-correct-charset-alist,
-	w3m-horizontal-scroll-columns, w3m-horizontal-shift-columns,
-	w3m-edit-function, w3m-url-local-directory-alist,
-	w3m-pop-up-frame-parameters, w3m-horizontal-scroll-division,
-	w3m-mbconv-command, w3m-local-find-file-regexps,
-	w3m-local-find-file-function, w3m-local-directory-view-method,
-	w3m-dirlist-cgi-program, w3m-add-referer-regexps, w3m-touch-command,
-	w3m-uri-replace-alist, w3m-db-history-display-size,
-	w3m-select-buffer-window-ratio): Improve the customizing widgets.
-
-	* w3m-symbol.el (w3m-symbol-custom-type): New variable.
-	(w3m-default-symbol, w3m-Chinese-BIG5-symbol, w3m-Chinese-CNS-symbol,
-	w3m-Chinese-GB-symbol, w3m-Japanese-symbol, w3m-Korean-symbol): Use it.
-	(w3m-symbol): Improve the customizing widgets.
-
-	* w3m-search.el (w3m-search-engine-alist, w3m-search-default-engine):
-	Improve the customizing widgets.
-	* w3m-perldoc.el (w3m-perldoc-command, w3m-perldoc-pod2html-command,
-	w3m-perldoc-pod2html-arguments): Ditto.
-	* w3m-filter.el (w3m-filter-rules): Ditto.
-
-2003-07-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-namazu.el (w3m-namazu-command, w3m-namazu-arguments,
-	w3m-namazu-page-max, w3m-namazu-default-index-customize-spec,
-	w3m-namazu-index-alist, w3m-namazu-output-coding-system,
-	w3m-namazu-input-coding-system): Improve the customizing widgets.
-	* w3m-image.el (w3m-imagick-convert-program): Ditto.
-	* w3m-form.el (w3m-form-input-textarea-buffer-lines,
-	w3m-form-input-select-buffer-lines, w3m-form-input-map-buffer-lines):
-	Ditto.
-	* w3m-filter.el (w3m-filter-rules): Ditto.
-	* w3m-e21.el (w3m-favicon-size, w3m-favicon-cache-file,
-	w3m-favicon-cache-expire-wait, w3m-favicon-type, w3m-tab-width): Diito.
-	* w3m-dtree.el (w3m-dtree-directory-depth, w3m-dtree-indent-strings,
-	w3m-dtree-stop-strings): Ditto.
-	* w3m-cookie.el (w3m-cookie-accept-domains, w3m-cookie-reject-domains,
-	w3m-cookie-accept-bad-cookies, w3m-cookie-file): Ditto.
-	* w3m-bookmark.el (w3m-bookmark-file, w3m-bookmark-file-coding-system,
-	w3m-bookmark-default-section): Ditto.
-	* w3m-bitmap.el (w3m-bitmap-convert-arguments): Ditto.
-	* w3m-antenna.el (w3m-antenna-sites, w3m-antenna-make-summary-function,
-	w3m-antenna-sort-changed-sites-function,
-	w3m-antenna-sort-unchanged-sites-function, w3m-antenna-file): Ditto.
-	* mime-w3m.el (mime-w3m-safe-url-regexp): Ditto.
-
-2003-07-27  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-accept-japanese-characters): Checked loosely.
-
-2003-07-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Makefile.in (clean): Do not remove `shimbun-servers.el'.
-
-	* w3mhack.el: Do not generate `shimbun-servers.el'.
-	(shimbun-servers-file): Abolished.
-	(w3mhack-compile, w3mhack-batch-compile): Do not call
-	`w3mhack-check-shimbun-servers-file'.
-	(w3mhack-generate-shimbun-servers-file): Removed.
-	(w3mhack-check-shimbun-servers-file): Removed.
-
-	* w3m.el (w3m-fontify-anchors): Handle `id' attributes of anchors.
-	Thanks to Shinichiro HIDA and TAKAISHI Hayato for their reports.
-	(w3m-fontify-bold, w3m-fontify-underline): Stricten regular expressions
-	to detect tags.  For more detail, see [emacs-w3m:05600].
-
-2003-07-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* mime-w3m.el (mime-w3m-display-inline-images): Improve the customizing
-	widget.
-
-2003-07-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-language, w3m-command-environment,
-	w3m-content-type-alist, w3m-encoding-type-alist, w3m-decoder-alist,
-	w3m-charset-coding-system-alist, w3m-correct-charset-alist,
-	w3m-url-local-directory-alist, w3m-pop-up-frame-parameters): Improve
-	the customizing widgets.
-
-2003-07-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-generate-shimbun-servers-file): Exclude rss.
-
-2003-07-25  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-form.el (w3m-form-set-method): New inline function, that is a
-	`setf' method of `w3m-form-method'.
-
-	* w3mhack.el (w3mhack-examine-modules): Because Mew 2.x and later do
-	not support Mule2.3 and Emacs19, ignore mew-shimbun.el when compiling
-	on such Emacsen.
-
-2003-07-24  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-output-coding-system): Changed condition to use utf-8
-	with w3m-m17n.
-	(w3m-halfdump-command-arguments): Ditto.
-
-2003-07-24  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-form.el (w3m-form-parse-and-fontify): Fix for the pages in which
-	form_int appears after input_alt.
-
-2003-07-23  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-makeinfo): Force texinfmt.elc to load texinfo.elc
-	from the correct place.  <cf. [emacs-w3m:05573]>
-
-2003-07-19  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-e21.el (w3m-euc-japan-encoder): Fixed comment.
-
-
-2003-07-18  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Release emacs-w3m-1.3.6 from emacs-w3m-1_3 branch.
-
-2003-07-18  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-e21.el (w3m-ccl-get-ucs-codepoint-with-emacs-unicode): Remove
-	`translate-character'.
-	(w3m-euc-japan-encoder, w3m-iso-latin-1-encoder): Select appropriate
-	encoders when thie file is loaded.
-
-	* w3m-ccl.el (w3m-ccl-write-repeat): Use a literal list of unibyte
-	character sets, instead of calling `charset-bytes', in order to avoid
-	difference between FSF Emacs and XEmacs.
-	(w3m-euc-japan-encoder, w3m-iso-latin-1-encoder): Do not overwrite, if
-	they have already been defined.
-
-2003-07-17  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-examine-modules): Ignore w3m-ccl.el when XEmacs
-	doesn't provide the mule feature.
-
-2003-07-17  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-correct-charset-alist): New user option.
-	(w3m-correct-charset): New inline macro.
-	(w3m-detect-meta-charset): New function.
-	(w3m-decode-buffer): Use `w3m-correct-charset' and
-	`w3m-detect-meta-charset'.
-	(w3m-create-page): Set `charset' to `w3m-current-content-charset' if it
-	is nil.
-	(w3m-region): If `charset' is nil, check `content-charset' in `META
-	Tag'.
-
-2003-07-17  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-ccl.el (toplevel): Add autoload for `charset-id' defined at
-	w3m-om.el.
-	(w3m-ccl-write-repeat): Simplified.
-	(w3m-ccl-write-euc-japan-character): Set nil, when
-	`read-multibyte-character' is not available.
-	(w3m-ccl-write-iso-latin-1-character): Ditto.
-
-	* w3m-om.el: Remove redundant `function'.
-	(w3m-om-character-set-alist): New variable.
-	(charset-id): New function.
-
-	* w3m.el (w3m-input-coding-system): Change its default value for
-	Mule2.3 and Emacsen without Mule.
-
-2003-07-17  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3mhack.el (w3mhack-examine-modules): Ignore w3m-ccl.el when ccl.el
-	is missing.
-
-	* w3m-e21.el (w3m-ccl-get-ucs-codepoint-with-emacs-unicode): Import
-	from w3m-ccl.el.
-
-	* w3m-ucs.el (w3m-ccl-get-ucs-codepoint-with-mule-ucs): Import from
-	w3m-ccl.el.
-
-	* w3m-ccl.el: Export the above constants.
-
-	* w3m.el (w3m-retrieve-and-render): Check current content charset
-	before `w3m-create-page' is called.
-
-2003-07-17  ARISAWA Akihiro <ari@mbf.sphere.ne.jp>
-	    TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (toplevel): Do not require `ccl'.
-	(w3m-input-coding-system): Change its default value.
-	(w3m-internal-characters-alist): Moved to w3m-ccl.el
-	(w3m-ccl-write-repeat): Ditto.
-	(w3m-euc-japan-decoder): Ditto.
-	(w3m-euc-japan-encoder): Ditto.
-	(w3m-iso-latin-1-decoder): Ditto.
-	(w3m-iso-latin-1-encoder): Ditto.
-
-	* w3m-ccl.el: New file.
-
-	* w3m-ucs.el: Completely rewritten.
-	(w3m-euc-japan-mule-ucs, w3m-iso-latin-1-mule-ucs): New coding systems.
-
-	* w3m-e21.el (toplevel): Require `w3m-ccl'.
-	(w3m-euc-japan-encoder, w3m-iso-latin-1-encoder): New encoder.
-
-	* w3m-om.el, w3m-e20.el, w3m-xmas.el (toplevel): Require `w3m-ccl'.
-
-2003-07-17  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-about-db-history): Call `w3m-arrived-time' with string.
-
-2003-07-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-uri-replace-alist): Improve the customizing widget.
-
-2003-07-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-copy-buffer): Fix the logical error installed by the last
-	change at 2003-07-15.
-
-2003-07-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-image-only-page): Abolished.
-	(w3m-show-error-information): Return nil.
-	(w3m-create-text-page): Return 'text-page.
-	(w3m-create-image-page): Return 'image-page.
-	(w3m-create-page): Return 'external-view when `w3m-external-view' is
-	called.
-	(w3m-goto-url): Do not encode a given URL when it points a local page.
-	Bind `w3m-current-buffer' locally.  Follow the change of
-	`w3m-create-page'.
-	(w3m-copy-buffer): Wrap `w3m-goto-url' with
-	`w3m-process-with-wait-handler', to avoid unexpected asynchronous
-	processes.
-	(w3m-region): Bind `w3m-current-buffer' locally.
-
-	* w3m-util.el (w3m-url-local-p): Stricten its regexp.
-	(w3m-url-dtree-p): Removed.
-
-2003-07-10  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-uri-replace-alist): Revert 2003-07-09 change; improve the
-	customizing widget.
-
-	* doc/ptexinfmt.el (texinfo-discard-command-and-arg): New function for
-	old Emacsen.
-
-2003-07-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-decoder-alist): Simplified.
-
-2003-07-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-decoder-alist): Look for the newest inflate command.
-
-2003-07-09  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* mew-w3m.el (w3m-mew-support-cid): Check `mew-version-number'.
-	(mew-w3m-cid-retrieve): Support Mew 4.0.53 and later.  Thanks to Kazu
-	YAMAMOTO for his patch.
-
-2003-07-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-uri-replace-alist): Add `rpm', `waei', `eiwa', `kokugo'
-	and `eiei'.
-	(w3m-input-url): Do not encode its return value.
-	(w3m-goto-url): Call `w3m-url-transfer-encode-string' to encode a given
-	URL.
-
-
-2003-07-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Release emacs-w3m-1.3.5 from emacs-w3m-1_3 branch.
-
-2003-07-04  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-view-this-url-1): Simply copy buffer's contents to the
-	new session rather than to call `w3m-goto-url'.
-
-2003-07-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-local-file-type): Check whether a regular expression is
-	specified, before matching it on a URL.
-
-	* Following changes are to check whether required libraries are
-	available.
-
-	* w3mhack.el (toplevel): Do not create `shimbun/shimbun-servers.el' and
-	`w3m-kwds.el' only when this file is loaded, to suppress excessive
-	messages.
-	(w3mhack-check-shimbun-servers-file): New function.
-	(w3mhack-check-colon-keywords-file): New function.
-	(w3mhack-compile): Call these functions explicitly.
-	(w3mhack-batch-compile, w3mhack-locate-library, w3mhack-print-status):
-	New functions.
-
-	* configure.in: Check that egrep is available and that regexp-opt.el
-	and xml.el are available.
-
-	* aclocal.m4 (AC_EMACS_LISP): Add `-q' option and `-no-site-file'
-	option.
-	(AC_ADD_LOAD_PATH): Define `--with-attic' option.
-	(AC_CHECK_ELISP): New function.
-
-	* Makefile.in (.el.elc): Call `w3mhack-batch-compile' instead of
-	`batch-byte-compile'.
-	(very-slow): Always call `keywords' target.
-	(keywords): Call `w3mhack-check-colon-keywords-file'.
-
-2003-07-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-antenna.el (w3m-about-antenna): Fix the expression to decide
-	changed sites.
-
-	* w3m.el (w3m-retrieve-and-render): Do not overwrite an arrived time
-	with a modified time, even if the modified time is newer than the
-	arrived time.  Store a real URL to arrived DB.
-	(w3m-about-db-history): Small clean up.
-
-	* attic/xml.el: Import contrib/xml.el of Oort Gnus.  Require cl and
-	poe.
-
-2003-07-02  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-bookmark.el (w3m-bookmark-add): Encode special characters
-	included in a URL and a title.
-
-	* w3m-antenna.el (w3m-antenna-check-all-sites): Use `w3m-antenna-alist'
-	instead of `w3m-antenna-sites'; this change must have no ill effects
-	because `w3m-use-setup' merges site informations kept by
-	`w3m-antenna-sites' into `w3m-antenna-alist'.
-	(w3m-about-antenna): Fix.
-	(w3m-antenna-add-current-url): Encode special characters included in
-	`w3m-current-title'.
-
-	* w3m.el: Changes of functions handling the arrived database, and clean
-	up w3m-retrieve-and-render() and related parts.
-	(w3m-content-type-alist): Change spec.
-	(w3m-attributes): Strip authentication part from URL before checking
-	charsets given by a user.
-	(w3m-arrived-add-1): Removed.
-	(w3m-arrived-add): Reimplemented.
-	(w3m-arrived-modify): Removed.
-	(w3m-arrived-time): Define its `setf' method.
-	(w3m-arrived-get, w3m-arrived-put): New inline functions.
-	(w3m-arrived-title): Define as a macro using `w3m-arrived-get'.
-	(w3m-arrived-last-modified): Ditto
-	(w3m-arrived-content-charset): Ditto
-	(w3m-arrived-content-type): Ditto.
-	(w3m-arrived-shutdown): Modify a predicate used for comparing arrived
-	elements, to ensure that every URL precedes its variants with
-	fragments.
-	(w3m-encode-specials-string): New function.
-	(w3m-safe-decode-buffer): New function.
-	(w3m-rendering-extract-title): Simplified.
-	(w3m-rendering-half-dump): Define as a normal function.
-	(w3m-rendering-buffer): Do not call `w3m-filter'.
-	(w3m-retrieve-and-render): Reimplemented.
-	(w3m-show-error-information): Change its argument spec.
-	(w3m-content-prepare-functions): Abolished.
-	(w3m-prepare-content): Reimplemented.
-	(w3m-prepare-text-content, w3m-prepare-image-content): Removed.
-	(w3m-create-text-page, w3m-create-image-page): New functions; the
-	successors of the aboves.
-	(w3m-create-page): New function.
-	(w3m-goto-url): Follow above changes and clean up.
-	(w3m-redisplay-and-reset): Call `setf' methods instead of using
-	`w3m-arrived-modify'.
-	(w3m-redisplay-with-charset): Ditto.
-	(w3m-redisplay-with-content-type): Ditto.
-	(w3m-about-header): Strip authentication part from URL before
-	extracting titles.
-	(w3m-about-history): Encode special characters included in a title.
-	(w3m-about-db-history): Encode special characters in the title.  Ignore
-	URLs that include fragments.
-
-2003-07-01  TAKAHASHI Kaoru  <kaoru@kaisei.org>
-
-	* doc/ptexinfmt.el: @verb, @tie, @/ support.
-	(ptexinfmt-broken-facility): Abolish NO-NOTICE argument.  Use
-	`ptexinfmt-disable-broken-notice-flag' instead.
-
-2003-07-01  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* mew-w3m.el (mew-mime-text/html-w3m): Add CHARSET argument of
-	`w3m-region' when no w3m-m17n.
-
-2003-07-01  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* mime-w3m.el (mime-w3m-preview-text/html): Call `w3m-region' with
-	`charset' option.
-
-2003-07-01  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-goto-url): Use `w3m-url-strip-fragment' instead of
-	`w3m-base-url' for local files.
-
-2003-07-01  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-arrived-load-list): Check that `w3m-arrived-file' exists
-	before deleting it.
-	(w3m-check-refresh-attribute): Condition relaxed.
-	(w3m-region): Disable checking refresh attribute.
-
-2003-06-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Some miscellaneous changes and large changes to make a filter
-	module cooperate with w3mmee and w3m-m17n.
-	(w3m-language): Stricten its customize spec.
-	(w3m-attributes): Call `w3m-url-strip-fragment' instead of using a
-	literal regular expression.
-	(w3m-arrived-load-list): New function.
-	(w3m-arrived-setup, w3m-arrived-shutdown): Use the above.
-	(w3m-url-decode-string): Call `vector' instead of `string' to avoid
-	making unexpected multibyte characters.
-	(w3m-decode-buffer): Do not call `w3m-decode-get-refresh'.
-	(w3m-decode-get-refresh): Removed.
-	(w3m-check-refresh-attribute): New function, the successor of the
-	above.
-	(w3m-rendering-half-dump): Encode a content for w3mmee and w3m-m17n
-	with `w3m-current-coding-system' instead of giving it as a binary data.
-	Because `w3m-current-coding-system' keeps a coding system used to
-	decode the current buffer, all characters should be recovered by this
-	encoding.
-	(w3m-rendering-buffer-1): Removed.
-	(w3m-rendering-buffer): New function, the successor of the above.
-	(w3m-rendering-unibyte-buffer): Removed.
-	(w3m-rendering-multibyte-buffer): Removed.
-	(w3m-prepare-text-content): Always call `w3m-decode-buffer'. Call
-	`w3m-rendering-buffer' instead of `w3m-rendering-unibyte-buffer'.
-	(w3m-goto-url): Fix regular expressions.
-	(w3m-region): Accept the 4th optional argument, `charset'.  Set
-	`w3m-current-coding-system' to the coding system based on the given
-	charset.  Call `w3m-rendering-buffer' with the charset.
-
-2003-06-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-makeinfo): Include other files first.
-
-2003-06-23  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-shimbun-modules-using-rss): Don't use
-	`with-temp-buffer'.
-
-2003-06-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3mhack.el (w3mhack-shimbun-modules-using-rss): New function.
-	(w3mhack-examine-modules): Call the above instead of a literal list.
-
-2003-06-20  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* doc/Makefile.in (install): Don't run install-info for non- existent
-	info files.
-
-	* w3mhack.el (w3mhack-examine-modules): Also examine
-	"sb-pukiwiki-rss.el".
-
-2003-06-19  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-namazu.el (w3m-namazu-complete-index): Consider `predicate'
-	option.
-
-	* w3m-weather.el (w3m-weather-completion-table): Add `oki' as the
-	shortend form of `shimanekenoki'.
-
-2003-06-18  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-fontify-anchors): Do not encode fragment parts.
-
-2003-06-18  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-examine-modules): Ignore the shimbun modules
-	which need xml.el if it is not available.
-
-2003-06-18  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-makeinfo): Improve the last change.
-
-
-2003-06-18  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Release emacs-w3m-1.3.4 from emacs-w3m-1_3 branch.
-
-2003-06-18  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-arrived-ignored-regexp): Use "\`" instead of "^".
-	(w3m-history-ignored-regexp): Ditto.
-	(w3m-url-transfer-encode-string): New inline function.
-	(w3m-fontify-anchors): Encode URL with the attribute `charset'.
-	(w3m-input-url): Encode URL with `w3m-default-coding-system'.
-	(w3m-about-header): Display the current anchor information.
-
-	* w3m-form.el (w3m-form-parse-and-fontify): Encode URL with the
-	attribute `charset'.
-
-2003-06-17  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-makeinfo): Encode messages to terminal while
-	formatting info pages.
-
-2003-06-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-w3m-attributes): Improve the regexp to extract
-	content-types.
-
-2003-06-08  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-form.el (w3m-form-parse-and-fontify): Apply
-	`w3m-decode-anchor-string' to the form action url.
-
-2003-06-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* doc/emacs-w3m.texi, doc/emacs-w3m-ja.texi: Their license is changed
-	from GNU Free Documentation License to GNU General Public License.
-
-2003-05-30  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* octet.el (toplevel): Require poe.
-	(octet-filter-call1): Use `make-temp-file' instead of `make-temp-name'.
-	(octet-filter-call2): Ditto.
-	(octet-filter-call2-extra): Ditto.
-	(octet-temp-directory): Changed default value to
-	`temporary-file-directory'.
-
-2003-05-29  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Makefile.in (DOCS): FAQ, FAQ.ja, README.namazu.ja, README.shimbun.ja,
-	TIPS and TIPS.ja are merged into Info.
-
-2003-05-29  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* doc/Makefile.in (dvi): New target to create dvi files; related
-	targets and macros are installed.
-
-	* doc/.cvsignore: Ignore dvi files.
-
-	* configure.in: Check whether texi2dvi, ptex and jbibtex exists.
-
-2003-05-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* .cvsignore: Ignore tarballs.
-
-	* Makefile.in (SUBDIRS): New macro.
-	(tarball): Refer the above macro, and put texinfo sources into a
-	tarball.
-
-	* aclocal.m4 (AC_ADD_LOAD_PATH): Use the variable `EGREP' instead of
-	the literal `grep'.
-
-2003-05-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (byte-optimizer for match-string-no-properties): `lenght'
-	-> `length'.
-
-2003-05-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Simplify functions that rewrite URIs.
-	(toplevel): Autoload `w3m-search-uri-replace' instead of
-	`w3m-search-quick-search-handler'.
-	(w3m-uri-replace-alist): Changed its default value and its customize
-	spec.
-	(w3m-pattern-uri-replace): New function.
-	(w3m-uri-replace): Reimplemented.
-
-	* w3m-search.el (w3m-search-quick-search-engine-alist): Abolished.
-	(w3m-search-quick-search-engines): Removed.
-	(w3m-search-quick-search-handler): Removed.
-	(w3m-search-uri-replace): New function.
-
-2003-05-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-highlight-current-anchor): Don't infloop even if a w3m
-	buffer is narrowed.
-
-2003-05-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-make-package): Make it work under non-Mule
-	XEmacs.
-
-2003-05-19  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* mew-w3m.el (mew-w3m-use-safe-url-regexp): New variable.
-	(mew-w3m-view-inline-image, mew-mime-text/html-w3m): Use
-	`mew-w3m-use-safe-url-regexp' for `w3m-safe-url-regexp'.
-
-2003-05-12  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (Top): Use w3m-treat-drive-letter for `w3m-expand-path-name'.
-
-2003-05-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* mime-w3m.el (mime-w3m-preview-text/html): Apply the patch posted by
-	Yoichi NAKAYAMA <yoichi@geiin.org> in [emacs-w3m:04836], that correct
-	the wrong usage of `message'.
-
-2003-05-06  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-fontify-anchors): Invalidate the widget keymap in XEmacs;
-	add a help-echo to the widget button.
-	(w3m-make-minor-mode-keymap): Bind [down-mouse-2] to `undefined' to
-	invalidate the `widget-button-click' command in FSF Emacs.
-
-2003-04-30  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-imitate-widget-button): New variable.
-	(w3m-imitate-widget-button): New function.
-	(w3m-fontify-anchors): Imitate the widget button.
-	(w3m-next-anchor): Look for the widget button.
-	(w3m-previous-anchor): Ditto.
-
-2003-04-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-retrieve-and-render): Hide a exit status from an error
-	message unless `w3m-process-exit-status'.
-
-2003-04-30  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-goto-url): Improve and bug fix the find-file code.
-
-2003-04-16  Chihiro Kuroda  <chee@iijmio-mail.jp>
-
-	* w3m.el (w3m-download): Download a directory url to index.html
-	(by default) instead of signaling an error.
-
-2003-04-11  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-local-find-file-regexps): New user option.
-	(w3m-local-find-file-function): New user option.
-	(w3m-goto-url): Use the function specified by the
-	`w3m-local-find-file-function' variable for local files when the file
-	name matches the `w3m-local-find-file-regexps' variable.
-
-2003-04-04  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-search.el (w3m-search-engine-alist): Change coding-system to
-	`euc-japan' of "waei" and "kokugo". Tnx, Mr. Saito (sai@yedo.com) for
-	his report.
-
-2003-03-26  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-antenna.el (w3m-antenna-check-all-sites): Call `make-symbol'
-	instead of `gensym', in order to make this function free from runtime
-	CL functions.
-
-2003-03-07  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bug.el (report-emacs-w3m-bug): Make it possible to send a bug
-	report even if emacs-w3m is not running.
-
-2003-03-03  Michael Shields  <shields@msrl.com>
-
-	* w3m-xmas.el (w3m-create-image): Protect against images which are not
-	permitted to be loaded according to `w3m-safe-url-regexp'.
-
-2003-02-28  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-util.el (w3m-get-server-hostname): Rename and move from
-	`w3m-process-get-server-root' in `w3m-proc.el'.
-
-	* w3m-proc.el (w3m-process-set-authinfo, w3m-process-read-user)
-	(w3m-process-read-passwd, w3m-process-y-or-n-p): Use
-	`w3m-get-server-hostname' instead of `w3m-process-get-server-root'.
-
-	* w3m.el (w3m-show-error-information): New customized variable.
-	(w3m-w3m-attributes): Message strange `Location:' like lynx.
-	(w3m-retrieve-and-render): When error occur, show error message in `w3m
-	buffer' to be accompanied by `w3m-show-error-information'.
-	(w3m-show-error-information): New function.
-	(w3m-reload-this-page, w3m-redisplay-this-page)
-	(w3m-redisplay-and-reset, w3m-redisplay-with-charset)
-	(w3m-view-source, w3m-view-header): If `w3m-current-url' is nil, dont'
-	execute command.
-	(w3m): Guard from the bug of `select-frame-set-input-focus' in
-	Emacs-21.3.x. If `w3m-current-url' is nil in `w3m buffer'
-
-2003-02-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-generate-shimbun-servers-file): Exclude fml,
-	glimpse, lump, mailarc, mailman, mhonarc and text; indent.
-	(w3mhack-generate-colon-keywords-file): indent.
-
-2003-02-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-search.el (w3m-search-engine-alist): Add www.alltheweb.com
-	suggested by Chris Beggy <chrisb@kippona.com>; make the default value
-	more suitable to the language environment; don't use the old fashioned
-	backquotes.
-	(w3m-search-default-engine): Always default to google.
-	(w3m-search-prefer-japanese-site): Remove.
-	(w3m-search-inhibited-japanese-engines): Remove.
-	(w3m-search): Bind `completion-ignore-case' to t.
-	(w3m-search-quick-search-handler): Remove
-	`w3m-search-prefer-japanese-site' and
-	`w3m-search-inhibited-japanese-engines'.
-
-2003-02-26  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-w3m-attributes): Allow imperfect Status-Line like no
-	Reason-Phrase. Guard broken header like no location field.
-
-2003-02-25  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-util.el (w3m-url-local-p): Use `\`' instead of `^'.
-
-2003-02-21  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-local-dirlist-cgi): Treat a `local cookie file', again.
-
-2003-02-16  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-type): Support "release candidate" of w3m.
-
-2003-02-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-insert-image): Use `map-extents' instead of
-	`extent-at' repeatedly.
-	(w3m-remove-image): Ditto.
-
-2003-02-05  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-form.el (w3m-form-submit): Remove `!CURRENT_URL!' from action
-	tag.
-
-2003-02-04  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (TopLevel): Don't gererate the w3m-kwds.el file if there
-	is no permission to write.
-
-	* Makefile.in (clean): Remove shimbun/shimbun-servers.el.
-
-2003-02-04  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
-	Katsumi Yamaoka <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-generate-shimbun-servers-file): New function.
-	(TopLevel): Call it.
-
-2003-02-04  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
-
-	* w3mhack.el (shimbun-servers-file): New constant.
-
-2003-02-04  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-mode): Bind `auto-hscroll-mode' for Emacs-21.3.
-
-2003-01-30  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-image-type): Move forward.
-	(w3m-fontify-images): Use `w3m-action' and `w3m-anchor' instead of
-	`get-text-property'.
-	(w3m-toggle-inline-images-internal): Use `w3m-image' instead of
-	`get-text-property'.
-	(w3m-toggle-inline-image): Don't specify the arg to `w3m-image'.
-	(w3m-resize-inline-image-internal): Use `w3m-image' instead of
-	`get-text-property'.
-	(w3m-zoom-in-image): Don't specify the arg to `w3m-image'.
-	(w3m-zoom-out-image): Ditto.
-	(w3m-view-this-url): Don't bother to call `w3m-anchor' if it is
-	needless.
-	(w3m-print-this-url): Don't pull-in the point into the link if it is
-	called non-interactively.
-	(w3m-highlight-current-anchor-1): Use `w3m-anchor-sequence' instead of
-	`get-text-property'.
-	(w3m-next-anchor): Don't put `nil' element into `w3m-goto-anchor-hist';
-	use `push' instead of `cons'.
-	(w3m-previous-anchor): Ditto.
-	(w3m-next-form): Use `w3m-action' instead of `get-text-property'; don't
-	put `nil' element into `w3m-goto-anchor-hist'; specify the current
-	position to `w3m-action'; use `push' instead of `cons'.
-	(w3m-goto-previous-form): indent.
-	(w3m-previous-form): Use `w3m-action' instead of `get-text-property';
-	don't put `nil' element into `w3m-goto-anchor-hist'; specify the
-	current position to `w3m-action'; use `push' instead of `cons'.
-	(w3m-next-image): Use `w3m-image' instead of `get-text-property'; don't
-	put `nil' element into `w3m-goto-anchor-hist'; specify the current
-	position to `w3m-image'; use `push' instead of `cons'.
-	(w3m-previous-image): Ditto.
-
-	* w3m-form.el (w3m-form-resume): Use `w3m-action' instead of
-	`get-text-property'; specify the current position to `w3m-action'.
-	(w3m-fontify-textareas): Use `w3m-anchor-sequence' instead of
-	`get-text-property'.
-	(w3m-form-replace): Use `w3m-action' instead of `get-text-property'.
-	(w3m-form-textarea-info): Use `get-text-property' instead of
-	`w3m-get-text-property-around'.
-	(w3m-form-reset): Use `w3m-action' instead of `get-text-property'.
-
-	* w3m-util.el (w3m-get-text-property-around): Always search for the
-	text prop around there and pull-in the point into the position where
-	the prop exists.
-	(w3m-action, w3m-anchor, w3m-image, w3m-submit): Use
-	`get-text-property' if the argument is omitted.
-	(w3m-image-scale): Abolished.
-	(w3m-anchor-sequence): Simplified.
-
-	* mime-w3m.el (mime-w3m-mode-map): Bind it when compiling.
-
-2003-01-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (top): Move the last addition (modifying the value for
-	`shell-file-name') just after loading `cl'.
-
-2003-01-28  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3mhack.el (top): Set `cmdproxy.exe' to `shell-file-name' when Win32
-	environment.
-
-2003-01-28  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-local-dirlist-cgi): Treat a `local cookie file'.
-
-2003-01-27  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-ucs.el (w3m-ucs-to-char): Guard error for Mule-UCS 0.85.
-
-2003-01-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-byte-optimize-letX): Add `pathname-coding-system'
-	to be removed from `let' bindings.
-
-2003-01-26  MIYOSHI Masanori  <miyoshi@boreas.dti.ne.jp>
-
-	* w3m-e21.el (w3m-favicon-type): Add BMP at the head of the list.
-	(w3m-favicon-type): Undo the last change and make the priority of BMP
-	the lowest.
-
-2003-01-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-makeinfo): Withdraw the change of 2003-01-09.
-
-2003-01-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3mhack.el (w3mhack-examine-modules, w3mhack-load-path): Check the
-	existence of Gnus for shimbun/nnshimbun.el.
-
-2003-01-21  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el (w3m-function-max-args): Don't use the arglist
-	destructively.
-
-	* mime-w3m.el (kill-new): Don't refer to the whole arglist of the
-	original function.
-
-2003-01-21  Masatake YAMATO  <jet@gyve.org>
-
-	* w3m.el (w3m-scroll-down-or-previous-url): Added doc string.
-
-2003-01-19  TSUCHIYA Masatoshi  <tsuchiya@pine.kuee.kyoto-u.ac.jp>
-
-	* w3m.el (toplevel): Strict checking that buggy `w3m-time-parse-string'
-	is used.
-
-2003-01-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-	Suggested by KURIHARA Kenichi <kenichi_kurihara@nifty.com>.
-
-	* w3m.el (w3m-async-exec): Always default to `t'.
-	(w3m-process-connection-type): Default to `nil' under MacOS X.
-
-2003-01-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-makeinfo): Insert one excessive newline after a
-	@foo{bar} thing to prevent clinging of a line and a line
-	(old texinfmt bug?) if it should be considered only one thing in a
-	line.
-
-2003-01-07  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* mew-w3m.el (mew-w3m-ext-url-show): Use `mew-buffer-message' instead
-	of `mew-window-configure'.
-
-2003-01-06  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* mew-w3m.el (mew-w3m-ext-url-show): New funcition.
-	(mew-w3m-ext-url-fetch): Ditto.
-	(top): Modify comment. Avoid byte-compile warning for
-	`mew-window-configure'.
-
-2002-12-20  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-about-db-history): Display the information of page.
-
-2002-12-19  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-local-dirlist-cgi): Treat a local cookie.
-
-2002-12-18  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-e21.el (w3m-favicon-type): Change default value and type of
-	custom.
-	(w3m-favicon-type-alist): New internal variable.
-	(w3m-setup-favicon): Don't check 'xpm.
-	(w3m-buffer-favicon): Decide image type of Emacs use
-	`w3m-favicon-type-alist'.
-
-2002-12-17  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-type): Suppert `stable version notation' of w3m-m17n.
-
-2002-12-12  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-use-favicon): Moved from w3m-e21.el.
-
-	* w3m-image.el (w3m-favicon-usable-p): Moved from w3m-e21.el.
-
-	* w3m-e21.el : Bind `w3m-use-favicon' when compiling.
-	(w3m-favicon-usable-p): Moved to w3m-image.el.
-	(w3m-use-favicon): Moved to w3m.el.
-
-2002-12-07  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-form.el (w3m-form-text-chop): Added nil check.
-
-2002-12-06  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-what-where): Don't say [-ja] especially.
-
-2002-12-03  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* doc/ptexinfmt.el: Modify it not to use APEL functions.
-
-	* w3mhack.el (w3mhack-makeinfo): Remove last temporal mod.
-
-2002-12-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-makeinfo): Temporally fix to help users who don't
-	have APEL that use texinfmt if loading doc/ptexinfmt.el is failed.
-
-2002-12-02  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* doc/Makefile.in: Remove GNU make things.
-
-2002-12-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-makeinfo): Don't format Japanes info if the mule
-	feature is not provided.
-
-	* aclocal.m4 (AC_PATH_LISPDIR, AC_PATH_ICONDIR): Undo last change.
-
-	* doc/Makefile.in (INSTALL_INFO): New variable.
-	(install): Use it.
-
-2002-11-29  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* Makefile.in (srcdir): New variable.
-	(FLAGS): Specify an absolute path to w3mhack.el.
-	(all-en): New rule.
-	(all-ja): Made it make only Japanese info.
-	(info-en): New rule.
-	(install-en): New rule.
-	(install-ja): Made it install only Japanese info.
-	(install-lisp): Use `$(srcdir)/' instead of `./'.
-	(install-icons): Ditto.
-	(install-info-en): New rule.
-	(Makefile): Use `$(srcdir)/' instead of `./'.
-	(config.status): Ditto.
-	(very-slow): Specify an absolute path to attic/addpath.el.
-
-	* doc/.cvsignore: Add version.texi.
-
-	* doc/ChangeLog: Removed.
-
-	* doc/Makefile.in (srcdir, subdir, top_srcdir): New variables.
-	(FLAGS): Specify an absolute path to w3mhack.el.
-	(EMACSINFO): Use `$(top_srcdir)' instead of `..'.
-	(INFO_DEPS): Include both emacs-w3m.info and emacs-w3m-ja.info.
-	(INFO_DEPS_EN): New variable.
-	(en): New rule.
-	(version.texi): New rule.
-	(emacs-w3m.info): Made it depend on version.texi.
-	(emacs-w3m-ja.info): Ditto.
-	(install): Use `$(top_srcdir)/' instead of `../'.
-	(install-en): New rule.
-
-	* doc/version.texi: Removed from the CVS repository.
-
-2002-11-29  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* doc/Makefile.in (clean): Fix target.
-
-2002-11-29  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3mhack.el (w3mhack-nonunix-install): Create parent directories.
-
-2002-11-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* doc/texinfo.tex: Replaced with the latest version.
-
-2002-11-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-header-line-map): Prevent tool-bar from being doubled
-	under Emacs 21.
-
-2002-11-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* Makefile.in (infodir): Add a variable.
-	(default): Use `all'.
-	(all, all-ja): New rules.
-	(lisp): Renamed from `default'.
-	(what-where): Pass `infodir' to `w3mhack-what-where'.
-	(info, info-ja): New rules.
-	(install): Use `install-lisp' and `install-info'.
-	(install-ja): New rule.
-	(install-lisp): Renamed from `install'.
-	(install-info, install-info-ja): New rules.
-	(install-package): Use `install-lisp' instead of `install'; install
-	info files as well.
-	(install-package-ja): New rule.
-	(clean): Remove info files as well.
-	(distclean): Remove doc.Makefile as well.
-
-	* aclocal.m4 (AC_PATH_LISPDIR, AC_PATH_ICONDIR): Modify a message for
-	`install-package'.
-
-	* configure.in: Check for the makeinfo command; create doc/Makefile.
-
-	* w3mhack.el (w3mhack-make-package): Add info file names into a
-	MANIFEST file.
-	(w3mhack-what-where): Show where info files will go.
-	(w3mhack-makeinfo): New function.
-
-2002-11-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* doc/Makefile.in, .cvsignore: New file.
-
-	* doc/emacs-w3m.texi, emacs-w3m-ja.texi: Correct copyright holder.
-
-	* doc/emacs-w3m.texi: Renamed from emacs-w3m-en.texi.
-
-	* doc/txi.tex: Renamed from txi-en.tex.
-
-2002-11-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-search.el (w3m-search-engine-alist): Specify coding-system for
-	the waei and kokugo entries.  Suggested by Hideyuki SHIRAI.
-
-2002-11-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* doc/emacs-w3m-en.texi, emacs-w3m-en.texi: Convert to GFDL.
-
-2002-11-27  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
-
-	* doc/emacs-w3m-en.texi: New files.
-	* doc/emacs-w3m-ja.texi:
-	* doc/ptexinfmt.el:
-	* doc/texinfo.tex:
-	* doc/txi-en.tex:
-	* doc/txi-ja.tex:
-	* doc/version.texi:
-
-2002-11-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-tabmenu.el (w3m-tab-menubar-update): Do nothing when there's no
-	menubar.
-
-2002-11-18  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-view-this-url-1): Keep position when new-session and
-	`w3m-view-this-url-new-session-in-background' is non-nil.
-
-2002-11-17  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* mew-w3m.el (mew-mime-text/html-w3m): Use `match-string-no-properties'
-	if it exist.
-
-2002-11-15  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-goto-url): Use an optional argument and the function
-	`interactive' to examine whether it is called interactively instead of
-	the function `interactive-p'.  Suggested by TSUCHIYA Masatoshi.
-	(w3m-goto-url-new-session): Ditto.
-	(w3m): Ditto.
-	(w3m-select-buffer-show-this-line): Ditto.
-
-2002-11-14  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-w3m-attributes): Bind `case-fold-search' to t.
-
-2002-11-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-search.el (w3m-search-engine-alist): Add some dictionaries.
-	(w3m-search-default-engine): Default to google.
-	(w3m-search-quick-search-engine-alist): Add iij-archie; add
-	customization type.
-	(w3m-search-prefer-japanese-site): New user option.
-	(w3m-search-inhibited-japanese-engines): New user option.
-	(w3m-search-quick-search-engines): New function.
-	(w3m-search-quick-search-handler): Maybe use a Japanese site; use
-	`w3m-search-quick-search-engines' to merge `w-s-engine-alist' and
-	`w-s-quick-search-engine-alist'.
-
-	* w3m.el (w3m): Allow quicksearch urls if interactive.
-
-2002-11-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3.el (w3m-view-this-url-1): Copy `w3m-current-url' into a copied
-	buffer.
-	(w3m-goto-url): Allow the 7th argument `qsearch'; use it to recursive
-	call the function itself if the quicksearch feature is permitted.
-	(w3m-goto-url-new-session): Specify the 7th arg of `w3m-goto-url' if it
-	is called interactively.
-
-2002-11-08  Romain FRANCOISE  <romain@orebokech.com>
-
-	* w3m-search.el (w3m-search-engine-alist): Add "google groups".
-	(w3m-search-quick-search-engine-alist): New user option.
-	(w3m-search-quick-search-handler): New function.
-
-	* w3m.el: Autoload `w3m-search-quick-search-handler'.
-	(w3m-goto-url): Use `w3m-search-quick-search-handler' to parse
-	quicksearch url schemes.
-
-2002-11-06  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-bookmark.el (w3m-bookmark-safe-string): Abolish its 2nd `coding'
-	argument.  Instead of it, use the coding system to be used for encoding
-	the buffer contents on saving.
-	(w3m-bookmark-write-file): Follow the above change.
-
-2002-11-06  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-form.el (w3m-fontify-textareas): Replace textarea string only
-	when form data contains non-nil data.
-
-2002-11-05  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (toplevel): Added autoload setting for
-	`w3m-fontify-textareas'.
-	(w3m-fontify): Don't remove tag strings in the textareas; Call
-	`w3m-fontify-textareas'.
-
-	* w3m-form.el (w3m-form-treat-textarea-size): New option.
-	(w3m-form-resume): Do nothing if forms is nil.
-	(w3m-fontify-textareas): New function.
-	(w3m-form-parse-and-fontify): Decode entities for form value; Record
-	textarea rows as text property.
-	(w3m-form-parse-and-fontify): Treat CRLF as a newline character.
-	(w3m-form-search-textarea): New function.
-	(w3m-form-textarea-replace): Rewrite.
-	(w3m-form-textarea-info): Ditto.
-
-2002-11-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-bookmark.el (w3m-bookmark-file-coding-system): Fix its docstring.
-	(w3m-bookmark-verify-modtime): Keep buffer modified status.
-	(w3m-bookmark-safe-string): New function.
-	(w3m-bookmark-write-file): Call it to make given strings be safe.
-
-2002-11-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-bookmark.el: Use non-visiting working buffer; Auto-detection of
-	bookmark file coding system.
-	(w3m-bookmark-file-coding-system): Fix its docstring.
-	(w3m-bookmark-buffer-file-name): New internal variable.
-	(w3m-bookmark-mode): Add documents for commands.
-	(w3m-bookmark-mode-setter): Set `default-directory'.
-	(w3m-bookmark-buffer): Use non-visiting working buffer.
-	(w3m-bookmark-sections): Follow the above change.
-	(w3m-bookmark-kill-entries): Likewise.
-	(w3m-bookmark-file-modtime, w3m-bookmark-verify-modtime)
-	(w3m-bookmark-save-buffer): New functions.
-	(w3m-bookmark-write-file): Use it; Stricten check.
-	(w3m-bookmark-add-current-url-group): Call `w3m-bookmark-add' without
-	2nd argument.
-	(w3m-about-bookmark): Give unique id to sections.
-	(w3m-bookmark-current-number): Follow the above change.
-	(w3m-bookmark-kill-entry): If the bookmark file is reverted, reload it.
-	(w3m-bookmark-undo): Ditto.
-	(w3m-bookmark-edit): New function.
-
-2002-11-02  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-bookmark.el (w3m-about-bookmark): Fix.
-	(w3m-bookmark-current-number): Return nil on no entry line.
-	(w3m-bookmark-kill-entry): On no entry line, do not call
-	`w3m-bookmark-kill-entries'.
-	(w3m-bookmark-kill-entries): Fix.
-
-2002-11-01  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-namazu.el (w3m-namazu): Change prompt.
-	(w3m-namazu): Change prompt; Small fix.
-
-	* w3m-bookmark.el: Experimental bookmark editer.
-	(w3m-bookmark-read-file): Removed.
-	(w3m-bookmark-buffer): New function.
-	(w3m-bookmark-sections): Use it.
-	(w3m-bookmark-write-file): Use it; Call `basic-save-buffer'.
-	(w3m-bookmark-view): View about://bookmark/ instead of
-	w3m-bookmark-file directly.
-	(w3m-about-bookmark, w3m-bookmark-current-number)
-	(w3m-bookmark-kill-entry, w3m-bookmark-kill-entries)
-	(w3m-bookmark-undo): New functions.
-	(w3m-bookmark-mode, w3m-bookmark-mode-map): New variables.
-	(w3m-bookmark-mode-hook): New hook.
-	(w3m-bookmark-mode): New minor mode.
-	(w3m-bookmark-mode-setter): New function.
-	(toplevel): Register it to `w3m-display-functions'.
-
-2002-10-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3mhack.el (w3mhack-generate-colon-keywords-file): Protect against
-	unexpected data structure.
-
-2002-10-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-w3m-attributes): Remove workaround for servers which do
-	not support HEAD operations.
-
-
-2002-10-25  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Release emacs-w3m-1.3.3 from emacs-w3m-1_3 branch.
-
-2002-10-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (find-charset): Alias to ignore if no-Mule.
-
-2002-10-25  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-entity-alist): Use `w3m-mule-unicode-p' instead of
-	`w3m-use-mule-ucs'.
-
-	* w3m-xmas.el (w3m-mule-unicode-p): New function.
-
-	* w3m-fsf.el (w3m-mule-unicode-p): New function.
-
-	* w3m-om.el (w3m-mule-unicode-p): Set aliase to `ignore'.
-
-	* w3m-e19.el (w3m-mule-unicode-p): Set aliase to `ignore'.
-
-2002-10-25  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
-
-	* w3m.el (w3m-entity-alist): Support all entities using Mule-UCS.
-
-2002-10-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* mew-w3m.el: Cancel the last change.  Use `w3m-minor-mode'.
-
-	* mime-w3m.el (mime-w3m-display-inline-images): Fix its docstring.
-	(mime-w3m-safe-url-regexp): Fill its docstring.
-	(mime-w3m-setup-hook): New hook.
-	(mime-w3m-setup): Do not initialize `mime-w3m-mode-map'; Run the above
-	hook.
-	(mime-w3m-mode-map): It is not defined for XEmacs and Emacs21.
-	(mime-w3m-local-map-property): New function.
-	(mime-w3m-preview-text/html): Call it.
-
-	* w3m.el (w3m-key-binding): Cancel the last change.
-	(w3m-region): Change the interactive form; Do not process <base> tag by
-	itself.
-	(w3m-minor-mode-command-alist): Cancel the last change.
-	(w3m-minor-mode-map, w3m-minor-mode-hook, w3m-minor-mode): Revival.
-
-2002-10-23  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-toggle-inline-images-internal)
-	(w3m-toggle-inline-image, w3m-view-this-url, w3m-view-this-url)
-	(w3m-submit-form, w3m-external-view, w3m-view-image)
-	(w3m-save-image, w3m-view-url-with-external-browser)
-	(w3m-download-this-url, w3m-edit-this-url, w3m-goto-url)
-	(w3m-goto-url-with-timer, w3m-safe-view-this-url)
-	(w3m-safe-view-this-url): Check validity of the URL.
-	(w3m-print-current-url, w3m-edit-current-url): Check `w3m-current-url'.
-
-	* w3m-util.el (w3m-url-fallback-base): Move from `w3m.el'.
-	(w3m-url-invalid-regexp): New constant.
-	(w3m-url-valid): New inline function.
-
-	* mew-w3m.el (mew-mime-text/html-w3m): Remove any properties from
-	`xref'.
-
-2002-10-23  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-om.el (coding-system-list): Use `defalias' and `lambda' instead
-	of `defun'; allow an optional dummy argument; don't ignore `*noconv*'.
-	(read-passwd): Use `defalias' and `lambda' instead of `defun'.
-	(compose-mail): Ditto.
-
-2002-10-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-key-binding): Remove the code to reset
-	`w3m-minor-mode-map'.
-	(w3m-minor-mode-command-alist): Update its docstring.
-	(w3m-minor-mode-map, w3m-minor-mode-hook, w3m-minor-mode): Abolished.
-	(w3m-minor-mode): Removed.
-
-	* mime-w3m.el (mime-w3m-setup): Call `w3m-make-minor-mode-keymap'
-	without using `w3m-minor-mode-map'.
-
-	* mew-w3m.el (mew-use-w3m-minor-mode): Update its docstring.
-	(mew-w3m-minor-mode-map): New variable.
-	(toplevel): Revival the code to add a minor mode.
-	(mew-w3m-minor-mode-setter): Cancel the last change.
-
-2002-10-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-key-binding): Revival the code to reset
-	`mime-w3m-mode-map'.
-
-	* mime-w3m.el (mime-w3m-mode-map): Revival.
-	(mime-w3m-setup): Initialize `mime-w3m-mode-map' based on
-	`w3m-minor-mode-map'; Modify it to set its parent map to
-	`mime-view-mode-default-map'.
-	(mime-w3m-preview-text/html) [XEmacs,Emacs21]: Unify `local-map' as
-	text property.
-
-	* w3m.el (w3m-make-minor-mode-keymap): Call `make-spase-keymap' instead
-	of `make-keymap'.
-
-2002-10-22  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el (w3m-entity-regexp): As simple regexp. Existance of final
-	semi-collon is to be detected.
-	(w3m-entity-value): 2nd argument STRICT is added. If not STRICT, find
-	entity from db by maxmum length matching, and returns it with appending
-	unused chars. Returns nil if not match.  And also use defun instead of
-	defsubst.
-	(w3m-decode-entities): Use new `w3m-entity-value' with 2nd arg.
-
-2002-10-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-minor-mode): Define without `define-minor-mode'.
-	(w3m-minor-mode): Ditto.
-	(w3m-minor-mode-hook): Ditto.
-	(w3m-entity-regexp): Set 3000 to `max-specpdl-size' locally to avoid
-	max-specpdl-size error.
-
-	* w3m-e19.el: Cancel the last change to define `define-minor-mode'.
-	* w3m-fsf.el: Ditto.
-	* w3m-om.el: Ditto.
-
-	* attic/easy-mmode.el: Removed.
-
-2002-10-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e19.el: Require `easy-mmode'; make the alias `define-minor-mode'
-	to `easy-mmode-define-minor-mode'.
-	* w3m-fsf.el: Ditto.
-	* w3m-om.el: Ditto.
-
-	* attic/easy-mmode.el: New file imported from Emacs 20.7.
-
-2002-10-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-lynx-like-map, w3m-info-like-map): Add [tab] for
-	`w3m-next-anchor'.
-	(w3m-safe-view-this-url, w3m-mouse-safe-view-this-url): New command.
-	(w3m-minor-mode-command-alist): New constant.
-	(w3m-make-minor-mode-keymap): New function.
-	(w3m-minor-mode-map): New keymap.
-	(w3m-minor-mode): New function.
-
-	* mime-w3m.el (mime-w3m-mode-map): Abolished.
-	(mime-w3m-mode-command-alist): Abolished.
-	(mime-w3m-mode-dont-bind-keys): Abolished.
-	(mime-w3m-mode-ignored-keys): Abolished.
-	(mime-w3m-setup): Do not initialize `mime-w3m-mode-map'.
-	(mime-w3m-preview-text/html): Use `w3m-minor-mode-map' instead of
-	`mime-w3m-mode-map'.
-	(mime-w3m-view-this-url, mime-w3m-mouse-view-this-url): Removed.
-
-	* mew-w3m.el (mew-w3m-minor-mode): Abolished.
-	(mew-w3m-minor-mode-setter): Call `w3m-minor-mode'.
-
-2002-10-21  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e19.el: Cancel last change for providing the base64 codec.
-
-2002-10-21  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-goto-url): Use 'group:' scheme instead of
-	'about://group/...'; Use url encoding for the member of URL group
-	instead of base64 encoding.
-
-	* w3m-bookmark.el (w3m-bookmark-add-current-url-group): Follow the
-	change above.
-
-2002-10-21  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e19.el: Require `poe' and `path-util'; attempt to define the
-	functions `base64-decode-string' and `base64-encode-string'.
-
-	* w3m-util.el (w3m-display-progress-message): New function.
-	* w3m.el (w3m-goto-url-new-session): Use it.
-	(w3m): Use it.
-
-2002-10-21  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-goto-url): Process 'about://group/...'.
-
-	* w3m-bookmark.el (w3m-bookmark-add-current-url-group): New function.
-
-2002-10-21  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-delete-buffer): Run `w3m-delete-buffer-hook' only when a
-	buffer is killed.
-	(w3m-pack-buffer-numbers): Arrange buffers sequentially from 1 instead
-	of 0.
-	(w3m-select-buffer-next-line): Update gutter tabs for XEmacs.
-	(w3m-select-buffer-delete-buffer): Run `w3m-delete-buffer-hook'.
-
-	* w3m-util.el (w3m-buffer-number): Assume the buffer number has begun
-	from 1 instead of 0.
-	(w3m-buffer-set-number): Ditto.
-	(w3m-buffer-name-lessp): Ditto.
-
-2002-10-19  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
-
-	* w3m.el (w3m-entity-alist): Support Greek.
-
-2002-10-20  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-goto-url): Display a help message to stop asynchronous
-	process.
-
-2002-10-18  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-form.el (w3m-form-input-textarea-keymap): Don't bind C-g.
-	(w3m-form-input-select-keymap): Ditto.
-	(w3m-form-input-map-keymap): Ditto.
-
-	* w3m.el (w3m-select-buffer-mode): Add some key descriptions to the
-	doc-string.
-
-2002-10-17  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* icons/db-history-up.xpm: Add missing comma.
-
-2002-07-19  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-symbol.el: New file.
-
-	* w3m.el: Autoload "w3m-symbol" for `w3m-replace-symbol'.
-	(w3m-use-symbol): New variable.
-	(w3m-fontify): Call `w3m-replace-symbol'.
-
-	* w3mhack.el (w3mhack-examine-modules): Don't byte-compile
-	w3m-symbol.el if no-MULE.
-
-2002-10-17  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-e21.el (w3m-buffer-favicon): Bind local null handler with
-	`w3m-process-with-null-handler' instead of `lexical-let'.
-
-2002-10-16  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-proc.el (w3m-process-push, w3m-process-start): Fix last change.
-
-2002-10-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-rendering-half-dump): To decide whether
-	`w3m-treat-image-size' is ignored, use `w3m-display-inline-images-p'
-	instead of `w3m-display-graphic-p'.  Thanks to Mito for his report.
-	(w3m-about): Add `witdh' and `height' property to <img> tag.
-
-2002-10-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-emacs-w3m-icon): Use helvetica-bold to widen image.
-
-2002-10-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-lynx-like-map): Don't define key bindings for
-	`w3m-zoom-out-image' and `w3m-zoom-in-image' when emacs-w3m in running
-	in non-graphical display.
-	(w3m-info-like-map): Ditto.
-
-2002-10-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-	    Mito <mito@mxa.nes.nec.co.jp>
-
-	* w3m.el (w3m-rendering-half-dump): Ignore `w3m-treat-image-size' when
-	emacs-w3m is running in non-graphical display.
-
-2002-10-13  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-local-dirlist-cgi): Follow the change of
-	`w3m-process-start'.
-	(w3m-w3m-get-header): Ditto.
-	(w3m-w3m-dump-head-source): Ditto.
-
-	* w3m-image.el (w3m-imagick-convert-async-exec): Abolished.
-	(w3m-imagick-start): Removed.
-	(w3m-imagick-start-convert-buffer): Call `w3m-process-start' instead of
-	the above function.
-
-	* w3m-proc.el (w3m-process-push): Accept `command' argument.
-	(w3m-process-start): Ditto.
-
-2002-10-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-w3m-dump-head-source): Do not display the help message
-	when `w3m-process-with-wait-handler' is evaluated.
-	(w3m-make-separator): New function.
-	(w3m-about-header): Use the above function.
-
-	* w3m-proc.el (w3m-process-waited): New variable.
-	(w3m-process-error-handler): New function.
-	(w3m-process-with-wait-handler): Wrap the critical part with
-	`condition-case' to clean running processes up when `quit' signal is
-	occured.
-
-2002-10-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-w3m-dump-head-source): Display the message which
-	describes how to stop asynchronous process.
-	(w3m-lynx-like-map): Changed the key binded to `w3m-process-stop' from
-	`C-c C-g' to `C-c C-k'.
-	(w3m-info-like-map): Ditto.
-
-2002-10-08  MIYOSHI Masanori  <miyoshi@boreas.dti.ne.jp>
-
-	* README.shimbun.ja: Add notice that f1express requires Mule-UCS.
-
-	* README.shimbun.ja: Ditto.
-
-2002-10-04  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-toggle-inline-images-internal): Simplify the code.
-	(w3m-resize-inline-image-internal): Remove an existing bitmap image
-	first.
-
-	* w3m-bitmap.el (w3m-bitmap-image-insert): Replace
-	`insert-before-markers' with `insert' (return to the state before
-	2002-04-15).
-
-2002-10-03  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bitmap.el (w3m-create-resized-image): Return nil when resizing is
-	failed; set buffer multibyte before converting xbm to bitmap.
-
-	* w3m-xmas.el (w3m-create-resized-image): Return nil when resizing is
-	failed.
-
-	* w3m-image.el (w3m-resize-image-by-rate): Undo last change.
-
-2002-10-03  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bitmap.el (w3m-create-resized-image): New function.
-
-	* w3m-e19.el (w3m-create-resized-image): Alias to `ignore'.
-	* w3m-e20.el (w3m-create-resized-image): Alias to `ignore' if the
-	BITMAP-MULE is not available.
-	* w3m-om.el (w3m-create-resized-image): Ditto.
-
-	* w3m-image (w3m-resize-image-by-rate): Limit the minimum scale.
-
-	* w3m.el (w3m-resize-inline-image-internal): Remove an existing image
-	only for XEmacs.
-
-2002-10-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-create-resized-image): New function.
-
-	* w3m.el (w3m-resize-inline-image-internal): Remove an existing image
-	before resizing.
-
-2002-10-01  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-e21.el (w3m-favicon-type): New user variable.
-	(w3m-setup-favicon): Check `w3m-favicon-type'.
-	(w3m-buffer-favicon): Convert image to `w3m-favicon-type' instead of
-	'xpm.
-
-2002-10-01  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-filter.el (w3m-filter-server-regexp): Fix the value; translate
-	the comment into English.
-
-2002-10-01  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-lynx-like-map): Bind key M-] to `w3m-zoom-in-image'; bind
-	key M-[ to `w3m-zoom-out-image'.
-	(w3m-info-like-map): Ditto.
-	(w3m-mode): Document those new keys.
-
-2002-09-30  KURODA Chihiro  <chee@iijmio-mail.jp>
-
-	* w3m.el (w3m-resize-image-scale): New user option.
-	(w3m-toggle-inline-image): Call `w3m-zoom-in-image' without resizing.
-	(w3m-resize-inline-image-internal): New inline function.
-	(w3m-zoom-in-image): New command.
-	(w3m-zoom-out-image): New command.
-
-	* w3m-util.el (w3m-image-scale): New macro.
-
-	* w3m-image.el (w3m-resize-image-by-rate): New function.
-
-	* w3m-e21.el (w3m-create-resized-image): New function.
-
-2002-09-21  Kahlil HODGSON  <dorge@tpg.com.au>
-
-	* w3m.el (ffap-url-regexp): Make sure it is non-nil.
-
-2002-09-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-	Follow the change in Gnus.
-
-	* mime-w3m.el (mime-w3m-mode-ignored-keys): New variable.
-	(mime-w3m-setup): Use it.
-
-2002-09-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-lynx-like-map): Unbind the key "N" to the command
-	`w3m-namazu' in order to avoid binding collision to
-	`w3m-view-next-page'.  Thanks to Satoshi TAOKA for his report.
-	(w3m-mode): Fix its docstring for `w3m-antenna-add-current-url'.
-	Thanks to Satoshi TAOKA and Yoichi NAKAYAMA for the advice.
-
-2002-09-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el: Ignore byte-compile warnings for the dummy autoloads,
-	mis-judging of cl run-time functions and the obsoleteness of
-	`make-local-hook' under Emacs CVS.
-
-2002-09-25  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3mhack.el (w3mhack-examine-modules): Do not compile `mew-shimbun.el'
-	with old Mew.
-
-	* mew-w3m.el (top): Avoid byte-compile error and warning for old
-	Mew. Do not push 'mew-w3m-cid-retrieve' for old Mew.
-
-2002-09-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-arrived-setup): Use 0 instead of nil as the initial value
-	for the new obarray.
-
-	* w3m-filter.el (w3m-filter-setup): Use 0 instead of nil as the initial
-	value for the new obarray.
-
-2002-09-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-mode): Fix typo in its docstring.
-
-2002-09-20  Kahlil HODGSON  <dorge@tpg.com.au>
-
-	* w3m.el (w3m-fontify-bold): Permit class attributes, newlines or
-	whitespaces in the tag.
-	(w3m-fontify-underline): Ditto.
-
-2002-09-18  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-treat-drive-letter): New constant.
-	(w3m-url-to-file-name): Check `w3m-treat-drive-letter'.
-
-	* w3m-dtree.el (w3m-dtree-directory-name): Check
-	`w3m-treat-drive-letter'.
-
-2002-09-12  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-filter.el (w3m-filter-rules): Add 'assahi shimbun' rule.
-	(w3m-filter-asahi-shimbun): New function.
-
-2002-09-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-antenna.el (w3m-antenna-setup): Check new entries registered in
-	`w3m-antenna-sites'.
-	(w3m-antenna-shutdown): Return the value of `w3m-antenna-alist'.
-	(w3m-antenna-check-all-sites): Simplified.
-	(w3m-about-antenna): Do not call `w3m-antenna-setup'.
-
-
-2002-09-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Release emacs-w3m-1.3.2 from emacs-w3m-1_3 branch.
-
-	* w3m.el (w3m-init-file): Changed its default value.
-
-	* Makefile.in (PACKAGE): Use `emacs-w3m' instead of `w3m_el'.
-
-	* w3m-antenna.el (w3m-antenna-make-summary-function): Use
-	`function-item' instead of `const'.
-	(w3m-antenna-sort-changed-sites-function): Ditto.
-	(w3m-antenna-sort-unchanged-sites-function): Ditto.
-	(w3m-antenna-hns-last-modified): Asynchronized.
-	(w3m-antenna-last-modified): Removed.
-	(w3m-antenna-check-site): New function
-	(w3m-antenna-check-site-after): New function.
-	(w3m-antenna-check-sites): Removed.
-	(w3m-antenna-check-all-sites): New function.
-	(w3m-about-antenna): Asynchronized.
-	(w3m-about-antenna-edit): Reset post-data after its content is
-	displayed.
-	(w3m-antenna-edit-reset-post-data): New function.
-
-2002-09-02  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-init-file): Changed its default value.
-	(toplevel): When Emacs is running without interactive terminal, do not
-	load the startup file and do not evaluate `w3m-load-hook'.  Load a byte
-	compiled startup file safely.
-
-2002-09-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-mailto-url-popup-function-alist): New user option.
-	(w3m-view-this-url-1): Don't save a window configuration for mailto
-	urls here.
-	(w3m-goto-mailto-url): Save a window configuration while composing a
-	mail message; popup a mail window if the major-mode of a mail buffer
-	matches to `w3m-mailto-url-popup-function-alist'.
-
-2002-09-01  Andrew M. Scott  <ascott@sedona.ch.intel.com>
-
-	* w3m-weather.el (w3m-weather-default-area): Fix typo in its docstring.
-
-2002-08-30  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el: Provide the feature `w3m' before loading an init file or
-	evaluating `w3m-load-hook'.  Suggested by Seiichi NAMBA
-	<sn@asahi-net.email.ne.jp>.
-
-2002-08-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-init-file, w3m-load-hook): New option.
-	(toplevel): Load `w3m-init-file' and run `w3m-load-hook'.
-
-2002-08-29  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el: Require `custom' for Emacs 19 because of the function
-	`custom-initialize-set'.
-
-2002-08-29  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Clean up hook options.
-	(toplevel): Define the dummy function of `w3m-update-tab-line'.
-	(w3m-mode-hook, w3m-fontify-after-hook, w3m-select-buffer-hook): Clean
-	up its default value to nil.
-	(w3m-display-hook, w3m-delete-buffer-hook): Minimize its default value
-	and use `w3m-custom-hook-initialize' as the initialize function.
-	(w3m-arrived-setup-hook, w3m-arrived-shutdown-hook): Abolished.
-	(w3m-arrived-setup-functions, w3m-arrived-shutdown-functions,
-	w3m-mode-setup-functions, w3m-display-functions): New interanal
-	variables.
-	(w3m-arrived-setup): Refer `w3m-arrived-setup-functions' instead of
-	`w3m-arrived-setup-hook'.
-	(w3m-arrived-shutdown): Refer `w3m-arrived-shutdown-functions' instead
-	of `w3m-arrived-shutdown-hook'.
-	(w3m-fontify): Call `w3m-header-line-insert' by itself.
-	(w3m-next-buffer, w3m-delete-buffer, w3m-delete-other-buffers): Call
-	`w3m-select-buffer-update' by itself.
-	(w3m-clean-hook-options): New function.
-	(w3m-mode): Call `w3m-clean-hook-options', and run functions registered
-	to `w3m-mode-setup-functions'.
-	(w3m-goto-url): Call `w3m-select-buffer-update' by itself, and Run
-	functions registered to `w3m-display-functions'.
-	(w3m-select-buffer-update): Call `w3m-update-tab-line'.
-
-	* w3m-util.el (w3m-custom-hook-initialize): New function.
-
-	* w3m-xmas.el: Cancel the last change and refer `w3m-display-functions'
-	instead of `w3m-display-hook'.
-
-	* w3m-e21.el (toplevel): Add `w3m-setup-favicon' to
-	`w3m-display-functions', `w3m-favicon-load-cache-file' to
-	`w3m-arrived-setup-functions', `w3m-favicon-save-cache-file' to
-	`w3m-arrived-shutdown-functions', and add `w3m-setup-header-line' and
-	`w3m-setup-widget-faces' to `w3m-mode-setup-functions'
-
-	* w3mhack.el (w3mhack-load-path) [Mule]: Add the path of bitmap.el to
-	`load-path'.
-
-	* w3m.el (w3m-select-buffer-hook): Renamed from
-	`w3m-change-buffer-hook'.
-	(w3m-next-buffer): Accept a numerical argument.
-	(w3m-previous-buffer): Accept a numerical argument, and call
-	`w3m-next-buffer'.
-	(w3m-delete-buffer): Call `w3m-next-buffer' instead of
-	`w3m-previous-buffer'.
-
-	* w3m.el (w3m-delete-buffer-hook): Change its default value.
-	(w3m-change-buffer-hook): New option.
-	(w3m-delete-other-buffers-hook, w3m-previous-buffer-hook,
-	w3m-next-buffer-hook): Abolished.
-	(w3m-next-buffer): Run `w3m-change-buffer-hook' instead of
-	`w3m-next-buffer-hook'.
-	(w3m-previous-buffer): Run `w3m-change-buffer-hook' instead of
-	`w3m-previous-buffer-hook'.
-	(w3m-delete-buffer): Not call `w3m-select-buffer-update', which is
-	added to `w3m-delete-buffer-hook'.
-	(w3m-delete-other-buffers): Likewise.  Run `w3m-delete-buffer-hook'
-	instead of `w3m-delete-other-buffers-hook'.
-
-2002-08-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (toplevel): Remove expressions to register hook functions to
-	`w3m-delete-buffer-hook', `w3m-delete-other-buffers-hook',
-	`w3m-display-hook', and `w3m-fontify-after-hook'.
-	(w3m-mode-hook, w3m-fontify-after-hookk, w3m-display-hook,
-	w3m-arrived-setup-hook, w3m-arrived-shutdown-hook,
-	w3m-delete-buffer-hook, w3m-delete-other-buffers-hook,
-	w3m-previous-buffer-hook, w3m-next-buffer-hook): Changed their default
-	values to avoid inconsistency of their customize.
-	(w3m-toolbar): Fix its help messages.
-	(w3m-arrived-file, w3m-keep-arrived-urls, w3m-db-history-display-size):
-	Fix their docstrings.
-	(w3m-history): Moved to avoid a byte compile warning.
-
-	* w3m-xmas.el (toplevel): Remove an expression to register
-	`w3m-xmas-update-tab-in-gutter' to `w3m-display-hook'.
-	(w3m-xmas-show-current-title-in-buffer-tab): Remove expressions to
-	handle `w3m-display-hook' from the form to change its value.
-
-	* w3m-e21.el (toplevel): Remove expressions to register hook functions
-	to `w3m-display-hook', `w3m-arrived-setup-hook',
-	`w3m-arrived-shutdown-hook', `w3m-mode-hook', `w3m-fontify-after-hook',
-	`w3m-next-buffer-hook', `w3m-previous-buffer-hook',
-	`w3m-delete-buffer-hook' and `w3m-delete-other-buffers-hook'.
-
-2002-08-28  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-delete-buffer-hook): New hook.
-	(w3m-other-delete-buffers-hook): Ditto.
-	(w3m-previous-buffer-hook): Ditto.
-	(w3m-next-buffer-hook): Ditto.
-	(w3m-view-this-url-new-session-in-background): Fixed docstring.
-	(w3m-next-buffer): Run `w3m-next-buffer-hook'.
-	(w3m-previous-buffer): Run `w3m-previous-buffer-hook'.
-	(w3m-delete-buffer): Run `w3m-delete-buffer-hook'.
-	(w3m-delete-other-buffers): Run `w3m-delete-other-buffers-hook'.
-	(w3m-pack-buffer-numbers): New function.
-	(w3m-delete-buffer-hook): Add `w3m-pack-buffer-numbers'.
-	(w3m-delete-other-buffer-hook): Add `w3m-pack-buffer-numbers'.
-
-	* w3m-util.el (w3m-buffer-number): New inline function.
-	(w3m-buffer-set-number): Ditto.
-
-	* w3m-e21.el (w3m-update-tab-line): New function.
-	(w3m-mode-hook): Add `w3m-update-tab-line'.
-	(w3m-fontify-after-hook): Ditto.
-	(w3m-previous-buffer-hook): Ditto.
-	(w3m-next-buffer-hook): Ditto.
-	(w3m-delete-buffer-hook): Ditto.
-	(w3m-delete-other-buffers-hook): Ditto.
-	(w3m-tab-width): Changed default value to 16.
-	(w3m-tab-line): Calculate tab width dynamically.
-
-2002-08-27  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-output-coding-system, w3m-halfdump-command-arguments):
-	Use 'utf-8 when `w3m-m17n' with Mule-UCS environment.
-	(w3m-charset-coding-system-alist): Add Windows Code Point.
-	(w3m-current-content-charset): New buffer-local variable.
-	(w3m-clear-local-variables, w3m-copy-local-variables): Handle it.
-	(w3m-decode-buffer): Set `w3m-current-content-charset'.
-	(w3m-rendering-half-dump): Use `w3m-current-content-charset' when
-	`w3m-m17n' or `w3mmee'.
-
-2002-08-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-lynx-like-map): Change the key `C-c w' to `C-c M-w' for
-	the command `w3m-delete-other-buffers'.
-	(w3m-info-like-map): Ditto.
-
-2002-08-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (emacs-w3m-version): Reset for development series toward
-	emacs-w3m-1.4.
-
-2002-08-27  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-history): Call `w3m-db-history' instead of goto
-	`about://db-history/'.
-
-2002-08-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-delete-other-buffers): New user command.
-	(w3m-lynx-like-map): Bind the key `C-c w' to the command
-	`w3m-delete-other-buffers'.
-	(w3m-info-like-map): Ditto.
-	(w3m-select-buffer-mode-map): Bind the key to the command
-	`w3m-select-buffer-delete-other-buffers'.
-	(w3m-select-buffer-delete-other-buffers): New user command.
-
-2002-08-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-check-header-tags): Ignore case of tags.
-	(w3m-about-db-history): Accept range specification in URL.
-	(w3m-db-history-display-size): New option.
-	(w3m-db-history): Refer it.
-
-	* w3m-antenna.el (w3m-antenna-html-skeleton): Add link to
-	about://antenna-edit/.
-	(w3m-about-antenna-edit): New function.  This is an experimental
-	imprement of the editor for Antenna sites.
-
-2002-08-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (char-after): Byte-optimize it for old Emacsen.
-	(char-before): Ditto.
-
-2002-08-23  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-view-this-url-new-session-in-background): New user
-	option.
-	(w3m-view-this-url-1): Use it; enclose `w3m-goto-url' with
-	`save-window-excursion'.
-
-	* w3m-form.el (w3m-form-resume): Confirm `value' for text form is a
-	string.
-
-2002-08-22  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (ffap-url-regexp): Fix last change.
-
-2002-08-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (ffap-url-regexp): Modify the value to make it match to nntp
-	urls.
-
-2002-08-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* Makefile.in (very-slow): New rule.
-
-	* attic/addpath.el: New file.
-
-2002-08-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el: Require `cl' when compiling to provide the function
-	`gensym'.  It is needed to byte-compile this file alone because of the
-	w3m-proc macros.
-	* w3m-image.el: Ditto.
-	* w3m-bitmap.el: Don't bother to load cl-macs.
-
-2002-08-21  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el (w3m-display-message-enable-logging): New variable.
-	(w3m-display-message): Use it.
-
-2002-08-08  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-w3m-retrieve-1): Do not make error but return nil, even
-	if decoding is failed.
-
-2002-08-08  Nishimoto Masaki  <nishimoto@gaju.org>
-
-	* w3m-proc.el (w3m-process-with-environment): Copy
-	`process-environment' before `getenv' is called, in order to avoid
-	putting side effects to environment variables.
-
-2002-07-17  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el (w3m-ucs-to-char): Return char for tilde by default.
-
-
-2002-07-17  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Release emacs-w3m-1.3.1 from emacs-w3m-1_3 branch.
-
-2002-07-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* mime-w3m.el (toplevel): Bind `mime-preview-condition' to avoid
-	byte-compile warnings.
-	(mime-w3m-insinuate): Install code to overwrite
-	`mime-preview-condition' which is already initialized before this
-	functions is called.
-
-2002-07-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-image-viewer): New option.
-	(w3m-content-type-alist): Refer it.
-
-2002-07-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-decoder-alist): Don't examine the existence of w3m
-	command when compiling.
-	(w3m-dirlist-cgi-program): Ditto.
-
-2002-07-09  Hironori FUJII  <fujii@chi.its.hiroshima-cu.ac.jp>
-
-	* w3m.el (w3m-highlight-current-anchor): Don't infloop at the beginning
-	of a buffer.
-
-2002-07-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-perldoc.el (w3m-about-perldoc): Install workaround to specify the
-	place in which pod2html generates its cache files.  Adjust links
-	pointing other perldocs.
-
-2002-07-08  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-mode): Make `list-buffers-directory' to buffer local
-	variable.
-	(w3m-goto-url): Set title of the URL to `list-buffers-directory'.
-
-	* w3m-tabmenu.el (w3m-switch-buffer): Bind `completion-ignore-case' to
-	`t'.
-
-2002-07-08  OKAZAKI Tetsurou  <okazaki@be.to>
-
-	* configure.in: Use `AC_PATH_EMACS' instead of `AC_CHECK_EMACS'.
-
-	* aclocal.m4 (AC_PATH_EMACS): New macro.
-	(AC_CHECK_EMACS): Removed.
-
-
-2002-07-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Release emacs-w3m-1.3 from emacs-w3m-1_3 branch.
-
-2002-07-04  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (byte-optimize-form-code-walker): Advise to make it
-	optimize throughout the and/or forms.
-	(max-specpdl-size): Increase the value by 5 times for Mule 2.
-
-2002-07-03  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-accept-japanese-characters): Don't call the external
-	command when compiling.
-	(examining the value for `w3m-command'): Ditto.
-
-2002-07-01  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-lynx-like-map): Use the key `(control space)' instead of
-	`C- ' for the command `w3m-history-store-position' under XEmacs.
-
-2002-06-29  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3mhack.el (w3mhack-nonunix-lispdir): New option.
-	(w3mhack-nonunix-icondir): Ditto.
-	(w3mhack-nonunix-dryrun): Ditto.
-	(w3mhack-nonunix-install): New function.
-
-2002-06-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Makefile.in (DOCS): Add `TIPS'.
-
-2002-06-26  Ando Tsutomu  <ando-tom@ff.iij4u.or.jp>
-
-	* w3m-weather.el (w3m-weather-completion-table): Fix typo.
-
-2002-06-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-info-like-map): Remove redundant code.
-
-2002-06-27  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-fontify-anchors): Put `w3m-name-anchor' property to
-	point-max().
-	(w3m-fontify): Remove `w3m-name-anchor' handling.
-	(w3m-search-name-anchor): Move in the screen.
-
-2002-06-26  Tadashi Watanabe  <watanabe@sigmaitec.co.jp>
-
-	* w3m.el (w3m-info-like-map): Don't use FSF Emacs style key format for
-	XEmacs.
-
-2002-06-26  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (toplevel): Stricten the pattern to detect w3m version.
-	(w3m-info-like-map): Changed key bindings of `w3m-shift-left' and
-	`w3m-shift-right'.
-
-2002-06-25  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-use-ange-ftp): Chenged its default value to nil.
-
-2002-06-21  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-w3m-retrieve-1): Specify -no-cookie option only when the
-	w3m command is configured to accept it.
-
-2002-06-20  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* octet.el (octet-type-filter-alist): Fixed parenthesis.
-	(octet-filter-call1, octet-filter-call2, octet-filter-call2-extra):
-	Enclose call-process with as-binary-process.
-
-2002-05-31  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
-
-	* octet.el (octet-find-file): Bind `buffer-read-only', only while
-	calling `octet-buffer'.
-
-
-2002-06-20  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Release emacs-w3m-1.2.8 from emacs-w3m-1_2 branch.
-
-2002-06-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bug.el: Require `w3m-e19' for Emacs 19 to be able to compile this
-	module alone.
-
-2002-06-18  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-search.el (w3m-search): Don't extract a default word from the
-	header line.
-
-2002-06-18  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-header-line-insert): Use the property `keymap' instead of
-	`local-map' for the recent Emacsen; add a help echo; fix a typo.
-
-	* w3m-xmas.el (w3m-setup-header-line): Remove.
-
-2002-06-13  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e19.el: Remove many emulating functions on the condition that
-	APEL should be used; require `cl' only when compiling; require
-	`pcustom' instead of `custom'.
-	(compose-mail): New function.
-	(read-passwd): Autoload "ange-ftp".
-
-	* w3m-proc.el (read-passwd): Autoload "w3m-e19" for Emacs 19.
-
-	* w3m-util.el (cancel-timer): Autoload "timer" for not only Mule 2 but
-	also Emacs 19.
-
-	* w3m.el: Require `w3m-e19' for Emacs 19.
-
-	* w3mhack.el (w3mhack-emacs-major-version): New constant.
-	(TopLevel): Silence the byte-compiler for not only Mule 2 but also
-	Emacs 19.
-	(w3mhack-mdelete): New function.
-	(w3mhack-examine-modules): Use it to make the code simple.
-	(w3mhack-generate-colon-keywords-file): Be sure to go to the beginning
-	of each file before looking for colon keywords (I noticed that
-	`insert-file-contents' doesn't always position point to the top).
-
-	* README.ja: Update for the use of Emacs 19.
-
-2002-05-30  Kevin Rodgers  <kevin.rodgers@ihs.com>
-
-	NOTE: The following changes have been posted to the emacs-w3m
-	mailing list, they were not installed in the CVS repository at the
-	time.  The original article has been archived in:
-
-	http://emacs-w3m.namazu.org/ml/msg03472.html
-
-	* w3m-e19.el: New file.
-
-	* w3m.el: Require `w3m-e19' for Emacs 19.
-	(w3m-key-binding): Replace the widget `other' with `const'.
-
-	* w3mhack.el (w3mhack-examine-modules): Include w3m-e19.el in the
-	listing for Emacs 19.
-
-	* README: Update for the use of Emacs 19.
-
-2002-06-13  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-prepare-content): When cdr of
-	`w3m-content-prepare-functions' element is not function, call
-	`w3m-prepare-content' recursively.
-	(w3m-content-prepare-functions): Add "application/xhtml+xml" entry.
-
-2002-06-12  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-uri-replace-alist): New user option.
-	(w3m-uri-replace): New function.
-	(w3m-goto-url): Call `w3m-uri-replace'.
-
-2002-06-02  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-e21.el (w3m-ucs-to-char): Don't define it when already defined.
-
-	* w3m-xmas.el (w3m-ucs-to-char): Ditto.
-
-
-2002-06-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Release emacs-w3m-1.2.7 from emacs-w3m-1_2 branch.
-
-	* w3m-weather.el: Require CL when this module is byte-compiled.
-	(w3m-weather-completion-table): Fix typos, which are noticed by Ando
-	Tsutomu <ando-tom@ff.iij4u.or.jp> in [emacs-w3m:03487].
-
-2002-05-31  Mito <mito@mxa.nes.nec.co.jp>
-
-	* w3m-weather.el (w3m-weather-completion-table): Fix "niigata-kaetsu".
-
-2002-05-30  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-make-ccl-coding-system): Make it recallable for the
-	existing coding-systems (we can now reload w3m.elc under XEmacs 21.5-b6
-	and later).
-
-2002-05-29  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-w3m-retrieve-1): Don't decode the contents when redirect.
-
-2002-05-29  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (define-ccl-program): Remove advice when non-MULE.  It
-	might be specified by pccl.elc if it has been mis-compiled for XEmacs
-	with MULE.
-
-	* w3m.el (w3m-delete-frame-maybe): Don't delete the current frame if it
-	is the sole frame in the screen.
-
-2002-05-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (unicode-to-char): Shut XEmacs 21.5-b5 and earlier up
-	when compiling.
-
-2002-05-28  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-e21.el (w3m-ucs-to-char): New function.
-
-	* w3m-xmas.el (w3m-ucs-to-char): New function for XEmacs-21.5.
-
-2002-05-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* Makefile.in (tarball): Chmod 755 configure.
-
-2002-05-16  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-auto-show): Check multiple command like a
-	`previous|next-line' or `beginning|end-of-buffer' at the buffer's edge.
-	(w3m-window-hscroll): New function to rescue for XEmacs with Mule.
-	(w3m-current-column, w3m-set-window-hscroll): Chenge method of the
-	calculation point.  the difference points.
-	(w3m-horizontal-scroll, w3m-horizontal-on-screen)
-	(w3m-horizontal-recenter): Use `w3m-window-hscroll'.
-	(w3m-redisplay-this-page): Don't handle store|restore position.
-	(w3m-goto-url): If reload or redisplay, restore position of history.
-
-2002-05-15  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-after-cursor-move-hook): Add `w3m-auto-show'.
-	(w3m-auto-show, w3m-horizontal-scroll-division): New options.
-	(w3m-next-anchor, w3m-previous-anchor, w3m-next-form)
-	(w3m-previous-form, w3m-next-image, w3m-previous-image): Call
-	`w3m-horizontal-on-screen'.
-	(w3m-mode): Bind many variables for automatic scrolling when
-	`w3m-auto-show' is non-nil.
-	(w3m-scroll-left, w3m-scroll-right, w3m-shift-left)
-	(w3m-shift-right): Call `w3m-horizontal-scroll'.
-	(w3m-horizontal-scroll-done): New buffer local variable.
-	(w3m-current-position): Modify initial value.
-	(w3m-auto-show, w3m-horizontal-scroll, w3m-horizontal-on-screen): New
-	functions.
-	(w3m-horizontal-recenter, w3m-beginning-of-line)
-	(w3m-end-of-line): Use `w3m-set-window-hscroll' and
-	`w3m-current-column'.
-	(w3m-store-current-position): Set markers of beginning of line and end
-	of line.
-	(w3m-check-current-position): Check car of `w3m-current-position'.
-	(w3m-current-column, w3m-set-window-hscroll): New functions to rescue
-	for XEmacs with Mule.
-
-2002-05-15  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-form.el (w3m-form-replace): Don't pad the form slot with spaces
-	if a string is longer than that width.
-
-2002-05-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-arrived-p): Move its definition in order to avoid
-	byte-compile warning.
-
-	* Makefile.in (default, what-where): Change order.
-
-2002-05-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el: Modify the error message that XEmacs APEL package
-	versions 1.23 and later can barely be used to run emacs-w3m.
-
-2002-05-13  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-mode): Suppress compile warning under old Emacsen.
-
-	* Makefile.in (what-where): New rule.
-
-	* w3mhack.el (w3mhack-what-where): New function.
-	(locate-library): Make the function silent for Mule first.
-
-2002-05-13  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-horizontal-shift-columns): New user option.
-	(w3m-shift-left, w3m-shift-right): New commands.
-	(w3m-lynx-like-map, w3m-info-like-map): Add keybind `w3m-shift-left'
-	and `w3m-shift-right'.
-	(w3m-mode): Modify doc-string for new commands. Bind `auto-show-mode'
-	to nil.
-
-2002-05-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-hist.el (w3m-history-add-arrived-db): Force update the page.
-
-2002-05-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bug.el (report-emacs-w3m-bug-system-informations): Don't include
-	useless infos; eval the value for each time to load it.
-	(report-emacs-w3m-bug): Bind `print-length' and `print-level' with nil.
-
-2002-05-07  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-menubar): Modify the label for report-emacs-w3m-bug.
-	(w3m-lynx-like-map): Replace the key `C-c C-b' with `C-c C-v' for
-	`w3m-history-restore-position'; replace the key `C-c b' with `C-c C-b'
-	for `report-emacs-w3m-bug'.
-	(w3m-info-like-map): Ditto.
-	(w3m-mode): Add a document for `report-emacs-w3m-bug'.
-
-	* w3mhack.el: Check for the validity on APEL also for XEmacs with MULE.
-
-	* w3m-bug.el (report-emacs-w3m-bug-system-informations): Add
-	(featurep 'mule) and (featurep 'file-coding).
-
-2002-05-07  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-download): Modify string of the prompt.
-	(w3m-prepare-content): Add 5th optional argument `retry'. If not
-	determine content-type, ask its.
-
-2002-04-30  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bug.el (report-emacs-w3m-bug): Bind `after-load-alist' to nil
-	while loading the file itself; examine system info in the `w3m-mode'
-	buffer.
-
-2002-04-27  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-bug.el (report-emacs-w3m-bug-system-informations): Add
-	`mule-version' and `Meadow-version'.
-	(report-emacs-w3m-bug): Fix when info is a function.
-
-	* w3m.el (w3m-menubar): Add many functions.
-
-2002-04-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bug.el: New file.
-
-	* w3m.el: Autoload "w3m-bug" for `report-emacs-w3m-bug'.
-	(w3m-lynx-like-map): Bind `report-emacs-w3m-bug' to C-cb.<
-	(w3m-info-like-map): Ditto.
-
-	* w3m-om.el (compose-mail): New function.
-
-	* w3mhack.el: Check for the validity on APEL.
-
-2002-04-26  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-arrived-modify): New function.
-	(w3m-local-attributes): If set Content-type in arrived DB, return it.
-	(w3m-redisplay-this-page, w3m-redisplay-and-reset)
-	(w3m-redisplay-with-content-type): New commands.
-	(w3m-redisplay-with-charset): Use `w3m-arrived-modify'.
-	(w3m-lynx-like-map): Bind all new commands and modify bind for
-	`w3m-redisplay-with-charset'.
-	(w3m-info-like-map): Ditto.
-	(w3m-mode): Document them.
-	(w3m-goto-url): If reload is 'redisplay, do redisplay only. Modify
-	content-type decided method at local URL.
-	(w3m-about-header): Display `Modifer Information'.
-	(w3m-header-line-insert): Display modifers when type are setting.
-
-2002-04-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-horizontal-recenter): New command.
-	(w3m-beginning-of-line): New command.
-	(w3m-end-of-line): New command.
-	(w3m-lynx-like-map): Bind them.
-	(w3m-info-like-map): Bind them.
-	(w3m-mode): Document them.
-
-2002-04-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bitmap.el (w3m-bitmap-image-face-inherit): Default to t.
-
-	* w3m-om.el (w3m-om-use-overstrike-to-make-face-bold): New var.
-	(custom-declare-face): Advise it to use `set-face-bold-p' to make faces
-	bold by overstriking.
-
-	* w3m-util.el (w3m-default-face-colors): New constant.
-	* w3m.el (w3m-bold-face, w3m-underline-face): Use it.
-
-2002-04-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bitmap.el (w3m-bitmap-image-insert): Don't put the transparent
-	face except for Emacs 20.
-
-	* w3m.el (w3m-key-binding): Don't manipulate key bindings if w3m.elc
-	has not been loaded (it will fix the problem that the face colors might
-	not be specified under Mule 2).
-
-2002-04-23  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bitmap.el (w3m-bitmap-transparent-face): Remove.
-	(w3m-bitmap-image-insert): Use the list form instead of
-	`w3m-bitmap-transparent-face' to make the overlay transparent.
-
-2002-04-23  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-bitmap.el (w3m-bitmap-convert-arguments)
-	(w3m-bitmap-image-face-inherit): New customize values.
-	(w3m-create-image): Append argument `w3m-bitmap-convert-arguments' when
-	call `w3m-imagick-start-convert-buffer'.
-	(w3m-insert-image): If `w3m-bitmap-image-face-inherit' is non-nil,
-	inherit the face of bitmap image from the face of text at point.
-
-2002-04-23  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* Makefile.in (distclean): Remove autom4te*.cache rather than
-	autom4te.cache.
-
-	* w3m-bitmap.el (w3m-bitmap-transparent-face): New face.
-	(w3m-bitmap-image-insert): Put `w3m-bitmap-transparent-face' to
-	overlays; don't use overlays to highlight bitmap images.
-	(w3m-insert-image): Add `w3m-bitmap-image-face' to a bitmap image as a
-	text property.
-
-2002-04-23  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-toggle-inline-images-internal): Call `w3m-insert-image'
-	with the url of image.
-
-	* w3m-xmas.el (w3m-insert-image): Add dummy argument.
-
-	* w3m-e21.el (w3m-insert-image): Add dummy argument.
-
-	* w3m-bitmap.el (w3m-bitmap-cache-image-hook): New hook.
-	(w3m-create-image): Run `w3m-bitmap-cache-image-hook' with `url' when
-	use the cached image.
-	(w3m-insert-image): Add 4th argument `url'. Do nothing which have no
-	'w3m-image property or differ its url.
-
-2002-04-23  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	Make emacs-w3m can be compiled by `make slow' with no warnings.
-	* Makefile.in (slow): Don't echo the values for EMACS and FLAGS.
-	* octet.el: Require `w3m-util' for `w3m-insert-string'.
-	* w3m-bitmap.el: Autoload w3m-om for `move-to-column-force'.
-	* w3m-hist.el: Load w3m-kwds.el for old Emacsen.
-	* w3m-image.el: Require `pcustom' for old Emacsen; bind some external
-	vars when compiling.
-	* w3m.el: Enclose the definitions for `w3m-current-title' and
-	`w3m-current-url' with `eval-and-compile', and move them forward.
-	(w3m-url-at-point): Enclose with `eval-and-compile'.
-	(w3m-add-local-hook): Ditto.
-	(w3m-about-retrieve): Call `base64-decode-string' indirectly to avoid
-	compile warn under old Emacsen.
-
-	* w3m-util.el (w3m-insert-string): Fix doc-string.
-
-2002-04-22  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-region): Call `w3m-process-stop' first.
-
-	* mew-w3m.el (mew-w3m-view-inline-image): Toggle
-	`mew-w3m-auto-insert-image'.
-	(mew-w3m-cid-retrieve-hook): New customize hook.
-	(mew-w3m-cid-retrieve): Run `mew-w3m-cid-retrieve-hook'.
-
-2002-04-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el (w3m-insert-string): Prevent doubling expansion on the
-	arg.
-
-2002-04-20  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
-
-	* mime-w3m.el (mime-w3m-cid-retrieve): Use `w3m-insert-string' instead
-	of `insert' to prevent multibyte/unibyte problems.
-	* octet.el (mime-preview-octet, mime-view-octet): Ditto.
-
-	* w3m-util.el (w3m-insert-string): Moved from shimbun/shimbun.el.
-
-2002-04-20  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-w3m-attributes): Set type to downcase.
-
-2002-04-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-about-header): Don't use `make-string' to make a
-	separator text under Mule.
-
-2002-04-19  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* mew-w3m.el (mew-w3m-cid-retrieve): Support w3m-bitmap.el when
-	retrieve `cid image' (Mew cache has multibyte strings, but work buffer
-	is unibyte).
-
-2002-04-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (TopLevel): Not to get the byte-code for `current-column'
-	inlined under old Emacsen.
-
-	* w3m-bitmap.el (w3m-bitmap-emacs-broken-p): Use
-	`ad-Orig-current-column' rather than `current-column' if it has already
-	been defined.
-	(TopLevel): Not to get the byte-code for `current-column' inlined under
-	the broken Emacsen in case when compiling manually.
-
-2002-04-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bitmap.el (TopLevel) Require `cl' and possibly load cl-macs.  The
-	following changes are for old Emacsen.
-	(w3m-bitmap-emacs-broken-p): New constant.
-	(TopLevel): Warn if Emacs has a bug on managing column numbers.
-	(w3m-bitmap-move-to-column): Allow the 3rd arg `strictly'; don't modify
-	the buffer contents unless the 3rd arg has been set.
-	(w3m-bitmap-defadvice-if-broken): New macro; use it to advise the
-	functions `current-column', `move-to-column', `move-to-column-force',
-	`next-line' and `previous-line' to work under the broken Emacsen.
-	(w3m-bitmap-byte-indexed-characters-p): Remove.
-	(TopLevel): Don't alias `w3m-bitmap-current-column' to
-	`current-column'; don't alias `w3m-bitmap-move-to-column-force' to
-	`move-to-column-force'.
-	(w3m-bitmap-substitute-key-definitions): Remove.
-	(w3m-bitmap-image-insert): Replace `w3m-bitmap-current-column' with
-	`current-column'; replace `w3m-bitmap-move-to-column-force' with
-	`move-to-column-force'.
-	(w3m-bitmap-image-delete-internal): Ditto.
-
-	* w3m-om.el (move-to-column-force): New function using
-	`move-to-column-strictly'.
-
-2002-04-18  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bitmap.el (w3m-bitmap-next-line): Handle `temporary-goal-column'.
-
-2002-04-18  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-halfdump-command-arguments): Fix last change.
-
-2002-04-17  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bitmap.el (w3m-bitmap-byte-indexed-characters-p): New macro.  The
-	following changes are for old Emacsen.
-	(w3m-bitmap-move-to-column): New function.
-	(w3m-bitmap-move-to-column-force): Use it.
-	(w3m-bitmap-next-line): New command.
-	(w3m-bitmap-previous-line): New command.
-	(w3m-bitmap-substitute-key-definitions): New function; add it to
-	`w3m-mode-hook' as the one-shot function.
-
-2002-04-17  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-halfdump-command-arguments): Add `-I e' option to w3m
-	under Japanese environment.
-
-2002-04-17  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* mime-w3m.el (mime-w3m-cid-retrieve): Use `mime-decode-string',
-	`mime-entity-body' and `mime-entity-encoding' instead of
-	`mime-insert-entity-content' to make it work even if the entity buffer
-	is multibyte.
-
-2002-04-16  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-check-header-tags): Renamed from w3m-check-link-tags.
-	(w3m-check-header-tags): Parse base tag too.
-	(w3m-rendering-buffer-1): Use it.
-	(w3m-prepare-text-content): Don't use w3m-base-url.
-
-2002-04-15  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bitmap.el (w3m-bitmap-image-insert): Replace `insert' with
-	`insert-before-markers'.
-	(w3m-bitmap-image-delete-internal): Delete trailing newlines.
-	(w3m-insert-image): Don't check for the existence of an image.
-
-	* w3m.el (w3m-history-current-url-face): Provide `font' temporally to
-	avoid loading it and `cl'.
-
-2002-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bitmap.el (w3m-bitmap-image-get-overlay): Don't clear the
-	`evaorate' property here.
-	(w3m-bitmap-image-insert-internal): Rename to
-	`w3m-bitmap-image-insert'; change the meaning of the 2nd arg `image'
-	(see docs); allow the optional arg `ovr'; don't scan for an overlay
-	here; handle `w3m-bitmap-image-count'; use overlays to highlight bitmap
-	images.
-	(w3m-bitmap-image-insert): Remove old one.
-	(w3m-bitmap-image-delete-internal): Allow the 2nd arg `ovr'; don't scan
-	for an overlay here; clear the `evaorate' property here.
-	(w3m-bitmap-image-delete): Allow the 2nd arg `ovr'; don't scan for an
-	overlay here; don't delete an overlay.
-	(w3m-bitmap-image-delete-string): Remove.
-	(w3m-insert-image): Scan for an overlay here; don't use text props to
-	highlight bitmap images.
-	(w3m-remove-image): Scan for an overlay here.
-
-2002-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bitmap.el (w3m-bitmap-image-cleanup): Remove.
-	(w3m-bitmap-image-get-overlay): Clear the `evaorate' property in an
-	overlay temporally.
-	(w3m-bitmap-image-insert-internal): Put the `evaorate' property in an
-	overlay; return an overlay.
-	(w3m-bitmap-image-insert): Use the return value of
-	`w3m-bitmap-image-insert-internal' instead of to call
-	`w3m-bitmap-image-get-overlay'.
-	(w3m-bitmap-image-insert-string): Remove.
-	(w3m-insert-image): Use `w3m-modify-plist' to cleanup plist; don't move
-	the point.
-	(w3m-remove-image): Replace `w3m-bitmap-image-insert-string' with
-	`w3m-bitmap-image-insert-internal'.
-
-	* w3m-util.el (w3m-modify-plist): New function.
-
-2002-04-12  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-proc.el (w3m-process-kill-surely): New internal variable.
-	(w3m-process-kill-process): When `w3m-process-kill-surely' is non-nil,
-	wait for the completion to kill process surely.
-
-2002-04-10  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bitmap.el (w3m-bitmap-image-get-overlay): Speed up a bit.
-	(w3m-bitmap-image-insert-internal): Replace `current-column' with
-	`w3m-bitmap-current-column'; call `w3m-add-text-properties' only when
-	props are specified; use `overlay-end' dynamically (fix a bug I've
-	made); replace `move-to-column-force' with
-	`w3m-bitmap-move-to-column-force'.
-	(w3m-bitmap-image-delete-internal): Make the 2nd arg optional; replace
-	`current-column' with `w3m-bitmap-current-column'; replace
-	`move-to-column-force' with `w3m-bitmap-move-to-column-force'; guess
-	the end position of an overlay by itself when the 2nd arg is omitted.
-	(w3m-bitmap-image-delete): Remove the 2nd arg.
-	(w3m-bitmap-image-delete-string): Alias to
-	`w3m-bitmap-image-delete-internal' instead of defining as a function.
-	(w3m-insert-image): Don't use the length of a bitmap image.
-	(w3m-remove-image): Ditto.
-
-	* w3m-om.el (move-to-column-force): Remove.
-
-2002-04-10  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-image.el (w3m-imagick-convert-async-exec): Change default value
-	for Meadow.
-
-2002-04-10  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-e21.el (w3m-favicon-converted): New buffer-local variable.
-	(w3m-setup-favicon): Set w3m-favicon-converted as nil.
-	(w3m-buffer-favicon): If w3m-favicon-converted is non-nil, don't start
-	conversion.  Set w3m-favicon-converted as t before conversion.
-
-2002-04-10  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-about-retrieve): Change behavior according to whether the
-	return value of `base64-decode-string' is multibyte or not.
-
-	* w3m-image.el (w3m-imagick-convert-async-exec): New user option.
-	(w3m-imagick-start): Use `call-process' when
-	`w3m-imagick-convert-async-exec' is nil.
-	(w3m-imagick-convert-buffer): Don't use stdin because `convert' can not
-	handle an animation GIF that it input from stdin.
-
-2002-04-10  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-bitmap.el (w3m-create-image): Use w3m-process-do-with-temp-buffer
-	instead of w3m-process-do.
-	(w3m-create-image): Don't call `set-buffer-multibyte' if old mule.
-
-	* w3m-image.el (w3m-imagick-start-convert-buffer): Removed needless
-	`concat'.
-
-	* w3m-bitmap.el (w3m-create-image): Call
-	`w3m-imagick-start-convert-buffer' instead of
-	`w3m-imagick-convert-data'.
-
-2002-04-10  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bitmap.el (w3m-bitmap-current-column): New function for old
-	Emacsen; alias to `current-column' for the recent Emacsen.
-	(w3m-bitmap-move-to-column-force): New function for old Emacsen; alias
-	to `move-to-column-force' for the recent Emacsen.
-
-2002-04-10  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-image.el (w3m-imagick-convert-data): Check buffer size.
-	(w3m-imagick-start-convert-data): Ditto.
-	(w3m-imagick-start-convert-buffer): Don't use output file
-	(Because it sometimes causes multiple files).
-
-2002-04-10  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3mhack.el (w3mhack-examine-modules): Reverse the turn of the load
-	with `bitmap' and `un-define'.
-
-2002-04-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bitmap.el (w3m-bitmap-image-face): New face.
-	(w3m-bitmap-image-insert-internal): Put text properties.
-	(w3m-bitmap-image-insert): Pass text properties argument to
-	`w3m-bitmap-image-insert-internal'.
-	(w3m-bitmap-image-add-text-properties): Remove.
-	(w3m-insert-image): Pass text properties to `w3m-bitmap-image-insert'.
-
-2002-04-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-bitmap.el (w3m-bitmap-image-get-overlay): Use
-	`line-beginning-position' and/or `line-end-position'.
-	(w3m-bitmap-image-insert-internal): Ditto.
-	(w3m-bitmap-image-delete-internal): Ditto.
-	(w3m-bitmap-image-add-text-properties): Ditto.
-
-	* w3m-om.el: Require `w3m-bitmap' if BITMAP-MULE is available.
-	(move-to-column-force): Define it if void.
-
-2002-04-09  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-bitmap.el: Convert CRLF to LF.
-	(w3m-display-graphic-p): Ruturn nil if no window-system.
-	(w3m-image-type-available-p): Ruturn nil if not found "convert".
-
-	* w3mhack.el (w3mhack-examine-modules): Don't byte-compile
-	w3m-bitmap.el under XEmacs or FSF Emacs-21.
-
-	* w3m.el (w3m-fontify): When delete duplicated empty line, keep
-	'w3m-name-anchor property surely.
-
-	* w3m-e20.el (top): Require 'w3m-bitmap if have BITMAP.
-
-2002-04-09  Taiki SUGAWARA  <taiki.s@cityfujisawa.ne.jp>
-
-	* w3mhack.el (w3mhack-examine-modules): Don't byte-compile
-	w3m-bitmap.el if bitmap.el is not installed.
-	(w3mhack-examine-modules): Add condition to w3m-bitmap.el check.
-
-	* w3m-bitmap.el: New file.
-
-	* w3m-e20.el (w3m-create-image, w3m-insert-image, w3m-remove-image,
-	w3m-image-type-available-p, w3m-display-graphic-p,
-	w3m-display-inline-images-p): Alias to `ignore'. Bitmap image
-	implementation is moved to w3m-bitmap.el.
-	(w3m-bitmap-image-cache-alist, w3m-bitmap-image-use-cache,
-	w3m-bitmap-image-cleanup, w3m-bitmap-image-buffer,
-	w3m-bitmap-image-get-overlay, w3m-bitmap-image-insert-internal,
-	w3m-bitmap-image-insert, w3m-bitmap-image-insert-string,
-	w3m-bitmap-image-delete-internal, w3m-bitmap-image-delete,
-	w3m-bitmap-image-delete-string, w3m-bitmap-image-add-text-properties):
-	Move to w3m-bitmap.el.
-
-2002-04-09  Taiki SUGAWARA  <taiki.s@cityfujisawa.ne.jp>
-
-	* w3m-e20.el (w3m-create-image): Return nil if
-	w3m-imagick-convert-buffer is failed.
-	(w3m-insert-image): Not insert image if image is nil.
-
-2002-04-08  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-coding-system): Change default value to
-	'iso-2022-7bit-ss2 when use w3mmee under mule environment.
-
-2002-04-08  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-xmas.el (w3m-create-image): Resize gif images, too.
-
-2002-04-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-make-glyph): Remove unused var.
-
-2002-04-08  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-form.el (w3m-char-to-int): New alias.
-	(w3m-form-mee-attr-unquote): Use it.
-	(w3m-form-mee-new): Ditto.
-
-	* w3m-xmas.el (toplevel): Require 'w3m-image.
-	(w3m-make-glyph): New inline function.
-	(w3m-create-image): Resize images when w3m-resize-images is non-nil.
-
-	* w3m-form.el (w3m-string-to-char-list)[XEmacs]: Use string-to-list
-	instead of string-to-char-list.
-	(w3m-int-to-char): New alias.
-	(w3m-form-mee-select-value): Use it.
-
-2002-04-08  Taiki SUGAWARA  <taiki.s@cityfujisawa.ne.jp>
-
-	* w3m-e20.el (w3m-bitmap-image-insert-internal): Begin the overlay on
-	`begion-of-line'.
-
-2002-04-08  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* octet.el: Update URL for xlhtml.
-
-2002-04-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el: Don't require `pcustom'.
-
-2002-04-08  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-image.el: New file.
-
-	* w3m.el (w3m-halfdump-command-arguments): Specify single-row-image
-	dump option instead of image.
-	(w3m-goto-mailto-url): Added optional post-data argument and use it.
-	(w3m-goto-url): Set post-data of w3m-goto-mailto-url.
-
-	* w3m-util.el (w3m-imagick-convert-program, w3m-imagick-convert-buffer,
-	w3m-imagick-convert-data): Moved to w3m-image.el.
-
-	* w3m-e21.el (toplevel): Require 'w3m-image.
-	(w3m-resize-images, w3m-imagick-start-convert-data,
-	w3m-imagick-start-convert-buffer, w3m-imagick-start, w3m-resize-image):
-	Moved to w3m-image.el;
-	(w3m-create-image): Follow the change in w3m-resize-image.
-	(w3m-favicon-usable-p): Renamed from w3m-imagick-convert-usable-p.
-	(w3m-use-favicon): Follow the change above.
-	(w3m-favicon-cache-data): Fixed typo.
-	(w3m-favicon-cache-retrieved): Ditto.
-	(w3m-retrieve-favicon): Ditto.
-
-	* w3m-e20.el (w3m-image): Require 'w3m-image.
-
-2002-04-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (multibyte-string-p): Alias to `stringp' if MULE,
-	otherwise `ignore'.
-
-	* w3m-om.el (multibyte-string-p): Alias to `stringp'.
-
-	* w3m-util.el: Require `pcustom' for old Emacsen.
-
-2002-04-05  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-w3m-retrieve): Revert previous change.
-	(w3m-w3m-dump-head-source): Add argument orig-url; Cache header and
-	body using orig-url.
-	(w3m-w3m-retrieve): Don't cache header here; Return error response when
-	follow redirection number exceeds w3m-follow-redirection; Pass orig-url
-	to w3m-w3m-retrieve-1.
-	(w3m-w3m-retrieve-1): Add argument orig-url; Call w3m-dump-head-source
-	with orig-url argument.
-	(w3m-redirect-with-get): Changed default value to t.
-
-2002-04-05  Taiki SUGAWARA  <taiki.s@cityfujisawa.ne.jp>
-
-	* w3m-e20.el (w3m-bitmap-image-insert): Fix (point) -> pos.
-
-2002-04-04  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-form.el (w3m-form-input-map): If menu string is empty, use href
-	string instead.
-
-	* w3m.el (w3m-w3m-dump-head-source): Fixed caching logic.
-	(w3m-w3m-retrieve): Use cache if available after redirection.
-
-2002-04-04  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-e20.el (top): Avoid byte-compile warnings when not found
-	`bitmap'.
-	(w3m-image-type-available-p): Return nil if not have `bitmap'.
-
-2002-04-04  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-fontify-anchors): Set default icon type as ico.
-
-	* w3m-e21.el (w3m-buffer-favicon): Asynchronous implementation.
-
-2002-04-04  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3mhack.el (top): Avoid byte-compile error for `w3m-ucs.el' with
-	Emacs20 when it has `un-define' and `bitmap'.
-	(w3mhack-load-path): Add the path of `bitmap.el' on Emacs20.
-
-2002-04-04  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-request-arguments): Use -header option if no cookie nor
-	no body.
-	(w3m-w3m-retrieve-1): Delete temp-file only when it exists.
-
-	* w3m-e21.el (w3m-imagick-start-convert-data): Don't use
-	string-as-unibyte (no use).
-
-2002-04-04  Taiki SUGAWARA  <taiki.s@cityfujisawa.ne.jp>
-
-	* w3m.el (w3m-toggle-inline-images-internal): Support w3m-bitmap-image.
-
-	* w3m-e21.el (w3m-imagick-convert-program): Move to w3m-util.el.
-	(w3m-imagick-convert-buffer): Ditto.
-	(w3m-imagick-convert-data): Ditto.
-
-	* w3m-util.el (w3m-imagick-convert-program): Move from w3m-e21.el.
-	(w3m-imagick-convert-buffer): Ditto.
-	(w3m-imagick-convert-data): Ditto.
-
-	* w3m-e20.el (w3m-bitmap-image-cache-alist): New variable.
-	(w3m-bitmap-image-use-cache): Ditto.
-	(w3m-bitmap-image-cleanup): New function.
-	(w3m-bitmap-image-buffer): Ditto.
-	(w3m-bitmap-image-get-overlay): Ditto.
-	(w3m-bitmap-image-insert-internal): Ditto.
-	(w3m-bitmap-image-insert): Ditto.
-	(w3m-bitmap-image-insert-string): Ditto.
-	(w3m-bitmap-image-delete-internal): Ditto.
-	(w3m-bitmap-image-delete): Ditto.
-	(w3m-bitmap-image-delete-string): Ditto.
-	(w3m-bitmap-image-add-text-properties): Ditto.
-	(w3m-display-graphic-p): New implementation.
-	(w3m-display-inline-images-p): Ditto.
-	(w3m-image-type-available-p): Ditto.
-	(w3m-create-image): New implementation. It use w3m-bitmap-image-*.
-	(w3m-insert-image): Ditto.
-	(w3m-remove-image): Ditto.
-
-2002-04-03  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-fontify): Put invisible and intangible properties at the
-	duplicated empty lines instead of delete them.
-
-2002-04-03  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-e21.el (w3m-resize-image): Asynchronous implementation.
-	(w3m-imagick-start-convert-data): New function.
-	(w3m-imagick-start-convert-buffer): Ditto.
-	(w3m-imagick-start): Ditto.
-	(w3m-create-image): Rewrite to resize images asynchronously.
-	(w3m-insert-image): Don't resize.
-
-2002-04-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-check-link-tags): Relax the pattern to detect headers.
-
-2002-04-02  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-form.el (w3m-form-submit): Confirm when posting from secure page
-	to normal page.
-
-	* w3m.el (w3m-redirect-with-get): New user option.
-	(w3m-w3m-retrieve): If w3m-redirect-with-get is non-nil, use GET method
-	after redirection; Ask user to use POST data after redirection.
-	(w3m-w3m-attributes): Set w3m-current-redirect as a cons cell of
-	(CODE . LOCATION).
-	(w3m-w3m-dump-head-source): Don't cache content if the response code is
-	one of 302, 303, 307.
-	(w3m-w3m-retrieve): Change POST redirection behavior according to
-	response code.
-	(w3m-retrieve-and-render): Confirm leaving secure pages.
-
-	* octet.el (mime-preview-octet): Change behavior according to whether
-	the return value of mime-entity-content is multibyte or not.
-	(mime-view-octet): Ditto.
-
-	* w3m.el (w3m-w3m-retrieve): Don't call w3m-cache-request-header when
-	type is nil.
-
-2002-04-01  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-follow-redirection): New user option.
-	(w3m-w3m-attributes): Set w3m-current-redirect as nil.
-	(w3m-cookie-command-arguments): Abolish.
-	(w3m-request-arguments): Use cookie only when w3m-use-cookies is
-	non-nil.
-	(w3m-header-arguments): New function.
-	(w3m-w3m-retrieve): Treat redirection when w3m-follow-redirection is
-	non-nil.
-	(w3m-w3m-retrieve-1): Renamed from w3m-w3m-retrieve.
-	(w3m-prepare-content): Don't care w3m-current-redirect.
-	(w3m-goto-url): Ditto.
-
-	* w3m-form.el (w3m-form-new): Added argumnet enctype.
-	(w3m-form-enctype): New macro.
-	(w3m-form-plist): Changed definition.
-	(w3m-form-put-property): Ditto.
-	(w3m-form-make-form-data): Removed optional argument urlencode; Encode
-	form data acording to w3m-form-enctype.
-	(w3m-form-mee-new): Set enctype field.
-	(w3m-form-parse-and-fontify): Parse enctype.
-	(w3m-form-submit): Don't pass enctype argumnet.
-
-2002-04-01  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-fontify-anchors): Put a property of `w3m-name-anchor' as
-	a list.
-	(w3m-move-point-for-localcgi): Use `w3m-search-name-anchor'.
-	(w3m-search-name-anchor): Use `member' when compare a name with
-	`w3m-name-anchor'. Fix continuous name-anchor.
-
-2002-03-29  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* mew-w3m.el (mew-mime-text/html-w3m): Use `match-string' instead of
-	`mew-match'.
-
-	* w3m.el (w3m-fontify-anchors): Modify the point for 'w3m-name-anchor
-	property when its has an empty body.
-
-2002-03-28  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-dump-head-source-command-arguments)[w3mmee]: Don't add
-	Accept-Language header option.
-	(w3m-cookie-command-arguments)[w3mmee]: Don't add Cookie header option.
-	(w3m-request-arguments): New function to generate -request option.
-	(w3m-w3m-retrieve)[w3mmee]: Use w3m-request-arguments to make request
-	header and body.
-
-2002-03-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-url-at-point (ffap)): Strip text props under XEmacs.
-	(ffap-url-regexp): Modify the value to make it match to https urls for
-	Emacs 19, 20 and XEmacs.
-
-2002-03-27  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-e21.el (w3m-tab-drag-mouse-function): Fix problem when dragged
-	mouse position is outside of the original frame.
-
-	* w3m.el (w3m-version): New variable.
-	(toplevel): Detect w3m version.
-	(w3m-user-agent): New user option.
-	(w3m-add-user-agent): Ditto.
-	(w3m-w3m-retrieve): Add User-Agent: field if w3m-add-user-agent is
-	non-nil.
-
-	* w3m-e21.el (w3m-tab-drag-mouse-function): New function.
-	(w3m-tab-make-keymap): Add mouse-1, mouse-2, drag-mouse-1 and
-	drag-mouse-2.
-
-	* w3m-cookie.el (w3m-cookie-set): Fixed docstring.
-
-2002-03-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-find-coding-system): Alias to ignore if the function
-	`find-coding-system' is not available.
-	(w3m-make-ccl-coding-system): Check whether the function
-	`make-ccl-coding-system' is available instead of checking the feature
-	`mule' to determine what function should be aliased to.
-	(coding-system-list): Alias to ignore if it is not available.
-	(define-ccl-program): Check whether it is available instead of checking
-	the feature `mule' to determine if it is aliased to `ignore'.
-	(w3m-detect-coding-with-priority): Quote `w3m-default-coding-system'.
-
-2002-03-24  Nix  <nix@esperi.demon.co.uk>
-
-	* w3m-xmas.el (w3m-detect-coding-with-priority): New macro, handle
-	non-MULE XEmacsen.
-	(w3m-detect-coding-region): Use it.
-
-2002-03-26  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-cookie.el (w3m-cookie-1-set): Fixed problem when no `Expires',
-	ignore is ignored.
-
-2002-03-26  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-cookie.el (w3m-cookie-url, w3m-cookie-domain, w3m-cookie-secure,
-	w3m-cookie-name, w3m-cookie-value, w3m-cookie-path, w3m-cookie-version,
-	w3m-cookie-expires, w3m-cookie-ignore): Define as macro.
-	(w3m-cookie-set-url, w3m-cookie-set-domain, w3m-cookie-set-secure,
-	w3m-cookie-set-name, w3m-cookie-set-value, w3m-cookie-set-path,
-	w3m-cookie-set-version, w3m-cookie-set-expires, w3m-cookie-set-ignore):
-	Removed.
-	(w3m-cookie-create): New implementation.
-	(w3m-about-cookie): Call `setf' instead of `w3m-cookie-set-ignore'.
-
-2002-03-26  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-fontify-anchors): Changed anchor name property position.
-	(w3m-lynx-like-map): Bind w3m-cookie as `M-k'.
-	(w3m-info-like-map): Ditto.
-
-2002-03-26  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-cookie.el (w3m-cookie-save): Use `w3m-time-newer-p' instead of
-	`w3m-time-lapse-seconds'.
-
-2002-03-26  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-cookie.el (w3m-cookie): New command.
-	(w3m-about-cookie): Do nothing if w3m-use-cookies is nil.
-
-	* w3m.el (toplevel): Added autoload setting for w3m-about-cookie; Added
-	autoload setting for w3m-cookie.
-
-	* w3m-cookie.el (w3m-cookie-store): Don't replace if ignored cookie.
-	(w3m-cookie-retrieve): Don't use cookie which is ignored.
-	(w3m-about-cookie): New function.
-
-	* w3m-e21.el (w3m-setup-favicon): Do nothing when w3m-current-url is
-	nil.
-
-	* w3m.el (w3m-goto-url): Force reload if w3m-current-redirect is set.
-	(w3m): If w3m-current-url is nil, erase buffer.
-
-	* w3m-util.el (w3m-time-less-p): Abolish.
-	(w3m-assoc-ignore-case): Moved from w3m-cookie.el and rewrote not to
-	use assoc* (because it's cl function).
-
-	* w3m-cookie.el (w3m-cookie-retrieve): Use w3m-time-newer-p instead of
-	w3m-time-less-p.
-	(w3m-cookie-1-set): Ditto.
-	(w3m-assoc-ignore-case): Moved to w3m-util.el.
-
-2002-03-25  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-cookie.el (w3m-cookie-1-set): Use w3m-time-less-p instead of
-	w3m-time-lapse-seconds.
-	(w3m-cookie-retrieve): Ditto.
-
-	* w3m-util.el (w3m-time-less-p): New inline function.
-
-	* w3m.el (w3m-current-redirect): New buffer local variable.
-	(w3m-clear-local-variables): Add w3m-current-redirect.
-	(w3m-copy-local-variables): Treat w3m-current-redirect.
-	(w3m-w3m-attributes): Set w3m-current-redirect instead of
-	w3m-current-refresh when 30x response.
-	(w3m-prepare-content): Use w3m-current-redirect instead of
-	w3m-current-refresh.
-	(w3m-goto-url): Do nothing but w3m-goto-url after retrieval if
-	w3m-current-redirect is set.
-
-2002-03-25  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-cookie.el (w3m-cookie-file): Changed default value.
-	(w3m-cookie-save): Follow the above change.
-	(w3m-cookie-load): Ditto.
-
-2002-03-25  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-w3m-attributes): Don't call w3m-cookie-set.
-	(w3m-w3m-dump-head-source): Call w3m-cookie-set.
-	(w3m-cookie-command-arguments): Set `-no-cookie'; Don't set
-	cookie_accept_domains, cookie_reject_domains.
-
-	* w3m-cookie.el (toplevel): Require 'w3m.
-	(w3m-cookie-accept-domains): Moved from w3m.el.
-	(w3m-cookie-reject-domains): Ditto.
-	(w3m-cookie-accept-bad-cookies): New user option.
-	(w3m-cookie-file): Ditto.
-	(w3m-cookie-set-ignore): Fix.
-	(w3m-cookie-retrieve): Remove expired cookies.
-	(w3m-cookie-trusted-host-p): Fixed domain match.
-	(w3m-cookie-1-set): Treat all cookies.  Accept bad cookies according to
-	w3m-cookie-accept-bad-cookies.
-	(w3m-cookie-init): New variable.
-	(w3m-cookie-clear): New function.
-	(w3m-cookie-save): Ditto.
-	(w3m-cookie-load): Ditto.
-	(w3m-cookie-setup): Ditto.
-	(w3m-cookie-shutdown): Rewrite.
-	(w3m-cookie-set): Call w3m-cookie-setup; Changed API.
-	(w3m-cookie-get): Call w3m-cookie-setup.
-
-	* w3m.el (w3m-goto-url): Don't resume form from history when POST.
-
-2002-03-24  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-cookie.el: New file.
-
-	* w3m-form.el (w3m-form-resume): Use cdr of forms if car is t
-	(Just in case).
-	(w3m-form-parse-and-fontify)[w3m]: Search form structure according to
-	fid.
-
-	* w3m.el (toplevel): Added autoload setting for w3m-cookie.
-	(w3m-use-cookies): New user option.
-	(w3m-cookie-accept-domains): Ditto.
-	(w3m-cookie-reject-domains): Ditto.
-	(toplevel): Bind system-time-locale as "C" while calling
-	format-time-string.
-	(w3m-w3m-attributes): Call w3m-cookie-set; When 30x response is
-	received, set w3m-current-refresh as
-	(0 . Location).
-	(w3m-cookie-command-arguments): New function.
-	(w3m-w3m-retrieve): Use it.
-	(w3m-retrieve-and-render): Mark w3m-current-forms as `not history' if
-	retrieval failed.
-	(w3m-prepare-content): If w3m-current-refresh rate is 0, do nothing.
-	(w3m-quit): Call `w3m-cookie-shutdown'.
-
-2002-03-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-decode-encoded-contents): Convert encoding to lower case
-	before checking alist.
-
-2002-03-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-remove-redundant-spaces): New implementation.
-	(w3m-about-retrieve): Call `insert-buffer-substring' instead of
-	`insert-buffer'.
-	(w3m-rendering-unibyte-buffer): Ditto.
-	(w3m-rendering-multibyte-buffer): Ditto.
-	(w3m-prepare-text-content): Ditto.
-
-2002-03-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-w3m-attributes): Ignore trailing whitespaces in header
-	lines.
-
-2002-03-20  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-view-this-url): Eval action even when anchor is set.
-
-	* w3m-form.el (w3m-form-parse-and-fontify): Clear mapval if it is set.
-
-	* w3m.el (w3m-halfdump-command-arguments)[w3mmee]: Add `image' to the
-	-dump argument only if `w3m-treat-image-size' is non-nil.
-
-2002-03-20  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-form.el (w3m-form-parse-and-fontify): If not detect `usemap'
-	attribute of `img_alt', use `value' attribute of `input_alt' for the
-	select map name; W3M removes `usemap' attribute when
-	"display_image=off".
-
-2002-03-19  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-w3m-attributes): Ignore `w3m-document-charset' when
-	w3m-m17n.
-
-2002-03-19  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-fontify-images): Parse width and height attributes of
-	img_alt.
-	(w3m-toggle-inline-images-internal): Set `size' argument of
-	w3m-create-image.
-	(w3m-highlight-current-anchor): Fixed logic.
-
-	* w3m-xmas.el (w3m-create-image): Added optional argument `size'
-	(ignored currently).
-
-	* w3m-e21.el (w3m-imagick-convert-program): Use w3m-which to set
-	initial value.
-	(w3m-resize-images): New user option.
-	(w3m-resize-image): New function.
-	(w3m-create-image): Added optional argument `size'; Changed return
-	value.
-	(w3m-insert-image): Call w3m-resize-image if size is specified.
-	(w3m-imagick-convert-buffer): Accept nil for from-type and to-type.
-
-2002-03-18  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-form.el (w3m-form-mee-select-value): Fix.
-	(w3m-form-parse-and-fontify): If w3m-type is not w3mmee, use last form
-	object as current form.
-
-2002-03-18  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-highlight-current-anchor): New implementation.
-	(w3m-highlight-current-anchor-1): New function.
-
-	* w3m-form.el (w3m-form-replace): Fixed problem when string is nil.
-
-2002-03-16  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-form.el (w3m-string-to-char-list): Fixed.
-
-2002-03-15  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-form.el (w3m-form-mee-select-value): Use w3m-output-coding-system
-	instead of w3m-current-coding-system.
-	(w3m-form-parse-and-fontify)[w3mmee]: Ditto.
-	(w3m-form-mee-select-value): Fixed select value.
-	(w3m-form-resume): Fixed checkbox resuming.
-	(w3m-form-parse-and-fontify): Use `form' instead of `(car forms)';
-	Search the form which corresponds to input_alt by fid; Use `nconc'
-	instead of `push'.
-
-	* w3m-form.el (w3m-form-mee-select-value): New function.
-	(w3m-form-parse-and-fontify)[w3mmee]: Set select value.
-
-	* w3m.el (w3m-halfdump-command-arguments)[w3mmee]: Added image.
-
-	* w3m-form.el (w3m-form-parse-and-fontify): Set the value of form only
-	if the method is not internal; Add internal form to the
-	w3m-current-forms; Treat input type `image' as same as `submit'.
-	(w3m-form-mee-attr-unquote): New function.
-	(w3m-string-to-char-list): New function/alias.
-	(w3m-form-mee-new): New function.
-	(w3m-form-parse-and-fontify): Parse w3mmee's form info.
-	(w3m-form-input-textarea-keymap): Bind C-g.
-	(w3m-form-input-select-keymap): Bind C-g, h,j,k,l.
-	(w3m-form-input-map-keymap): Ditto.
-	(w3m-form-parse-and-fontify): Set textarea value.
-
-2002-03-13  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-form.el (w3m-form-resume): Typo.
-
-2002-03-13  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (toplevel): Removed autoload setting for
-	`w3m-form-parse-buffer'.
-	(w3m-clear-local-variables): Don't treat w3m-current-forms any more.
-	(w3m-copy-local-variables): Ditto.
-	(w3m-additional-command-arguments): Fixed problem when no-proxy host
-	has port number other than 80.
-	(w3m-rendering-buffer-1): Don't call w3m-form-parse-buffer.
-	(w3m-goto-url): Setup w3m-current-forms from history structure.
-
-	* w3m-form.el (w3m-form-parse-buffer): Abolish.
-	(w3m-form-parse-forms): Ditto.
-	(w3m-form-resume): Set value of `w3m-current-forms'.
-	(w3m-fontify-forms): Call `w3m-form-parse-and-fontify' instead of
-	`w3m-form-fontify'.
-	(w3m-form-parse-and-fontify): New function.
-	(w3m-form-input-select): Fix problem when candidate label is "".
-
-2002-03-13  Katsumi Yamaoka  <yamaoka@jpl.org>
-	Suggested by HAYASHI Chifumi <chifumi@mscom.or.jp>.
-
-	* w3m-form.el (w3m-form-new): Ignore the 2nd arg `action' if it is nil.
-	(w3m-form-parse-forms): Don't parse the value of `w3m-current-url' if
-	it is nil.
-
-
-2002-03-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Release emacs-w3m-1.2.6 from emacs-w3m-1_2 branch.
-
-2002-03-11  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-ucs.el (w3m-euc-japan-encoder): Treat japanese-jisx0208-1978 as
-	japanese-jisx0208.
-
-2002-03-11  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-view-this-url, w3m-goto-url-new-session,
-	w3m-select-buffer-copy-buffer): Remove unused non-global variables.
-
-2002-03-11  Katsumi Yamaoka  <yamaoka@jpl.org>
-	Suggested by Yuuichi Teranishi <teranisi@gohome.org> with mod.
-
-	* w3m.el (w3m-no-proxy-domains): New user option renamed from
-	`w3m-no-proxy-hosts' and changed the meaning.
-	(w3m-additional-command-arguments): Refer to it.
-
-2002-03-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Makefile.in (tarball): Fix permissions.
-
-2002-03-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-command-arguments-alist): Change the meaning that the car
-	of each element will be compared with a url instead of a hostname.
-	(w3m-no-proxy-hosts): New user option.
-	(w3m-additional-command-arguments): Look into it.
-
-2002-03-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-command-arguments-alist): New user option.
-	(w3m-additional-command-arguments): New function.
-	(w3m-w3m-retrieve): Use it.
-	(w3m-history-current-url-face, w3m-copy-buffer, w3m-about-header):
-	Remove unused non-global variables.
-
-2002-03-08  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-w3m-attributes) [w3mmee]: Fetch content-encoding from
-	"x-w3m-content-encoding" filed.
-
-2002-03-07  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* mew-w3m.el (mew-w3m-cid-retrieve): Return lowercase string always
-	because `w3m-image-type-alist' has lowercase keys.
-
-2002-03-07  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
-
-	* w3m.el (w3m-lynx-like-map): Switch J and K so as to behave like w3m.
-
-2002-03-07  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* aclocal.m4 (AC_EXAMINE_PACKAGEDIR): Use `(eq 0 foo)' instead of
-	`(zerop foo)' because foo might not be a number.
-	(AC_PATH_ICONDIR): Ditto.
-
-2002-03-07  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-decoder-alist): Change default commands to `gzip' and
-	`bzip2' instead of `gunzip' and `bunzip2' because some broken OS and
-	its environment does not work them.
-
-2002-03-07  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* Makefile.in (datadir): New variable.
-
-2002-03-06  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-proc.el (w3m-process-filter): Modify a regexp for "Password:".
-
-2002-03-06  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* Makefile.in (install): Don't chdir to shimbun/ while installing
-	shimbun modules.
-	(install-icons): Don't chdir to icons/ while installing icons.
-
-2002-03-05  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* Makefile.in (install): Install all ChangeLog files.
-	* w3mhack.el (w3mhack-make-package): List all ChangeLog files in the
-	manifest.
-
-2002-03-05  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-local-dirlist-cgi): Set `w3m-current-url' for avoid error
-	in `w3m-process-start-process()'.
-	(w3m-goto-url): When use w3m-dtree and the URL is local directory,
-	change the URL to `about://dtree' securely.
-
-2002-03-04  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el (w3m-function-max-args): Alias to `function-max-args'
-	under XEmacs, otherwise define it as a function.
-	(symbol-for-testing-whether-colon-keyword-is-available-or-not): Use
-	`dont-compile' instead of `eval'.
-
-
-2002-03-02  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Release emacs-w3m-1.2.5 from emacs-w3m-1_2 branch.
-
-2002-03-01  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* octet.el (octet-find-file): Decode even in the read-only buffer.
-
-2002-02-26  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Makefile.in (DOCS): Add ChangeLog.1.
-
-
-Local Variables:
-coding: iso-2022-7bit
-fill-column: 79
-indent-tabs-mode: t
-End:

=== removed file 'share/emacs/site-lisp/w3m/ChangeLog.1'
--- share/emacs/site-lisp/w3m/ChangeLog.1	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/ChangeLog.1	1970-01-01 00:00:00 +0000
@@ -1,6731 +0,0 @@
-2002-02-25  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-proc.el (w3m-process-filter): Use `ignore-errors' instead of
-	`condition-case'.
-	(w3m-process-y-or-n-p): Regist answers only when they have non-nil
-	values.
-
-2002-02-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-perldoc.el: New file.
-
-	* w3m.el (top): Add autoload for `w3m-perldoc.el'.
-	(w3m-tmp-urluser-alist): Abolished.
-	(w3m-read-file-name): Call `w3m-url-strip-query'.
-	(w3m-download): Ditto.
-	(w3m-w3m-get-header): Accept URLs which includes authentication
-	information like scheme://user:pass@netloc/.  Set `w3m-current-url'
-	before `w3m-process-start' is called.
-	(w3m-w3m-dump-head-source): Ditto.
-	(w3m-retrieve): Call `w3m-url-strip-fragment'.
-	(w3m-retrieve-and-render): Modified to accept URLs which includes
-	authentication information.  Do not set `w3m-current-url'.
-	(w3m-goto-url): Modified to accept URLs which includes authentication
-	information and to pass them through to sub-routines.
-	(w3m): Small modified to accept URLs which includes authentication
-	information.
-
-	* w3m-util.el (w3m-url-authinfo-regexp): New internal constant.
-	(w3m-url-authinfo): New function.
-	(w3m-url-strip-authinfo): Ditto.
-	(w3m-url-strip-fragment): Ditto.
-	(w3m-url-strip-query): Ditto.
-
-	* w3m-proc.el (top): No bind `w3m-tmp-urluser-alist'.
-	(w3m-process-authinfo-alist): Renamed from `w3m-process-user-alist'.
-	(w3m-process-accept-list): Abolished.
-	(w3m-process-accept-alist): New internal variable.
-	(w3m-process-user-counter): Abolished.
-	(w3m-process-start-process): In order to set `w3m-process-user' and
-	`w3m-process-passwd' call `w3m-url-authinfo', instead of refering
-	`w3m-tmp-urluser-alist'.
-	(w3m-process-stop): Reset `w3m-process-authinfo-alist' and
-	`w3m-process-accept-alist'.
-	(w3m-process-sentinel): Regist an authentication information only when
-	`w3m-process-realm' is set.
-	(w3m-process-filter): Call `w3m-process-y-or-n-p' instead of
-	`w3m-process-accept-get' and `w3m-process-accept-set'.  When a user
-	name and a password of a proxy server are reasked, their old values are
-	discarded.  Reconstruct the part checking user names and passwords.
-	(w3m-process-get-server-root): Its regular expression are small
-	modified.  Call `w3m-url-strip-authinfo'.
-	(w3m-process-get-user): Removed.
-	(w3m-process-get-passwd): Ditto.
-	(w3m-process-set-user): Ditto.
-	(w3m-process-accept-get): Ditto.
-	(w3m-process-accept-set): Ditto.
-	(w3m-process-set-authinfo): New function.
-	(w3m-process-read-user): Ditto.
-	(w3m-process-read-passwd): Ditto.
-	(w3m-process-y-or-n-p): Ditto.
-
-2002-02-14  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-modeline-ssl-image-status-on)
-	(w3m-modeline-ssl-status-off): New constants.
-	(w3m-current-ssl): New buffer local variable.
-	(w3m-clear-local-variables, w3m-copy-local-variables): Handling
-	`w3m-current-ssl'.
-	(w3m-w3m-attributes): When detect `W3m-ssl-certificate:' header, set
-	`w3m-current-ssl'. Skip reading of folded lines of each header.
-	(w3m-buffer-setup): Display SSL indicator at mode-line.
-	(w3m-about-header): Display SSL information when exist
-	`W3m-ssl-certificate:' header.
-
-2002-02-13  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-read-file-name): Strip the query part from a default file
-	name.
-	(w3m-download): Ditto.
-	(w3m-url-components-regexp): Move forward.
-
-	* mime-w3m.el: Always require `font' under XEmacs.
-
-2002-02-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-async-exec): Default to nil under MacOS X.
-
-2002-02-12  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-e21.el (w3m-setup-favicon): Fix handling of
-	`w3m-about-xxxx-favicon'.
-
-2002-02-08  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-icon-data): New buffer local variable.
-	(w3m-clear-local-variables): Add `w3m-icon-data'.
-	(w3m-copy-local-variables): Ditto.
-	(w3m-fontify-anchors): Setup `w3m-icon-data'.
-	(w3m-check-link-tags): Parse `type' of link attribute; Set
-	`w3m-icon-data' if `icon' rel attribute exist.
-	(w3m-goto-url): Added local variable real-data.
-
-	* w3m-e21.el (w3m-favicon-cache-favicon): Added compatibility code.
-	(w3m-setup-favicon): Use w3m-icon-data if it exists; Changed first
-	argument for `w3m-retrieve-favicon'.
-	(w3m-buffer-favicon): Use car of `w3m-current-favicon-data' as image
-	data and cdr as image type.
-	(w3m-retrieve-favicon): Changed first argument to cons cell of image
-	data and its type.
-
-2002-02-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-save-list): Allow the 4th arg `escape-ctl-chars'.
-	(w3m-arrived-shutdown): Call it with the 4th arg.
-
-	* w3m-antenna.el (w3m-antenna-shutdown): Call `w3m-save-list' with the
-	4th arg.
-
-2002-02-08  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-pixels-per-line): Renamed from w3m-pixel-per-line; Fixed
-	custom type.
-	(w3m-pixels-per-character): Likewise.
-	(w3m-rendering-half-dump): Follow the changes above.
-
-2002-02-08  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-type): Considerd as an internal variable.
-	(w3m-options): Removed.
-	(w3m-compile-options): New internal variable.
-	(toplevel): Set `w3m-compile-options' instead of `w3m-options'.
-	(w3m-treat-image-size): Refer `w3m-compile-options' instead of
-	`w3m-options'.
-	(w3m-rendering-half-dump): Ditto.
-	(w3m-local-file-type): When a remote URL is passed, refer its
-	non-directory part to decide its content type.
-	(w3m-touch-file): Bind `default-directory' locally.
-
-2002-02-08  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-pixel-per-line): New user option.
-	(w3m-rendering-half-dump): Use `w3m-pixel-per-line' as the -ppl
-	argument of the w3m command.
-	(w3m-pixel-per-character): New user option.
-	(w3m-rendering-half-dump): Use `w3m-pixel-per-character' as the -ppc
-	argument of the w3m command.
-
-2002-02-07  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-e21.el (w3m-favicon-size): Set default value to nil.
-	(w3m-buffer-favicon): If w3m-favicon-size is nil, detect frame char
-	height and use it.
-
-	* w3m.el (w3m-command): Set default value to nil.
-	(w3m-type): Ditto.
-	(w3m-options): New user option.
-	(toplevel): Set w3m-command, w3m-type and w3m-options.
-	(w3m-treat-image-size): New user option.
-	(w3m-rendering-half-dump): Set rendering options -o
-	display_image=on/off, -ppc, -ppl according to the value of
-	`w3m-treat-image-size'.
-
-2002-02-07  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el (w3m-display-message): New macro.
-
-	* w3m.el (w3m-make-help-echo): Clear the echo area when Emacs 21 is
-	running; use the modern styles of backquote.
-	(w3m-make-balloon-help): Use the modern styles of backquote.
-	(w3m-toggle-inline-image): Use `w3m-display-message' instead of
-	`message' to say a trivial message.
-	(w3m-view-this-url): Ditto.
-	(w3m-submit-form): Ditto.
-	(w3m-view-image): Ditto.
-	(w3m-save-image): Ditto.
-	(w3m-download-this-url): Ditto.
-	(w3m-print-current-url): Ditto.
-	(w3m-print-this-url): Ditto.
-	(w3m-edit-this-url): Ditto.
-	(w3m-quit): Ditto.
-	(w3m-goto-ftp-url): Ditto.
-	(w3m-select-buffer): Ditto.
-	(w3m-select-buffer-show-this-line): Ditto.
-	(w3m-select-buffer-show-this-line-and-switch): Ditto.
-
-2002-02-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-after-cursor-move-hook): New option.
-	(w3m-check-current-position): New function.
-	(w3m-print-this-url-after-command): Removed.
-	(w3m-buffer-setup): Set `w3m-check-current-position' to
-	`post-command-hook', instead of `w3m-print-this-url-after-command'.
-	(w3m-add-local-hook): Check version of Emacsen dynamically.
-
-	* w3m-e21.el (w3m-add-local-hook): New function.
-
-2002-02-07  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-fontify-images): Changed regexp to more generic one to
-	search img_alt tag.
-	(w3m-toggle-inline-images-internal): Fixed image redisplay flickers.
-
-2002-02-06  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-halfdump-command-common-arguments): Replace `frame-width'
-	with `window-width'.
-	(w3m-about-db-history): Ditto.
-
-2002-02-05  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-proc.el (w3m-process-accept-list): New internal variable.
-	(w3m-process-filter): Watch `accept? (y/n)' for certification.
-	(w3m-process-accept-get, w3m-process-accept-set): New functions.
-
-2002-02-05  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-make-ccl-coding-system): Alias to `ignore' if
-	no-MULE (the feature `mule' is not provided).
-	(coding-system-category): Ditto.
-	(define-ccl-program): Define it as an empty macro if no-MULE.
-
-	* w3m.el (TopLevel): Don't require `ccl' if no-MULE.
-	(w3m-accept-japanese-characters): Default to nil if no-MULE.
-	(w3m-coding-system): Default to `iso-8859-1' if no-MULE.
-	(w3m-output-coding-system): Ditto.
-	(w3m-file-coding-system): Ditto.
-	(w3m-toolbar): Don't express some Japaneses chars directly.
-
-	* w3mhack.el (w3mhack-examine-modules): Don't byte-compile w3m-ucs.el,
-	shimbun modules, mime-w3m.el, octet.el and w3m-weather.el if no-MULE.
-
-2002-02-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-meta-content-type-charset-regexp)
-	(w3m-meta-charset-content-type-regexp)
-	(w3m-meta-refresh-content-regexp)
-	(w3m-meta-content-refresh-regexp): Remove redundant double quote.
-
-	* w3m.el (w3m-content-prepare-functions): New internal contsant.
-	(w3m-prepare-content): Refer it.
-	(w3m-prepare-text-content): New function.
-	(w3m-prepare-image-content): Ditto.
-
-2002-02-05  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-meta-charset-content-type-regexp)
-	(w3m-meta-content-refresh-regexp): Allow broken quotation mark.
-
-2002-02-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-touch-file): Robust checking.
-
-2002-02-05  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-util.el (w3m-which-command): If called with `not string', return
-	nil.
-
-2002-02-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-touch-file-avaiable-p): New internal variable.
-	(w3m-touch-file): Check the validity of `touch' command.
-
-2002-02-05  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-touch-file): Call touch command with "-t time" instead of
-	"-d time".
-
-2002-02-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-touch-command): New option.
-	(w3m-touch-file): New function.
-	(w3m-download): Call it.
-	(w3m-toggle-inline-images-internal): Fix inconsistency of text
-	properties when images are not downloaded.
-	(w3m-toggle-inline-image): Simplified.
-	(w3m-toggle-inline-images): Ditto.
-
-2002-02-04  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el (w3m-prin1): New function.
-	* w3m.el (w3m-save-list): Use it instead of `prin1'.
-
-	* w3mhack.el, w3m.el, w3m-xmas.el, w3m-om.el: Say emacs-w3m not
-	Emacs-W3M.
-
-2002-02-04  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* mime-w3m.el (mime-w3m-mode-dont-bind-keys): New variable.
-	(mime-w3m-setup): Don't bind keys listed in the above.
-
-	* w3m.el (w3m-key-binding): Switch key bindings also in w3m-mode
-	buffers when customizing; don't manipulate keymaps when Emacs is
-	running in the batch mode.
-
-2002-02-01  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* octet.el (octet-suffix-type-alist): Added lzh, tar, pdf.
-	(octet-type-filter-alist): Ditto.
-	(octet-content-type-alist): Added application/x-msexcel, text/html,
-	application/x-tar, application/pdf.
-	(octet-magic-type-alist): Fixed magic for html.
-	(octet-tar-mode): New function.
-	(octet-guess-type-from-name): Downcase suffix.
-	(octet-mime-setup): Add action for application/vnd.ms-powerpoint.
-
-2002-02-01  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* mime-w3m.el (mime-w3m-safe-url-regexp): New user option.
-	(mime-w3m-preview-text/html): Use it.
-
-	* w3m.el (w3m-key-binding): Don't eval a part of the `set:' form when
-	compiling nnshimbun.el in the Gnus source tree.
-
-2002-02-01  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* octet.el (octet-buffer): Fixed problem when 'Quit'.
-	(mime-preview-octet-hook): New hook.
-	(mime-preview-octet): Run it.
-	(w3m-about-octet-attachments): Fixed problem when there's no
-	octet-attachment which corresponds to the src url.
-	(mime-view-octet): Set content-type argument for `octet-buffer'.
-	(mime-preview-octet): Ditto.
-
-2002-02-01  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* mime-w3m.el (mime-w3m-preview-text/html): Bind `w3m-force-redisplay'
-	with nil.
-
-2002-02-01  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* octet.el (octet-buffer): Set default of `completing-read'.
-
-2002-02-01  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-key-binding): Switch `w3m-mode-map', `mime-w3m-mode-map'
-	and `mm-w3m-mode-map' when customizing.
-
-2002-01-31  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* mime-w3m.el (mime-w3m-mode-command-alist): New variable.
-	(mime-w3m-setup): Use it; invalidate widget button in
-	`mime-w3m-mode-map'.
-	(mime-w3m-keymap-property): Removed.
-	(mime-w3m-preview-text/html): Add `text-rendered-by-mime-w3m' text
-	property to the rendered area.
-	(kill-new): Strip keymap properties from a killed string only if it has
-	`text-rendered-by-mime-w3m' property.
-
-2002-01-31  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-url-at-point): Remove all text-properties from url.
-
-	* w3m-search.el (w3m-search): Remove all text-properties from default
-	search value.
-
-2002-01-31  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-search.el (w3m-search-word-at-point): New option.
-	(w3m-search): Refer `w3m-search-word-at-point'.
-
-2002-01-31  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* octet.el (octet-content-type-alist): Added text/html.
-	(octet-magic-type-alist): Likewise.
-	(octet-type-filter-alist): Likewise; Added `guess'; Changed result type
-	of gzip as `guess'.
-	(octet-find-file-hook): New hook.
-	(octet-find-file): Run it.
-	(octet-filter-guess): New function.
-	(octet-buffer): Fix.
-
-2002-01-30  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* octet.el (toplevel): Require 'static.
-	(octet-html-render-function): Changed default value to
-	`octet-w3m-region.'
-	(octet-type-filter-alist): Changed filter function to
-	`octet-filter-call2-extra'.
-	(octet-attachments): New buffer-local variable.
-	(w3m-about-octet-attachments): New function.
-	(octet-w3m-region): Ditto.
-	(octet-filter-call2-extra): New function.
-	(octet-find-file): Do nothing when buffer is read-only.
-
-	* w3m.el (w3m-about-retrieve): Decode buffer only if the content-type
-	is text.
-
-	* octet.el (octet-guess-type-from-name): Return nil if guess failed.
-	(octet-buffer): Ask octet type if guess failed.
-	(octet-content-type-alist): New variable.
-	(octet-guess-type-from-content-type): New function.
-	(octet-buffer): Added optional argument `content-type'.
-	(octet-buffer): Ignore `quit'.
-	(octet-suffix-type-alist): Added images.
-	(octet-content-type-alist): Ditto.
-	(octet-type-filter-alist): Ditto.
-	(octet-magic-type-alist): Renamed from mime-magic-type-alist.
-	(octet-decode-image): New function.
-	(octet-guess-type-from-magic): New function.
-	(octet-buffer): Use it.
-	(octet-insert-buffer): New function.
-	(mime-preview-octet): Use it.
-
-2002-01-29  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* octet.el (octet-type-filter-alist): Changed default value for xlhtml
-	and ppthtml.
-	(octet-filter-call2): Fixed problem when return value of call-process
-	is not numeric.
-	(octet-filter-call1): Ditto.
-	(octet-find-file): Use unwind-protect.
-	(octet-filter-call2): Fixed docstring.
-	(octet-filter-call1): Ditto.
-	(octet-buffer): Fixed argument for `interactive'.
-
-2002-01-29  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-encoding-type-alist): New option.
-	(w3m-local-file-type): New function.
-	(w3m-local-content-type): New implementation.
-	(w3m-local-attributes): Call `w3m-local-file-type' instead of
-	`w3m-local-content-type'.
-	(w3m-download): `url' is lexically binded.  Call `message' to display
-	error messages.
-
-	* w3mhack.el (w3mhack-examine-modules): Fix to avoid that octet.el is
-	byte-compiled repeatedly.
-
-2002-01-29  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3mhack.el (w3mhack-examine-modules): Add octet.el to the module list
-	if FLIM is installed.
-
-	* octet.el: New file.
-
-2002-01-25  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-highlight-current-anchor): Don't search for the anchor
-	points which are out of sight.
-
-2002-01-25  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-tmp-urluser-alist): New variable.
-	(w3m-goto-url): If URL include user and passwd, set
-	`w3m-tmp-urluser-alist' for process handling.  Remove passwd from URL.
-	(w3m): Remove passwd from URL when insert it in buffer.
-
-	* w3m-util.el (w3m-get-user-passwd-from-url)
-	(w3m-remove-passwd-from-url): New functions.
-
-	* w3m-proc.el (top): Define `w3m-tmp-urluser-alist' to avoid
-	byte-compile warning.
-	(w3m-process-start-process): If URL include user or passwd, set them to
-	default values.
-	(w3m-process-filter): Use default values of `w3m-process-user' and
-	`w3m-process-passwd'.
-	(w3m-process-get-server-root): Remove `about://.../' from server root.
-
-	* w3m-search.el (w3m-search): Insert default string in minibuffer.
-
-2002-01-25  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-about-history): Don't add to history if url is nil.
-	(w3m-print-this-url-after-command): Call
-	`w3m-highlight-current-anchor'.
-	(w3m-delete-all-overlays): New macro.
-	(w3m-highlight-current-anchor): New function.
-	(w3m-current-anchor-face): New face.
-	(w3m-arrived-anchor-face): Removed underline property.
-	(w3m-anchor-face): Ditto.
-
-2002-01-18  OHASHI Akira  <bg66@koka-in.org>
-
-	* w3m.el (w3m-header-line-map): Inherit `w3m-mode-map'.
-
-2002-01-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-e21.el (w3m-setup-favicon): Reversed the condition that decide
-	whether favicons are used.
-
-2002-01-15  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-e21.el (w3m-setup-favicon): If url is `ftp://', not retrieve a
-	favicon data.
-
-	* w3m.el (w3m-current-directory): New function.
-	(w3m-goto-url): Use `w3m-current-directory' when set
-	`default-directory'.
-
-2002-01-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-use-ange-ftp): New option.
-	(w3m-w3m-attributes): Handle ftp scheme URLs.
-	(w3m-download): Refer `w3m-use-ange-ftp'.
-	(w3m-goto-url): Ditto.
-
-2002-01-11  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-read-file-name): Remove an optional argument
-	`initial'. Call `read-file-name' without `default' option.
-
-2002-01-11  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-url-encode-string): Fixed for Mule2.
-
-	* w3m-util.el (w3m-truncate-string): New function.
-
-	* w3m-form.el (w3m-form-replace): Use `w3m-truncate-string' instead of
-	`truncate-string'.
-
-2002-01-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-region): Process <base> tag.
-
-2002-01-09  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-local-content-type): Fix handling of the remote url.
-	(w3m-file-directory-p): New function.
-	(w3m-goto-ftp-url): Use `w3m-file-directory-p' instead of
-	`file-directory-p'.
-
-
-2002-01-08  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Release emacs-w3m-1.2.4 from emacs-w3m-1_2 branch.
-
-2002-01-08  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-arrived-setup-hook): New hook.
-	(w3m-arrived-shutdown-hook): Ditto.
-	(w3m-arrived-setup): Run `w3m-arrived-setup-hook'.
-	(w3m-arrived-shutdown): Run `w3m-arrived-shutdown-hook'.
-	(w3m-quit): Don't remove `w3m-arrived-shutdown' from `kill-emacs-hook'.
-
-	* w3m-e21.el (w3m-favicon-cache-expire-wait): New user option.
-	(w3m-favicon-cache-p): New macro.
-	(w3m-favicon-cache-favicon): Ditto.
-	(w3m-favicon-cache-retrived): Ditto.
-	(w3m-retrieve-favicon): Don't use old cache data.
-	(w3m-favicon-cache-data): Renamed from `w3m-favicon-data-cache'.
-	(w3m-favicon-save-cache-file): Follow above change.
-	(w3m-favicon-load-cache-file): Ditto.
-	(w3m-arrived-setup-hook): Regist `w3m-favicon-load-cachee-faile'.
-	(w3m-arrived-shutdown-hook): Regist `w3m-favicon-save-cache-file'.
-
-2002-01-08  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-goto-url): Use a URL-like string under the cursor as the
-	initial value of the target URL when interactively called.
-	(w3m-view-this-url): When a URL-like string is found under the cursor,
-	view it.
-	(w3m-view-this-url-1): New internal function.
-
-2002-01-08  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-display-hook): Change default variable to `nil'.
-	(top): Use `add-hook' when `w3m-history-highlight-current-url',
-	`w3m-move-point-for-localcgi' and `w3m-select-buffer-update' set to
-	`w3m-display-hook'.
-	(w3m-local-dirlist-cgi): When use `dirlist.cgi', decode filename tag.
-
-2002-01-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-url-to-file-name): When the pointed file is not found,
-	decode the specified URL and recheck it.
-
-2002-01-07  Shiro Takeda  <zbc08106@park.zero.ad.jp>
-
-	* w3m.el (w3m-bold-face, w3m-underline-face): New faces.
-	(w3m-fontify-bold): Use `w3m-bold-face' instead of `bold'.
-	(w3m-fontify-underline): Use `w3m-underline-face' instead of
-	`underline'.
-
-2002-01-07  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-w32-browser-with-fiber): Fix handling of the local url.
-
-	* w3m-util.el (w3m-url-local-p): Fix its regexp for Windows.
-
-2002-01-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-about-header): Protect against null title.
-	(w3m-arrived-setup): Ignore database of arrived URLs in too old style.
-
-2002-01-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-url-encode-string): Add a period to the set of characters
-	which are not encoded.  From Fabrice Bauzac <noon@noon.dnsalias.net>
-
-2001-12-31  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-add-local-hook): New function.
-	(w3m-current-position): New buffer local variable.
-	(w3m-store-current-position): New hook function.
-	(w3m-print-this-url-after-command): New hook funtcion.
-	(w3m-buffer-setup): Regist these hook functions.
-	(w3m-header-line-location-title-face): Integrated with the defition in
-	w3m-e21.el
-	(w3m-header-line-location-content-face): Ditto.
-	(w3m-header-line-map): Ditto.
-	(w3m-header-line-insert): Renamed from `w3m-insert-header-line'.
-
-	* w3m-e21.el (w3m-header-line-location-title-face): Integrated to the
-	defition in w3m.el.
-	(w3m-header-line-location-content-face): Ditto.
-	(w3m-header-line-map): Ditto.
-	(w3m-setup-header-line): Clean up.
-	(w3m-insert-header-line): Removed.
-
-2001-12-30  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-url-to-file-name): Fix its regexp.
-
-2001-12-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-print-this-url): Display a message when it is called
-	interactively.
-
-2001-12-29  OHASHI Akira  <bg66@koka-in.org>
-
-	* w3m.el (w3m-print-this-url): Don't print any messages when there is
-	no url or form under point.
-
-2001-12-29  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-url-local-directory-alist): Renamed from
-	`w3m-edit-url-directory-alist'.
-	(w3m-url-to-file-name): Return nil, when the specified URL points no
-	local file.
-	(w3m-url-completion): Modified its regexp.  Fix completion of dot
-	files.
-	(w3m-edit-url): Simplified.
-	(w3m-goto-url): Removed the redundant local variable.  Set
-	`default-directory' to the local directory to which the current URL is
-	related by `w3m-url-local-directory-alist'.
-	(w3m-about-history): Installed the ad-hoc workaround.
-
-	* w3m-util.el (w3m-url-dtree-p): Modified its regexp.
-
-2001-12-26  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-decode-get-refresh): Not run Refresh timer if the URI is
-	matched `about://', .
-	(w3m-goto-url): Modify the timing to call `w3m-cancel-refresh-timer'.
-
-2001-12-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-util.el: Autoload "timer" for the function `cancel-timer' when
-	Mule 2 is running.
-
-2001-12-26  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-refresh-at-time): Run `w3m-goto-url-with-timer'
-	immediately, if the delay of refresh is zero.
-
-	* w3m-xmas.el (w3m-refresh-at-time): Removed.
-
-2001-12-25  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-use-refresh): New user option.
-	(w3m-refresh-timer, w3m-current-refresh): New buffer-local variables.
-	(w3m-clear-local-variables, w3m-copy-local-variables): Handle
-	`w3m-current-refresh'.
-	(w3m-meta-refresh-content-regexp)
-	(w3m-meta-content-refresh-regexp): New constant.
-	(w3m-decode-buffer): Call `w3m-decode-get-refresh' first.
-	(w3m-decode-get-refresh): New function.
-	(w3m-view-previous-page): Bind `w3m-use-refresh' to nil.
-	(w3m-quit, w3m-close-window): Call `w3m-cancel-refresh-timer' at any
-	buffers.
-	(w3m-goto-url): Call `w3m-cancel-refresh-timer' first.  Call
-	`w3m-refresh-at-time' at last; start REFRESH timer.
-	(w3m-goto-url-with-timer): New function.
-	(w3m-refresh-at-time): New function for FSF Emacs.
-
-	* w3m-xmas.el (w3m-refresh-at-time): New function for XEmacs.
-
-	* w3m-util.el (w3m-cancel-refresh-timer): New function.
-	(w3m-current-refresh, w3m-refresh-timer, w3m-use-refresh): Avoid
-	byte-compiled warnings.
-
-	* w3m-proc.el (w3m-process-stop): Call `w3m-cancel-refresh-timer'.
-
-2001-12-24  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-dump-head-source-command-arguments) [w3mmee]: Support
-	`w3m-accept-languages'.
-
-
-2001-12-21  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Release emacs-w3m-1.2.3 from emacs-w3m-1_2 branch.
-
-2001-12-21  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-type): Changed condition to decide type.
-	(w3m-decoder-alist): Call `file-name-nondirectory' before `w3m-command'
-	is refered.
-	(w3m-dirlist-cgi-program): Ditto.
-
-2001-12-21  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-type): Changed condition to decide type.
-	(w3m-decoder-alist): Use `w3m-command' for inflate command path.
-	(w3m-dirlist-cgi-program): Use `w3m-command'.
-	(w3m-dump-head-source-command-arguments) [w3mmee]: Don't add "-o
-	accept_language=xxx".
-
-2001-11-16  OKAZAKI Tetsurou <okazaki@be.to>
-
-	* w3m.el (w3m-type): Use "w3m-m17n" if exists.
-
-2001-12-21  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-goto-mailto-url): Use the property `composefunc' to get
-	the function to compose a mail from `mail-user-agent'.
-
-2001-12-20  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-load-list): Removed a bogus code for XEmacs; don't bind
-	the value of `file-coding-system-for-read' if the optional arg is nil
-	and `w3m-file-coding-system-for-read' is nil.
-
-2001-12-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3m-use-favicon): Don't bind it.
-
-	* w3m-e21.el (w3m-use-favicon): Set it to nil anyway when Emacs is
-	running in the batch mode.
-	(w3m-imagick-convert-buffer): Reverted.
-
-2001-12-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el (w3m-imagick-convert-buffer): Don't growl errors when
-	Emacs is running in the batch mode.
-
-2001-12-18  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-e21.el (w3m-favicon-use-cache-file): New user option.
-	(w3m-favicon-cache-file): Ditto.
-	(w3m-favicon-data-cache): New variable.
-	(w3m-retrieve-favicon): Use `w3m-favicon-data-cache' or store it.
-	(w3m-favicon-save-cache-file): New function.
-	(w3m-favicon-load-cache-file): Ditto.
-
-2001-12-17  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el (w3m-e21-toolbar-configurations): Replace
-	`auto-resize-tool-bar' to `auto-resize-tool-bars'.
-
-2001-12-17  OHASHI Akira  <bg66@koka-in.org>
-
-	* README.shimbun.ja: Add information for sb-debian-jp.el and
-	sb-debian.el.
-
-2001-12-17  Taiki SUGAWARA  <t-suga@atomsystem.co.jp>
-	    TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-form.el (w3m-form-parse-forms): Change the separater string for
-	option tag.
-
-2001-12-12  Taiki SUGAWARA  <t-suga@atomsystem.co.jp>
-
-	* w3m-form.el (w3m-form-parse-forms): If not find selected, first
-	element is made into default.
-
-2001-12-14  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-dtree.el (w3m-about-dtree): Ignore arguments on and after 4th.
-
-2001-12-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-	Suggested by NAKAJIMA Mikio <minakaji@osaka.email.ne.jp>.
-
-	* w3m-e21.el (w3m-use-favicon): Default to t, but it will be altered to
-	nil automatically if ImageMagick does not support a favicon; never use
-	ImageMagick if it has been set to nil.
-
-	* w3mhack.el (w3m-use-favicon): Bind it to nil to inhibit the use of
-	ImageMagick.
-
-2001-12-12 Kazuyoshi Koreeda <k_koreed@d2.dion.ne.jp>
-
-	* w3m-weather.el (w3m-weather-insert-seikatu-sisu): New function.
-	(w3m-weather-get-seikatu-sisu): Ditto.
-
-2001-12-10  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-form.el (w3m-form-parse-forms): Use `w3m-decode-entities-string'
-	to value in the textarea and option menu.
-
-2001-12-11  Mito  <mito@mxa.nes.nec.co.jp>
-
-	* w3m.el (w3m-scroll-left): Modify doc-string.
-	(w3m-scroll-right): Ditto.
-
-2001-12-07  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el (w3m-imagick-convert-usable-p): New function.
-	(w3m-use-favicon): Use it.
-
-2001-12-06  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>,
-	    TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-e21.el (top): Installed the check of the validity of ImageMagick.
-
-
-2001-12-06  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Release emacs-w3m-1.2.2 from emacs-w3m-1_2 branch.
-
-2001-12-06  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-type): Follow the new official release of w3m.
-	(w3m-attributes): Follow the change of error symbols which are defined
-	in w3m-proc.el.
-	(w3m-retrieve): Ditto.
-	(w3m-about-header): Likewise.  Ignore optional arguments safely.
-	(w3m-message): Display message only when original w3m buffer is
-	displayed.
-	(w3m-about-retrieve): Asynchronized.
-	(w3m-retrieve-and-render): Follow the change of `w3m-message'.
-	(w3m-prepare-content): Install the measure against narrowed buffers.
-
-	* w3m-proc.el (w3m-process-start-process): Accept the 2nd optional
-	argument to reset the sentinel funtcion for the generated asynchronous
-	process.
-	(w3m-process-failure): Removed.
-	(w3m-process-timeout): Simplified its error condition.
-	(w3m-process-with-wait-handler): No sentinel function is registered and
-	the sentinel function is called from this macro itself.
-
-	* w3m-weather.el (w3m-weather-filter-functions): Add
-	`w3m-weather-expand-anchors'.
-	(w3m-about-weather): Asynchronized.
-	(w3m-weather-remove-headers): Follow changes of original content.
-	(w3m-weather-remove-footers): Ditto.
-	(w3m-weather-expand-anchors): New filter function.
-
-2001-12-06  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-emacs-w3m-icon): Made it interlaced and endlessly
-	animated.
-
-2001-12-06  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-decode-buffer): When content-charset is unknown, detect
-	coding-system automatically.
-
-2001-12-04  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-e21.el (w3m-buffer-favicon): Reset `w3m-current-favicon-data' to
-	nil when conversion was failure.
-
-2001-12-04  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el (w3m-imagick-convert-buffer): Say errors and return nil if
-	the process returns a non-zero status (possibly a string).
-
-2001-12-03  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-xmas.el (w3m-create-image): Bind some arguments lexically for
-	w3m-fix-gif().
-
-2001-12-04  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-e21.el (w3m-setup-favicon): Fix for "about://" url.
-	(w3m-buffer-favicon): Renamed local variable.
-	(w3m-tab-line): Call `w3m-buffer-favicon' only when w3m-use-favicon is
-	non-nil.
-
-2001-12-03  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-modeline-process-status-on): Modify default value.
-	(w3m-buffer-setup): Simplified `mode-line-buffer-identification'.
-
-2001-11-29  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-e21.el (w3m-imagick-convert-program): New user option.
-	(w3m-favicon-size): Ditto.
-	(w3m-use-favicon): Ditto.
-	(w3m-favicon-name): New constant.
-	(w3m-current-favicon-data): New buffer local variable.
-	(w3m-current-favicon-image): Ditto.
-	(w3m-display-hook): Added 'w3m-setup-favicon.
-	(w3m-imagick-convert-buffer): New function.
-	(w3m-imagick-convert-data): Ditto.
-	(w3m-setup-favicon): Ditto.
-	(w3m-buffer-favicon): Ditto.
-	(w3m-retrieve-favicon): Ditto.
-	(w3m-tab-line): Display favicon on tab.
-
-2001-11-28  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-xmas.el (w3m-insert-image): Rewrite.
-	(if displayed images exist on the right side, keep them and display
-	again)
-	(w3m-remove-image): Call `delete-extent' to destroy extents.
-
-2001-11-27  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
-
-	* TIPS: New file.
-
-2001-11-27  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-download-this-url): Fix a problem of broken URL.
-
-2001-11-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (top, w3m-about): Change the URL of w3m's official page.
-
-2001-11-21  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-max-anchor-sequence): New buffer local variable.
-	(w3m-copy-local-variables, w3m-clear-local-variables): Handle
-	`w3m-max-anchor-sequence'.
-	(w3m-fontify-anchors): Reset `w3m-max-anchor-sequence' to zero.  Use
-	the text-property `w3m-anchor-sequence' insted of `w3m-cursor-anchor'.
-	(w3m-goto-next-anchor, w3m-next-anchor, w3m-goto-previous-anchor)
-	(w3m-previous-anchor): Rewrite use the text-property
-	`w3m-anchor-sequence'.
-	(w3m-next-form, w3m-goto-next-image, w3m-next-image)
-	(w3m-previous-image): Fix mistake as modified last time.
-
-	* w3m-util.el (w3m-anchor-sequence): New macro.
-	(w3m-cursor-anchor) Remove macro.
-
-	* w3m-form.el (w3m-form-fontify): Use the text-property
-	`w3m-anchor-sequence' insted of `w3m-cursor-anchor'.
-
-2001-11-21  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-download-this-url): Wrap the form which is evaluated in
-	asynchronous context with `w3m-process-with-null-handler', to fix the
-	bug reported by Hideyuki SHIRAI <shirai@meadowy.org>.
-
-	* w3m-xmas.el (w3m-create-image): Modified to avoid calling
-	`w3m-process-with-wait-handler'.
-
-2001-11-20  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-proc.el (w3m-process-push): Set the buffer-local variable
-	`w3m-process-object' in the appropriate buffer.
-	(w3m-process-sentinel): Removed redundant call of
-	`with-current-buffer'.
-
-	* Makefile.in (default): Reintroduce of checking time stamps of
-	w3m-util.elc and w3m-proc.elc.
-
-	* w3m-proc.el (w3m-process-temp-file): Abolished.
-
-	* w3m.el (w3m-content-charset, w3m-content-encoding,
-	w3m-content-length, w3m-content-type, w3m-last-modified, w3m-real-url):
-	Fixed asynchrounization.
-	(w3m-download): Changed the argument spec and the body to accept an
-	asynchrounous context.
-	(w3m-external-view): Follow change of `w3m-download'.
-	(w3m-external-view-file): Changed the argument spec and the body;
-	`w3m-process-temp-file' is not refered.
-	(w3m-download-this-url): Follow change of `w3m-download'.
-	(w3m-scroll-left, w3m-scroll-right): Use `call-interactively' to avoid
-	a strange behavior of Emacs21.  This change is suggested by Hironori
-	FUJII <fujii@chi.its.hiroshima-cu.ac.jp>.
-
-	* w3m-proc.el (w3m-process-failure): New error symbol.
-	(w3m-process-timeout): Change its error condition.
-	(w3m-process-with-wait-handler): Install adhoc workaround.
-
-	* w3m.el (w3m-attributes, w3m-retrieve, w3m-about-header): Follow
-	change of `w3m-process-with-wait-handler'.
-
-2001-11-19  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-modeline-process-status-on): New constant.
-	(w3m-modeline-status-off): Rename from `w3m-modeline-image-status-off'.
-	(w3m-buffer-setup): Show the string of `w3m-modeline-process-status-on'
-	when process running.
-	(w3m-download): Add 4th argument `extview' for w3m-external-view(). If
-	`extview' is gived, apply `extview' on process-sentinel like (apply
-	(car extview) (cdr extview)).
-	(w3m-external-view): When execute `w3m-download', call with `extview'
-	argument.
-	(w3m-external-view-file): New function.
-
-2001-11-19  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-print-this-url): View current image info.
-	(w3m-goto-next-image, w3m-next-image, w3m-goto-previous-image)
-	(w3m-previous-image): New functions.
-	(w3m-lynx-like-map, w3m-info-like-map): Bind "}" as the key to call
-	`w3m-next-image'. Bind "{" as the key to call `w3m-previous-image'.
-	(w3m-mode): Modify dos-string.
-
-2001-11-19  Masatake YAMATO  <jet@gyve.org>
-
-	* w3m.el (w3m-goto-next-form, w3m-next-form)
-	(w3m-goto-previous-form, w3m-previous-form): New functions.
-	(w3m-lynx-like-map, w3m-info-like-map): Bind "]" as the key to call
-	`w3m-next-form'. Bind "[" as the key to call `w3m-previous-form'.
-
-2001-11-19  Kazuhiko  <kazuhiko@ring.gr.jp>
-
-	* w3m-xmas.el (w3m-create-image): Fix a problem in handling XBM on
-	XEmacs.
-
-2001-11-18  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-attributes): Establish the error handler for
-	`w3m-process-timeout' when the argument `handler' is equal to nil.
-	(w3m-retrieve): Ditto.
-	(w3m-about-header): Establish the error handler for
-	`w3m-process-timeout' before `w3m-w3m-get-header' is called.
-	(w3m-select-buffer-close-window): Check whether the menu's window
-	exists.
-
-	* w3m-proc.el: Changes to avoid endless loop.
-	(w3m-process-start-process): Changed the spec of its return value.
-	(w3m-process-timeout): New error symbol.
-	(w3m-process-with-wait-handler): Bind `inhibit-quit' to nil, in order
-	to accept user's quit; Signal `w3m-process-timeout' when time out is
-	detected.
-	(w3m-process-do): Accept null variable.
-	(w3m-process-do-with-temp-buffer): Ditto.
-
-	* Makefile.in (default): Cancel the last change.
-
-2001-11-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Makefile.in (default): When files which define macros and inline
-	functions such as w3m-util.el and w3m-proc.el are newer than their
-	byte-compiled files, run clean target before compile.
-
-	* w3m.el (w3m-about-db-history-today): Removed.
-	(w3m-about-db-history): Call `w3m-time-lapse-seconds' to classify
-	entries.
-
-	* w3m-proc.el: Changes to avoid endless loop.
-	(w3m-process-inhibit-quit): New internal variable.
-	(w3m-process-timeout): New variable.
-	(w3m-process-with-wait-handler): Strict check when asynchrounous
-	processes finish; Refer `w3m-process-timeout' to check idle time.
-	(w3m-process-sentinel): Bind `inhibit-quit' according to
-	`w3m-process-sentinel'.
-
-	* w3m-e21.el: Changes to display tabs which are retieving contents in
-	the other face.
-	(top): Define `w3m-current-process' to avoid byte-compile warning.
-	(w3m-tab-unselected-retrieving-face): New face.
-	(w3m-tab-selected-retrieving-face): Ditto.
-	(w3m-tab-line): Refer `w3m-current-process' in order to select the face
-	of the tab which is retriving some pages.
-
-	* w3m-util.el (w3m-time-lapse-seconds): New inline function.
-
-	* w3m-antenna.el (top): Add autoload of `w3m-filter' to avoid
-	byte-compile warning.
-
-2001-11-16  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-select-buffer): If nomsg eq 'update, don't save
-	selected-window; so called `w3m-select-buffer-update' any window to
-	differ original window executed process, is broken
-	`w3m-select-buffer-window'.
-	(w3m-select-buffer-update): Call `w3m-select-buffer' with 'update.
-
-2001-11-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* mime-w3m.el (mime-w3m-keymap-property): New macro.
-	(mime-w3m-preview-text/html, kill-new): Use the above macro instead of
-	`w3m-static-if'.
-
-2001-11-16  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-select-buffer-window-ratio): New user option.
-	(w3m-select-buffer-window-size): Remove user option.
-	(w3m-select-buffer-window-size): New function.
-	(w3m-select-buffer-toggle-style): Ditto.
-	(w3m-select-buffer): Use `w3m-select-buffer-window-size' when calculate
-	window size. When call with prefix argument, toggle
-	`w3m-select-buffer-horizontal-window'.
-	(w3m-select-buffer-show-this-line): Use `w3m-select-buffer-window-size'
-	when calculate window size.  If exist w3m-buffer another window under
-	control, use it.
-	(w3m-select-buffer-mode-map): Modify the key binding 'C-cC-s' for
-	toggle `w3m-select-buffer-horizontal-window'.
-	(w3m-select-buffer-update): Call `w3m-select-buffer' with two
-	arguments.
-	(w3m-select-buffer-mode): Modify doc-string.
-
-	* w3m-tabmenu.el (w3m-switch-buffer): Change the rule of detecting
-	default buffer.
-	(w3m-tab-menubar-make-items): Ditto.
-
-2001-11-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* mime-w3m.el: Changes to make installation of this module be easy;
-	Comments updated; Initialize code is moved to `mime-w3m-setup'; Changed
-	requirement of other modules.
-	(mime-w3m-display-inline-images): Changed the default value.
-	(mime-w3m-insinuate, mime-w3m-setup): New function.
-	(mime-w3m-preview-text/html): Call `mime-w3m-setup'.
-
-2001-11-15  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-search.el: Require `cl' when compiling.
-
-2001-11-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Changes to avoid that multi async processes are started in
-	the same buffer.
-	(w3m-current-process): New internal variable to protect parallel
-	retriving.
-	(w3m-attributes, w3m-base-url, w3m-content-charset,
-	w3m-content-encoding, w3m-content-length, w3m-content-type,
-	w3m-last-modified, w3m-real-url): Asynchronized.
-	(w3m-toggle-inline-images-internal): Set `w3m-current-buffer' to this
-	buffer locally, in order to classify the generated async process to the
-	appropriate buffer.
-	(w3m-toggle-inline-images): Stop processes which are retrieving images
-	of this buffer.
-	(w3m-retrieve-and-render): Remove redundant `let'.
-	(w3m-view-this-url): Refontify anchor.
-	(w3m-lynx-like-map, w3m-info-like-map): Bind `C-cC-g' as the key to
-	call `w3m-process-stop'.
-	(w3m-goto-url): Check `w3m-current-process' to avoid reenterant and set
-	it to the value of `w3m-retrieve-and-render'; Before the retrieving
-	process of the next page is started, select this buffer in the current
-	window and stop processes which are retrieving images of this buffer.
-	(w3m): Not select this buffer in the current window.
-
-	* w3m-proc.el (top): Define `w3m-current-process' to avoid byte-compile
-	warning.
-	(w3m-process-queue-registrable-p): Abolished.
-	(w3m-process-new): Its argument spec is changed; Changed the strucuture
-	of `w3m-process' object.
-	(w3m-process-command): New macro.
-	(w3m-process-arguments): Follow the structural change of `w3m-process'
-	object.
-	(w3m-process-push): Likewise; Follow change of `w3m-process-new'; No
-	check for `w3m-process-queue-registrable-p'.
-	(w3m-process-kill-process): Check process status before stopping them.
-	(w3m-process-start-process): Follow the structural change of
-	`w3m-process' object.
-	(w3m-process-stop): Ditto; Start queued processes.
-	(w3m-process-with-null-handler): No check for
-	`w3m-process-queue-registrable-p'.
-
-	* w3m-util.el (w3m-kill-buffer): Fix code to kill this buffer.
-
-2001-11-15  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-select-buffer): Fix window height calculation when
-	w3m-select-buffer-horizontal-window is nil.
-	(w3m-select-buffer-mode-map): Add the key bind of
-	`w3m-select-buffer-show-this-line-and-down'. Modify the key bind of
-	`w3m-select-buffer-show-this-line'.
-	(w3m-select-buffer-show-this-line): Fix window height calculation when
-	w3m-select-buffer-horizontal-window is nil. If already displayed
-	w3m-buffer and call interactively, call `w3m-scroll-up-or-next-url'.
-	(w3m-select-buffer-show-this-line-and-down): New function.
-
-2001-11-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Merge experimental-async branch to main trunk.
-
-	* w3m-util.el: Rename from w3m-macro.el; Require `poe' and `poem'
-	module for XEmacs and Mule; Import some functions from w3m.el and
-	w3m-proc.el.
-
-	* w3m.el: Require `w3m-util' instead of `w3m-macro'; Export
-	`w3m-kill-all-buffer' to w3m-util.el.
-	(w3m-work-binary-buffer-name): Removed.
-	(w3m-rendering-half-dump): Accept an optional argument for w3mmee and
-	w3m-m17n.
-	(w3m-rendering-buffer-1): Accept two optional arguments for w3mmee and
-	w3m-m17n.
-	(w3m-rendering-unibyte-buffer): Generate a new working buffer for
-	w3mmee and w3m-m17n, in order to avoid racing.
-	(w3m-rendering-multibyte-buffer): Ditto.
-
-	* w3m-proc.el: Require `w3m-util' instead of `w3m-macro'; Export
-	`w3m-buffer-title', `w3m-buffer-name-lessp' and `w3m-list-buffers' to
-	w3m-util.el.
-
-	* mime-w3m.el, w3m-antenna.el, w3m-bookmark.el, w3m-e21.el,
-	w3m-form.el, w3m-tabmenu.el, w3m-xmas.el: Require `w3m-util' instead of
-	`w3m-macro'.
-
-	* w3mhack.el (w3mhack-examine-modules): Handle w3m-util.el instead of
-	w3m-macro.el.
-
-2001-11-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (top): Colon keywords definition are moved to `w3m-macro.el'.
-	(w3m-process-connection-type): Imported from `w3m-proc.el'.
-	(w3m-next-buffer, w3m-previous-buffer): Simplified.
-	(w3m-delete-buffer): Call `w3m-quit' when the number of w3m-mode
-	buffers is equal to 1.
-	(w3m-quit): Kill all w3m-mode buffers.
-	(w3m-close-window): Call `w3m-select-buffer-close-window'.
-	(w3m-select-buffer-generate-contents): Simplified.
-	(w3m-select-buffer-close-window): New function.
-
-	* w3m-tabmenu.el (w3m-tab-menubar-make-items): Use `w3m-buffer-title'
-	and `w3m-list-buffers'.
-
-	* w3m-proc.el (top): Require `poe' module in XEmacs; Require `w3m-om'
-	in Mule; Define `w3m-current-title' to avoid byte-compile warning.
-	(w3m-process-connection-type): Exported to `w3m.el'.
-	(w3m-buffer-title, w3m-buffer-name-lessp, w3m-list-buffers): New
-	functions.
-
-	* w3m-macro.el (top): Colon keywords definition are imported from
-	`w3m.el'.
-	(w3m-pullout-buffer-number): Removed.
-
-	* w3m-e21.el (w3m-tab-line): Use `w3m-buffer-title' and
-	`w3m-list-buffers'.
-
-	* w3m.el (w3m-attributes): Wrap `w3m-w3m-attributes' with
-	`w3m-process-with-wait-handler'.
-	(w3m-w3m-attributes): Changed the argument spec.  Now, this function
-	can be used only in asynchronous context.
-	(w3m-rendering-unibyte-buffer): Changed the argument spec, and the
-	first argument `url' is refered instead of `w3m-current-url'.  This
-	change is made to avoid using `w3m-process-with-wait-handler' in
-	asynchronous context.
-	(w3m-prepare-content): Follow the change of
-	`w3m-rendering-unibyte-buffer'.
-
-2001-11-14  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-next-buffer): Use `w3m-pullout-buffer-number' when sort
-	buffer-name.
-	(w3m-previous-buffer): Ditto.
-	(w3m-select-buffer): Change the turn to call of functions.
-	(w3m-select-buffer-generate-contents): Use `w3m-pullout-buffer-number'
-	when sort buffer-name.  Use text-property instead of point when move to
-	point.
-	(w3m-select-buffer-recheck): Fix read-only error.
-	(w3m-select-buffer-copy-buffer): Rewrite.
-
-	* w3m-tabmenu.el (w3m-tab-menubar-make-items): Use
-	`w3m-pullout-buffer-number' instead of `w3m-tab-menubar-pull-bufnum'.
-	(w3m-tab-menubar-pull-bufnum): Remove.
-
-	* w3m-macro.el (w3m-pullout-buffer-number): New defsubst.
-
-	* w3m-e21.el (w3m-tab-line): Use `w3m-pullout-buffer-number' when sort
-	buffer-name.
-
-2001-11-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-parse-attributes): Moved it again to w3m-macro.el.
-	* w3m-macro.el: The opposite of above.
-
-2001-11-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el: Moved back some macros and inline functions from
-	w3m-macro.el.
-
-	* w3m-macro.el (w3m-parse-attributes, w3m-real-url, w3m-last-modified,
-	w3m-content-type, w3m-content-length, w3m-content-encoding,
-	w3m-content-charset, w3m-base-url, w3m-attributes): Moved back to
-	w3m.el.
-
-2001-11-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-w3m-retrieve) Call `w3m-w3m-attributes' instead of
-	`w3m-attributes'.
-
-	* w3m-proc.el (w3m-process-with-wait-handler): Reimplemented.
-
-2001-11-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el: Moved some macros and inline functions to w3m-macro.el.
-
-	* w3m-macro.el (w3m-time-newer-p, w3m-url-local-p, w3m-url-dtree-p,
-	w3m-parse-attributes, w3m-real-url, w3m-last-modified,w3m-content-type,
-	w3m-content-length, w3m-content-encoding, w3m-content-charset,
-	w3m-base-url, w3m-attributes, w3m-cursor-anchor, w3m-submit, w3m-image,
-	w3m-anchor, w3m-action, w3m-get-text-property-around): Moved from
-	w3m.el.
-	(w3m-condition-case): Use old-fashioned backquotes.
-
-	* w3m.el, w3m-xmas.el, w3m-tabmenu.el, w3m-form.el, w3m-e21.el,
-	w3m-bookmark.el, w3m-antenna.el, mime-w3m.el: Require `w3m-macro'.
-
-2001-11-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-w3m-get-header, w3m-w3m-attributes): Asynchronized.
-	(w3m-w3m-retrieve): Argument spec is changed.
-	(w3m-w3m-dump-head-source): Follow change of `w3m-w3m-attributes'.
-	(w3m-copy-buffer): Removed redundant code.
-	(w3m-about-header): Follow change of `w3m-w3m-get-header'.
-
-	* w3m-proc.el (w3m-process-do): The generated asynchronous process in
-	the post handler is started at the end of `w3m-process-sentinel'.
-	(w3m-process-do-with-temp-buffer): Ditto.
-	(w3m-process-sentinel): Fixed.
-
-	* w3m.el (w3m-download): Use `progn' instead of `inline', in order to
-	make debugging be easy.
-	(w3m-retrieve-and-render): Ditto.
-
-	* w3m-proc.el: Changed the order of asynchronous form evaluation and
-	starting asynchronous processes.
-	(w3m-process-queue): Renamed from `w3m-processes'.
-	(w3m-process-queue-registrable-p): New internal variable.
-	(w3m-process-with-coding-system): New macro.
-	(w3m-process-with-environment): Redefine with new backquote style.
-	(w3m-process-push): Refer `w3m-process-queue-registrable-p' to add the
-	handler to processes registered in `w3m-process-queue' safely.
-	(w3m-process-start-process): New internal function.
-	(w3m-process-start-queued-processes): Renamed from
-	`w3m-process-start-internal'; Call `w3m-process-start-process'; Follow
-	renaming of variables.
-	(w3m-process-stop, w3m-process-shutdown): Follow renaming of variables.
-	(w3m-process-with-null-handler): Start asynchronous processes at the
-	end of this macro.
-	(w3m-process-do, w3m-process-do-with-temp-buffer): Reimplemented.
-	(w3m-process-start): Reimplemented.  Asynchronous processes are not
-	started in this function.
-	(w3m-process-start-after): New internal function.
-	(w3m-process-sentinel): Follow renaming of variables and functions.
-
-2001-11-13  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-macro.el (w3m-condition-case): New macro.
-
-2001-11-13  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Makefile.in: Fix the macro rule to generate *.elc files.
-
-	* w3m.el (w3m-display-hook): Add `w3m-select-buffer-update'.
-	(w3m-select-buffer-name): Move the definition position to avoid
-	byte-compile warning.
-	(w3m-goto-url): Removed the code to update the select buffer.
-	(w3m-select-buffer-update): New function.
-
-	* w3m-proc.el (w3m-process-with-wait-handler): Adhoc workaround.
-	(w3m-process-start): Fix.
-
-2001-11-13  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-lynx-like-map): Bind `C-cC-a' as the key to call
-	`w3m-switch-buffer'.
-	(w3m-info-like-map): Ditto. Bind `\C-c\C-@' and `C-c\C- ' as the key to
-	call `w3m-history-store-position'. Bind `C-cC-b' as the key to call
-	`w3m-history-restore-position'.
-	(w3m-mode): Modify doc-string.
-	(w3m-select-buffer-show-this-line-and-switch): New function.
-	(w3m-select-buffer-name): New internal constant.
-	(w3m-select-buffer-mode-map): Bind `w' and `h' as the key to call
-	`w3m-select-buffer-show-this-line-and-switch'.
-	(w3m-select-buffer-mode): Modify doc-string.
-	(w3m-select-buffer): Use `w3m-select-buffer-name'. If alive
-	select-buffer, use it.  Add optional argument `nomsg'.
-	(w3m-select-buffer-generate-contents): If w3m-current-title is
-	`<no-title>', use w3m-current-url.
-	(w3m-select-buffer-show-this-line): Return selected buffer.
-	(w3m-select-buffer-quit): Always pop up the w3m window when quit.
-	(w3m-select-buffer-show-this-line-and-quit): Rewrite.
-	(w3m-goto-url): If alive w3m-select-buffer, update it.
-	(w3m-copy-buffer): If w3m-pop-up-windows is nil, use
-	switch-to-buffer. Block to change w3m-select-buffer to w3m buffer, if
-	w3m-pop-up-windows is t.
-	(top): Add autoload of `w3m-setup-tab' and `w3m-switch-buffer'.
-	(w3m-setup-menu): Call `w3m-setup-tab-menu' when w3m-use-tab-menubar is
-	t.
-	(w3m-mode): Remove to call `w3m-setup-tab-menu'.
-
-	* w3m-e21.el (TOP): Remove `(require 'w3m-tabmenu)'.
-
-	* w3m-e20.el (TOP): Ditto.
-
-	* w3m-om.el (TOP): Ditto.
-
-	* w3m-xmas.el (w3m-setup-tab-menu, w3m-tab-menubar-pull-bufnum)
-	(w3m-tab-menubar-make-items, w3m-select-buffer): Remove.
-	(w3m-setup-menu): Call `w3m-setup-tab-menu' when w3m-use-tab-menubar is
-	t.
-
-	* w3mhack.el (w3mhack-examine-modules): Revival byte-compile
-	`w3m-tabmenu.el' when XEmacs.
-
-	* w3m-tabmenu.el (ALL): Full rewrite to use `easymenu'.
-
-2001-11-13  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-select-buffer-horizontal-window): New user option.
-	(w3m-select-buffer-window-size): Ditto.
-	(w3m-lynx-like-map): Bind `C-cC-b' as the key to call
-	`w3m-switch-buffer.
-	(w3m-info-like-map): Ditto.
-	(w3m-select-buffer-window): New internal variable.
-	(w3m-select-buffer-message): New internal constant.
-	(w3m-select-buffer): New implementation.
-	(w3m-select-buffer-generate-contents): New function.
-	(w3m-select-buffer-mode-map): New keymap.
-	(w3m-select-buffer-mode): New function.
-	(w3m-select-buffer-recheck): New command.
-	(w3m-select-buffer-current-buffer): New macro.
-	(w3m-select-buffer-show-this-line): New command.
-	(w3m-select-buffer-next-line): Ditto.
-	(w3m-select-buffer-previous-line): Ditto.
-	(w3m-select-buffer-copy-buffer): Ditto.
-	(w3m-select-buffer-delete-buffer): Ditto.
-	(w3m-select-buffer-quit): Ditto.
-	(w3m-select-buffer-show-this-line-and-quit): Ditto.
-
-	* w3m-xmas.el (w3m-switch-buffer): Renamed from `w3m-select-buffer'.
-
-	* w3m-tabmenu.el (w3m-switch-buffer): Renamed from `w3m-select-buffer'.
-
-2001-11-12  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-e20.el (w3m-display-inline-images-p): Renamed from
-	`w3m-display-inline-image-p'.
-
-	* w3m-om.el (w3m-display-inline-images-p): Ditto.
-
-2001-11-12  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* mew-w3m.el (mew-mime-text/html-w3m): Bind `w3m-display-inline-images'
-	instead of `w3m-current-image-status'.
-
-	* mime-w3m.el (mime-w3m-display-inline-images): Renamed from
-	`mime-w3m-display-inline-image'.
-	(mime-w3m-preview-text/html): Follow the change above; Bind
-	`w3m-display-inline-images' instead of `w3m-current-image-status'.
-
-	* w3m-xmas.el (w3m-display-inline-images-p): Renamed from
-	`w3m-display-inline-image-p'; Refer `w3m-display-inline-images' instead
-	of `w3m-current-image-status'.
-
-	* w3m-e21.el (w3m-display-inline-images-p): Renamed from
-	`w3m-display-inline-image-p'; Refer `w3m-display-inline-images' instead
-	of `w3m-current-image-status'.
-
-	* w3m.el (w3m-display-inline-image): Abolish.
-	(w3m-current-image-status): Ditto.
-	(w3m-display-inline-images): New buffer local variable.
-	(w3m-default-display-inline-images): New user option.
-	(w3m-toggle-inline-images-permanently): Ditto.
-	(w3m-toggle-inline-image): Added docstring.
-	(w3m-toggle-inline-images): Ditto; Refer `w3m-display-inline-images'
-	instead of `w3m-current-image-status'.
-	(w3m-view-url-with-external-browser): Ditto.
-	(w3m-goto-url): Ditto.
-	(w3m-toggle-inline-images): Change the value of
-	`w3m-display-inline-images' even when displaying images is not
-	completed.
-	(w3m-copy-buffer): Set `w3m-display-inline-images' according to
-	`w3m-toggle-inline-images-permanently'.
-	(w3m-mode): Set value of `w3m-display-inline-images' according to
-	`w3m-default-display-inline-images'.
-	(w3m-goto-url): Set `w3m-display-inline-images' according to
-	`w3m-toggle-inline-images-permanently'; Use
-	`w3m-display-inline-images-p' instead of `w3m-display-inline-image-p'.
-	(w3m-redisplay-with-charset): Use `w3m-display-inline-images' instead
-	of `w3m-display-inline-image'.
-	(w3m-region): Use `w3m-display-inline-images-p' instead of
-	`w3m-display-inline-image-p'.
-
-2001-11-12  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (Top): Abolished autoload of `w3m-setup-tab'.
-	(w3m-use-tab-menubar): Revival.
-	(w3m-lynx-like-map): Bind `C-cC-s' as the key to call
-	`w3m-select-buffer'.
-	(w3m-info-like-map): Ditto.
-	(w3m-mode): Update the doc-string for the commands `w3m-next-buffer',
-	`w3m-previous-buffer', `w3m-delete-buffer' and `w3m-select-buffer'.
-	Use `w3m-use-tab-menubar' and `w3m-setup-tab-menu()'.
-
-	* w3m-e21.el (Top): Require `w3m-tabmenu'.
-
-	* w3m-e20.el (Top): Ditto.
-
-	* w3m-om.el (Top): Ditto.
-
-	* w3m-tabmenu.el: Rename from `w3m-tab.el'.
-	(w3m-setup-tab-menu): Rename from `w3m-setup-tab'.
-	(w3m-tab-menubar-make-items): Add new option `nomenu' for
-	w3m-select-buffer().
-	(w3m-select-buffer): New function.
-
-	* w3m-xmas.el (w3m-setup-tab-menu): Use `defun' insted of `ignore' to
-	avoid byte-compile warnings.
-	(w3m-tab-menubar-pull-bufnum, w3m-tab-menubar-make-items)
-	(w3m-select-buffer): Copy from w3m-tabmenu.el
-
-	* w3mhack.el (w3mhack-examine-modules): Don't byte-compile
-	`w3m-tabmenu.el' when XEmacs.
-
-
-2001-11-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Release emacs-w3m-1.2.1 from emacs-w3m-1_2 branch.
-
-2001-11-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-expand-url): Remove the last segment of the base URL
-	before concatination the specified URL which has only a query part and
-	the base URL.
-
-2001-11-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-proc.el (w3m-process-new): Argument spec is changed.
-	(w3m-process-process): New macro.
-	(w3m-process-handlers): Follow the change of `w3m-process-new'.
-	(w3m-process-kill-process): New inline function.
-	(w3m-process-start-internal): Strict checking.
-	(w3m-process-stop): Fixed.
-	(w3m-process-with-wait-handler): Simplified.
-	(w3m-process-do): Strict checking of redundant evaluation.
-	(w3m-process-do-with-temp-buffer): Ditto.
-	(w3m-process-start): Not bind `w3m-process-exit-status' as a local
-	variable.
-	(w3m-process-sentinel): Ensure that this function will be never called
-	repeatedly; Strict checking.
-
-2001-11-12  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-e21.el (top): Abolished a ignore() of `w3m-use-tab'.
-
-2001-11-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-w3m-dump-head-source): Fix the problem which occurs when
-	no content is retrieved.
-
-2001-11-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3mhack.el (w3mhack-examine-modules): Handle `w3m-proc.el'.
-
-	* w3m.el: Modified to retrieve contents asynchronously.
-	(top): Require `w3m-proc.el' instead of `w3m-macro.el'.
-	(w3m-command-environment): Old name is `w3m-process-environment'.
-	(w3m-display-hook): Changed the default value.
-	(w3m-current-buffer): New internal variable.
-	(w3m-arrived-user-alist): Renamed to `w3m-process-user-alist' and
-	exported to `w3m-proc.el'.
-	(w3m-process-connection-type, w3m-process-user, w3m-process-passwd,
-	w3m-process-user-counter, w3m-process-realm, w3m-process-temp-file,
-	w3m-process-exit-status): Exported to `w3m-proc.el'.
-	(w3m-toggle-inline-images-internal): Follow change of
-	`w3m-create-image'.
-	(w3m-exec-process): Removed.
-	(w3m-exec-get-user): Renamed to `w3m-process-get-user' and exported to
-	`w3m-proc.el'.
-	(w3m-exec-get-passwd): Renamed to `w3m-process-get-passwd' and exported
-	to `w3m-proc.el'.
-	(w3m-exec-set-user): Renamed to `w3m-process-set-user' and exported to
-	`w3m-proc.el'.
-	(w3m-get-server-root): Renamed to `w3m-process-get-server-root' and
-	exported to `w3m-proc.el'.
-	(w3m-proxy-user): Renamed to `w3m-process-proxy-user' and exported to
-	`w3m-proc.el'.
-	(w3m-proxy-passwd): Renamed to `w3m-process-proxy-passwd' and exported
-	to `w3m-proc.el'.
-	(w3m-exec-filter): Renamed to `w3m-process-filter' and exported to
-	`w3m-proc.el'; Slightly modified to protect illegal type of
-	`w3m-current-url'.
-	(w3m-decode-encoded-contents, w3m-x-moe-decode-buffer,
-	w3m-local-dirlist-cgi, w3m-rendering-half-dump): Use
-	`w3m-process-with-environment' to adjust the environment variables.
-	(w3m-local-retrieve, w3m-cid-retrieve): Insert the retrieved content to
-	this current buffer.
-	(w3m-w3m-get-header): Call `w3m-process-start' instead of
-	`w3m-exec-process'.
-	(w3m-w3m-dump-head-source, w3m-w3m-retrieve, w3m-about-retrieve,
-	w3m-retrieve, w3m-download): Reconstructed to support asynchronous
-	operation.
-	(w3m-exec): Removed.
-	(w3m-retrieve-and-render, w3m-prepare-content): New function.
-	(w3m-quit): Call `w3m-process-shutdown'.
-	(w3m-buffer-setup): New inline function.
-	(w3m-goto-url): Accept the 6th optional argument, and modified for
-	asynchronous processing.
-	(w3m-goto-url-localcgi-movepoint): Removed.
-	(w3m-move-point-for-localcgi): New function.
-	(w3m): Removed redundant quote from the definition of
-	`focusing-function'; Display the browsing buffer.
-	(w3m-region): Set `w3m-current-buffer' to this current buffer.
-	(w3m-about, w3m-about-header): Insert the generated content to this
-	current buffer.
-	(w3m-about-history, w3m-about-db-history): To access buffer-local
-	variables, refer the value of `w3m-current-buffer'.
-
-	* w3m-xmas.el (top): Require `w3m-proc.el' instead of `w3m-macro.el'.
-	(w3m-create-image): Accept the 4th optional argument, and modified for
-	asynchronous processing.
-
-	* w3m-weather.el (w3m-about-weather): Insert the generated content to
-	this current buffer.
-
-	* w3m-proc.el: New file.
-
-	* w3m-namazu.el (w3m-about-namazu): Insert the generated content to
-	this current buffer.
-
-	* w3m-macro.el (w3m-with-work-buffer): Removed.
-	(w3m-kill-buffer): New inline function.
-
-	* w3m-filter.el (w3m-filter): Filtering the content in this current
-	buffer.
-
-	* w3m-e21.el (top): Require `w3m-proc.el' instead of `w3m-macro.el'.
-	(w3m-create-image): Accept the 4th optional argument, and modified for
-	asynchronous processing.
-
-	* w3m-antenna.el (w3m-about-antenna): Insert the generated content to
-	this current buffer.
-
-	* mime-w3m.el (mime-w3m-cid-retrieve): Insert the retrieved content to
-	this current buffer.
-
-	* mew-w3m.el (mew-w3m-cid-retrieve): Insert the retrieved content to
-	this current buffer.
-
-2001-11-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-use-tab-menubar): Abolished.
-	(w3m-pop-up-windows): Changed the expression to decide its default
-	value.
-	(w3m-setup-menu): Removed the code to set the menubar item of TAB.
-	(w3m-fontify-images): Accept an image-type input tag.
-	(w3m-fontify): To accept an image-type input tag, changed the order of
-	calling fontify functions.
-	(top): Add autoload of `w3m-setup-tab'.
-	(w3m-mode): Call `w3m-setup-tab'.
-	(w3m-tab-menubar-open-buffer): Moved to `w3m-tab.el'.
-	(w3m-tab-menubar-update): Ditto.
-	(w3m-tab-menubar-pull-bufnum): Ditto.
-	(w3m-tab-menubar-make-items): Ditto.
-
-	* w3m-tab.el: New file.
-
-	* w3m-e21.el (top): Define `w3m-use-tab' to avoid byte-compile warning.
-	(w3m-use-tab): Moved to `w3m.el'.
-	(w3m-setup-tab): Define as a dummy function.
-
-	* w3m-xmas.el (w3m-setup-tab): Define as a dummy function.
-
-	* w3m-form.el: Changes of the structure of the `w3m-form' object.
-	(w3m-form-put-property): New inline function.
-	(w3m-form-get-property): New macro.
-	(w3m-form-put): Use `w3m-form-put-property'.
-	(w3m-form-get): Use `w3m-form-get-property'.
-	(w3m-form-make-form-data): Follow change of structure of the `w3m-form'
-	object.
-	(w3m-form-parse-forms): Accept an image-type input tag.
-	(w3m-form-resume): Ditto.
-	(w3m-form-fontify): Ditto.
-
-2001-11-09  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-use-tab-menubar): New user variable.
-	(w3m-setup-menu): Handling tab-menubar.
-	(w3m-tab-menubar-open-buffer, w3m-tab-menubar-update,
-	w3m-tab-menubar-make-items): New functions.
-	(w3m-tab-menubar-pull-bufnum): New macro.
-	(top-level): Add define-key-after() to avoid byte-compile warnings, if
-	XEmacs.
-
-2001-11-08  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
-
-	* w3m.el (w3m-start-url, w3m-contents-url): New buffer-local vars.
-	(w3m-clear-local-variables): Also clear `w3m-start-url' and
-	`w3m-contents-url'.
-	(w3m-copy-local-variables): Also copy `w3m-start-url' and
-	`w3m-contents-url'.
-	(w3m-fontify-anchors, w3m-check-link-tags): Add support the tags
-	"previous", "start" and "contents".
-
-2001-11-02  Masatake YAMATO  <jet@gyve.org>
-
-	* w3m.el (autoload): Added w3m-antenna-add-current-url.
-	(w3m-lynx-like-map): Likewise.
-	(w3m-info-like-map): Likewise.
-	(w3m-mode): Added w3m-antenna-add-current-url to doc string.
-
-	* w3m-antenna.el (string-with-default): New widget.
-	(string-with-default-value-create): New function.
-	(w3m-antenna-sites): Use string-with-default widgets instead of string
-	widgets.
-	(w3m-antenna-tmp-url): New variable.
-	(w3m-antenna-tmp-title): New variable.
-	(w3m-antenna-add-current-url): New function.
-	(w3m-antenna-add): New function.
-
-2001-11-08  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-form.el (w3m-form-replace): Don't use `save-excursion' because
-	point at start time may be deleted at end time.
-	(w3m-form-textarea-replace): Ditto.
-	(w3m-form-textarea-info): Use `w3m-get-text-property-around'.
-
-2001-11-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-goto-ftp-url): Rewrote.
-	(w3m-download): Use `w3m-goto-ftp-url' for ftp files.
-
-	* w3m-e20.el (w3m-make-ccl-coding-system): Copied from w3m-fsf.el;
-	don't call `make-coding-system' if a coding-system already exists.
-	* w3m-e21.el (w3m-make-ccl-coding-system): Moved from w3m-fsf.el.
-	* w3m-fsf.el (w3m-make-ccl-coding-system): Moved to w3m-e21.el.
-
-2001-11-08  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (top): Removed autoload of `w3m-remove-image'.
-
-	* w3m-om.el (w3m-remove-image): Define as a dummy function.
-
-	* w3m-e20.el (w3m-remove-image): Define as a dummy function.
-
-	* w3m.el (w3m-quick-start): New option.
-	(w3m-input-url): When the default string is equal to nil, it is not
-	displayed in the prompt.
-	(w3m): Refer `w3m-quick-start' to decide the action when interactively
-	called.
-
-2001-11-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-current-title, w3m-current-url): Define them before
-	loading the version specific modules.
-
-2001-11-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-xmas.el (format-buffers-tab-line): Protect aginst errors caused
-	by the illegal type of `w3m-current-url'.
-
-	* w3m-e21.el (top): Define `w3m-current-url' and `w3m-current-title' to
-	avoid byte-compile warnings.
-	(w3m-insert-header-line): Protect aginst errors caused by the illegal
-	type of `w3m-current-url'.
-	(w3m-tab-line): Protect aginst errors caused by illegal types of
-	`w3m-current-url' and `w3m-current-title'.
-
-2001-11-07  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (format-buffers-tab-line): Don't use the value of
-	`w3m-current-title' if it is nil.
-
-2001-11-07  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-exec-filter): Modify regexp pattern of "Wrong username or
-	passwd".
-
-
-2001-11-06  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Release emacs-w3m-1.2 from emacs-w3m-1_2 branch.
-
-	* w3m.el (emacs-w3m-version): Modified.
-	(top): Protect against the error occurs when `w3m-ucs.el' isn't found.
-
-2001-11-06  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* README.shimbun.ja (mew-shimbun.el): Modify description.
-
-2001-11-03  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-copy-buffer): Added argument `empty'.
-	(w3m-goto-url-new-session): Call `w3m-copy-buffer' with argument
-	`empty' non-nil; If new url has `name' portion, goto the base url
-	first.
-	(w3m-view-this-url): Likewise.
-
-2001-11-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Makefile.in (DOCS): Add `FAQ'.
-
-2001-11-02  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-form.el (w3m-form-parse-forms): Decode value of input tag.
-	(w3m-form-replace): Use `w3m-get-text-property-around'.
-
-	* w3m.el (w3m-parse-attributes): Add :decode-entity attribute.
-	(w3m-decode-entities-string): New function.
-
-2001-11-02  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-lynx-like-map): Remove binding of `C-tab' and `C-S-tab'
-	Bind `C-cC-t' as the key to call `w3m-copy-buffer'.  Bind `C-cC-p' as
-	the key to call `w3m-previous-buffer'.  Bind `C-cC-n' as the key to
-	call `w3m-next-buffer'.  Bind `C-cC-w' as the key to call
-	`w3m-delete-buffer'.
-	(w3m-info-like-map): Ditto.
-
-2001-11-02  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-reload-this-page): When execute with prefix argument,
-	clear post-data certainty.
-
-2001-11-01  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-goto-url): Remove processing url's forms from the history
-	when post data.
-	(w3m): Use `select-frame-set-input-focus' instead of `x-focus-frame'.
-
-	* w3m-form.el (w3m-form-resume): Fix typo.
-
-2001-11-01  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-delete-buffer): New function.
-	(w3m-copy-buffer): Call `w3m-goto-url' instead of copying buffer
-	content.
-
-2001-10-31  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-form.el (w3m-form-resume): Remove submit button status to support
-	forms containing multiple submit buttons.
-
-2001-10-31  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-accept-languages): Don't use config file if there are no
-	contents for "accept_language".
-
-2001-10-31  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-e21.el (w3m-tab-unselected-face): Setup color for tty.
-	(w3m-tab-selected-face): Ditto.
-	(w3m-tab-background-face): Ditto.
-
-	* w3m.el (w3m-next-buffer): New function.
-	(w3m-previous-buffer): Ditto.
-	(w3m-lynx-like-map): Bind `C-tab' as the key to call `w3m-next-buffer';
-	Bind `C-S-tab' as the key to call `w3m-previous-buffer'.
-	(w3m-info-like-map): Ditto.
-
-2001-10-31  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-accept-languages): New option.
-	(w3m-dump-head-source-command-argument): Abolished.
-	(w3m-dump-head-source-command-arguments): New constant.
-	(w3m-w3m-expand-arguments): New macro.
-	(w3m-w3m-dump-head-source): To generate command arguments for w3m, use
-	`w3m-w3m-expand-arguments' and refer
-	`w3m-dump-head-source-command-arguments'.
-	(w3m-rendering-half-dump): To generate command arguments for w3m, use
-	`w3m-w3m-expand-arguments'.
-
-2001-10-31  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-reload-this-page): Change the semantic of the prefix
-	argument to `clear form and post datas'.
-
-2001-10-31  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-pop-up-windows): Changed default value
-	(See [emacs-w3m: 01999]).
-
-	* w3m-e21.el (w3m-tab-unselected-face): Changed underline color.
-	(w3m-tab-selected-face): Ditto.
-	(w3m-tab-background-face): Ditto.
-	(w3m-tab-line): Removed needless local variable `len'.
-
-2001-10-30  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-e21.el (w3m-header-line-location-title-face): Specify background
-	color.
-	(w3m-header-line-location-title-face): Ditto.
-	(w3m-use-tab): New user option.
-	(w3m-tab-width): Ditto.
-	(w3m-tab-unselected-face): New face.
-	(w3m-tab-selected-face): Ditto.
-	(w3m-tab-background-face): Ditto.
-	(w3m-header-line-map): New variable.
-	(w3m-setup-header-line): If w3m-use-tab is non-nil, use header-line as
-	a tab area.
-	(w3m-insert-header-line): New function.
-	(w3m-tab-make-keymap): New function.
-	(w3m-tab-line): New function.
-	(w3m-fontify-after-hook): Add 'w3m-insert-header-line.
-
-2001-10-30  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-reload-this-page): If form data exist, ask to make use of
-	its. Check form data modified.
-
-	* README.shimbun.ja (mew-shimbun.el): Modify description.
-
-2001-10-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-form.el (w3m-form-parse-forms): Dismantle `w3m-current-url' of
-	its query part before the rest is refered as the default value of the
-	action.
-
-	* w3m.el (w3m-ccl-write-repeat): Accept optional arguments to avoid
-	difference between Emacesn on CCL.
-	(w3m-iso-latin-1-decoder): Call `w3m-ccl-write-repeat' with optional
-	argument.
-
-2001-10-30  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* README.shimbun.ja: Add information for mew-shimbun.el
-
-2001-10-29  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-terminal-coding-system): Changed default value for
-	w3m(en).
-	(w3m-input-coding-system): Ditto.
-	(w3m-default-coding-system): Ditto.
-	(w3m-iso-latin-1-decoder): Fixed for latin-iso8859-1 under old Emacsen.
-	(w3m-ccl-write-repeat): Ditto.
-
-2001-10-29  ORI Manabu <ori@tahoo.org>
-
-	* w3m.el (w3m-type): Added the expression to detect `w3m-m17n'.
-
-2001-10-29  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-accept-japanese-characters): Use `-halfdump' option
-	instead of `-dump' option in order to detect the real internal
-	character set of `w3m-command'.
-	(w3m-profile-directory): Fixed the expression to determine the default
-	value for the environment where `w3m-command' includes redundant
-	suffixes.
-	(w3m-default-save-directory): Ditto.
-	(w3m-euc-japan-encoder): Define in the old-style backquote.
-	(w3m-iso-latin-1-encoder): Ditto.
-
-	* w3m.el (w3m-use-mule-ucs): Simplified.
-	(w3m-ccl-write-repeat): Fixed.
-	(w3m-euc-japan-decoder): Ditto.
-
-2001-10-29  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-ccl-write-repeat): Avoid a byte-compile warning.
-
-2001-10-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-info-like-map): Bind `\M-g' as the key to call
-	`goto-line'.
-
-	* w3m.el (w3m-use-mule-ucs): More safe default value.
-	(w3m-accept-japanese-characters): Improved automatic detection.
-	(w3m-ccl-write-repeat): Fix typo.
-
-	* w3m.el (w3m-type): Use the default value which detected
-	automatically.
-	(w3m-accept-japanese-characters): New internal variable.
-	(w3m-terminal-coding-system): Changed the default value for w3m which
-	doesn't accept Japanese characters.
-	(w3m-input-coding-system): Ditto.
-	(w3m-output-coding-system): Ditto.
-	(w3m-default-coding-system): Changed the default value for the
-	environment that `w3m-language' doesn't equal to "Japanese".
-	(w3m-internal-characters-alist): New constant.
-	(w3m-ccl-write-repeat): New internal function to generate a part of CCL
-	decoder.
-	(w3m-euc-japan-decoder): Modified.
-	(w3m-iso-latin-1-decoder): New CCL program.
-	(w3m-iso-latin-1-encoder): New CCL program which is used when
-	`w3m-use-mule-ucs' equals to nil.
-	(w3m-iso-latin-1): New coding system.
-
-	* w3m-ucs.el (w3m-ucs-generate-ncr-program): New constant.
-	(w3m-euc-japan-encoder): Refer `w3m-ucs-generate-ncr-program'.
-	(w3m-iso-latin-1-encoder): New CCL program.
-
-	* w3m-macro.el (w3m-static-when): New macro.
-	(w3m-static-unless): Ditto.
-
-	* w3m-e21.el (w3m-setup-header-line): Protect aginst the error occurs
-	when `w3m-current-url' isn't string.
-
-2001-10-26  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* mew-w3m.el (mew-mime-text/html-w3m): Support `Xref' header in SHIMBUN
-	article.
-
-2001-10-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m): Call `w3m-mode' for a new session; use
-	`generate-new-buffer' instead of `get-buffer-create' for a new session;
-	allow the optional 2nd arg NEW-SESSION.
-	(w3m-goto-url-new-session): New command.
-	(w3m-goto-url): Always set the value of
-	`mode-line-buffer-identification'.
-	(w3m-mode): Update the doc-string for the new command
-	`w3m-goto-url-new-session'.
-	(w3m-info-like-map): Bind the key "G" to the command
-	`w3m-goto-url-new-session'.
-	(w3m-lynx-like-map): Bind the key "G" to the command
-	`w3m-goto-url-new-session'; replace the key "G" to "\M-g" for the
-	command `goto-line'.
-	(w3m-copy-buffer): Make all the arguments optional; make the 1st arg
-	BUF default to the current buffer.
-	(w3m-view-this-url): Call `w3m-copy-buffer' with the 1st arg nil.
-	(w3m-region, w3m-find-file, w3m-browse-url, w3m-gohome, w3m-download):
-	Add autoload magic cookie.
-	(w3m-popup-frame-p): Allow the optional arg FORCE.
-
-2001-10-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-examine-modules): Don't byte-compile w3m-ucs.el
-	when the version of XEmacs is not greater than or equal to 21.2.37.
-
-	* w3m.el (w3m-pop-up-frames, w3m-pop-up-windows): Add a recommendation
-	to the doc-string about the use of XEmacs' buffers tab.
-
-	* w3m-xmas.el (w3m-xmas-update-tab-in-gutter): New function; add it to
-	`w3m-display-hook'.
-	(format-buffers-tab-line): Advise the function to show the current
-	title string in the buffer tab.
-	(w3m-xmas-show-current-title-in-buffer-tab): New user option.
-	(TopLevel): When compiling, use `autoload' "w3m" for the void functions
-	instead of the use of `defalias' to `ignore'; autoload "gutter-items"
-	for `update-tab-in-gutter'.
-
-2001-10-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-copy-buffer): Bind `pop-up-windows' to the value of
-	`w3m-pop-up-windows'.
-	(w3m-pop-up-windows): New user option.
-
-2001-10-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-rendering-buffer-1): Redundant argument is removed.
-
-2001-10-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-view-this-url): Fixed the interactive spec.
-
-2001-10-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-	    Suggested by Clifford Caoile <piyokun@email.com>.
-
-	* w3m.el (w3m-info-like-map, w3m-lynx-like-map): Bind S-SPC key to the
-	command `w3m-scroll-down-or-previous-url'.
-
-2001-10-23  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-use-mule-ucs): Changed.
-	(w3m-url-encode-string): Refer `w3m-default-coding-system' and
-	`w3m-coding-system' when `coding' argument is lacked.
-	(w3m-url-decode-string): Ditto.
-	(w3m-rendering-buffer-1): Define as a normal function.
-	(w3m-lynx-like-map): Changed the key which calls `w3m-save-image' from
-	`M-I' to `M-i'.
-	(w3m-info-like-map): Ditto; Registerd `O' as the key which calls
-	`w3m-db-history'.
-
-	* aclocal.m4 (AC_ADD_LOAD_PATH): Remove empty lines from auto detection
-	result.
-
-	* Makefile.in (DOCS): Add FAQ.ja, README.namazu.ja and
-	README.shimbun.ja.
-	(tarball): Handle attic/ and patches/.
-
-2001-10-23  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-mode): Update the doc-string about making a new session.
-	(w3m-info-like-map, w3m-lynx-like-map): Bind keys for the new commands
-	to make a new session.
-	(w3m-mouse-view-this-url-new-session): New command.
-	(w3m-view-this-url-new-session): New command.
-	(w3m-mouse-view-this-url): Make it can create a new session.
-	(w3m-view-this-url): Ditto.
-
-2001-10-23  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (top): Add autoload for `w3m-form-parse-buffer'.
-	(w3m-display-hook): New option.
-	(w3m-decoder-alist): Reindent.
-	(w3m-use-form): Changed default value.
-	(w3m-dirlist-cgi-program): Changed the expression to get default path.
-	(w3m-work-binary-buffer-name): New constant.
-	(w3m-attributes): Handle URLs which start `about://source/'; It isn't
-	defined as an inline function but a normal function to avoid
-	byte-compile error.
-	(w3m-arrived-add): Fixed codes to remove fragments in the specified
-	URL.
-	(w3m-local-retrieve): Clean up.
-	(w3m-about-retrieve): Handle URLs which start `about://source/'.
-	(w3m-retrieve): Doesn't call `w3m-filter'.
-	(w3m-remove-meta-charset-tags): Renamed from `w3m-remove-meta-tags'.
-	(w3m-rendering-region): Removed.
-	(w3m-rendering-extract-title): New function.
-	(w3m-rendering-half-dump): Ditto.
-	(w3m-rendering-buffer-1): Ditto.
-	(w3m-rendering-unibyte-buffer): Ditto.
-	(w3m-rendering-multibyte-buffer): Ditto.
-	(w3m-exec): Call `w3m-rendering-unibyte-buffer' instead of
-	`w3m-rendering-region'.
-	(w3m-edit-url): Improved to handle URLs which start `about://source/'
-	or `about://header/'.
-	(w3m-goto-url): Removed code to highlight current line in the history;
-	Call hook functions in `w3m-display-hook'.
-	(w3m-region): Call `w3m-rendering-multibyte-buffer' instead of
-	`w3m-rendering-region'.
-	(w3m-about): Clean up.
-	(w3m-about-source): Removed.
-	(w3m-view-source): Make URLs which start `about:' available.
-	(w3m-about-header): Simplified.
-	(w3m-history-highlight-current-url): New function.
-
-	* w3m-form.el (w3m-form-parse-buffer): New function.
-	(w3m-form-parse-region): Removed.
-
-	* w3m-filter.el (w3m-filter-rules): Add the rule to call
-	`w3m-filter-www.zdnet.co.jp'.
-	(w3m-filter): Protect against wrong type argument.
-	(w3m-filter-www.zdnet.co.jp): New function.
-
-	* w3m-antenna.el (w3m-antenna-size): Call `w3m-remove-comments' and
-	`w3m-filter' before checking size of contents.
-
-	* w3mhack.el (w3mhack-load-path): Search `un-define' instead of
-	`un-define.el' to check the path where Mule-UCS is installed.
-
-2001-10-22  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3mhack.el (w3mhack-examine-modules): Handle `mew-shimbun.el'.
-
-	* w3m-dtree.el (w3m-dtree-indent-strings, w3m-dtree-stop-strings):
-	Throw out the "Japanese Character" for non-mule's environments.
-
-2001-10-19  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* aclocal.m4 (AC_ADD_LOAD_PATH): When `yes' or null string is passed as
-	an argument, call `w3mhack-load-path' to search places of required
-	modules automatically.
-
-	* w3mhack.el (w3mhack-load-path): New function.
-
-2001-10-17  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-create-image): Call `w3m-fix-gif' if
-	`w3m-should-convert-interlaced-gifs' is non-nil.
-	(w3m-fix-gif): Renamed from `w3m-unoptimize-animated-gif'; convert an
-	interlaced gif to be non-interlaced as well as unoptimization.
-	(w3m-cache-fixed-gif-images-max-length): Renamed from
-	`w3m-cache-unoptimized-gif-images-max-length'.
-	(w3m-cache-fixed-gif-images): Renamed from
-	`w3m-cache-unoptimized-gif-images'.
-	(w3m-should-convert-interlaced-gifs): New variable.
-
-2001-10-16  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* README.ja: Add description about "new custom".
-
-	* README: Ditto.
-
-	* w3m.el (w3m-attributes): When URL matches `about://source/', returns
-	nil as its content-charset.
-	(w3m-about-retrieve): When URL matches `about://source/', don't call
-	`encode-coding-region'.
-	(w3m-about-source): Don't call `w3m-decode-region'.
-	(w3m-exec): Use `set-buffer-file-coding-system' instead of to set
-	`buffer-file-coding-system'.
-
-2001-10-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-exec): Substitute `w3m-current-coding-system' for
-	`buffer-file-coding-system' to show the current coding system in the
-	mode line.
-
-2001-10-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-use-mule-ucs): Don't use Mule-UCS package for XEmacs
-	versions prior to 21.2.37.
-
-2001-10-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (top): It doesn't require `thingatpt'.
-	(w3m-url-at-point): New function.
-	(w3m-input-url): Call `w3m-url-at-point' instead of `thing-at-point';
-	The 4th optional argument is added.
-	(w3m): Call `w3m-input-url' with the 4th argument.
-
-2001-10-15  NAKAJIMA Mikio  <minakaji@osaka.email.ne.jp>
-
-	* README: Add description about ftp site of FLIM.
-
-2001-10-15  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* mew-w3m.el (mew-w3m-auto-insert-image): Change from 'defcont' to
-	'defcustom', again.
-	(mew-w3m-safe-url-regexp): New constant.
-	(mew-w3m-view-inline-image): Rewrite.
-	(mew-mime-text/html-w3m): Bind 'w3m-safe-url-regexp' to
-	'mew-w3m-safe-url-regexp'.
-
-2001-10-15  NAKAJIMA Mikio  <minakaji@osaka.email.ne.jp>
-
-	* README.ja: Divided original section 2. a) into two parts, 2. a) and
-	2. b).  Add new section 2. c), 2. e) about APEL, FLIM, shimbun library.
-	* README: Ditto.
-
-	* FAQ.ja (Q. ~~~~ Emacs ~?): Add description about where to get APEL.
-
-2001-10-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-expand-url): Accept URL which has the scheme part only.
-
-2001-10-15  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-url-components-regexp): Don't except `\' for scheme,
-	authority and path.
-
-2001-10-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (top): Removed autoload for `regexp-opt'.
-
-	* w3m-weather.el (top): Likewise.
-
-	* w3m-om.el (top): Add autoload for `regexp-opt'.
-
-2001-10-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-entity-regexp): Unified to the use of `regexp-opt';
-	autoload regexp-opt for old Emacsen.
-
-	* attic/regexp-opt.el: New file.
-
-	* README.ja, README: Emacs-w3m requires the module regexp-opt.
-
-	* w3m-weather.el: Autoload regexp-opt for old Emacsen.
-
-2001-10-13  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-safe-url-regexp): New variable.
-	(w3m-retrieve): When `w3m-safe-url-regexp' has non-nil value and it
-	matches the requested URL, doesn't fetch its contents.
-
-	* mime-w3m.el (mime-w3m-display-inline-image): New option.
-	(mime-w3m-preview-text/html): In order to avoid web bug which is
-	described in [mew-dist 19267], restrict accesible URLs.
-
-	* mew-w3m.el (mew-mime-text/html-w3m): Likewise.
-
-	* w3m-weather.el (w3m-weather-url-alist): Abolished.
-	(w3m-weather-completion-table): New constant.
-	(w3m-weather-default-area): Refer `w3m-weather-completion-table'
-	instead of `w3m-weather-url-alist' to decide customize spec.
-	(w3m-weather-input-history): New variable.
-	(w3m-weather-input-area): New function.
-	(w3m-weather-area-completion): Ditto.
-	(w3m-weather): Call `w3m-weather-input-area'.
-	(w3m-about-weather): Refer `w3m-weather-completion-table' instead of
-	`w3m-weather-url-alist' to convert the area to the real URL.
-
-2001-10-12  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* mew-w3m.el (mew-w3m-auto-insert-image): Change from 'defcustom' to
-	'defconst' and default value to 'nil'.
-	(mew-w3m-view-inline-image): New function.
-
-2001-10-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-input-url): Accept the 3rd optional argument.
-	(w3m): Improved interactive form.
-
-2001-10-12  Yuuichi Teranishi  <teranisi@gohome.org>,
-	    TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-	* w3m-e21.el (w3m-form-button-keymap): Renamed from
-	`w3m-widget-keymap'.
-	(w3m-form-make-button): Fixed.
-	(w3m-setup-widget-faces): Revived.
-
-2001-10-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m): Always prompts user for a URL string.
-
-2001-10-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-weather.el (w3m-weather-url-alist): Refer
-	`http://weather.yahoo.co.jp'.
-	(w3m-weather-default-area): Change default region.
-	(w3m-weather-filter-functions): Change default value.
-	(w3m-about-weather): Accept `no-cache' argument.
-	(w3m-weather-remove-headers): Modified for Yahoo.
-	(w3m-weather-remove-footers): Ditto.
-	(w3m-weather-insert-title): Ditto.
-	(w3m-weather-remove-weather-images): Removed.
-	(w3m-weather-remove-washing-images): Removed.
-	(w3m-weather-remove-futon-images): Removed.
-	(w3m-weather-remove-week-weather-images): Removed.
-
-	* w3m-e21.el (w3m-widget-keymap): New keymap.
-	(w3m-form-make-button): Set `w3m-widget-keymap' as keymap on buttons;
-	Fix condition to make buttons.
-	(w3m-setup-widget-faces): Removed.
-
-2001-10-11  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* mew-w3m.el, w3m-form.el, w3m.el: Remove useless whitespaces.
-
-2001-10-11  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-local-dirlist-cgi): Replace `re-search-forward' to
-	`search-forward'; bind `beg' as a non-global variable.
-
-2001-10-11  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-local-dirlist-cgi): Remove <from>...</form>.
-
-2001-10-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-expand-path-name): Fix incompatibility of drive letter.
-
-2001-10-11  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-e21.el (toplevel): Require 'wid-edit.
-	(w3m-form-button-face): Set background and foreground color; Set box
-	line-width as 2.
-	(w3m-form-button-pressed-face): Ditto.
-	(w3m-form-button-mouse-face): New face.
-	(w3m-form-button): New widget button.
-	(w3m-form-make-button): Use `widget-convert-button' to put
-	w3m-form-button.
-	(w3m-setup-widget-faces): New function.
-	(w3m-mode-hook): Add `w3m-setup-widget-faces'.
-	(w3m-form-make-button): Don't check :box attribute when
-	w3m-form-use-fancy-faces is non-nil.
-
-2001-10-11  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-decoder-alist): Fix for Windows or OS/2 environments.
-
-2001-10-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-display-inline-image): Update document.
-	(w3m-decoder-alist): Change default value.
-	(w3m-current-image-status): New buffer-local variable.
-	(w3m-which-command): Export to w3m-macro.el.
-	(w3m-decode-encoded-contents): Small change.
-	(w3m-expand-url): Fix to remove an empty query part and an empty
-	fragment part correctly.
-	(w3m-toggle-inline-images): Refer `w3m-current-image-status' instead of
-	`w3m-display-inline-image'.
-	(w3m-view-url-with-external-browser): Ditto.
-	(w3m-goto-url): Ditto.
-	(w3m-reload-this-page): Ditto.
-	(w3m-redisplay-with-charset): Ditto.
-
-	* w3m-e21.el (top, w3m-display-inline-image-p): Refer
-	`w3m-current-image-status' instead of `w3m-display-inline-image'.
-
-	* w3m-om.el (w3m-expand-path-name): Add 2nd optional argument.
-
-	* w3m-macro.el (w3m-which-command): Import from w3m.el.
-
-	* w3m-xmas.el (top, w3m-display-inline-image-p): Refer
-	`w3m-current-image-status' instead of `w3m-display-inline-image'.
-
-	* mew-w3m.el (mew-mime-text/html-w3m): Refer `w3m-current-image-status'
-	instead of `w3m-display-inline-image'.
-
-2001-10-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-cache-header): Add 3rd optional argument.
-	(w3m-w3m-dump-head-source): Call `w3m-cache-header' with `overwrite'
-	option.
-
-	* w3m.el (w3m-cache-header-delete-variable-part): New function.
-	(w3m-cache-header): Remove cached contents when inconsistency between
-	new header and cached header is found.
-
-	* w3m.el (w3m-expand-url): Fix the last change.
-	(w3m-url-hierarchical-schemes): Add `file'.
-	(w3m-goto-url): Use `\`' instead of `^' as a meta character.
-
-	* w3m.el (w3m-fontify-anchors): Fix.
-	(w3m-url-fallback-base): New constant.
-	(w3m-expand-url): Make it robust against illegal base-URL.
-
-	* w3m.el (w3m-url-components-regexp): New constant.
-	(w3m-url-hierarchical-schemes): Ditto.
-	(w3m-expand-url): Reimplemented.
-	(w3m-view-this-url): Remove a redundant local variable.
-	(w3m-mouse-view-this-url): Call `w3m-view-this-url'.
-	(w3m-goto-url): Refer `w3m-url-components-regexp' to delete a fragment
-	part of URL.
-
-	* mime-w3m.el (mime-w3m-view-this-url): When there is an inline image
-	under point, display it.
-	(mime-w3m-mouse-view-this-url): Call `mime-w3m-view-this-url'.
-
-2001-10-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-expand-url): Emergency fixed.
-
-2001-10-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-expand-url): Make it work correctly when a url begins
-	with "//".
-
-2001-10-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-language): New option.
-	(w3m-default-coding-system): Refer `w3m-language' to decide default
-	value.
-	(w3m-coding-system-priority-list): Ditto.
-	(w3m-toolbar): Ditto.
-	(w3m-url-to-file-name): Moved to avoid byte-compile warnings.
-	(w3m-expand-file-name-as-url): Ditto.
-	(w3m-url-local-p): Ditto.
-	(w3m-url-dtree-p): Ditto.
-	(w3m-view-this-url): When there is an inline image under point, display
-	it.
-	(w3m-mouse-view-this-url): Ditto.
-	(w3m-view-url-with-external-browser): Renamed from
-	`w3m-view-current-url-with-external-browser'.  Handle an inline image
-	under point.
-	(w3m-download-this-url): Handle an inline image under point.
-	(w3m-info-like-map): Reconstructed.
-
-	* w3m-search.el (w3m-search-default-coding-system): Abolished.
-	(w3m-search-engine-alist): Refer `w3m-language' to decide default
-	value.
-	(w3m-search-escape-query-string): Refer `w3m-default-coding-system'
-	instead of `w3m-search-default-coding-system'.
-
-2001-10-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-form.el (w3m-form-use-fancy-faces): New option.
-	(w3m-form-make-button): New function.
-	(w3m-form-fontify): Call `w3m-form-make-button'.
-
-	* w3m-e21.el (w3m-form-button-face): New face.
-	(w3m-form-button-pressed-face): Ditto.
-	(w3m-form-make-button): New function.
-
-2001-10-04  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-om.el (read-string): Unify the advice form.
-	(w3m-om-coding-system-alist): Fix doc-string.
-
-2001-10-04  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-om.el (read-string): Don't modify the value of
-	`current-load-list' when advising it.
-
-	* mime-w3m.el (mime-w3m-remove-text-properties): Don't modify the value
-	of `current-load-list' when advising the function `kill-new'; add a
-	doc-string.
-
-	* w3m.el (w3m-decode-entities): Save-match-data when `w3m-entity-value'
-	is called.
-
-2001-10-03  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-xmas.el (w3m-detect-coding-region): Return just the return value
-	of `detect-coding-with-priority' if it is not a list, again.
-
-2001-10-03  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-om.el (read-string): Advise the function to allow the 4th
-	argument `default-value'.
-
-2001-10-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* mime-w3m.el (mime-w3m-remove-text-properties): New advice to protect
-	`kill-ring-save' against the `local-map' text property.
-
-2001-10-03  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-om.el (w3m-detect-coding-region): Use the fixed value for the
-	list of coding-categories; suppress the duplication of coding-
-	categories.
-	(TopLevel): Protect against non-existent coding-systems when creating
-	the modern coding-systems.
-	(w3m-om-coding-category-alist): Reinforce the default value.
-	(w3m-om-coding-categories): Abolish.
-	(w3m-om-coding-system-alist): Add some new coding-systems.
-
-	* w3m-fsf.el (w3m-detect-coding-region): Suppress the duplication of
-	coding-categories.
-	* w3m-xmas.el (w3m-detect-coding-region): Ditto; use
-	`coding-system-category' instead of `coding-system-type'.
-
-2001-10-03  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-show-inline-images-before-hook,
-	w3m-show-inline-images-after-hook,
-	w3m-remove-inline-images-before-hook,
-	w3m-remove-inline-images-after-hook): Abolished.
-	(w3m-modeline-image-status-on): New constant.
-	(w3m-modeline-image-status-off): Ditto.
-	(w3m-image-only-page): New buffer local variable.
-	(w3m-display-inline-image-status): Abolished.
-	(w3m-fontify-images): Put `w3m-image-status property'.
-	(w3m-toggle-inline-images-internal): New inline function.
-	(w3m-exec): Set w3m-image-only-page as t.
-	(w3m-lynx-like-map): Bind "T" to 'w3m-toggle-inline-images and "t" to
-	'w3m-toggle-inline-image.
-	(w3m-goto-url): Set w3m-image-only-page as nil at first; Setup modeline
-	to display image display status; Display image if w3m-image-only-page
-	is nil.
-
-	* w3m-e21.el (w3m-cache-underline-faces): Abolished.
-	(w3m-insert-image): Set text property 'w3m-undeline-face to the image
-	instead of setting up w3m-cache-underline-faces.
-	(w3m-remove-image): Recover underline faces.
-	(w3m-fontify-before-hook, w3m-show-inline-images-before-hook,
-	w3m-show-inline-images-after-hook,
-	w3m-remove-inline-images-after-hook): Don't set up.
-
-2001-10-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-om.el (w3m-detect-coding-region): Make it work.
-
-	* w3m-xmas.el (w3m-detect-coding-region): Return just the return value
-	of `detect-coding-with-priority' if it is not a list, otherwise the car
-	of the value.
-
-2001-10-02  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-coding-system-priority-list): New user option.
-	(w3m-decode-buffer): Use it.
-
-	* w3m-fsf.el (w3m-detect-coding-region): Remove argument `highest';
-	always return the first possible coding system.  Add new optional
-	argument `priority-list'.  Use `detect-coding-with-priority'.
-
-	* w3m-xmas.el (w3m-detect-coding-region): Ditto.
-
-	* w3m-om.el (w3m-detect-coding-region): Remove argument `highest';
-	always return the first possible coding system.  Add new optional
-	argument `priority-list'.
-
-2001-10-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-om.el (w3m-detect-coding-region): Return a non-list of a
-	coding-system if the number of return value is only one; use
-	`w3m-om-modernize-coding-system' and `w3m-om-coding-categories'; use
-	`code-detect-region' instead of `detect-coding-region'.
-	(w3m-om-modernize-coding-system): New function.
-	(w3m-om-coding-category-alist): Use `w3m-om-coding-categories'.
-	(w3m-om-coding-categories): New constant.
-	(w3m-om-coding-system-alist): Add `emacs-mule'.
-
-2001-10-01  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (TopLevel): Don't byte-compile the source form to bind colon
-	keywords for old Emacsen.
-
-2001-10-01  Masatake YAMATO  <jet@gyve.org>
-
-	* w3m.el (w3m-mode): Added `w3m-toggle-inline-images' to the mode
-	description.
-
-2001-10-01  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-edit-url-directory-alist): New option.
-	(w3m-edit-url): New function.
-	(w3m-edit-current-url): Call `w3m-edit-url'.
-	(w3m-edit-this-url): Ditto.
-
-2001-10-01  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-om.el (w3m-detect-coding-region): Prefer the coding-category that
-	the value of `w3m-default-coding-system' belongs to.
-	(w3m-om-coding-category-alist): New variable.
-	(w3m-om-coding-system-alist): New variable.
-
-	* w3m.el (w3m-default-coding-system): Default to `shift_jis' when Mule2
-	is running.
-
-2001-09-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3mhack.el (w3mhack-examine-modules): Handle `w3m-fsf.el'.
-
-	* w3m.el (w3m-default-coding-system): New option.
-	(w3m-decode-buffer): Call `w3m-detect-coding-region' instead of
-	`detect-coding-region'.
-	(w3m-make-ccl-coding-system): Export it to `w3m-fsf.el'.
-
-	* w3m-xmas.el (coding-system-category): Removed.
-	(w3m-detect-coding-region): New function.
-
-	* w3m-om.el (coding-system-category): Removed.
-	(w3m-detect-coding-region): New function.
-
-	* w3m-fsf.el: New file.
-
-	* w3m-form.el (w3m-form-default-coding-system): Abolished.
-	(w3m-form-make-form-data): Refer `w3m-default-coding-system' instead of
-	`w3m-form-default-coding-system'.
-
-	* w3m-e21.el (top): Require `w3m-fsf'.
-	(w3m-find-coding-system): Export it to `w3m-fsf.el'.
-
-	* w3m-e20.el (top): Require `w3m-fsf'.
-	(w3m-find-coding-system): Export it to `w3m-fsf.el'.
-
-	* w3m.el (w3m-goto-url): Change effect of the 3rd argument `charset'.
-	(w3m-redisplay-with-charset): Reimplemented.
-	(w3m-view-source): Improved to handle `about://header/...'.
-	(w3m-about-header): Show title etc.
-	(w3m-view-header): Improved to handle `about://source/...'.
-
-2001-09-28  kkonishi <ironbeat@mail.st.rim.or.jp>
-
-	* w3m-search.el (w3m-search-engine-alist): New search engines,
-	`excite-ja', `lycos-ja', `altavista' and `freebsd-users-jp'.
-
-2001-09-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-goto-url): Speed up the action to refer a name anchor in
-	the same document.
-
-2001-09-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-copy-local-variables): Simplified.
-	(w3m-region): Set `w3m-current-base-url'.
-
-	* w3m.el: Fix the bug reported in [emacs-w3m:01564].
-	(w3m-current-base-url): New buffer-local variable.
-	(w3m-clear-local-variables): Handle `w3m-current-base-url'.
-	(w3m-copy-local-variables): Ditto.
-	(w3m-attributes): Change spec of return value.
-	(w3m-w3m-attributes): Ditto.
-	(w3m-local-attributes): Ditto.
-	(w3m-base-url): New macro.
-	(w3m-expand-url): Make the second argument `base' optional, and refer
-	`w3m-current-base-url' when a relative URL is canonicalized.
-	(w3m-fontify-anchors): Follow change of `w3m-expand-url'.
-	(w3m-fontify-images): Ditto.
-	(w3m-toggle-inline-images): Ditto.
-	(w3m-exec): Call `w3m-base-url' to set `w3m-current-base-url'.
-
-	* w3m-form.el (w3m-form-new): Canonicalize `action' whenever this
-	function is called.
-	(w3m-form-parse-forms): Follow change of `w3m-form-new'.
-	(w3m-form-submit): Ditto.
-	(w3m-form-input-map-set): Follow change of `w3m-expand-url'.
-
-2001-09-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-goto-url): Position point to the current url and
-	highlight the line when the page is for listing the history
-	(suggested by SHIRAI-san).
-	(w3m-history-current-url-face): New face.
-	(w3m-image-face, w3m-arrived-anchor-face, w3m-anchor-face): Fix
-	doc-string.
-
-2001-09-26  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-about-db-history-today): New defsubst.
-	(w3m-about-db-history): If arrived time within 18 hours, display with
-	"HH:MM:SS".
-
-2001-09-18  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-ucs.el (w3m-euc-japan-encoder): Convert lain-jisx0201 to ASCII;
-	Avoid deep nesting.
-	(TopLevel): Don't require `w3m-macro'.
-
-2001-09-18  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-om.el (w3m-expand-path-name): Cancel last change.
-
-2001-09-17  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-expand-path-name): Except Mule2, define alias of
-	`expand-file-name'.
-
-	* w3m-om.el (w3m-expand-path-name): Re-implemented.
-
-	* w3m-e20.el (w3m-expand-path-name): Removed.
-
-	* w3m-e21.el (w3m-expand-path-name): Ditto.
-
-	* w3m-xmas.el (w3m-expand-path-name): Ditto.
-
-2001-09-17  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-generate-colon-keywords-file): Renamed from
-	`w3mhack-bind-colon-keywords'; generate a file which contains a list of
-	colon keywords; don't bind colon keywords.
-	(w3mhack-colon-keywords-file): New constant.
-
-	* w3m.el: Load w3m-kwds.el if a colon keyword is not avaulable.
-	(w3m-colon-keywords): Abolished.
-
-	* Makefile.in (keywords): Create w3m-kwds.el instead of w3mkwds.el;
-	don't remove w3m-kwds.el in advance.
-	(clean): Remove w3m-kwds.el instead of w3mkwds.el.
-	(install): Install w3m-kwds.el if it exists.
-
-2001-09-17  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-expand-url): Use `w3m-expand-path-name' instead of
-	`expand-file-name'.
-
-	* w3m-om.el (w3m-expand-path-name): New function.
-
-	* w3m-e20.el (w3m-expand-path-name): New alias.
-
-	* w3m-xmas.el (w3m-expand-path-name): Ditto.
-
-	* w3m-e21.el (w3m-expand-path-name): Ditto.
-
-2001-09-17  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-search.el (w3m-search-engine-alist): Changed default value of
-	`google'.  Add new engines `debian-pkg', `debian-bts', and
-	`iij-archie'.
-
-2001-09-17  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
-
-	* w3m-search.el (w3m-search-engine-alist): Changed default value of
-	`google-ja'.
-
-2001-09-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (top): Require `ccl'.
-	(w3m-make-ccl-coding-system): New function for Emacs20 / Emacs21.
-	(w3m-euc-japan): Define with `w3m-make-ccl-coding-system'.
-
-	* w3m-macro.el (top): Delete garbage.
-
-	* w3m-e21.el (top): Fix to avoid byte-compile warnings.
-
-	* w3m-xmas.el (top): Require `pccl' and fix to avoid byte-compile
-	warnings.
-	(w3m-make-ccl-coding-system): New alias to `make-ccl-coding-system'.
-
-	* w3m-om.el (top): Require `pccl'.
-	(w3m-make-ccl-coding-system): New alias to `make-ccl-coding-system'.
-
-	* w3m-search.el (w3m-search): Fixed search engine specification error
-	when interactively called with prefix arguments.
-
-2001-09-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-macro.el (w3m-with-work-buffer): Keep `w3m-history' and
-	`w3m-history-flat' through buffers.
-
-	* w3m.el (w3m-current-buffer): Abolished.
-	(w3m-goto-url): Don't set `w3m-current-buffer'.
-	(w3m-region): Ditto.
-	(w3m-about-history): Don't refer `w3m-current-buffer'.
-
-	* w3m-form.el (w3m-form-parse-region): Simplified.
-	(w3m-form-parse-forms): Accept <OPTION> tag lacks `value' attribute.
-
-	* w3m.el (w3m-resume-forms): Abolished.
-	(w3m-clear-local-variables): Don't handle `w3m-resume-forms'.
-	(w3m-copy-local-variables): Ditto.
-	(w3m-fontify): Don't call `w3m-form-resume'.
-	(w3m-cache-available-p): Protect against the illegal type of arguments.
-	(w3m-rendering-region): Removed the fourth optional argument, `forms'.
-	(w3m-exec): Follow change of `w3m-rendering-region'.
-
-	* w3m-form.el (w3m-form-parse-region): Check the cached form/map
-	objects are available, and if available return them with the flag.
-	(w3m-fontify-forms): Its real part is moved to `w3m-form-fontify'.
-	Call `w3m-form-resume' if `w3m-current-forms' includes the flag.
-	(w3m-form-fontify): New function.
-
-2001-09-15  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-form.el (w3m-form-resume): Ignore `hidden' type form; Fixed
-	problem when no item is selected in the select form.
-
-	* w3m.el (w3m-copy-local-variables): Bind local variable resume.
-
-2001-09-14  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-resume-forms): New buffer local variable.
-	(w3m-clear-local-variables): Add w3m-resume-forms.
-	(w3m-copy-local-variables): Ditto.
-	(w3m-fontify): If w3m-resume-forms is non-nil, call w3m-form-resume.
-	(w3m-rendering-region): Set w3m-resume-forms if form is cached.
-
-	* w3m-form.el (w3m-form-replace-string): Eliminate.
-	(w3m-form-resume): New function.
-	(w3m-fontify-forms): Don't call `w3m-form-replace-string'.
-
-2001-09-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-form.el (w3m-form-replace-string): Protect against the illegal
-	type of arguments.
-
-2001-09-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-region): Defined new optional argument, `url'.
-
-	* mime-w3m.el (mime-w3m-preview-text/html): Call `w3m-region' with an
-	optional argument `url'.
-
-2001-09-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-form.el (w3m-fontify-forms): Restore a string for the input
-	button from the history if it is available.
-	(w3m-form-replace-string): New function.
-
-	* w3m.el (w3m): Clear the startup screen on the new frame.
-	(w3m-reload-this-page, w3m-goto-url, w3m-view-previous-page):
-	Save/restore post-data and referer as buffer-local properties in the
-	history.
-
-2001-09-13  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-goto-url): Register the value of `w3m-current-forms' in
-	the history as a buffer-local property.
-	(w3m-view-previous-page): Specify a url string to
-	`w3m-history-restore-position'.
-	(w3m-exec): Use cached forms if it is valid.
-	(w3m-rendering-region): Allow the optional argument `forms'; use
-	`forms' if it is non-nil.
-	(w3m-close-window, w3m-copy-buffer, w3m-exec-set-user, w3m-input-url,
-	w3m-copy-local-variables): Remove unused non-global variables.
-
-	* w3m-hist.el (w3m-history-restore-position): Allow the optional
-	argument `url'.
-	(w3m-history-store-position): Ditto.
-	(w3m-history-plist-get): Return nil instead of to signal an error.
-
-	* w3m-form.el (w3m-form-parse-region): Don't set the value of
-	`w3m-current-forms' here.
-	(w3m-form-input-map, w3m-form-input-map-set): Remove unused non- global
-	variables.
-
-2001-09-13  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-goto-url): Don't use `w3m-cleanup-plist'.
-
-	* w3m-macro.el (w3m-cleanup-plist): Abolished.
-
-	* w3m-hist.el (w3m-history-push): Don't add property whose value is
-	nil.
-	(w3m-history-modify-properties): Don't infloop.
-
-	* Makefile.in (keywords): New rule.
-	(distclean): Remove the directory autom4te.cache which will be created
-	by autoconf v2.5x.
-	(clean): Remove w3mkwds.el.
-
-	* .cvsignore: Add autom4te.cache.
-
-	* w3mhack.el (w3mhack-bind-colon-keywords): Always define it.
-
-2001-09-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-current-referer, w3m-current-post-data): Abolished.
-	(w3m-copy-local-variables, w3m-clear-local-variables): Don't handle
-	them.
-	(w3m-reload-this-page, w3m-goto-url): Don't use them; use the history
-	instead.
-
-2001-09-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-add-referer): Removed.
-	(w3m-add-referer-regexps): Default value is changed.
-	(w3m-goto-url): No check `w3m-add-referer'.
-
-2001-09-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-w3m-retrieve): Don't send a referer if it does not
-	satisfy the rule of `w3m-add-referer-regexps'.
-	(w3m-add-referer-regexps): New user option.
-
-2001-09-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-cache-available-p): New function.
-
-2001-09-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-hist.el, w3m.el: Don't quote colon keywords.
-
-	* Makefile.in (install): Don't install w3mkwds.el.
-
-2001-09-11  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-colon-keywords): New variable; bind some colon keywords
-	for Emacs versions prior to 20.3.
-
-	* .cvsignore: Add w3mkwds.el.
-
-	* w3mhack.el (w3mhack-bind-colon-keywords): New function; byte- compile
-	and exec it.
-	(w3mhack-examine-modules): Don't byte-compile w3mkwds.el.
-
-	* w3m-macro.el (w3m-tag-regexp-of): Reverted; add a documentation.
-	(TopLevel): Require `cl' when compiling.
-
-2001-09-11  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-goto-url): Register post-data and a referer in the
-	history.
-	(w3m-info-like-map, w3m-lynx-like-map): Use `suppress-keymap'.
-	(w3m-view-previous-page): Give post-data and a referer to
-	`w3m-goto-url'.
-	(w3m-view-next-page): Use `w3m-view-previous-page'.
-
-	* w3m-macro.el (w3m-cleanup-plist): New macro.
-	(w3m-tag-regexp-of): Use backquote.
-
-	* w3m-hist.el (w3m-history-modify-properties): Don't infloop.
-
-2001-09-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-clear-local-variables): Not reset `w3m-initial-frame'.
-	(w3m-copy-local-variables): Not copy `w3m-initial-frame'.
-
-	* w3m-form.el (w3m-form-parse-region): Modify `w3m-current-forms' in
-	this buffer.
-
-2001-09-11  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-expand-url): Use `expand-file-name' to expand path; If
-	URL is a form like 'scheme://server/path?query', only path is expanded.
-
-2001-09-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-meta-content-type-charset-regexp): Relaxed to accept
-	<meta> tag in XML style.
-	(w3m-meta-charset-content-type-regexp): Ditto.
-	(w3m-tag-regexp-of): Exported to `w3m-macro.el'.
-
-	* w3m-macro.el (w3m-tag-regexp-of): Imported from `w3m.el'.
-
-	* w3m.el (w3m-goto-url): Changed timing when `w3m-current-referer' and
-	`w3m-current-post-data' are set.
-	(w3m-exec): Call `w3m-clear-local-variables' before image data is
-	inserted.
-
-	* w3m.el (w3m-current-forms): Definition imported from `w3m-form.el'.
-	(w3m-current-coding-system): New buffer local variable.
-	(w3m-clear-local-variables): New function.
-	(w3m-copy-local-variables): Ditto.
-	(w3m-arrived-p): Cancel the last change.
-	(w3m-arrived-auto-detected-coding-system): Removed.
-	(w3m-arrived-set-auto-detected-coding-system): Ditto.
-	(w3m-fontify-anchors): Expand `w3m-next-url' and `w3m-previous-url' on
-	`w3m-current-url'.
-	(w3m-decode-buffer): Set auto-detected coding system to
-	`w3m-current-coding-system'.
-	(w3m-remove-comments): Simplified.  No point is saved.
-	(w3m-check-link-tags): `w3m-next-url' and `w3m-previous-url' are not
-	reseted.
-	(w3m-remove-meta-tags): New function.
-	(w3m-rendering-region): Call `w3m-remove-meta-tags'.
-	(w3m-exec): Clean up codes.
-	(w3m-redisplay-with-charset): Refer `w3m-current-coding-system'.
-	(w3m-region): Call `w3m-clear-local-variables'.
-
-	* w3m-form.el (w3m-current-forms): Definition moved to `w3m.el'.
-	(w3m-form-make-form-data): Refer `w3m-current-coding-system'.
-
-2001-09-10  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-expand-url): Changed regexp for detecting absolute spec;
-	Don't use `expand-file-name'.
-
-2001-09-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-ucs.el (w3m-euc-japan-encoder): Simplified.
-
-2001-09-10  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
-
-	* w3m-ucs.el (w3m-euc-japan-encoder): Fixed for ASCII under XEmacs.
-
-2001-09-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-goto-url): Refer `coding-system-for-read' which is
-	specified by `universal-coding-system-argument'.
-
-	* w3m-ucs.el (w3m-euc-japan-encoder): Protect against invalid value
-	which `emacs-char-to-ucs-codepoint-conversion' returns.
-
-2001-09-09  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
-
-	* w3m-ucs.el (w3m-euc-japan-encoder): Fixed for katakana-jisx0201.
-
-2001-09-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-form.el (w3m-form-make-form-data): Call
-	`w3m-arrived-auto-detected-coding-system' when `w3m-content-charset'
-	returns nil.
-
-	* w3m.el (w3m-arrived-p): Strict checking.
-	(w3m-arrived-auto-detected-coding-system): New function.
-	(w3m-arrived-set-auto-detected-coding-system): Ditto.
-	(w3m-decode-buffer): Call `w3m-arrived-set-auto-detected-coding-system'
-	to store the coding system detectd by this function.
-	(w3m-w3m-attributes): Use content of w3m-document-charset: field as
-	charset, only when `w3m-type' equals `w3mmee' or `w3m-m17n'.
-	(w3m-redisplay-with-charset): Call
-	`w3m-arrived-auto-detected-coding-system' to get current coding-system.
-
-2001-09-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-use-mule-ucs): Strict checking.
-	(w3m-euc-japan-decode): Use `write-multibyte-character' except Mule2
-	and XEmacs21.1.
-	(w3m-find-file): Refer `coding-system-for-read' which is specified by
-	`universal-coding-system-argument'.
-
-	* w3m-xmas.el (w3m-euc-japan-decoder): Removed.
-
-2001-09-09  MIYOSHI Masanori  <miyoshi@boreas.dti.ne.jp>
-
-	* README.shimbun.ja: Ditto.
-
-	* README.shimbun.ja: Ditto.
-
-2001-09-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-use-mule-ucs): New user option.
-	(w3m-input-coding-system): Changed default value.
-	(w3m-async-exec): Ditto.
-	(w3m-process-connection-type) [Solaris]: Changed default value.
-	(w3m-entity-alist): Enlarge a regular expression.
-	(w3m-ucs-to-char): New function.
-	(w3m-euc-japan-encoder): Follow the change of `w3m-ucs.el'.
-
-	* w3mhack.el (w3mhack-examine-modules): Handle `w3m-ucs.el'.
-
-	* w3m-ucs.el: New file.
-
-2001-09-05  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el (w3m-use-toolbar): Use `w3m-image-type-available-p'.
-	(w3m-image-type-available-p): Use `display-images-p' instead of
-	`display-graphic-p'.
-	(w3m-display-inline-image-p): Ditto.
-	(w3m-display-graphic-p): Alias to `display-images-p' instead of
-	`display-graphic-p'.
-	(display-images-p): Make an alias to `display-graphic-p' if it is not
-	available.  It is for Emacs version prior to 21.0.105.
-
-2001-09-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-filter.el (w3m-filter-lwn.net): Add link information to next
-	page.
-
-2001-08-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-load-list): Retry to read a file when failed.
-
-2001-08-26  MIYOSHI Masanori  <miyoshi@boreas.dti.ne.jp>
-
-	* README.shimbun.ja: Add information on nikkansports.
-
-2001-08-24  MIYOSHI Masanori  <miyoshi@boreas.dti.ne.jp>
-
-	* README.shimbun.ja: Add information on makanai, f1fan, f1express and
-	isize-sports.
-
-2001-08-13  NAKAGAWA Takayuki  <tknakaga@kanagawa.hitachi.co.jp>
-
-	* w3m.el (w3m-w3m-attributes): Refer `w3m-base-url' as current url,
-	when it is available.
-
-2001-08-10  Takenobu Sugiyama  <sugiyama@ae.advantest.co.jp>
-
-	* w3m-weather.el (w3m-weather-url-alist): Update data to follow the
-	most recent urls.
-	(w3m-weather-default-area): Ditto.
-	(w3m-weather-remove-weather-images): Ditto.
-
-2001-08-10  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-download): Made it to work as a command.
-
-2001-08-10  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-fontify-images): Use `w3m-decode-anchor-string' to
-	convert "&amp;" to "&" in the url string.
-
-2001-08-10  NOMIYA Masaru  <nomiya@ttmy.ne.jp>
-
-	* w3m.el (w3m-content-type-alist): Fix typos for gif and tiff.
-
-2001-08-10  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-goto-url): Put the url in the history even if `w3m-exec'
-	returns nil.
-
-2001-08-09  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* mew-w3m.el (mew-mime-text/html-w3m): Bug fix. Guess charset in cache
-	buffer.
-
-2001-08-07  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-type): Remove `w3m-mnc' option.
-	(w3m-w3m-dump-source): Removed.
-	(w3m-w3m-retrieve): Don't use `w3m-w3m-dump-source'.
-
-2001-08-07  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-content-type-alist): [Win32] Executed 'fiber' with
-	synchronous mode
-	(w3m-w32-browser-with-fiber): Ditto.
-	(w3m-external-view): Add a suffix to the temporally file name if
-	possible.
-
-2001-08-06  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-async-exec): Fix doc-string.
-	(w3m-exec-get-user): Rewrite.
-	(w3m-exec-get-passwd): New funciton.
-	(w3m-exec-set-user): Rewrite.
-	(w3m-get-server-root): Set 'server root' to downcase.
-	(w3m-exec-filter): Modify the method of 'user' and 'passwd' handling.
-
-2001-08-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-next-url): New buffer local variable.
-	(w3m-previous-url): Ditto.
-	(w3m-arrived-ignored-regexp): Add 'about://namazu/'.
-	(w3m-history-ignored-regexp): Ditto.
-	(w3m-url-decode-string): New funtcion.
-	(w3m-fontify-anchors): Process `rel' element of anchor tag.
-	(w3m-check-link-tags): New funtcion.
-	(w3m-rendering-region): Call `w3m-check-link-tags'.
-	(w3m-exec): Set `w3m-next-url' and `w3m-previous-url'.
-	(w3m-lynx-like-map): Replace `scroll-up' with
-	`w3m-scroll-up-or-next-url'.  Replace `scroll-down' with
-	`w3m-scroll-down-or-previous-url'.
-	(w3m-info-like-map): Ditto.
-	(w3m-mode): Ditto.
-	(w3m-scroll-up-or-next-url): New command.
-	(w3m-scroll-down-or-previous-url): Ditto.
-
-	* w3m-namazu.el (w3m-namazu-default-index-customize-spec): New
-	constant.
-	(w3m-namazu-index-alist): Change customize spec.
-	(w3m-namazu-default-index): Ditto.
-	(w3m-namazu-call-process): Change argument spec and followed change of
-	`w3m-namazu-index-alist'.
-	(w3m-about-namazu): Add link information to next or previous results.
-	(w3m-namazu): Stricter checking of arguments.  Encoded index and query.
-
-	* w3m-filter.el (w3m-filter-rules): Add `w3m-filter-google.com'.
-	(w3m-filter-google.com): New function.
-
-2001-08-03  Masayuki Ataka  <ataka@milk.freemail.ne.jp>,
-	    TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-namazu.el (w3m-namazu): Fixed the problem which is reported in
-	[emacs-w3m:01389].
-
-2001-08-03  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-download-save-directory): Abolished.
-	(w3m-goto-ftp-url, w3m-download): Reverted.  ;; Those last changes were
-	nonsensical.
-
-2001-08-03  Masayuki Ataka  <ataka@milk.freemail.ne.jp>,
-	    TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-namazu.el (w3m-namazu-default-index): Changed customize spec.
-	(w3m-namazu): Follow change of `w3m-namazu-default-index'.
-
-2001-08-03  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-toggle-inline-images): Display "Showing images..."
-	message only when there is at least one inline image.
-	(w3m-current-post-data): New buffer local variable.
-	(w3m-current-referer): Ditto.
-	(w3m-goto-url): Set up `w3m-current-post-data' and
-	`w3m-current-referer'.
-	(w3m-reload-this-page): Process post-data and referer.
-
-2001-08-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-download-save-directory): New user option.
-	(w3m-goto-ftp-url, w3m-download): Refer it.
-
-2001-08-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-antenna.el (w3m-antenna-shutdown): Don't specify a coding-system
-	to `w3m-save-list'.
-	(w3m-antenna-setup): Don't specify a coding-system to `w3m-load-list'.
-	(w3m-antenna-file-coding-system): Abolished.
-
-	* w3m.el (w3m-arrived-shutdown): Don't specify a coding-system to
-	`w3m-save-list'.
-	(w3m-arrived-shutdown, w3m-arrived-setup): Don't specify a
-	coding-system to `w3m-load-list'.
-	(w3m-save-list): Made the arg `coding-system' optional; refer to
-	`w3m-file-coding-system' by default; insert the file magic in the
-	beginning of a file.
-	(w3m-load-list): Made the arg `coding-system' optional; refer to
-	`w3m-file-coding-system-for-read' by default.
-	(w3m-arrived-file-coding-system): Abolished.
-	(w3m-file-coding-system-for-read): New variable.
-	(w3m-file-coding-system): New user option.
-
-2001-08-02  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-arrived-user-alist): Rename from w3m-arrived-user-list.
-	(w3m-process-realm): New variable.
-	(w3m-exec-process): Bind w3m-process-realm to nil.  Call
-	w3m-exec-set-user() for the certification.
-	(w3m-exec-get-user): Rewrite.
-	(w3m-exec-set-user): New function.
-	(w3m-get-server-root): Ditto.
-	(w3m-exec-filter): Support a pair of 'rootserver' and 'realm'.
-
-2001-08-02  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-form.el (w3m-form-make-form-data): Fixed typo.
-	(w3m-form-input-file): Rewrite.
-	(w3m-fontify-forms): Parse hseq attribute as well; Changed textarea
-	properties.
-	(w3m-form-text-chop): New function.
-	(w3m-form-input-textarea-hseq): New buffer local variable.
-	(w3m-form-input-textarea-name): Eliminated.
-	(w3m-form-input-textarea-set): Use `w3m-form-textarea-info',
-	`w3m-form-textarea-replace' and `w3m-form-input-textarea-hseq'.
-	(w3m-form-input-textarea): Use `w3m-form-textarea-info'; Adjust cursor
-	line at start time.
-	(w3m-form-textarea-replace): New function.
-	(w3m-form-textarea-info): Ditto.
-
-2001-08-02  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-add-referer): New option.
-	(w3m-goto-url): When `w3m-add-referer' equals nil, no reference
-	information is given to `w3m-exec'.
-
-	* README, README.ja: Update documents for required version of w3m.
-
-	* w3m-0.2.1-mnc.patch: Removed.
-
-	* w3m.el (TOP): Add autoload for w3m-namazu.
-
-	* w3m-namazu.el: New file.
-
-2001-08-01  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-w3m-retrieve): Bind coding-system-for-write as 'binary.
-
-	* w3m-form.el (w3m-form-make-form-data): New function.
-	(w3m-form-make-form-urlencoded): Eliminated.
-	(w3m-fontify-forms): Added 'file' input processing.
-	(w3m-form-input-file): New function.
-	(w3m-form-input-textarea-keymap): Bind "\C-c\C-k" as well.
-	(w3m-form-input-select-keymap): Ditto.
-	(w3m-form-input-map-keymap): Ditto.
-	(w3m-form-submit): Call `w3m-form-make-form-data' instead of
-	`w3m-form-make-form-urlencoded'.
-
-2001-07-31  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el: Applied patch [emacs-w3m: 01330].
-	(w3m-exec-filter): Changed regexp for authentication realm.
-
-	* w3m.el (w3m-toggle-inline-images): Set `referer' argument of
-	`w3m-create-image'.
-
-	* w3m-e21.el (w3m-create-image): Added argument `referer'.
-
-	* w3m-xmas.el (w3m-create-image): Ditto.
-
-	* w3m-form.el (w3m-form-submit): Set `referer' argument of
-	w3m-goto-url.
-
-	* w3m.el (w3m-w3m-retrieve): Make a temporary file for POST; Use
-	-header option to specify Content-Type: field.
-	(w3m-w3m-retrieve): Added argument `referer'; Add -header option to
-	specify Referer: field.
-	(w3m-retrieve): Added argument `referer'.
-	(w3m-exec): Ditto.
-	(w3m-goto-url): Ditto.
-	(w3m-view-this-url): Set `referer' argument of w3m-goto-url.
-
-2001-07-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-make-help-echo): For FSF Emacs 21, specify the third
-	argument of `get-text-property' where the buffer is to be checked; for
-	XEmacs, make it not to work if the buffer is not focused.
-	(w3m-make-balloon-help): Make it not to work if the buffer is not
-	focused.
-
-2001-07-27  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-form.el (w3m-form-parse-forms): Fixed for initial value in the
-	textarea.
-
-2001-07-27  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-form.el (w3m-form-input-textarea-exit): New function.
-	(w3m-form-input-select-exit): Ditto.
-	(w3m-form-input-map-exit): Ditt.
-	(w3m-form-input-textarea-keymap): Add key for 'exit'.
-	(w3m-form-input-select-keymap): Ditto.
-	(w3m-form-input-map-keymap): Ditto.
-	(w3m-form-input-textarea-mode): Modify doc-string.
-	(w3m-form-input-select-mode): Ditto.
-	(w3m-form-input-map-mode): Ditto.
-	(w3m-form-input-select-set-mouse): Add doc-string.
-	(w3m-form-input-map-set-mouse): Ditto.
-
-2001-07-26  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-x-moe-decode-buffer): Use 'w3m-coding-system' instead of
-	'euc-jp.
-	(w3m-w32-browser-with-fiber): Ignore process output.
-
-	* w3m-form.el (w3m-form-mouse-face): New user option.
-	(w3m-form-input-select): Add mouse-face.
-	(w3m-form-input-map): Ditto.
-
-	* mew-w3m.el (toplevel): Require 'cl, when byte-compile.
-	(mew-mime-text/html-w3m): Guess charset with the use of the Mew's
-	funcion and use its charset, if executed a combination of Mew Ver.2 and
-	w3m-m17n.
-
-2001-07-25  NAKAGAWA Takayuki  <tknakaga@kanagawa.hitachi.co.jp>
-
-	* w3m.el (w3m-fontify-anchors): Don't delete trailing whitespaces,
-	etc. from anchors.
-
-2001-07-19  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-form.el (w3m-form-parse-forms): Support the USEMAP attribute of
-	the IMG element.
-	(w3m-fontify-forms): Ditto.
-	(w3m-form-input-textarea-wincfg): New buffer local variable.
-	(w3m-form-input-select-wincfg): Ditto.
-	(w3m-form-input-textarea): Save the configuration of current window.
-	Guard error of the minimum height of window.
-	(w3m-form-input-select): Ditto.
-	(w3m-form-input-textarea-set): Restore the configuration of window.
-	(w3m-form-input-select-set): Ditto.
-	(w3m-form-input-map-buffer-lines): New user option.
-	(w3m-form-input-map-mode-hook): Ditto.
-	(w3m-form-input-map-set-hook): Ditto.
-	(w3m-form-input-map-keymap): New keymap.
-	(w3m-form-input-map-buffer): New buffer local variable.
-	(w3m-form-input-map-wincfg): Ditto.
-	(w3m-form-input-map-set): New function.
-	(w3m-form-input-map-mode): Ditto.
-	(w3m-form-input-map): Ditto.
-	(w3m-form-input-select-keymap): Added mouse operation.
-	(w3m-form-input-map-keymap): Ditto.
-	(w3m-form-input-select-set-mouse): New function.
-	(w3m-form-input-map-set-mouse): Ditto.
-
-2001-07-18  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-submit): New defmacro.
-	(w3m-mouse-view-this-url): Handle the action of form tag.
-	(w3m-submit-form): New function, submit the form.
-	(w3m-lynx-like-map): Add w3m-submit-form().
-	(w3m-info-like-map): Ditto.
-	(w3m-mode): Modify doc-string.
-
-	* w3m-form.el (w3m-fontify-forms): Add 'w3m-submit property on all tags
-	except the "reset".
-
-2001-07-18  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-w3m-retrieve): Added argument `post-data'.
-	(w3m-w3m-retrieve): Add -post and -post_ct to `w3m-command-arguments'
-	when `post-data' is specified.
-	(w3m-retrieve): Added argument `post-data'.
-	(w3m-exec): Ditto.
-	(w3m-goto-url): renamed `post-body' to `post-data'.  Don't bind
-	w3m-command-arguments here.
-
-2001-07-18  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-w3m-dump-source, w3m-w3m-dump-head-source,
-	w3m-local-dirlist-cgi): Say where the url is being connected to.
-
-	* w3mhack.el (w3mhack-compile): Changed message convention.
-	* w3m.el (w3m-view-source, w3m-rendering-region, w3m-w3m-dump-source,
-	w3m-w3m-dump-head-source, w3m-w3m-get-header, w3m-local-dirlist-cgi,
-	w3m-fontify): Ditto.
-	* w3m-e21.el (w3m-setup-header-line): Ditto.
-	* w3m-dtree.el (w3m-about-dtree): Ditto.
-	* w3m-bookmark.el (w3m-bookmark-add-current-url,
-	w3m-bookmark-add-this-url, w3m-bookmark-add-this-url): Ditto.
-	* mime-w3m.el (mime-w3m-mouse-view-this-url): Ditto.
-
-	* w3m.el (w3m-gohome, w3m-convert-ftp-url-for-emacsen,
-	w3m-goto-mailto-url, w3m-edit-current-url, w3m-external-view,
-	w3m-local-dirlist-cgi, w3m-toggle-inline-images, w3m-parse-attributes):
-	Changed error message convention.
-	* w3m-hist.el (w3m-history-add-arrived-db, w3m-history-rename-url,
-	w3m-history-remove-properties, w3m-history-add-properties,
-	w3m-history-plist-put, w3m-history-plist-get): Ditto.
-	* w3m-bookmark.el (w3m-bookmark-add, w3m-bookmark-write-file): Ditto.
-
-2001-07-16  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-mbconv-command): New customize variable.
-	(w3m-decode-buffer): If charset equal 'x-moe-internal', call
-	w3m-x-moe-decode-buffer().
-	(w3m-x-moe-decode-buffer): New funcion. A coding-system of buffer
-	converts 'x-moe-internal' to usual coding-system for emacsen.
-
-	* w3m-form.el (w3m-form-parse-region): If charset equal
-	'x-moe-internal', call w3m-x-moe-decode-buffer().
-	(w3m-form-parse-forms): Handles value of 'charset', if w3m-type eq
-	'w3mmee.
-
-2001-07-13  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-byte-optimize-letX): Remove `pop-up-frame-alist'
-	when compiling.
-
-	* w3m.el (w3m): Use the new macros; set the value of
-	`w3m-initial-frame' in the popped up frame.
-	(w3m-close-window): Use `w3m-delete-frame-maybe'.
-	(w3m-quit): Use `w3m-delete-frame-maybe'.
-	(w3m-delete-frame-maybe): New function.
-	(w3m-copy-buffer): Pop up a new frame if `w3m-pop-up-frames' is
-	non-nil; set the value of `w3m-initial-frame' in the new frame.
-	(w3m-popup-frame-p): New macro.
-	(w3m-pop-up-frame-parameters): New macro.
-	(w3m-initial-frame): New internal variable.
-
-	* w3m-xmas.el (w3m-setup-header-line): Use text-properties instead of
-	the raw extents for highlighting a header line.
-
-2001-07-13  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-form.el (w3m-form-new): Added 'charlst' option.
-	(w3m-form-charlst): New macro.
-	(w3m-form-plist): Move a indent of an array.
-	(w3m-form-put): Ditto.
-	(w3m-form-make-form-urlencoded): Remove 'coding' option.  If
-	'accept-charset' denotes within <form> tag, resolve coding-system
-	according to its list of charset.
-	(w3m-form-parse-forms): Handle value of 'accept-charset'.
-
-2001-07-12  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el (w3m-tag-regexp-of): New macro to generate regexp of specified
-	tag(s).
-	(w3m-parse-attributes): Skip spaces before parsing.
-
-	* w3m-form.el (w3m-form-parse-forms): More flexible and simple tag
-	finding using `w3m-tag-regexp-of' macro.
-
-2001-07-12  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-charset-coding-system-alist): Added 'us_ascii'.
-	(w3m-w3m-attributes): Use content of w3m-document-charset: field as
-	charset if exists.
-
-2001-07-12  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-form.el (w3m-form-parse-forms): Parse the tags only within the
-	"<form ..> ... </form>".
-
-2001-07-12  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-remove-redundant-spaces): Don't cause an error when str
-	contains only spaces.
-
-2001-07-12  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* mew-w3m.el: Hand-over of copyright of this file from Goto to
-	Tsuchiya. This is consensual.
-
-2001-07-11  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-rendering-region): Add charset option when call
-	w3m-form-parse-region().
-
-	* w3m-form.el (w3m-form-parse-region): Add charset option.  If w3m-type
-	is 'w3mmee or 'w3m-m17n, forms parse within a decoded temporally
-	buffer.
-	(w3m-form-parse-forms): New function.
-
-2001-07-11  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
-
-	* w3m-form.el (w3m-form-parse-region): Don't extract value from submit
-	button, again.
-	(w3m-form-submit): Don't set value when NAME is omitted.
-
-2001-07-11  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el (w3m-rendering-region): Do not break matching data.
-
-2001-07-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-form.el (w3m-fontify-forms): Put text properties corresponding to
-	form types.
-	(w3m-form-input): Simplify.
-	(w3m-form-input-password): New function.
-	(w3m-form-input-checkbox): Ditto.
-	(w3m-form-input-radio): Ditto.
-	(w3m-form-input-textarea): Follow changes in `w3m-form-input'.
-	(w3m-form-input-select): Ditto.
-
-2001-07-11  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m-form.el (w3m-form-goto-next-field): New function.
-	(w3m-form-make-form-urlencoded): Refine to support value of check-box
-	type which is list of value string.
-	(w3m-form-parse-region): Support CHECKBOX type and RADIO type. Note
-	that CHECKBOX type has multiple values.
-	(w3m-fontify-forms): Use new property 'w3m-form-field-id to identify
-	each field to support RADIO type item. Also removed value putting code
-	because values are already set in parsing.
-	(w3m-form-input): Support action for CHECKBOX and RADIO type field.
-
-	* w3m.el (w3m-url-encode-string): Encode SPACE(0x20) as "+".
-	(w3m-rendering-region): Decode entities in title string.
-
-2001-07-10  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-w3m-attributes): Fixed problem when charset is quoted.
-
-	* w3m-form.el (w3m-form-parse-region): Don't extract value from submit
-	button.
-	(w3m-form-submit): If ACTION is not specified, send data to current
-	url.
-	(w3m-form-make-get-string): Removed.
-
-2001-07-10  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el: Bind `:bool' for old Emacsen.
-
-2001-07-10  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el (w3m-parse-attributes): Support :bool type attribute.
-
-	* w3m-form.el (w3m-form-parse-region): Use :bool type for SELECTED
-	attribute of OPTION tag.
-
-2001-07-09  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-form.el (w3m-form-make-form-urlencoded): If second value of plist
-	is consp, use car value (for select).
-	(w3m-form-parse-region): Don't parse type attribute for textarea;
-	Process select.
-	(w3m-fontify-forms): Save value and name for submit.
-	(w3m-form-replace): Added optional argument `invisible'.
-	(w3m-form-input): Process SELECT and PASSWORD.
-	(w3m-form-input-select-buffer-lines): New user option.
-	(w3m-form-input-select-mode-hook): Ditto.
-	(w3m-form-input-select-set-hook): Ditto.
-	(w3m-form-input-select-keymap): New keymap.
-	(w3m-form-input-select-buffer): New buffer local variable.
-	(w3m-form-input-select-form): Ditto.
-	(w3m-form-input-select-name): Ditto.
-	(w3m-form-input-select-point): Ditto.
-	(w3m-form-input-select-candidates): Ditto.
-	(w3m-form-input-select-set): New function.
-	(w3m-form-input-select-mode): Ditto.
-	(w3m-form-input-select): Ditto.
-	(w3m-form-submit): Added optional argument name and value.
-
-	* w3m.el (w3m-remove-comments): New function.
-	(w3m-rendering-region): Call it.
-
-2001-07-06  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-form.el (w3m-form-default-coding-system): Changed default value
-	to shift_jis.
-	(w3m-form-make-form-urlencoded): Removed redundant local variable.
-
-	* w3m.el (w3m-url-encode-string): Encode newline as "%0D%0A"
-
-	* w3m-form.el (w3m-form-default-coding-system): New user option.
-	(w3m-form-make-form-urlencoded): Use it.
-	(w3m-form-input-textarea-set): Get values of buffer local variables
-	before changing buffer.
-	(w3m-form-input-textarea): Set values of buffer local variables after
-	changing buffer.
-
-2001-07-06  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-form.el (comment): Modify URI of emacs-w3m.
-	(w3m-form-input-textarea-mode-hook): New user option.
-	(w3m-form-input-textarea-point): New buffer local variable.
-	(w3m-form-input-textarea-set): Run 'w3m-form-input-textarea-set-hook'
-	hook first.  Get 'w3m-buffer' from input buffer.  Go to the point of
-	the orignal form when switch to 'w3m-buffer'.
-	(w3m-form-input-textarea): Save original point to
-	'w3m-form-input-textarea-point'.  Set 'w3m-form-input-textarea-buffer'
-	within the buffer of the input area.
-
-	* w3m.el (w3m-about): Modify URI of emacs-w3m.
-	* w3m-xmas.el (comment): Ditto.
-	* w3m-weather.el (comment): Ditto.
-	* w3m-search.el (comment): Ditto.
-	* w3m-om.el (comment): Ditto.
-	* w3m-macro.el (comment): Ditto.
-	* w3m-e21.el (comment): Ditto.
-	* w3m-e20.el (comment): Ditto.
-	* w3m-dtree.el (comment): Ditto.
-	* w3m-bookmark.el (comment): Ditto.
-	* w3m-antenna.el (comment): Ditto.
-
-2001-07-05  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-0.2.1-mnc.patch: Added [-post body] option.
-
-	* w3m.el (w3m-url-encode-string): Don't cause an error when str is nil.
-	(w3m-goto-url): Added post-body argument; Set -post option if post-body
-	is specified.
-
-	* w3m-form.el (w3m-form-make-form-urlencoded): New function.
-	(w3m-form-make-get-string): Use `w3m-form-make-form-urlencoded'.
-	(w3m-form-parse-region): Add textarea processing.
-	(w3m-form-replace): Delete newline characters.
-	(w3m-form-input): Added textarea processing.
-	(w3m-form-submit): If form method is POST, then set post-body argument
-	of `w3m-goto-url'.
-	(w3m-form-input-textarea-buffer-lines): New user option.
-	(w3m-form-input-textarea-mode-hook): Ditto.
-	(w3m-form-input-textarea-keymap): New keymap.
-	(w3m-form-input-textarea-buffer): New buffer local variable.
-	(w3m-form-input-textarea-form): Ditto.
-	(w3m-form-input-textarea-name): Ditto.
-	(w3m-form-input-textarea-set): New function.
-	(w3m-form-input-textarea-mode): Ditto.
-	(w3m-form-input-textarea): Ditto.
-
-2001-06-29  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* mime-w3m.el (mime-w3m-preview-text/html): Search xref in the root
-	entitiry.
-
-2001-06-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-version): Bind `print-level' and `print-length'
-	to nil.
-	(w3mhack-examine-modules): Ditto.
-	* w3m.el (w3m-rendering-region): Ditto.
-	* w3m-form.el (w3m-form-submit): Ditto.
-
-2001-06-12  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el: Added support code for w3m-m17n.
-	(w3m-type): Add new candidate.
-	(w3m-command, w3m-input-coding-system, w3m-output-coding-system)
-	(w3m-halfdump-command-arguments): Add default value for w3m-m17n.
-	(w3m-exec) [w3m-m17n]: No call `w3m-decode-buffer'.
-	(w3m-region) [w3m-m17n]: No call `encode-coding-region'.
-
-2001-06-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-dump-head-source-command-argument): Its old name is
-	`w3m-dump-head-source-command-arguments'.
-
-2001-06-11  Mito  <mit@nines.nec.co.jp>
-
-	* w3m.el (w3m-broken-proxy-cache): New variable.
-	(w3m-dump-head-source-command-arguments): Defined as list.
-	(w3m-w3m-retrieve): Cache on proxy server isn't used when neither
-	`no-cache' nor `w3m-broken-proxy-cache' equal to nil.
-
-2001-06-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-form.el (w3m-form-parse-region): Check the value of
-	`w3m-current-buffer' to avoid wrong type argument error.
-
-	* w3m.el (w3m-rendering-region): Set `w3m-current-buffer' refered in
-	`w3m-form-parse-region'.
-
-2001-06-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-attributes): Remove URL fragments before checking its
-	attributes.
-	(w3m-retrieve): Remove URL fragments before getting its contents.
-	(w3m-w3m-retrieve): Follow changes in `w3m-retrieve'.
-	(w3m-arrived-add): Simplified regular expression.
-	(w3m-parse-attributes): Changed form spec for edebug.
-
-	* w3m-form.el (w3m-form-parse-region): Set `w3m-current-forms' in the
-	buffer `w3m-current-buffer'.
-
-	* mime-w3m.el (mime-w3m-save-background-color): Changed form spec for
-	edebug.
-
-2001-06-09  Kiyokazu SUTO  <suto@ks-and-ks.ne.jp>,
-	    TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-fontify-anchors): Process w3m internal tag `<_id>' which
-	represents ID properties.
-
-2001-06-08  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-w3m-retrieve): Remove URL's fragment before checking
-	cache.
-
-2001-06-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-unoptimize-animated-gif): Truncate an animated gif
-	to have only one frame when the size is larger than the value of
-	`w3m-animated-gif-maximum-size'.
-	(w3m-animated-gif-maximum-size): New variable.
-
-2001-06-06  Kenichi OKADA  <okada@opaopa.org>
-
-	* w3m-xmas.el: Require `path-util'.
-
-2001-06-07  NAKAJIMA Mikio <minakaji@osaka.email.ne.jp>
-
-	* w3m.el (w3m-exec-process): Replace `delete' with `delq'.
-
-2001-06-05  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-toolbar): Use the English language when the value of the
-	variable `current-language-environment' is not "Japanese".
-
-2001-06-04  Pavel Janik  <Pavel@Janik.cz>
-
-	* w3m.el (w3m-about-db-history): Fix typo Titile -> Title.
-
-2001-06-01  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-halfdump-command-arguments): Changed default value to
-	"-dump=half-buffer" when w3m-type equal 'w3mmee.
-
-2001-05-31  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-om.el (iso-2022-7bit): New coding-system generated by copying
-	from `*iso-2022-jp*'.
-
-2001-05-31  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-coding-system): Changed default value to 'iso-2022-7bit.
-	(w3m-input-coding-system): Ditto.
-
-2001-05-31  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-dtree.el (w3m-dtree-create): Insert 'Meta tag' to the binding of
-	charset.
-
-	* w3m.el (w3m-local-dirlist-cgi): Fix charset handling.
-
-2001-05-30  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-file-name-coding-system): New customizable value.
-	(w3m-charset-coding-system-alist): Reverse list.
-	(w3m-dirlist-cgi-program): Change default value for OS/2.
-	(w3m-local-dirlist-cgi): Set "QUERY_STRING" to encoded string of
-	'w3m-file-name-coding-system'. Insert 'Meta tag' to the binding of
-	charset.
-
-2001-05-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-goto-url): Set a string representing file interpreted as
-	a directory to `default-directory'.
-	(w3m-about-source): Call `w3m-decode-buffer'.
-
-2001-05-29  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-decode-buffer): Allow `detect-coding-region' to return
-	both a coding-system and a list of coding-systems.
-
-2001-05-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (XEmacs): Require `byte-optimize' expressly before
-	advising the function `byte-optimize-form-code-walker'.
-
-2001-05-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-hist.el (w3m-history-rename-url): Don't use `with-current-buffer'
-	for old Emacsen.
-	(w3m-history-copy): Ditto.
-	(w3m-history-share-properties): Ditto.
-	(w3m-history-seek-properties): Ditto.
-
-2001-05-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* Makefile.in (slow): New rule for the developers to check a
-	portability for each module.
-	* w3m-xmas.el (w3m-cache-unoptimized-gif-images): Fix typo.
-
-2001-05-26  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-local-directory-view-method): Modify default value.
-	(w3m-direlist-cgi-program): New variable.
-	(w3m-local-retrieve): Call w3m-local-dirlist-cgi() when local
-	directory.
-	(w3m-local-dirlist-cgi): New function. Execute either 'w3m' or
-	'direlist.cgi'.
-	(w3m-goto-url-localcgi-movepoint): Use 'w3m-name-anchor instead of
-	'patter-matching'.
-	(w3m-url-completion): Handling drive letter for any broken OSes.
-
-	* w3m-dtree.el (w3m-dtree-stop-strings): Add a new alternative.
-
-2001-05-26  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-decode-buffer): Removed reference of `w3m-coding-system'.
-
-2001-05-25  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-dtree.el (w3m-dtree-directory-depth): New variable.
-	(w3m-dtree-stop-strings): Ditto.
-	(w3m-dtree-create-sub): Add new arugument 'depth'. Stop recursive call,
-	if directory-depth over the 'w3m-dtree-directory-depth'.
-
-2001-05-25  NAKAGAWA Takayuki <tknakaga@kanagawa.hitachi.co.jp>
-
-	* w3m-dtree.el (w3m-dtree-create-sub): To avoid infinite recusion,
-	directory-files now returns absolute file names and expand-file-name is
-	omitted.
-
-2001-05-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-about-history): Get the values of `w3m-current-url' and
-	`w3m-history-flat' from the buffer `w3m-current-buffer'.
-	(w3m-goto-url): Set the value of `w3m-current-buffer' as the current
-	buffer.
-	(w3m-current-buffer): New internal variable.
-
-2001-05-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-examine-modules): Made it to return w3m-macro.elc
-	and the version specific module first.
-
-	* w3m.el (w3m-setup-menu): Define it if the feature `xemacs' is not
-	provided.
-	(TopLevel): Don't bind the functions `w3m-display-inline-image-p',
-	`w3m-display-graphic-p', `w3m-update-toolbar', `w3m-setup-toolbar',
-	`w3m-image-type-available-p', `w3m-insert-image' and
-	`w3m-create-image'.
-	(w3m-get-buffer-create, w3m-add-text-properties, w3m-with-work-buffer):
-	Moved to w3m-macro.el.
-	(w3m-charset-coding-system-alist): Use `w3m-find-coding-system'
-	directly.
-	(w3m-find-coding-system): Moved to the version specific modules.
-	(w3m-static-cond, w3m-static-if): Moved to w3m-macro.el.
-	(TopLevel): Require `w3m-e20' when the version of the running Emacs is
-	neither XEmacs, Emacs 21 nor Mule2.
-	(TopLevel): Require `w3m-macro'.
-
-	* w3m-xmas.el (w3m-euc-japan-decoder): Define it when the function
-	`ccl-compile-write-multibyte-character' is bound.
-	(widget-coding-system-action): Use `eval' instead of the funcall'ing
-	for the function `widget-coding-system-prompt-value'.  It is only for
-	avoiding a byte-compile warning.
-	(w3m-should-unoptimize-animated-gifs): Check for both
-	`emacs-patch-level' and `emacs-beta-version' when XEmacs 21.2 is
-	running.
-	(TopLevel): Bind the functions `w3m-image-type' and `w3m-retrieve' when
-	compiling.
-	(TopLevel): Bind the variables `w3m-current-url',
-	`w3m-display-inline-image', `w3m-icon-directory', `w3m-menubar',
-	`w3m-toolbar', `w3m-toolbar-buttons', `w3m-use-header-line' and
-	`w3m-work-buffer-name' when compiling.
-	(TopLevel): Don't require `w3m'.
-	(TopLevel): Provide the feature `w3m-xmas' in the end of the file.
-
-	* w3m-om.el (read-passwd): Enclose it with `eval-and-compile'.
-	(w3m-find-coding-system): New inline function moved from w3m.el.
-	(w3m-display-inline-image-p, w3m-display-graphic-p, w3m-update-toolbar,
-	w3m-setup-toolbar, w3m-image-type-available-p, w3m-insert-image,
-	w3m-create-image): Alias to `ignore'.
-	(TopLevel): Bind the variables `w3m-menubar' and `w3m-mode-map' when
-	compiling.
-	(TopLevel): Don't require `w3m'.
-	(TopLevel): Provide the feature `w3m-om' in the end of the file.
-
-	* w3m-macro.el: New file which currently contains
-	`w3m-get-buffer-create', `w3m-add-text-properties',
-	`w3m-with-work-buffer', `w3m-static-cond' and `w3m-static-if'.
-
-	* w3m-e21.el (w3m-update-toolbar): Alias to `ignore'.
-	(w3m-find-coding-system): New inline function moved from w3m.el.
-	(TopLevel): Bind the functions `w3m-image-type' and `w3m-retrieve' when
-	compiling.
-	(TopLevel): Bind the variables `w3m-work-buffer-name',
-	`w3m-use-header-line', `w3m-toolbar-buttons', `w3m-toolbar',
-	`w3m-mode-map', `w3m-icon-directory' and `w3m-display-inline-image'
-	when compiling.
-	(TopLevel): Don't require `w3m'; require `w3m-macro'.
-	(TopLevel): Provide the feature `w3m-e21' in the end of the file.
-
-	* w3m-e20.el: New file.
-
-2001-05-25  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-expand-file-name-as-url): Remove handling
-	'about://dtree'.
-	(w3m-local-content-type): Ditto.
-	(w3m-url-local-p): Ditto.
-	(w3m-local-directory-view-method): New variable.
-	(w3m-local-retrieve): If url is directory, call w3m by way of kick
-	'dirlist.cgi'
-	(w3m-url-dtree-p): New defsubst.
-	(w3m-edit-current-url, w3m-edit-this-url): Use w3m-url-dtree-p().
-	(w3m-goto-url-localcgi-movepoint): New function.
-	(w3m-goto-url): If URL is a local directory, check and change URL by
-	the use of 'w3m-local-directory-view-method'.  If URL type is a local
-	cgi, move to its directory point.
-
-2001-05-25  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-euc-japan-decoder): Check if `emacs-major-version'
-	is 21 instead of 20 and check for `emacs-beta-version' instead of
-	`emacs-patch-level'.
-	(w3m-should-unoptimize-animated-gifs): Ditto.
-
-2001-05-25  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-xmas.el (w3m-euc-japan-decoder): Fix typo.
-
-2001-05-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-euc-japan-decoder): Don't check for the constant
-	`emacs-patch-level' when the beta versions of XEmacs is running.
-
-2001-05-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-euc-japan-decoder): Not define when it has been already
-	defined.
-
-	* w3m-xmas.el (w3m-euc-japan-decoder): Define when XEmacs whose version
-	is greater than 21.2.19 is used.
-
-2001-05-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el: Modify messages in `w3m-view-header', `w3m-view-source',
-	`w3m-edit-this-url', `w3m-print-this-url', `w3m-download-this-url',
-	`w3m-view-current-url-with-external-browser', `w3m-save-image',
-	`w3m-view-image', `w3m-mouse-view-this-url', `w3m-view-this-url' and
-	`w3m-search-name-anchor'.
-
-	* w3m.el (w3m-toggle-inline-images): Signal an error when the function
-	`w3m-display-graphic-p' returns nil.
-	(w3m-display-graphic-p): Alias to `ignore' by default.
-	(w3m-menubar): Disable a menu button "Toggle Images" when the function
-	`w3m-display-graphic-p' returns nil.
-	* w3m-xmas.el (w3m-display-graphic-p): Alias to
-	`device-on-window-system-p'.
-	* w3m-e21.el (w3m-display-graphic-p): Alias to `display-graphic-p'.
-
-2001-05-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-find-coding-system): New function to replace
-	`find-coding-system'.
-	(w3m-charset-to-coding-system): Use `w3m-find-coding-system'.
-	(make-ccl-coding-system): Removed.
-	(toplevel) [emacs20, emacs21]: Removed dependency on `pccl'.
-
-2001-05-24  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (toplevel): Fix condition for (require 'pccl).
-
-2001-05-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-charset-to-coding-system): Simplified.
-	(make-ccl-coding-system) [XEmacs, Mule]: Removed.
-
-2001-05-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-region): Use `w3m-display-inline-image-p'.
-	(w3m-goto-url): Ditto.
-	(w3m-display-inline-image-p): New function.
-	* w3m-xmas.el (w3m-display-inline-image-p): New function.
-	* w3m-e21.el (w3m-display-inline-image-p): New function.
-
-2001-05-24  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (toplevel): Define make-ccl-coding-system() myself, when
-	failed (require 'pccl).
-
-2001-05-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m): Made it can be called non-interactively or a batch job.
-
-	* w3m.el (w3m-goto-url): Add autoload magic cookie.
-	* w3m-weather.el (w3m-about-weather, w3m-weather): Ditto.
-	* w3m-search.el (w3m-search): Ditto.
-	* w3m-form.el (w3m-fontify-forms, w3m-form-parse-region): Ditto.
-	* w3m-filter.el (w3m-filter): Ditto.
-	* w3m-dtree.el (w3m-dtree, w3m-about-dtree): Ditto.
-	* w3m-bookmark.el (w3m-bookmark-view, w3m-bookmark-add-current-url,
-	w3m-bookmark-add-this-url): Ditto.
-	* w3m-antenna.el (w3m-antenna, w3m-about-antenna): Ditto.
-	* mime-w3m.el (mime-w3m-preview-text/html): Ditto.
-
-2001-05-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-coding-system): Changed default value to
-	'iso-2022-7bit-ss2.
-	(w3m-terminal-coding-system): New user option.
-	(w3m-attributes): When URL whose scheme equals to `about' is specified,
-	returns `w3m-coding-system' as its content-charset.
-	(w3m-exec-process): Refer `w3m-terminal-coding-system'.
-	(w3m-decode-buffer): Decode buffer everywhen it is called.
-	(w3m-about-retrieve): New function.
-	(w3m-cid-retrieve): Ditto.
-	(w3m-retrieve): Call `w3m-about-retrieve' and `w3m-cid-retrieve'.
-	(w3m-rendering-region) [w3mmee]: No call `encode-coding-region'.  Fix
-	coding-system spec error for Mule-2.3.
-	(w3m-rendering-region): Simplified.
-	(w3m-region) [w3mmee]: Encode this buffer as unibyte representation.
-	(w3m-about-history): No call `w3m-with-work-buffer'.
-	(w3m-about-db-history): Ditto.
-
-	* w3m-dtree.el (w3m-about-dtree): Ditto.
-
-	* w3m-weather.el (w3m-about-weather): Call `w3m-decode-buffer'.
-
-2001-05-23  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m): Popup a new frame if there is neither a window nor a
-	frame associated with w3m and `w3m-pop-up-frames' is non-nil; refer to
-	`w3m-pop-up-frame-parameters' when creating a new w3m frame.
-	(w3m-pop-up-frame-parameters): New user option which allows a kludge
-	that it can be either an alist or a plist.
-	(w3m-pop-up-frames): New user option.
-
-	* w3m-e21.el (w3m-setup-header-line): Replace "%" with "%%" in an url
-	string.
-
-2001-05-23  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-read-coding-system): Removed.
-	(w3m-process-environment): New variable.
-	(w3m-input-coding-system): Changed default value.
-	(w3m-output-coding-system) [w3mmee]: Changed default value.
-	(w3m-arrived-add-1): Changed argument spec.
-	(w3m-arrived-add): Ditto.
-	(w3m-arrived-coding-system): Removed.
-	(w3m-arrived-content-charset): New function.
-	(w3m-arrived-setup): Changed arrived file format to keep
-	content-charset instead of coding-system.
-	(w3m-arrived-shutdown): Ditto.
-	(w3m-exec-process): Refer `w3m-process-environment' to set environments
-	for sub-processes.
-	(w3m-decode-encoded-contents): Ditto.
-	(w3m-coding-system-to-charset): Removed.
-	(w3m-read-content-charset): New function.
-	(w3m-decode-buffer): Changed argument spec.  Process this buffer if and
-	only if it's represented in unibyte.
-	(w3m-rendering-region): Reconstruced.
-	(w3m-exec): Changed argument spec and followed the change of
-	`w3m-decode-buffer'.
-	(w3m-goto-url): Changed argument spec and followed the change of
-	`w3m-exec'.
-	(w3m-redisplay-with-coding-system): Removed.
-	(w3m-redisplay-with-charset): New command to replace
-	`w3m-redisplay-with-coding-system'.
-	(w3m-region): No call `encode-coding-region'.
-	(w3m-about-history): Ditto.
-	(w3m-about-db-history): Ditto.
-
-	* w3m-antenna.el (w3m-about-antenna): No call `encode-coding-region'.
-
-	* w3m-dtree.el (w3m-about-dtree): Ditto.
-
-	* w3m-om.el (w3m-read-coding-system): Removed.
-	(coding-system-list): New function.
-
-2001-05-23  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-expand-file-name-as-url): If file is directory, expand to
-	use 'about://dtree'.
-	(w3m-local-content-type): If url is directory or 'about://dtree/",
-	return "text/html" type.
-	(w3m-goto-url): If URL is local and directory, change URL 'file://' to
-	'about://dtree'.
-	(w3m-halfdump-command): New variable.
-	(w3m-halfdump-command-arguments): Change to defvar.
-	(w3m-halfdump-command-common-arguments): New constant, common arguments
-	for 'halfdump' execution of all w3m variants.
-	(w3m-rendering-region): Use 'w3m-halfdump-command' if setted. Change
-	call process arguments.
-	(w3m-lynx-like-map): Add w3m-gohome() keybind.
-	(w3m-info-like-map): Add w3m-dtree() and w3m-edit-this-url()
-	keybind. Use w3m-gohome() instead of lamda expression.
-	(w3m-mode): Modify doc-string.
-
-	* w3m-dtree.el (w3m-about-dtree): Modify message.
-
-2001-05-23  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-unoptimize-animated-gif): New function which is
-	separated from `w3m-create-image'; improve a way to check whether a
-	data should be unoptimized or not.
-	(w3m-create-image): Use it.
-
-2001-05-23  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-create-image): Attempt to extract the first frame of
-	an animated gif when the unoptimization is failed.
-
-2001-05-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-add-text-properties): Don't specify `end-open' nor
-	`front-nonsticky' that are the default.
-	(w3m-emacs-w3m-icon): Colorized.
-
-2001-05-22  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-cache-contents): Don't insert additional '\n' for binary
-	data.
-
-2001-05-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el: Don't make the coding-system `w3m-euc-japan' if it already
-	exists to make w3m.el reloadable in Emacs 20.
-
-2001-05-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-about): Put an icon image as about://emacs-w3m.gif.
-	(w3m-retrieve): Make an exception of about://emacs-w3m.gif.
-	(w3m-attributes): Ditto.
-	(w3m-emacs-w3m-icon): New constant for about://emacs-w3m.gif.
-
-2001-05-22  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-region): Call w3m-render-region for the region from
-	`point-min' to `point-max' because buffer is already narrowed.
-
-2001-05-22  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* mew-w3m.el (mew-mime-text/html-w3m): Fix condition when
-	mew-mime-text/html() call, again. Avoid byte-compile warning when
-	compiling.
-
-2001-05-21  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Add support code of w3mmee.  Reorganaized codes to handle
-	content types and coding systems which are specified by user.
-	(toplevel): Require 'pccl.
-	(w3m-type): New user option.
-	(w3m-mnc): Removed user option.
-	(w3m-linefeed-type): Removed variable.
-	(w3m-dump-head-source-option): Ditto.
-	(w3m-decode-all-to-this-charset): Ditto.
-	(w3m-halfdump-option): Ditto.
-	(w3m-halfdump-expand-options): Ditto.
-	(w3m-extended-characters-table): Ditto.
-	(w3m-command): Refer `w3m-type' to decide default value.
-	(w3m-command-arguments): Ditto.
-	(w3m-output-coding-system): Changed default value to `w3m-euc-japan'.
-	(w3m-profile-directory): Refer `w3m-command' to decide default value.
-	(w3m-default-save-directory): Ditto.
-	(w3m-dump-head-source-command-arguments): New constant.
-	(w3m-halfdump-command-arguments): Refer `w3m-type' to decide default
-	value.
-	(w3m-arrived-add-1): Add an argument `content-type'.
-	(w3m-arrived-add): Likewise and follow change of `w3m-arrived-add-1'.
-	(w3m-arrived-coding-system): Strict checking of return value.
-	(w3m-arrived-content-type): New function.
-	(w3m-arrived-setup): Follow change of `w3m-arrived-add'.
-	(w3m-arrived-shutdown): Ditto.
-	(w3m-exec-process): Set process environment to avoid unexpected
-	conversion in Windows.
-	(w3m-charset-to-coding-system): New function.
-	(w3m-decode-encoded-contents): Old name is `w3m-decode-encoded-buffer'.
-	Set process environment to avoid unexpected conversion in Windows.
-	(w3m-local-retrieve). Simplified.
-	(w3m-pretty-length): Removed.
-	(w3m-crlf-to-lf): Removed.
-	(w3m-w3m-dump-head-source): No call `w3m-crlf-to-lf'.
-	(w3m-w3m-dump-source): Ditto.
-	(w3m-w3m-retrieve) Removed optional argument `cs' and simplified.
-	(w3m-retrieve): Ditto.
-	(w3m-decode-extended-characters): Removed.
-	(w3m-euc-japan-decoder): New CCL program.
-	(w3m-euc-japan-encoder): Dummy CCL program.
-	(w3m-euc-japan): New coding system.
-	(w3m-rendering-region): New optional argument `charset' and support
-	codes of `w3mmee' are added.  Handle new defintion style of
-	`w3m-halfdump-command-arguments'.  Refer `w3m-euc-japan' to process
-	outputs of `w3m'.
-	(w3m-exec): Reconstructed.  This accepts new optional argument
-	`content-type'.
-	(w3m-goto-url): Reconstructed to handle files which have unknown
-	cotent-types.
-	(w3m-redisplay-with-coding-system): Simplified.
-	(w3m-find-file): Simplified and optional argument `type' is removed.
-	(w3m-region): Encode output buffer into `w3m-input-coding-system'.
-	(w3m-about-history): Ditto.
-	(w3m-about-db-history): Ditto.
-
-	* w3m-antenna.el (w3m-about-antenna): Encode output buffer into
-	`w3m-input-coding-system'.
-
-	* w3m-dtree.el (w3m-about-dtree): Ditto.
-
-	* mime-w3m.el (mime-w3m-cid-retrieve): Changed spec of arguments.
-
-	* mew-w3m.el (mew-w3m-cid-retrieve): Ditto.
-
-2001-05-21  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-toggle-inline-images): Message "Showing...".
-
-	* w3m-xmas.el (w3m-create-image): Unoptimize animated GIFs using
-	gifsicle program.
-	(w3m-cache-unoptimized-gif-images-max-length): New variable.
-	(w3m-cache-unoptimized-gif-images): New variable.
-	(w3m-gifsicle-program): New variable.
-	(w3m-should-unoptimize-animated-gifs): New variable.
-
-2001-05-21  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-fontify): Don't initialize the value of
-	`w3m-cache-underline-faces' here.
-	(w3m-toggle-inline-images): Run the following new hooks instead of to
-	hide/show underlines behind inline images here.
-	(w3m-cache-underline-faces): Variable moved to w3m-e21.el.
-	(w3m-remove-inline-images-after-hook): New hook.
-	(w3m-remove-inline-images-before-hook): New hook.
-	(w3m-show-inline-images-after-hook): New hook.
-	(w3m-show-inline-images-before-hook): New hook.
-
-	* w3m-e21.el: Use `w3m-remove-inline-images-after-hook',
-	`w3m-show-inline-images-after-hook',
-	`w3m-show-inline-images-before-hook' and `w3m-fontify-before-hook' to
-	fix the undesirable feature of Emacs 21 that to show an underline of a
-	text even if it has an image as a text property.
-	(w3m-cache-underline-faces): Variable moved from w3m.el.
-
-2001-05-18  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-cache-underline-faces): Modified docs that it is for
-	Emacs 21's exclusive use.
-
-2001-05-18  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-dtree.el (w3m-dtree-indent): Remove variable.
-	(w3m-dtree-fancy-display): Ditto.
-	(w3m-dtree-indent-strings): New variable.
-	(w3m-dtree-create-fancy): Remove function.
-	(w3m-dtree-create-sub): Rename function from w3m-dtree-create-fancy()
-	and tiny modified.
-	(w3m-about-dtree): Remove 'fancy style' method.
-
-2001-05-18  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* icons/db-history-up.xpm: Change color.
-
-	* mew-w3m.el (mew-mime-text/html-w3m): Fix condition when
-	mew-mime-text/html() call.
-
-2001-05-18  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-find-file): Improved.
-	(w3m-default-content-type): New user option.
-	(w3m-url-completion): New function.
-	(w3m-input-url): Call `w3m-url-completion' to complete URLs.
-
-2001-05-17  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-find-file): New optional argument, `type' is added.
-
-2001-05-17  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-hist.el (w3m-history-add-arrived-db): Improve the madness.
-
-	* w3m.el (w3m-about-history): Add small indentation to sub trees.
-
-2001-05-17  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-about-db-history): Modify display format for no folding.
-
-2001-05-17  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-about-history): New implementation.
-	(w3m-about-history-indent-level): New variable.
-	(w3m-about-history-max-indentation): New variable.
-
-	* icons/history-up.xpm: Replaced a pixmap with a new pattern.
-
-2001-05-16  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-dtree.el (w3m-dtree-default-allfiles): Modify default value.
-	(w3m-dtree-fancy-display): New variable.
-	(w3m-dtree-create-fancy): New function.
-	(w3m-dtree-create-sub): Insert the indicator which directory or file,
-	if allfiles.
-	(w3m-about-dtree): Use fancy style function, if
-	'w3m-dtree-fancy-display' is non-nil.
-
-2001-05-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m): Use existing frame or window.
-
-2001-05-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-dtree.el (w3m-dtree-create): Fix HTML bug.
-
-2001-05-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-cache-underline-faces): Added docs that it is currently
-	needed for only pretest versions of Emacs 21.
-	(w3m-fontify-anchors): Don't fontify the trailing white spaces of a
-	href.
-	* w3m-xmas.el (w3m-insert-image): Don't handle underline faces.
-	* w3m-e21.el (w3m-insert-image): Simplified.
-
-2001-05-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-setup-header-line, w3m-exec, w3m-decode-entities):
-	Replace `add-text-properties' with `w3m-add-text-properties'.
-	(w3m-fontify-images, w3m-fontify-anchors): Ditto.
-	(w3m-setup-header-line, w3m-cache-contents, w3m-refontify-anchor):
-	Replace `put-text-property' with `w3m-add-text-properties'.
-	(w3m-toggle-inline-images, w3m-fontify-anchors): Ditto.
-	(w3m-fontify-underline, w3m-fontify-bold): Ditto.
-	(w3m-add-text-properties): New macro used to put non-sticky text
-	properties.
-
-	* w3m-xmas.el (w3m-setup-header-line): Don't put non-sticky text
-	property here.
-
-2001-05-16  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* mew-w3m.el (mew-w3m): Typo fix.
-
-2001-05-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-bookmark.el (w3m-bookmark-default-section): Changed
-	initialization order.
-
-2001-05-16  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-dtree.el (w3m-dtree-create): Modify warning message.
-	(w3m-about-dtree): Set path to directory name.
-
-2001-05-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el, w3m-antenna.el, w3m-bookmark.el, w3m-dtree.el, w3m-search.el,
-	w3m-weather.el: Fixed document strings of functions.
-
-	* mew-w3m.el (mew-w3m): New customize group.
-	(mew-use-w3m-minor-mode): Use defcustom.
-	(mew-w3m-auto-insert-image): Use defcustom.
-
-2001-05-16  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-goto-url): Set 'default-directory' to
-	'w3m-profile-directory', if 'url' is local but not exist that
-	directory.
-
-	* w3m-dtree.el (w3m-dtree-create): If 'path' is not a directory,
-	display warning message.
-
-2001-05-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-fontify): Initialize the value of
-	`w3m-cache-underline-faces'.
-	(w3m-toggle-inline-images): Remove or restore the underlined faces.
-	(w3m-cache-underline-faces): New buffer-local variable used to cache
-	the detached underlined faces from a buffer.
-
-	* w3m-xmas.el (w3m-insert-image): Detach an underlined face in
-	`w3m-cache-underline-faces'.
-	* w3m-e21.el (w3m-insert-image): Ditto.
-
-2001-05-15  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-toggle-inline-images): Restore hidden faces in the text
-	property `w3m-hidden-face'.
-
-	* w3m-xmas.el (w3m-setup-header-line): Don't inherit existing text
-	properties in a header line.
-
-	* w3m-xmas.el (w3m-insert-image): Hide a face in the text property
-	`w3m-hidden-face' if it is underlined, instead of the removing.
-	* w3m-e21.el (w3m-insert-image): Ditto.
-
-2001-05-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (top-level): Fixed argument of autoload for `w3m-dtree', and
-	added autoload for `w3m-about-dtree'.
-
-	* w3m-dtree.el (w3m-dtree): Fixed doc-string.
-
-2001-05-15  "Takayuki Nakagawa"  <tknakaga@kanagawa.hitachi.co.jp>
-
-	* w3m.el (w3m-goto-ftp-url): Use `file-directory-p' instead of file
-	name suffix to distinguish directories and files.
-	(w3m-time-parse-string (for buggy timezone.el)): Ignore errors occured
-	in `encode-time'.
-
-2001-05-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-dtree.el (top-level): Require `w3m' to suppress byte-compile
-	warnings.
-
-2001-05-15  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-view-this-url): Message if there is no link.
-	(w3m-cursor-anchor): Redefine as a macro for byte-optimization.
-	(w3m-action, w3m-image, w3m-anchor): Redefine as a macro using
-	`w3m-get-text-property-around'.
-	(w3m-get-text-property-around): New macro.
-
-2001-05-15  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-exec): Report a process exit status if an error has
-	occurred.
-	(w3m-download): Ditto.
-	(w3m-w3m-dump-source): Don't use `zerop' to check for a process exit
-	status.
-	(w3m-w3m-dump-head-source): Ditto.
-	(w3m-w3m-get-header): Ditto.
-	(w3m-exec-process): Made it to return t if succeeded otherwise nil, to
-	keep a process exit status in `w3m-process-exit-status'.
-	(w3m-process-exit-status): New variable.
-
-2001-05-15  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (TOP): Add autoload for w3m-dtree.
-	(w3m-url-to-file-name): If URL is started 'about://dtree', it convert
-	to local file. Change [A-z] to [A-Za-z].
-	(w3m-url-local-p): If URL is started 'about://dtree', it assume to
-	local file.
-	(w3m-prog-dtree): Delete variable.
-	(w3m-about-history-ignored-regexp): Delete constant.
-	(w3m-arrived-ignored-regexp): New constant.
-	(w3m-history-ignored-regexp): New constant.
-	(w3m-arrived-add): Use 'w3m-arrived-ignored-regexp' instead of
-	'w3m-about-history-ignored-regexp'.
-	(w3m-arrived-p): Ditto.
-	(w3m-parse-attributes): Change [A-z] to [A-Za-z].
-	(w3m-fontify): Ditto.
-	(w3m-external-view): Remove 'about://dtree' handling.
-	(w3m-about-history): Use 'w3m-history-ignored-regexp' instead of
-	'w3m-about-history-ignored-regexp'.
-	(w3m-about-db-history): Ditto.
-	(w3m-about-dtree): Move to 'w3m-dtree.el'.
-	(w3m-dtree): Ditto.
-
-	* w3m-dtree.el: New file.
-
-2001-05-11  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-cursor-anchor): New defsubst.
-	(w3m-fontify-anchors): Add 'w3m-cursor-anchor property for
-	w3m-goto-(next|previous)-anchor.
-	(w3m-goto-anchor-hist): New buffer local variable.
-	(w3m-goto-next-anchor): Use 'w3m-cursor-anchor property.
-	(w3m-goto-previous-anchor): Ditto.
-	(w3m-next-anchor): Don't stop divided anchor using
-	'w3m-goto-anchor-hist'.
-	(w3m-previous-anchor): Ditto.
-
-	* w3m-form.el (w3m-fontify-forms): Add 'w3m-cursor-anchor property for
-	w3m-goto-(next|previous)-anchor.
-
-2001-05-11  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-hist.el (w3m-history-copy): New implementation without recursive
-	funcall'ing using `w3m-history-tree'.
-	(w3m-history-tree): Allow the optional argument `newpos'.
-	(w3m-history-copy-1): Removed.
-
-	* w3m.el (w3m-gohome): New command.
-	(w3m-setup-menu): Use `w3m-menubar'.
-	(w3m-menubar): New constant.
-	(w3m-toolbar): Added "copy"; use `w3m-gohome'.
-	(w3m-toolbar-buttons): Added "copy".
-
-	* w3m-xmas.el (w3m-setup-menu): Moved menubar definition to w3m.el.
-
-	* icons/copy-up.xpm: New file.
-
-2001-05-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-antenna.el (w3m-antenna-last-modified): When specified URL is not
-	found, returns t.
-	(w3m-antenna-check-sites): When the checking site is not found, use old
-	record.
-	(w3m-about-antenna): Excess arguments are ignored.
-
-2001-05-10  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-insert-image): Remove `face' property from a text
-	behind an image.
-
-	* w3m-e21.el (w3m-remove-image): Use a regular plist in the arg of
-	`remove-text-properties'.
-	* w3m.el (w3m-toggle-inline-images): Ditto.
-
-2001-05-10  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-e21.el (w3m-insert-image): Remove `face' property from a text
-	behind an image.
-
-2001-05-10  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el:
-	(w3m-dump-head-source-option): New variable.
-	(w3m-decode-all-to-this-charset): Ditto.
-	(w3m-halfdump-option): Ditto.
-	(w3m-halfdump-expand-options): Ditto.
-	(w3m-edit-function): Ditto.
-	(w3m-prog-dtree): Ditto.
-	(w3m-halfdump-command-arguments): Remove "-halfdump".
-	(w3m-fontify): Display minibuffer messages.
-	(w3m-decode-buffer): Use w3m-decode-all-to-this-charset, when its
-	non-nil.
-	(w3m-local-retrieve): If file is directory, return 'nil'.
-	(w3m-w3m-dump-head-source): Use 'w3m-dump-head-source-option' instead
-	of "-dump_extra".
-	(w3m-rendering-region): Use 'w3m-halfdump-option',
-	'w3m-halfdump-command-arguments' and 'w3m-halfdump-expand-options',
-	when call-process.
-	(w3m-exec): Add no-cache option for w3m-dtree when call
-	w3m-external-view().
-	(w3m-external-view): Add no-cache option. If url is local directory,
-	call w3m-dtree().
-	(w3m-print-this-url): Expand output message.
-	(w3m-edit-current-url): Use 'w3m-edit-function' instead of find-file().
-	(w3m-edit-this-url): New function.
-	(w3m-goto-next-anchor): Input form support.
-	(w3m-goto-previous-anchor): Ditto.
-	(keymap): Add w3m-edit-current-url() and w3m-edit-this-url().
-	(w3m-mode): Modify doc-string for new functions.
-	(w3m-view-header): Modify doc-string.
-	(w3m-history): Add doc-string.
-	(w3m-about-dtree): New function.
-	(w3m-dtree): Ditto.
-
-2001-05-10  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-hist.el (w3m-history-flat): Don't funcall itself recursively.
-
-	* w3m.el (w3m-fontify-images): Only put text properties `w3m-image' and
-	`w3m-image-redundant' if there is a property `w3m-href-anchor'.
-
-2001-05-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-hist.el (w3m-history-tree): New function.
-
-
-2001-05-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Release emacs-w3m-1.0 from emacs-w3m-1_0 branch.
-
-2001-05-08  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-setup-menu): Don't set up menu if it has already been
-	available.
-
-	* w3m.el (w3m-setup-menu): Locate W3M menu in the forefront of the
-	menubar.
-	* w3m-xmas.el (w3m-setup-menu): Ditto.
-
-2001-05-08  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-mode): Modify doc-string for describe mode, again.
-
-2001-05-08  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-form.el (top-level): Modify string to 'iso-2022-7bit' for
-	set-auto-coding.
-	(w3m-form-make-get-string): Guard error in w3m-url-encode-string()
-	reported [emacs-w3m:00686].
-
-2001-05-07  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-about-history): Run `set-buffer-multibyte' after
-	`erase-buffer' is done.
-
-2001-05-07  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-w3m-retrieve): Fixed problem when no-cache is non-nil and
-	w3m-content-type returns nil.
-
-2001-05-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-search.el (top-level): Removed magic string to decide coding
-	system.
-
-	* w3m-xmas.el (top-level): Ditto.
-
-	* w3m-e21.el (top-level): Ditto.
-
-2001-05-07  Masatake YAMATO  <jet@gyve.org>
-
-	* w3m-xmas.el (w3m-setup-menu): Implemented.
-
-2001-05-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-w3m-attributes): Check validity of contents length, to
-	avoid the problem reported in [emacs-w3m:00682].
-
-2001-05-07  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-bookmark.el (w3m-bookmark-section-history): Revival.
-	(w3m-bookmark-title-history): Ditto.
-
-	* w3m.el (w3m-extended-characters-table): Add "\x90" entry.
-	(w3m-setup-menu): Move from w3m-e21.el.
-	(w3m-mode): Modify doc-string for describe mode.
-	(top-level): Add key-bind, w3m-antenna(), w3m-weather() and
-	w3m-search().
-	(w3m-about-history): Set w3m work buffer as multibyte.
-
-	* w3m-e21.el (w3m-setup-menu): Move to w3m.el.
-
-2001-05-03  Masatake YAMATO  <jet@gyve.org>
-
-	* w3m.el (w3m-mode): Call w3m-setup-menu.
-
-	* w3m-xmas.el (w3m-setup-menu): New stub.
-
-	* w3m-e21.el (w3m-setup-menu): New function.
-
-2001-04-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-about-history): Replace ">" with "&gt;".
-
-2001-04-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-about-history): New implementation without recursive
-	funcall'ing.
-	(w3m-about-history-1): Removed.
-
-2001-04-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-goto-ftp-url): Don't give a url string to the function
-	`file-name-nondirectory'.
-
-2001-04-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-about-history): Enhance the last link.
-	(w3m-arrived-p): Return non-nil when url matches
-	`w3m-about-history-ignored-regexp'.
-	(w3m-arrived-add): Don't put url into an arrived-db when url matches
-	`w3m-about-history-ignored-regexp'.
-	(w3m-about-history-ignored-regexp): Renamed from
-	`w3m-about-history-except-regex'.
-
-	* w3m-hist.el (w3m-history-restore-position): Instruct
-	`w3m-history-plist-get' to work with buffer-local properties.
-	(w3m-history-store-position): Instruct `w3m-history-add-properties' to
-	work with buffer-local properties.
-	(w3m-history-remove-properties): Allow the optional arg `local'.
-	(w3m-history-add-properties): Ditto.
-	(w3m-history-plist-put): Ditto.
-	(w3m-history-plist-get): Ditto.
-	(w3m-history-copy): Remove buffer-local properties.
-	(w3m-history-flat): Made it to have buffer-local properties.
-
-2001-04-24  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* mew-w3m.el (mew-mime-text/html-w3m): Support Mew 1.95b120 or later.
-
-2001-04-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-quit): Clear the echo area just after prompting.
-	(w3m-save-list): Format a list by itself instead of the use of pp.
-
-2001-04-24  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-0.2.1-mnc.patch: See [emacs-w3m:00629].
-
-2001-04-23  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-goto-url): Use `w3m-history-store-position' instead of
-	`w3m-arrived-store-position'.
-	(w3m-lynx-like-map): Bind `w3m-history-restore-position' instead of
-	`w3m-view-previous-point' for the key `C-c C-b'; new key `C-c C-SPC' to
-	bind the command `w3m-history-store-position'.
-	(w3m-view-previous-point): Removed.
-	(w3m-view-next-page): Use `w3m-history-restore-position' instead of
-	`w3m-arrived-restore-position'.
-	(w3m-view-previous-page): Ditto.
-	(w3m-arrived-restore-position): Removed.
-	(w3m-arrived-store-position): Removed.
-
-	* w3m-hist.el (w3m-history-add-arrived-db): Don't specify the 2nd arg
-	in `w3m-history-push'; specify the 2nd in `w3m-history-backward'.
-	(w3m-history-restore-position): New command.
-	(w3m-history-store-position): New command.
-	(w3m-history-plist-put): Use `w3m-history-modify-properties'.
-	(w3m-history-plist-get): Don't specify the 3rd arg in
-	`w3m-history-assoc'.
-	(w3m-history-push): Allow the optional arg `replace-props'; use
-	`w3m-history-modify-properties'.
-	(w3m-history-assoc): Allow the optional arg `replace-props'; always
-	modify the properties of a history element; use
-	`w3m-history-modify-properties'.
-	(w3m-history-backward): Allow the optional arg `set-current'; don't
-	modify the position pointer of `w3m-history' normally; use
-	`w3m-history-save-position'.
-	(w3m-history-forward): Ditto.
-	(w3m-history-with-element): Don't specify the 3rd arg in
-	`w3m-history-assoc'.
-	(w3m-history-modify-properties): New macro.
-	(w3m-history-save-position): New macro.
-
-2001-04-23  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-xmas.el (w3m-setup-header-line): Check `major-mode' to decide
-	whether header line should be set up.
-
-2001-04-23  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-linefeed-type): Change default value.
-
-	* w3m-0.2.1-mnc.patch: Define setmode(fileno(stdout), O_BINARY) if
-	win32 or OS/2. Define lrand48() and srand48() used if they don't have.
-
-2001-04-23  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-about-db-history): Set w3m work buffer as multibyte.
-
-2001-04-23  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-info-like-map): Changed key of `w3m-reload-this-page'.
-
-2001-04-20  Taiki SUGAWARA <taiki.s@cityfujisawa.ne.jp>
-
-	* w3m.el (w3m-expand-file-name-as-url): Use "file:///cygdrive/" instead
-	of "/cygdrive/" when `w3m-use-cygdrive' is non-nil.
-
-2001-04-20  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-hist.el (w3m-history-add-arrived-db): New command.
-
-	* w3m.el (w3m-db-history): New command.
-	(w3m-about-history, w3m-about-history-1): Don't deactivate "about://*"
-	links.
-	(w3m-exec): Share a url string between the variable `w3m-current-url'
-	and the history structure.
-	(w3m-toolbar, w3m-toolbar-buttons): Added history and db-history.
-
-	* icons/db-history-up.xpm: New file.
-	* icons/history-up.xpm: New file.
-
-2001-04-20  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-view-source): Don't execute if can't load its source.
-	(w3m-view-header): Don't execute if can't load its header. Toggle
-	html/header if execute twice.
-
-2001-04-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-goto-url): Use `set-text-properties' to remove all text
-	props from url string.
-	(w3m-exec): Use `add-text-properties' instead of `set-text-properties'.
-	(w3m-w3m-dump-source, w3m-w3m-dump-head-source): Removed not-used bound
-	variable `w3m-w3m-retrieve-length'.
-	(w3m-cache-request-contents): Removed not-used bound variables `type'
-	and `charset'.
-	(w3m-entity-value): Removed not-used bound variable `sym'.
-	(w3m-arrived-add): Use `w3m-arrived-add-1'; don't funcall itself
-	recursively to get rid of redundancy; don't use `set-text-properties'
-	here.
-	(w3m-arrived-add-1): New macro.
-
-	* w3mhack.el (XEmacs): Byte-optimize `set-text-properties' to make the
-	program run a little bit faster.
-
-2001-04-19  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-use-cygdrive): Change default value.
-	(w3m-linefeed-type): New customize variable.
-	(w3m-executable-type): Remove variable.
-	(w3m-crlf-to-lf): Use 'w3m-linefeed-type' instead of
-	'w3m-executable-type'.
-
-2001-04-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el: Byte-optimize `match-string-no-properties' not to use
-	`set-text-properties' under XEmacs.
-
-2001-04-19  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-setup-header-line): Check `major-mode' to decide whether
-	header line should be set up.
-
-	* mime-w3m.el (mime-w3m-use-header-line): Removed.
-	(mime-w3m-preview-text/html): Canceled last change.
-
-2001-04-18  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-mode-map): Initialize when source file is loaded.
-
-	* mime-w3m.el (mime-w3m-mode-map): Simplify.
-
-	* mew-w3m.el (TopLevel): Initialization code of `w3m-mode-map' is
-	removed.
-
-	* w3m.el, w3m-weather.el, w3m-filter.el, w3m-form.el: Change
-	coding-system.
-
-	* mime-w3m.el (mime-w3m-use-header-line): New user option.
-	(mime-w3m-preview-text/html): Refer `mime-w3m-use-header-line' to
-	control `w3m-use-header-line'.
-
-2001-04-18  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-hist: Made the history management system to keep properties of
-	each history element to be shared by all the w3m buffers.
-	(w3m-history-remove-properties): Share properties.
-	(w3m-history-add-properties): Ditto.
-	(w3m-history-plist-put): Ditto.
-	(w3m-history-copy, w3m-history-copy-1): Ditto.
-	(w3m-history-push): Ditto.
-	(w3m-history-assoc): Ditto.
-	(w3m-history-share-properties): New function.
-	(w3m-history-seek-properties): New function.
-
-	(w3m-history-rename-url): Allow the 4th arg `this-buffer'.
-	(w3m-history-with-element): Renamed from `w3m-history-with-elements';
-	bind only the variable `element' to have a history element of
-	`w3m-history-flat'.
-
-2001-04-18  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-setup-header-line): Don't execute the setup-header-line,
-	if w3m-current-url is 'nil'.
-
-	* w3m-xmas.el (w3m-setup-header-line): Ditto.
-
-2001-04-17  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-fontify-images): Use `match-string-no-properties' instead
-	of `buffer-substring-no-properties'.
-	(w3m-parse-attributes): Use `match-string-no-properties' instead of
-	`match-string' to remove text properties.
-
-	* w3m-xmas.el: Require `poe' for the function
-	`match-string-no-properties'.
-
-2001-04-17  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-setup-header-line): New function except for Emacs 21 nor
-	XEmacs.
-	(w3m-header-line-map): New variable except for Emacs 21 nor XEmacs.
-	(w3m-fontify-after-hook): Use it for emulating a header-line.
-	(w3m-header-line-location-content-face): New face except for Emacs 21.
-	(w3m-header-line-location-title-face): Ditto.
-	(w3m-use-header-line): Moved from w3m-e21.el.
-
-	* w3m-xmas.el (w3m-setup-header-line): New function.
-	(w3m-header-line-map): New variable.
-
-	* w3m-e21.el (w3m-use-header-line): Moved to w3m.el.
-
-2001-04-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* icons/parent-up.xpm: Reduced color depth.
-	* icons/parent-disabled.xpm: Renamed from parent-down.xpm.
-
-2001-04-16  Masatake YAMATO  <masata-y@gyve.aist-nara.ac.jp>
-
-	* w3m.el (w3m-toolbar): Added w3m-toolbar-parent-icon.
-	(w3m-toolbar-buttons): Added "parent".
-	(w3m-parent-page-available-p): New function.
-
-	* icons/parent-up.xpm: New file.
-	* icons/parent-down.xpm: New file.
-
-2001-04-16  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-about-history): Set w3m work buffer as multibyte.
-
-2001-04-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-about-history-1, w3m-about-history): Deactivate all
-	"about://*" links.
-
-2001-04-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-about-history-1): New internal function.
-	(w3m-about-history): Use it.
-
-2001-04-15  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-e21.el (w3m-header-line-location-title-face): New face.
-	(w3m-header-line-location-content-face): Ditto.
-	(w3m-use-header-line): New user option.
-	(w3m-setup-header-line): New function.
-	(w3m-mode-hook): Add `w3m-setup-header-line'.
-
-2001-04-13  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-about-history): Show a history tree (incompleted).
-	(w3m-exec): Put a title string into the history structure.
-
-2001-04-12  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-about-db-history): Change the format on display.
-
-2001-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-om.el (w3m-icon-directory): Define it as the constant nil to
-	avoid byte-compile warnings when compiling.
-	* w3m.el (w3m-icon-directory): Undo last change.
-
-2001-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-icon-directory): Hide the actual function name
-	`locate-data-directory' for old Emacsen to avoid byte-compile warnings.
-
-	* w3m-om.el (w3m-om-define-missing-widgets): New function.
-	(TopLevel): Use it for defining some missing widgets after the library
-	wid-edit is loaded.
-
-2001-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el (w3m-xmas-define-missing-widgets): New function.
-	(TopLevel): Use it for defining some missing widgets after the library
-	wid-edit is loaded.
-
-	* w3m.el (w3m-track-mouse): Added a description about balloon-help.
-	(w3m-make-balloon-help): New macro.
-	(w3m-fontify-anchors, w3m-fontify-images): Use it.
-
-2001-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-track-mouse): Default to t.
-	(w3m-make-help-echo): New macro.
-	(w3m-fontify-anchors, w3m-fontify-images): Use it.
-
-2001-04-12  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* mew-w3m.el (TopLevel): Set w3m-mode-map if not exec w3m-mode() yet.
-
-2001-04-11  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-fontify-images, w3m-fontify-anchors): Put a url string to
-	each anchor as a `help-echo' property when the value of
-	`w3m-track-mouse' is non-nil.
-	(w3m-track-mouse): New user option.
-
-2001-04-10  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-copy-buffer): Use `w3m-history-copy' to make copies of
-	`w3m-history' and `w3m-history-flat'.
-
-2001-04-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* mime-w3m.el (mime-w3m-mode-map): Refer `w3m-key-binding' to avoid the
-	problem reported in [emacs-w3m:00498].
-
-2001-04-10  Keisuke Nishida  <kxn30@po.cwru.edu>
-
-	* w3m-search.el (w3m-search): Find default using thing-at-point.
-
-2001-04-10  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-about-history): Use `w3m-history-flat' instead of
-	`w3m-url-history'.
-	(w3m-view-source): Don't bind `w3m-url-yrotsih' nor `w3m-url-history'.
-	(w3m-redisplay-with-coding-system): Don't treat `w3m-url-history'.
-	(w3m-reload-this-page): Ditto.
-	(w3m-view-next-page): Use `w3m-history-forward' instead of
-	`w3m-url-yrotsih'.
-	(w3m-view-previous-page): Use `w3m-history-backward' instead of
-	`w3m-url-history'.
-	(w3m-exec): Use `w3m-history-push' instead of `w3m-url-yrotsih' or
-	`w3m-url-history'.
-	(w3m-toolbar): Use `w3m-history-next-link-available-p' and
-	`w3m-history-previous-link-available-p'.
-	(w3m-url-yrotsih, w3m-url-history): Removed.
-	(TopLevel): Require `w3m-hist'.
-
-2001-04-09  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-info-like-map): Use `(shift iso-lefttab)' instead of
-	`S-iso-lefttab'.
-	(w3m-lynx-like-map): Ditto.
-
-	* w3mhack.el (w3mhack-make-package): Add shimbun modules in
-	MANIFEST.w3m file.
-	(w3mhack-examine-modules): Look for the library "mime-def" instead of
-	"mime" to check whether FLIM has been installed or not.
-	* Makefile.in (install): Install shimbun modules as well.
-	(install-icons): Show subdirectory name.
-
-2001-04-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-key-binding): New user option.
-	(w3m-lynx-like-map, w3m-info-like-map): New keymaps.
-	(w3m): Refer w3m-key-binding, to decide whether keymap is used.
-
-2001-04-06  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-edit-current-url): New command.
-	(w3m-mode-map): `w3m-edit-current-url' is registered.
-	(w3m-save-this-url): Removed.
-	(w3m-decode-encoded-buffer): Use `w3m-which-command' in order to find
-	appropriate command in Windows.
-
-2001-04-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Makefile.in (default): Depends `Makefile'.
-	(Makefile): Removed `--recheck' option in order to re-create itself
-	when `Makefile.in' or `config.status' is updated.
-
-2001-04-05  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (top): Define w3m-read-coding-system().
-	(w3m-content-type-alist): Change "fiber" to "fiber.exe".
-	(w3m-quit): Remove hook if no w3m exist.
-	(w3m-arrived-add): Add 'coding-system entry.
-	(w3m-arrived-coding-system): New function.
-	(w3m-arrived-setup): Handle 'coding-system entry.
-	(w3m-arrived-shutdown): Ditto.
-	(w3m-goto-url): Handle specified coding-system.
-	(w3m-redisplay-with-coding-system): Use w3m-read-coding-system.  If no
-	coding-system specify, set 'reset.
-
-	* w3m-om.el (w3m-read-coding-system): New function.
-
-2001-04-04  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-w3m-retrieve): Add 'cs(coding-system)' option.
-	(w3m-retrieve): Ditto.
-	(w3m-exec): Ditto.
-	(w3m-goto-url): Ditto.
-	(w3m-decode-buffer): Ditto. If 'cs' specify, decoding use it.
-	(w3m-mode-map): Add w3m-redisplay-with-coding-system() at "C".
-	(w3m-mode): Change doc string.
-	(w3m-redisplay-with-coding-system): New function.
-
-2001-04-04  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-w3m-attributes): When content type has trailing
-	semicolon, make it removed.
-
-	* w3mhack.el (load-path): Add `shimbun' sub-directory.
-
-2001-04-04  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* Makefile.in (clean): Remove shimbun modules.
-
-	* w3mhack.el (shimbun-module-directory): New constant.
-	(w3mhack-examine-modules): Add shimbun modules if mime is installed.
-
-	* w3m.el (w3m-decode-entities): New function.
-	(w3m-fontify): Use it.
-
-2001-04-04  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-print-this-url): New optional argument `add-kill-ring' is
-	added.
-
-2001-04-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-filter.el: New file.
-
-	* w3m-antenna.el (w3m-antenna-size): Refer decoded buffer as size.
-
-	* w3m.el (TopLevel): Add autoload code of `w3m-filter'.
-	(w3m-use-filter): New user option.
-	(w3m-retrieve): Call `w3m-filter' when decode.
-
-2001-04-03  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-force-redisplay): New variable, default is 't'.
-	(w3m-toggle-inline-images): If w3m-force-redisplay is nil, don't
-	redraw.
-	(w3m-goto-url): Ditto.
-	(w3m-region): Ditto.
-
-	* mew-w3m.el (mew-mime-text/html-w3m): Bind w3m-force-redisplay to
-	'nil'.
-	(w3m-mew-support-cid): New variable.
-	(mew-w3m-cid-retrieve): Use mew-syntax-get-entry-by-cid(), Tnx, Kazu
-	Yamamoto <kazu@mew.org>.
-
-2001-04-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-process-message): Removed.
-	(w3m-exec-process): Clean up.
-	(w3m-w3m-dump-head-source): Removed code which refers
-	`w3m-process-message'.
-	(w3m-w3m-dump-source): Ditto.
-	(w3m-parse-attributes): Remove leading and trailing white space in
-	CDATA attribute values.
-
-2001-04-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-hist.el (w3m-history-copy): Make a copy of `w3m-history-flat'
-	using `w3m-history-flat' instead of `w3m-history-copy-1'.
-
-2001-04-02  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Makefile.in (DISTS): Removed `Makefile'.
-
-2001-04-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-hist.el (w3m-history-backward, w3m-history-forward): Simplified.
-
-2001-04-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-hist.el (w3m-history-backward, w3m-history-forward): Allow the
-	optional argument `count'.
-	(w3m-history-backward-1, w3m-history-forward-1): New macros.
-
-2001-04-02  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-0.2.1-mnc.patch: Apply patch posted in [w3m-dev 01887].
-
-	* w3m.el (w3m-w3m-dump-head-source): Follow change in MNC patch.
-	(w3m-w3m-attributes): Ditto.
-
-2001-04-02  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-crlf-to-lf): New function.
-	(w3m-w3m-dump-head-source): Do crlf-to-lf when executable-type eq
-	'cygwin.
-	(w3m-w3m-dump-source): All time do crlf-to-lf function when
-	executable-type eq 'cygwin.
-
-2001-04-02  Taiki SUGAWARA <taiki.s@cityfujisawa.ne.jp>
-
-	* w3m.el (w3m-exec-process): Guard the process from some errors.
-	(w3m-copy-buffer): Restore view point with new window to the point in
-	original window.
-
-2001-04-02  Hiroya Murata  <hiroya@use-ebisu.co.jp>
-
-	* Makefile.in (Makefile): Depends on config.status instead of
-	configure.
-	(config.status): New rule.
-
-2001-04-01  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* aclocal.m4 (AC_PATH_ICONDIR): Quote "$(data-directory)" in help-
-	string.
-
-2001-04-02  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-html-string-regexp): Make no exception of back-quote.
-	(w3m-parse-attributes): Follow up above change.
-
-2001-03-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-home-page): Default value is changed.
-	(w3m-html-string-regexp): Support single quoted string.
-	(w3m-parse-attributes): Import from w3m-form.el.
-	(w3m-fontify-anchors): Fix bug reported in [emacs-w3m:00400].
-	(w3m-external-view): Fix.
-	(w3m-goto-url): Default argument is changed when it is interactively
-	called.
-	(w3m-browse-url): Fix.
-	(w3m-about): Update.
-	(w3m-about-history-except-regex): Add `about:'.
-
-	* w3m-form.el: (w3m-parse-attributes): Exported.
-
-	* mime-w3m.el (mime-w3m-save-background-color): Changed
-	`edebug-form-spec'.
-
-	* Makefile.in (dist): Improved.
-	(Makefile, configure): New rules.
-	(ECC, MODULES): Removed macros.
-
-2001-03-30  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-hist.el (w3m-history-with-elements): New macro.
-	(w3m-history-rename-url): Use it.
-	(w3m-history-remove-properties): Use it.
-	(w3m-history-add-properties): Use it.
-	(w3m-history-plist-put): Use it.
-
-2001-03-30  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-hist.el (w3m-history-rename-url): New function.
-	(w3m-history-remove-properties): New function.
-	(w3m-history-add-properties): New function.
-	(w3m-history-plist-put): New function.
-	(w3m-history-plist-get): New function.
-	(w3m-history-assoc): Return a history element of `w3m-history-flat'
-	instead of `w3m-history'.
-
-2001-03-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-w3m-attributes): Fixed spec of return value when response
-	code is greater than 500.
-
-2001-03-29  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Fix bugs in caching deflated contents.
-	(w3m-attributes): Fixed spec of return value when `about:' is
-	specified.
-	(w3m-cache-available-p): Removed.
-	(w3m-w3m-dump-head-source): Reconstructed.
-	(w3m-w3m-dump-source): New function.
-	(w3m-w3m-retrieve): Use `w3m-w3m-dump-head-source' or
-	`w3m-w3m-dump-source'.
-	(w3m-real-url): Fix side effect of macro expansion.
-
-	* w3m-0.2.1-mnc.patch: New file.
-
-2001-03-29  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* Makefile.in (default): Replace with `fast'.
-	(install): Undo the last change.
-	(.el.elc, .SUFFIXES, install-anyway): Removed.
-	(fast-install-package, fast-install, fast): Removed.
-
-	* w3m-hist.el (w3m-hist): Provide as a feature.
-	(w3m-history-copy, w3m-history-copy-1): New functions.
-	(w3m-history-push): Handle the variable `w3m-history-flat' as well as
-	`w3m-history'.
-	(w3m-history-assoc): Ditto.
-	(w3m-history-flat function): Set the value of the variable
-	`w3m-history-flat'.
-	(w3m-history-flat variable): New buffer-local variable.
-	(The whole module): Replace the term ATTRIBUTES with PROPERTIES;
-	replace the symbol name of the variable `w3m-url-history' with
-	`w3m-history'.
-
-2001-03-29  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-real-url): Return original url when real url is nil.
-
-	* w3m-antenna.el (w3m-antenna-sites): Add 'time' type.
-	(w3m-antenna-alist): Modify comment.
-	(w3m-antenna-hns-last-modified): Don't use old 'Last-Modified:' format.
-	(w3m-antenna-last-modified): Use w3m-last-modified() when can not get
-	'diary/di.cgi'.
-	(w3m-antenna-check-sites): Push current-time() if (nth 6 pre) is nil.
-
-2001-03-29  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Support deflated contents and redirected URLs.
-	(w3m-decoder-alist, w3m-mnc): New variable.
-	(w3m-encoding-alist): New constant.
-	(w3m-attributes, w3m-w3m-attributes, w3m-local-attributes): Spec of
-	return value is changed.
-	(w3m-content-charset, w3m-content-encoding, w3m-real-url): New macro.
-	(w3m-cache-available-p): New function.
-	(w3m-decode-encoded-buffer): Ditto.
-	(w3m-decode-buffer): Changed arguments spec.  Call
-	`w3m-decode-encoded-buffer' to process encoded contents.
-	(w3m-w3m-dump-head-source): New function.
-	(w3m-w3m-retrieve): Call `w3m-w3m-dump-head-source' when `w3m-mnc' is
-	non-nil value.  Follow change of `w3m-decode-buffer'.
-	(w3m-exec): Call `w3m-real-url' to process redirected URLs.
-	(w3m-sub-list): When N is nil, no elements in LIST should be deleted.
-	(w3m-save-list): Preserve file permission when file is overwritten.
-
-2001-03-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-compile): New function.
-
-	* Makefile.in (fast-install-package, fast-install, fast): New rules.
-	(install-package): Make it to be more talkative.
-	(install-anyway): New rule separated from `install'.
-	(install): Use `install-anyway'.
-
-	* w3m-hist.el (w3m-history-push): Rewrite for following the change of
-	`w3m-url-history'.
-	(w3m-history-assoc): Ditto.
-	(w3m-history-backward): Ditto.
-	(w3m-history-forward): Ditto.
-	(w3m-history-current): Ditto.
-	(w3m-history-current-1): New macro.
-	(w3m-history-next-link-available-p): New function.
-	(w3m-history-previous-link-available-p): New function.
-	(w3m-url-history): Make it to have the previous and the next position
-	pointers.
-
-2001-03-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-hist.el (w3m-history-push): New function.
-
-2001-03-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-hist.el (w3m-url-history): Define it here.
-	(w3m-history-assoc, w3m-history-flat, w3m-history-backward): New
-	functions.
-
-2001-03-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-hist.el (w3m-history-forward): New function.
-
-2001-03-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-goto-url): Put cursor at the top of minibuffer.
-
-2001-03-23  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-w3m-attributes): Don't check "OK" string in Status-Line.
-
-2001-03-23  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-time-parse-string the 2nd): Don't funcall
-	`parse-time-string' directly for avoiding compile warning.
-
-	* w3m-hist.el (w3m-history-current): New function.
-
-2001-03-23  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-hist.el: New file.
-
-2001-03-23  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-time-parse-string): Fix condition to detect timezone.el
-	includes bug.
-
-	* w3m-time.el: Removed.
-
-	* w3m.el (TopLevel): Require `timezone' instead of `w3m-time'.
-	(w3m-time-parse-string): Use `timezone-fix-time' and spec of return
-	value is changed.
-	(w3m-time-newer-p): Imported.
-
-	* w3m-antenna.el (w3m-antenna-hns-last-modified): Follow change of
-	`w3m-time-parse-string'.
-
-2001-03-23  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* README, README.ja: Update for w3m-0.2.1.
-
-	* Makefile.in (dist, tarball): Fix that some files are not included in
-	package.
-
-2001-03-22  Keisuke Nishida  <kxn30@po.cwru.edu>
-
-	* w3m.el (w3m-goto-url): Insert the current url for input by default.
-
-2001-03-22  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-xmas.el (w3m-update-toolbar): New function.
-	(w3m-setup-toolbar): Added docstring.
-
-	* w3m.el (w3m-goto-url): Call `w3m-update-toolbar'.
-	(toplevel): Define `w3m-update-toolbar' if it is not bound as function.
-
-2001-03-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-w3m-attributes): Ignore errors while parsing a
-	time-string.
-
-2001-03-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el: Moved generic macros and defsubsts in front of functions.
-	(w3m-content-encoding, w3m-content-charset): Commented out.
-	* w3m-form.el (w3m-parse-attributes): Moved from w3m.el.
-
-2001-03-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el: Make `w3m-fontify-forms' and `w3m-form-parse-region' to be
-	always autoloaded; encolose the defining procedures for the unbound
-	functions with `eval-and-compile'.
-	(browse-url-interactive-arg): Bind it only at the compile-time as an
-	autoload'ed function.
-	* w3m-xmas.el: Provide `w3m-xmas' and then require `w3m'.
-	* w3m-om.el: Provide `w3m-om' and then require `w3m'.
-	* w3m-form.el: Require `w3m'.
-	* w3m-e21.el: Provide `w3m-e21' and then require `w3m'.
-
-2001-03-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-antenna.el: All occurrence of `natsumikan' is replaced with
-	`natsumican'.
-
-2001-03-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (coding-system-category): Don't define it for the Emacs
-	variants.
-	* w3m-om.el (coding-system-category): Defalias to `get-code-mnemonic'.
-	* w3m-xmas.el (coding-system-category): Defalias to
-	`coding-system-type' if it is not bound.
-
-	* w3mhack.el (w3mhack-version): Don't require `w3m' in the top level,
-	do it here instead.
-
-2001-03-22  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-save-list): Use 'pp' if have pp().  Bind 'print-length'
-	and 'print-level' to nil.
-
-2001-03-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Structure of hash database of arrived urls is changed.
-	(w3m-arrived-setup): Follow change of DB structure.
-	(w3m-arrived-shutdown): Likewise.
-	(w3m-arrived-add): Likewise, and argument spec is changed.
-	(w3m-arrived-time): New function.
-	(w3m-arrived-seq, w3m-arrived-put-title, w3m-arrived-arrived-time,
-	w3m-arrived-put-arrived-time): Removed.
-	(w3m-goto-url): Follow change of `w3m-arrived-add'.
-
-2001-03-22  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-goto-url): Refresh the visibility of toolbar when XEmacs
-	is running.
-
-2001-03-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-url-to-file-name): Fix bug reported in [emacs-w3m:00305].
-	(w3m-goto-url): Set the value interpreted as a directory to
-	`default-directory'.
-
-2001-03-21  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-about-db-history): Use w3m-arrived-arrived-time().
-	(w3m-goto-url): Put arrived time to w3m-arrived-db.
-	(w3m-arrived-shutdown): Handling 'arrived-time in w3m-arrived-db.
-	(w3m-arrived-setup): Ditto.
-	(w3m-arrived-put-title): New function.
-	(w3m-arrived-arrived-time): Ditto.
-
-2001-03-21  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-arrived-shutdown): Check sites which are arrived on the
-	other emacs process.
-
-2001-03-21  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-input-url): 'nil' don't add candidates.
-
-2001-03-21  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-antenna.el (w3m-antenna-make-summary-function): Default value is
-	changed.
-	(w3m-antenna-make-summary-like-natsumikan): New function.
-
-	* w3m.el (w3m-about-db-history-sort-time): Removed.
-	(w3m-about-db-history): Use `w3m-time-newer-p' instead of
-	`w3m-about-db-history-sort-time'.
-
-2001-03-20  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-about-history-except-regex): New constant.
-	(w3m-about-db-history): New function.
-	(w3m-about-db-history-sort-time): Ditto.
-	(w3m-about-history): If 'titile' is '<no-title>', show 'URL' instead of
-	'title'. Use w3m-about-history-except-regex.
-	(w3m-history): If exec with 'C-u', goto 'about://db-history/'.
-	(w3m-w3m-attributes): Adhoc implementation when server return 'HTTP/1.x
-	500x'.
-
-2001-03-19  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Format of arrived URL database is changed in order to store
-	page's title.
-	(w3m-arrived-title, w3m-arrived-put-title): New function.
-	(w3m-arrived-setup, w3m-arrived-shutdown): Follow format change.
-	(w3m-about-history): Use page's title to make history contents.
-
-2001-03-19  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-url-to-file-name): Fix 'file:///c/xxxx' format in
-	Windows.
-	(w3m-expand-file-name-as-url): Use 'file:///c|/xxxx' format if
-	non-cygwin Windows.
-	(w3m-about-history): Uniq history. Insert exposition of html.
-
-2001-03-19  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-url-to-file-name): Fix (Cf. RFC-1808).
-	(w3m-expand-file-name-as-url): Ditto.
-	(w3m-url-local-p): New function.
-	(w3m-goto-url): Set `default-directory' when URL points a local file.
-	(w3m-find-file): Use `w3m-goto-url'.
-	(w3m-w32-browser-with-fiber): Use `w3m-url-to-file-name'.
-
-2001-03-19  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-make-package): Fixed entries of autoloads and
-	cus-load, and added ChangeLog in the file MANIFEST.w3m.
-
-	* aclocal.m4 (AC_CHECK_EMACS): Added the option `--with-xemacs'.
-
-2001-03-19  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-download): Bind `file-coding-system' to binary.
-	(w3m-content-type-alist): Fix.
-
-2001-03-18  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-antenna.el (w3m-antenna): Optional argument, `no-cache' is added.
-
-2001-03-18  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-goto-url): Switch to buffer of w3m, certainty.
-	(w3m): Ditto.
-
-2001-03-17  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-halfdump-command-arguments): Rename from
-	'w3m-command-arguments'.
-	(w3m-command-arguments): New customize variable.
-	(w3m-exec-process): Add w3m-command-arguments to args when w3m execute.
-	(w3m-rendering-region): Use w3m-halfdump-command-arguments when w3m
-	execute.
-	(w3m-fontify-anchors): Put w3m-name-anchor certainty.
-
-2001-03-17  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-antenna.el: Changed antenna database format.
-	(w3m-antenna-site-key, w3m-antenna-site-title, w3m-antenna-site-class,
-	w3m-antenna-site-url, w3m-antenna-site-last-modified,
-	w3m-antenna-site-size, w3m-antenna-site-size-detected): New macros.
-	(w3m-antenna-setup): Follow change of database format.
-	(w3m-antenna-check-sites): New function.
-	(w3m-antenna-make-summary, w3m-antenna-sort-sites-by-time,
-	w3m-antenna-sort-sites-by-title): Use macros to refer database.
-	(w3m-about-antenna): Use w3m-antenna-check-sites.
-
-	* w3m.el (w3m-about-history): Don't print "about://antenna/".
-
-2001-03-17  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* icons/antenna-up.xpm: New file.
-
-	* w3m.el (w3m-toolbar-buttons): Added "antenna".
-	(w3m-toolbar): Ditto; Fixed behavior of `home'.
-
-2001-03-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el, w3m-antenna.el: Fix typo.
-
-2001-03-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-make-package): Remove autoloads and cus-load
-	files before generating.
-
-	* w3m.el (w3m): Added autoload cookie.
-	(w3m-icon-directory): Attempt to set the default value using the way of
-	Wanderlust.
-
-2001-03-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* README: Update for `install-package' and `install-icons'.
-	* README.ja: Ditto.
-
-	* w3mhack.el (w3mhack-make-package): New function.
-	(w3mhack-examine-modules): Ignore auto-save files.
-
-	* mkinstalldirs: New file.
-
-	* configure.in: Call `AC_PATH_PACKAGEDIR'.
-
-	* aclocal.m4 (AC_PATH_PACKAGEDIR): New function.
-	(AC_EXAMINE_PACKAGEDIR): New function.
-	(AC_CHECK_EMACS_FLAVOR): Merged into `AC_CHECK_EMACS'.
-
-	* Makefile.in (install-package): New rule.
-	(install-icons, install): Exec mkinstalldirs.
-	(SHELL, PACKAGEDIR): New variable.
-
-2001-03-16  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-goto-url): Force switch to '*w3m*' buffer.
-	(w3m-view-source): Don't add current-url to w3m-url-history|yrotsih.
-
-	* mew-w3m.el (mew-w3m-cid-retrieve): Change mime-part handling.
-
-2001-03-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m-antenna.el (w3m-antenna-sort-function): Removed.
-	(w3m-antenna-sort-changed-sites-function): New variable.
-	(w3m-antenna-sort-unchanged-sites-function): Ditto.
-	(w3m-antenna-sort-sites-by-time): Refer time, when size modification
-	detected.
-	(w3m-about-antenna): Use new variables.
-
-2001-03-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-time.el (w3m-time-rules): Don't use backquote.
-	(w3m-time-zoneinfo): Ditto.
-	(w3m-time-parse-integer): Ditto.
-
-2001-03-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (TopLevel): Require `w3m-time'.
-	(w3m-w3m-attributes): Use `w3m-time-parse-string' instead of
-	`parse-time-string'.
-
-	* w3m-time.el: Import parse-time.el of T-gnus and rename it.
-
-	* w3m-antenna.el: Use `w3m-time-parse-string' instead of
-	`parse-time-string'.
-
-2001-03-16  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m-e21.el (w3m-create-image): Changed arguments spec, that
-	`accept-type-regexp' is removed.
-
-	* w3m-xmas.el (w3m-create-image): Ditto.
-
-2001-03-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Arrived URL database format is changed and code to get
-	headers and to retrieve contents is cleaned up.
-	(w3m-attributes, w3m-local-attributes): New function.
-	(w3m-w3m-attributes): Old name is `w3m-w3m-check-header'.
-	(w3m-content-type): Use `w3m-attributes'.
-	(w3m-content-charset, w3m-content-length, w3m-content-encoding,
-	w3m-last-modified): New macro.
-	(w3m-retrieve, w3m-local-retrieve): Changed arguments spec, that
-	`accept-type-regexp' is removed.
-	(w3m-w3m-retrieve): Likewise and call `w3m-w3m-attributes' instead of
-	`w3m-w3m-check-header'.
-	(w3m-exec): Follow change of arguments spec of `w3m-retrieve'.
-	(w3m-about-source, w3m-about-header): Changed arguments spec that
-	`accept-type-regexp' is removed and follow change of arguments spec of
-	w3m-retrieve.
-	(w3m-arrived-last-modified): New function.
-	(w3m-arrived-add): Support optional argument `time' and follow change
-	of database format.
-	(w3m-arrived-setup, w3m-arrived-shutdown, w3m-arrived-store-position,
-	w3m-arrived-restore-position): Follow change of database format.
-	(w3m-with-work-buffer, w3m-parse-attributes): Changed
-	`edebug-form-spec', see [emacs-w3m:00238].
-	(TopLevel): Add autoload codes for `w3m-antenna.el'.
-
-	* w3m-antenna.el: New file.
-
-	* mime-w3m.el (mime-w3m-cid-retrieve): Changed arguments spec, that
-	`accept-type-regexp' is removed.
-
-	* mew-w3m.el (mew-w3m-cid-retrieve): Ditto.
-
-2001-03-16  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* Makefile.in (install-icons): New rule.
-	(ICONDIR): New variable.
-
-	* aclocal.m4 (AC_PATH_ICONDIR): New function.
-	* configure.in: Call it.
-
-2001-03-16  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* icons: New directory (Some toolbar icons are contained).
-
-2001-03-16  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-view-source): Render as html if already display source.
-
-2001-03-15  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-icon-directory): New variable.
-	(w3m-toolbar-buttons): New constant.
-	(w3m-toolbar): Ditto.
-	(w3m-setup-toolbar): Define as null function.
-	(w3m-mode): Call `w3m-setup-toolbar'.
-
-	* w3m-xmas.el (w3m-use-toolbar): New variable.
-	(w3m-xmas-make-toolbar-buttons): New function.
-	(w3m-setup-toolbar): Ditto.
-
-	* w3m-e21.el (w3m-use-toolbar): New variable.
-	(w3m-e21-toolbar-configurations): Ditto.
-	(w3m-e21-setup-toolbar): New function.
-	(w3m-e21-make-toolbar-buttons): Ditto.
-	(w3m-setup-toolbar): Ditto.
-
-2001-03-15  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (XEmacs): Implemented the source level optimizer for `let'
-	or `let*' form to remove some obsolete variables.
-
-2001-03-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* README, README.ja: Update procedure of package installation.
-
-	* w3m.el (w3m-hook): Removed.
-	(w3m-goto-mailto-url): Old name is `w3m-mailto-url'.
-	(w3m-goto-ftp-url): Old name is `w3m-exec-ftp'.
-	(w3m-convert-ftp-url-for-emacsen): Old name is
-	`w3m-convert-ftp-to-emacsen'.
-	(w3m-exec): Removed code for ftp protocol.
-	(w3m-alive-p): Change spec of return value when w3m is alive.
-	(w3m-goto-url): Made this function safe when it is called at the buffer
-	whose major mode is not equal to w3m-mode.
-	(w3m): If it is interactively called when w3m is alive, it is simply
-	select the appropriate buffer in the current window without asking url.
-	(w3m-view-parent-page, w3m-browse-url, w3m-view-source, w3m-history):
-	Use `w3m-goto-url' instead of `w3m'.
-	(w3m-mode-map): Replace `w3m' with `w3m-goto-url'.
-
-2001-03-15  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (MULE): Make `locate-library' run quietly; bind
-	defcustom'ed variables at compile-time; require `w3m' after
-	byte-optimizations are done.
-
-	* w3m.el (w3m-static-cond): New macro; use it for defining
-	`find-coding-system'.
-	(w3m-url-encode-string): Use `append' instead of `string-to-list' to
-	coerce a string to a list of chars.
-	(w3m-entity-regexp): Don't funcall `regexp-opt' directly for avoiding
-	compile warning.
-
-2001-03-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-exec-process): Add `delete-process' to clean up resources
-	of child process.
-
-2001-03-15  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* Makefile.in (default): Report errors if it has occurred while
-	examining modules.
-
-	* w3m.el: Add autoload for `w3m-remove-image' when compiling.
-	(w3m-charset-coding-system-alist): Use `coding-system-p' if the
-	function `find-coding-system' is not bound.
-
-	* w3mhack.el: Use `require' instead of `load' for loading "w3m" to
-	avoid undesirable newlines in stdout.
-
-2001-03-15  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-xmas.el: Require `wid-edit' when the widget `coding-system' is
-	not available.
-
-	* mime-w3m.el: Add autoload for `font-set-face-background' since it is
-	not auto-autoload'ed in XEmacs.
-
-	* w3mhack.el: Require `bytecomp'; make XEmacs don't warn for unused
-	non-global variables.
-
-2001-03-15  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el: Bind colon keywords only if it is not available.
-	(rfc2368-parse-mailto-url):
-	(w3m-form-parse-region):
-	(w3m-fontify-forms): Bind them only at the compile-time as autoload'ed
-	functions to avoid byte-compile warnings.
-
-	* w3mhack.el: Byte optimize `truncate-string' for replacing with
-	`truncate-string-to-width' if it is bound.
-
-	* mew-w3m.el (mew-w3m-minor-mode-setter): Defun it after defining some
-	variables.
-
-2001-03-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Makefile.in (default): Add `-k' option to continue byte-compile as
-	much as possible after an error.
-
-2001-03-15  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* Makefile.in (default): Don't use `for' loop.
-	* w3mhack.el (w3mhack-examine-modules): Use space instead of newline
-	for the module names separator.
-
-2001-03-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Removed functions and variables of bookmark.
-	* w3m-bookmark.el: New file.
-	* Makefile.in: Clean up rules and removed GNU-make depended functions.
-	* w3mhack.el (TopLevel): Load w3m.el.
-	(w3mhack-version): New function.
-	* .cvsignore: Add files generated by autoconf.
-
-2001-03-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3mhack.el (w3mhack-examine-modules): Renamed from
-	`w3mhack-examine-additional-modules'.
-	* Makefile.in: Ditto.
-
-2001-03-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* Makefile.in, aclocal.m4, configure.in, install-sh, w3mhack.el: New
-	files.
-	* Makefile: Removed.
-
-2001-03-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Split file.
-
-	* w3m-form.el: New file.
-
-2001-03-14  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m-xmas.el (w3m-insert-image): Don't use current cursor point to
-	make a new extent.
-
-	* w3m.el (w3m-region): Call `sit-for' to redisplay before image
-	display.
-	(w3m-goto-url): Ditto.
-	(w3m-exec-process): Use `sleep-for' instead of `sit-for'.
-	(w3m-toggle-inline-images): Set cursor point before image insertion.
-	(w3m-goto-url): Set cursor point before redisplay.
-
-2001-03-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-read-passwd): Removed.
-	(w3m-exec-filter): Use `read-passwd' instead of `w3m-read-passwd'.
-
-	* w3m-om.el (read-passwd): Added.
-
-2001-03-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m-om.el: Rewrite to insert "-" into the name of eol-type variants
-	of each newly generated coding-system.
-
-2001-03-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Split files.
-	(w3m-coding-system): Changed customize type.
-	(w3m-input-coding-system): Ditto.
-	(w3m-output-coding-system): Ditto.
-	(w3m-bookmark-file-coding-system): Ditto.
-	(w3m-url-encode-string): Removed redundant code for Mule-2.
-
-	* w3m-e21.el: New file.
-
-	* w3m-xmas.el: New file.
-
-	* w3m-om.el: New file.
-
-	* w3m-search.el (w3m-search-default-coding-system): Changed customize
-	type.
-	(w3m-search-engine-alist): Ditto.
-
-	* w3m-weather.el: Fix comments.
-
-2001-03-13  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el: Use the copy of info-vector for newly generated coding-
-	systems; use `eval-when-compile' separately from "cl" for loading
-	"cl-macs".
-
-2001-03-13  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Split files.
-	* w3m-search.el: New file.
-	* w3m-weather.el: New file.
-
-2001-03-13  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* w3m.el (w3m-rendering-region): Make no exceptions of Mule 2 in
-	coding-systems.
-	(w3m-download): Ditto.
-	(w3m-local-retrieve): Ditto.
-	(w3m-exec-process): Ditto.
-	(w3m-arrived-file-coding-system): Unified the default value to
-	`euc-japan'.
-	(w3m-bookmark-file-coding-system): Ditto.
-	(w3m-default-url-coding-system): Ditto.
-	(w3m-output-coding-system): Ditto.
-	(w3m-coding-system): Ditto.
-	(w3m-input-coding-system): Unified the default value to `iso-2022-jp'.
-	(TopLevel): Generate some coding-systems by copying for Mule 2.
-	(TopLevel): Load "cl-macs" if the macro `dolist' has been defined
-	incorrectly.
-
-2001-03-13  Masatake YAMATO  <jet@gyve.org>
-
-	* w3m.el (w3m-url-yrotsih): New variable.
-	(w3m-view-previous-page): Set w3m-url-yrotsih.  Use while/cdr instead
-	of nthcdr.
-	(w3m-view-next-page): New function.
-	(w3m-mode-map): Bind w3m-view-next-page.
-	(w3m-mode): Added w3m-view-next-page and w3m-view-parent-page to the
-	function document.
-	(w3m-reload-this-page): Guard w3m-url-yrotsih from resetting.
-	(w3m-exec): Reset yrotsih.
-
-2001-03-13  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-content-type-alist): [UNIX] Change method for text/html
-	type.
-
-2001-03-13  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>,
-	    TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Require `poem' when Mule 2.3 is running.  Bind keywods
-	`:case-ignore' and `:integer' for Mule 2.3.
-	(coding-system-category): New alias when Mule 2.3 is running.
-	(w3m-arrived-file-coding-system): Fix typo.
-	(w3m-entity-alist): Fix for Mule 2.3.
-	(w3m-form-method, w3m-form-action, w3m-form-plist, w3m-form-put,
-	w3m-form-get): Convert to old style of macro definition.
-	(w3m-fontify): Removed code to decode w3m-specific characters.
-	(w3m-decode-extended-characters): New function.
-	(w3m-rendering-region): Use an unibyte temporary buffer and call
-	`w3m-decode-extended-characters'.
-
-2001-03-13  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-exec-process): Return process exit status.
-	(w3m-w3m-get-header): Check the return value of w3m-exec-process.
-	(w3m-w3m-check-header): Check the return value of w3m-w3m-get-header.
-
-2001-03-13  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-exec-process): Check exit status and cause an error if it
-	is not zero.
-
-2001-03-12  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-executable-type): Use (eq system-type 'windows-nt) for
-	determination of win32.
-	(w3m-content-type-alist): Ditto.
-
-2001-03-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-which-command): Support executable suffix, `.exe' for
-	win32.
-
-2001-03-12  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-content-type-alist): Add 'use fiber.exe' alist for
-	Windows.
-	(w3m-w32-browser-with-fiber): New funciton.
-
-2001-03-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-which-command): New function.
-	(w3m-external-view): When no viewing method is defined, call
-	`w3m-download' as alternative method.  Added check which command exists
-	with `w3m-which-command'.
-
-2001-03-12  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-display-inline-image-status): Define as buffer local
-	variable.
-	(w3m-image-type): New function.
-	(w3m-image-type-available-p): Ditto.
-	(w3m-create-image): Check image type by `w3m-image-type-available-p'.
-	(w3m-exec): Accept all content-types in `w3m-retrieve'; Make an image
-	only page, if the image can be displayed inline; Call
-	`w3m-external-view' if the content-type of retrieved content is not
-	text nor image.
-
-2001-03-12  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-view-parent-page): Add a postfix '/' to parent-url.
-
-2001-03-12  Takaaki MORIYAMA  <taka@airlab.cs.ritsumei.ac.jp>
-
-	* w3m.el (w3m-extended-charcters-table): Add '\x80'.
-
-2001-03-12  Masatake YAMATO  <masata-y@is.aist-nara.ac.jp>
-
-	* w3m.el (w3m-view-parent-page): New command.
-	(w3m-mode-map): Add `w3m-view-parent-page'.
-
-2001-03-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* mime-w3m.el (mime-w3m-message-structure): Make variable buffer local
-	at top leve.
-
-2001-03-10  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-entity-alist): Eval at compile time.; Add character
-	entity references for ISO 8859-1 characters.
-
-2001-03-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-entity-regexp): New constant.
-	(w3m-fontify): Use `w3m-entity-regexp'.
-	(w3m-entity-value): Use defsubst, and fix typo.
-	(w3m-decode-anchor-string): New function.
-	(w3m-fontify-anchors): Decode `&amp;' exists in URL string.
-
-2001-03-09  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-create-image) [EMACS21,XEMACS]: Guard against error.
-
-	* mew-w3m.el (mew-w3m-auto-insert-image): New variable.
-	(mew-mime-text/html-w3m): Bind 'w3m-display-inline-image' with
-	'mew-w3m-auto-insert-image'.
-	(mew-w3m-cid-retrieve): New function. Fix wrong guess.
-
-2001-03-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-mode-map): Add `w3m-close-window', `w3m-view-source',
-	`w3m-view-header', and `w3m-history'.  Keybind of `w3m-quit' is
-	changed.
-	(w3m-close-window, w3m-about-source, w3m-view-source, w3m-about-header,
-	w3m-view-header, w3m-about-history, w3m-history): New functions.
-
-	* mime-w3m.el (mime-put-keymap-region): Removed.
-	(mime-w3m-save-background-color): Old name is
-	`mime-save-background-color'.
-	(mime-w3m-mode-map): Add workaround for `w3m-close-window',
-	`w3m-view-source', `w3m-view-header', and `w3m-history'.
-
-2001-03-09  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
-
-	* w3m.el (w3m-cid-retrieve-function-alist): New variable.
-	(w3m-retrieve): Add support for URLs which has `cid:' prefix.
-
-	* mime-w3m.el: Always require `w3m'.  Require `cl' when compiling.  Set
-	`w3m-cid-retrieve-function-alist'.
-	(mime-w3m-message-structure): New variable.
-	(mime-w3m-preview-text/html): Set `mime-w3m-message-structure'.
-	(mime-w3m-cid-retrieve): New function.
-
-2001-03-09  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-toggle-inline-images): Eliminated needless local
-	variable.
-	(toplevel): Encloses old emacs judgement with eval-and-compile; Define
-	`find-coding-system' using `w3m-static-if'.
-
-2001-03-08  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: All w3m-backlog-* symbols are renamed into w3m-cache-*, and
-	coupling of retrieve module and cache module are cleand up.
-	(w3m-keep-cache-size): Old name is `w3m-keep-backlog'.
-	(w3m-cache-buffer, w3m-cache-articles, w3m-cache-hashtb,
-	w3m-cache-setup, w3m-cache-shutdown, w3m-cache-contents,
-	w3m-cache-request-contents): These symbols are renamed.
-	(w3m-cache-header, w3m-cache-request-header): New function.
-	(w3m-work-buffer-list): New variable.
-	(w3m-get-buffer-create): New function.
-	(w3m-with-work-buffer): New macro.
-	(w3m-kill-all-buffer): New function.
-	(w3m-create-image, w3m-local-retrieve): Use `w3m-with-work-buffer'
-	instead of `with-current-buffer'.
-	(w3m-arrived-setup): Set `w3m-input-url-history' when its value is nil.
-	(w3m-arrived-shutdown): More strict error check.  This function is
-	added to `kill-emacs-hook'.
-	(w3m-w3m-get-header): New function.
-	(w3m-w3m-check-header): Use `w3m-w3m-get-header'.
-	(w3m-w3m-retrieve): Clean up code.
-	(w3m-download, w3m-exec): More strict error check.
-	(w3m-content-type): New optional argument `no-cache' is added.
-	(w3m-alive-p): New function.
-	(w3m-quit): Use `w3m-alive-p'.
-
-2001-03-08  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-local-retrieve): Bind 'auto conversion variables' to nil
-	when insert file with binary .
-
-2001-03-08  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-insert-image): Eliminated needless local variable.
-	(w3m-remove-image) [XEmacs]: Remove images at `end' too.
-	(w3m-fontify-images): Set `w3m-image-redundant' property if "img_alt"
-	string is upper case.
-	(w3m-toggle-inline-images): Fixed docstring; Insert and remove dummy
-	string if alt string has `w3m-image-redundant' property.
-
-2001-03-08  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el (w3m-fontify): Allow '_' char for element name.
-
-2001-03-08  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-display-inline-image-status): New variable.
-	(w3m-image-type-alist): Define as constant.
-	(w3m-anchor): Moved position.
-	(w3m-image): Ditto.
-	(w3m-action): Ditto.
-	(w3m-create-image): Added argument `no-cache'.
-	(w3m-remove-image): New function.
-	(w3m-fontify-images): Don't display inline image here.
-	(w3m-toggle-inline-images): New function.
-	(w3m-mode-map): Bind 't' to `w3m-toggle-inline-images'.
-	(w3m-goto-url): Call `w3m-toggle-inline-images'; Set
-	`w3m-display-inline-image-status'.
-	(w3m-region): Ditto.
-
-2001-03-08  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
-
-	* mime-w3m.el (mime-w3m-preview-text/html): Use
-	`mime-entity-fetch-field' instead of `mime-w3m-get-xref'.
-	(mime-w3m-get-xref): Removed.
-
-2001-03-07  Keisuke Nishida  <kxn30@po.cwru.edu>
-
-	* w3m.el (w3m-search-engine-alist): Added "rpmfind".
-	(w3m-fontify-anchors): Treat single quotes (') as quotation marks.
-
-2001-03-08  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Backlog module is separated from front-end functions and code
-	to access the list of arrived URLs is put in order.
-	(w3m-arrived-file): Renamed from `w3m-arrived-urls-file'.
-	(w3m-arrived-anchor-list): Removed variable.
-	(w3m-arrived-list-load, w3m-arrived-list-save, w3m-arrived-list-add,
-	w3m-save-position, w3m-restore-position): Removed functions.
-	(w3m-arrived-db-size): New constant.
-	(w3m-arrived-db, w3m-arrived-seq): New variables.
-	(w3m-arrived-p, w3m-arrived-add, w3m-arrived-setup,
-	w3m-arrived-shutdown, w3m-arrived-store-position,
-	w3m-arrived-restore-position): New functions.
-	(w3m-input-url): Follow changes.
-	(w3m-view-previous-page): Ditto.
-	(w3m-view-previous-point): Ditto.
-	(w3m-quit): Ditto.
-	(w3m-goto-url): Ditto.
-	(w3m-create-image): Clean up codes.
-
-2001-03-07  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-view-current-url-with-external-browser): Fix typo when
-	browse current URL.
-
-2001-03-07  Yuuichi Teranishi  <teranisi@gohome.org>
-
-	* w3m.el (w3m-create-image) [XEmacs]: Retrieve header to determine
-	image type when `w3m-local-content-type' failed.
-
-2001-03-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-arrived-file-coding-system): Default value is changed to
-	avoid unknown coding system error on XEmacs.
-	(w3m-input-url): Changed for old style `completing-read'.
-
-2001-03-07  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-download): Bind 'auto conversion variables' to nil.
-	(w3m-w3m-check-header): Fix search 'HTTP/1.[01] 200' method.
-	(inline-image-features): Patch from Yuuichi Teranishi san
-	<teranisi@gohome.org> at [emacs-w3m:00103].
-
-2001-03-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* mime-w3m.el: Renamed mime-w3m-preview-text/html from
-	w3m-mime-preview-text/html.  Check of user setting is required.
-	(mime-w3m-mode-map): New variable.
-	(mime-w3m-get-xref): New function.
-	(mime-w3m-view-this-url): Ditto.
-	(mime-w3m-mouse-view-this-url): Ditto.
-	(mime-w3m-preview-text/html): Use `mime-w3m-mode-map' insted of
-	`w3m-mode-map'.  Refer Xref: header to set `w3m-current-url'.
-	(mime-put-keymap-region): Define with `defmacro' instead of
-	`defmacro-maybe'.
-	(mime-save-background-color): Ditto.
-
-	* w3m.el (w3m-exec-filter): Improved code to process prompt string.
-
-2001-03-06  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-exec-filter): Delete Prompt string with process output
-	buffer.
-	(w3m-w3m-check-header): Check 'HTTP/1.[01] 200' for valid
-	'content-length'.
-	(w3m-w3m-retrieve): Cygwin binary data support. Remove Prompt handling.
-
-2001-03-06  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (emacs-w3m-version): New constant.
-	(find-coding-system): Removed duplicated definition.
-	(w3m-backlog-remove-oldest): Simplify.
-	(w3m-search): Fix typo in function document.
-
-2001-03-05  Keisuke Nishida  <kxn30@po.cwru.edu>
-
-	* w3m.el (w3m-anchor, w3m-image, w3m-action): Use defsubst.
-
-2001-03-05  Keisuke Nishida  <kxn30@po.cwru.edu>
-
-	* w3m.el (and-let*): Removed
-	(w3m-save-this-url): Updated.
-
-2001-03-06  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el (w3m-goto-previous-anchor): Fix mistake on merging w3-anchor
-	patch. Cursor should go to beginning of anchor previous.
-	(w3m-mode-map): Assign Shift-TAB key with w3m-previous-anchor.
-
-2001-03-06  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el (TOP): No need to load cl-macs explicitly.
-	(w3m-charset-coding-system-alist): Do not use doloop in defcustom
-	because it is not expanded in compile time.
-
-2001-03-05  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el: apply patch from Keisuke Nishida.  URL is hold in text
-	property as already expanded.  Some utility functions (w3m-anchor,
-	w3m-image, w3m-action) is defined and used.
-	(and-let*): New macro.
-	(w3m-fontify-anchors): Hold expanded url in text property.
-	(w3m-fontify-images): Likewise.
-	(w3m-expand-url): Save matching data.  Match pattern bug fix (by
-	gotoh).
-	(w3m-anchor): New function.
-	(w3m-image): New function.
-	(w3m-action): New function. (added by gotoh)
-	(w3m-view-this-url): Use new functions to extract text prop.
-	(w3m-mouse-view-this-url): Likewise.
-	(w3m-download-this-url): Likewise.
-	(w3m-print-this-url): Likewise.
-	(w3m-save-this-url): Likewise.
-	(w3m-goto-next-anchor): Likewise, and do not expand url.
-	(w3m-external-view): Remove 1st arg CONTENT-TYPE.
-	(w3m-next-anchor): Use and-let* macro and do not expand url.
-	(w3m-goto-previous-anchor): Use utility functions.
-	(w3m-bookmark-add-this-url): Likewise and refine.
-	(w3m-url-encode-string): Do not escape ':' and '/'.
-
-2001-03-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-retrieve): Add support for URLs which has `about:'
-	prefix.
-	(w3m-content-type): Likewise.
-	(w3m-about, w3m-about-weather, w3m-weather, w3m-weather-remove-headers,
-	w3m-weather-remove-footers, w3m-weather-remove-weather-images,
-	w3m-weather-remove-washing-images, w3m-weather-remove-futon-images,
-	w3m-weather-remove-week-weather-images, w3m-weather-insert-title): New
-	function.
-	(w3m-weather-url-alist): New associative list of AREA vs. URL.
-	(w3m-weather-default-area): New customize variable.
-	(w3m-weather-default-area): Ditto.
-	(w3m-entity-value): When unknown entity is specified, return original
-	string instead of null string.
-
-2001-03-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-url-encode-string): New function.
-	(w3m-escape-query-string): Use `w3m-url-encode-string'.
-	(w3m-form-make-get-string): Ditto.
-	(w3m-message): Changed to support Emacs-19.
-	(w3m-parse-attributes): Ditto.
-	(w3m-fontify): Refer `mc-flag' when mule is used.
-
-2001-03-05  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el (w3m-command-arguments): Make it as system constants user not
-	for user variable. User need not change this value.  "-S" options is
-	removed because it doesn't work for non Text/Plain object.
-	(w3m-default-url-coding-system): New variable.
-	(w3m-search-engine-alist): Change format to hold encoding type for
-	query string. And add some engines.
-	(w3m-fill-column): Born again variable. Positive value is for fixed
-	column, negative value is for fitting frame width.
-	(w3m-mode): Add key description of "<" and ">" in doc-string.
-	(w3m-escape-query-string): Add 2nd argument for coding system.
-	(w3m-search): Adapt to new format of w3m-search-engine-alist.
-
-2001-03-05  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-sub-list): Guard error for XEmacs (N must count from
-	zero).
-
-2001-03-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-search): Simplify.
-	(w3m-do-search): Removed.
-
-2001-03-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Merge form branch to main trunk.
-
-2001-03-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-form-new): Changed w3m-form structure.
-	(w3m-form-p): Likewise.
-	(w3m-form-put): Likewise.
-	(w3m-form-get): Likewise.
-	(w3m-form-plist): New macro.
-	(w3m-form-symbol): Removed.
-	(w3m-url-encode): Ditto.
-	(w3m-form-make-get-string): Follow change of w3m-form and use
-	w3m-escape-query-string instead of w3m-url-encode.
-	(w3m-parse-attributes): New macro.
-	(w3m-form-parse-region): Use w3m-parse-attributes.
-	(w3m-fontify-forms): Use w3m-parse-attributes.
-
-2001-03-05  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-content-type-alist): Add some content-type.
-	(w3m-w3m-retrieve): Change bind variables method to 'let*'.
-
-2001-03-05  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el (w3m-command-arguments): Add "-S" option for w3m.
-	(w3m-search-engine-alist): Add new spec for google with JA lang.
-	(w3m-current-url): Make variable buffer local at top leve.
-	(w3m-current-title): Likewise.
-	(w3m-url-history): Likewise.
-	(w3m-process-temp-file): Likewise.
-	(w3m-rendering-region): Do not make local variable for the reason
-	above.
-	(w3m-exec): Likewise.
-	(w3m-external-view): Likewise.
-	(w3m-goto-next-anchor): Bug fix.
-	(w3m-goto-previous-anchor): Bug fix.
-	(w3m-escape-query-string): Bug: Escape SPC char as "+" not "%20".
-
-2001-03-04  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-form-string-regexp): Add `eval-and-compile' to suprress
-	byte-compile error.
-	(w3m-form-p): Fix typo.
-	(w3m-mode-map): Swapped keybindings of w3m-scroll-left and
-	w3m-scroll-right to fit w3m's keybindings.
-
-2001-03-04  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el: Add Keisuke Nishida as author.
-	(TOP): Use thingatpt instead of ffap.
-	(w3m-fill-column): Obsoleted. Determine in dynamic.
-	(w3m-command-arguments): Specify as lambda
-	(w3m-command-arguments): Change initial value.
-	(w3m-search-engine-alist): Change spec more simple.
-	(w3m-input-url): Use thing-at-point.
-	(w3m-do-search): Adapt to new w3m-search-engine-alist spec.
-	(w3m-search): Change variable name and refine codes.
-
-	* w3m.el: (w3m-entity-value): Allow immediate entity (&#nnn).
-	(w3m-fontify): Likewise.
-
-2001-03-04  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el (w3m-delete-duplicated-empty-lines): New variable.
-	(w3m-search-engine-alist): New variable.
-	(w3m-default-search-engine): New variable.
-	(w3m-horizontal-scroll-columns): New variable.
-	(w3m-fontify): Change regexp to allow non-double-quoted string for href
-	attribute value of anchor tag. Remove duplicated empty lines for
-	compact view.
-	(w3m-mode-map): Add keymap "<" and ">" to scroll horizontaly.
-	(w3m-mode): Truncate lines.
-	(w3m-scroll-left): New interactive function.
-	(w3m-scroll-right): New interactive function.
-	(w3m-escape-query-string): New function.
-	(w3m-do-search): New function.
-	(w3m-search): New interactive function for searching word with various
-	search engine.
-
-2001-03-04  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Start implementation of code to process <form> tag.
-	(w3m-form-face): New face.
-	(w3m-current-forms): New internal variable.
-	(w3m-form-string-regexp): New internal constant.
-	(w3m-form-new, w3m-form-p, w3m-form-symbol, w3m-form-method,
-	w3m-form-action, w3m-form-put, w3m-form-get, w3m-url-encode,
-	w3m-form-make-get-string, w3m-form-parse-region, w3m-fontify-forms,
-	w3m-form-replace, w3m-form-input, w3m-form-submit, w3m-form-real-reset,
-	w3m-form-reset, w3m-fontify-bold, w3m-fontify-underline,
-	w3m-fontify-images): New function.
-	(w3m-fontify): Use new functions.
-	(w3m-mode-map): Add scroll-right and scroll-left.
-	(w3m-mode): Set t to `truncate-line'.
-
-2001-03-04  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el: Patch from Keisuke Nishida <kxn30@po.cwru.edu>.
-	(w3m-print-this-url): Do not save URL, print only.
-	(w3m-save-this-url): New function. Print and save URL under cursor.
-	(w3m-goto-next-anchor): New function.
-	(w3m-next-anchor): Move to top anchor from bottom.  Print URL after
-	move.
-	(w3m-goto-previous-anchor): New function.
-	(w3m-previous-anchor): Move to bottom anchor from top.  Print URL after
-	move.
-
-2001-03-04  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el: Patch from Keisuke Nishida <kxn30@po.cwru.edu>.
-	(TOP): Require ffap.el.
-	(w3m-input-url): Prompt with default URL, and use URL under cursor as
-	default if not specified.
-	(w3m): Do not specify default url for w3m-input-url.
-
-2001-03-02  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-backlog-enter): Overwrite backlog data when specified URL
-	is duplicated.
-	(w3m-home-page): Changed official emacs-w3m page's address to
-	namazu.org.
-
-2001-03-02  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Renamed w3m-http-* to w3m-w3m-* in order to prepare name
-	space of symbols processing HTTP protocol directly, and fix for cookie.
-	(w3m-w3m-check-header): Renamed from `w3m-http-check-header'.
-	(w3m-w3m-retrieve): Renamed from `w3m-http-retrieve' and added code to
-	remove cookies.
-	(w3m-retrieve): Follow changes of fuction name.
-	(w3m-download): Likewise and changed argument spec.
-	(w3m-exec): Changed argument spec.
-	(w3m-goto-url): Changed reload scheme,
-	(w3m-fontify): Move point to the top of the buffer before delete <?xml
-	... ?> tag.
-
-2001-03-02  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (TOP): Changed code to detect XEmacs and add to define
-	`find-coding-system'.
-	(w3m-backlog-setup): Changed caching data format.
-	(w3m-backlog-enter): Ditto and changed argument spec.
-	(w3m-backlog-request): Ditto and changed spec of return value.
-	(w3m-http-retrieve): Access backlog in this function and changed
-	argument spec.
-	(w3m-retrieve): Changed argument spec.
-	(w3m-exec): Clean up and chaned spec of return value.
-	(w3m-goto-url): Follow changes in `w3m-exec'.
-	(w3m-decode-buffer): Clean up.
-	(w3m-process-temp-file): New variable to suppress byte-compile warning.
-	(w3m-external-view): Use w3m-process-temp-file to suppress byte-compile
-	warning.
-	(w3m): Change `mode-line-buffer-identification'.
-
-2001-03-02  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el (w3m-home-page): Initialize as URL.
-
-2001-03-02  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el: Correcting wrong use of cygwin type filename usage, using
-	dolist macro, adding handling codes html character entities, correct
-	bug of w3m-view-bookmark on win32 environment, fixing some small bugs,
-	etc.
-	(w3m-url-to-file-name): New function.
-	(w3m-expand-file-name-as-url): Renamed from w3m-expand-file-name.
-	(w3m-bookmark-file): Initialize as native filename format.
-	(w3m-arrived-urls-file): Likewise.
-	(w3m-charset-coding-system-alist): Use dolist macro.
-	(w3m-entity-alist): New constant.
-	(w3m-entity-db): New variable.
-	(w3m-entity-db-size): New variable.
-	(w3m-entity-db-setup): New function.
-	(w3m-entity-value): New function
-	(w3m-fontify): Refine html character entity decoding.  Use dolist
-	macro. Some bug fix.
-	(w3m-exec-get-user): Simplify using dolist macro.
-	(w3m-bookmark-save): Likewise.
-	(w3m-local-content-type): Likewise.
-	(w3m-local-retrieve): Fix filename handling considering cygwin
-	convention by using w3m-local-file-name function.
-	(w3m-http-retrieve): Buf fix.
-	(w3m-rendering-region): Bug fix, use w3m-current-url.
-	(w3m-view-bookmark): Use w3m to do initialize on interactive call.
-	(w3m-find-file): Fix for renamed function.
-
-2001-03-01  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* Merge changes on `url' branch to main trunk.
-
-2001-03-01  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-home-page): Changed to official w3m.el page.
-	(w3m-anchor-face): Changed default face in dark backgraound.
-	(w3m-arrived-anchor-face): Ditto.
-	(w3m-download): Fix typo.
-	(w3m-content-type-alist): Accept .png file.
-	(w3m-external-view): Fix typo.
-	(w3m-view-image): Fix.
-
-2001-03-01  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* mew-w3m.el: New file to use w3m with Mew.
-
-2001-03-01  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* mime-w3m.el: New file to use w3m with SEMI.
-
-	* w3m.el (w3m-message): New function.
-	(w3m-verbose): New variable.
-	(w3m-process-message): Ditto.
-	(w3m-process-url): Removed.
-	(w3m-exec-process): Add code to show progress status.
-	(w3m-exec-filter): Fix prompt bug and clean up codes.
-	(w3m-retrieve): Changed arguments spec.
-	(w3m-local-retrieve): Ditto.
-	(w3m-http-retrieve): Ditto.
-	(w3m-pretty-length): New function.
-	(w3m-rendering-region): Add code to show progress status.
-
-2001-03-01  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-http-retrieve): Add adhoc fragment to avoid new-line
-	replacement.
-	(w3m-decode-buffer): Renamed from w3m-html-decode-buffer.
-
-2001-02-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-content-type-alist): Accept .htm as text/html.
-	(w3m-backlog-enter): Add code to memory w3m-current-title.
-	(w3m-backlog-request): Resume w3m-current-title from backlog data.
-	(w3m-html-decode-buffer): Change arguments spec.
-	(w3m-rendering-region): Removed code to set w3m-current-url.
-	(w3m-exec): Fix bug of proecessing text/plain files and changed data
-	format to preserve in backlog.
-
-2001-02-28  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el: Support XEmacs using APEL.
-	(w3m-fontify): Delete <?XML ... ?> tag for XHTML page.
-	(w3m-input-url): Do not use 7th arg of completing-read for XEmacs
-	support.
-	(w3m-bookmark-save): Check bookmark file is writable.
-
-2001-02-28  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el (w3m-bookmark-add): Fix problem of adding bookmark first time.
-
-2001-02-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Reconstructed drastically and removed w3 depended codes.
-
-2001-02-28  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el (w3m-executable-type): New variable.
-	(w3m-cygwin-path): New function.
-	(w3m-region): New function.
-
-2001-02-26  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-fontify): Add code to decode w3m-specific extended
-	charcters.
-	(w3m-extended-charcters-table): New constant.
-
-2001-02-08  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-async-exec): New customizable variable.
-	(w3m-exec-process): Use 'w3m-async-exec' instead of 'w3m-process-type'.
-
-2001-02-07  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el: Fixed small and thoughtless bugs...
-	(w3m-bookmark-file-modified-p): Bug fix.
-	(w3m-bookmark-save): Bug fix. Don't forget time stamp updating.
-	(w3m-bookmark-add): Bug fix. Function name miss-typing.
-
-2001-02-07  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el: Add bookmark operations. This feature is very ad-hoc.
-	Support loading w3m's bookmark file into internal bookmark data, adding
-	new entry interactively, and saving data as w3m's bookmark file format.
-	(w3m-bookmark-file-coding-system): New user varible.
-	(w3m-bookmark-data): New internal variable.
-	(w3m-bookmark-file-time-stamp): ditto.
-	(w3m-bookmark-section-history): ditto.
-	(w3m-bookmark-title-history): ditto.
-	(w3m-mode-map): Add bookmark operation functions to mode map.
-	(w3m-bookmark-file-modified-p): New function.
-	(w3m-bookmark-parse): ditto.
-	(w3m-bookmark-load): ditto.
-	(w3m-bookmark-save): ditto.
-	(w3m-bookmark-data-prepare): ditto.
-	(w3m-bookmark-add): ditto.
-	(w3m-bookmark-add-this-url): ditto.
-	(w3m-bookmark-add-current-url): ditto.
-
-2000-12-12  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el (w3m-sub-list, w3m-load-list, w3m-save-list): New utility
-	function.
-	(w3m-arrived-list-load): Refine and move out common code into
-	w3m-load-list.
-	(w3m-arrived-list-save): Refine and move out common code into
-	w3m-save-list and w3m-sub-list. (Previous code had side effect of
-	nreverse).
-
-2000-12-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* makepatch.pl, Makefile, .cvsignore: New files.
-
-2000-10-26  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-view-this-url): Chang optinal argument 'arg'.
-	(w3m-next-anchor, w3m-previous-anchor): Bind 'pos'.
-	(w3m-fontify): Put mouse-face at anchor and image property.
-	(w3m-mouse-view-this-url): Handling 'w3m-image property.
-
-2000-10-20  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-process-type): Change default valule to 'start-process.
-	(w3m-process-user-counter): New buffer local variable.
-	(w3m-exec-get-user): New funciton, get user and passwd from
-	w3m-arrived-user-list.
-	(w3m-exec-filter): Use w3m-exec-get-user().
-
-2000-10-18  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-view-previous-point): New function.
-	(w3m-expand-url): If BASE is nil, it set "".
-	(w3m-download-this-url): w3m-refontify-anchor() exec when finished
-	download.
-
-2000-10-16  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-arrived-ct-file, w3m-arrived-file-cs,
-	w3m-always-html-url-regex): New variables.
-	(w3m-process-type): Change name from w3m-exec-process-type.
-	(w3m-refontify-anchor): New funcition.
-	(w3m-exec): Pre-check content-type.
-	(w3m-exec-w3m-ctcheck): New funcition, check context-type for URL.
-	(w3m-exec-w3m): New funcion, execute w3m.
-	(w3m-exec-ftp): New function, execute dired-other-window() or
-	copy-file(), if URL is 'ftp://'.
-	(w3m-convert-ftp-to-emacsen): Change 'ftp://' to '/user@host:/' from
-	elisp ML.
-	(w3m-download-this-url, w3m-save-image, w3-view-image): Use w3
-	features.
-
-2000-10-12  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (top-level): Add authors.
-	(w3m-expand-url): Check relative URL first.
-	(w3m-fontify): Add original text properties when replace 'escaped
-	character'.
-
-2000-10-11  Hideyuki SHIRAI  <shirai@meadowy.org>
-
-	* w3m.el (w3m-mailto-url-function, w3m-use-cygdrive,
-	w3m-default-save-dir, w3m-arrived-list-file, w3m-arrived-list-keep,
-	w3m-arrived-anchor-face, w3m-exec-process-type,
-	w3m-process-connection-type, w3m-arrived-anchor-list): New user
-	custumize variables.
-	(w3m-mode): Change doc-string for key binding.
-	(w3m-arrived-list-add, w3m-arrived-list-load, w3m-arrived-list-save):
-	New functions for handling arrived anchor.
-	(w3m-fontify): Add arrived anchor face.
-	(w3m-exec-process, w3m-exec-filter, w3m-exec-sentinel): New functions
-	for asynchronous w3m execution.
-	(w3m-find-file, w3m-read-file-name, w3m-read-passwd): New miscellaneous
-	functions.
-	(w3m-expand-file-name): Support old cygwin.
-	(w3m-view-current-url-with-external-browser): If w3m-browser-command is
-	function, funcall it.
-	(w3m-mailto-url): If w3m-mailto-url-function is function, funcall it.
-	(w3m-mode-map): If running xemacs, use (button2) instead of (mouse-2).
-
-2000-09-21  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el (w3m): Cancel last change, use switch-to-buffer again.
-
-2000-09-20  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el (w3m): Do not switch buffer if w3m window already exists.
-
-2000-09-20  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Add declaration of dependency on APEL.
-	(w3m-quit): When other w3m buffers exist, don't destruct cache.
-	(w3m-browse-url): New function.
-
-2000-09-20  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el (w3m-command-arguments): Remove option -m, that's not good for
-	bookmark / local file handling.
-
-2000-09-19  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el (w3m-command-arguments): Add -m option explicitly.
-	(w3m-exec): Ad-hoc change to view .txt object. It's temporary
-	fix. Should we consider type? w3m option -dump_head may help us.
-	(w3m-exec): Get title and remove both format <title_alt> and <title>.
-	(w3m-view-this-url): Force reloading by prefix.
-	(w3m-view-current-url-with-external-browser): Works correctly.
-	(w3m-print-current-url): Push url to kill king to paste later.
-	(w3m-print-this-url): ditto.
-	(w3m-mailto-url): Use rfc2368.el instead of mailto.el.
-	(w3m-goto-url): Add 2nd argument RELOAD to withdraw data cached on
-	emacs.
-	(w3m-reload-this-page): Simplified by using new w3m-goto-url.
-	(w3m): Set mode-line-buffer-identification after changing major mode
-	because it overwrite that variable.
-
-2000-09-19  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el (w3m-fontify): Add code to handle irregular ordered elements
-	of anchor tags.
-	(w3m-mailto-url): Adopt for Emacs-19.
-	(w3m-input-url): Call `w3m-backlog-setup' to initialize
-	`w3m-backlog-hashtb'.
-
-2000-09-19  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el (w3m): Sorry, over paren.
-
-2000-09-18  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el (w3m-exec): Get title correctly within -halfdump format of
-	w3m.
-	(w3m-mouse-view-this-url): New function to view page by clicking mouse
-	middle button.
-	(w3m-mode-map): Assign mouse middle button to view page.
-	(w3m): Change mode-line spec to show title of current page.
-
-2000-09-18  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Add authors.
-
-2000-09-18  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el (w3m-input-url): Enter url with completion. Candidates are
-	visited url kept in w3m-backlog-hashtb.
-	(w3m-backlog-setup): Change hash size as prime number and initialized
-	with value 0 for obarray.
-	(w3m-backlog-remove): Remove unused 2nd arg NUMBER and remove when
-	block to check NUMBER.
-	(w3m-exec): Show message "Loading..." while loading.
-	(w3m-save-position): New function to keep display position in Emacs
-	window into hash symbol, but I think this is not best way.
-	(w3m-restore-position): New function to restore display position.
-	(w3m-view-previous-page): Restore display position.
-	(w3m-expand-url): Canonicalize url, ex. "http://www.host.org" to
-	"http://www.host.org/".  Change regexp to allow "mailto:" protocol.
-	Remove drive letter as side-effect using expand-file-name to expand url
-	for Win32 emacen.
-	(w3m-expand-file-name): New function to alternates expand-file-name
-	function with convert drive letter prefixed path to cygwin path.
-	i.e. c:/users/home to /cygdrive/c/users/home
-	(w3m-view-bookmark): Expand bookmark filename as cygwin path format to
-	pass to w3m.
-	(w3m-mode-map): Add new key binding 'B' to back to previous page.  Add
-	new key binding 'R' to force reloading current page.
-	(w3m-mailto-url): New function to support mailto: protocol.  It use
-	rfc2368.el if available.
-	(w3m-goto-url): Ad-hoc support mailto: protocol. We should consider
-	more...
-	(w3m-reload-this-page): New function to reload current page.
-
-2000-09-18  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-
-	* w3m.el (w3m): Add 2nd arguemnt to use with browse url.  This is patch
-	from Satoru Takabayashi <satoru-t@is.aist-nara.ac.jp> in ELF-ML, Seq#
-	875.
-	(w3m-fontify): Change regexp for <a ...> tag to allow newline in
-	between attributes.  This is patch from Satoru Takabayashi
-	<satoru-t@is.aist-nara.ac.jp> in ELF-ML, Seq# 876.
-	(w3m-fontify): Allow un-ended tag for name attribute, is it w3m bug?).
-	This is Patch from Satoru Takabayashi <satoru-t@is.aist-nara.ac.jp> in
-	ELF-ML, Seq# 876.
-
-2000-07-13  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Added handling of name anchors. Add comments.
-
-2000-07-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Improved to handle multi buffer. Fix broken cache and order
-	of fontify.
-
-2000-07-01  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: Handle &-sequence. Add history and cache.
-
-2000-06-25  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
-
-	* w3m.el: New file.
-
-
-Local Variables:
-coding: iso-2022-7bit
-fill-column: 79
-indent-tabs-mode: t
-End:

=== removed file 'share/emacs/site-lisp/w3m/mew-w3m.el'
--- share/emacs/site-lisp/w3m/mew-w3m.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/mew-w3m.el	1970-01-01 00:00:00 +0000
@@ -1,474 +0,0 @@
-;; mew-w3m.el --- View Text/Html content with w3m in Mew
-
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Author: Shun-ichi GOTO  <gotoh@taiyo.co.jp>,
-;;         Hideyuki SHIRAI <shirai@meadowy.org>
-;; Created: Wed Feb 28 03:31:00 2001
-;; Version: $Revision: 1.69 $
-;; Keywords: Mew, mail, w3m, WWW, hypermedia
-
-;; This file is a part of emacs-w3m.
-
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or (at
-;; your option) any later version.
-
-;; This program is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; This package is for viewing formatted (rendered) Text/Html content
-;; in Mew's message buffer.
-
-;;; Installation:
-
-;; (1) Simply load this file and add followings in your ~/.mew file.
-;;
-;; (require 'mew-w3m)
-;;
-;; (2) And you can use keymap of w3m-mode as mew-w3m-minor-mode.
-;; To activate this feaeture, add followings also:
-;;
-;; (setq mew-use-w3m-minor-mode t)
-;; (add-hook 'mew-message-hook 'mew-w3m-minor-mode-setter)
-;;
-;; (3) If you use mew-1.95b118 or later on which Emacs 21, 22 or XEmacs,
-;; can display the images in the Text/Html message.
-;; To activate this feaeture, add following in your ~/.mew file.
-;;
-;; (define-key mew-summary-mode-map "T" 'mew-w3m-view-inline-image)
-;;
-;; Press "T":    Toggle the visibility of the images included its message only.
-;; Press "C-uT": Display the all images included its Text/Html part."
-;;
-;; (4) You can use emacs-w3m to fetch and/or browse
-;; `external-body with URL access'. To activate this feaeture,
-;; add followings also:
-;;
-;; (setq mew-ext-url-alist
-;;      '(("^application/" "Fetch by emacs-w3m" mew-w3m-ext-url-fetch nil)
-;;        (t "Browse by emacs-w3m" mew-w3m-ext-url-show nil)))
-;;  or
-;; (setq mew-ext-url-alist
-;;      '((t "Browse by emacs-w3m" mew-w3m-ext-url-show nil)))
-;;
-
-;;; Usage:
-
-;; There's nothing special. Browse messages in usual way.
-;; On viewing Text/Html file, rendered text is appeared in message
-;; buffer instead of usual "HTML" banner.
-;; C-c C-e operation is also allowed to view with external browser.
-;;
-;; If mew-use-w3m-minor-mode is t, key operations of w3m-mode is
-;; allowed (as minor-mode-map) and jump links in message buffer.
-;; NOTE: This feature is not complete. You may confuse.
-;;
-;;
-
-;;; Code:
-
-(require 'mew)
-(require 'w3m)
-(eval-when-compile (require 'cl))
-
-;;; initializer for mew
-(defgroup mew-w3m nil
-  "mew-w3m - Inline HTML rendering extension of Mew"
-  :group 'w3m)
-
-(defcustom mew-use-w3m-minor-mode nil
-  "*Use w3m minor mode in message buffer.
-Non-nil means that the minor mode whose keymap contains keys binded to
-some emacs-w3m commands are activated in message buffer, when viewing
-Text/Html contents."
-  :group 'mew-w3m
-  :type 'boolean)
-
-(defcustom mew-w3m-auto-insert-image nil
-  "*If non-nil, images are inserted automatically in Multipart/Related message.
-This variable is effective only in XEmacs, Emacs 21 and Emacs 22."
-  :group 'mew-w3m
-  :type 'boolean)
-
-(defcustom mew-w3m-cid-retrieve-hook nil
-  "*Hook run after cid retrieved"
-  :group 'mew-w3m
-  :type 'hook)
-
-(defcustom mew-w3m-region-cite-mark "&gt;&nbsp;"
-  "*Method of converting `blockquote'."
-  :group 'mew-w3m
-  :type '(choice (const :tag "Use Indent" nil)
-		 (const :tag "Use Cite Mark \"> \"" "&gt;&nbsp;")
-		 (string :tag "Use Other Mark")))
-
-(defconst mew-w3m-safe-url-regexp "\\`cid:")
-
-;; Avoid bytecompile error and warnings.
-(eval-when-compile
-  (defvar mew-use-text/html)
-  (unless (fboundp 'mew-current-get-fld)
-    (autoload 'mew-coding-system-p "mew")
-    (autoload 'mew-current-get-fld "mew")
-    (autoload 'mew-current-get-msg "mew")
-    (autoload 'mew-syntax-get-entry-by-cid "mew")
-    (defun mew-cache-hit (&rest args) ())))
-
-(defmacro mew-w3m-add-text-properties (props)
-  `(add-text-properties (point-min)
-			(min (1+ (point-min)) (point-max))
-			,props))
-
-(defun mew-w3m-minor-mode-setter ()
-  "Check message buffer and activate w3m-minor-mode."
-  (w3m-minor-mode (or (and (get-text-property (point-min) 'w3m)
-			   mew-use-w3m-minor-mode)
-		      0)))
-
-(defvar mew-w3m-use-safe-url-regexp t)
-
-(defun mew-w3m-view-inline-image (&optional allimage)
-  "Display the images of Text/Html part.
-\\<mew-summary-mode-map>
-'\\[mew-w3m-view-inline-image]'	Toggle display the images included its message only.
-'\\[universal-argument]\\[mew-w3m-view-inline-image]'	Display the all images included its Text/Html part."
-  (interactive "P")
-  (mew-summary-msg-or-part
-   (if allimage
-       (let ((mew-use-text/html t)
-	     (mew-w3m-auto-insert-image t)
-	     (mew-w3m-use-safe-url-regexp nil))
-	 (mew-summary-display 'force))
-     (with-current-buffer (mew-buffer-message)
-       (let* ((image (get-text-property (point-min) 'w3m-images))
-	      (w3m-display-inline-images image)
-	      (w3m-safe-url-regexp (when mew-w3m-use-safe-url-regexp
-				     mew-w3m-safe-url-regexp)))
-	 (w3m-toggle-inline-images)
-	 (mew-elet
-	  (mew-w3m-add-text-properties `(w3m-images ,(not image)))
-	  (set-buffer-modified-p nil)))))))
-
-(defun mew-w3m-region (start end &optional url charset)
-  "w3m-region with inserting the cite mark."
-  (if (null mew-w3m-region-cite-mark)
-      (w3m-region start end url charset)
-    (save-restriction
-      (narrow-to-region start end)
-      (let ((case-fold-search t)
-	    pos lines tagbeg0 tagend0 tagbeg1 tagend1)
-	(goto-char (point-min))
-	(while (w3m-search-tag "blockquote")
-	  (setq tagbeg0 (match-beginning 0))
-	  (setq tagend0 (match-end 0))
-	  (when (w3m-search-tag "/blockquote")
-	    (setq tagbeg1 (match-beginning 0))
-	    (setq tagend1 (match-end 0))
-	    (setq lines (buffer-substring tagend0 tagbeg1))
-	    (delete-region tagbeg0 tagend1)
-	    (insert (with-temp-buffer
-		      (insert lines)
-		      (goto-char (point-min))
-		      (if (and (w3m-search-tag "pre")
-			       (setq tagbeg0 (match-beginning 0))
-			       (setq tagend0 (match-end 0))
-			       (w3m-search-tag "/pre")
-			       (setq tagbeg1 (match-beginning 0))
-			       (setq tagend1 (match-end 0)))
-			  (progn
-			    (delete-region tagbeg1 tagend1)
-			    (delete-region tagbeg0 tagend0))
-			;; delete <br>
-			(goto-char (point-min))
-			(while (w3m-search-tag "br")
-			  (delete-region (match-beginning 0) (match-end 0))
-			  (unless (looking-at "[\n\r]") (insert "\n"))))
-		      (goto-char (point-max))
-		      (skip-chars-backward " \t\n\f\r")
-		      (delete-region (point) (point-max))
-		      (goto-char (point-min))
-		      (skip-chars-forward " \t\n\f\r")
-		      (delete-region (point-min) (point))
-		      (goto-char (point-min))
-		      (while (not (eobp))
-			(insert mew-w3m-region-cite-mark)
-			(forward-line 1))
-		      (goto-char (point-min))
-		      (insert "<pre>\n")
-		      (goto-char (point-max))
-		      (insert "\n</pre>\n")
-		      (buffer-substring (point-min) (point-max)))))))
-      (w3m-region (point-min) (point-max) url charset))))
-
-;; processing Text/Html contents with w3m.
-(defun mew-mime-text/html-w3m (&rest args)
-  "View Text/Html contents with w3m rendering output."
-  (let ((w3m-display-inline-images mew-w3m-auto-insert-image)
-	(w3m-safe-url-regexp (when mew-w3m-use-safe-url-regexp
-			       mew-w3m-safe-url-regexp))
-	w3m-force-redisplay	;; don't redraw
-	charset wcs xref
-	cache begin end params execute)
-    (if (= (length args) 2)
-	;; Mew-2
-	(setq begin (nth 0 args) end (nth 1 args))
-      ;; Old Mew
-      (setq cache (nth 0 args))
-      (setq begin (nth 1 args))
-      (setq end (nth 2 args))
-      (setq params (nth 3 args))
-      (setq execute (nth 4 args)))
-    (if (and cache (or execute (<= end begin)))
-	;; 'C-cC-e' + Old Mew
-	(apply 'mew-mime-text/html (list cache begin end params execute))
-      (save-excursion
-	;; search Xref: Header in SHIMBUN article
-	(when cache (set-buffer cache))
-	(goto-char (point-min))
-	(when (re-search-forward mew-eoh nil t)
-	  (let ((eoh (point))
-		(case-fold-search t))
-	    (goto-char (point-min))
-	    (when (and (re-search-forward "^X-Shimbun-Id: " eoh t)
-		       (goto-char (point-min))
-		       (re-search-forward "^Xref: \\(.+\\)\n" eoh t))
-	      (setq xref (match-string 1))
-	      (w3m-static-if (fboundp 'match-string-no-properties)
-		  (setq xref (match-string-no-properties 1))
-		(setq xref (match-string 1))
-		(set-text-properties 0 (length xref) nil xref))))))
-      (mew-elet
-       (cond
-	((and (null cache) (eq w3m-type 'w3m-m17n))
-	 ;; Mew-2 + w3m-m17n.
-	 ;; Coding-system and charset are decided by Mew.
-	 (let ((w3m-input-coding-system w3m-input-coding-system)
-	       (w3m-output-coding-system w3m-output-coding-system)
-	       (w3m-halfdump-command-arguments w3m-halfdump-command-arguments))
-	   (when (setq charset (mew-charset-guess-region begin end))
-	     (setq wcs (mew-charset-to-cs charset)))
-	   (when (and charset wcs (mew-coding-system-p wcs))
-	     ;; guess correctly and not us-ascii
-	     (setq w3m-input-coding-system wcs)
-	     (setq w3m-output-coding-system wcs)
-	     (setq w3m-halfdump-command-arguments
-		   (list "-halfdump"
-			 "-I" charset "-O" charset
-			 "-o" "ext_halfdump=1"
-			 "-o" "pre_conv=1"
-			 "-o" "strict_iso2022=0")))
-	   (mew-w3m-region begin end xref)))
-	((null cache)	;; Mew-2 + w3m, w3mmee
-	 (mew-w3m-region begin end xref (mew-charset-guess-region begin end)))
-	(t		;; Old Mew
-	 (setq charset (or (mew-syntax-get-param params "charset")
-			   (with-current-buffer cache
-			     (mew-charset-guess-region begin end))))
-	 (if charset
-	     (setq wcs (mew-charset-to-cs charset))
-	   (setq wcs mew-cs-text-for-write))
-	 (mew-frwlet
-	     mew-cs-dummy wcs
-	   (mew-w3m-region (point)
-			   (progn (insert-buffer-substring cache begin end)
-				  (point))
-			   xref))))
-       (mew-w3m-add-text-properties `(w3m t w3m-images ,mew-w3m-auto-insert-image))))))
-
-(defvar w3m-mew-support-cid (and (boundp 'mew-version-number)
-				 (fboundp 'mew-syntax-get-entry-by-cid)))
-
-(defun mew-w3m-cid-retrieve (url &rest args)
-  (let ((output-buffer (current-buffer)))
-    (with-current-buffer w3m-current-buffer
-      (when (and w3m-mew-support-cid
-		 (string-match "^cid:\\(.+\\)" url))
-	(setq url (match-string 1 url))
-	(let* ((fld (mew-current-get-fld (mew-frame-id)))
-	       (msg (mew-current-get-msg (mew-frame-id)))
-	       (cache (mew-cache-hit fld msg 'must-hit))
-	       (syntax (mew-cache-decode-syntax cache))
-	       cidstx beg end)
-	  (if (string< "4.0.53" mew-version-number)
-	      (setq cidstx (mew-syntax-get-entry-by-cid syntax (concat "<" url ">")))
-	    (setq cidstx (mew-syntax-get-entry-by-cid syntax url)))
-	  (when cidstx
-	    (setq beg (mew-syntax-get-begin cidstx))
-	    (setq end (mew-syntax-get-end cidstx))
-	    (prog1
-		(with-current-buffer output-buffer
-		  (set-buffer-multibyte t)
-		  (insert-buffer-substring cache beg end)
-		  (set-buffer-multibyte nil)
-		  (downcase (car (mew-syntax-get-ct cidstx))))
-	      (run-hooks 'mew-w3m-cid-retrieve-hook))))))))
-
-(when w3m-mew-support-cid
-  (push (cons 'mew-message-mode 'mew-w3m-cid-retrieve)
-	w3m-cid-retrieve-function-alist))
-
-(defun mew-w3m-ext-url-show (dummy url)
-  (pop-to-buffer (mew-buffer-message))
-  (w3m url))
-
-(defun mew-w3m-ext-url-fetch (dummy url)
-  (lexical-let ((url url)
-		(name (file-name-nondirectory url))
-		handler)
-    (w3m-process-do
-	(success (prog1
-		     (w3m-download url nil nil handler)
-		   (message "Download: %s..." name)))
-      (if success
-	  (message "Download: %s...done" name)
-	(message "Download: %s...failed" name))
-      (sit-for 1))))
-
-(defun w3m-mail-compose-with-mew (source url charset content-type
-					 to subject other-headers)
-  "Compose a mail using Mew."
-  (when (one-window-p)
-    (split-window))
-  (select-window (next-window))
-  (condition-case nil
-      (unless (and (boundp 'mew-init-p) mew-init-p
-		   (progn
-		     (mew-summary-jump-to-draft-buffer)
-		     (and (eq major-mode 'mew-draft-mode)
-			  (y-or-n-p "Attatch this draft? "))))
-	(mew-user-agent-compose to subject other-headers))
-    (quit
-     (if (y-or-n-p "Create new draft? ")
-	 (mew-user-agent-compose to subject other-headers)
-       (delete-window)
-       (error "Abort mail composing"))))
-  (let* ((basename (file-name-nondirectory (w3m-url-strip-query url)))
-	 (ct (downcase  content-type))
-	 (mew-attach-move-next-after-copy nil)
-	 (i 1)
-	 (pos -1)
-	 (csorig (mew-charset-to-cs (symbol-name charset)))
-	 last filename cs)
-    (unless (mew-attach-p)
-      (mew-draft-prepare-attachments))
-    ;; goto last attachment
-    (setq last (catch 'last
-		 (while (not (= pos (point)))
-		   (setq i (1+ i))
-		   (mew-attach-goto-number 'here `(,i))
-		   (when (mew-attach-line-lastp)
-		     (throw 'last t)))))
-    (when (eq csorig mew-cs-unknown)
-      (setq csorig nil))
-    (if (or (not last) (not (mew-attach-not-line012-1)))
-	(message "Can not attach from emacs-w3m here!")
-      ;; Application/.*xml is not inline view with Mew.
-      (cond
-       ((string= "application/xhtml+xml" ct)
-	(setq ct "text/html"))
-       ((string-match "^application/.*xml$" ct)
-	(setq ct "text/xml")))
-      (setq filename (expand-file-name (cond
-					((and (string-match "^[\t ]*$" basename)
-					      (string= ct "text/html"))
-					 "index.html")
-					((and (string-match "^[\t ]*$" basename)
-					      (string= ct "text/xml"))
-					 "index.xml")
-					((string-match "^[\t ]*$" basename)
-					 "dummy")
-					(t
-					 basename))
-				       mew-temp-dir))
-      (with-temp-buffer
-	(cond
-	 ((string= "text/html" ct)
-	  (insert source)
-	  (setq cs (w3m-static-if (fboundp 'mew-text/html-detect-cs)
-		       (mew-text/html-detect-cs (point-min) (point-max))))
-	  (when (or (eq cs mew-cs-unknown) (not cs))
-	    (cond
-	     (csorig
-	      (setq cs csorig))
-	     (t
-	      (setq cs mew-cs-autoconv)))))
-	 ((string= "text/xml" ct)
-	  (insert source)
-	  (setq cs (w3m-static-if (fboundp 'mew-text/html-detect-cs)
-		       (mew-text/html-detect-cs (point-min) (point-max))))
-	  (when (or (eq cs mew-cs-unknown) (not cs))
-	    (cond
-	     (csorig
-	      (setq cs csorig))
-	     ((mew-coding-system-p 'utf-8)
-	      (setq cs 'utf-8))
-	     (t
-	      (setq cs mew-cs-autoconv)))))
-	 ((string-match "^text/" ct)
-	  (insert source)
-	  (setq cs mew-cs-autoconv))
-	 (t
-	  (mew-set-buffer-multibyte nil)
-	  (insert source)
-	  (setq cs mew-cs-binary)))
-	(setq charset (cond
-		       ((eq cs mew-cs-autoconv)
-			(mew-charset-guess-region (point-min) (point-max)))
-		       ((eq cs mew-cs-binary)
-			nil)
-		       (t
-			(mew-cs-to-charset cs))))
-	(mew-frwlet
-	    mew-cs-text-for-read cs
-	  (write-region (point-min) (point-max) filename nil 'nomsg)))
-      (when ct
-	(setq ct (mew-capitalize ct)))
-      (mew-attach-copy filename (file-name-nondirectory filename))
-      ;; content-type check & set
-      (let* ((nums (mew-syntax-nums))
-	     (syntax (mew-syntax-get-entry mew-encode-syntax nums))
-	     (file (mew-syntax-get-file syntax))
-	     (ctl (mew-syntax-get-ct syntax))
-	     (ct-orig (mew-syntax-get-value ctl 'cap))
-	     cte)
-	(unless (string= ct ct-orig)
-	  (setq ctl (list ct))
-	  (mew-syntax-set-ct syntax ctl)
-	  (setq cte (mew-ctdb-cte (mew-ctdb-by-ct ct)))
-	  (mew-syntax-set-cte syntax cte)
-	  (mew-syntax-set-cdp syntax (mew-syntax-cdp-format ct file))
-	  (mew-encode-syntax-print mew-encode-syntax)))
-      ;; charset set
-      (let* ((nums (mew-syntax-nums))
-	     (syntax (mew-syntax-get-entry mew-encode-syntax nums))
-	     (file (mew-syntax-get-file syntax))
-	     (ctl (mew-syntax-get-ct syntax))
-	     (ct (mew-syntax-get-value ctl 'cap))
-	     (params (mew-syntax-get-params ctl))
-	     (ocharset "charset"))
-	(when (and (string-match "^Text" ct) charset)
-	  (setq params (mew-delete ocharset params))
-	  (setq ctl (cons ct (cons (list ocharset charset) params)))
-	  (mew-syntax-set-ct syntax ctl))
-	(mew-syntax-set-cd syntax url)
-	(mew-encode-syntax-print mew-encode-syntax))
-      (message "Compose a mail using Mew with %s...done" url)
-      (when (and (file-exists-p filename) (file-writable-p filename))
-	(delete-file filename)))))
-
-;;;
-(provide 'mew-w3m)
-
-;; mew-w3m.el ends here

=== removed file 'share/emacs/site-lisp/w3m/mime-w3m.el'
--- share/emacs/site-lisp/w3m/mime-w3m.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/mime-w3m.el	1970-01-01 00:00:00 +0000
@@ -1,227 +0,0 @@
-;;; mime-w3m.el --- mime-view content filter for text
-
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Author: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
-;;         Akihiro Arisawa    <ari@mbf.sphere.ne.jp>
-;; Keywords: HTML, MIME, multimedia, mail, news
-
-;; This file is *NOT* yet part of SEMI (Suite of Emacs MIME Interfaces).
-
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or (at
-;; your option) any later version.
-
-;; This program is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-
-;;; Install:
-
-;; (1) Install SEMI.
-;; (2) Put this file to appropriate directory.
-;; (3) Write these following code to your ~/.emacs or ~/.gnus.
-;;
-;;        (require 'mime-w3m)
-
-
-;;; Code:
-
-(eval-when-compile
-  (require 'cl)
-  ;; mime-parse.el should be loaded before mime.el so as not to make
-  ;; `mime-uri-parse-cid' an autoloaded function to which the byte
-  ;; compiler might issue a nonsense warning.
-  (require 'mime-parse)
-  (require 'mime)
-  (require 'w3m)
-  (defvar mime-preview-condition)
-  (defvar mime-setup-enable-inline-html)
-  (defvar mime-view-mode-default-map))
-
-(eval-and-compile
-  (when (featurep 'xemacs)
-    (require 'font)))
-
-(defcustom mime-w3m-display-inline-images 'default
-  "*Non-nil means that inline images are displayed.
-When this option is equal to `default',
-`w3m-default-display-inline-images' is refered instead of this option,
-to decide whether inline images are displayed."
-  :group 'w3m
-  :group 'mime-view
-  :type '(radio (const :format "%v " nil)
-		(sexp :format "non-nil "
-		      :match
-		      (lambda (widget value)
-			(and value (not (eq value 'default))))
-		      :value-to-internal
-		      (lambda (widget value)
-			(if (and value (not (equal value "default")))
-			    (widget-sexp-value-to-internal widget value)
-			  "t")))
-		(const default)))
-
-(defcustom mime-w3m-safe-url-regexp "\\`cid:"
-  "*Regexp that matches safe url names.
-Some HTML mails might have the trick of spammers using <img> tags.  It
-is likely to be intended to verify whether you have read the mail.
-You can prevent your personal informations from leaking by setting
-this to the regexp which matches the safe url names.  The value of the
-variable `w3m-safe-url-regexp' will be bound with this value.  You may
-set this value to nil if you consider all the urls to be safe."
-  :group 'mime-w3m
-  :type '(choice (regexp :format "%t: %v\n" :size 0)
-		 (const :tag "All URLs are safe" nil)))
-
-(defcustom mime-w3m-after-cursor-move-hook
-  '(w3m-print-this-url)
-  "*Hook run each time after the cursor moves in mime-w3m buffers.
-This hook is called by the `mime-w3m-check-current-position' function
-by way of `post-command-hook'."
-  :group 'mime-w3m
-  :type 'hook)
-
-(defcustom mime-w3m-setup-hook nil
-  "*Hook run at the end of function `mime-w3m-setup'."
-  :group 'mime-w3m
-  :type 'hook)
-
-(defvar mime-w3m-message-structure nil)
-(make-variable-buffer-local 'mime-w3m-message-structure)
-
-(defun mime-w3m-insinuate ()
-  "Insinuate `mime-w3m' module to SEMI."
-  (setq mime-setup-enable-inline-html nil)
-  (let (flag)
-    (when (boundp 'mime-preview-condition)
-      (labels ((overwrite (x)
-		(if (symbolp x)
-		    (if (eq x 'mime-preview-text/html)
-			(setq flag 'mime-w3m-preview-text/html)
-		      (when (eq x 'mime-w3m-preview-text/html)
-			(setq flag t))
-		      x)
-		  (if (consp x)
-		      (cons (overwrite (car x)) (overwrite (cdr x)))
-		    x))))
-	(setq mime-preview-condition
-	      (overwrite mime-preview-condition))))
-    (unless flag
-      (eval-after-load "mime-view"
-	'(progn
-	   (ctree-set-calist-strictly
-	    'mime-preview-condition
-	    '((type . text)
-	      (subtype . html)
-	      (body . visible)
-	      (body-presentation-method . mime-w3m-preview-text/html)))
-	   (set-alist 'mime-view-type-subtype-score-alist
-		      '(text . html) 3))))))
-
-(defun mime-w3m-setup ()
-  "Setup `mime-w3m' module."
-  (require 'w3m)
-  (when (eq mime-w3m-display-inline-images 'default)
-    (setq mime-w3m-display-inline-images w3m-default-display-inline-images))
-  (unless (assq 'mime-view-mode w3m-cid-retrieve-function-alist)
-    (push (cons 'mime-view-mode 'mime-w3m-cid-retrieve)
-	  w3m-cid-retrieve-function-alist))
-  (run-hooks 'mime-w3m-setup-hook))
-
-(def-edebug-spec mime-w3m-save-background-color t)
-(defmacro mime-w3m-save-background-color (&rest body)
-  (if (featurep 'xemacs)
-      `(let ((color (color-name (face-background 'default))))
-	 (prog1
-	     (progn ,@body)
-	   (font-set-face-background 'default color (current-buffer))))
-    (cons 'progn body)))
-
-;;;###autoload
-(defun mime-w3m-preview-text/html (entity situation)
-  (mime-w3m-setup)
-  (setq mime-w3m-message-structure (mime-find-root-entity entity))
-  (let ((p (point))
-	(xref
-	 (or (mime-entity-fetch-field entity "xref")
-	     (mime-entity-fetch-field mime-w3m-message-structure "xref"))))
-    (goto-char p)
-    (insert "\n")
-    (goto-char p)
-    (mime-w3m-save-background-color
-     (save-restriction
-       (narrow-to-region p p)
-       (mime-insert-text-content entity)
-       (run-hooks 'mime-text-decode-hook)
-       (condition-case err
-	   (let ((w3m-safe-url-regexp mime-w3m-safe-url-regexp)
-		 (w3m-display-inline-images mime-w3m-display-inline-images)
-		 w3m-force-redisplay)
-	     (w3m-region p (point-max)
-			 (and (stringp xref)
-			      (string-match "\\`http://" xref)
-			      xref)
-			 (mime-content-type-parameter
-			  (mime-entity-content-type entity)
-			  "charset"))
-	     (add-text-properties p (point-max)
-				  (list 'keymap w3m-minor-mode-map
-					'text-rendered-by-mime-w3m t)))
-	 (error (message "%s" err)))))))
-
-(let (current-load-list)
-  (defadvice mime-display-message
-    (after mime-w3m-add-local-hook activate compile)
-    "Advised by emacs-w3m.
-Set hooks run arround each command is executed."
-    (when (featurep 'w3m)
-      (w3m-add-local-hook 'pre-command-hook
-			  'w3m-store-current-position)
-      (w3m-add-local-hook 'post-command-hook
-			  'mime-w3m-check-current-position))))
-
-(defun mime-w3m-check-current-position ()
-  "Run `mime-w3m-after-cursor-move-hook' if the cursor has been moved."
-  (when (and (/= (point) (car w3m-current-position))
-	     (ignore-errors
-	       (or (get-text-property (point)
-				      'text-rendered-by-mime-w3m)
-		   (get-text-property (car w3m-current-position)
-				      'text-rendered-by-mime-w3m))))
-    (run-hooks 'mime-w3m-after-cursor-move-hook)))
-
-(defun mime-w3m-cid-retrieve (url &rest args)
-  (let ((entity (mime-find-entity-from-content-id
-		 (mime-uri-parse-cid url)
-		 (with-current-buffer w3m-current-buffer
-		   mime-w3m-message-structure))))
-    (when entity
-      ;; `mime-decode-string' should be performed in a unibyte buffer.
-      (w3m-insert-string (mime-entity-content entity))
-      (mime-entity-type/subtype entity))))
-
-(let (current-load-list)
-  (defadvice kill-new (before strip-keymap-properties-from-kill activate)
-    "Advised by emacs-w3m.
-Strip `keymap' or `local-map' properties from a killed string."
-    (if (text-property-any 0 (length (ad-get-arg 0))
-			   'text-rendered-by-mime-w3m t (ad-get-arg 0))
-	(remove-text-properties 0 (length (ad-get-arg 0))
-				'(keymap nil local-map nil)
-				(ad-get-arg 0)))))
-
-(mime-w3m-insinuate)
-
-(provide 'mime-w3m)
-
-;;; mime-w3m.el ends here

=== removed file 'share/emacs/site-lisp/w3m/octet.el'
--- share/emacs/site-lisp/w3m/octet.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/octet.el	1970-01-01 00:00:00 +0000
@@ -1,548 +0,0 @@
-;;; octet.el --- An octet stream viewer.
-
-;; Copyright (C) 2000, 2002, 2003, 2004, 2005, 2010
-;; Yuuichi Teranishi <teranisi@gohome.org>
-
-;; Author: Yuuichi Teranishi <teranisi@gohome.org>
-;; Created: 2000/05/19
-;; Keywords: octet-stream, broken document
-
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or (at
-;; your option) any later version.
-
-;; This program is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-;;
-;; Display application/octet-stream inline on the emacs buffer.
-;;
-;; This program requires:
-;;
-;; emacs-w3m for HTML rendereing.
-;; (http://emacs-w3m.namazu.org/)
-;; Mule-UCS  for UTF-8 decoding.
-;; (ftp://ftp.m17n.org/pub/mule/Mule-UCS/)
-;; wvHtml for MS Word document.
-;; (http://www.wvware.com/)
-;; xlHtml for MS Excel document.
-;; (http://chicago.sourceforge.net/xlhtml/)
-;; pptHtml for MS PowerPoint document.
-;; (http://chicago.sourceforge.net/xlhtml/)
-;; gunzip for decoding gzipped file.
-;; bunzip2 for decoding bzip2ed file.
-
-;; Put follwing line in your setting file:
-;;
-;; (require 'octet)
-;;
-;; To display octet data file, execute following command.
-;;
-;; M-x octet-find-file
-;;
-;; If you use SEMI, put following lines in your setting file:
-;;
-;; (require 'octet)
-;; (octet-mime-setup)
-;;
-;; Then you can toggle displaying application/octet-stream messages.
-
-;;; History:
-;;
-;; This file is created in 2000/05/19.
-;; All part was rewrote in 2002/01/28.
-;; Added to emacs-w3m repository in 2002/01/29.
-
-;;; Code:
-
-(eval-when-compile
-  (require 'cl))
-
-(require 'poe)     ; for compatibility
-(require 'pces)    ; as-binary-process
-(require 'mime)    ; SEMI
-(require 'static)
-(require 'w3m-util); w3m-insert-string
-
-(defvar octet-temp-directory temporary-file-directory
-  "A directory to create temporal files.")
-
-(defvar octet-html-render-function 'octet-w3m-region
-  "A function for HTML rendering.")
-
-(defvar octet-suffix-type-alist
-  '(("xls"  . msexcel)
-    ("ppt"  . msppt)
-    ("doc"  . msword)
-    ("gz"   . gzip)
-    ("bz2"  . bzip2)
-    ("html" . html)
-    ("jpg"  . jpeg)
-    ("jpeg" . jpeg)
-    ("gif"  . gif)
-    ("png"  . png)
-    ("tif"  . tiff)
-    ("tiff" . tiff)
-    ("txt"  . text)
-    ("lzh"  . lzh)
-    ("tar"  . tar)
-    ("pdf"  . pdf))
-  "Alist of suffix-to-octet-type.")
-
-(defvar octet-content-type-alist
-  '(("application/vnd\\.ms-excel"	. msexcel)
-    ("application/vnd\\.ms-powerpoint"	. msppt)
-    ("application/x-msexcel"		. msexcel)
-    ("application/msword"		. msword)
-    ("image/jpeg"			. jpeg)
-    ("image/gif"			. gif)
-    ("image/png"			. png)
-    ("image/tiff"			. tiff)
-    ("audio/midi"			. ignore)
-    ("video/mpeg"			. ignore)
-    ("text/html"			. html-un)
-    ("application/x-tar"		. tar)
-    ("application/pdf"			. pdf))
-  "Alist of content-type-regexp-to-octet-type.")
-
-(defvar octet-magic-type-alist
-  '(("^\377\330\377[\340\356]..JFIF"	image jpeg)
-    ("^\211PNG"				image png)
-    ("^GIF8[79]"			image gif)
-    ("^II\\*\000"			image tiff)
-    ("^MM\000\\*"			image tiff)
-    ("^MThd"				audio midi)
-    ("^\000\000\001\263"		video mpeg)
-    ("^<!doctype html"			text  html)
-    ("^<head"				text  html)
-    ("^<title"				text  html)
-    ("^<html"				text  html))
-  "*Alist of regexp about magic-number vs. corresponding content-types.
-Each element looks like (REGEXP TYPE SUBTYPE).
-REGEXP is a regular expression to match against the beginning of the
-content of entity.
-TYPE is symbol to indicate primary type of content-type.
-SUBTYPE is symbol to indicate subtype of content-type.")
-
-(defvar octet-type-filter-alist
-  `((msexcel octet-filter-call1	      "xlhtml" ("-te")	html-u8)
-    (msppt   octet-filter-call1	      "ppthtml" nil	html-u8)
-    (msword  octet-filter-call2-extra "wvHtml"	nil	html-u8)
-    (html    octet-render-html	      nil	nil	nil)
-    (html-u8 octet-decode-u8-text     nil	nil	html)
-    (html-un octet-decode-text	      nil	nil	html)
-    (gzip    octet-filter-call1	      "gunzip"	("-c")	guess)
-    (bzip2   octet-filter-call1	      "bunzip2"	("-c")	guess)
-    (text    octet-decode-text	      nil	nil	nil)
-    (ignore  ignore		      nil	nil	nil)
-    (jpeg    octet-decode-image	      nil	jpeg	nil)
-    (gif     octet-decode-image	      nil	gif	nil)
-    (png     octet-decode-image	      nil	png	nil)
-    (tiff    octet-decode-image	      nil	tiff	nil)
-    (guess   octet-filter-guess	      nil	nil	nil)
-    (lzh     octet-filter-call1	      "lha"	("-v")	text)
-    (tar     octet-tar-mode	      nil	nil	nil)
-    (pdf     octet-filter-call2	     "pdftotext" ("-q" "-eucjp" "-raw") text))
-  "Alist of type-to-filter-program.
-Each element should have the form like:
-\(TYPE FUNCTION FILTER_PROGRAM ARGUMENT NEW-TYPE\)
-nil in NEW-TYPE means filtering is completed.")
-
-(defvar octet-find-file-hook nil)
-
-(defvar octet-attachments nil)
-(make-variable-buffer-local 'octet-attachments)
-
-(defun octet-render-html (&rest args)
-  (funcall octet-html-render-function (point-min) (point-max))
-  0)
-
-(defun octet-decode-text (&rest args)
-  (let ((string (buffer-string)))
-    (erase-buffer)
-    (set-buffer-multibyte t)
-    (insert (decode-coding-string string 'undecided)))
-  0)
-
-;;; HTML rendering by w3m.el
-(defun w3m-about-octet-attachments (url &optional no-decode no-cache
-					&rest args)
-  (let (buffer attachments pair)
-    (set-buffer-multibyte nil)
-    (when (string-match "\\`about://octet-attachments/\\([^/]+\\)/" url)
-      (setq buffer (get-buffer (base64-decode-string (match-string 1 url)))
-	    url (substring url (match-end 0))
-	    attachments (with-current-buffer buffer
-			  octet-attachments))
-      (when (and buffer attachments
-		 (setq pair (assoc url attachments)))
-	(insert (cdr pair)))))
-  (car (funcall (symbol-function 'w3m-local-file-type) url)))
-
-(defun octet-w3m-region (beg end)
-  (let ((w3m-display-inline-images t)
-	(w3m-url-hierarchical-schemes '("about")))
-    (funcall (symbol-function 'w3m-region)
-	     beg end (concat "about://octet-attachments/"
-			     (base64-encode-string
-			      (string-as-unibyte
-			       (buffer-name (current-buffer))) "/")))
-    (setq octet-attachments nil))
-  0)
-
-;; Decode image
-(static-cond
- ((featurep 'xemacs)
-  (defun octet-decode-image (ignore &rest args)
-    (let (glyph)
-      (if (memq (car args) (image-instantiator-format-list))
-	  (progn
-	    (setq glyph (make-glyph (vector (car args) :data (buffer-string))))
-	    (if glyph
-		(progn (erase-buffer)
-		       (set-extent-end-glyph
-			(make-extent (point-min)(point-min))
-			glyph)
-		       0)
-	      1))
-	1))))
- (t
-  (defun octet-decode-image (ignore &rest args)
-    (let (image)
-      (if (image-type-available-p (car args))
-	  (progn
-	    (setq image (create-image (buffer-string) (car args) 'data))
-	    (if image
-		(progn (erase-buffer)
-		       (insert-image image) 0)
-	      1))
-	1)))))
-
-(defun octet-decode-u8-text (&rest args)
-  (let ((string (buffer-string)))
-    (erase-buffer)
-    (set-buffer-multibyte t)
-    (insert (decode-coding-string string 'utf-8)))
-  0)
-
-(defun octet-filter-call2 (filter &optional args)
-  "Call octed filter with two arguments (infile, outfile).
-Current buffer content is replaced.
-Returns 0 if succeed."
-  (let ((infile (file-name-nondirectory
-		 (make-temp-file (expand-file-name "octet"
-						   octet-temp-directory))))
-	(outfile (file-name-nondirectory
-		  (make-temp-file (expand-file-name "octet"
-						    octet-temp-directory))))
-	(last-dir default-directory)
-	result)
-    (cd octet-temp-directory)
-    (write-region-as-binary (point-min) (point-max) infile nil 'no-msg)
-    (unwind-protect
-	(progn
-	  (as-binary-process
-	   (setq result (apply 'call-process filter nil nil nil
-			       (append args (list infile outfile)))))
-	  (when (and (numberp result)
-		     (zerop result))
-	    (erase-buffer)
-	    (insert-file-contents-as-binary outfile))
-	  0)
-      (if (file-exists-p infile) (delete-file infile))
-      (if (file-exists-p outfile) (delete-file outfile))
-      (cd last-dir))))
-
-(defun octet-filter-call2-extra (filter &optional args)
-  "Call octed filter with two arguments (infile, outfile).
-Current buffer content is replaced.
-Also, exta attachments are collected to `octet-attachments'.
-Returns 0 if succeed."
-  (let ((infile (file-name-nondirectory
-		 (make-temp-file (expand-file-name "octet"
-						   octet-temp-directory))))
-	(outfile (file-name-nondirectory
-		  (make-temp-file (expand-file-name "octet"
-						    octet-temp-directory))))
-	(last-dir default-directory)
-	result)
-    (cd octet-temp-directory)
-    (write-region-as-binary (point-min) (point-max) infile nil 'no-msg)
-    (unwind-protect
-	(progn
-	  (as-binary-process
-	   (setq result (apply 'call-process filter nil nil nil
-			       (append args (list infile outfile)))))
-	  (when (and (numberp result)
-		     (zerop result))
-	    (erase-buffer)
-	    (insert-file-contents-as-binary outfile)
-	    (dolist (attach (directory-files "." nil (concat
-						      (regexp-quote outfile)
-						      ".*\\..*")))
-	      (setq octet-attachments
-		    (cons (cons
-			   attach
-			   (with-temp-buffer
-			     (insert-file-contents-as-binary attach)
-			     (buffer-string)))
-			  octet-attachments))
-	      (if (file-exists-p attach) (delete-file attach))
-	      ))
-	  0)
-      (if (file-exists-p infile) (delete-file infile))
-      (if (file-exists-p outfile) (delete-file outfile))
-      (cd last-dir))))
-
-(defun octet-filter-call1 (filter &optional args)
-  "Call external octed filter with two arguments (infile) and obtain stdout.
-Current buffer content is replaced.
-Returns 0 if succeed."
-  (let ((infile (file-name-nondirectory
-		 (make-temp-file (expand-file-name "octet"
-						   octet-temp-directory))))
-	(last-dir default-directory)
-	result)
-    (cd octet-temp-directory)
-    (write-region-as-binary (point-min) (point-max) infile nil 'no-msg)
-    (unwind-protect
-	(progn
-	  (erase-buffer)
-	  (as-binary-process
-	   (setq result (apply 'call-process filter nil t nil
-			       (append args (list infile)))))
-	  (if (numberp result) result 1))
-      (if (file-exists-p infile) (delete-file infile))
-      (cd last-dir))))
-
-(defun octet-filter-guess (&rest args)
-  (let (buffer-file-name)
-    (octet-buffer)
-    0))
-
-(defun octet-tar-mode (&rest args)
-  (funcall (symbol-function 'tar-mode))
-  0)
-
-(defun octet-guess-type-from-name (name)
-  (when (string-match "\\.\\([a-z0-9]+\\)\\'" name)
-    (cdr (assoc (downcase (match-string 1 name))
-		octet-suffix-type-alist))))
-
-(defun octet-guess-type-from-content-type (content-type)
-  (let ((alist octet-content-type-alist)
-	type)
-    (while alist
-      (when (string-match (car (car alist)) content-type)
-	(setq type (cdr (car alist))
-	      alist nil))
-      (setq alist (cdr alist)))
-    type))
-
-(defun octet-guess-type-from-magic ()
-  (let ((rest octet-magic-type-alist)
-	type subtype)
-    (goto-char (point-min))
-    (while (not (let ((cell (car rest)))
-		  (if cell
-		      (if (looking-at (car cell))
-			  (setq type (nth 1 cell)
-				subtype (nth 2 cell)))
-		    t)))
-      (setq rest (cdr rest)))
-    (if type
-	(octet-guess-type-from-content-type
-	 (concat (symbol-name type) "/" (symbol-name subtype))))))
-
-(defun octet-filter-buffer (type)
-  "Call a filter function in `octet-type-filter-alist'.
-TYPE is the symbol of type.
-Returns NEW-TYPE."
-  (let ((elem (assq type octet-type-filter-alist)))
-    (if (zerop (apply (nth 1 elem) (list (nth 2 elem) (nth 3 elem))))
-	(nth 4 elem))))
-
-;;;###autoload
-(defun octet-buffer (&optional name content-type)
-  "View octet-stream content according to `octet-type-filter-alist'.
-Optional NAME is the filename.
-If optional CONTENT-TYPE is specified, it is used for type guess."
-  (interactive)
-  (let ((type (or (and content-type
-		       (octet-guess-type-from-content-type
-			content-type))
-		  (octet-guess-type-from-magic)
-		  (and (or name buffer-file-name)
-		       (octet-guess-type-from-name
-			(or name buffer-file-name)))
-		  (intern (condition-case nil
-			      (completing-read "Octet Type(text): "
-					       (mapcar
-						(lambda (pair)
-						  (list (symbol-name
-							 (cdr pair))))
-						octet-suffix-type-alist)
-					       nil 'require-match nil nil
-					       "text")
-			    (quit "text"))))))
-    (while (setq type (octet-filter-buffer type)))))
-
-(static-if (featurep 'xemacs)
-    (defun octet-insert-buffer (from)
-      "Insert after point the contents of BUFFER and the image."
-      (let (extent glyph)
-	(with-current-buffer from
-	  (if (setq extent (extent-at (point-min) nil nil nil 'at))
-	      (setq glyph (extent-end-glyph extent))))
-	(insert-buffer-substring from)
-	(if glyph
-	    (set-extent-end-glyph (make-extent (point) (point))
-				  glyph))))
-  (defalias 'octet-insert-buffer 'insert-buffer))
-
-;;;###autoload
-(defun octet-find-file (file)
-  "Find FILE with octet-stream decoding."
-  (interactive "fFilename: ")
-  (as-binary-input-file	(find-file file))
-  (unwind-protect
-      (let ((inhibit-read-only t))
-	(octet-buffer))
-    (goto-char (point-min))
-    (set-buffer-modified-p nil)
-    (auto-save-mode -1)
-    (setq buffer-read-only t
-	  truncate-lines t)
-    (run-hooks 'octet-find-file-hook)))
-
-;;;
-;; Functions for SEMI.
-;;
-
-(defvar mime-preview-octet-hook nil)
-(defvar mime-view-octet-hook nil)
-
-;;;###autoload
-(defun mime-preview-octet (entity situation)
-  "A method for mime-view to preview octet message."
-  (goto-char (point-max))
-  (let ((p (point))
-	(name (mime-entity-filename entity))
-	from-buf to-buf)
-    (insert "\n")
-    (goto-char p)
-    (save-restriction
-      (narrow-to-region p p)
-      (setq to-buf (current-buffer))
-      (with-temp-buffer
-	(setq from-buf (current-buffer))
-	(w3m-insert-string (mime-entity-content entity))
-	(octet-buffer name (mime-entity-type/subtype entity))
-	(with-current-buffer to-buf
-	  (octet-insert-buffer from-buf)
-	  (run-hooks 'mime-preview-octet-hook))))))
-
-;;;###autoload
-(defun mime-view-octet (entity situation)
-  "A method for mime-view to display octet message."
-  (let (type subtype)
-    (let ((mdata (mime-entity-content entity))
-	  (rest octet-magic-type-alist))
-      (while (not (let ((cell (car rest)))
-		    (if cell
-			(if (string-match (car cell) mdata)
-			    (setq type (nth 1 cell)
-				  subtype (nth 2 cell)))
-		      t)))
-	(setq rest (cdr rest)))
-      (if type
-	  (progn
-	    (setq situation (del-alist 'method (copy-alist situation)))
-	    (funcall (symbol-function 'mime-play-entity)
-		     entity
-		     (put-alist 'type type
-				(put-alist 'subtype subtype
-					   situation))
-		     'mime-view-octet))
-	(let ((buf (get-buffer-create
-		    (format "%s-%s" (buffer-name) (mime-entity-number entity))))
-	      (name (mime-entity-filename entity)))
-	  (with-current-buffer buf
-	    (set-buffer-multibyte nil)
-	    (setq buffer-read-only nil)
-	    (erase-buffer)
-	    (w3m-insert-string mdata)
-	    (octet-buffer name (mime-entity-type/subtype entity))
-	    (setq buffer-read-only t
-		  truncate-lines t)
-	    (set-buffer-multibyte t)
-	    (set-buffer-modified-p nil))
-	  (let ((win (get-buffer-window (current-buffer))))
-	    (or (eq (selected-window) win)
-		(select-window (or win (get-largest-window)))))
-	  (view-buffer buf)
-	  (run-hooks 'mime-view-octet-hook)
-	  (goto-char (point-min)))))))
-
-;;;###autoload
-(defun octet-mime-setup ()
-  "Octet setting for MIME module."
-  (eval-after-load "mime-view"
-    '(progn
-       (ctree-set-calist-strictly
-	'mime-acting-condition
-	'((mode . "play")
-	  (type . application)(subtype . msword)
-	  (method . mime-view-octet)))
-
-       (ctree-set-calist-strictly
-	'mime-acting-condition
-	'((mode . "play")
-	  (type . application)(subtype . excel)
-	  (method . mime-view-octet)))
-
-       (ctree-set-calist-strictly
-	'mime-acting-condition
-	'((mode . "play")
-	  (type . application)(subtype . x-msexcel)
-	  (method . mime-view-octet)))
-
-       (ctree-set-calist-strictly
-	'mime-acting-condition
-	'((mode . "play")
-	  (type . application)(subtype . vnd.ms-excel)
-	  (method . mime-view-octet)))
-
-       (ctree-set-calist-strictly
-	'mime-acting-condition
-	'((mode . "play")
-	  (type . application)(subtype . vnd.ms-powerpoint)
-	  (method . mime-view-octet)))
-
-       (ctree-set-calist-strictly
-	'mime-acting-condition
-	'((mode . "play")
-	  (type . application)(subtype . octet-stream)
-	  (method . mime-view-octet)))
-
-       (ctree-set-calist-strictly
-	'mime-preview-condition
-	'((type . application)(subtype . t)
-	  (encoding . t)
-	  (body . invisible)
-	  (body-presentation-method . mime-preview-octet)))
-       ;; another condition?
-       )))
-
-(provide 'octet)
-
-;;; octet.el ends here

=== removed file 'share/emacs/site-lisp/w3m/w3m-antenna.el'
--- share/emacs/site-lisp/w3m/w3m-antenna.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-antenna.el	1970-01-01 00:00:00 +0000
@@ -1,659 +0,0 @@
-;;; w3m-antenna.el --- Utility to detect changes of WEB
-
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-;; Keywords: w3m, WWW, hypermedia
-
-;; This file is a part of emacs-w3m.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-
-;;; Commentary:
-
-;; w3m-antenna.el is the add-on utility of emacs-w3m to detect changes
-;; of WEB pages.  For more detail about emacs-w3m, see:
-;;
-;;    http://emacs-w3m.namazu.org/
-
-
-;;; How to install:
-
-;; Please put this file to appropriate directory, and if you want
-;; byte-compile it.  And add following lisp expressions to your
-;; ~/.emacs.
-;;
-;;     (autoload 'w3m-antenna "w3m-antenna" "Report changes of WEB sites." t)
-
-
-;;; Code:
-
-(eval-when-compile (require 'cl))
-(require 'w3m-util)
-(require 'w3m-rss)
-(require 'w3m)
-
-(defgroup w3m-antenna nil
-  "w3m-antenna - Utility to detect changes of WEB."
-  :group 'w3m
-  :prefix "w3m-antenna-")
-
-(define-widget 'w3m-antenna-string 'string
-  "String widget with default value.
-When creating a new widget, its value is given by an expression specified
-with :value-from."
-  :tag "URL"
-  :value-from nil
-  :create 'w3m-antenna-string-create)
-
-(defun w3m-antenna-string-create (widget)
-  (if (string= "" (widget-get widget :value))
-      ;; No value is given.
-      (widget-put widget :value
-		  (let* ((symbol (widget-get widget :value-from))
-			 (value  (eval symbol)))
-		    (if value
-			(set symbol nil)
-		      (setq value ""))
-		    value)))
-  (widget-default-create widget))
-
-(eval-when-compile
-  ;; Compiler warning in Emacs 19.
-  (autoload 'widget-default-get "wid-edit"))
-
-(apply 'define-widget 'w3m-antenna-function 'function
-       "Bug-fixed version of the `function' widget.
-In Emacs 20.7 through 21.4 and XEmacs, it doesn't represent a value as
-a string internally, converts it into a string in the customization
-buffer, and provides the default value as `ignore'."
-       (if (and (fboundp 'widget-default-get)
-		(widget-default-get
-		 '(function :value-to-external ignore :value foo)))
-	   '(:value-create
-	     (lambda (widget)
-	       (widget-put widget :value
-			   (widget-sexp-value-to-internal widget value))
-	       (widget-field-value-create widget))
-	     :value-to-internal
-	     (lambda (widget value) value)
-	     :value ignore)))
-
-(defvar w3m-antenna-alist nil
-  "A list of site information (internal variable).  nil means that
-antenna database is not initialized.  Each site information is a list
-that consists of:
- 0. Format string of URL.
- 1. Title.
- 2. Class (Normal, HNS or TIME).
- 3. Real URL.
- 4. Last modification time.
- 5. Size in bytes.
- 6. Time when size modification is detected.
-")
-
-(defmacro w3m-antenna-site-key (site)
-  `(car ,site))
-(defmacro w3m-antenna-site-title (site)
-  `(nth 1 ,site))
-(defmacro w3m-antenna-site-class (site)
-  `(nth 2 ,site))
-(defmacro w3m-antenna-site-url (site)
-  `(nth 3 ,site))
-(defmacro w3m-antenna-site-last-modified (site)
-  `(nth 4 ,site))
-(defmacro w3m-antenna-site-size (site)
-  `(nth 5 ,site))
-(defmacro w3m-antenna-site-size-detected (site)
-  `(nth 6 ,site))
-
-(defcustom w3m-antenna-file
-  (expand-file-name ".antenna" w3m-profile-directory)
-  "File which has list of antenna URLs."
-  :group 'w3m-antenna
-  :type '(file :size 0))
-
-(defcustom w3m-antenna-refresh-interval nil
-  "Interval time to update (to refresh) the antenna page automatically.
-The value should be a positive integer in seconds, or nil which means
-not to update the page."
-  :group 'w3m-antenna
-  :type '(choice
-	  (const :tag "Not reload." nil)
-	  (integer :tag "Interval second.")))
-
-(defcustom w3m-antenna-sites
-  (unless noninteractive
-    (mapcar (lambda (site)
-	      (list (w3m-antenna-site-key site)
-		    (w3m-antenna-site-title site)
-		    (w3m-antenna-site-class site)))
-	    (w3m-load-list w3m-antenna-file)))
-  "List of WEB sites, watched by `w3m-antenna'."
-  :group 'w3m-antenna
-  :type `(repeat
-	  (group
-	   :indent 7
-	   (w3m-antenna-string :format "URL: %v\n" :size 0
-			       :value-from w3m-antenna-tmp-url)
-	   (w3m-antenna-string :format "Title: %v\n" :size 0
-			       :value-from w3m-antenna-tmp-title)
-	   (choice
-	    :tag "Procedure"
-	    (const :tag "Check either its last modified time or its size" nil)
-	    (const :tag "Check its last modified time only" time)
-	    (const :tag "Check its current date provided by Hyper Nikki System"
-		   hns)
-	    (list :tag "Check RSS"
-		  (function-item :format "" w3m-antenna-check-rss)
-		  (string :format "URL: %v\n" :value ""))
-	    (list :tag "Check the another changelog page"
-		  (function-item :format "" w3m-antenna-check-another-page)
-		  (string :format "URL: %v\n" :value ""))
-	    (list :tag "Check the page linked by the anchor that matches"
-		  (function-item :format "" w3m-antenna-check-anchor)
-		  (regexp :value "")
-		  (integer :value 0))
-	    (cons :tag "Check with a user defined function"
-		  (w3m-antenna-function
-		   :match (lambda (widget value)
-			    (and (functionp value)
-				 (not (memq value
-					    '(w3m-antenna-check-rss
-					      w3m-antenna-check-another-page
-					      w3m-antenna-check-anchor))))))
-		  (repeat :tag "Arguments" sexp))))))
-
-(defcustom w3m-antenna-html-skelton
-  (eval-when-compile
-    (concat "<!doctype html public \"-//W3C//DTD HTML 3.2//EN\">\n"
-	    "<html>\n<head>\n<title>Antenna</title>\n%R</head>\n<body>\n"
-	    "<h1>Antenna</h1>\n<p align=\"right\">Checked at %D.</p>\n"
-	    "<h2>Updated</h2>\n<ul>\n%C</ul>\n"
-	    "<h2>Visited</h2>\n<ul>\n%U</ul>\n"
-	    "</body>\n</html>\n"))
-  "HTML skelton of antenna."
-  :group 'w3m-antenna
-  :type 'string)
-
-(defcustom w3m-antenna-make-summary-function
-  'w3m-antenna-make-summary-like-natsumican
-  "Function to make summary of site information."
-  :group 'w3m-antenna
-  :type '(choice
-	  :format "%{%t%}:\n %[Value Menu%] %v"
-	  (function-item :tag "Simple style." w3m-antenna-make-summary)
-	  (function-item :tag "Natsumican style."
-			 w3m-antenna-make-summary-like-natsumican)
-	  (function :format "User function: %v\n" :size 0)))
-
-(defcustom w3m-antenna-sort-changed-sites-function
-  'w3m-antenna-sort-sites-by-time
-  "Function to sort list of changed sites."
-  :group 'w3m-antenna
-  :type '(choice
-	  :format "%{%t%}:\n %[Value Menu%] %v"
-	  (function-item :tag "Sort by last modification time."
-			 w3m-antenna-sort-sites-by-time)
-	  (function-item :tag "Sort by title." w3m-antenna-sort-sites-by-title)
-	  (function-item :tag "Do nothing." identity)
-	  (function :format "User function: %v\n" :size 0)))
-
-(defcustom w3m-antenna-sort-unchanged-sites-function
-  'w3m-antenna-sort-sites-by-time
-  "Function to sort list of unchanged sites."
-  :group 'w3m-antenna
-  :type '(choice
-	  :format "%{%t%}:\n %[Value Menu%] %v"
-	  (function-item :tag "Sort by last modification time."
-			 w3m-antenna-sort-sites-by-time)
-	  (function-item :tag "Sort by title." w3m-antenna-sort-sites-by-title)
-	  (function-item :tag "Do nothing." identity)
-	  (function :format "User function: %v\n" :size 0)))
-
-(defun w3m-antenna-alist ()
-  (let ((alist (w3m-load-list w3m-antenna-file)))
-    (mapcar (lambda (site)
-	      (let ((l (assoc (w3m-antenna-site-key site) alist)))
-		(if l
-		    (progn
-		      (setf (w3m-antenna-site-class l)
-			    (w3m-antenna-site-class site))
-		      l)
-		  (append site (list nil nil nil nil)))))
-	    w3m-antenna-sites)))
-
-(defun w3m-antenna-hns-last-modified (url handler)
-  (w3m-process-do-with-temp-buffer
-      (type (w3m-retrieve (w3m-expand-url "di.cgi" url) nil t nil nil handler))
-    (when type
-      (or (let (start str)
-	    ;; Process a line such as "Tue, 27 Mar 2001 12:43:16 GMT<br>".
-	    (goto-char (point-min))
-	    (and
-	     (search-forward "\nLast-Modified: " nil t)
-	     (setq start (match-end 0))
-	     (search-forward "<br>" nil t)
-	     (setq str (buffer-substring start (match-beginning 0)))
-	     ;; Ignore format such as "2001, 27 03 GMT", which is used
-	     ;; by old HNS.
-	     (not (string-match
-		   " *[0-9][0-9][0-9][0-9], +[0-9][0-9] +[0-9][0-9] +" str))
-	     (w3m-time-parse-string str)))
-	  (progn
-	    ;; Process a line such as "newest day is 2001/03/15".
-	    (goto-char (point-min))
-	    (and
-	     (re-search-forward "\
-^newest day is \\([0-9][0-9][0-9][0-9]\\)/\\([0-9][0-9]\\)/\\([0-9][0-9]\\)$"
-				nil t)
-	     (encode-time 0 0 0
-			  (string-to-number (match-string 3))
-			  (string-to-number (match-string 2))
-			  (string-to-number (match-string 1))
-			  32400)))))))
-
-(defun w3m-antenna-check-hns (site handler)
-  "Check the page served by HNS (Hyper Nikki System) asynchronously."
-  (lexical-let ((site site))
-    (w3m-process-do
-	(time
-	 (w3m-antenna-hns-last-modified (w3m-antenna-site-key site) handler))
-      (if time
-	  (w3m-antenna-site-update site (w3m-antenna-site-key site) time nil)
-	(w3m-antenna-check-page site handler)))))
-
-(defun w3m-antenna-check-rss (site handler url)
-  "Check RSS to detect change of SITE asynchronously.
-In order to use this function, `xml.el' is required."
-  (lexical-let ((url url)
-		(site site))
-    (w3m-process-do-with-temp-buffer
-	(type (w3m-retrieve url nil t nil nil handler))
-      (let (link date dates)
-	(when type
-	  (w3m-decode-buffer url)
-	  (let* ((xml (ignore-errors
-			(xml-parse-region (point-min) (point-max))))
-		 (dc-ns (w3m-rss-get-namespace-prefix
-			 xml "http://purl.org/dc/elements/1.1/"))
-		 (rss-ns (w3m-rss-get-namespace-prefix
-			  xml "http://purl.org/rss/1.0/"))
-		 (channel (car (w3m-rss-find-el
-				(intern (concat rss-ns "channel"))
-				xml)))
-		 (items (w3m-rss-find-el
-			 (intern (concat rss-ns "item"))
-			 xml)))
-	    (setq link (nth 2 (car (w3m-rss-find-el
-				    (intern (concat rss-ns "link"))
-				    channel))))
-	    (setq dates (append
-			 (w3m-rss-find-el
-			  (intern (concat dc-ns "date"))
-			  channel)
-			 (w3m-rss-find-el
-			  (intern (concat dc-ns "date"))
-			  items)
-			 (w3m-rss-find-el 'pubDate channel)
-			 (w3m-rss-find-el 'pubDate items)))
-	    (when dates
-	      ;; Ignore future entries to display site announcements.
-	      (let ((now (current-time)))
-		(let ((low (+ (nth 1 now) 3600))) ; 3600 = clock skew margin
-		  (setq now
-			(if (>= low 65536)
-			    (list (1+ (car now))
-				  (- low 65536)
-				  (nth 2 now))
-			  (list (car now)
-				low
-				(nth 2 now)))))
-		(setq date '(0 0))
-		(dolist (tmp dates)
-		  (setq tmp (w3m-rss-parse-date-string (nth 2 tmp)))
-		  (and (w3m-time-newer-p tmp date)
-		       (w3m-time-newer-p now tmp)
-		       (setq date tmp)))))))
-	(if (and link date)
-	    (w3m-antenna-site-update site link date nil)
-	  (w3m-antenna-check-page site handler))))))
-
-(defun w3m-antenna-check-another-page (site handler url)
-  "Check the another page to detect change of SITE asynchronously.
-This function checks the another page specified by the URL before
-checking the SITE itself.  This function is useful when the SITE's
-owner either maintains the page which describes the change of the
-SITE."
-  (lexical-let ((site site))
-    (w3m-process-do-with-temp-buffer
-	(time (w3m-last-modified url t handler))
-      (if time
-	  (w3m-antenna-site-update site (w3m-antenna-site-key site) time nil)
-	(w3m-antenna-check-page site handler)))))
-
-(defun w3m-antenna-check-anchor (site handler regexp number)
-  "Check the page linked from SITE asynchronously.
-This function checks the page linked by an anchor that matches REGEXP
-from the page that is specified by SITE's key attribute."
-  (lexical-let ((site site)
-		(regexp regexp)
-		(number (or number 0)))
-    (w3m-process-do-with-temp-buffer
-	(type (w3m-retrieve (w3m-antenna-site-key site)
-			    nil nil nil nil handler))
-      (w3m-antenna-check-page site
-			      handler
-			      (when type
-				(w3m-decode-buffer (w3m-antenna-site-key site))
-				(goto-char (point-min))
-				(when (re-search-forward regexp nil t)
-				  (w3m-expand-url
-				   (match-string number)
-				   (w3m-antenna-site-key site))))))))
-
-;; To avoid byte-compile warning.
-(eval-and-compile
-  (autoload 'w3m-filter "w3m-filter"))
-
-(defun w3m-antenna-check-page (site handler &optional url)
-  "Check SITE with the generic procedure.
-It consists of 3 steps:
-\(1\) Check the time when the SITE was last modified with HEAD request.
-\(2\) Check the size of the SITE with HEAD request.
-\(3\) Get the real content of the SITE, and check its size.
-"
-  (lexical-let ((site site)
-		(url (or url
-			 (w3m-antenna-site-url site)
-			 (w3m-antenna-site-key site))))
-    (w3m-process-do
-	(attr (w3m-attributes url t handler))
-      (when attr
-	(if (nth 4 attr)	; Use the value of Last-modified header.
-	    (w3m-antenna-site-update site url (nth 4 attr) (nth 2 attr))
-	  (unless (eq 'time (w3m-antenna-site-class site))
-	    (if (nth 2 attr)	; Use the value of Content-Length header.
-		(w3m-antenna-site-update site url nil (nth 2 attr))
-	      ;; Get the real content of the SITE, and calculate its size.
-	      (w3m-process-do-with-temp-buffer
-		  (type (w3m-retrieve url nil t nil nil handler))
-		(when type
-		  (w3m-decode-buffer url nil type)
-		  (w3m-remove-comments)
-		  (when w3m-use-filter
-		    (w3m-filter url))
-		  (w3m-antenna-site-update site url nil (buffer-size)))))))))))
-
-(defun w3m-antenna-site-update (site url time size)
-  "Update SITE's status information with specified TIME and SIZE."
-  ;; (w3m-antenna-site-size-detected site) keeps the time when SITE's
-  ;; size attribute is checked.
-  (setf (w3m-antenna-site-size-detected site)
-	(when size
-	  (or (when (and url
-			 (w3m-antenna-site-url site)
-			 (string= url (w3m-antenna-site-url site))
-			 (w3m-antenna-site-size site)
-			 (= size (w3m-antenna-site-size site)))
-		(w3m-antenna-site-size-detected site))
-	      (current-time))))
-  (setf (w3m-antenna-site-url site) url)
-  (setf (w3m-antenna-site-last-modified site) time)
-  (setf (w3m-antenna-site-size site) size)
-  site)
-
-(defun w3m-antenna-check-site (site handler)
-  "Check SITE asynchronously.
-If a class attribute of the SITE is a list that consists of a function
-to check SITE and its options, call it.  When a class attribute of the
-SITE is equal to the symbol `hns', call `w3m-antenna-check-hns'.
-Otherwise, call `w3m-antenna-check-page'."
-  (if (and (listp (w3m-antenna-site-class site))
-	   (functionp (car (w3m-antenna-site-class site))))
-      (apply (car (w3m-antenna-site-class site))
-	     site handler (cdr (w3m-antenna-site-class site)))
-    (if (eq 'hns (w3m-antenna-site-class site))
-	(w3m-antenna-check-hns site handler)
-      (w3m-antenna-check-page site
-			      handler
-			      (format-time-string (w3m-antenna-site-key site)
-						  (current-time))))))
-
-(defun w3m-antenna-mapcar (function sequence handler)
-  "Apply FUNCTION to each element of SEQUENCE asynchronously, and make
-a list of the results."
-  (let ((index -1)
-	(table (make-symbol "table"))
-	(buffer (make-symbol "buffer")))
-    (set table (make-vector (length sequence) nil))
-    (set buffer (current-buffer))
-    (dolist (element sequence)
-      (aset (symbol-value table)
-	    (incf index)
-	    (funcall function
-		     element
-		     (cons `(lambda (x)
-			      (aset ,table ,index x)
-			      (w3m-antenna-mapcar-after ,table ,buffer))
-			   handler))))
-    (w3m-antenna-mapcar-after (symbol-value table) (symbol-value buffer))))
-
-(defun w3m-antenna-mapcar-after (result buffer)
-  "Handler function of `w3m-antenna-mapcar'.
-If all asynchronous processes have finished, return a list of the
-results for the further handler functions.  Otherwise, return an
-asynchronous process that has not finished yet."
-  (or (catch 'found-proces
-	(let ((index -1))
-	  (while (< (incf index) (length result))
-	    (when (w3m-process-p (aref result index))
-	      (throw 'found-proces (aref result index))))))
-      (progn
-	(set-buffer buffer)
-	(append result nil))))
-
-(defun w3m-antenna-check-all-sites (&optional handler)
-  "Check all sites specified in `w3m-antenna-sites'."
-  (unless w3m-antenna-alist
-    (setq w3m-antenna-alist (w3m-antenna-alist)))
-  (if (not handler)
-      (w3m-process-with-wait-handler
-	(w3m-antenna-check-all-sites handler))
-    (w3m-process-do
-	(result
-	 (w3m-antenna-mapcar 'w3m-antenna-check-site
-			     w3m-antenna-alist
-			     handler))
-      (prog1 w3m-antenna-alist
-	(w3m-save-list w3m-antenna-file w3m-antenna-alist)
-	(setq w3m-antenna-alist nil)))))
-
-(defun w3m-antenna-make-summary (site)
-  (format "<li><a href=\"%s\">%s</a> %s"
-	  (or (w3m-antenna-site-url site)
-	      (w3m-antenna-site-key site))
-	  (w3m-antenna-site-title site)
-	  (cond
-	   ((w3m-antenna-site-last-modified site)
-	    (current-time-string (w3m-antenna-site-last-modified site)))
-	   ((w3m-antenna-site-size site) "Size")
-	   (t ""))))
-
-(defun w3m-antenna-make-summary-like-natsumican (site)
-  (let ((t1 (w3m-antenna-site-last-modified site))
-	(t2 (w3m-antenna-site-size-detected site)))
-    (format "<li>%20s&nbsp;&nbsp;(%s)&nbsp;&nbsp;<a href=\"%s\">%s</a>"
-	    (if (or t1 t2)
-		(format-time-string "%Y/%m/%d %R" (or t1 t2))
-	      "----/--/-- --:--")
-	    (cond
-	     (t1 "T")
-	     (t2 "S")
-	     (t "?"))
-	    (or (w3m-antenna-site-url site)
-		(w3m-antenna-site-key site))
-	    (w3m-antenna-site-title site))))
-
-(defun w3m-antenna-sort-sites-by-time (sites)
-  (sort sites
-	(lambda (a b)
-	  (w3m-time-newer-p
-	   (or (w3m-antenna-site-last-modified a)
-	       (w3m-antenna-site-size-detected a))
-	   (or (w3m-antenna-site-last-modified b)
-	       (w3m-antenna-site-size-detected b))))))
-
-(defun w3m-antenna-sort-sites-by-title (sites)
-  (sort sites
-	(lambda (a b)
-	  (string< (w3m-antenna-site-title a)
-		   (w3m-antenna-site-title b)))))
-
-(defun w3m-antenna-make-contents (changed-sites unchanged-sites)
-  (insert w3m-antenna-html-skelton)
-  (goto-char (point-min))
-  (while (re-search-forward "%\\(.\\)" nil t)
-    (let ((c (char-after (match-beginning 1))))
-      (cond
-       ((memq c '(?C ?U))
-	(save-restriction
-	  (narrow-to-region (match-beginning 0) (match-end 0))
-	  (delete-region (point-min) (point-max))
-	  (goto-char (point-min))
-	  (dolist (site (if (eq c ?C)
-			    changed-sites
-			  unchanged-sites))
-	    (insert (funcall w3m-antenna-make-summary-function site)
-		    "\n"))
-	  (goto-char (point-max))))
-       ((eq c '?D)
-	(goto-char (match-beginning 0))
-	(delete-region (match-beginning 0) (match-end 0))
-	(insert (let ((time (nth 5 (file-attributes w3m-antenna-file))))
-		  (if time
-		      (current-time-string time)
-		    "(unknown)"))))
-       ((eq c '?R)
-	(save-restriction
-	  (narrow-to-region (match-beginning 0) (match-end 0))
-	  (delete-region (point-min) (point-max))
-	  (when (and w3m-antenna-refresh-interval
-		     (integerp w3m-antenna-refresh-interval)
-		     (< 0 w3m-antenna-refresh-interval))
-	    (insert (format "<META HTTP-EQUIV=\"Refresh\" CONTENT=\"%d\">\n"
-			    w3m-antenna-refresh-interval)))))))))
-
-;;;###autoload
-(defun w3m-about-antenna (url &optional no-decode no-cache
-			      post-data referer handler)
-  (w3m-process-do
-      (alist (if no-cache
-		 (w3m-antenna-check-all-sites handler)
-	       (or w3m-antenna-alist (w3m-antenna-alist))))
-    (let (changed unchanged)
-      (dolist (site alist)
-	(if (w3m-time-newer-p (or (w3m-antenna-site-last-modified site)
-				  (w3m-antenna-site-size-detected site))
-			      (or (w3m-arrived-last-modified
-				   (w3m-antenna-site-url site))
-				  (w3m-arrived-time
-				   (w3m-antenna-site-url site))))
-	    (progn
-	      (w3m-cache-remove (w3m-antenna-site-url site))
-	      (push site changed))
-	  (push site unchanged)))
-      (w3m-antenna-make-contents
-       (funcall w3m-antenna-sort-changed-sites-function (nreverse changed))
-       (funcall w3m-antenna-sort-unchanged-sites-function (nreverse unchanged)))
-      "text/html")))
-
-;;;###autoload
-(defun w3m-antenna (&optional no-cache)
-  "Report changes of WEB sites, which is specified in `w3m-antenna-sites'."
-  (interactive "P")
-  (w3m-goto-url "about://antenna/" no-cache))
-
-(defvar w3m-antenna-tmp-url nil)
-(defvar w3m-antenna-tmp-title nil)
-
-(defun w3m-antenna-add-current-url (&optional arg)
-  "Add link of current page to antenna.
-With prefix, ask new url to add instead of current page."
-  (interactive "P")
-  (w3m-antenna-add (if arg (w3m-input-url) w3m-current-url)
-		   (w3m-encode-specials-string w3m-current-title)))
-
-(defun w3m-antenna-add (url &optional title)
-  "Add URL to antenna.
-Optional argument TITLE is title of link."
-  (setq w3m-antenna-tmp-url url)
-  (setq w3m-antenna-tmp-title title)
-  (customize-variable 'w3m-antenna-sites)
-  ;; dirty...
-  (goto-char (point-max))
-  (re-search-backward "INS")
-  (widget-button-press (point))
-  (re-search-forward "State:\\|\\(\\[State\\]:\\)")
-  (backward-char (if (match-beginning 1) 3 2)))
-
-(defvar w3m-antenna-mode-map
-  (let ((map (make-sparse-keymap)))
-    (substitute-key-definition 'w3m-edit-current-url 'w3m-antenna-edit
-			       map w3m-mode-map)
-    map)
-  "*Keymap for `w3m-antenna-mode'.")
-
-(defvar w3m-antenna-mode nil "Non-nil if w3m antenna mode is enabled.")
-(make-variable-buffer-local 'w3m-antenna-mode)
-(unless (assq 'w3m-antenna-mode minor-mode-alist)
-  (push (list 'w3m-antenna-mode " antenna") minor-mode-alist))
-(unless (assq 'w3m-antenna-mode minor-mode-map-alist)
-  (push (cons 'w3m-antenna-mode w3m-antenna-mode-map) minor-mode-map-alist))
-
-(defun w3m-antenna-mode (&optional arg)
-  "\\<w3m-antenna-mode-map>
-Minor mode to edit antenna.
-
-\\[w3m-antenna-edit]	Customize `w3m-antenna-sites'.
-"
-  (interactive "P")
-  (when (setq w3m-antenna-mode
-	      (if arg
-		  (> (prefix-numeric-value arg) 0)
-		(not w3m-antenna-mode)))
-    (run-hooks 'w3m-antenna-mode-hook)))
-
-(defun w3m-antenna-mode-setter (url)
-  "Activate `w3m-antenna-mode', when visiting page shows antenna."
-  (w3m-antenna-mode (if (string-match "\\`about://antenna/" url)
-			 (progn
-			   (setq default-directory
-				 (file-name-directory w3m-antenna-file))
-			   1)
-		       0)))
-(add-hook 'w3m-display-functions 'w3m-antenna-mode-setter)
-
-(defun w3m-antenna-edit ()
-  "Start customize of `w3m-antenna-sites'."
-  (interactive)
-  (customize-variable 'w3m-antenna-sites))
-
-(provide 'w3m-antenna)
-
-;;; w3m-antenna.el ends here

=== removed file 'share/emacs/site-lisp/w3m/w3m-bookmark.el'
--- share/emacs/site-lisp/w3m/w3m-bookmark.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-bookmark.el	1970-01-01 00:00:00 +0000
@@ -1,591 +0,0 @@
-;;; w3m-bookmark.el --- Functions to operate bookmark file of w3m
-
-;; Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Authors: Shun-ichi GOTO     <gotoh@taiyo.co.jp>,
-;;          TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-;; Keywords: w3m, WWW, hypermedia
-
-;; This file is a part of emacs-w3m.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-
-;;; Commentary:
-
-;; w3m-bookmark.el is the add-on program of emacs-w3m to operate
-;; bookmark file.  For more detail about emacs-w3m, see:
-;;
-;;    http://emacs-w3m.namazu.org/
-
-
-;;; Code:
-
-(eval-when-compile (require 'cl))
-(require 'w3m-util)
-(require 'w3m)
-(require 'easymenu)
-
-(defcustom w3m-bookmark-file
-  (expand-file-name "bookmark.html" w3m-profile-directory)
-  "Bookmark file of w3m."
-  :group 'w3m
-  :type '(file :size 0))
-
-(defcustom w3m-bookmark-file-coding-system 'euc-japan
-  "Coding system for a created bookmark file.
-This option is used when a new bookmark file is created, or when an
-existing bookmark file includes ASCII characters only.  If the coding
-system which is used to encode your using bookmark file is different
-from the value of this option, emacs-w3m does not change the encoding
-of your bookmark file."
-  :group 'w3m
-  :type '(coding-system :size 0))
-
-(defcustom w3m-bookmark-default-section
-  nil
-  "Default section to add new entry."
-  :group 'w3m
-  :type '(radio (const :tag "Not specified" nil)
-		(string :format "Default section name: %v\n" :size 0)))
-
-(defcustom w3m-bookmark-mode-hook nil
-  "*Hook run at the end of function `w3m-bookmark-mode'."
-  :group 'w3m
-  :type 'hook)
-
-(defcustom w3m-bookmark-menu-open-new-session nil
-  "If non-nil, \"Bookmark\" menu item open new session."
-  :group 'w3m
-  :type 'boolean)
-
-(eval-and-compile
-  (defconst w3m-bookmark-section-delimiter
-    "<!--End of section (do not delete this comment)-->\n"))
-
-(eval-and-compile
-  (defconst w3m-bookmark-section-format
-    (eval-when-compile
-      (concat "<h2>%s</h2>\n<ul>\n"
-	      "<li><a href=\"%s\">%s</a>\n"
-	      w3m-bookmark-section-delimiter
-	      "</ul>\n"))))
-
-(defconst w3m-bookmark-initial-format
-  (eval-when-compile
-    (concat "<html><head><title>Bookmarks</title></head>\n"
-	    "<body>\n<h1>Bookmarks</h1>\n"
-	    w3m-bookmark-section-format
-	    "</body>\n</html>\n")))
-
-(defvar w3m-bookmark-section-history nil)
-(defvar w3m-bookmark-title-history nil)
-
-(defvar w3m-bookmark-buffer-file-name nil
-  "Non-nil means that `w3m-bookmark-file' has been loaded to this buffer.")
-(make-variable-buffer-local 'w3m-bookmark-buffer-file-name)
-
-(defvar w3m-bookmark-mode-map
-  (let ((map (make-sparse-keymap))
-	(table '((kill-line . w3m-bookmark-kill-entry)
-		 (undo . w3m-bookmark-undo))))
-    (dolist (pair table)
-      (substitute-key-definition (car pair) (cdr pair) map global-map))
-    (substitute-key-definition 'w3m-edit-current-url 'w3m-bookmark-edit
-			       map w3m-mode-map)
-    map)
-  "*Keymap for `w3m-bookmark-mode'.")
-
-(defvar w3m-bookmark-mode nil "Non-nil if w3m bookmark mode is enabled.")
-(make-variable-buffer-local 'w3m-bookmark-mode)
-(unless (assq 'w3m-bookmark-mode minor-mode-alist)
-  (push (list 'w3m-bookmark-mode " bookmark") minor-mode-alist))
-(unless (assq 'w3m-bookmark-mode minor-mode-map-alist)
-  (push (cons 'w3m-bookmark-mode w3m-bookmark-mode-map) minor-mode-map-alist))
-
-(defun w3m-bookmark-mode (&optional arg)
-  "\\<w3m-bookmark-mode-map>
-Minor mode to edit bookmark.
-
-\\[w3m-bookmark-kill-entry]	Kill the current entry of this bookmark.
-\\[w3m-bookmark-undo]	Undo some previous changes on this bookmark.
-\\[w3m-bookmark-edit]	Open `w3m-bookmark-file'.
-"
-  (interactive "P")
-  (when (setq w3m-bookmark-mode
-	      (if arg
-		  (> (prefix-numeric-value arg) 0)
-		(not w3m-bookmark-mode)))
-    (run-hooks 'w3m-bookmark-mode-hook)))
-
-(defun w3m-bookmark-mode-setter (url)
-  "Activate `w3m-bookmark-mode', when visiting page shows bookmark."
-  (w3m-bookmark-mode (if (string-match "\\`about://bookmark/" url)
-			 (progn
-			   (setq default-directory
-				 (file-name-directory w3m-bookmark-file))
-			   1)
-		       0)))
-(add-hook 'w3m-display-functions 'w3m-bookmark-mode-setter)
-
-(defun w3m-bookmark-file-modtime ()
-  "Return the modification time of the bookmark file `w3m-bookmark-file'.
-The value is a list of two time values `(HIGH LOW)' if the bookmark
-file exists, otherwise nil."
-  (nth 5 (file-attributes w3m-bookmark-file)))
-
-(defun w3m-bookmark-buffer (&optional no-verify-modtime)
-  "Return the buffer reading `w3m-bookmark-file' current."
-  (let ((buffer (get-file-buffer w3m-bookmark-file)))
-    (if buffer
-	;; When a buffer visiting `w3m-bookmark-file' is found, return
-	;; it instead of a working buffer.  In this case, kill the
-	;; working buffer which was generated in the past.
-	(progn (w3m-kill-buffer " *w3m bookmark*") buffer)
-      ;; Generate a working buffer.
-      (with-current-buffer (w3m-get-buffer-create " *w3m bookmark*")
-	(unless (and w3m-bookmark-buffer-file-name
-		     (or no-verify-modtime
-			 (equal (w3m-visited-file-modtime)
-				(w3m-bookmark-file-modtime))))
-	  (when (file-readable-p w3m-bookmark-file)
-	    (buffer-disable-undo)
-	    (erase-buffer)
-	    (let ((coding-system-for-read 'binary))
-	      (insert-file-contents w3m-bookmark-file))
-	    (w3m-decode-buffer
-	     (w3m-expand-file-name-as-url w3m-bookmark-file))
-	    (set-buffer-file-coding-system
-	     (if (memq w3m-current-coding-system
-		       '(undecided undecided-dos undecided-mac undecided-unix))
-		 w3m-bookmark-file-coding-system
-	       w3m-current-coding-system))
-	    (set-buffer-modified-p nil))
-	  (setq w3m-bookmark-buffer-file-name w3m-bookmark-file)
-	  (set-visited-file-modtime (or (w3m-bookmark-file-modtime)
-					;; No bookmark file.
-					(with-temp-buffer
-					  ;; 0 in Emacs; (0 . 0) in XEmacs
-					  (visited-file-modtime))))
-	  (buffer-enable-undo))
-	(current-buffer)))))
-
-(defun w3m-bookmark-verify-modtime ()
-  (unless (equal (w3m-visited-file-modtime)
-		 (w3m-bookmark-file-modtime))
-    (if (buffer-file-name)
-	(ask-user-about-supersession-threat w3m-bookmark-file)
-      (let ((modified (buffer-modified-p))
-	    (name (buffer-name)))
-	(unwind-protect
-	    (progn
-	      (set-visited-file-name w3m-bookmark-file)
-	      (ask-user-about-supersession-threat w3m-bookmark-file))
-	  (set-visited-file-name nil)
-	  (rename-buffer name)
-	  (set-buffer-modified-p modified))))))
-
-(defun w3m-bookmark-sections ()
-  "Return collection of registered sections."
-  (let (sections)
-    (with-current-buffer (w3m-bookmark-buffer)
-      (goto-char (point-min))
-      (while (search-forward "<h2>" nil t)
-	(push (cons (buffer-substring-no-properties
-		     (point)
-		     (if (search-forward "</h2>" nil t)
-			 (match-beginning 0)
-		       (point-at-eol)))
-		    nil)
-	      sections)))
-    (nreverse sections)))
-
-(defun w3m-bookmark-save-buffer ()
-  "Save this current buffer to `w3m-bookmark-file'."
-  (cond
-   ((buffer-file-name)
-    (basic-save-buffer))
-   ((buffer-modified-p)
-    (let ((backup-info (find-backup-file-name w3m-bookmark-file))
-	  (modes (when (file-exists-p w3m-bookmark-file)
-		   (file-modes w3m-bookmark-file))))
-      (when (and modes ; means that `w3m-bookmark-file' exists.
-		 make-backup-files
-		 (funcall backup-enable-predicate w3m-bookmark-file))
-	(rename-file w3m-bookmark-file (car backup-info) t))
-      (write-region (point-min) (point-max) w3m-bookmark-file)
-      (when modes
-	(set-file-modes w3m-bookmark-file modes))
-      (set-visited-file-modtime (w3m-bookmark-file-modtime))
-      (set-buffer-modified-p nil)
-      (dolist (file (cdr backup-info))
-	(condition-case ()
-	    (delete-file file)
-	  (file-error nil)))))))
-
-(defun w3m-bookmark-safe-string (string format)
-  (labels ((filter (s c) (decode-coding-string (encode-coding-string s c) c)))
-    (if (let ((encoding (w3m-static-when (featurep 'mule)
-			  buffer-file-coding-system)))
-	  (or (string= string (filter string encoding))
-	      (when w3m-use-mule-ucs
-		(string= (setq string
-			       (filter string
-				       (if w3m-accept-japanese-characters
-					   'w3m-euc-japan
-					 'w3m-iso-latin-1)))
-			 (filter string encoding)))))
-	string
-      (error format string))))
-
-(defun w3m-bookmark-write-file (url title section)
-  "Make new bookmark with specified spec, and save it."
-  (with-current-buffer (w3m-bookmark-buffer)
-    (setq title (w3m-bookmark-safe-string
-		 title
-		 "Specified title includes unsafe character(s): %s")
-	  section (w3m-bookmark-safe-string
-		   section
-		   "Specified section includes unsafe character(s): %s"))
-    (if (zerop (buffer-size))
-	;; New bookmark file.
-	(progn
-	  (insert (format w3m-bookmark-initial-format section url title))
-	  (set-buffer-file-coding-system w3m-bookmark-file-coding-system))
-      (goto-char (point-min))
-      (if (search-forward (format "<h2>%s</h2>" section) nil t)
-	  (progn
-	    (unless (search-forward w3m-bookmark-section-delimiter nil t)
-	      (error "Can't find section delimiter: %s" section))
-	    (goto-char (match-beginning 0))
-	    (insert (format "<li><a href=\"%s\">%s</a>\n" url title)))
-	;; New section.
-	(unless (search-forward "</body>\n" nil t)
-	  (error "%s" "Can't find terminator of bookmark"))
-	(goto-char (match-beginning 0))
-	(insert (format w3m-bookmark-section-format
-			section url title))))
-    (w3m-bookmark-save-buffer)))
-
-(defun w3m-bookmark-add (url &optional title)
-  "Add URL to bookmark.
-Optional argument TITLE is title of link."
-  (let ((section (completing-read
-		  (if w3m-bookmark-default-section
-		      (format "Section (default %s): "
-			      w3m-bookmark-default-section)
-		    "Section: ")
-		  (w3m-bookmark-sections) nil nil nil
-		  'w3m-bookmark-section-history)))
-    (and (string= section "")
-	 (setq section w3m-bookmark-default-section))
-    (when (or (not section)
-	      (string-match section "^ *$"))
-      (error "%s" "You must specify section name"))
-    (setq title (read-string "Title: " title 'w3m-bookmark-title-history))
-    (when (or (not title)
-	      (string-match title "^ *$"))
-      (error "%s" "You must specify title"))
-    (w3m-bookmark-write-file url
-			     (w3m-encode-specials-string title)
-			     (w3m-encode-specials-string section))))
-
-;;;###autoload
-(defun w3m-bookmark-add-this-url ()
-  "Add link under cursor to bookmark."
-  (interactive)
-  (if (null (w3m-anchor))
-      (message "No anchor")		; nothing to do
-    (let ((url (w3m-anchor))
-	  (title (buffer-substring-no-properties
-		  (previous-single-property-change (1+ (point))
-						   'w3m-href-anchor)
-		  (next-single-property-change (point) 'w3m-href-anchor))))
-      (w3m-bookmark-add url title))
-    (message "Added")))
-
-;;;###autoload
-(defun w3m-bookmark-add-current-url (&optional arg)
-  "Add a url of the current page to the bookmark.
-With prefix, ask for a new url instead of the present one."
-  (interactive "P")
-  (w3m-bookmark-add (if arg (w3m-input-url) w3m-current-url)
-		    w3m-current-title)
-  (message "Added"))
-
-;;;###autoload
-(defun w3m-bookmark-add-all-urls ()
-  "Add urls of all pages being visited to the bookmark."
-  (interactive)
-  (let ((buffers (w3m-list-buffers)))
-    (if (and w3m-use-tab
-	     (>= (length buffers) 2))
-	(while buffers
-	  (switch-to-buffer (pop buffers))
-	  (condition-case nil
-	      (w3m-bookmark-add-current-url)
-	    (quit)))
-      (message
-       "Use the `%s' command instead"
-       (key-description (car (where-is-internal 'w3m-bookmark-add-current-url
-						w3m-mode-map)))))))
-
-;;;###autoload
-(defun w3m-bookmark-add-current-url-group ()
-  "Add link of the group of current urls to the bookmark."
-  (interactive)
-  (w3m-bookmark-add
-   (concat "group:"
-	   (mapconcat
-	    'w3m-url-encode-string
-	    (mapcar (lambda (buffer)
-		      (with-current-buffer buffer w3m-current-url))
-		    (w3m-list-buffers))
-	    "&")))
-  (message "Added as URL group"))
-
-;;;###autoload
-(defun w3m-bookmark-view (&optional reload)
-  "Display the bookmark."
-  (interactive "P")
-  (if (file-exists-p w3m-bookmark-file)
-      (progn
-	;; Store the current position in the history structure.
-	(w3m-history-store-position)
-	(w3m-goto-url "about://bookmark/" reload))
-    (message "No bookmark file is available")))
-
-;;;###autoload
-(defun w3m-bookmark-view-new-session (&optional reload)
-  "Display the bookmark on a new session."
-  (interactive "P")
-  (if (not (eq major-mode 'w3m-mode))
-      (message "This command can be used in w3m mode only")
-    (if (file-exists-p w3m-bookmark-file)
-	(w3m-view-this-url-1 "about://bookmark/" reload 'new-session)
-      (message "No bookmark file is available"))))
-
-;;;###autoload
-(defun w3m-about-bookmark (&rest args)
-  (insert-buffer-substring (w3m-bookmark-buffer))
-  (let ((ident) (i 0) (j 0))
-    (goto-char (point-min))
-    (while (search-forward (setq ident (format "w3mbk%d." i)) nil t)
-      (incf i))
-    (setq i 0)
-    (goto-char (point-min))
-    (while (re-search-forward "\n<\\(?:h2\\|\\(li\\)\\)>" nil t)
-      (forward-char -1)
-      (insert (if (match-beginning 1)
-		  (format " id=\"%s%d.%d\"" ident i (incf j))
-		(format " id=\"%s%d\"" ident (incf i))))))
-  "text/html")
-
-(defun w3m-bookmark-current-number ()
-  "Return the ordinal number of the current bookmark entry."
-  (let ((x (car (get-text-property (point-at-eol) 'w3m-name-anchor))))
-    (and x
-	 (string-match "\\`w3mbk[0-9]+\\.[0-9]+\\.\\([0-9]+\\)\\'" x)
-	 (string-to-number (match-string 1 x)))))
-
-(defun w3m-bookmark-kill-entry (num)
-  "Kill the bookmark entry of the current line.
-With prefix argument, kill that many entries from point."
-  (interactive "p")
-  (let ((entries (w3m-bookmark-current-number)))
-    (when entries
-      (setq entries (list entries))
-      (while (> (decf num) 0)
-	(push (1+ (car entries)) entries))
-      (condition-case nil
-	  (w3m-bookmark-kill-entries entries)
-	(file-supersession nil))
-      (w3m-bookmark-view t))))
-
-(defun w3m-bookmark-kill-entries (entries)
-  (with-current-buffer (w3m-bookmark-buffer t)
-    (w3m-bookmark-verify-modtime)
-    (goto-char (point-min))
-    (let ((i 0))
-      (while (search-forward "\n<li>" nil t)
-	(when (memq (incf i) entries)
-	  (let ((beg (point-at-bol))
-		(end (progn
-		       (search-forward w3m-bookmark-section-delimiter)
-		       (match-beginning 0))))
-	    (delete-region (goto-char beg)
-			   (if (search-forward "\n<li>" end t)
-			       (point-at-bol)
-			     end))
-	    (goto-char (1- beg))))))
-    (w3m-bookmark-save-buffer)))
-
-(defun w3m-bookmark-undo (&optional arg)
-  "Undo some previous changes on bookmark."
-  (interactive "p")
-  (condition-case nil
-      (with-current-buffer (w3m-bookmark-buffer t)
-	(w3m-bookmark-verify-modtime)
-	(undo arg)
-	(w3m-bookmark-save-buffer))
-    (file-supersession nil))
-  (w3m-bookmark-view t))
-
-(defun w3m-bookmark-edit ()
-  "Edit the bookmark file."
-  (interactive)
-  (w3m-edit-url (w3m-expand-file-name-as-url w3m-bookmark-file)))
-
-;; Bookmark menu
-(defvar w3m-bookmark-menu-items
-  (let ((etsu (when w3m-use-japanese-menu
-		(decode-coding-string "\e$B1\\\e(B" 'iso-2022-jp)))) ;; $B1\(B
-    `(([,(w3m-make-menu-item (concat "$B%V%C%/%^!<%/$N(B" etsu "$BMw(B") "View Bookmark")
-	w3m-bookmark-view t]
-       [,(w3m-make-menu-item (concat "$B?7%;%C%7%g%s$G%V%C%/%^!<%/$N(B" etsu "$BMw(B")
-			     "View Bookmark in a New Session")
-	w3m-bookmark-view-new-session t]
-       [,(w3m-make-menu-item "$B%V%C%/%^!<%/$NJT=8(B" "Edit Bookmark")
-	w3m-bookmark-edit t]
-       "----"
-       [,(w3m-make-menu-item "$B$3$N%Z!<%8$r%V%C%/%^!<%/(B" "Add Current URL to Bookmark")
-	w3m-bookmark-add-current-url t]
-       [,(w3m-make-menu-item "$B$9$Y$F$N(B URL $B$r%V%C%/%^!<%/(B" "Add These URLs to Bookmark")
-	w3m-bookmark-add-current-url-group t]
-       [,(w3m-make-menu-item "$B$3$N(B URL $B$r%V%C%/%^!<%/(B" "Add This URL to Bookmark")
-	w3m-bookmark-add-this-url (w3m-anchor)])
-      .
-      ([,(w3m-make-menu-item "$B$3$N%(%s%H%j$r>C5n(B" "Kill Current Entry")
-	w3m-bookmark-kill-entry
-	(text-property-not-all (point-at-bol) (point-at-eol)
-			       'w3m-href-anchor nil)]
-       [,(w3m-make-menu-item "$B$b$H$KLa$9(B" "Undo")
-	w3m-bookmark-undo t]
-       [,(w3m-make-menu-item "$B%V%C%/%^!<%/$NJT=8(B" "Edit Bookmark")
-	w3m-bookmark-edit t])))
-  "*List of the bookmark menu items.
-The car is used if `w3m-bookmark-mode' is nil, otherwise the cdr is used.")
-
-;;;###autoload
-(defun w3m-setup-bookmark-menu ()
-  "Setup w3m bookmark items in menubar."
-  (w3m-static-if (featurep 'xemacs)
-      (unless (car (find-menu-item current-menubar '("Bookmark")))
-	(easy-menu-define w3m-bookmark-menu w3m-mode-map
-	  "" '("Bookmark" ["(empty)" ignore nil]))
-	(easy-menu-add w3m-bookmark-menu)
-	(add-hook 'activate-menubar-hook 'w3m-bookmark-menubar-update))
-    (unless (lookup-key w3m-mode-map [menu-bar Bookmark])
-      (easy-menu-define w3m-bookmark-menu w3m-mode-map "" '("Bookmark"))
-      (easy-menu-add w3m-bookmark-menu)
-      (add-hook 'menu-bar-update-hook 'w3m-bookmark-menubar-update))))
-
-(defun w3m-bookmark-menubar-update ()
-  "Update w3m bookmark menubar."
-  (when (and (eq major-mode 'w3m-mode)
-	     (w3m-static-if (featurep 'xemacs)
-		 (frame-property (selected-frame) 'menubar-visible-p)
-	       menu-bar-mode))
-    (let ((items (if w3m-bookmark-mode
-		     (cdr w3m-bookmark-menu-items)
-		   (car w3m-bookmark-menu-items)))
-	  (pages (w3m-bookmark-make-menu-items)))
-      (easy-menu-define w3m-bookmark-menu w3m-mode-map
-	"The menu kepmap for the emacs-w3m bookmark."
-	(cons "Bookmark" (if pages
-			     (append items '("----") pages)
-			   items)))
-      (w3m-static-when (featurep 'xemacs)
-	(when (setq items (car (find-menu-item current-menubar '("Bookmark"))))
-	  (setcdr items (cdr w3m-bookmark-menu))
-	  (set-buffer-menubar current-menubar))))))
-
-(defun w3m-bookmark-iterator ()
-  "Iteration bookmark groups/entries.
-Format as (list (\"Group name\" . (\"Entry URL\" . \"Entry name\")* )* )."
-  (let ((entries nil))
-    (with-current-buffer (w3m-bookmark-buffer)
-      (goto-char (point-min))
-      (let (group entry beg end)
-	(while (re-search-forward "<h2>\\([^<]+\\)</h2>" nil t)
-	  (setq group (match-string-no-properties 1))
-	  (setq beg (match-beginning 0))
-	  (setq end (re-search-forward "</ul>" nil t))
-	  (save-excursion
-	    (let (urls)
-	      (narrow-to-region beg end)
-	      (goto-char (point-min))
-	      (while (re-search-forward
-		      "<a href=\"\\([^\"]+\\)\">\\([^<]+\\)</a>"
-		      nil t)
-		(push (cons (match-string-no-properties 1)
-			    (match-string-no-properties 2))
-		      urls))
-	      (setq entry (cons group (nreverse urls)))
-	      (push entry entries)
-	      (widen)))
-	  (goto-char (match-end 0))))
-      (nreverse entries))))
-
-(defun w3m-bookmark-menu-open-item (url)
-  "Open URL at current/new buffer"
-  (if w3m-bookmark-menu-open-new-session
-      (w3m-goto-url-new-session url)
-    (w3m-goto-url url)))
-
-(defvar w3m-bookmark-menu-items-pre nil)
-(defvar w3m-bookmark-menu-items-time nil)
-
-(defvar w3m-bookmark-make-item-xmas
-  (and (equal "Japanese" w3m-language) (featurep 'xemacs)))
-
-(defun w3m-bookmark-make-item (item)
-  (if w3m-bookmark-make-item-xmas
-      (concat item "%_ ")
-    item))
-
-(defun w3m-bookmark-make-menu-items (&optional nomenu)
-  "Create w3m bookmark menu items."
-  (when (not nomenu)
-    (if (and w3m-bookmark-menu-items-pre
-	     w3m-bookmark-menu-items-time
-	     (equal w3m-bookmark-menu-items-time
-		    (w3m-bookmark-file-modtime)))
-	w3m-bookmark-menu-items-pre
-      (setq w3m-bookmark-menu-items-time (w3m-bookmark-file-modtime))
-      (let ((entries (when (file-exists-p w3m-bookmark-file)
-		       (w3m-bookmark-iterator))))
-	(setq w3m-bookmark-menu-items-pre
-	      (and entries
-		   (mapcar
-		    (lambda (entry)
-		      (let ((group (car entry))
-			    (items (cdr entry)))
-			(cons (w3m-bookmark-make-item group)
-			      (and items
-				   (mapcar
-				    (lambda (item)
-				      (vector
-				       (w3m-bookmark-make-item (cdr item))
-				       `(w3m-bookmark-menu-open-item
-					 ,(car item))))
-				    items)))))
-		    entries)))))))
-
-(provide 'w3m-bookmark)
-
-;;; w3m-bookmark.el ends here

=== removed file 'share/emacs/site-lisp/w3m/w3m-bug.el'
--- share/emacs/site-lisp/w3m/w3m-bug.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-bug.el	1970-01-01 00:00:00 +0000
@@ -1,192 +0,0 @@
-;;; w3m-bug.el --- command to report emacs-w3m bugs -*- coding: euc-japan -*-
-
-;; Copyright (C) 2002, 2003, 2005, 2007, 2010
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Author: Katsumi Yamaoka <yamaoka@jpl.org>
-;; Keywords: w3m, WWW, hypermedia
-
-;; This file is a part of emacs-w3m.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; `M-x report-emacs-w3m-bug' starts an email note to the emacs-w3m
-;; developers describing a problem.
-
-;;; Code:
-
-(defvar report-emacs-w3m-bug-address "emacs-w3m@namazu.org"
-  "*Address of mailing list for emacs-w3m bugs.")
-
-(defvar report-emacs-w3m-bug-no-explanations nil
-  "*If non-nil, suppress the explanations given for the sake of novice users.")
-
-(defconst report-emacs-w3m-bug-system-informations
-  (eval
-   '`(emacs-w3m-version
-      emacs-version
-      ,@(if (or (boundp 'mule-version)
-		(functionp 'mule-version))
-	    '(mule-version))
-      ,@(cond ((featurep 'xemacs)
-	       '((featurep 'mule)
-		 (featurep 'file-coding)))
-	      ((or (boundp 'Meadow-version)
-		   (functionp 'Meadow-version))
-	       '(Meadow-version)))
-      system-type
-      (featurep 'gtk)
-      w3m-version
-      w3m-type
-      w3m-compile-options
-      w3m-language
-      w3m-command-arguments
-      w3m-command-arguments-alist
-      w3m-command-environment
-      w3m-input-coding-system
-      w3m-output-coding-system
-      w3m-use-mule-ucs))
-  "List of the system informations.  Users should NEVER modify the value."
-  ;; For the developers:
-  ;; It is possible that it would be a security hole.  To prevent those
-  ;; rogue attacks, this constant should be reloaded for each time to
-  ;; send a bug report.  Each element can be the symbol of a variable,
-  ;; a Lisp function with no argument or any Lisp form to be evaluated.
-  )
-
-(eval-when-compile
-  (require 'cl))
-
-(defun report-emacs-w3m-bug (topic &optional buffer)
-  "Report a bug in emacs-w3m.
-Prompts for bug subject.  Leaves you in a mail buffer."
-  (interactive
-   (let* ((buffer (current-buffer))
-	  (buffers (cons buffer (delq buffer (buffer-list))))
-	  (inhibit-point-motion-hooks t)
-	  keymap)
-     (save-current-buffer
-       (while buffers
-	 (setq buffer (car buffers)
-	       buffers (cdr buffers))
-	 (set-buffer buffer)
-	 (save-restriction
-	   (widen)
-	   (if (or (eq major-mode 'w3m-mode)
-		   (and (keymapp (setq keymap
-				       (or (get-text-property
-					    (max (1- (point-max)) (point-min))
-					    'keymap)
-					   (get-text-property
-					    (max (1- (point-max)) (point-min))
-					    'local-map)))))
-		   (where-is-internal 'w3m-print-current-url keymap))
-	       (setq buffers nil)
-	     (setq buffer nil)))))
-     (list (read-string "Bug Subject: ") buffer)))
-  (let (after-load-alist)
-    ;; See the comment for `report-emacs-w3m-bug-system-informations'.
-    (load "w3m-bug"))
-  (compose-mail report-emacs-w3m-bug-address topic nil 'new)
-  (goto-char (point-min))
-  (re-search-forward (concat "^" (regexp-quote mail-header-separator) "$"))
-  (forward-line 1)
-  (unless buffer
-    (insert
-     (if (and (boundp 'w3m-language)
-	      (equal (symbol-value 'w3m-language) "Japanese"))
-	 "¤â¤·²Äǽ¤Ê¤é emacs-w3m ¤òµ¯Æ°¤·¤Æ¤«¤é¤ä¤êľ¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
-       "It is if possible, please redo after starting emacs-w3m.\n")
-     "\
-================================================================\n"))
-  (unless report-emacs-w3m-bug-no-explanations
-    ;; Insert warnings for the novice users.
-    (if (and (boundp 'w3m-language)
-	     (equal (symbol-value 'w3m-language) "Japanese"))
-	(progn
-	  (insert "¤³¤Î¥Ð¥°¥ê¥Ý¡¼¥È¤Ï emacs-w3m ³«È¯¥Á¡¼¥à¤ËÁ÷¤é¤ì¤Þ¤¹¡£\n")
-	  (put-text-property (point)
-			     (progn
-			       (insert "\
-¤¢¤Ê¤¿¤Î¥í¡¼¥«¥ë¥µ¥¤¥È¤Î´ÉÍý¼Ô°¸¤Æ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!!")
-			       (point))
-			     'face 'underline)
-	  (insert "\n\n¤Ç¤­¤ë¤À¤±´Ê·é¤Ë½Ò¤Ù¤Æ¤¯¤À¤µ¤¤:
-\t- ²¿¤¬µ¯¤­¤Þ¤·¤¿¤«?
-\t- ËÜÅö¤Ï¤É¤¦¤Ê¤ë¤Ù¤­¤À¤Ã¤¿¤È»×¤¤¤Þ¤¹¤«?
-\t- ¤½¤Î¤È¤­²¿¤ò¤·¤Þ¤·¤¿¤«? (Àµ³Î¤Ë)
-
-¤â¤· Lisp ¤Î¥Ð¥Ã¥¯¥È¥ì¡¼¥¹¤¬¤¢¤ì¤ÐźÉÕ¤·¤Æ¤¯¤À¤µ¤¤¡£\n"))
-      (insert "\
-This bug report will be sent to the emacs-w3m development team,\n")
-      (put-text-property (point)
-			 (progn
-			   (insert " not to your local site managers!!")
-			   (point))
-			 'face 'italic)
-      (insert "\nPlease write in ")
-      (put-text-property (point) (progn
-				   (insert "simple")
-				   (point))
-			 'face 'italic)
-      (insert " English, because the emacs-w3m developers
-aren't good at English reading. ;-)
-
-Please describe as succinctly as possible:
-\t- What happened.
-\t- What you thought should have happened.
-\t- Precisely what you were doing at the time.
-
-Please also include any Lisp back-traces that you may have.\n"))
-    (insert "\
-================================================================\n"))
-  (insert "Dear Bug Team!\n\n")
-  (let ((user-point (point))
-	(print-escape-newlines t)
-	(print-quoted t)
-	infos print-length print-level)
-    (insert "\n
-================================================================
-
-System Info to help track down your bug:
----------------------------------------\n")
-    (with-current-buffer (or buffer (current-buffer))
-      (dolist (info report-emacs-w3m-bug-system-informations)
-	(push (prin1-to-string info) infos)
-	(push "\n => " infos)
-	(push (cond ((functionp info)
-		     (prin1-to-string (condition-case code
-					  (funcall info)
-					(error
-					 code))))
-		    ((symbolp info)
-		     (prin1-to-string (condition-case code
-					  (symbol-value info)
-					(error
-					 code))))
-		    ((consp info)
-		     (prin1-to-string (condition-case code
-					  (eval info)
-					(error
-					 code)))))
-	      infos)
-	(push "\n" infos)))
-    (apply 'insert (nreverse infos))
-    (goto-char user-point)))
-
-;;; w3m-bug.el ends here

=== removed file 'share/emacs/site-lisp/w3m/w3m-ccl.el'
--- share/emacs/site-lisp/w3m/w3m-ccl.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-ccl.el	1970-01-01 00:00:00 +0000
@@ -1,202 +0,0 @@
-;;; w3m-ccl.el --- CCL programs to process Unicode and internal characters.
-
-;; Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
-;;          ARISAWA Akihiro <ari@mbf.sphere.ne.jp>
-;; Keywords: w3m, WWW, hypermedia
-
-;; This file is a part of emacs-w3m.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; This file contains CCL programs to process Unicode and internal
-;; characters of w3m.  For more detail about emacs-w3m, see:
-;;
-;;    http://emacs-w3m.namazu.org/
-
-;;; MEMO:
-
-;; It is possible to support multi scripts without Mule-UCS.  For more
-;; detail, see [emacs-w3m:01950]
-
-;;; Code:
-
-(eval-and-compile
-  (cond
-   ((featurep 'xemacs)
-    (require 'pccl))
-   (t
-    (require 'ccl))))
-
-;;; CCL programs:
-
-(eval-when-compile
-  (when (and (not (fboundp 'charset-id))
-	     (fboundp 'charset-id-internal))
-    (defmacro charset-id (charset)
-      "Return charset identification number of CHARSET."
-      `(charset-id-internal ,charset))))
-
-(eval-and-compile
-  (defconst w3m-internal-characters-alist
-    '((?\x90 . ? )			; ANSP (use for empty anchor)
-      (?\x91 . ? )			; IMSP (blank around image)
-      (?\xa0 . ? ))			; NBSP (non breakble space)
-    "Alist of internal characters v.s. ASCII characters.")
-
-  (defun w3m-ccl-write-repeat (charset &optional r0 r1)
-    (unless r0
-      (setq r0 'r0))
-    (unless r1
-      (setq r1 (if (eq r0 'r1) 'r0 'r1)))
-    (let ((unibyte (memq charset '(latin-iso8859-1 katakana-jisx0201))))
-      (if (fboundp 'ccl-compile-write-multibyte-character)
-	  `((,r1 &= ?\x7f)
-	    ,@(unless unibyte
-		`((,r1 |= ((,r0 & ?\x7f) << 7))))
-	    (,r0 = ,(charset-id charset))
-	    (write-multibyte-character ,r0 ,r1)
-	    (repeat))
-	`((write ,(charset-id charset))
-	  ,@(unless unibyte
-	      `((write ,r0)))
-	  (write-repeat ,r1)))))
-
-  (defconst w3m-ccl-write-euc-japan-character
-    (when (fboundp 'ccl-compile-read-multibyte-character)
-      `((read-multibyte-character r1 r0)
-	(if (r1 == ,(charset-id 'ascii))
-	    ;; (1) ASCII characters
-	    (write-repeat r0))
-	(if (r1 == ,(charset-id 'latin-jisx0201))
-	    ;; (2) Latin Part of Japanese JISX0201.1976
-	    ;;     Convert to ASCII
-	    (write-repeat r0))
-	(r2 = (r1 == ,(charset-id 'japanese-jisx0208-1978)))
-	(if ((r1 == ,(charset-id 'japanese-jisx0208)) | r2)
-	    ;; (3) Characters of Japanese JISX0208.
-	    ((r1 = ((r0 & 127) | 128))
-	     (r0 = ((r0 >> 7) | 128))
-	     (write r0)
-	     (write-repeat r1)))
-	(if (r1 == ,(charset-id 'katakana-jisx0201))
-	    ;; (4) Katakana Part of Japanese JISX0201.1976
-	    ((r0 |= 128)
-	     (write ?\x8e)
-	     (write-repeat r0)))))
-    "CCL program to write characters represented in `euc-japan'.")
-
-  (defconst w3m-ccl-write-iso-latin-1-character
-    (when (fboundp 'ccl-compile-read-multibyte-character)
-      `((read-multibyte-character r1 r0)
-	(if (r1 == ,(charset-id 'ascii))
-	    ;; (1) ASCII characters
-	    (write-repeat r0))
-	(if (r1 == ,(charset-id 'latin-jisx0201))
-	    ;; (2) Latin Part of Japanese JISX0201.1976
-	    ;;     Convert to ASCII
-	    (write-repeat r0))
-	(if (r1 == ,(charset-id 'latin-iso8859-1))
-	    ;; (3) Latin-1 characters
-	    ((r0 |= ?\x80)
-	     (write-repeat r0)))))
-    "CCL program to write characters represented in `iso-latin-1'.")
-
-  (defconst w3m-ccl-generate-ncr
-    `((r1 = 0)
-      (r2 = 0)
-      (loop
-       (r1 = (r1 << 4))
-       (r1 |= (r0 & 15))
-       (r0 = (r0 >> 4))
-       (if (r0 == 0)
-	   (break)
-	 ((r2 += 1)
-	  (repeat))))
-      (write "&#x")
-      (loop
-       (branch (r1 & 15)
-	       ,@(mapcar
-		  (lambda (i)
-		    (list 'write (string-to-char (format "%x" i))))
-		  '(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15)))
-       (r1 = (r1 >> 4))
-       (if (r2 == 0)
-	   ((write ?\;)
-	    (break))
-	 ((r2 -= 1)
-	  (repeat))))
-      (repeat))
-    "CCL program to generate a string which represents a UCS codepoint
-in NCR (Numeric Character References)."))
-
-(define-ccl-program w3m-euc-japan-decoder
-  `(2
-    (loop
-     (read r0)
-     ;; Process normal EUC characters.
-     (if (r0 < ?\x80)
-	 (write-repeat r0))
-     (if (r0 > ?\xa0)
-	 ((read r1)
-	  ,@(w3m-ccl-write-repeat 'japanese-jisx0208)))
-     (if (r0 == ?\x8e)
-	 ((read r1)
-	  ,@(w3m-ccl-write-repeat 'katakana-jisx0201)))
-     (if (r0 == ?\x8f)
-	 ((read r0)
-	  (read r1)
-	  ,@(w3m-ccl-write-repeat 'japanese-jisx0212)))
-     ;; Process internal characters used in w3m.
-     ,@(mapcar (lambda (pair)
-		 `(if (r0 == ,(car pair))
-		      (write-repeat ,(cdr pair))))
-	       w3m-internal-characters-alist)
-     (write-repeat r0))))
-
-(unless (get 'w3m-euc-japan-encoder 'ccl-program-idx)
-  (define-ccl-program w3m-euc-japan-encoder
-    `(1 (loop (read r0) (write-repeat r0)))))
-
-(define-ccl-program w3m-iso-latin-1-decoder
-  `(2
-    (loop
-     (read r0)
-     ;; Process ASCII characters.
-     (if (r0 < ?\x80)
-	 (write-repeat r0))
-     ;; Process Latin-1 characters.
-     (if (r0 > ?\xa0)
-	 (,@(w3m-ccl-write-repeat 'latin-iso8859-1 'r1)))
-     ;; Process internal characters used in w3m.
-     ,@(mapcar (lambda (pair)
-		 `(if (r0 == ,(car pair))
-		      (write-repeat ,(cdr pair))))
-	       w3m-internal-characters-alist)
-     (write-repeat r0))))
-
-(unless (get 'w3m-iso-latin-1-encoder 'ccl-program-idx)
-  (define-ccl-program w3m-iso-latin-1-encoder
-    `(1 (loop (read r0) (write-repeat r0)))))
-
-
-(provide 'w3m-ccl)
-
-;;; w3m-ccl.el ends here

=== removed file 'share/emacs/site-lisp/w3m/w3m-cookie.el'
--- share/emacs/site-lisp/w3m/w3m-cookie.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-cookie.el	1970-01-01 00:00:00 +0000
@@ -1,578 +0,0 @@
-;;; w3m-cookie.el --- Functions for cookie processing
-
-;; Copyright (C) 2002, 2003, 2005, 2006, 2008, 2009, 2010
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Authors: Teranishi Yuuichi  <teranisi@gohome.org>
-;; Keywords: w3m, WWW, hypermedia
-
-;; This file is a part of emacs-w3m.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; This file contains the functions for cookies.  For more detail
-;; about emacs-w3m, see:
-;;
-;;    http://emacs-w3m.namazu.org/
-
-;; Reference for version 0 cookie:
-;;	http://www.netscape.com/newsref/std/cookie_spec.html
-;; Reference for version 1 cookie:
-;;	http://www.ietf.org/rfc/rfc2965.txt
-;;
-
-;;; Code:
-
-(eval-when-compile
-  (require 'cl))
-
-(require 'w3m-util)
-(require 'w3m)
-
-(defvar w3m-cookies nil
-  "A list of cookie elements.
-Currently only browser local cookies are stored.")
-
-(defconst w3m-cookie-two-dot-domains-regexp
-  (concat "\\.\\(?:"
-	  (mapconcat 'identity (list "com" "edu" "net" "org" "gov" "mil" "int")
-		     "\\|")
-	  "\\)$")
-  "A regular expression of top-level domains that only require two matching
-'.'s in the domain name in order to set a cookie.")
-
-(defcustom w3m-cookie-accept-domains nil
-  "A list of trusted domain name string."
-  :group 'w3m
-  :type '(repeat (string :format "Domain name: %v\n" :size 0)))
-
-(defcustom w3m-cookie-reject-domains nil
-  "A list of untrusted domain name string."
-  :group 'w3m
-  :type '(repeat (string :format "Domain name: %v\n" :size 0)))
-
-(defcustom w3m-cookie-accept-bad-cookies nil
-  "If nil, don't accept bad cookies.
-If t, accept bad cookies.
-If ask, ask user whether accept bad cookies or not."
-  :group 'w3m
-  :type '(radio
-	  (const :tag "Don't accept bad cookies" nil)
-	  (const :tag "Ask accepting bad cookies" ask)
-	  (const :tag "Always accept bad cookies" t)))
-
-(defcustom w3m-cookie-save-cookies t
-  "*Non-nil means save cookies when emacs-w3m cookie system shutdown."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-cookie-file
-  (expand-file-name ".cookie" w3m-profile-directory)
-  "File in which cookies are kept."
-  :group 'w3m
-  :type '(file :size 0))
-
-;;; Cookie accessor.
-(defmacro w3m-cookie-url (cookie)
-  `(aref ,cookie 0))
-(defmacro w3m-cookie-domain (cookie)
-  `(aref ,cookie 1))
-(defmacro w3m-cookie-secure (cookie)
-  `(aref ,cookie 2))
-(defmacro w3m-cookie-name (cookie)
-  `(aref ,cookie 3))
-(defmacro w3m-cookie-value (cookie)
-  `(aref ,cookie 4))
-(defmacro w3m-cookie-path (cookie)
-  `(aref ,cookie 5))
-(defmacro w3m-cookie-version (cookie)
-  `(aref ,cookie 6))
-(defmacro w3m-cookie-expires (cookie)
-  `(aref ,cookie 7))
-(defmacro w3m-cookie-ignore (cookie)
-  `(aref ,cookie 8))
-
-(defun w3m-cookie-create (&rest args)
-  (let ((cookie (make-vector 9 nil)))
-    (setf (w3m-cookie-url cookie)     (plist-get args :url))
-    (setf (w3m-cookie-domain cookie)  (plist-get args :domain))
-    (setf (w3m-cookie-secure cookie)  (plist-get args :secure))
-    (setf (w3m-cookie-name cookie)    (plist-get args :name))
-    (setf (w3m-cookie-value cookie)   (plist-get args :value))
-    (setf (w3m-cookie-path cookie)    (plist-get args :path))
-    (setf (w3m-cookie-version cookie) (or (plist-get args :version) 0))
-    (setf (w3m-cookie-expires cookie) (plist-get args :expires))
-    (setf (w3m-cookie-ignore cookie)  (plist-get args :ignore))
-    cookie))
-
-(defun w3m-cookie-store (cookie)
-  "Store COOKIE."
-  (let (ignored)
-    (catch 'found
-      (dolist (c w3m-cookies)
-	(when (and (string= (w3m-cookie-domain c)
-			    (w3m-cookie-domain cookie))
-		   (string= (w3m-cookie-path c)
-			    (w3m-cookie-path cookie))
-		   (string= (w3m-cookie-name c)
-			    (w3m-cookie-name cookie)))
-	  (if (w3m-cookie-ignore c)
-	      (setq ignored t)
-	    (setq w3m-cookies (delq c w3m-cookies)))
-	  (throw 'found t))))
-    (unless ignored
-      (push cookie w3m-cookies))))
-
-(defun w3m-cookie-remove (domain path name)
-  "Remove COOKIE if stored."
-  (dolist (c w3m-cookies)
-    (when (and (string= (w3m-cookie-domain c)
-			domain)
-	       (string= (w3m-cookie-path c)
-			path)
-	       (string= (w3m-cookie-name c)
-			name))
-      (setq w3m-cookies (delq c w3m-cookies)))))
-
-(defun w3m-cookie-retrieve (host path &optional secure)
-  "Retrieve cookies for DOMAIN and PATH."
-  (let ((case-fold-search t)
-	expires	cookies)
-    (dolist (c w3m-cookies)
-      (if (and (w3m-cookie-expires c)
-	       (w3m-time-newer-p (current-time)
-				 (w3m-time-parse-string
-				  (w3m-cookie-expires c))))
-	  (push c expires)
-	(when (and (not (w3m-cookie-ignore c))
-		   (or
-		    ;; A special case that domain name is ".hostname".
-		    (string= (concat "." host) (w3m-cookie-domain c))
-		    (string-match (concat
-				   (regexp-quote (w3m-cookie-domain c)) "$")
-				  host))
-		   (string-match (concat
-				  "^" (regexp-quote (w3m-cookie-path c)))
-				 path))
-	  (if (w3m-cookie-secure c)
-	      (if secure
-		  (push c cookies))
-	    (push c cookies)))))
-    ;; Delete expired cookies.
-    (dolist (expire expires)
-      (setq w3m-cookies (delq expire w3m-cookies)))
-    cookies))
-
-;; HTTP URL parser.
-(defun w3m-parse-http-url (url)
-  "Parse an absolute HTTP URL."
-  (let (secure split)
-    (w3m-string-match-url-components url)
-    (when (and (match-beginning 4)
-	       (or (equal (match-string 2 url) "http")
-		   (setq secure (equal (match-string 2 url) "https"))))
-      (setq split (save-match-data
-		    (split-string (match-string 4 url) ":")))
-      (vector secure
-	      (nth 0 split)
-	      (string-to-number (or (nth 1 split) "80"))
-	      (if (eq (length (match-string 5 url)) 0)
-		  "/"
-		(match-string 5 url))))))
-
-(defsubst w3m-http-url-secure (http-url)
-  "Secure flag of the HTTP-URL."
-  (aref http-url 0))
-
-(defsubst w3m-http-url-host (http-url)
-  "Host name of the HTTP-URL."
-  (aref http-url 1))
-
-(defsubst w3m-http-url-port (http-url)
-  "Port number of the HTTP-URL."
-  (aref http-url 2))
-
-(defsubst w3m-http-url-path (http-url)
-  "Path of the HTTP-URL."
-  (aref http-url 3))
-
-;;; Cookie parser.
-(defvar w3m-cookie-parse-args-syntax-table
-  (copy-syntax-table emacs-lisp-mode-syntax-table)
-  "A syntax table for parsing sgml attributes.")
-
-(modify-syntax-entry ?' "\"" w3m-cookie-parse-args-syntax-table)
-(modify-syntax-entry ?` "\"" w3m-cookie-parse-args-syntax-table)
-(modify-syntax-entry ?{ "(" w3m-cookie-parse-args-syntax-table)
-(modify-syntax-entry ?} ")" w3m-cookie-parse-args-syntax-table)
-
-(defun w3m-cookie-parse-args (str &optional nodowncase)
-  (let (name value results name-pos val-pos)
-    (with-current-buffer (get-buffer-create " *w3m-cookie-parse-temp*")
-      (erase-buffer)
-      (set-syntax-table w3m-cookie-parse-args-syntax-table)
-      (insert str)
-      (goto-char (point-min))
-      (while (not (eobp))
-	(skip-chars-forward "; \n\t")
-	(setq name-pos (point))
-	(skip-chars-forward "^ \n\t=;")
-	(unless nodowncase
-	  (downcase-region name-pos (point)))
-	(setq name (buffer-substring name-pos (point)))
-	(skip-chars-forward " \t\n")
-	(if (/= (or (char-after (point)) 0)  ?=) ; There is no value
-	    (setq value nil)
-	  (skip-chars-forward " \t\n=")
-	  (setq val-pos (point)
-		value
-		(cond
-		 ((or (= (or (char-after val-pos) 0) ?\")
-		      (= (or (char-after val-pos) 0) ?'))
-		  (buffer-substring (1+ val-pos)
-				    (condition-case ()
-					(prog2
-					    (forward-sexp 1)
-					    (1- (point))
-					  (skip-chars-forward "\""))
-				      (error
-				       (skip-chars-forward "^ \t\n")
-				       (point)))))
-		 (t
-		  (buffer-substring val-pos
-				    (progn
-				      (skip-chars-forward "^;")
-				      (skip-chars-backward " \t")
-				      (point)))))))
-	(push (cons name value) results)
-	(skip-chars-forward "; \n\t"))
-      results)))
-
-(defun w3m-cookie-trusted-host-p (host)
-  "Returns non-nil when the HOST is specified as trusted by user."
-  (let ((accept w3m-cookie-accept-domains)
-	(reject w3m-cookie-reject-domains)
-	(trusted t)
-	regexp tlen rlen)
-    (while accept
-      (cond
-       ((string= (car accept) ".")
-	(setq regexp ".*"))
-       ((string= (car accept) ".local")
-	(setq regexp "^[^\\.]+$"))
-       ((eq (string-to-char (car accept)) ?.)
-	(setq regexp (concat (regexp-quote (car accept)) "$")))
-       (t (setq regexp (concat "^" (regexp-quote (car accept)) "$"))))
-      (when (string-match regexp host)
-	(setq tlen (length (car accept))
-	      accept nil))
-      (pop accept))
-    (while reject
-      (cond
-       ((string= (car reject) ".")
-	(setq regexp ".*"))
-       ((string= (car reject) ".local")
-	(setq regexp "^[^\\.]+$"))
-       ((eq (string-to-char (car reject)) ?.)
-	(setq regexp (concat (regexp-quote (car reject)) "$")))
-       (t (setq regexp (concat "^" (regexp-quote (car reject)) "$"))))
-      (when (string-match regexp host)
-	(setq rlen (length (car reject))
-	      reject nil))
-      (pop reject))
-    (if tlen
-	(if rlen
-	    (if (<= tlen rlen)
-		(setq trusted nil)))
-      (if rlen
-	  (setq trusted nil)))
-    trusted))
-
-;;; Version 0 cookie.
-(defun w3m-cookie-1-acceptable-p (host domain)
-  (let ((numdots 0)
-	(last nil)
-	(case-fold-search t)
-	(mindots 3))
-    (while (setq last (string-match "\\." domain last))
-      (setq numdots (1+ numdots)
-	    last (1+ last)))
-    (if (string-match w3m-cookie-two-dot-domains-regexp domain)
-	(setq mindots 2))
-    (cond
-     ((string= host domain)		; Apparently netscape lets you do this
-      t)
-     ;; A special case that domain name is ".hostname".
-     ((string= (concat "." host) domain)
-      t)
-     ((>= numdots mindots)		; We have enough dots in domain name
-      ;; Need to check and make sure the host is actually _in_ the
-      ;; domain it wants to set a cookie for though.
-      (string-match (concat (regexp-quote domain) "$") host))
-     (t
-      nil))))
-
-(defun w3m-cookie-1-set (url &rest args)
-  ;; Set-Cookie:, version 0 cookie.
-  (let ((http-url (w3m-parse-http-url url))
-	(case-fold-search t)
-	secure domain expires path rest)
-    (when http-url
-      (setq secure (and (w3m-assoc-ignore-case "secure" args) t)
-	    domain (or (cdr-safe (w3m-assoc-ignore-case "domain" args))
-		       (w3m-http-url-host http-url))
-	    expires (cdr-safe (w3m-assoc-ignore-case "expires" args))
-	    path (or (cdr-safe (w3m-assoc-ignore-case "path" args))
-		     (file-name-directory
-		      (w3m-http-url-path http-url))))
-      (while args
-	(if (not (member (downcase (car (car args)))
-			 '("secure" "domain" "expires" "path")))
-	    (setq rest (cons (car args) rest)))
-	(setq args (cdr args)))
-      (cond
-       ((not (w3m-cookie-trusted-host-p (w3m-http-url-host http-url)))
-	;; The site was explicity marked as untrusted by the user
-	nil)
-       ((or (w3m-cookie-1-acceptable-p (w3m-http-url-host http-url) domain)
-	    (eq w3m-cookie-accept-bad-cookies t)
-	    (and (eq w3m-cookie-accept-bad-cookies 'ask)
-		 (y-or-n-p (format "Accept bad cookie from %s for %s? "
-				   (w3m-http-url-host http-url) domain))))
-	;; Cookie is accepted by the user, and passes our security checks
-	(dolist (elem rest)
-	  ;; If a CGI script wishes to delete a cookie, it can do so by
-	  ;; returning a cookie with the same name, and an expires time
-	  ;; which is in the past.
-	  (when (and expires
-		     (w3m-time-newer-p (current-time)
-				       (w3m-time-parse-string expires)))
-	    (w3m-cookie-remove domain path (car elem)))
-	  (w3m-cookie-store
-	   (w3m-cookie-create :url url
-			      :domain domain
-			      :name (car elem)
-			      :value (cdr elem)
-			      :path path
-			      :expires expires
-			      :secure secure))))
-       (t
-	(message "%s tried to set a cookie for domain %s - rejected."
-		 (w3m-http-url-host http-url) domain))))))
-
-;;; Version 1 cookie.
-(defun w3m-cookie-2-acceptable-p (http-url domain)
-  ;;   A user agent rejects (SHALL NOT store its information) if the Version
-  ;;   attribute is missing.  Moreover, a user agent rejects (SHALL NOT
-  ;;   store its information) if any of the following is true of the
-  ;;   attributes explicitly present in the Set-Cookie2 response header:
-
-  ;;      *  The value for the Path attribute is not a prefix of the
-  ;;         request-URI.
-
-  ;;      *  The value for the Domain attribute contains no embedded dots,
-  ;;         and the value is not .local.
-
-  ;;      *  The effective host name that derives from the request-host does
-  ;;         not domain-match the Domain attribute.
-
-  ;;      *  The request-host is a HDN (not IP address) and has the form HD,
-  ;;         where D is the value of the Domain attribute, and H is a string
-  ;;         that contains one or more dots.
-
-  ;;      *  The Port attribute has a "port-list", and the request-port was
-  ;;         not in the list.
-  )
-
-(defun w3m-cookie-2-set (url &rest args)
-  ;; Set-Cookie2:, version 1 cookie.
-  ;; Not implemented yet.
-  )
-
-
-;;; Save & Load
-(defvar w3m-cookie-init nil)
-
-(defun w3m-cookie-clear ()
-  "Clear cookie list."
-  (setq w3m-cookies nil))
-
-(defun w3m-cookie-save (&optional domain)
-  "Save cookies.
-When DOMAIN is non-nil, only save cookies whose domains match it."
-  (interactive)
-  (let (cookies)
-    (dolist (cookie w3m-cookies)
-      (when (and (or (not domain)
-		     (string= (w3m-cookie-domain cookie) domain))
-		 (w3m-cookie-expires cookie)
-		 (w3m-time-newer-p (w3m-time-parse-string
-				    (w3m-cookie-expires cookie))
-				   (current-time)))
-	(push cookie cookies)))
-    (w3m-save-list w3m-cookie-file cookies)))
-
-(defun w3m-cookie-save-current-site-cookies ()
-  "Save cookies for the current site."
-  (interactive)
-  (when (and w3m-current-url
-	     (not (w3m-url-local-p w3m-current-url)))
-    (w3m-string-match-url-components w3m-current-url)
-    (w3m-cookie-save (match-string 4 w3m-current-url))))
-
-(defun w3m-cookie-load ()
-  "Load cookies."
-  (when (null w3m-cookies)
-    (setq w3m-cookies
-	  (w3m-load-list w3m-cookie-file))))
-
-(defun w3m-cookie-setup ()
-  "Setup cookies. Returns immediataly if already initialized."
-  (interactive)
-  (unless w3m-cookie-init
-    (w3m-cookie-load)
-    (setq w3m-cookie-init t)))
-
-;;;###autoload
-(defun w3m-cookie-shutdown ()
-  "Save cookies, and reset cookies' data."
-  (interactive)
-  (when w3m-cookie-save-cookies
-    (w3m-cookie-save))
-  (setq w3m-cookie-init nil)
-  (w3m-cookie-clear)
-  (if (get-buffer " *w3m-cookie-parse-temp*")
-      (kill-buffer (get-buffer " *w3m-cookie-parse-temp*"))))
-
-;;;###autoload
-(defun w3m-cookie-set (url beg end)
-  "Register cookies which correspond to URL.
-BEG and END should be an HTTP response header region on current buffer."
-  (w3m-cookie-setup)
-  (when (and url beg end)
-    (save-excursion
-      (let ((case-fold-search t)
-	    (version 0)
-	    data)
-	(goto-char beg)
-	(while (re-search-forward
-		"^\\(?:Set-Cookie\\(2\\)?:\\) *\\(.*\\(?:\n[ \t].*\\)*\\)\n"
-		end t)
-	  (setq data (match-string 2))
-	  (if (match-beginning 1)
-	      (setq version 1))
-	  (apply
-	   (case version
-	     (0 'w3m-cookie-1-set)
-	     (1 'w3m-cookie-2-set))
-	   url (w3m-cookie-parse-args data 'nodowncase)))))))
-
-;;;###autoload
-(defun w3m-cookie-get (url)
-  "Get a cookie field string which corresponds to the URL."
-  (w3m-cookie-setup)
-  (let* ((http-url (w3m-parse-http-url url))
-	 (cookies (and http-url
-		       (w3m-cookie-retrieve (w3m-http-url-host http-url)
-					    (w3m-http-url-path http-url)
-					    (w3m-http-url-secure http-url)))))
-    ;; When sending cookies to a server, all cookies with a more specific path
-    ;; mapping should be sent before cookies with less specific path mappings.
-    (setq cookies (sort cookies
-			(lambda (x y)
-			  (< (length (w3m-cookie-path x))
-			     (length (w3m-cookie-path y))))))
-    (when cookies
-      (mapconcat (lambda (cookie)
-		   (concat (w3m-cookie-name cookie)
-			   "=" (w3m-cookie-value cookie)))
-		 cookies
-		 "; "))))
-
-;;;###autoload
-(defun w3m-cookie (&optional no-cache)
-  "Display cookies and enable you to manage them."
-  (interactive "P")
-  (w3m-goto-url "about://cookie/" no-cache))
-
-;;;###autoload
-(defun w3m-about-cookie (url &optional no-decode no-cache post-data &rest args)
-  "Make the html contents to display and to enable you to manage cookies."
-  (unless w3m-use-cookies (error "You must enable emacs-w3m to use cookies."))
-  (w3m-cookie-setup)
-  (let ((pos 0))
-    (when post-data
-      (dolist (pair (split-string post-data "&"))
-	(setq pair (split-string pair "="))
-	(setf (w3m-cookie-ignore
-	       (nth (string-to-number (car pair)) w3m-cookies))
-	      (eq (string-to-number (cadr pair)) 0))))
-    (insert
-     (concat
-      "\
-<html><head><title>Cookies</title></head>
-<body><center><b>Cookies</b></center>
-<p><form method=\"post\" action=\"about://cookie/\">
-<ol>"))
-    (dolist (cookie w3m-cookies)
-      (insert
-       (concat
-	"<li><h1><a href=\""
-	(w3m-cookie-url cookie)
-	"\">"
-	(w3m-cookie-url cookie)
-	"</a></h1>"
-	"<table cellpadding=0>"
-	"<tr><td width=\"80\"><b>Cookie:</b></td><td>"
-	(w3m-cookie-name cookie) "=" (w3m-cookie-value cookie)
-	"</td></tr>"
-	(when (w3m-cookie-expires cookie)
-	  (concat
-	   "<tr><td width=\"80\"><b>Expires:</b></td><td>"
-	   (w3m-cookie-expires cookie)
-	   "</td></tr>"))
-	"<tr><td width=\"80\"><b>Version:</b></td><td>"
-	(number-to-string (w3m-cookie-version cookie))
-	"</td></tr>"
-	(when (w3m-cookie-domain cookie)
-	  (concat
-	   "<tr><td width=\"80\"><b>Domain:</b></td><td>"
-	   (w3m-cookie-domain cookie)
-	   "</td></tr>"))
-	(when (w3m-cookie-path cookie)
-	  (concat
-	   "<tr><td width=\"80\"><b>Path:</b></td><td>"
-	   (w3m-cookie-path cookie)
-	   "</td></tr>"))
-	"<tr><td width=\"80\"><b>Secure:</b></td><td>"
-	(if (w3m-cookie-secure cookie) "Yes" "No")
-	"</td></tr><tr><td>"
-	"<tr><td width=\"80\"><b>Use:</b></td><td>"
-	(format "<input type=radio name=\"%d\" value=1%s>Yes"
-		pos (if (w3m-cookie-ignore cookie) "" " checked"))
-	"&nbsp;&nbsp;"
-	(format "<input type=radio name=\"%d\" value=0%s>No"
-		pos (if (w3m-cookie-ignore cookie) " checked" ""))
-	"</td></tr><tr><td><input type=submit value=\"OK\"></table><p>"))
-      (setq pos (1+ pos)))
-    (insert "</ol></form></body></html>")
-    "text/html"))
-
-(provide 'w3m-cookie)
-
-;;; w3m-cookie.el ends here

=== removed file 'share/emacs/site-lisp/w3m/w3m-dtree.el'
--- share/emacs/site-lisp/w3m/w3m-dtree.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-dtree.el	1970-01-01 00:00:00 +0000
@@ -1,239 +0,0 @@
-;;; w3m-dtree.el --- The add-on program to display local directory tree.
-
-;; Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2009
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Author: Hideyuki SHIRAI    <shirai@meadowy.org>,
-;;         TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-;; Keywords: w3m, WWW, hypermedia, directory, tree
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-
-;;; Commentary:
-
-;; w3m-dtree.el is the add-on program of emacs-w3m to display local
-;; directory tree.  For more detail about emacs-w3m, see:
-;;
-;;    http://emacs-w3m.namazu.org/
-
-
-;;; Code:
-(require 'w3m)
-
-(defcustom w3m-dtree-default-allfiles nil
-  "*If non-nil, set 'allfiles' to default."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-dtree-directory-depth 8
-  "*Interger of a depth of the viewing directory."
-  :group 'w3m
-  :type '(choice
-	  (const :tag "No limit" nil)
-	  (integer :format "%t: %v\n" :size 0 :tag "depth" 10)))
-
-(defcustom w3m-dtree-indent-strings ["|-" "+-" "|  " "   "]
-  "*Vector of strings to be used for indentation with w3m-dtree.
-
-If use default value or choice 'ASCII', display like this,
-/home/shirai/work/emacs-w3m/
- |-CVS/
- |-icons/
- |  +-CVS/
- +-shimbun/
-    +-CVS/
-
-If you care for another style, set manually and try it :-).
-"
-  :group 'w3m
-  :type '(radio
-	  (const :format "ASCII: " ["|-" "+-" "|  " "   "])
-	  (vector
-	   :convert-widget w3m-widget-type-convert-widget
-	   (let ((defaults (if (equal w3m-language "Japanese")
-			       (vconcat
-				(mapcar
-				 (lambda (s)
-				   (decode-coding-string s 'iso-2022-7bit))
-				 '("\e$B('\e(B" "\e$B(&\e(B"
-				   "\e$B(\"\e(B" "\e$B!!\e(B")))
-			     ["|-" "+-" "|  " "   "])))
-	     `(:format "Others:\n%v" :indent 4
-		       (string :format "%{|-%}          %v\n"
-			       :sample-face widget-field-face :size 0
-			       :value ,(aref defaults 0))
-		       (string :format "%{+-%}          %v\n"
-			       :sample-face widget-field-face :size 0
-			       :value ,(aref defaults 1))
-		       (string :format "%{|  %}         %v\n"
-			       :sample-face widget-field-face :size 0
-			       :value ,(aref defaults 2))
-		       (string :format "%{   %}         %v"
-			       :sample-face widget-field-face :size 0
-			       :value ,(aref defaults 3)))))))
-
-(defcustom w3m-dtree-stop-strings ["|=" "+="]
-  "*Vector of strings to be used for indentation when a depth of directory
-over the 'w3m-dtree-directory-depth'."
-  :group 'w3m
-  :type '(radio
-	  (const :format "ASCII: " ["|=" "+="])
-	  (const :format "ASCII Bold: " ["<b>|-</b>" "<b>+-</b>"])
-	  (vector
-	   :convert-widget w3m-widget-type-convert-widget
-	   (let ((defaults (if (equal w3m-language "Japanese")
-			       (vconcat
-				(mapcar
-				 (lambda (s)
-				   (decode-coding-string s 'iso-2022-7bit))
-				 '("\e$B(<\e(B" "\e$B(1\e(B")))
-			     ["|=" "+="])))
-	     `(:format "Others:\n%v" :indent 4
-		       (string :format "|=          %{|=%}              %v\n"
-			       :sample-face bold :size 0
-			       :value ,(aref defaults 0))
-		       (string :format "+=          %{+=%}              %v\n"
-			       :sample-face bold :size 0
-			       :value ,(aref defaults 1)))))))
-
-(defun w3m-dtree-expand-file-name (path)
-  (if (string-match "^\\(.\\):\\(.*\\)" path)
-      (if w3m-use-cygdrive
-	  (concat "/cygdrive/"
-		  (match-string 1 path) (match-string 2 path))
-	(concat "/" (match-string 1 path) "|" (match-string 2 path)))
-    path))
-
-(defun w3m-dtree-directory-name (path)
-  (when (and w3m-treat-drive-letter
-	     (string-match
-	      "^/\\(?:\\([A-Za-z]\\)[|:]?\\|cygdrive/\\([A-Za-z]\\)\\)/"
-	      path))
-    (setq path (concat
-		(or (match-string 1 path)
-		    (match-string 2 path))
-		":/"
-		(substring path (match-end 0)))))
-  path)
-
-(defmacro w3m-dtree-has-child (path)
-  `(let ((w32-get-true-file-link-count t)) ;; true link count for Meadow
-     (and (nth 1 (file-attributes ,path))
-	  (/= (nth 1 (file-attributes ,path)) 2))))
-
-(defun w3m-dtree-create-sub (path allfiles dirprefix fileprefix indent depth)
-  (let* ((files (directory-files path t))
-	 (limit (and (integerp w3m-dtree-directory-depth)
-		     (>= depth w3m-dtree-directory-depth)))
-	 (indent-sub1 (if limit
-			  (aref w3m-dtree-stop-strings 0)
-			(aref w3m-dtree-indent-strings 0)))
-	 (indent-sub2 (aref w3m-dtree-indent-strings 2))
-	 file fullpath tmp)
-    (setq files (delete (concat (file-name-as-directory path) ".")
-			(delete (concat (file-name-as-directory path) "..")
-				files)))
-    (unless allfiles
-      (setq tmp files)
-      (while (setq file (car tmp))
-	(unless (file-directory-p file)
-	  (setq files (delete file files)))
-	(setq tmp (cdr tmp))))
-    (while (setq fullpath (car files))
-      (when (= (length files) 1)
-	(if limit
-	    (setq indent-sub1 (aref w3m-dtree-stop-strings 1))
-	  (setq indent-sub1 (aref w3m-dtree-indent-strings 1)))
-	(setq indent-sub2 (aref w3m-dtree-indent-strings 3)))
-      (setq file (file-name-nondirectory fullpath))
-      (cond
-       ((or (not allfiles) (file-directory-p fullpath))
-	(insert (format "%s%s%s<A HREF=\"%s%s\">%s</A>\n"
-			indent indent-sub1
-			(if allfiles "<B>[d]</B>" "")
-			dirprefix
-			(w3m-dtree-expand-file-name (file-name-as-directory fullpath))
-			(concat file "/")))
-	(when (and (null limit)
-		   (or allfiles (w3m-dtree-has-child fullpath)))
-	  (w3m-dtree-create-sub fullpath allfiles dirprefix fileprefix
-				(concat indent indent-sub2) (1+ depth))))
-       ((and allfiles (file-exists-p fullpath))
-	(insert (format "%s%s%s<A HREF=\"%s%s\">%s</A>\n"
-			indent indent-sub1
-			(if allfiles "(f)" "")
-			fileprefix (w3m-dtree-expand-file-name fullpath)
-			file))))
-      (setq files (cdr files)))))
-
-(defun w3m-dtree-create (path allfiles dirprefix fileprefix)
-  (let ((charset (or (car (rassq w3m-file-name-coding-system
-				 w3m-charset-coding-system-alist))
-		     w3m-file-name-coding-system)))
-    (insert "<!doctype html public \"-//W3C//DTD HTML 3.2//EN\">\n"
-	    "<html>\n<head>\n"
-	    "<meta http-equiv=\"CONTENT-TYPE\" "
-	    "content=\"text/html; charset="
-	    (symbol-name charset)
-	    "\">\n"
-	    "<title>"
-	    path
-	    "</title>\n</head>\n<body>\n<pre>\n")
-    (insert (format "<A HREF=\"%s%s\">%s</A>%s\n"
-		    dirprefix (w3m-dtree-expand-file-name path) path
-		    (if allfiles " (allfiles)" "")))
-    (if (file-directory-p path)
-	(w3m-dtree-create-sub path allfiles dirprefix fileprefix " " 0)
-      (insert (format "\n<h3>Warning: Directory not found.</h3>\n")))
-    (insert "</pre>\n</body>\n</html>\n")))
-
-;;;###autoload
-(defun w3m-about-dtree (url &optional nodecode allfiles &rest args)
-  (let ((prelen (length "about://dtree"))
-	(dirprefix "about://dtree")
-	(fileprefix "file://")
-	path)
-    (if (string-match "\\?allfiles=\\(?:\\(true\\)\\|false\\)$" url)
-	(progn
-	  (setq path (substring url prelen (match-beginning 0)))
-	  (if (match-beginning 1) (setq allfiles t)))
-      (if w3m-dtree-default-allfiles
-	  (setq allfiles (not allfiles)))
-      (setq path (substring url prelen)))
-    ;; counter drive letter
-    (setq path (file-name-as-directory (w3m-dtree-directory-name path)))
-    (setq default-directory path)
-    (w3m-message "Dtree (%s)..." path)
-    (w3m-dtree-create path allfiles dirprefix fileprefix)
-    (w3m-message "Dtree...done")
-    "text/html"))
-
-;;;###autoload
-(defun w3m-dtree (allfiles path)
-  "Display directory tree on local file system.
-If called with 'prefix argument', display all directorys and files."
-  (interactive "P\nDDtree directory: ")
-  (if w3m-dtree-default-allfiles
-      (setq allfiles (not allfiles)))
-  (w3m-goto-url (format "about://dtree%s%s"
-			(w3m-dtree-expand-file-name
-			 (file-name-as-directory
-			  (expand-file-name path)))
-			(if allfiles "?allfiles=true" ""))))
-
-(provide 'w3m-dtree)
-;;; w3m-dtree.el ends here

=== removed file 'share/emacs/site-lisp/w3m/w3m-ems.el'
--- share/emacs/site-lisp/w3m/w3m-ems.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-ems.el	1970-01-01 00:00:00 +0000
@@ -1,1416 +0,0 @@
-;;; w3m-ems.el --- GNU Emacs stuff for emacs-w3m
-
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Authors: Yuuichi Teranishi  <teranisi@gohome.org>,
-;;          TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
-;;          Katsumi Yamaoka    <yamaoka@jpl.org>
-;; Keywords: w3m, WWW, hypermedia
-
-;; This file is a part of emacs-w3m.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-
-;;; Commentary:
-
-;; This file contains GNU Emacs stuff that emacs-w3m uses.  For more
-;; detail about emacs-w3m, see:
-;;
-;;    http://emacs-w3m.namazu.org/
-;;
-;; We can use w3m-static- switches to make the byte code differ between
-;; Emacs 2[12] and 2[34], if anything, it is impossible to share the byte
-;; code with those versions of Emacsen.
-
-;;; Code:
-
-(eval-when-compile
-  (require 'cl))
-
-(require 'w3m-util)
-(require 'w3m-proc)
-(require 'w3m-image)
-(require 'w3m-favicon)
-(require 'w3m-ccl)
-(require 'wid-edit)
-
-;; Functions and variables which should be defined in the other module
-;; at run-time.
-(eval-when-compile
-  (defvar w3m-add-tab-number)
-  (defvar w3m-coding-system)
-  (defvar w3m-current-process)
-  (defvar w3m-current-title)
-  (defvar w3m-current-url)
-  (defvar w3m-default-coding-system)
-  (defvar w3m-display-inline-images)
-  (defvar w3m-favicon-image)
-  (defvar w3m-form-input-textarea-coding-system)
-  (defvar w3m-form-use-fancy-faces)
-  (defvar w3m-icon-directory)
-  (defvar w3m-image-default-background)
-  (defvar w3m-mode-map)
-  (defvar w3m-modeline-process-status-on)
-  (defvar w3m-new-session-in-background)
-  (defvar w3m-process-queue)
-  (defvar w3m-show-graphic-icons-in-header-line)
-  (defvar w3m-show-graphic-icons-in-mode-line)
-  (defvar w3m-toolbar)
-  (defvar w3m-toolbar-buttons)
-  (defvar w3m-use-favicon)
-  (defvar w3m-use-header-line)
-  (defvar w3m-use-header-line-title)
-  (defvar w3m-use-tab)
-  ;; `w3m-tab-move-right' calls the inline function `w3m-buffer-set-number'
-  ;; which uses it.
-  (defvar w3m-use-title-buffer-name)
-  (defvar w3m-work-buffer-list)
-  (defvar w3m-work-buffer-name)
-  (autoload 'w3m-copy-buffer "w3m")
-  (autoload 'w3m-delete-buffer "w3m")
-  (autoload 'w3m-image-type "w3m")
-  (autoload 'w3m-retrieve "w3m")
-  (autoload 'w3m-select-buffer-update "w3m"))
-
-(eval-and-compile
-  (unless (fboundp 'frame-current-scroll-bars)
-    (defalias 'frame-current-scroll-bars 'ignore))
-  (unless (fboundp 'window-fringes)
-    (defalias 'window-fringes 'ignore))
-  (unless (fboundp 'unencodable-char-position)
-    (defalias 'unencodable-char-position 'ignore)))
-
-;;; Coding system and charset.
-
-(defsubst w3m-find-coding-system (obj)
-  "Return OBJ if it is a coding-system."
-  (if (coding-system-p obj) obj))
-
-(defun w3m-detect-coding-region (start end &optional priority-list)
-  "Detect coding system of the text in the region between START and END.
-Return the first possible coding system.
-
-PRIORITY-LIST is a list of coding systems ordered by priority."
-  (let (category categories)
-    (dolist (codesys priority-list)
-      (setq category (coding-system-category codesys))
-      (unless (or (null category) (assq category categories))
-	(push (cons category codesys) categories)))
-    (car (detect-coding-with-priority start end (nreverse categories)))))
-
-(defun w3m-mule-unicode-p ()
-  "Check the existence as charsets of mule-unicode."
-  (and (charsetp 'mule-unicode-0100-24ff)
-       (charsetp 'mule-unicode-2500-33ff)
-       (charsetp 'mule-unicode-e000-ffff)))
-
-(defalias 'w3m-make-ccl-coding-system
-  (if (fboundp 'define-coding-system)
-      (eval-when-compile
-	(funcall (if (and (fboundp 'define-coding-system)
-			  (featurep 'bytecomp))
-		     'byte-compile
-		   'identity)
-		 '(lambda (coding-system mnemonic docstring decoder encoder) "\
-Define a new CODING-SYSTEM by CCL programs DECODER and ENCODER.
-CODING-SYSTEM, DECODER and ENCODER must be symbols.
-This function is an interface to `define-coding-system'."
-		    (define-coding-system coding-system docstring
-		      :mnemonic mnemonic :coding-type 'ccl
-		      :ccl-decoder decoder :ccl-encoder encoder))))
-    (eval-when-compile
-      (funcall (if (featurep 'bytecomp)
-		   (lambda (form)
-		     (let ((byte-compile-warnings
-			    (if (eq (get 'make-coding-system 'byte-compile)
-				    'byte-compile-obsolete)
-				(delq 'obsolete
-				      (copy-sequence
-				       (cond ((consp byte-compile-warnings)
-					      byte-compile-warnings)
-					     (byte-compile-warnings
-					      byte-compile-warning-types)
-					     (t nil))))
-			      byte-compile-warnings)))
-		       (byte-compile form)))
-		 'identity)
-	       '(lambda (coding-system mnemonic docstring decoder encoder) "\
-Define a new CODING-SYSTEM by CCL programs DECODER and ENCODER.
-CODING-SYSTEM, DECODER and ENCODER must be symbols.
-This function is an interface to `make-coding-system'."
-		  (make-coding-system coding-system 4 mnemonic docstring
-				      (cons decoder encoder)))))))
-
-;; For Emacsen of which the `mule-version' is 5.x, redefine the ccl
-;; programs that been defined in w3m-ccl.el.
-(w3m-static-when (string-match "\\`5\\." mule-version)
-  (let ((source
-	 ;; CCL program to convert multibyte char to ucs with emacs-unicode.
-	 `((if (r1 == ,(charset-id 'latin-iso8859-1))
-	       ((r1 = (r0 + 128)))
-	     (if (r1 == ,(charset-id 'mule-unicode-0100-24ff))
-		 ((r1 = ((((r0 & #x3f80) >> 7) - 32) * 96))
-		  (r0 &= #x7f)
-		  (r1 += (r0 + 224)))		; 224 == -32 + #x0100
-	       (if (r1 == ,(charset-id 'mule-unicode-2500-33ff))
-		   ((r1 = ((((r0 & #x3f80) >> 7) - 32) * 96))
-		    (r0 &= #x7f)
-		    (r1 += (r0 + 9440)))	; 9440 == -32 + #x2500
-		 (if (r1 == ,(charset-id 'mule-unicode-e000-ffff))
-		     ((r1 = ((((r0 & #x3f80) >> 7) - 32) * 96))
-		      (r0 &= #x7f)
-		      (r1 += (r0 + 57312)))	; 57312 == -32 + #xe000
-		   ,(if (fboundp 'ccl-compile-lookup-character)
-			'((lookup-character utf-subst-table-for-encode r1 r0)
-			  (if (r7 == 0)		; lookup failed
-			      (r1 = #xfffd)))
-		      '((r1 = #xfffd)))))))
-	   (if (r1 == #xfffd)
-	       (write-repeat ?~)		; unknown character.
-	     (r0 = r1)))))
-    (if (get 'utf-translation-table-for-encode 'translation-table-id)
-	;; Emacs 21.3 and later.
-	(progn
-	  (eval
-	   `(define-ccl-program w3m-euc-japan-encoder
-	      '(4
-		(loop
-		 ,@w3m-ccl-write-euc-japan-character
-		 (translate-character utf-translation-table-for-encode r1 r0)
-		 ,@source
-		 ,@w3m-ccl-generate-ncr))))
-	  (eval
-	   `(define-ccl-program w3m-iso-latin-1-encoder
-	      '(4
-		(loop
-		 ,@w3m-ccl-write-iso-latin-1-character
-		 (translate-character utf-translation-table-for-encode r1 r0)
-		 ,@source
-		 ,@w3m-ccl-generate-ncr)))))
-      ;; Emacs 21.2 and earlier.
-      (eval
-       `(define-ccl-program w3m-euc-japan-encoder
-	  '(4
-	    (loop
-	     ,@w3m-ccl-write-euc-japan-character
-	     ,@source
-	     ,@w3m-ccl-generate-ncr))))
-      (eval
-       `(define-ccl-program w3m-iso-latin-1-encoder
-	  '(4
-	    (loop
-	     ,@w3m-ccl-write-iso-latin-1-character
-	     ,@source
-	     ,@w3m-ccl-generate-ncr)))))))
-
-;; This might be redefined by w3m-ucs.el.
-(defun w3m-ucs-to-char (codepoint)
-  (or (decode-char 'ucs codepoint) ?~))
-
-(defun w3m-add-local-hook (hook function &optional append)
-  "Add to the buffer-local value of HOOK the function FUNCTION."
-  (add-hook hook function append t))
-
-(defun w3m-remove-local-hook (hook function)
-  "Remove to the buffer-local value of HOOK the function FUNCTION."
-  (remove-hook hook function t))
-
-;; Function which returns non-nil when the current display device can
-;; show images inline.
-(defalias 'w3m-display-graphic-p 'display-images-p)
-
-(defun w3m-display-inline-images-p ()
-  "Returns non-nil when images can be displayed under the present
-circumstances."
-  (and w3m-display-inline-images (display-images-p)))
-
-(eval-and-compile
-  (defalias 'w3m-ems-create-image (if (fboundp 'create-animated-image)
-				      'create-animated-image
-				    'create-image)))
-
-(defun w3m-create-image (url &optional no-cache referer size handler)
-  "Retrieve data from URL and create an image object.
-If optional argument NO-CACHE is non-nil, cache is not used.
-If second optional argument REFERER is non-nil, it is used as Referer: field.
-If third optional argument SIZE is non-nil, its car element is used as width
-and its cdr element is used as height."
-  (if (not handler)
-      (w3m-process-with-wait-handler
-	(w3m-create-image url no-cache referer size handler))
-    (lexical-let ((set-size size)
-		  (url url)
-		  image size)
-      (w3m-process-do-with-temp-buffer
-	  (type (progn
-		  (set-buffer-multibyte nil)
-		  (w3m-retrieve url nil no-cache nil referer handler)))
-	(goto-char (point-min))
-	(when (w3m-image-type-available-p
-	       (setq type
-		     (or (and (let (case-fold-search)
-				(looking-at
-				 "\\(GIF8\\)\\|\\(\377\330\\)\\|\211PNG\r\n"))
-			      (cond ((match-beginning 1) 'gif)
-				    ((match-beginning 2) 'jpeg)
-				    (t 'png)))
-			 (w3m-image-type type))))
-	  (setq image (w3m-ems-create-image
-		       (buffer-string) type t
-		       :ascent 'center
-		       :background w3m-image-default-background))
-	  (if (and w3m-resize-images set-size)
-	      (progn
-		(set-buffer-multibyte t)
-		(setq size (image-size image 'pixels))
-		(if (and (null (car set-size)) (cdr set-size))
-		    (setcar set-size
-			    (/ (* (car size) (cdr set-size)) (cdr size))))
-		(if (and (null (cdr set-size)) (car set-size))
-		    (setcdr set-size
-			    (/ (* (cdr size) (car set-size)) (car size))))
-		(if (or (not (eq (car size)
-				 (car set-size)))  ; width is different
-			(not (eq (cdr size)
-				 (cdr set-size)))) ; height is different
-		    (lexical-let ((image image))
-		      (w3m-process-do
-			  (resized (w3m-resize-image
-				    (plist-get (cdr image) :data)
-				    (car set-size)(cdr set-size)
-				    handler))
-			(if resized (plist-put (cdr image) :data resized))
-			image))
-		  image))
-	    image))))))
-
-(defun w3m-create-resized-image (url rate &optional referer size handler)
-  "Resize an cached image object.
-URL is the image file's url.
-RATE is resize percentage.
-If REFERER is non-nil, it is used as Referer: field.
-If SIZE is non-nil, its car element is used as width
-and its cdr element is used as height."
-  (if (not handler)
-      (w3m-process-with-wait-handler
-	(w3m-create-image url nil referer size handler))
-    (lexical-let ((url url)
-		  (rate rate)
-		  image)
-      (w3m-process-do-with-temp-buffer
-	  (type (progn
-		  (set-buffer-multibyte nil)
-		  (w3m-retrieve url nil nil nil referer handler)))
-	(when (w3m-image-type-available-p (setq type (w3m-image-type type)))
-	  (setq image (create-image (buffer-string) type t :ascent 'center))
-	  (progn
-	    (set-buffer-multibyte t)
-	    (w3m-process-do
-		(resized (w3m-resize-image-by-rate
-			  (plist-get (cdr image) :data)
-			  rate
-			  handler))
-	      (if resized (plist-put (cdr image) :data resized))
-	      image)))))))
-
-(defun w3m-insert-image (beg end image &rest args)
-  "Display image on the current buffer.
-Buffer string between BEG and END are replaced with IMAGE."
-  (let ((faces (get-text-property beg 'face))
-	(idx 0)
-	orig len face)
-    (add-text-properties beg end (list 'display image
-				       'intangible image
-				       'invisible nil))
-    ;; Hide underlines behind inline images.
-    ;; Gerd Moellmann <gerd@gnu.org>, the maintainer of Emacs 21, wrote in
-    ;; the article <86heyi7vks.fsf@gerd.segv.de> in the list emacs-pretest-
-    ;; bug@gnu.org on 18 May 2001 that to show an underline of a text even
-    ;; if it has an image as a text property is the feature of Emacs 21.
-    ;; However, that behavior is not welcome to the w3m buffers, so we do
-    ;; to fix it with the following stuffs.
-    (when faces
-      (unless (listp faces)
-	(setq faces (list faces)))
-      (setq orig (copy-sequence faces)
-	    len (length orig))
-      (while (< idx len)
-	(when (face-underline-p (setq face (nth idx orig)))
-	  (setq faces (delq face faces)))
-	(setq idx (1+ idx)))
-      (when (< (length faces) len)
-	(put-text-property beg end 'face faces)
-	(put-text-property beg end 'w3m-faces-with-underline orig)))))
-
-(defun w3m-remove-image (beg end)
-  "Remove an image which is inserted between BEG and END."
-  (remove-text-properties beg end '(display nil intangible nil))
-  (let ((underline (get-text-property beg 'w3m-faces-with-underline)))
-    (when underline
-      (add-text-properties
-       beg end (list 'face underline 'w3m-faces-with-underline nil)))))
-
-(defun w3m-image-type-available-p (image-type)
-  "Return non-nil if an image with IMAGE-TYPE can be displayed inline."
-  (and (display-images-p)
-       (image-type-available-p image-type)))
-
-;;; Form buttons
-(defface w3m-form-button
-  '((((type x w32 mac ns) (class color))
-     :background "lightgrey" :foreground "black"
-     :box (:line-width 2 :style released-button))
-    (((class color) (background light)) (:foreground "cyan" :underline t))
-    (((class color) (background dark)) (:foreground "red" :underline t))
-    (t (:underline t)))
-  "*Face to fontify buttons in forms."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-form-button-face 'face-alias 'w3m-form-button)
-
-(defface w3m-form-button-mouse
-  '((((type x w32 mac ns) (class color))
-     :background "DarkSeaGreen1" :foreground "black"
-     :box (:line-width 2 :style released-button))
-    (((class color) (background light)) (:foreground "cyan" :underline t))
-    (((class color) (background dark)) (:foreground "red" :underline t))
-    (t (:underline t)))
-  "*Face to fontify focused buttons in forms."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-form-button-mouse-face 'face-alias 'w3m-form-button-mouse)
-
-(defface w3m-form-button-pressed
-  '((((type x w32 mac ns) (class color))
-     :background "lightgrey" :foreground "black"
-     :box (:line-width 2 :style pressed-button))
-    (((class color) (background light)) (:foreground "cyan" :underline t))
-    (((class color) (background dark)) (:foreground "red" :underline t))
-    (t (:underline t)))
-  "*Face to fontify pressed buttons in forms."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-form-button-pressed-face 'face-alias 'w3m-form-button-pressed)
-
-(defvar w3m-form-button-keymap
-  (let ((map (copy-keymap widget-keymap)))
-    (substitute-key-definition 'widget-forward nil map)
-    (substitute-key-definition 'widget-backward nil map)
-    map))
-
-(define-widget 'w3m-form-button 'push-button
-  "Widget for w3m form button."
-  :keymap w3m-form-button-keymap
-  :action (function (lambda (widget &optional e)
-		      (eval (widget-get widget :w3m-form-action)))))
-
-(defun w3m-form-make-button (start end properties)
-  "Make button on the region from START to END."
-  (if w3m-form-use-fancy-faces
-      (progn
-	(unless (memq (face-attribute 'w3m-form-button :box)
-		      '(nil unspecified))
-	  (and (eq ?\[ (char-after start))
-	       (eq ?\] (char-before end))
-	       (save-excursion
-		 (goto-char start)
-		 (delete-char 1)
-		 (insert " ")
-		 (goto-char end)
-		 (delete-char -1)
-		 (insert " ")
-		 (setq start (1+ start)
-		       end (1- end)))))
-	(let ((w (widget-convert-button
-		  'w3m-form-button start end
-		  :w3m-form-action (plist-get properties 'w3m-action))))
-	  (overlay-put (widget-get w :button-overlay) 'evaporate t))
-	(add-text-properties start end properties))
-    (w3m-add-text-properties start end (append '(face w3m-form) properties))))
-
-(defun w3m-setup-widget-faces ()
-  (make-local-variable 'widget-button-face)
-  (make-local-variable 'widget-mouse-face)
-  (make-local-variable 'widget-button-pressed-face)
-  (setq widget-button-face 'w3m-form-button)
-  (setq widget-mouse-face 'w3m-form-button-mouse)
-  (setq widget-button-pressed-face 'w3m-form-button-pressed))
-
-;;; Menu bar
-(defun w3m-menu-on-forefront (arg &optional curbuf)
-  "Place emacs-w3m menus on the forfront of the menu bar if ARG is non-nil.
-If CURBUF is given, this function works only in the current buffer,
-otherwise works in all the emacs-w3m buffers."
-  (if curbuf
-      (if arg
-	  (let ((items (mapcar 'car (cdr (lookup-key global-map [menu-bar])))))
-	    (when items
-	      (set (make-local-variable 'menu-bar-final-items) items)))
-	(kill-local-variable 'menu-bar-final-items))
-    (save-current-buffer
-      (dolist (buffer (w3m-list-buffers t))
-	(set-buffer buffer)
-	(w3m-menu-on-forefront arg t)))))
-
-;;; Toolbar
-(defcustom w3m-use-toolbar
-  (and (featurep 'tool-bar)
-       ;; Emacs 22 and greater return t for `(featurep 'tool-bar)'
-       ;; even if being launched with the -nw option.
-       (display-images-p)
-       (or (featurep 'gtk)
-	   (image-type-available-p 'xpm)))
-  "Non-nil activates toolbar of w3m."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-toolbar-icon-preferred-image-types
-  (if (featurep 'gtk)
-      '(png)
-    '(xpm))
-  "List of image types that you prefer to use for the tool bar icons.
-By default, `png' is most preferred for Emacs built with GTK and `xpm'
-is for others."
-  :group 'w3m
-  :type '(repeat (symbol :tag "Image type"))
-  :set (lambda (symbol value)
-	 (prog1
-	     (custom-set-default symbol value)
-	   (when (and (not noninteractive) (boundp 'w3m-toolbar-buttons))
-	     (w3m-update-toolbars)))))
-
-(defcustom w3m-toolbar-use-single-image-per-icon nil
-  "Non-nil means use single image (named possibly *-up) per icon.
-If it is nil, subsidiaries, e.g., *-down and *-disabled, if any, are
-used together."
-  :group 'w3m
-  :type 'boolean
-  :set (lambda (symbol value)
-	 (prog1
-	     (custom-set-default symbol value)
-	   (when (and (not noninteractive) (boundp 'w3m-toolbar-buttons))
-	     (w3m-update-toolbars)))))
-
-(defcustom w3m-toolbar-configurations
-  `((tool-bar-button-margin . global)
-    ,@(unless (featurep 'gtk)
-	'((tool-bar-button-relief . global))))
-  "Alist of the variables and the values controls the tool bar appearance.
-The value `global' means to use the global value of the variable.
-
-If you're annoyed with changing of the frame height of Emacs built for
-GTK because of the difference of the sizes between the emacs-w3m tool
-bar icons and the ones that Emacs natively uses, try customizing this
-variable or both the value of this variable and the global value of
-`tool-bar-button-margin'.  For examples:
-
-;; The case where the emacs-w3m icons are smaller than the others.
-\(setq w3m-toolbar-configurations '((tool-bar-button-margin . 5)))
-
-;; The case where the emacs-w3m icons are bigger than the others.
-\(setq w3m-toolbar-configurations '((tool-bar-button-margin . 0))
-      tool-bar-button-margin 7)"
-  :group 'w3m
-  :type '(repeat (cons :format "%v"
-		       (symbol :tag "Variable")
-		       (radio :format "%v"
-			      (const :format "%v " global)
-			      (sexp :tag "Local Value"))))
-  :set (lambda (symbol value)
-	 (prog1
-	     (custom-set-default symbol value)
-	   (when (and (not noninteractive) (featurep 'w3m))
-	     (w3m-toolbar-set-configurations)))))
-
-(defun w3m-toolbar-define-keys (keymap defs)
-  ;; Invalidate the default bindings.
-  (let ((keys (cdr (key-binding [tool-bar] t)))
-	item)
-    (while (setq item (pop keys))
-      (when (setq item (car-safe item))
-	(define-key keymap (vector 'tool-bar item) 'undefined))))
-  (let ((n (length defs))
-	def)
-    (while (>= n 0)
-      (setq n (1- n)
-	    def (nth n defs))
-      (define-key keymap (vector 'tool-bar (aref def 1))
-	(list 'menu-item (aref def 3) (aref def 1)
-	      :enable (aref def 2)
-	      :image (symbol-value (aref def 0)))))))
-
-(defun w3m-find-image (name &optional directory)
-  "Find image file for NAME and return cons of file name and type.
-This function searches only in DIRECTORY, that defaults to the value of
-`w3m-icon-directory', for an image file of which the base name is NAME.
-Files of types that Emacs does not support are ignored."
-  (unless directory
-    (setq directory w3m-icon-directory))
-  (when (and directory
-	     (file-directory-p directory)
-	     (display-images-p))
-    (let* ((case-fold-search nil)
-	   (files (directory-files directory t
-				   (concat "\\`" (regexp-quote name) "\\.")))
-	   (types (append w3m-toolbar-icon-preferred-image-types image-types))
-	   file type rest)
-      (while files
-	(when (string-match "\\.\\([^.]+\\)\\'" (setq file (pop files)))
-	  (setq type (intern (downcase (match-string 1 file))))
-	  (setq type (or (cdr (assq type '((tif . tiff)
-					   (jpg . jpeg)
-					   (ps . postscript)
-					   (pgm . pbm)
-					   (ppm . pbm))))
-			 type))
-	  (push (cons file (memq type types)) rest)))
-      (setq rest (car (sort rest (lambda (a b) (> (length a) (length b))))))
-      (when (cdr rest)
-	(cons (car rest) (cadr rest))))))
-
-(defun w3m-toolbar-make-buttons (buttons &optional force)
-  (let ((xpm-props '(:color-symbols (("backgroundToolBarColor" . "None"))))
-	button icon down disabled up)
-    (while buttons
-      (setq button (pop buttons)
-	    icon (intern (concat "w3m-toolbar-" button "-icon")))
-      (when (or force (not (boundp icon)))
-	(setq down (w3m-find-image (concat button "-down"))
-	      disabled (w3m-find-image (concat button "-disabled")))
-	(if (setq up (or (w3m-find-image (concat button "-up"))
-			 (prog1
-			     (or down disabled (w3m-find-image button))
-			   (setq down nil
-				 disabled nil))))
-	    (progn
-	      (setq up (apply 'create-image (car up) (cdr up) nil
-			      :ascent 'center
-			      (when (eq (cdr up) 'xpm)
-				xpm-props)))
-	      (if (or w3m-toolbar-use-single-image-per-icon
-		      (not (or down disabled)))
-		  (set icon up)
-		(when down
-		  (setq down (apply 'create-image (car down) (cdr down) nil
-				    :ascent 'center
-				    (when (eq (cdr up) 'xpm)
-				      xpm-props))))
-		(when disabled
-		  (setq disabled (apply 'create-image
-					(car disabled) (cdr disabled) nil
-					:ascent 'center
-					(when (eq (cdr disabled) 'xpm)
-					  xpm-props))))
-		(set icon (vector down up disabled disabled))))
-	  (error "Icon file %s-up.* not found" button))))))
-
-(defun w3m-toolbar-set-configurations (&optional curbuf)
-  "Set values of variables according to `w3m-toolbar-configurations'.
-If CURBUF is given, this function works only in the current buffer,
-otherwise works in all the emacs-w3m buffers."
-  (if curbuf
-      (dolist (config w3m-toolbar-configurations)
-	(if (eq (cdr config) 'global)
-	    (kill-local-variable (car config))
-	  (set (make-local-variable (car config)) (cdr config))))
-    (let ((cur (selected-frame))
-	  buffer buffers)
-      (walk-windows
-       (lambda (window)
-	 (setq buffer (window-buffer window))
-	 (unless (memq buffer buffers)
-	   (set-buffer buffer)
-	   (when (eq major-mode 'w3m-mode)
-	     (push buffer buffers)
-	     (select-frame (window-frame window))
-	     ;;(set-buffer buffer)
-	     (w3m-toolbar-set-configurations t))))
-       'ignore 'visible)
-      (select-frame-set-input-focus cur)
-      (save-current-buffer
-	(dolist (buffer (w3m-list-buffers t))
-	  (unless (memq buffer buffers)
-	    (set-buffer buffer)
-	    (w3m-toolbar-set-configurations t))))
-      (select-frame-set-input-focus cur))))
-
-(defun w3m-setup-toolbar ()
-  (when (and w3m-use-toolbar
-	     (w3m-find-image "antenna-up"))
-    (w3m-toolbar-make-buttons w3m-toolbar-buttons)
-    (w3m-toolbar-set-configurations t)
-    (w3m-toolbar-define-keys w3m-mode-map w3m-toolbar)))
-
-(defalias 'w3m-update-toolbar 'ignore)
-
-(defun w3m-update-toolbars ()
-  (when (and w3m-use-toolbar
-	     (w3m-find-image "antenna-up"))
-    (w3m-toolbar-make-buttons w3m-toolbar-buttons t)
-    (w3m-toolbar-set-configurations)
-    (w3m-toolbar-define-keys w3m-mode-map w3m-toolbar)))
-
-;;; Header line & Tabs
-(defcustom w3m-tab-width 16
-  "w3m tab width."
-  :group 'w3m
-  :set (lambda (symbol value)
-	 (custom-set-default symbol
-			     (if (and (numberp value) (> value 0))
-				 value
-			       16)))
-  :type '(integer :size 0))
-
-(defface w3m-tab-unselected
-  '((((type x w32 mac ns) (class color))
-     :background "Gray70" :foreground "Gray20"
-     :box (:line-width -1 :style released-button))
-    (((class color))
-     (:background "blue" :foreground "black")))
-  "*Face to fontify unselected tabs."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-tab-unselected-face 'face-alias 'w3m-tab-unselected)
-
-(defface w3m-tab-unselected-retrieving
-  '((((type x w32 mac ns) (class color))
-     :background "Gray70" :foreground "OrangeRed"
-     :box (:line-width -1 :style released-button))
-    (((class color))
-     (:background "blue" :foreground "OrangeRed")))
-  "*Face to fontify unselected tabs which are retrieving their pages."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-tab-unselected-retrieving-face
-     'face-alias 'w3m-tab-unselected-retrieving)
-
-(defface w3m-tab-unselected-unseen
-  '((((type x w32 mac ns) (class color))
-     :background "Gray70" :foreground "Gray20"
-     :box (:line-width -1 :style released-button))
-    (((class color))
-     (:background "blue" :foreground "gray60")))
-  "*Face to fontify unselected and unseen tabs."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-tab-unselected-unseen-face 'face-alias 'w3m-tab-unselected-unseen)
-
-(defface w3m-tab-selected
-  '((((type x w32 mac ns) (class color))
-     :background "Gray90" :foreground "black"
-     :box (:line-width -1 :style released-button))
-    (((class color))
-     (:background "cyan" :foreground "black"))
-    (t (:underline t)))
-  "*Face to fontify selected tab."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-tab-selected-face 'face-alias 'w3m-tab-selected)
-
-(defface w3m-tab-selected-retrieving
-  '((((type x w32 mac ns) (class color))
-     :background "Gray90" :foreground "red"
-     :box (:line-width -1 :style released-button))
-    (((class color))
-     (:background "cyan" :foreground "red"))
-    (t (:underline t)))
-  "*Face to fontify selected tab which is retrieving its page."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-tab-selected-retrieving-face
-     'face-alias 'w3m-tab-selected-retrieving)
-
-(defface w3m-tab-background
-  '((((type x w32 mac ns) (class color))
-     :background "LightSteelBlue" :foreground "black")
-    (((class color))
-     (:background "white" :foreground "black")))
-  "*Face to fontify background of tab line."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-tab-background-face 'face-alias 'w3m-tab-background)
-
-(defface w3m-tab-selected-background
-  '((((type x w32 mac ns) (class color))
-     :background "LightSteelBlue" :foreground "black")
-    (((class color))
-     (:background "white" :foreground "black")))
-  "*Face to fontify selected background tab."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-tab-selected-background-face
-     'face-alias 'w3m-tab-selected-background)
-
-(defface w3m-tab-mouse
-  '((((type x w32 mac ns) (class color))
-     :background "Gray75" :foreground "white"
-     :box (:line-width -1 :style released-button)))
-  "*Face used to highlight tabs under the mouse."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-tab-mouse-face 'face-alias 'w3m-tab-mouse)
-
-(defvar w3m-modeline-spinner-map nil
-  "Keymap used on the spinner in the mode-line.")
-
-(defvar w3m-spinner-map-help-echo "mouse-2 kills the current process"
-  "String used for the :help-echo property on the spinner.")
-
-(defun w3m-setup-header-line ()
-  (setq header-line-format
-	(cond (w3m-use-tab
-	       '(:eval (w3m-tab-line)))
-	      (w3m-use-header-line
-	       (list
-		(if w3m-use-header-line-title
-		    (list
-		     (propertize
-		      "Title: "
-		      'face (list 'w3m-header-line-location-title))
-		     `(:eval
-		       (propertize
-			(replace-regexp-in-string "%" "%%" (w3m-current-title))
-			'face (list 'w3m-header-line-location-content)
-			'mouse-face '(highlight :foreground
-						,(face-foreground 'default))
-			'local-map (let ((map (make-sparse-keymap)))
-				     (define-key map [header-line mouse-2]
-				       'w3m-goto-url)
-				     map)
-			'help-echo "mouse-2 prompts to input URL"))
-		     ", ")
-		  "")
-		 (propertize
-		  "Location: "
-		  'face (list 'w3m-header-line-location-title))
-		 `(:eval
-		  (propertize
-		   (if (stringp w3m-current-url)
-		       (replace-regexp-in-string "%" "%%" w3m-current-url)
-		     "")
-		   'face (list 'w3m-header-line-location-content)
-		   'mouse-face '(highlight :foreground
-					   ,(face-foreground 'default))
-		   'local-map (let ((map (make-sparse-keymap)))
-				(define-key map [header-line mouse-2]
-				  'w3m-goto-url)
-				map)
-		   'help-echo "mouse-2 prompts to input URL")))))))
-
-(eval-when-compile
-  ;; Shut up the byte-compiler for old Emacsen.
-  (unless (fboundp 'force-window-update)
-    (defalias 'force-window-update 'ignore)))
-
-(eval-and-compile
-  (defalias 'w3m-force-window-update
-    (if (and (fboundp 'force-window-update)
-	     (not (eq (symbol-function 'force-window-update) 'ignore)))
-	(lambda (&optional window) "\
-Force redisplay of WINDOW which defaults to the selected window."
-	  (force-window-update (or window (selected-window))))
-      (lambda (&optional ignore) "\
-Wobble the selected window to force redisplay of the header-line."
-	(save-window-excursion
-	  (split-window-vertically))))))
-
-(defun w3m-tab-drag-mouse-function (event buffer)
-  (let ((window (posn-window (event-end event)))
-	mpos)
-    (when (framep window) ; dropped at outside of the frame.
-      (setq window nil
-	    mpos (mouse-position))
-      (and (framep (car mpos))
-	   (car (cdr mpos))
-	   (cdr (cdr mpos))
-	   (setq window (window-at (car (cdr mpos))
-				   (cdr (cdr mpos))
-				   (car mpos))))
-      (unless window
-	(when (one-window-p 'nomini)
-	  (split-window))
-	(setq window (next-window))))
-    (unless (eq (window-buffer window) buffer)
-      (select-window window)
-      (switch-to-buffer buffer)
-      (w3m-force-window-update window))))
-
-(defun w3m-tab-click-mouse-function (event buffer)
-  (let ((window (posn-window (event-start event))))
-    (select-window window)
-    (switch-to-buffer buffer)
-    (w3m-force-window-update window)))
-
-(defun w3m-tab-double-click-mouse1-function (event buffer)
-  (let ((window (posn-window (event-start event))))
-    (when (eq major-mode 'w3m-mode)
-      (if w3m-new-session-in-background
-	  (save-window-excursion
-	    (w3m-copy-buffer))
-	(w3m-copy-buffer)))
-    (w3m-force-window-update window)))
-
-(defun w3m-tab-double-click-mouse2-function (event buffer)
-  (let ((window (posn-window (event-start event))))
-    (when (eq major-mode 'w3m-mode)
-      (w3m-delete-buffer))
-    (w3m-force-window-update window)))
-
-(defvar w3m-tab-line-format nil
-  "Internal variable used to keep contents to be shown in the header-line.
-This is a buffer-local variable.")
-(make-variable-buffer-local 'w3m-tab-line-format)
-
-(defvar w3m-tab-timer nil
-  "Internal variable used to say time has not gone by after the tab-line
-was updated last time.  It is used to control the `w3m-tab-line'
-function running too frequently, set by the function itself and
-cleared by a timer.")
-(make-variable-buffer-local 'w3m-tab-timer)
-
-(defcustom w3m-tab-track-mouse t
-  "Say whether to make the mouse track the selected tab.
-It controls the behavior of the commands `w3m-tab-previous-buffer',
-`w3m-tab-next-buffer', `w3m-tab-move-right', and `w3m-tab-move-left'
-invoked by the mouse.
-
-You may want to set this to nil if you use a proportional font for the
-tab faces.  See also `w3m-tab-mouse-position-adjuster'."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-tab-mouse-position-adjuster '(0.5 . -4)
-  "Values used to adjust the mouse position on tabs.
-It is used when the command `w3m-tab-previous-buffer',
-`w3m-tab-next-buffer', `w3m-tab-move-right', or `w3m-tab-move-left' is
-invoked by the mouse.  The value consists of the cons of a floating
-point number M and an integer N that are applied to calculating of the
-mouse position, which is given in pixel units, as follows:
-
-  (TAB_WIDTH + M) * ORDER + N
-
-Where TAB_WIDTH is the pixel width of a tab and ORDER is the order
-number in tabs.  The result is rounded towards zero.
-
-Note that the calculation will always fail if you use a proportional
-font for the tab faces.  See also `w3m-tab-track-mouse'."
-  :group 'w3m
-  :type '(cons (number :tag "M") (integer :tag "N")))
-
-(defun w3m-tab-mouse-track-selected-tab (event order
-					       &optional buffers decelerate)
-  "Make the mouse track the selected tab.
-EVENT is a command event.  ORDER is the order number in tabs.
-The optional BUFFERS is a list of emacs-w3m buffers, DECELERATE if it
-is non-nil means not to respond to too fast operation of mouse wheel."
-  (when (and w3m-use-tab window-system w3m-tab-track-mouse
-	     (consp event) (symbolp (car event)))
-    (let ((e (get (car event) 'event-symbol-elements))
-	  (len (* (car w3m-tab-mouse-position-adjuster) order))
-	  (fcw (frame-char-width))
-	  posn tab start end disp next)
-      (when (and (consp e) (symbolp (car e))
-		 (or (memq (car e) '(mouse-4 mouse-5 wheel-up wheel-down))
-		     (string-match "\\`mouse-" (symbol-name (car e)))))
-	;; Ignore values gotten by the mouse pointing to other frames.
-	;; It might happen if the frame in question gets out of focus
-	;; by a certain desktop tool such as unclutter.
-	(let ((frame (selected-frame)))
-	  (while (not (cadr (setq posn (mouse-pixel-position))))
-	    (select-frame-set-input-focus frame)))
-	;; Update the header line.
-	(setq w3m-tab-timer nil)
-	(sit-for 0)
-	(setq tab w3m-tab-line-format)
-	(with-temp-buffer
-	  (insert tab)
-	  (setq start (point-min)
-		end (point))
-	  (while (and (> order  0)
-		      (setq start (text-property-any start end
-						     'tab-separator t))
-		      (setq start (text-property-not-all start end
-							 'tab-separator t)))
-	    (setq order (1- order)))
-	  (setq end (1- start)
-		start (point-min)
-		next start
-		disp (get-text-property start 'display))
-	  (while (and (< next end)
-		      (setq next (next-single-property-change
-				  start 'display nil end)))
-	    (setq len (+ (cond
-			  ((eq (car disp) 'image)
-			   (or (car w3m-favicon-size) (frame-char-height)))
-			  ((eq (car disp) 'space)
-			   (* (or (plist-get (cdr disp) :width) 1) fcw))
-			  (t
-			   (* (string-width (buffer-substring start next))
-			      fcw)))
-			 len)
-		  start next
-		  disp (get-text-property start 'display))))
-	(set-mouse-pixel-position
-	 (car posn)
-	 (truncate (+ len (cdr w3m-tab-mouse-position-adjuster)))
-	 (cddr posn))
-	(when decelerate
-	  (sleep-for 0.1))
-	(discard-input)))))
-
-(defun w3m-tab-next-buffer (&optional n event)
-  "Turn N pages of emacs-w3m buffers ahead."
-  (interactive (list (prefix-numeric-value current-prefix-arg)
-		     last-command-event))
-  (unless n (setq n 1))
-  (when (and (/= n 0) (eq major-mode 'w3m-mode))
-    (let ((buffers (w3m-list-buffers)))
-      (switch-to-buffer
-       (nth (mod (+ n (w3m-buffer-number (current-buffer)) -1)
-		 (length buffers))
-	    buffers))
-      (run-hooks 'w3m-select-buffer-hook)
-      (w3m-select-buffer-update)
-      (w3m-tab-mouse-track-selected-tab
-       event (w3m-buffer-number (current-buffer)) buffers))))
-
-(defun w3m-tab-previous-buffer (&optional n event)
-  "Turn N pages of emacs-w3m buffers behind."
-  (interactive (list (prefix-numeric-value current-prefix-arg)
-		     last-command-event))
-  (w3m-tab-next-buffer (- n) event))
-
-(defun w3m-tab-move-right (&optional n event)
-  "Move this tab N times to the right (to the left if N is negative)."
-  (interactive (list (prefix-numeric-value current-prefix-arg)
-		     last-command-event))
-  (unless n (setq n 1))
-  (when (and (/= n 0) (eq major-mode 'w3m-mode))
-    (let* ((buffers (if (> n 0)
-			(w3m-list-buffers)
-		      (setq n (- n))
-		      (nreverse (w3m-list-buffers))))
-	   (dest (or (nth n (memq (current-buffer) buffers))
-		     (car (last buffers))))
-	   (next (w3m-buffer-number dest))
-	   (cur (w3m-buffer-number (current-buffer)))
-	   e posn start)
-      (rename-buffer "*w3m*<0>")
-      (w3m-buffer-set-number dest cur)
-      (w3m-buffer-set-number (current-buffer) next)
-      (w3m-select-buffer-update)
-      (w3m-tab-mouse-track-selected-tab event next buffers t))))
-
-(defun w3m-tab-move-left (&optional n event)
-  "Move this tab N times to the left (to the right if N is negative)."
-  (interactive (list (prefix-numeric-value current-prefix-arg)
-		     last-command-event))
-  (w3m-tab-move-right (- n) event))
-
-(defvar w3m-tab-map nil)
-(make-variable-buffer-local 'w3m-tab-map)
-
-(defvar w3m-tab-spinner-map nil)
-(make-variable-buffer-local 'w3m-tab-spinner-map)
-
-(defun w3m-tab-make-keymap ()
-  (unless w3m-tab-map
-    (setq w3m-tab-map (make-sparse-keymap))
-    (let* ((cur (current-buffer))
-	   (f1 (lambda (fn) `(lambda (e) (interactive "e") (,fn e ,cur))))
-	   (f2 (lambda (fn) `(lambda (e)
-			       (interactive "e")
-			       (select-window (posn-window (event-start e)))
-			       (switch-to-buffer ,cur)
-			       (setq this-command ',fn)
-			       (,fn 1 e))))
-	   (drag-action (funcall f1 'w3m-tab-drag-mouse-function))
-	   (single-action (funcall f1 'w3m-tab-click-mouse-function))
-	   (double-action1 (funcall f1 'w3m-tab-double-click-mouse1-function))
-	   (double-action2 (funcall f1 'w3m-tab-double-click-mouse2-function))
-	   (menu-action (funcall f1 'w3m-tab-button-menu))
-	   (menu-action2 (funcall f1 'w3m-tab-button-menu2))
-	   (next-buffer-action (funcall f2 'w3m-tab-next-buffer))
-	   (previous-buffer-action (funcall f2 'w3m-tab-previous-buffer))
-	   (move-left-action (funcall f2 'w3m-tab-move-left))
-	   (move-right-action (funcall f2 'w3m-tab-move-right)))
-      (define-key w3m-tab-map [header-line down-mouse-1] 'ignore)
-      (define-key w3m-tab-map [header-line down-mouse-2] 'ignore)
-      (define-key w3m-tab-map [header-line mouse-1] single-action)
-      (define-key w3m-tab-map [header-line mouse-2] single-action)
-      (define-key w3m-tab-map [header-line drag-mouse-1] drag-action)
-      (define-key w3m-tab-map [header-line drag-mouse-2] drag-action)
-      (define-key w3m-tab-map [header-line double-mouse-1] double-action1)
-      (define-key w3m-tab-map [header-line double-mouse-2] double-action2)
-      (define-key w3m-tab-map [header-line mouse-3] menu-action)
-      (define-key w3m-tab-map [header-line wheel-up] previous-buffer-action)
-      (define-key w3m-tab-map [header-line wheel-down] next-buffer-action)
-      (define-key w3m-tab-map [header-line mouse-4] previous-buffer-action)
-      (define-key w3m-tab-map [header-line mouse-5] next-buffer-action)
-      (define-key w3m-tab-map [header-line C-wheel-up] move-left-action)
-      (define-key w3m-tab-map [header-line C-wheel-down] move-right-action)
-      (define-key w3m-tab-map [header-line C-mouse-4] move-left-action)
-      (define-key w3m-tab-map [header-line C-mouse-5] move-right-action)
-      (define-key w3m-mode-map [header-line double-mouse-1]
-	'w3m-goto-new-session-url)
-      (define-key w3m-mode-map [header-line mouse-3] menu-action2)
-      ;; The following bindings in `w3m-mode-map', not `w3m-tab-map',
-      ;; are required for some platforms, in which mouse wheel events
-      ;; sometimes pass by `w3m-tab-map' for the unresolved reason and
-      ;; see `w3m-mode-map', or else the `undefined' errors will arise.
-      (define-key w3m-mode-map [header-line mouse-4] 'w3m-tab-previous-buffer)
-      (define-key w3m-mode-map [header-line mouse-5] 'w3m-tab-next-buffer)
-      (define-key w3m-mode-map [header-line wheel-up] 'w3m-tab-previous-buffer)
-      (define-key w3m-mode-map [header-line wheel-down] 'w3m-tab-next-buffer)
-      (define-key w3m-mode-map [header-line C-wheel-up] 'w3m-tab-move-left)
-      (define-key w3m-mode-map [header-line C-wheel-down] 'w3m-tab-move-right)
-      (define-key w3m-mode-map [header-line C-mouse-4] 'w3m-tab-move-left)
-      (define-key w3m-mode-map [header-line C-mouse-5] 'w3m-tab-move-right))
-    (unless w3m-tab-spinner-map
-      (setq w3m-tab-spinner-map (make-sparse-keymap))
-      (define-key w3m-tab-spinner-map [header-line mouse-2]
-	`(lambda (e)
-	   (interactive "e")
-	   (save-current-buffer
-	     ;; Why the `(w3m-process-stop BUFFER)' doesn't work?
-	     (set-buffer ,(current-buffer))
-	     (call-interactively 'w3m-process-stop)))))))
-
-(defvar w3m-tab-half-space
-  (propertize " " 'display '(space :width 0.5))
-  "The space of half width.")
-
-(defvar w3m-tab-separator-map nil)
-
-(unless w3m-tab-separator-map
-  (let ((map (make-sparse-keymap)))
-    (setq w3m-tab-separator-map map)
-    (define-key map [header-line wheel-up] 'w3m-tab-previous-buffer)
-    (define-key map [header-line wheel-down] 'w3m-tab-next-buffer)
-    (define-key map [header-line mouse-4] 'w3m-tab-previous-buffer)
-    (define-key map [header-line mouse-5] 'w3m-tab-next-buffer)
-    (define-key map [header-line C-wheel-up] 'w3m-tab-move-left)
-    (define-key map [header-line C-wheel-down] 'w3m-tab-move-right)
-    (define-key map [header-line C-mouse-4] 'w3m-tab-move-left)
-    (define-key map [header-line C-mouse-5] 'w3m-tab-move-right)))
-
-(defvar w3m-tab-separator
-  (propertize " "
-	      'face (list 'w3m-tab-background)
-	      'mouse-face 'w3m-tab-selected-background
-	      'display '(space :width 0.5)
-	      'tab-separator t
-	      'local-map w3m-tab-separator-map)
-  "String used to separate tabs.")
-
-(defun w3m-tab-line ()
-  (or (and w3m-tab-timer w3m-tab-line-format)
-      (let* ((current (current-buffer))
-	     (buffers (w3m-list-buffers))
-	     (breadth 1)
-	     (number 0)
-	     (fringes (window-fringes))
-	     (width (+ (window-width)
-		       (/ (float (+ (or (car fringes) 0)
-				    (or (nth 1 fringes) 0)))
-			  (frame-char-width))
-		       ;; Assume that the vertical scroll-bar has
-		       ;; the width of two space characters.
-		       (if (car (frame-current-scroll-bars)) 2 0)))
-	     (nbuf (length buffers))
-	     (graphic (and window-system
-			   w3m-show-graphic-icons-in-header-line))
-	     (margin (if window-system
-			 (+ (if graphic 3.0 0.5)
-			    ;; Right and left shadows.
-			    (/ 2.0 (frame-char-width)))
-		       1))
-	     (spinner (when w3m-process-queue
-			(w3m-make-spinner-image)))
-	     buffer title data datum process unseen favicon keymap face icon
-	     line)
-	(setq w3m-tab-timer t)
-	(run-at-time 0.1 nil
-		     (lambda (buffer)
-		       (when (buffer-live-p buffer)
-			 (with-current-buffer buffer
-			   (setq w3m-tab-timer nil)
-			   (when (and (eq (selected-window)
-					  (get-buffer-window buffer))
-				      w3m-process-queue)
-			     (inline (w3m-force-window-update))))))
-		     current)
-	(save-current-buffer
-	  (while buffers
-	    (set-buffer (setq buffer (pop buffers)))
-	    (setq number (1+ number))
-	    (setq title (if w3m-add-tab-number
-			    (format "%d.%s" number (w3m-current-title))
-			  (w3m-current-title)))
-	    (setq breadth
-		  (max breadth
-		       ;; There may be a wide character in the beginning of
-		       ;; the title.
-		       (if (> (length title) 0)
-			   (char-width (aref title 0))
-			 0)))
-	    (push (list (eq current buffer)
-			w3m-current-process
-			(w3m-unseen-buffer-p buffer)
-			title
-			(when w3m-use-favicon w3m-favicon-image)
-			w3m-tab-map)
-		  data)))
-	(setq width (if (> (* nbuf (+ margin w3m-tab-width)) width)
-			(max (truncate (- (/ width nbuf) margin)) breadth)
-		      w3m-tab-width))
-	(while data
-	  (setq datum (pop data)
-		current (car datum)
-		process (nth 1 datum)
-		unseen (nth 2 datum)
-		title (nth 3 datum)
-		favicon (nth 4 datum)
-		keymap (nth 5 datum)
-		face (list
-		      (if process
-			  (if current
-			      'w3m-tab-selected-retrieving
-			    'w3m-tab-unselected-retrieving)
-			(if current
-			    'w3m-tab-selected
-			  (if unseen
-			      'w3m-tab-unselected-unseen
-			    'w3m-tab-unselected))))
-		icon (when graphic
-		       (cond
-			(process
-			 (when spinner
-			   (propertize
-			    " "
-			    'display spinner
-			    'face face
-			    'local-map w3m-tab-spinner-map
-			    'help-echo w3m-spinner-map-help-echo)))
-			(favicon
-			 (propertize
-			  " "
-			  'display favicon
-			  'face face
-			  'local-map keymap
-			  'help-echo title))))
-		breadth (cond (icon width)
-			      (graphic (+ 2 width))
-			      (t width)))
-	  (push
-	   (list
-	    icon
-	    (propertize
-	     (concat
-	      (when graphic w3m-tab-half-space)
-	      (replace-regexp-in-string
-	       "%" "%%"
-	       (if (and (> (string-width title) breadth)
-			(> breadth 6))
-		   (truncate-string-to-width
-		    (concat (truncate-string-to-width title (- breadth 3))
-			    "...")
-		    breadth nil ?.)
-		 (truncate-string-to-width title breadth nil ?\ ))))
-	     'face face
-	     'mouse-face 'w3m-tab-mouse
-	     'local-map keymap
-	     'help-echo title)
-	    w3m-tab-separator)
-	   line))
-	(setq w3m-tab-line-format
-	      (concat (apply 'concat (apply 'nconc line))
-		      (propertize (make-string (window-width) ?\ )
-				  'face (list 'w3m-tab-background)
-				  'mouse-face 'w3m-tab-selected-background
-				  'local-map w3m-tab-separator-map))))))
-
-(add-hook 'w3m-mode-setup-functions 'w3m-tab-make-keymap)
-(add-hook 'w3m-mode-setup-functions 'w3m-setup-header-line)
-(add-hook 'w3m-mode-setup-functions 'w3m-setup-widget-faces)
-(add-hook 'w3m-select-buffer-hook 'w3m-force-window-update)
-
-;; Graphic icons.
-(defcustom w3m-space-before-modeline-icon ""
-  "String of space character(s) to be put in front of the mode-line icon.
-It may be better to use one or more spaces if you are using oblique or
-italic font in the modeline."
-  :group 'w3m
-  :type 'string)
-
-(defvar w3m-spinner-image-file nil
-  "Image file used to show a spinner in the header-line.")
-
-(defvar w3m-spinner-image-frames 3
-  "Number of frames which the spinner image contains.")
-
-(defvar w3m-spinner-image-index 0
-  "Counter used to rotate spinner images.  This is a buffer-local variable.")
-(make-variable-buffer-local 'w3m-spinner-image-index)
-
-;; Images to be displayed in the modeline.
-(defvar w3m-modeline-process-status-on-icon nil)
-(defvar w3m-modeline-image-status-on-icon nil)
-(defvar w3m-modeline-status-off-icon nil)
-(defvar w3m-modeline-ssl-image-status-on-icon nil)
-(defvar w3m-modeline-ssl-status-off-icon nil)
-
-(defun w3m-initialize-graphic-icons (&optional force)
-  "Make icon images which will be displayed in the mode-line."
-  (interactive "P")
-  (when (or (image-type-available-p 'xpm)
-	    (image-type-available-p 'png))
-    ;; Prefer xpm icons rather than png icons since Emacs doesn't display
-    ;; background colors of icon images other than xpm images transparently
-    ;; in the mode line.
-    (let* ((w3m-toolbar-icon-preferred-image-types
-	    (if (image-type-available-p 'xpm)
-		'(xpm)
-	      '(png)))
-	   (defs `((w3m-modeline-status-off-icon
-		    ,(w3m-find-image "state-00")
-		    w3m-modeline-status-off)
-		   (w3m-modeline-image-status-on-icon
-		    ,(w3m-find-image "state-01")
-		    w3m-modeline-image-status-on)
-		   (w3m-modeline-ssl-status-off-icon
-		    ,(w3m-find-image "state-10")
-		    w3m-modeline-ssl-status-off)
-		   (w3m-modeline-ssl-image-status-on-icon
-		    ,(w3m-find-image "state-11")
-		    w3m-modeline-ssl-image-status-on)))
-	   def icon file type status keymap)
-      (while defs
-	(setq def (car defs)
-	      defs (cdr defs)
-	      icon (car def)
-	      file (car (nth 1 def))
-	      type (cdr (nth 1 def))
-	      status (nth 2 def))
-	(if (and w3m-show-graphic-icons-in-mode-line file)
-	    (progn
-	      (when (or force (not (symbol-value icon)))
-		(unless keymap
-		  (setq keymap
-			(make-mode-line-mouse-map 'mouse-2
-						  'w3m-reload-this-page)))
-		(set icon (propertize
-			   "  "
-			   'display (create-image file type nil
-						  :ascent 'center)
-			   'local-map keymap
-			   'mouse-face 'mode-line-highlight
-			   'help-echo "mouse-2 reloads this page"))
-		(put icon 'risky-local-variable t)
-		(put status 'risky-local-variable t))
-	      (when (stringp (symbol-value status))
-		;; Save the original status strings as properties.
-		(put status 'string (symbol-value status)))
-	      (set status (list "" 'w3m-space-before-modeline-icon icon)))
-	  ;; Don't use graphic icons.
-	  (when (get status 'string)
-	    (set status (get status 'string)))))))
-    (let (file)
-      ;; Spinner
-      (when (and (or force (not w3m-spinner-image-file))
-		 (image-type-available-p 'gif)
-		 w3m-icon-directory
-		 (file-directory-p w3m-icon-directory)
-		 (file-exists-p
-		  (setq file (expand-file-name "spinner.gif"
-					       w3m-icon-directory))))
-	(setq w3m-spinner-image-file file)
-	(define-key (setq w3m-modeline-spinner-map (make-sparse-keymap))
-	  [mode-line mouse-2]
-	  'w3m-process-stop)
-	(put 'w3m-modeline-process-status-on 'risky-local-variable t)
-	(put 'w3m-modeline-process-status-on-icon 'risky-local-variable t))
-      (if (and window-system
-	       w3m-show-graphic-icons-in-mode-line
-	       w3m-spinner-image-file)
-	  (progn
-	    (when (stringp w3m-modeline-process-status-on)
-	      ;; Save the original status strings as properties.
-	      (put 'w3m-modeline-process-status-on 'string
-		   w3m-modeline-process-status-on))
-	    (setq w3m-modeline-process-status-on
-		  '(""
-		    w3m-space-before-modeline-icon
-		    w3m-modeline-process-status-on-icon)))
-	(when (get 'w3m-modeline-process-status-on 'string)
-	  (setq w3m-modeline-process-status-on
-		(get 'w3m-modeline-process-status-on 'string))))))
-
-(defun w3m-make-spinner-image ()
-  "Make an image used to show a spinner.
-It should be called periodically in order to spin the spinner."
-  (when w3m-spinner-image-file
-    (unless (< (incf w3m-spinner-image-index) w3m-spinner-image-frames)
-      (setq w3m-spinner-image-index 0))
-    (let ((image (create-image w3m-spinner-image-file 'gif nil
-			       :ascent 'center :mask 'heuristic
-			       :index w3m-spinner-image-index)))
-      (setq w3m-modeline-process-status-on-icon
-	    (propertize "  "
-			'display image
-			'local-map w3m-modeline-spinner-map
-			'help-echo w3m-spinner-map-help-echo))
-      image)))
-
-(defun w3m-decode-coding-string-with-priority (str coding)
-  "Decode the string STR which is encoded in CODING.
-If CODING is a list, look for the coding system using it as a priority
-list."
-  (setq str (string-make-unibyte str))
-  (when (listp coding)
-    (setq coding
-	  (with-temp-buffer
-	    (set-buffer-multibyte nil)
-	    (insert str)
-	    (w3m-detect-coding-region (point-min) (point-max) coding))))
-  (decode-coding-string str
-			(or coding
-			    w3m-default-coding-system
-			    w3m-coding-system
-			    'iso-2022-7bit)))
-
-(defun w3m-form-coding-system-accept-region-p (&optional from to coding-system)
-  "Check whether `coding-system' can encode specified region."
-  (let ((from (or from (point-min)))
-	(to (or to   (point-max)))
-	(coding-system (or coding-system
-			   w3m-form-input-textarea-coding-system)))
-    (if (fboundp 'unencodable-char-position)
-	(let ((pos (unencodable-char-position from to coding-system)))
-	  (or (not pos)
-	      (y-or-n-p (format "\"%c\" would not be accepted. Continue? "
-				(char-after pos)))))
-      (let ((select-safe-coding-system-accept-default-p nil))
-	(or (eq (select-safe-coding-system from to coding-system)
-		coding-system)
-	    (y-or-n-p
-	     "This text may cause coding-system problem. Continue? "))))))
-
-(provide 'w3m-ems)
-
-;;; w3m-ems.el ends here

=== removed file 'share/emacs/site-lisp/w3m/w3m-favicon.el'
--- share/emacs/site-lisp/w3m/w3m-favicon.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-favicon.el	1970-01-01 00:00:00 +0000
@@ -1,367 +0,0 @@
-;;; w3m-favicon.el --- utilities for handling favicon in emacs-w3m
-
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2009
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Authors: Yuuichi Teranishi  <teranisi@gohome.org>,
-;;          TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
-;;          Katsumi Yamaoka    <yamaoka@jpl.org>
-;; Keywords: w3m, WWW, hypermedia
-
-;; This file is a part of emacs-w3m.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;;; Code:
-
-(eval-when-compile
-  (require 'cl))
-
-;;(require 'w3m-util)
-;;(require 'w3m-proc)
-(require 'w3m-image)
-
-(eval-when-compile
-  (defvar w3m-current-buffer)
-  (defvar w3m-current-url)
-  (defvar w3m-favicon-image)
-  (defvar w3m-icon-data)
-  (defvar w3m-modeline-favicon)
-  (defvar w3m-profile-directory)
-  (defvar w3m-use-favicon)
-  (defvar w3m-work-buffer-name)
-  (defvar w3m-work-buffer-list)
-  (autoload 'w3m-expand-url "w3m")
-  (autoload 'w3m-load-list "w3m")
-  (autoload 'w3m-message "w3m")
-  (autoload 'w3m-retrieve "w3m")
-  (autoload 'w3m-save-list "w3m")
-  (autoload 'w3m-url-readable-string "w3m"))
-
-(defcustom w3m-favicon-size nil
-  "Size of favicon.  The value should be `(WIDTH . HEIGHT)' or nil.
-Where WIDTH and HEIGHT are positive integers; both or any of them can
-be omitted."
-  :group 'w3m
-  :type '(radio (const :tag "Not specified" nil)
-		(cons :format "%v"
-		      (integer :format "Width: %v " :size 0 :value 16)
-		      (integer :format "Height: %v " :size 0 :value 16))))
-
-(defconst w3m-favicon-name "favicon.ico"
-  "The favicon name.")
-
-(add-hook 'w3m-display-functions 'w3m-favicon-setup)
-
-(defcustom w3m-favicon-use-cache-file nil
-  "*If non-nil, use favicon cache file."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-favicon-cache-file nil
-  "Filename of saving favicon cache.
-It defaults to the file named \".favicon\" under the directory specified
-by the `w3m-profile-directory' variable."
-  :group 'w3m
-  :type '(radio (const :format "Not specified\n")
-		(file :format "%t: %v\n" :size 0)))
-
-(defcustom w3m-favicon-cache-expire-wait (* 30 24 60 60)
-  "*The cache will be expired after specified seconds passed since retrieval.
-If this variable is nil, never expired."
-  :group 'w3m
-  :type '(integer :size 0))
-
-(defcustom w3m-favicon-type
-  (let ((types '(png gif pbm xpm bmp))
-	type)
-    (catch 'det
-      (while types
-	(setq type (car types)
-	      types (cdr types))
-	(if (if (featurep 'xemacs)
-		(featurep type)
-	      (image-type-available-p type))
-	    (throw 'det type)))))
-  "*Image type of display favicon."
-  :group 'w3m
-  :type (cons 'radio
-	      (let ((types (if (or
-				(featurep 'xemacs)
-				(not (fboundp 'image-types)))
-			       (delq nil
-				     (mapcar (lambda (type)
-					       (if (featurep type) type))
-					     '(gif jpeg png tiff xpm)))
-			     (delq 'postscript (copy-sequence image-types)))))
-		(nconc (mapcar (lambda (x)
-				 `(const :format "%v  " ,x))
-			       (butlast types))
-		       `((const ,(car (last types))))))))
-
-(defcustom w3m-space-before-favicon " "
-  "String of space char(s) to be put in front of favicon in the mode-line.
-It may be better to use two or more spaces if you are using oblique or
-italic font in the modeline."
-  :group 'w3m
-  :type 'string)
-
-(defcustom w3m-favicon-convert-args nil
-  "List of additional arguments passed to ImageMagick's convert program.
-Args that are always passed to convert in addition to this value are:
-
-\(\"-geometry\" \"WIDTHxHEIGHT\" \"fromTYPE:temp-file\" \"toTYPE:-\")
-
-Args might also contain (\"-transparent\" \"COLOR\") in the beginning.
-Note that this value is effective only with Emacs 22 and greater."
-  :group 'w3m
-  :type `(repeat (group :inline t
-			:match-inline
-			(lambda (widget vals)
-			  (if (and (eq (aref (car vals) 0) ?-)
-				   (cdr vals)
-				   (not (eq (aref (nth 1 vals) 0) ?-)))
-			      (cons (list (car vals) (nth 1 vals))
-				    (nthcdr 2 vals))
-			    (cons (list (car vals)) (cdr vals))))
-			(string :format "Arg: %v " :value "-" :size 0)
-			(checklist :inline t
-				   (string :format "Value: %v\n" :size 0)))))
-
-(defcustom w3m-favicon-default-background nil
-  "Color name used as transparent color of favicon image.
-Nil means to use the background color of the Emacs frame.  The null
-string \"\" is special, that will be replaced with the background color
-of the header line or the mode line on which the favicon is displayed.
-Note that this value is effective only with Emacs 22 and greater."
-  :group 'w3m
-  :type '(radio (string :format "Color: %v\n" :size 0
-			:match (lambda (widget value)
-				 (and (stringp value) (> (length value) 0))))
-		(const :tag "Use the background color of the Emacs frame" nil)
-		(const :tag "Null string" "")))
-
-(defvar w3m-favicon-type-alist '((pbm . ppm))
-  "A list of a difference type of image between Emacs and ImageMagick.
- 0. Type of Emacs
- 1. Type of ImageMagick")
-
-(defvar w3m-favicon-cache-data nil
-  "A list of favicon cache (internal variable).
-Each information is a list whose elements are:
-
- 0. URL
- 1. (RAW_DATA . TYPE)
- 2. DATE when the RAW_DATA was retrieved
- 3. IMAGE
-
-Where IMAGE highly depends on the Emacs version and is not saved in
-the cache file.")
-
-(w3m-static-if (featurep 'xemacs)
-    (set 'w3m-modeline-favicon
-	 '("" w3m-space-before-favicon w3m-favicon-image))
-  (put 'w3m-modeline-favicon 'risky-local-variable t))
-(make-variable-buffer-local 'w3m-modeline-favicon)
-(make-variable-buffer-local 'w3m-favicon-image)
-
-(defmacro w3m-favicon-cache-p (url)
-  "Say whether the favicon data for URL has been chached."
-  `(assoc ,url w3m-favicon-cache-data))
-
-(defmacro w3m-favicon-cache-favicon (url)
-  "Pull out the favicon image corresponding to URL from the cache."
-  `(nth 3 (assoc ,url w3m-favicon-cache-data)))
-
-(defmacro w3m-favicon-cache-retrieved (url)
-  "Return the time when the favicon data for URL was retrieved."
-  `(nth 2 (assoc ,url w3m-favicon-cache-data)))
-
-(defmacro w3m-favicon-set-image (image)
-  "Set IMAGE to `w3m-favicon-image' and `w3m-modeline-favicon'."
-  (if (featurep 'xemacs)
-      `(set 'w3m-favicon-image ,image)
-    `(when (setq w3m-favicon-image ,image)
-       (set 'w3m-modeline-favicon
-	    (list ""
-		  'w3m-space-before-favicon
-		  (propertize "  " 'display w3m-favicon-image)
-		  (propertize " " 'display '(space :width 0.5)))))))
-
-(defun w3m-favicon-setup (url)
-  "Set up the favicon data in the current buffer.  The buffer-local
-variable `w3m-favicon-image' will be set to non-nil value when the
-favicon is ready."
-  (w3m-favicon-set-image nil)
-  (when (and w3m-use-favicon
-	     w3m-current-url
-	     (w3m-static-if (featurep 'xemacs)
-		 (and (device-on-window-system-p)
-		      (featurep w3m-favicon-type))
-	       (and (display-images-p)
-		    (image-type-available-p w3m-favicon-type))))
-    (let (icon)
-      (cond
-       ((and (string-match "\\`about://\\([^/]+\\)/" url)
-	     (setq icon (intern-soft (concat "w3m-about-" (match-string 1 url)
-					     "-favicon"))))
-	(with-current-buffer w3m-current-buffer
-	  (w3m-favicon-set-image
-	   (w3m-favicon-convert
-	    (base64-decode-string (symbol-value icon)) 'ico))))
-       ((or (string-match "\\`https?://" url)
-	    (and (string-match "\\`about://\\(?:header\\|source\\)/https?://"
-			       url)
-		 (setq url (substring url 15))))
-	(if w3m-icon-data
-	    (w3m-favicon-retrieve (car w3m-icon-data) (cdr w3m-icon-data)
-				  w3m-current-buffer)
-	  (w3m-favicon-retrieve (w3m-expand-url (concat "/" w3m-favicon-name)
-						url)
-				'ico w3m-current-buffer)))))))
-
-(defun w3m-favicon-convert (data type)
-  "Convert the favicon DATA in TYPE to the favicon image and return it."
-  (when (or (not (eq type 'ico))
-	    ;; Since most of favicons are the `ico' types, we make sure
-	    ;; of the magic-numbers only as for them.
-	    (string-equal "\x00\x00\x01\x00" (substring data 0 4)))
-    (let ((height (or (cdr w3m-favicon-size)
-		      (w3m-static-if (featurep 'xemacs)
-			  (face-height 'default)
-			(frame-char-height))))
-	  (new (w3m-static-unless (featurep 'xemacs)
-		 (>= emacs-major-version 22)))
-	  bg args img)
-      ;; Examine the transparent color of the image.
-      (when (and w3m-imagick-identify-program
-		 (equal w3m-favicon-default-background ""))
-	(with-temp-buffer
-	  (set-buffer-multibyte nil)
-	  (insert data)
-	  (let ((coding-system-for-read 'raw-text)
-		(coding-system-for-write 'binary))
-	    (condition-case nil
-		(call-process-region (point-min) (point-max)
-				     w3m-imagick-identify-program
-				     t t nil "-verbose" (format "%s:-" type))
-	      (error)))
-	  (goto-char (point-min))
-	  (setq case-fold-search t)
-	  (while (and (not bg)
-		      (re-search-forward "^ *Transparent +color: *\
-\\([^\n ]+\\(?: +[^\n ]+\\)*\\)" nil t))
-	    (when (string-match "\\`none\\'" (setq bg (match-string 1)))
-	      (setq bg nil)))))
-      (setq args (list "-geometry"
-		       (format "%dx%d"
-			       (or (car w3m-favicon-size) height) height)))
-      (w3m-static-unless (featurep 'xemacs)
-	(when new
-	  ;; "-transparent" should precede the other arguments.
-	  (setq args (nconc (when bg (list "-transparent" bg))
-			    args
-			    w3m-favicon-convert-args))))
-      (setq img (apply
-		 #'w3m-imagick-convert-data
-		 data (symbol-name type)
-		 (symbol-name (or (cdr (assq w3m-favicon-type
-					     w3m-favicon-type-alist))
-				  w3m-favicon-type))
-		 args))
-      (when img
-	(w3m-static-if (featurep 'xemacs)
-	    (make-glyph
-	     (make-image-instance (vector w3m-favicon-type :data img)))
-	  (if new
-	      (create-image img w3m-favicon-type t
-			    :ascent 'center
-			    :background w3m-favicon-default-background)
-	    (create-image img w3m-favicon-type t :ascent 'center)))))))
-
-(defun w3m-favicon-retrieve (url type target)
-  "Retrieve favicon from URL and convert it to image as TYPE in TARGET.
-TYPE is a symbol like `ico' and TARGET is a buffer where the image is
-stored in the `w3m-favicon-image' buffer-local variable."
-  (if (and (w3m-favicon-cache-p url)
-	   (or (null w3m-favicon-cache-expire-wait)
-	       (< (- (w3m-float-time)
-		     (w3m-float-time (w3m-favicon-cache-retrieved url)))
-		  w3m-favicon-cache-expire-wait)))
-      (with-current-buffer target
-	(w3m-favicon-set-image (w3m-favicon-cache-favicon url)))
-    (lexical-let ((url url)
-		  (type type)
-		  (target target)
-		  (silent w3m-message-silent))
-      (w3m-process-with-null-handler
-	(w3m-process-do-with-temp-buffer
-	    (ok (w3m-retrieve url 'raw nil nil nil handler))
-	  (let ((w3m-message-silent silent)
-		idata image)
-	    (if (and ok
-		     ;; Some broken servers provides empty contents.
-		     (>= (buffer-size) 4))
-		(setq idata (buffer-string)
-		      image (w3m-favicon-convert idata type))
-	      (w3m-message "Reading %s...done (no favicon)"
-			   (w3m-url-readable-string url)))
-	    (with-current-buffer target
-	      (w3m-favicon-set-image image)
-	      (push (list url idata (current-time) w3m-favicon-image)
-		    w3m-favicon-cache-data)))))))
-  ;; Emacs frame needs to be redisplayed to make favicon come out.
-  (w3m-force-window-update-later target 1))
-
-(defun w3m-favicon-save-cache-file ()
-  "Save the cached favicon data into the local file."
-  (when w3m-favicon-use-cache-file
-    (w3m-save-list (or w3m-favicon-cache-file
-		       (expand-file-name ".favicon" w3m-profile-directory))
-		   (delq nil (mapcar (lambda (elem)
-				       (when (= (length elem) 4)
-					 (butlast elem)))
-				     w3m-favicon-cache-data))
-		   'binary)))
-
-(defun w3m-favicon-load-cache-file ()
-  "Load the cached favicon data from the local file."
-  (when (and w3m-favicon-use-cache-file
-	     (null w3m-favicon-cache-data))
-    (let ((cache (w3m-load-list
-		  (or w3m-favicon-cache-file
-		      (expand-file-name ".favicon" w3m-profile-directory))
-		  'binary))
-	  elem data image)
-      (while cache
-	(setq elem (car cache)
-	      cache (cdr cache)
-	      data (cadr elem))
-	(when (stringp data)
-	  (setcar (cdr elem) (setq data (cons data 'ico))))
-	(when (setq image (condition-case nil
-			      (w3m-favicon-convert (car data) (cdr data))
-			    (error nil)))
-	  (push (nconc elem (list image)) w3m-favicon-cache-data))))))
-
-(add-hook 'w3m-arrived-setup-functions 'w3m-favicon-load-cache-file)
-(add-hook 'w3m-arrived-shutdown-functions 'w3m-favicon-save-cache-file)
-
-(provide 'w3m-favicon)
-
-;;; w3m-favicon.el ends here

=== removed file 'share/emacs/site-lisp/w3m/w3m-fb.el'
--- share/emacs/site-lisp/w3m/w3m-fb.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-fb.el	1970-01-01 00:00:00 +0000
@@ -1,208 +0,0 @@
-;;; w3m-fb.el --- frame-local buffers support for Emacs-w3m
-
-;;; Copyright (C) 2005, 2006 Matthew P. Hodges
-
-;; Author: Matthew P. Hodges <MPHodges@member.fsf.org>
-;; Version: $Id: w3m-fb.el,v 1.4 2006/09/20 09:26:42 yamaoka Exp $
-
-;; w3m-fb.el is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published
-;; by the Free Software Foundation; either version 2, or (at your
-;; option) any later version.
-
-;; w3m-fb.el is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
-
-;;; Commentary:
-;;
-;; With this mode switched on, W3M buffers are associated with the
-;; frame on which they were created.  Only tabs for the current
-;; frame's W3M buffers are shown (with non-nil w3m-use-tab); other
-;; affected commands are w3m-next-buffer w3m-previous-buffer,
-;; w3m-select-buffer and w3m-quit.
-;;
-;; Switch the mode on programmatically with:
-;;
-;;     (w3m-fb-mode 1)
-;;
-;; or toggle interactively with M-x w3m-fb-mode RET.
-
-;;; Code:
-
-(defconst w3m-fb-version "1.0.0"
-  "Version number of this package.")
-
-(eval-when-compile
-  (autoload 'w3m-delete-buffer "w3m" nil t)
-  (autoload 'w3m-list-buffers "w3m-util")
-  (autoload 'w3m-next-buffer "w3m" nil t)
-  (defvar w3m-pop-up-frames))
-
-(eval-and-compile
-  (defalias 'w3m-fb-frame-parameter
-    (cond
-     ((fboundp 'frame-parameter)
-      'frame-parameter)
-     ((fboundp 'frame-property)
-      'frame-property)
-     (t
-      (error "No frame parameter/property function")))))
-
-(defvar w3m-fb-delete-frame-functions
-  (cond
-   ((boundp 'delete-frame-functions)
-    'delete-frame-functions)
-   ((boundp 'delete-frame-hook)
-    'delete-frame-hook)
-   (t
-    (error "No delete-frame hook/functions variable found")))
-  "Symbol associated with `delete-frame' hooks.")
-
-(defvar w3m-fb-list-buffers-frame nil
-  "Frame to list buffers for in `w3m-list-buffers'.
-Bind this if the buffers associated with a frame other than the
-selected frame are required.")
-
-;; Customizable variables
-
-(defgroup w3m-fb nil
-  "Frame local buffers for Emacs-w3m."
-  :group 'w3m)
-
-(defcustom w3m-fb-delete-frame-kill-buffers t
-  "If non-nil, kill W3M buffers after deleting frames."
-  :group 'w3m-fb
-  :type 'boolean
-  :set (lambda (sym val)
-	 (set sym val)
-	 (when (boundp 'w3m-fb-mode)
-	   (if w3m-fb-mode
-	       (add-hook w3m-fb-delete-frame-functions
-			 'w3m-fb-delete-frame-buffers)
-	     (remove-hook w3m-fb-delete-frame-functions
-			  'w3m-fb-delete-frame-buffers)))))
-
-;; Internal variables
-
-(defvar w3m-fb-buffer-list nil
-  "List of w3m buffers associated with the selected frame.")
-
-(defvar w3m-fb-inhibit-buffer-selection nil
-  "Non-nil to inhibit selecting a suitable w3m buffer.")
-
-;; Internal functions
-
-(defun w3m-fb-delete-frame-buffers (&optional frame)
-  "Delete W3M buffers associated with frame FRAME."
-  (let* ((w3m-fb-list-buffers-frame frame)
-	 (buffers (w3m-list-buffers))
-	 ;; Now bind w3m-fb-mode to nil so that w3m-delete-buffer
-	 ;; doesn't call w3m-quit when there are w3m buffers belonging
-	 ;; to other frames.
-	 (w3m-fb-mode nil)
-	 (w3m-fb-inhibit-buffer-selection t))
-    (save-window-excursion
-      (dolist (b buffers)
-	(with-current-buffer b
-	  (w3m-delete-buffer))))))
-
-;; Could use set-frame-parameter here, but it isn't portable
-(defun w3m-fb-set-frame-parameter (frame parameter value)
-  "Set for frame FRAME parameter PARAMETER to VALUE."
-  (modify-frame-parameters frame (list (cons parameter value))))
-
-(defun w3m-fb-add ()
-  "Add current buffer to `w3m-fb-buffer-list'."
-  (let ((val (w3m-fb-frame-parameter nil 'w3m-fb-buffer-list)))
-    (w3m-fb-set-frame-parameter
-     nil 'w3m-fb-buffer-list (nconc val (list (current-buffer))))))
-
-(defun w3m-fb-remove ()
-  "Remove current buffer from `w3m-fb-buffer-list'.
-Applies to all frames."
-  (when (eq major-mode 'w3m-mode)
-    (let (val)
-      (dolist (f (frame-list))
-	(setq val (w3m-fb-frame-parameter f 'w3m-fb-buffer-list))
-	(w3m-fb-set-frame-parameter
-	 f 'w3m-fb-buffer-list (delq (current-buffer) val))))))
-
-(defun w3m-fb-associate ()
-  "Associate all `w3m-mode' buffers with a frame."
-  (let (buffers done rest)
-    ;; Buffers displayed in windows
-    (dolist (f (frame-list))
-      (setq buffers nil)
-      (dolist (w (window-list f nil (frame-selected-window f)))
-	(when (with-current-buffer (window-buffer w)
-		(eq major-mode 'w3m-mode))
-	  (setq buffers (nconc buffers (list (window-buffer w))))
-	  (setq done (nconc done (list (window-buffer w))))))
-      (w3m-fb-set-frame-parameter
-       f 'w3m-fb-buffer-list buffers))
-    ;; Buffers not displayed in windows; add to selected frame
-    (let ((w3m-fb-mode nil))
-      (setq rest (w3m-list-buffers)))
-    (dolist (b done)
-      (setq rest (delq b rest)))
-    (when rest
-      (w3m-fb-set-frame-parameter
-       nil 'w3m-fb-buffer-list
-       (nconc (w3m-fb-frame-parameter nil 'w3m-fb-buffer-list) rest)))))
-
-(defun w3m-fb-dissociate ()
-  "Disassociate `w3m-mode' buffers from frames."
-  (dolist (f (frame-list))
-    (w3m-fb-set-frame-parameter f 'w3m-fb-buffer-list nil)))
-
-(defun w3m-fb-select-buffer ()
-  "Select an appropriate W3M buffer to display."
-  ;; If there are w3m buffers belonging to this frame, ensure one is
-  ;; selected; if not make sure that we're not displaying a w3m
-  ;; buffer
-  (cond
-   ;; Select w3m buffer belonging to frame, if one is available
-   ((w3m-list-buffers)
-    (unless (memq (current-buffer) (w3m-list-buffers))
-      (w3m-next-buffer -1)))
-   (t
-    ;; If no w3m buffers belong to frame, don't display any w3m buffer
-    (while (eq major-mode 'w3m-mode)
-;;      (assert (eq (current-buffer)
-;;		  (window-buffer (selected-window))))
-      (bury-buffer)))))
-
-;; Minor mode setup
-
-;;;###autoload
-(define-minor-mode w3m-fb-mode
-  "Toggle W3M Frame Buffer mode.
-This allows frame-local lists of buffers (tabs)."
-  :init-value nil
-  :group 'w3m-fb
-  :global t
-  (if (and w3m-fb-mode
-	   (if w3m-pop-up-frames
-	       (prog1
-		   (setq w3m-fb-mode nil)
-		 (message "\
-W3M Frame Buffer mode not activated (non-nil w3m-pop-up-frames)")
-		 (sit-for 2))
-	     t))
-      (progn
-	(add-hook 'w3m-mode-hook 'w3m-fb-add)
-	(add-hook 'kill-buffer-hook 'w3m-fb-remove)
-	(when w3m-fb-delete-frame-kill-buffers
-	  (add-hook w3m-fb-delete-frame-functions
-		    'w3m-fb-delete-frame-buffers))
-	(w3m-fb-associate))
-    (remove-hook 'w3m-mode-hook 'w3m-fb-add)
-    (remove-hook 'kill-buffer-hook 'w3m-fb-remove)
-    (remove-hook w3m-fb-delete-frame-functions 'w3m-fb-delete-frame-buffers)
-    (w3m-fb-dissociate)))
-
-(provide 'w3m-fb)
-
-;;; w3m-fb.el ends here

=== removed file 'share/emacs/site-lisp/w3m/w3m-filter.el'
--- share/emacs/site-lisp/w3m/w3m-filter.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-filter.el	1970-01-01 00:00:00 +0000
@@ -1,367 +0,0 @@
-;;; w3m-filter.el --- filtering utility of advertisements on WEB sites -*- coding: euc-japan -*-
-
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-;; Keywords: w3m, WWW, hypermedia
-
-;; This file is a part of emacs-w3m.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-
-;;; Commentary:
-
-;; w3m-filter.el is the add-on utility to filter advertisements on WEB
-;; sites.
-
-
-;;; Code:
-
-(provide 'w3m-filter)
-
-(eval-when-compile
-  (require 'cl))
-
-(require 'w3m)
-
-(defcustom w3m-filter-rules
-  `(("\\`http://www\\.geocities\\.co\\.jp/"
-     w3m-filter-delete-regions
-     "<DIV ALIGN=CENTER>\n<!--*/GeoGuide/*-->" "<!--*/GeoGuide/*-->\n</DIV>")
-    ("\\`http://[a-z]+\\.hp\\.infoseek\\.co\\.jp/"
-     w3m-filter-delete-regions
-     "<!-- start AD -->" "<!-- end AD -->")
-    ("\\`http://linux\\.ascii24\\.com/linux/"
-     w3m-filter-delete-regions
-     "<!-- DAC CHANNEL AD START -->" "<!-- DAC CHANNEL AD END -->")
-    ("\\`http://\\(www\\|images\\|news\\|maps\\|groups\\)\\.google\\."
-     w3m-filter-google)
-    ("\\`https?://\\(?:www\\.\\)?amazon\\.\
-\\(?:com\\|co\\.\\(?:jp\\|uk\\)\\|fr\\|de\\)/"
-     w3m-filter-amazon)
-    ("\\`https?://mixi\\.jp" w3m-filter-mixi)
-    ("\\`http://eow\\.alc\\.co\\.jp/[^/]+/UTF-8" w3m-filter-alc)
-    ("\\`http://www\\.asahi\\.com/" w3m-filter-asahi-shimbun)
-    ("\\`http://imepita\\.jp/[0-9]+/[0-9]+" w3m-filter-imepita)
-    ("\\`http://allatanys\\.jp/" w3m-filter-allatanys)
-    ("\\`http://.*\\.wikipedia\\.org/" w3m-filter-wikipedia)
-    ("" w3m-filter-iframe))
-  "Rules to filter advertisements on WEB sites."
-  :group 'w3m
-  :type '(repeat
-	  (cons :format "%v" :indent 4
-		(regexp :format "Regexp: %v\n" :size 0)
-		(choice
-		 :tag "Filtering Rule"
-		 (list :tag "Delete regions surrounded with these patterns"
-		       (function-item :format "" w3m-filter-delete-region)
-		       (regexp :tag "Start")
-		       (regexp :tag "End"))
-		 (list :tag "Filter with a user defined function"
-		       function
-		       (repeat :tag "Arguments" sexp))))))
-
-(defcustom w3m-filter-google-use-utf8
-  (or (featurep 'un-define) (fboundp 'utf-translate-cjk-mode)
-      (and (not (equal "Japanese" w3m-language))
-	   (w3m-find-coding-system 'utf-8)))
-  "*Use the converting rule to UTF-8 on the site of Google."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-filter-google-use-ruled-line  t
-  "*Use the ruled line on the site of Google."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-filter-google-separator "<hr>"
-  "Field separator for Google's search results ."
-  :group 'w3m
-  :type 'string)
-
-(defcustom w3m-filter-amazon-regxp
-  (concat
-   "\\`\\(https?://\\(?:www\\.\\)?amazon\\."
-   "\\(?:com\\|co\\.\\(?:jp\\|uk\\)\\|fr\\|de\\)"
-   ;; "Joyo.com"
-   "\\)/"
-   "\\(?:"
-   "\\(?:exec/obidos\\|o\\)/ASIN"
-   "\\|"
-   "gp/product"
-   "\\|"
-   "\\(?:[^/]+/\\)?dp"
-   "\\)"
-   "/\\([0-9]+\\)")
-  "*Regexp to extract ASIN number for Amazon."
-  :group 'w3m
-  :type '(string :size 0))
-
-(defcustom w3m-filter-amazon-short-url-bottom nil
-  "*Amazon short URLs insert bottom position."
-  :group 'w3m
-  :type 'boolean)
-
-;;;###autoload
-(defun w3m-filter (url)
-  "Apply filtering rule of URL against a content in this buffer."
-  (save-match-data
-    (dolist (elem w3m-filter-rules)
-      (when (string-match (car elem) url)
-	(apply (cadr elem) url (cddr elem))))))
-
-(defun w3m-filter-delete-regions (url start end)
-  "Delete regions surrounded with a START pattern and an END pattern."
-  (goto-char (point-min))
-  (let (p (i 0))
-    (while (and (search-forward start nil t)
-		(setq p (match-beginning 0))
-		(search-forward end nil t))
-      (delete-region p (match-end 0))
-      (incf i))
-    (> i 0)))
-
-(defun w3m-filter-replace-regexp (url regexp to-string)
-  "Replace all occurrences of REGEXP with TO-STRING."
-  (goto-char (point-min))
-  (while (re-search-forward regexp nil t)
-    (replace-match to-string nil nil)))
-
-;; Filter functions:
-(defun w3m-filter-asahi-shimbun (url)
-  "Convert entity reference of UCS."
-  (when w3m-use-mule-ucs
-    (goto-char (point-min))
-    (let ((case-fold-search t)
-	  end ucs)
-      (while (re-search-forward "alt=\"\\([^\"]+\\)" nil t)
-	(goto-char (match-beginning 1))
-	(setq end (set-marker (make-marker) (match-end 1)))
-	(while (re-search-forward "&#\\([0-9]+\\);" (max end (point)) t)
-	  (setq ucs (string-to-number (match-string 1)))
-	  (delete-region (match-beginning 0) (match-end 0))
-	  (insert-char (w3m-ucs-to-char ucs) 1))))))
-
-(defun w3m-filter-google (url)
-  "Insert separator within items."
-  (goto-char (point-min))
-  (let ((endm (make-marker))
-	(case-fold-search t)
-	pos beg end)
-    (when (and w3m-filter-google-use-utf8
-	       (re-search-forward "\
-<a class=. href=\"http://\\(www\\|images\\|news\\|maps\\|groups\\)\\.google\\."
-				  nil t)
-	       (setq pos (match-beginning 0))
-	       (search-backward "<table" nil t)
-	       (setq beg (match-beginning 0))
-	       (search-forward "</table" nil t)
-	       (set-marker endm (match-end 0))
-	       (< pos (marker-position endm)))
-      (goto-char beg)
-      (while (re-search-forward "[?&][io]e=\\([^&]+\\)&" endm t)
-	(replace-match "UTF-8" nil nil nil 1))
-      (setq end (marker-position endm)))
-    (when (string-match "\\`http://www\\.google\\.[^/]+/search\\?" url)
-      (goto-char (point-max))
-      (when (and w3m-filter-google-use-ruled-line
-		 (search-backward "<div class=" end t)
-		 (search-forward "</div>" nil t))
-	(insert w3m-filter-google-separator))
-      (if w3m-filter-google-use-ruled-line
-	  (while (search-backward "<div class=" end t)
-	    (insert w3m-filter-google-separator))
-	(while (search-backward "<div class=" end t)
-	  (insert "<p>"))))))
-
-(defun w3m-filter-amazon (url)
-  "Insert Amazon short URIs."
-  (when (string-match w3m-filter-amazon-regxp url)
-    (let* ((base (match-string 1 url))
-	   (asin (match-string 2 url))
-	   (shorturls `(,(concat base "/dp/" asin "/")
-			,(concat base "/o/ASIN/" asin "/")
-			,(concat base "/gp/product/" asin "/")))
-	   (case-fold-search t)
-	   shorturl)
-      (goto-char (point-min))
-      (setq url (file-name-as-directory url))
-      (when (or (and (not w3m-filter-amazon-short-url-bottom)
-		     (search-forward "<body" nil t)
-		     (search-forward ">" nil t))
-		(and w3m-filter-amazon-short-url-bottom
-		     (search-forward "</body>" nil t)
-		     (goto-char (match-beginning 0))))
-	(insert "\n")
-	(while (setq shorturl (car shorturls))
-	  (setq shorturls (cdr shorturls))
-	  (unless (string= url shorturl)
-	    (insert (format "Amazon Short URL: <a href=\"%s\">%s</a><br>\n"
-			    shorturl shorturl))))
-	(insert "\n")))))
-
-(defun w3m-filter-mixi (url)
-  "Direct jump to the external diary."
-  (goto-char (point-min))
-  (let (newurl)
-    (while (re-search-forward "<a href=\"?view_diary\\.pl\\?url=\\([^>]+\\)>"
-			      nil t)
-      (setq newurl (match-string 1))
-      (when newurl
-	(delete-region (match-beginning 0) (match-end 0))
-	(when (string-match "&owner_id=[0-9]+\"?\\'" newurl)
-	  (setq newurl (substring newurl 0 (match-beginning 0))))
-	(insert (format "<a href=\"%s\">"
-			(w3m-url-readable-string newurl)))))))
-
-(defun w3m-filter-alc (url)
-  (let ((baseurl "http://eow.alc.co.jp/%s/UTF-8/")
-	curl cword beg tmp1)
-    (when (string-match "\\`http://eow\\.alc\\.co\\.jp/\\([^/]+\\)/UTF-8/" url)
-      (setq curl (match-string 0 url))
-      (setq cword (match-string 1 url))
-      (setq cword (car (split-string (w3m-url-decode-string cword 'utf-8)
-				     " ")))
-      (goto-char (point-min))
-      (while (search-forward "¥Ç¡¼¥¿¤ÎžºÜ¤Ï¶Ø¤¸¤é¤ì¤Æ¤¤¤Þ¤¹" nil t)
-	(delete-region (line-beginning-position) (line-end-position))
-	(insert "<br>"))
-      (goto-char (point-min))
-      (when (search-forward "<body" nil t)
-	(forward-line 1)
-	(insert "<h1>±Ñ¼­Ï¯ on the WEB<h1>\n")
-	(setq beg (point))
-	(when (search-forward "<!-- ¢§¸¡º÷ʸ»úÎó -->" nil t)
-	  (forward-line 1)
-	  (delete-region beg (point)))
-	(when (search-forward "<!-- ¢§¥ï¡¼¥É¥ê¥ó¥¯ ÍúÎò -->" nil t)
-	  (forward-line 1)
-	  (setq beg (point))
-	  (when (search-forward "</body>" nil t)
-	    (delete-region beg (match-beginning 0))))
-	(insert "<br>¡ö¥Ç¡¼¥¿¤ÎžºÜ¤Ï¶Ø¤¸¤é¤ì¤Æ¤¤¤Þ¤¹¡£")
-	;; next/previous page
-	(goto-char (point-min))
-	(while (re-search-forward
-		"<a href='javascript:goPage(\"\\([0-9]+\\)\")'>"
-		nil t)
-	  (setq tmp1 (match-string 1))
-	  (delete-region (match-beginning 0) (match-end 0))
-	  (insert (format "<a href=\"%s?pg=%s\">" curl tmp1)))
-	;; wordlink
-	(goto-char (point-min))
-	(while (re-search-forward
-		"<span class=\"wordlink\">\\([^<]+\\)</span>"
-		nil t)
-	  (setq tmp1 (match-string 1))
-	  (delete-region (match-beginning 0) (match-end 0))
-	  (insert (format "<a href=\"%s\">%s</a>" (format baseurl tmp1) tmp1)))
-	;; goGradable/goFairWord
-	(goto-char (point-min))
-	(while (re-search-forward
-		"<a href='javascript:\\(goGradable\\|goFairWord\\)(\"\\([^\"]+\\)\")'>"
-		nil t)
-	  (setq tmp1 (match-string 2))
-	  (delete-region (match-beginning 0) (match-end 0))
-	  (insert (format "<a href=\"%s\">" (format baseurl tmp1))))
-	;; remove spacer
-	(goto-char (point-min))
-	(while (search-forward "img/spacer.gif" nil t)
-	  (delete-region (line-beginning-position) (line-end-position)))
-	(goto-char (point-min))
-	;; remove ¥ï¡¼¥É¥ê¥ó¥¯
-	(when (search-forward "alt=\"¥ï¡¼¥É¥ê¥ó¥¯\"" nil t)
-	  (delete-region (line-beginning-position) (line-end-position)))
-	;; Á´Ê¸¤òɽ¼¨¤¹¤ë¤Ï̵Íý
-	(goto-char (point-min))
-	(while (re-search-forward
-		(concat "<br */> *¢Í<strong>"
-			"<a href='javascript:goFullText(\"[^\"]+\", \"[^\"]+\")'>"
-			"Á´Ê¸¤òɽ¼¨¤¹¤ë</a>")
-		nil t)
-	  (delete-region (match-beginning 0) (match-end 0)))
-	;; Java Document write... ;_;
-	;; (while (re-search-forward
-	;; 	"<a href='javascript:goFullText(\"\\([^\"]+\\)\", \"\\([^\"]+\\)\")'>"
-	;; 	nil t)
-	;;   (setq tmp1 (match-string 1))
-	;;   (setq tmp2 (match-string 2))
-	;;   (delete-region (match-beginning 0) (match-end 0))
-	;;   ;; &dk=JE, &dk=EJ
-	;;   (insert (format "<a href=\"%s?ref=ex&exp=%s&dn=%s&dk=%s\">"
-	;; 		  curl tmp1 tmp2
-	;; 		  (if (string-match "\\Cj" cword) "JE" "EJ"))))
-	))))
-
-(defun w3m-filter-imepita (url)
-  "JavaScript emulation."
-  (goto-char (point-min))
-  (let (tmp)
-    (when (re-search-forward
-	   (concat "<script><!--\ndocument.write('\\([^\n]*\\)');\r\n//--></script>\n"
-		   "<noscript>.*</noscript>")
-	   nil t)
-      (setq tmp (match-string 1))
-      (delete-region (match-beginning 0) (match-end 0))
-      (insert tmp))))
-
-(defun w3m-filter-iframe (url)
-  (goto-char (point-min))
-  (while (re-search-forward "<iframe [^>]*src=\"\\([^\"]*\\)\"[^>]*>" nil t)
-    (insert (concat "[iframe:<a href=\"" (match-string 1) "\">" (match-string 1) "</a>]"))))
-
-(defun w3m-filter-allatanys (url)
-  "JavaScript emulation."
-  (goto-char (point-min))
-  (let (aturl atexpurl)
-    (if (re-search-forward
-	 (concat "<body[ \t\r\f\n]+onload=\"window\\.top\\.location\\.replace('"
-		 w3m-html-string-regexp
-		 "');\">")
-	 nil t)
-	(progn
-	  (setq aturl (match-string 1))
-	  (setq atexpurl (w3m-expand-url aturl url))
-	  (delete-region (match-beginning 0) (match-end 0))
-	  (insert "<body>\n"
-		  "<hr>"
-		  "Body has a <b>url=window.top.location.replace()</b><br><br>\n"
-		  (format "Goto: <a href=%s>%s</a>\n" aturl atexpurl)
-		  "<hr>")
-	  (goto-char (point-min))
-	  (insert (format "<meta HTTP-EQUIV=\"Refresh\" CONTENT=\"0;URL=%s\">\n"
-			  aturl)))
-      (while (re-search-forward (concat "<a[ \t\r\l\n]+href=\"javascript:[^(]+('"
-					"\\([^']+\\)')\">")
-				nil t)
-	(setq aturl (match-string 1))
-	(delete-region (match-beginning 0) (match-end 0))
-	(insert (format "<a href=\"%s\">" aturl))))))
-
-(defun w3m-filter-wikipedia (url)
-  "Make anchor reference to work."
-  (goto-char (point-min))
-  (let (matched-text refid)
-    (while (re-search-forward 
-	    "<\\(?:sup\\|cite\\) id=\"\\([^\"]*\\)\"" nil t)
-      (setq matched-text (match-string 0)
-	    refid        (match-string 1))
-      (delete-region (match-beginning 0) (match-end 0))
-      (insert (format "<a name=\"%s\"></a>%s" refid matched-text)))))
-
-;;; w3m-filter.el ends here

=== removed file 'share/emacs/site-lisp/w3m/w3m-form.el'
--- share/emacs/site-lisp/w3m/w3m-form.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-form.el	1970-01-01 00:00:00 +0000
@@ -1,1897 +0,0 @@
-;;; w3m-form.el --- Stuffs to handle <form> tag
-
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
-;;          Yuuichi Teranishi  <teranisi@gohome.org>,
-;;          Hideyuki SHIRAI    <shirai@meadowy.org>,
-;;          Shun-ichi GOTO     <gotoh@taiyo.co.jp>,
-;;          Akihiro Arisawa    <ari@mbf.sphere.ne.jp>
-;; Keywords: w3m, WWW, hypermedia
-
-;; This file is a part of emacs-w3m.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-
-;;; Commentary:
-
-;; This file contains the stuffs to handle <form> tag on emacs-w3m.
-;; For more detail about emacs-w3m, see:
-;;
-;;    http://emacs-w3m.namazu.org/
-
-
-;;; Code:
-
-(eval-when-compile
-  (require 'cl))
-
-(require 'w3m-util)
-(require 'w3m)
-
-(eval-when-compile
-  (defvar w3m-current-forms))
-
-(defcustom w3m-form-use-fancy-faces t
-  "*Use fancy faces to fontify <form> tags."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-form-treat-textarea-size t
-  "*Non-nil means to process textarea size (treat textarea rows)."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-form-use-textarea-backup t
-  "*Non-nil means save and restore text that you wrote last in the textarea.
-Files to save text are stored in the directory specified by the
-`w3m-form-textarea-directory' variable."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-form-textarea-file-expire-date 3
-  "*Date to expire of the file for textarea's backup."
-  :group 'w3m
-  :type '(choice (integer :tag "Expire date")
-		 (const :tag "Remove when emacs-w3m exit" t)
-		 (const :tag "No expire" nil)))
-
-(defcustom w3m-form-textarea-file-coding-system
-  (cond ((or (featurep 'un-define) 
-	     (fboundp 'utf-translate-cjk-mode))
-	 'utf-8)
-	((equal "Japanese" w3m-language)
-	 'iso-2022-7bit-ss2)
-	((w3m-find-coding-system 'utf-8)
-	 'utf-8)
-	(t
-	 'iso-2022-7bit-ss2))
-  "Coding system for textarea's backup file."
-  :group 'w3m
-  :type '(coding-system :size 0))
-
-(defcustom w3m-form-textarea-directory
-  (expand-file-name ".textarea" w3m-profile-directory)
-  "*Name of the directory to save the file of textarea input."
-  :group 'w3m
-  :type '(directory :size 0))
-
-(defcustom w3m-form-textarea-edit-mode 'text-mode
-  "*Major mode to edit textarea."
-  :group 'w3m
-  :type '(choice
-	  (function :tag "Major mode")
-	  (repeat :tag "Rules to select major modes for the current page"
-	   (cons (choice (regexp :tag "Regexp matches the current page")
-			 (function :tag "Predicate checks the current page")
-			 (sexp :tag "Expression checks the current page"))
-		 (function :tag "Major mode")))))
-
-(defface w3m-form
-  '((((class color) (background light)) (:foreground "cyan" :underline t))
-    (((class color) (background dark)) (:foreground "red" :underline t))
-    (t (:underline t)))
-  "*Face to fontify forms."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-form-face 'face-alias 'w3m-form)
-
-;;; Local variables
-(defvar w3m-form-input-textarea-buffer nil)
-(defvar w3m-form-input-textarea-form nil)
-(defvar w3m-form-input-textarea-hseq nil)
-(defvar w3m-form-input-textarea-point nil)
-(defvar w3m-form-input-textarea-wincfg nil)
-(defvar w3m-form-input-textarea-file nil)
-(defvar w3m-form-input-textarea-coding-system nil)
-(defvar w3m-form-use-textarea-backup-p nil)
-(make-variable-buffer-local 'w3m-form-input-textarea-buffer)
-(make-variable-buffer-local 'w3m-form-input-textarea-form)
-(make-variable-buffer-local 'w3m-form-input-textarea-hseq)
-(make-variable-buffer-local 'w3m-form-input-textarea-point)
-(make-variable-buffer-local 'w3m-form-input-textarea-wincfg)
-(make-variable-buffer-local 'w3m-form-input-textarea-file)
-(make-variable-buffer-local 'w3m-form-input-textarea-coding-system)
-(make-variable-buffer-local 'w3m-form-use-textarea-backup-p)
-
-(defvar w3m-form-textarea-files nil)
-(make-variable-buffer-local 'w3m-form-textarea-files)
-
-(defvar w3m-form-textarea-post-files nil)
-(make-variable-buffer-local 'w3m-form-textarea-post-files)
-
-(defvar w3m-form-input-textarea-mode nil
-  "Non-nil if w3m textarea minor mode is enabled.")
-(make-variable-buffer-local 'w3m-form-input-textarea-mode)
-
-(defvar w3m-form-input-select-buffer nil)
-(defvar w3m-form-input-select-form nil)
-(defvar w3m-form-input-select-name nil)
-(defvar w3m-form-input-select-id nil)
-(defvar w3m-form-input-select-point nil)
-(defvar w3m-form-input-select-candidates nil)
-(defvar w3m-form-input-select-wincfg nil)
-(defvar w3m-form-input-select-urlid nil)
-(make-variable-buffer-local 'w3m-form-input-select-buffer)
-(make-variable-buffer-local 'w3m-form-input-select-form)
-(make-variable-buffer-local 'w3m-form-input-select-name)
-(make-variable-buffer-local 'w3m-form-input-select-id)
-(make-variable-buffer-local 'w3m-form-input-select-point)
-(make-variable-buffer-local 'w3m-form-input-select-candidates)
-(make-variable-buffer-local 'w3m-form-input-select-wincfg)
-(make-variable-buffer-local 'w3m-form-input-select-urlid)
-
-(defvar w3m-form-input-map-buffer nil)
-(defvar w3m-form-input-map-wincfg nil)
-(defvar w3m-form-input-map-point nil)
-(defvar w3m-form-input-map-urlname nil)
-(make-variable-buffer-local 'w3m-form-input-map-buffer)
-(make-variable-buffer-local 'w3m-form-input-map-wincfg)
-(make-variable-buffer-local 'w3m-form-input-map-point)
-(make-variable-buffer-local 'w3m-form-input-map-urlname)
-
-(defvar w3m-form-new-session nil
-  "Specify non-nil value to create a new session after sending form.
-It is useful to bind this variable with `let', but do not set it globally.")
-
-(defvar w3m-form-download nil
-  "Specify non-nil value to download contents after sending form.
-It is useful to bind this variable with `let', but do not set it globally.")
-
-;;; w3m-form structure:
-
-(defun w3m-form-normalize-action (action url)
-  "Normalize the ACTION using URL as a current URL."
-  ;; "!CURRENT_URL!" is magic string of w3m.
-  (if (and action (not (string= action "!CURRENT_URL!")))
-      (w3m-expand-url action url)
-    (when url
-      (w3m-string-match-url-components url)
-      (substring url 0 (or (match-beginning 6)
-			   (match-beginning 8))))))
-
-(defun w3m-form-new (method action &optional baseurl charlst enctype)
-  "Return new form object."
-  (vector 'w3m-form-object
-	  (if (stringp method)
-	      (intern method)
-	    method)
-	  action
-	  charlst
-	  (or enctype 'application/x-www-form-urlencoded)
-	  nil))
-
-(defun w3m-form-p (obj)
-  "Return t if OBJ is a form object."
-  (and (vectorp obj)
-       (symbolp (aref 0 obj))
-       (eq (aref 0 obj) 'w3m-form-object)))
-
-(defun w3m-form-set-method (form method)
-  (aset form 1 (if (stringp method)
-		   (intern method)
-		 method)))
-(defsetf w3m-form-method w3m-form-set-method)
-
-(defmacro w3m-form-method (form)
-  `(aref ,form 1))
-(defmacro w3m-form-action (form)
-  `(aref ,form 2))
-(defmacro w3m-form-charlst (form)
-  `(aref ,form 3))
-(defmacro w3m-form-enctype (form)
-  `(aref ,form 4))
-(defmacro w3m-form-plist (form)
-  `(aref ,form 5))
-(defun w3m-form-put-property (form name property value)
-  (aset form 5
-	(plist-put (w3m-form-plist form)
-		   (setq name (if (stringp name) (intern name) name))
-		   (plist-put (plist-get (w3m-form-plist form) name)
-			      property value)))
-  value)
-(defmacro w3m-form-get-property (form name property)
-  `(plist-get (plist-get (w3m-form-plist ,form)
-			 (if (stringp ,name)
-			     (intern ,name)
-			   ,name))
-	      ,property))
-(defmacro w3m-form-put (form id name value)
-  `(w3m-form-put-property ,form ,id :value (cons ,name ,value)))
-(defmacro w3m-form-get (form id)
-  `(cdr (w3m-form-get-property ,form ,id :value)))
-(defun w3m-form-get-by-name (form name)
-  (let ((plist (w3m-form-plist form))
-	pair value)
-    (while plist
-      (setq pair (plist-get (cadr plist) :value))
-      (when (and pair
-		 (string= (car pair) name))
-	(setq value (cdr pair)
-	      plist nil))
-      (setq plist (cddr plist)))
-    value))
-(defun w3m-form-put-by-name (form id name value)
-  (let ((plist (w3m-form-plist form))
-	pair found)
-    (while plist
-      (setq pair (plist-get (cadr plist) :value))
-      (when (and pair
-		 (string= (car pair) name))
-	(setcar plist id)
-	(setcdr pair value)
-	(setq found t
-	      plist nil))
-      (setq plist (cddr plist)))
-    (unless found
-      (w3m-form-put form id name value))))
-
-(defun w3m-form-goto-next-field ()
-  "Move to next form field and return the point.
-If no field in forward, return nil without moving."
-  (let* ((id (get-text-property (point) 'w3m-form-field-id))
-	 (beg (if id
-		  (next-single-property-change (point) 'w3m-form-field-id)
-		(point)))
-	 (next (next-single-property-change beg 'w3m-form-field-id)))
-    (if next
-	(goto-char next)
-      nil)))
-
-(defun w3m-form-get-coding-system (coding)
-  (or (catch 'det
-	(while coding
-	  (if (w3m-charset-to-coding-system (car coding))
-	      (throw 'det (w3m-charset-to-coding-system (car coding)))
-	    (setq coding (cdr coding)))))
-      w3m-current-coding-system
-      (w3m-charset-to-coding-system
-       (w3m-content-charset w3m-current-url))
-      w3m-default-coding-system))
-
-(defun w3m-form-make-form-data (form)
-  (let ((plist (w3m-form-plist form))
-	(coding (w3m-form-charlst form))
-	buf bufs)
-    (setq coding (w3m-form-get-coding-system coding))
-    (while plist
-      (let* ((number (car plist))
-	     (pair (plist-get (cadr plist) :value))
-	     (name (car pair))
-	     (value (cdr pair)))
-	(cond
-	 ((and (consp value)
-	       (eq (car value) 'file))
-	  (setq bufs (cons (cons number (cons name value)) bufs)))
-	 ((and (consp value)
-	       (consp (cdr value))
-	       (consp (cadr value)))	; select.
-	  (setq bufs (cons (cons number (cons name (car value))) bufs)))
-	 ((consp value)			; checkbox
-	  (setq bufs (append (mapcar (lambda (x) (cons number (cons name x))) value)
-			     bufs)))
-	 (value
-	  (setq bufs (cons (cons number (cons name value)) bufs))))
-	(setq plist (cddr plist))))
-    (when bufs
-      (setq bufs (sort bufs (lambda (x y) (< (car x) (car y)))))
-      (if (eq (w3m-form-enctype form) 'multipart/form-data)
-	  (let ((boundary (apply 'format "--_%d_%d_%d" (current-time)))
-		file type)
-	    ;; (setq buf (nreverse buf))
-	    (cons
-	     (concat "multipart/form-data; boundary=" boundary)
-	     (with-temp-buffer
-	       (set-buffer-multibyte nil)
-	       (while (setq buf (cdr (car bufs)))
-		 (if (and (consp (cdr buf))
-			  (eq (car (cdr buf)) 'file))
-		     (progn
-		       (setq file (expand-file-name (cdr (cdr buf))))
-		       (if (string= (setq type (w3m-local-content-type file))
-				    "unknown")
-			   (setq type "application/octet-stream"))
-		       (insert "--" boundary "\r\n"
-			       "Content-Disposition: form-data; name=\""
-			       (car buf)
-			       "\"; filename=\"" file "\"\r\n"
-			       "Content-Type: " type "\r\n"
-			       "Content-Transfer-Encoding: binary\r\n\r\n")
-		       (when (file-exists-p file)
-			 (insert-file-contents-literally file)
-			 (goto-char (point-max)))
-		       (insert "\r\n"))
-		   (insert "--" boundary "\r\n"
-			   "Content-Disposition: form-data; name=\""
-			   (car buf)
-			   "\"\r\n\r\n"
-			   (encode-coding-string (cdr buf) coding)
-			   "\r\n"))
-		 (setq bufs (cdr bufs)))
-	       (insert "--" boundary "--\r\n")
-	       (buffer-string))))
-	(mapconcat (lambda (elem)
-		     (setq elem (cdr elem))
-		     (format "%s=%s"
-			     (w3m-url-encode-string (car elem) coding t)
-			     (w3m-url-encode-string (if (stringp (cdr elem))
-							(cdr elem)
-						      "")
-						    coding
-						    t)))
-		   bufs "&")))))
-
-(defun w3m-form-resume (forms)
-  "Resume content of all forms in the current buffer using FORMS."
-  (when forms
-    (if (eq (car forms) t)
-	(setq forms (cdr forms)))
-    (save-excursion
-      (goto-char (point-min))
-      (let (textareas)
-	(while (w3m-form-goto-next-field)
-	  (let ((fid (get-text-property (point) 'w3m-form-field-id)))
-	    (when (and fid
-		       (string-match "\
-fid=\\([^/]+\\)/type=\\([^/]+\\)/name=\\([^/]*\\)/id=\\(.*\\)$"
-				     fid))
-	      (let ((form (nth (string-to-number (match-string 1 fid))
-			       forms))
-		    (cform (nth (string-to-number (match-string 1 fid))
-				w3m-current-forms))
-		    (type (match-string 2 fid))
-		    (name (match-string 3 fid))
-		    (id (string-to-number (match-string 4 fid))))
-		(when form
-		  (cond
-		   ((or (string= type "submit")
-			(string= type "image"))
-		    ;; Remove status to support forms containing multiple
-		    ;; submit buttons.
-		    (w3m-form-put cform id name nil))
-		   ((or (string= type "reset")
-			(string= type "hidden")
-			;; Do nothing.
-			))
-		   ((string= type "password")
-		    (w3m-form-replace (w3m-form-get form id)
-				      'invisible)
-		    (unless (eq form cform)
-		      (w3m-form-put cform id name (w3m-form-get form id))))
-		   ((string= type "radio")
-		    (let ((value (w3m-form-get-by-name form name)))
-		      (when value
-			(w3m-form-replace
-			 (if (string= value (nth 4 (w3m-action (point))))
-			     "*" " ")))
-		      (unless (eq form cform)
-			(w3m-form-put-by-name cform id name value))))
-		   ((string= type "checkbox")
-		    (let ((value (w3m-form-get form id)))
-		      (when value
-			(w3m-form-replace
-			 (if (member (nth 4 (w3m-action (point))) value)
-			     "*" " ")))
-		      (unless (eq form cform)
-			(w3m-form-put cform id name value))))
-		   ((string= type "select")
-		    (let ((selects (w3m-form-get form id)))
-		      (when (and (consp selects) (car selects))
-			(w3m-form-replace (cdr (assoc (car selects)
-						      (cdr selects)))))
-		      (unless (eq form cform)
-			(w3m-form-put cform id name selects))))
-		   ((string= type "textarea")
-		    (let ((hseq (nth 2 (w3m-action (point))))
-			  (value (w3m-form-get form id)))
-		      (when (> hseq 0)
-			(setq textareas (cons (cons hseq value) textareas)))
-		      (unless (eq form cform)
-			(w3m-form-put cform id name value))))
-		   ((string= type "file")
-		    (let ((value (w3m-form-get form id)))
-		      (when (and value
-				 (consp value))
-			(w3m-form-replace (cdr value)))
-		      (unless (eq form cform)
-			(w3m-form-put cform id name value))))
-		   (t
-		    (let ((value (w3m-form-get form id)))
-		      (when (stringp value)
-			(w3m-form-replace value))
-		      (unless (eq form cform)
-			(w3m-form-put cform id name value))))))))))
-	(unless w3m-form-treat-textarea-size
-	  (dolist (textarea textareas)
-	    (when (cdr textarea)
-	      (w3m-form-textarea-replace (car textarea) (cdr textarea)))))))))
-
-;;;###autoload
-(defun w3m-fontify-forms ()
-  "Process half-dumped data and fontify forms in this buffer."
-  ;; If `w3m-current-forms' is resumed from history, reuse it.
-  (w3m-form-parse-and-fontify
-   (when (eq t (car w3m-current-forms))
-     (setq w3m-current-forms (cdr w3m-current-forms)))))
-
-(eval-and-compile
-  (unless (fboundp 'w3m-form-make-button)
-    (defun w3m-form-make-button (start end properties)
-      "Make button on the region from START to END with PROPERTIES."
-      (w3m-add-text-properties start end
-			       (append '(face w3m-form) properties)))))
-
-;;; w3mmee
-;;
-(eval-and-compile
-  (defalias 'w3m-char-to-int (if (fboundp 'char-to-int)
-				 'char-to-int
-			       'identity))
-  (defalias 'w3m-string-to-char-list (if (fboundp 'string-to-list)
-					 'string-to-list
-				       (lambda (str)
-					 (mapcar 'identity str))))
-  (defalias 'w3m-int-to-char (if (fboundp 'int-to-char)
-				 'int-to-char
-			       'identity)))
-
-(defmacro w3m-form-mee-attr-unquote (x)
-  "Unquote form attribute of w3mmee."
-  '(let (attr)
-     (when (eq (car x) ?T)
-       (setq x (cdr x))
-       (while (and x (not (eq (w3m-char-to-int (car x)) 0)))
-	 (setq attr (concat attr (char-to-string (car x))))
-	 (setq x (cdr x))))
-     attr))
-
-(defun w3m-form-mee-new (x)
-  "Decode form information of w3mmee."
-  (setq x (w3m-string-to-char-list
-	   (w3m-url-decode-string x w3m-current-coding-system)))
-  (let (method enctype action charset target name)
-    (setq method (case (/ (w3m-char-to-int (car x)) 16)
-		   (0 "get")
-		   (1 "post")
-		   (2 "internal")
-		   (3 "head"))
-	  enctype (case (% (w3m-char-to-int (car x)) 16)
-		    (0 'application/x-www-form-urlencoded)
-		    (1 'multipart/form-data)))
-    (setq x (cdr x))
-    (setq action (w3m-form-normalize-action (w3m-form-mee-attr-unquote x)
-					    w3m-current-url))
-    (setq x (cdr x))
-    (if (member "lang=many" w3m-compile-options)
-	(setq charset (w3m-form-mee-attr-unquote x))
-      (setq charset (case (car x)
-		      (?e "euc-jp")
-		      (?s "shift-jis")
-		      (?n "iso-2022-7bit"))))
-    (setq x (cdr x))
-    (setq target (w3m-form-mee-attr-unquote x))	; not used.
-    (setq x (cdr x))
-    (setq name (w3m-form-mee-attr-unquote x)) ; not used.
-    (w3m-form-new method action nil (and charset (list charset)) enctype)))
-
-(defun w3m-form-mee-select-value (value)
-  "Decode select form information of w3mmee."
-  (let ((clist (w3m-string-to-char-list
-		(w3m-url-decode-string value w3m-current-coding-system)))
-	label val s selected candidates)
-    (while clist
-      (setq s (eq (car clist) (w3m-int-to-char 1))
-	    label nil
-	    val nil)
-      (setq clist (cdr clist))
-      (while (not (eq (car clist) (w3m-int-to-char 0)))
-	(setq label (concat label (char-to-string (car clist))))
-	(setq clist (cdr clist)))
-      (if label
-	  (setq label (decode-coding-string label w3m-output-coding-system)))
-      (setq clist (cdr clist))
-      (while (not (eq (car clist) (w3m-int-to-char 0)))
-	(setq val (concat val (char-to-string (car clist))))
-	(setq clist (cdr clist)))
-      (if val
-	  (setq val (decode-coding-string val w3m-output-coding-system)))
-      (if s (setq selected val))
-      (push (cons val label) candidates)
-      (setq clist (cdr clist)))
-    (cons selected (nreverse candidates))))
-
-(defun w3m-fontify-textareas ()
-  "Process and fontify textareas in this buffer."
-  (when w3m-form-treat-textarea-size
-    (save-excursion
-      (goto-char (point-min))
-      (let ((inhibit-read-only t)
-	    form fid start end type name rows start-column end-column
-	    hseq abs-hseq text id filename readonly)
-	(while (w3m-form-goto-next-field)
-	  (setq fid (get-text-property (point) 'w3m-form-field-id))
-	  (setq filename (get-text-property (point) 'w3m-form-file-name))
-	  (when
-	      (and
-	       fid
-	       (string-match
-		"fid=\\([^/]+\\)/type=\\([^/]+\\)/name=\\([^/]*\\)/id=\\(.*\\)$"
-		fid))
-	    (setq form (nth (string-to-number (match-string 1 fid))
-			    w3m-current-forms)
-		  type (match-string 2 fid)
-		  name (match-string 3 fid)
-		  id (string-to-number (match-string 4 fid)))
-	    (when (string= type "textarea")
-	      (setq rows (get-text-property (point) 'w3m-textarea-rows)
-		    hseq (get-text-property (point) 'w3m-form-hseq)
-		    readonly (get-text-property (point) 'w3m-form-readonly)
-		    abs-hseq (w3m-anchor-sequence))
-	      (setq start-column (- (current-column) 1))
-	      (goto-char (next-single-property-change (point)
-						      'w3m-form-hseq))
-	      (setq end-column (current-column))
-	      (save-excursion
-		(dotimes (i (- rows 1))
-		  (forward-line -1)
-		  (save-excursion
-		    (move-to-column start-column)
-		    (delete-char 1)
-		    (insert "[")
-		    (setq start (point))
-		    (move-to-column end-column)
-		    (delete-char 1)
-		    (setq end (point))
-		    (insert "]"))
-		  (w3m-add-face-property start end 'w3m-form)
-		  (add-text-properties
-		   start end
-		   `(w3m-form-field-id
-		     ,(format "fid=%s/type=%s/name=%s/id=%d" fid type name id)
-		     w3m-action (w3m-form-input-textarea ,form ,hseq)
-		     w3m-submit (w3m-form-submit ,form ,id ,name
-						 (w3m-form-get ,form ,id)
-						 w3m-form-new-session
-						 w3m-form-download)
-		     w3m-form-hseq ,hseq
-		     w3m-anchor-sequence ,abs-hseq
-		     w3m-form-id ,id
-		     w3m-form-name ,name
-		     w3m-form-file-name ,filename
-		     w3m-form-readonly ,readonly)))
-		(when (setq text (w3m-form-get form id))
-		  (w3m-form-textarea-replace hseq text))))))))))
-
-(defun w3m-form-parse-and-fontify (&optional reuse-forms)
-  "Parse forms of the half-dumped data in this buffer and fontify them.
-Result form structure is saved to the local variable `w3m-current-forms'.
-If optional REUSE-FORMS is non-nil, reuse it as `w3m-current-form'."
-  (let ((case-fold-search t)
-	(id 0)
-	tag start end internal-start textareas selects forms maps mapval
-	form filename)
-    (setq w3m-form-textarea-files nil)
-    (setq w3m-form-use-textarea-backup-p nil)
-    (goto-char (point-min))
-    (while (if (eq w3m-type 'w3mmee)
-	       (w3m-search-tag "_f" "map" "img_alt" "input_alt"
-			       "/input_alt")
-	     (w3m-search-tag "form_int" "map" "img_alt" "input_alt"
-			     "/input_alt"))
-      (setq tag (downcase (match-string 1)))
-      (goto-char (match-end 1))
-      (setq start (match-end 0))
-      (cond
-       ((string= tag (if (eq w3m-type 'w3mmee) "_f" "form_int"))
-	(if (eq w3m-type 'w3mmee)
-	    (w3m-parse-attributes (_x)
-	      (setq forms (nconc forms (list (w3m-form-mee-new _x)))))
-	  (w3m-parse-attributes (action (method :case-ignore)
-					(fid :integer)
-					(accept-charset :case-ignore)
-					(enctype :case-ignore)
-					(charset :case-ignore))
-	    (when action
-	      (setq action (w3m-url-transfer-encode-string
-			    (w3m-decode-anchor-string action)
-			    (if charset
-				(w3m-charset-to-coding-system charset)
-			      w3m-current-coding-system))))
-	    (if (setq form (cdr (assq fid forms)))
-		(progn
-		  (setf (w3m-form-method form) (or method "get"))
-		  (setf (w3m-form-action form)
-			(w3m-form-normalize-action action w3m-current-url))
-		  (setf (w3m-form-charlst form)
-			(if accept-charset
-			    (setq accept-charset
-				  (split-string accept-charset ","))))
-		  (setf (w3m-form-enctype form)
-			(if enctype
-			    (intern enctype)
-			  'application/x-www-form-urlencoded)))
-	      (setq form (w3m-form-new
-			  (or method "get")
-			  (w3m-form-normalize-action action w3m-current-url)
-			  nil
-			  (if accept-charset
-			      (setq accept-charset
-				    (split-string accept-charset ",")))
-			  (if enctype
-			      (intern enctype)
-			    'application/x-www-form-urlencoded)))
-	      (setq forms (cons (cons fid form) forms))))))
-       ((string= tag "map")
-	(let (candidates)
-	  (w3m-parse-attributes (name)
-	    (while (and (w3m-search-tag "area" "/map")
-			(not (char-equal
-			      (char-after (match-beginning 1))
-			      ?/)))
-	      (goto-char (match-end 1))
-	      (w3m-parse-attributes (href alt)
-		(when href
-		  (setq candidates (cons (cons href (or alt href))
-					 candidates)))))
-	    (unless maps (setq maps (w3m-form-new "map" ".")))
-	    (when candidates
-	      (w3m-form-put maps
-			    (incf id)
-			    name
-			    (nreverse candidates))))))
-       ((string= tag "img_alt")
-	(w3m-parse-attributes (usemap)
-	  (w3m-search-tag "/img_alt")
-	  (when (or usemap mapval)
-	    (unless maps (setq maps (w3m-form-new "map" ".")))
-	    (unless usemap (setq usemap mapval))
-	    (when mapval (setq mapval nil))
-	    (w3m-add-face-property start end 'w3m-form)
-	    (add-text-properties
-	     start (match-beginning 0)
-	     `(w3m-action (w3m-form-input-map ,maps ,usemap))))))
-       ((string= tag "/input_alt")
-	(replace-match ""))
-       ((string= tag "input_alt")
-	(w3m-parse-attributes ((fid :integer)
-			       (type :case-ignore)
-			       (width :integer)
-			       (maxlength :integer)
-			       (hseq :integer)
-			       (selectnumber :integer)	 ; select
-			       (textareanumber :integer) ; textarea
-			       (size :integer)		 ; textarea
-			       (rows :integer)		 ; textarea
-			       (top_mergin :integer)	 ; textarea
-			       (checked :bool) ; checkbox, radio
-			       (readonly :bool)
-			       no_effect       ; map
-			       name value)
-	  (incf id)
-	  (when value
-	    (setq value (w3m-decode-entities-string value)))
-	  (save-excursion
-	    (search-forward "</input_alt>")
-	    (setq end (match-beginning 0)))
-	  (let ((abs-hseq (or (and (null hseq) 0) (abs hseq))))
-	    (setq w3m-max-anchor-sequence
-		  (max abs-hseq w3m-max-anchor-sequence))
-	    (if (eq w3m-type 'w3mmee)
-		(setq form (nth fid forms))
-	      (setq form (cdr (assq fid forms))))
-	    (unless form
-	      (setq forms (cons (cons fid (setq form
-						(w3m-form-new nil nil)))
-				forms)))
-	    (cond
-	     ((and (string= type "hidden")
-		   (string= name "link"))
-	      (setq mapval value))
-	     ((or (string= type "submit")
-		  (string= type "image"))
-	      (unless (string= no_effect "true")
-		(w3m-form-make-button
-		 start end
-		 `(w3m-form-field-id
-		   ,(format "fid=%d/type=%s/name=%s/id=%d" fid type name id)
-		   w3m-action (w3m-form-submit ,form ,id ,name ,value
-					       w3m-form-new-session
-					       w3m-form-download)
-		   w3m-submit (w3m-form-submit ,form ,id ,name
-					       (w3m-form-get ,form ,id)
-					       w3m-form-new-session
-					       w3m-form-download)
-		   w3m-anchor-sequence ,abs-hseq))))
-	     ((string= type "reset")
-	      (w3m-form-make-button
-	       start end
-	       `(w3m-form-field-id
-		 ,(format "fid=%d/type=%s/name=%s/id=%d" fid type name id)
-		 w3m-action (w3m-form-reset ,form)
-		 w3m-anchor-sequence ,abs-hseq)))
-	     ((string= type "textarea")
-	      (if (eq w3m-type 'w3mmee)
-		  (w3m-form-put form id
-				name
-				(decode-coding-string
-				 (w3m-url-decode-string value
-							w3m-current-coding-system)
-				 w3m-output-coding-system))
-		(setq textareas (cons (list textareanumber form id name readonly)
-				      textareas)))
-	      (when w3m-current-url
-		(setq filename (expand-file-name
-				(w3m-form-input-textarea-filename
-				 w3m-current-url
-				 (format "fid=%d/type=%s/name=%s/id=%d"
-					 fid type name id))
-				w3m-form-textarea-directory))
-		(setq w3m-form-textarea-files
-		      (cons filename w3m-form-textarea-files)))
-	      (w3m-add-face-property start end 'w3m-form)
-	      (add-text-properties
-	       start end
-	       `(w3m-form-field-id
-		 ,(format "fid=%d/type=%s/name=%s/id=%d" fid type name id)
-		 w3m-action (w3m-form-input-textarea ,form ,hseq)
-		 w3m-submit (w3m-form-submit ,form ,id ,name
-					     (w3m-form-get ,form ,id)
-					     w3m-form-new-session
-					     w3m-form-download)
-		 w3m-textarea-rows ,rows
-		 w3m-form-hseq ,hseq
-		 w3m-anchor-sequence ,abs-hseq
-		 w3m-form-id ,id
-		 w3m-form-name ,name
-		 w3m-form-file-name ,filename
-		 w3m-form-readonly ,readonly)))
-	     ((string= type "select")
-	      (when (if (eq w3m-type 'w3mmee)
-			(when value
-			  (w3m-form-put form id name
-					(w3m-form-mee-select-value value))
-			  t)
-		      (setq selects (cons (list selectnumber form id name)
-					  selects)))
-		(w3m-add-face-property start end 'w3m-form)
-		(add-text-properties
-		 start end
-		 `(w3m-form-field-id
-		   ,(format "fid=%d/type=%s/name=%s/id=%d" fid type name id)
-		   w3m-action (w3m-form-input-select ,form ,id ,name)
-		   w3m-submit (w3m-form-submit ,form ,id ,name
-					       (w3m-form-get ,form ,id)
-					       w3m-form-new-session
-					       w3m-form-download)
-		   w3m-anchor-sequence ,abs-hseq))))
-	     ((string= type "password")
-	      (w3m-add-face-property start end 'w3m-form)
-	      (add-text-properties
-	       start end
-	       `(w3m-form-field-id
-		 ,(format "fid=%d/type=%s/name=%s/id=%d" fid type name id)
-		 w3m-action (w3m-form-input-password ,form ,id ,name)
-		 w3m-submit (w3m-form-submit ,form ,id ,name
-					     (w3m-form-get ,form ,id)
-					     w3m-form-new-session
-					     w3m-form-download)
-		 w3m-anchor-sequence ,abs-hseq
-		 w3m-form-readonly ,readonly)))
-	     ((string= type "checkbox")
-	      (let ((cvalue (w3m-form-get form id)))
-		(w3m-form-put form id name
-			      (if checked
-				  (cons value cvalue)
-				cvalue)))
-	      (w3m-add-face-property start end 'w3m-form)
-	      (add-text-properties
-	       start end
-	       `(w3m-form-field-id
-		 ,(format "fid=%d/type=%s/name=%s/id=%d" fid type name id)
-		 w3m-action (w3m-form-input-checkbox ,form ,id ,name ,value)
-		 w3m-submit (w3m-form-submit ,form ,id ,name
-					     (w3m-form-get ,form ,id)
-					     w3m-form-new-session
-					     w3m-form-download)
-		 w3m-anchor-sequence ,abs-hseq)))
-	     ((string= type "radio")
-	      ;; Radio button input, one name has one value
-	      (if checked
-		  (w3m-form-put-by-name form id name value))
-	      (w3m-add-face-property start end 'w3m-form)
-	      (add-text-properties
-	       start end
-	       `(w3m-form-field-id
-		 ,(format "fid=%d/type=%s/name=%s/id=%d" fid type name id)
-		 w3m-action (w3m-form-input-radio ,form ,id ,name ,value)
-		 w3m-submit (w3m-form-submit ,form ,id ,name
-					     (w3m-form-get-by-name ,form ,name)
-					     w3m-form-new-session
-					     w3m-form-download)
-		 w3m-anchor-sequence ,abs-hseq)))
-	     ((string= type "file")
-	      (w3m-add-face-property start end 'w3m-form)
-	      (add-text-properties
-	       start end
-	       `(w3m-form-field-id
-		 ,(format "fid=%d/type=%s/name=%s/id=%d" fid type name id)
-		 w3m-action (w3m-form-input-file ,form ,id ,name ,value)
-		 w3m-submit (w3m-form-submit ,form ,id ,name
-					     (w3m-form-get ,form ,id)
-					     w3m-form-new-session
-					     w3m-form-download)
-		 w3m-anchor-sequence ,abs-hseq)))
-	     (t
-	      (w3m-form-put form
-			    id
-			    name
-			    (or value (w3m-form-get form id)))
-	      (w3m-add-face-property start end 'w3m-form)
-	      (add-text-properties
-	       start end
-	       `(w3m-form-field-id
-		 ,(format "fid=%d/type=%s/name=%s/id=%d" fid type name id)
-		 w3m-action (w3m-form-input ,form ,id ,name ,type
-					    ,width ,maxlength ,value)
-		 w3m-submit (w3m-form-submit ,form ,id ,name
-					     (w3m-form-get ,form ,id)
-					     w3m-form-new-session
-					     w3m-form-download)
-		 w3m-anchor-sequence ,abs-hseq
-		 w3m-form-readonly ,readonly)))))))))
-    ;; Process <internal> tag.
-    (when (search-forward "<internal>" nil t)
-      (setq internal-start (match-beginning 0))
-      (while (and (null reuse-forms)
-		  (re-search-forward "<\\([a-z]+\\)_int" nil t))
-	(incf id)
-	(cond
-	 ((string= (match-string 1) "select")
-	  (w3m-parse-attributes ((selectnumber :integer))
-	    (let ((selectinfo (cdr (assq selectnumber selects)))
-		  current candidates)
-	      (when selectinfo
-		;; Parse FORM SELECT fields until </SELECT> (or </FORM>)
-		(while (and (w3m-search-tag "option_int" "/select_int")
-			    (not (char-equal (char-after (match-beginning 1))
-					     ?/)))
-		  ;; <option_int> is found
-		  (goto-char (match-end 1))
-		  (w3m-parse-attributes ((value :decode-entity)
-					 (label :decode-entity)
-					 (selected :bool))
-		    (push (cons value label) candidates)
-		    (if selected (setq current value))
-		    (skip-chars-forward ">\n")))
-		(setq candidates (nreverse candidates))
-		(w3m-form-put (nth 0 selectinfo)
-			      (nth 1 selectinfo)
-			      (nth 2 selectinfo)
-			      (cons (or current	; current value
-					(caar candidates))
-				    candidates))))))
-	 ((string= (match-string 1) "textarea")
-	  (w3m-parse-attributes ((textareanumber :integer))
-	    (forward-char 1)		; skip newline character.
-	    (let ((textareainfo (cdr (assq textareanumber textareas)))
-		  (buffer (current-buffer))
-		  end text)
-	      (when textareainfo
-		(setq start (point))
-		(skip-chars-forward "^<")
-		(setq text (buffer-substring-no-properties start (point)))
-		(w3m-form-put
-		 (nth 0 textareainfo) (nth 1 textareainfo) (nth 2 textareainfo)
-		 (with-temp-buffer
-		   (insert text)
-		   (w3m-decode-entities)
-		   (goto-char (point-min))
-		   (while (search-forward "\r\n" nil t) (replace-match "\n"))
-		   (buffer-string)))))))))
-      (when (search-forward "</internal>" nil t)
-	(delete-region internal-start (match-end 0))))
-    (setq w3m-current-forms (if (eq w3m-type 'w3mmee)
-				forms
-			      (mapcar 'cdr
-				      (sort forms (lambda (x y)
-						    (< (car x)(car y)))))))
-    (w3m-form-resume (or reuse-forms w3m-current-forms))))
-
-(defun w3m-form-replace (string &optional invisible)
-  (let* ((start (text-property-any (point-min) (point-max)
-				   'w3m-action (w3m-action (point))))
-	 (width (string-width
-		 (buffer-substring
-		  start
-		  (next-single-property-change start 'w3m-action))))
-	 (prop (text-properties-at start))
-	 (p (point))
-	 (inhibit-read-only t))
-    (goto-char start)
-    (insert (setq string
-		  (if invisible
-		      (make-string (length string) ?.)
-		    (mapconcat 'identity
-			       (split-string
-				(w3m-truncate-string (or string "")
-						     width) "\n")
-			       "")))
-	    (make-string (max (- width (string-width string)) 0) ?\ ))
-    (delete-region (point)
-		   (next-single-property-change (point) 'w3m-action))
-    (add-text-properties start (point) prop)
-    (set-buffer-modified-p nil)
-    (prog1 (point)
-      (goto-char p))))
-
-(defun w3m-form-input (form id name type width maxlength value)
-  (let ((fvalue (w3m-form-get form id)))
-    (if (get-text-property (point) 'w3m-form-readonly)
-	(message "READONLY %s: %s" (upcase type) fvalue)
-      (save-excursion
-	(let ((input (save-excursion
-		       (read-from-minibuffer (concat (upcase type) ": ") fvalue)))
-	      (coding (w3m-form-get-coding-system (w3m-form-charlst form))))
-	  (when (with-temp-buffer
-		  (insert input)
-		  (w3m-form-coding-system-accept-region-p nil nil coding))
-	    (w3m-form-put form id name input)
-	    (w3m-form-replace input)))))))
-
-(defun w3m-form-input-password (form id name)
-  (if (get-text-property (point) 'w3m-form-readonly)
-      (message "This input box is read-only.")
-    (let* ((fvalue (w3m-form-get form id))
-	   (input (save-excursion
-		    (read-passwd (concat "PASSWORD"
-					 (if fvalue
-					     " (default is no change)")
-					 ": ")
-				 nil
-				 fvalue))))
-      (w3m-form-put form id name input)
-      (w3m-form-replace input 'invisible))))
-
-(defun w3m-form-input-checkbox (form id name value)
-  (let ((fvalue (w3m-form-get form id)))
-    (if (member value fvalue)		; already checked
-	(progn
-	  (w3m-form-put form id name (delete value fvalue))
-	  (w3m-form-replace " "))
-      (w3m-form-put form id name (cons value fvalue))
-      (w3m-form-replace "*"))))
-
-(defun w3m-form-field-parse (fid)
-  (when (and fid
-	     (string-match
-	      "fid=\\([^/]+\\)/type=\\([^/]+\\)/name=\\([^/]*\\)/id=\\(.*\\)$"
-	      fid))
-    (list (match-string 1 fid)
-	  (match-string 2 fid)
-	  (match-string 3 fid)
-	  (match-string 4 fid))))
-
-(defun w3m-form-input-radio (form id name value)
-  (save-excursion
-    (let ((fid (w3m-form-field-parse
-		(get-text-property (point) 'w3m-form-field-id)))
-	  cur-fid)
-      (when fid
-	;; Uncheck all RADIO input having same NAME
-	(goto-char 1)
-	(while (w3m-form-goto-next-field)
-	  (setq cur-fid (w3m-form-field-parse
-			 (get-text-property (point)
-					    'w3m-form-field-id)))
-	  (when (and (string= (nth 0 fid) (nth 0 cur-fid))
-		     (string= (nth 1 fid) (nth 1 cur-fid))
-		     (string= (nth 2 fid) (nth 2 cur-fid)))
-	    (w3m-form-put-by-name
-	     form (string-to-number (nth 3 fid)) (nth 2 fid) nil)
-	    (w3m-form-replace " ")))))) ; erase check
-  ;; Then set this field as checked.
-  (w3m-form-put-by-name form id name value)
-  (w3m-form-replace "*"))
-
-(defun w3m-form-input-file (form id name value)
-  (let ((input (save-excursion
-		 (read-file-name "File name: "
-				 (or (cdr (w3m-form-get form id))
-				     "~/")))))
-    (w3m-form-put form id name (cons 'file input))
-    (w3m-form-replace input)))
-
-;;; TEXTAREA
-
-(defcustom w3m-form-input-textarea-buffer-lines 10
-  "*Buffer lines for form textarea buffer."
-  :group 'w3m
-  :type '(integer :size 0))
-
-(defcustom w3m-form-input-textarea-mode-hook nil
-  "*A hook called after w3m-form-input-textarea-mode."
-  :group 'w3m
-  :type 'hook)
-
-(defcustom w3m-form-input-textarea-set-hook nil
-  "*A Hook called before w3m-form-input-textarea-set."
-  :group 'w3m
-  :type 'hook)
-
-(defun w3m-form-text-chop (text)
-  "Return a list of substrings of TEXT which are separated by newline
-character."
-  (when text
-    (let ((start 0) parts)
-      (while (string-match "\n" text start)
-	(setq parts (cons (substring text start (match-beginning 0)) parts)
-	      start (match-end 0)))
-      (nreverse (cons (substring text start) parts)))))
-
-(defun w3m-form-search-textarea (hseq direction)
-  (let ((point (point))
-	(next-single-property-change-function
-	 (if (eq direction 'forward)
-	     'next-single-property-change
-	   'previous-single-property-change))
-	found)
-    (if (get-text-property point 'w3m-form-hseq)
-	(setq point (funcall next-single-property-change-function point
-			     'w3m-form-hseq)))
-    (when point
-      (while (and (not found)
-		  (setq point (funcall next-single-property-change-function
-				       point 'w3m-form-hseq)))
-	(when (eq (get-text-property point 'w3m-form-hseq) hseq)
-	  (setq found t)))
-      (if point (goto-char point)))))
-
-(defun w3m-form-textarea-replace (hseq string)
-  (let ((chopped (w3m-form-text-chop string))
-	(p (point)))
-    (goto-char (point-min))
-    (while (w3m-form-search-textarea hseq 'forward)
-      (w3m-form-replace (or (car chopped) ""))
-      (setq chopped (cdr chopped)))
-    (goto-char p)))
-
-(defun w3m-form-textarea-info ()
-  "Return a list of (ID NAME LINE READONLY) for current text area."
-  (let ((s (get-text-property (point) 'w3m-form-hseq))
-	(lines 1))
-    (save-excursion
-      (while (w3m-form-search-textarea s 'backward)
-	(incf lines))
-      (list (get-text-property (point) 'w3m-form-id)
-	    (get-text-property (point) 'w3m-form-name)
-	    lines
-	    (get-text-property (point) 'w3m-form-readonly)))))
-
-(defvar w3m-form-input-textarea-map nil)
-(unless w3m-form-input-textarea-map
-  (setq w3m-form-input-textarea-map (make-sparse-keymap))
-  (define-key w3m-form-input-textarea-map "\C-c\C-c"
-    'w3m-form-input-textarea-set)
-  (define-key w3m-form-input-textarea-map "\C-c\C-q"
-    'w3m-form-input-textarea-exit)
-  (define-key w3m-form-input-textarea-map "\C-c\C-k"
-    'w3m-form-input-textarea-exit)
-  (define-key w3m-form-input-textarea-map "\C-x\C-s"
-    'w3m-form-input-textarea-save))
-
-(defun w3m-form-input-textarea-filename (url id)
-  (condition-case nil
-      (concat (md5 (concat url id) nil nil w3m-current-coding-system) ".txt")
-    (error
-     (let ((file "")
-	   ;; Interdit chars of Windows
-	   (replace (regexp-opt '("\\" "/" ":" "*" "?" "\"" "<" ">" "|")))
-	   (max-file-path 254))
-       (while (string-match replace url)
-	 (setq file (concat file (substring url 0 (match-beginning 0)) "_"))
-	 (setq url (substring url (match-end 0))))
-       (setq file (concat file url "-"))
-       (while (string-match replace id)
-	 (setq file (concat file (substring id 0 (match-beginning 0)) "_"))
-	 (setq id (substring id (match-end 0))))
-       (if (< (- max-file-path 4) (length file))
-	   (setq file (substring file 0 (- max-file-path 4 (length id)))))
-       (setq file (concat file id ".txt"))
-       (convert-standard-filename file)))))
-
-(defun w3m-form-input-textarea-save (&optional buffer file no-check)
-  "Save textarea buffer."
-  (interactive)
-  (setq buffer (or buffer (current-buffer)))
-  (setq file (or file w3m-form-input-textarea-file))
-  (with-current-buffer buffer
-    (if (/= (buffer-size) 0)
-	(when (and
-	       (or w3m-form-use-textarea-backup-p
-		   (and (eq this-command 'w3m-form-input-textarea-save)
-			(y-or-n-p "Really save this buffer? ")))
-	       (or no-check
-		   (w3m-form-coding-system-accept-region-p)))
-	  (let ((buffer-file-coding-system
-		 w3m-form-textarea-file-coding-system)
-		(coding-system-for-write
-		 w3m-form-textarea-file-coding-system))
-	    (write-region (point-min) (point-max) file nil 'nomsg)))
-      (when w3m-form-use-textarea-backup-p
-	(when (file-exists-p file)
-	  (delete-file file))
-	(when (file-exists-p (make-backup-file-name file))
-	  (delete-file (make-backup-file-name file)))
-	(set-buffer-modified-p nil)))))
-
-(defun w3m-form-input-textarea-set ()
-  "Save and exit from w3m form textarea mode."
-  (interactive)
-  (run-hooks 'w3m-form-input-textarea-set-hook)
-  (let ((input (buffer-string))
-	(buffer (current-buffer))
-	(hseq w3m-form-input-textarea-hseq)
-	(form w3m-form-input-textarea-form)
-	(point w3m-form-input-textarea-point)
-	(w3mbuffer w3m-form-input-textarea-buffer)
-	(wincfg w3m-form-input-textarea-wincfg)
-	(file w3m-form-input-textarea-file)
-	info)
-    (when (w3m-form-coding-system-accept-region-p)
-      (w3m-form-input-textarea-save buffer file t)
-      (or (one-window-p) (delete-window))
-      (kill-buffer buffer)
-      (if (not (buffer-live-p w3mbuffer))
-	  (and (eq this-command 'w3m-form-input-textarea-set)
-	       (message "No current w3m buffer"))
-	(pop-to-buffer w3mbuffer)
-	(set-window-configuration wincfg)
-	(when (and form point)
-	  (goto-char point)
-	  (setq info (w3m-form-textarea-info))
-	  (w3m-form-put form (nth 0 info) (nth 1 info) input)
-	  (w3m-form-textarea-replace hseq input))))))
-
-(defun w3m-form-input-textarea-exit ()
-  "Exit from w3m form textarea mode."
-  (interactive)
-  (let ((buffer (current-buffer))
-	(point w3m-form-input-textarea-point)
-	(w3mbuffer w3m-form-input-textarea-buffer)
-	(wincfg w3m-form-input-textarea-wincfg)
-	(file w3m-form-input-textarea-file))
-    (w3m-form-input-textarea-save buffer file)
-    (or (one-window-p) (delete-window))
-    (kill-buffer buffer)
-    (if (not (buffer-live-p w3mbuffer))
-	(and (eq this-command 'w3m-form-input-textarea-exit)
-	     (message "No current w3m buffer"))
-      (pop-to-buffer w3mbuffer)
-      (set-window-configuration wincfg)
-      (when point (goto-char point)))))
-
-(unless (assq 'w3m-form-input-textarea-mode minor-mode-alist)
-  (push (list 'w3m-form-input-textarea-mode " w3m form textarea")
-	minor-mode-alist))
-(unless (assq 'w3m-form-input-textarea-mode minor-mode-map-alist)
-  (push (cons 'w3m-form-input-textarea-mode w3m-form-input-textarea-map)
-	minor-mode-map-alist))
-
-(defun w3m-form-input-textarea-mode (&optional arg)
-  "\\<w3m-form-input-textarea-map>
-Minor mode to edit form textareas of w3m.
-
-\\[w3m-form-input-textarea-set]\
-	Set the value and exit from this textarea.
-\\[w3m-form-input-textarea-exit]\
-	Exit from this textarea without setting the value.
-\\[w3m-form-input-textarea-save]\
-	Save editing data in this textarea.
-"
-  (interactive "P")
-  (when (setq w3m-form-input-textarea-mode
-	      (if arg
-		  (> (prefix-numeric-value arg) 0)
-		(not w3m-form-input-textarea-mode)))
-    (run-hooks 'w3m-form-input-textarea-mode-hook)))
-
-(defun w3m-form-input-textarea-mode-setup (caller-buffer)
-  (funcall (if (functionp w3m-form-textarea-edit-mode)
-	       w3m-form-textarea-edit-mode
-	     (or (when (buffer-live-p caller-buffer)
-		   (with-current-buffer caller-buffer
-		     (save-match-data
-		       (catch 'found-mode
-			 (dolist (elem w3m-form-textarea-edit-mode)
-			   (when (if (stringp (car elem))
-				     (string-match (car elem)
-						   w3m-current-url)
-				   (if (functionp (car elem))
-				       (funcall (car elem))
-				     (eval (car elem))))
-			     (throw 'found-mode (cdr elem))))))))
-		 'text-mode)))
-  (w3m-form-input-textarea-mode 1)
-  (message "%s"
-	   (substitute-command-keys "Type \
-`\\<w3m-form-input-textarea-map>\\[w3m-form-input-textarea-set]' to exit \
-textarea, or type \
-`\\<w3m-form-input-textarea-map>\\[w3m-form-input-textarea-exit]' to quit \
-textarea")))
-
-(eval-and-compile
-  (defalias 'w3m-same-window-p
-    (if (featurep 'xemacs)
-	(lambda (buffer-name)
-	  "Return non-nil if a buffer named BUFFER-NAME would be shown in the \"same\" window.
-This function returns non-nil if `display-buffer' or
-`pop-to-buffer' would show a buffer named BUFFER-NAME in the
-selected rather than \(as usual\) some other window.  See
-`same-window-buffer-names' and `same-window-regexps'."
-	  (cond
-	   ((not (stringp buffer-name)))
-	   ;; The elements of `same-window-buffer-names' can be buffer
-	   ;; names or cons cells whose cars are buffer names.
-	   ((and (boundp 'same-window-buffer-names)
-		 (member buffer-name same-window-buffer-names)))
-	   ((and (boundp 'same-window-buffer-names)
-		 (assoc buffer-name same-window-buffer-names)))
-	   ((and (boundp 'same-window-regexps)
-		 (save-match-data
-		   (catch 'found
-		     (dolist (regexp same-window-regexps)
-		       ;; The elements of `same-window-regexps' can be regexps
-		       ;; or cons cells whose cars are regexps.
-		       (when (or (and (stringp regexp)
-				      (string-match regexp buffer-name))
-				 (and (consp regexp) (stringp (car regexp))
-				      (string-match (car regexp) buffer-name)))
-			 (throw 'found t)))))))))
-      'same-window-p)))
-
-(defun w3m-form-input-textarea (form hseq)
-  (let* ((info  (w3m-form-textarea-info))
-	 (value (w3m-form-get form (car info)))
-	 (cur-win (selected-window))
-	 (wincfg (current-window-configuration))
-	 (w3mbuffer (current-buffer))
-	 (point (point))
-	 (size (- (window-height cur-win)
-		  (1+ (max window-min-height
-			   w3m-form-input-textarea-buffer-lines))))
-	 (file (get-text-property (point) 'w3m-form-file-name))
-	 (coding (w3m-form-get-coding-system (w3m-form-charlst form)))
-	 (readonly (nth 3 info))
-	 (backup-p (and (not readonly)
-			(w3m-form-use-textarea-backup-p)))
-	 buffer)
-    (setq w3m-form-use-textarea-backup-p backup-p)
-    (when backup-p
-      (add-hook 'kill-emacs-hook 'w3m-form-textarea-file-cleanup)
-      (let ((dir (file-chase-links
-		  (expand-file-name w3m-form-textarea-directory))))
-	(unless (and (file-exists-p dir) (file-directory-p dir))
-	  (make-directory dir))))
-    (setq buffer
-	  (catch 'detect-buffer
-	    (save-current-buffer
-	      (dolist (buffer (buffer-list))
-		(set-buffer buffer)
-		(when (and w3m-form-input-textarea-mode
-			   (eq w3m-form-input-textarea-buffer w3mbuffer)
-			   (string= w3m-form-input-textarea-file file))
-		  (throw 'detect-buffer (cons t buffer)))))
-	    (generate-new-buffer "*w3m form textarea*")))
-    (unless (consp buffer)
-      (when (and backup-p (file-exists-p file) (file-readable-p file))
-	(with-temp-buffer
-	  (let ((buffer-file-coding-system w3m-form-textarea-file-coding-system)
-		(coding-system-for-read w3m-form-textarea-file-coding-system))
-	    (insert-file-contents file))
-	  (let ((before (buffer-string)))
-	    (when (unless (w3m-form-textarea-same-check value before)
-		    (save-window-excursion
-		      (set-window-buffer (selected-window) (current-buffer))
-		      (goto-char (abs (w3m-compare-strings
-				       before 0 (length before)
-				       value 0 (length value))))
-		      (condition-case nil
-			  (y-or-n-p
-			   "The saved text for this form exists. Use it? ")
-			(quit
-			 (kill-buffer buffer)
-			 (error "Abort textarea editing")))))
-	      (setq value before)))))
-      (with-current-buffer buffer
-	(insert value)
-	(set-buffer-modified-p nil)
-	(when readonly (setq buffer-read-only t))
-	(goto-char (point-min))
-	(forward-line (1- (nth 2 info)))
-	(w3m-form-input-textarea-mode-setup w3mbuffer)
-	(setq w3m-form-input-textarea-form form
-	      w3m-form-input-textarea-hseq hseq
-	      w3m-form-input-textarea-buffer w3mbuffer
-	      w3m-form-input-textarea-point point
-	      w3m-form-input-textarea-wincfg wincfg
-	      w3m-form-input-textarea-file file
-	      w3m-form-input-textarea-coding-system coding
-	      w3m-form-use-textarea-backup-p backup-p)))
-    (if (and (consp buffer)
-	     (get-buffer-window (cdr buffer)))
-	;; same frame only
-	(select-window (get-buffer-window (cdr buffer)))
-      ;; Use the whole current window for the textarea when a user added
-      ;; the buffer name "*w3m form textarea*" to `same-window-buffer-names'
-      ;; (that is available only in Emacs).
-      ;; cf. http://article.gmane.org/gmane.emacs.w3m/7797
-      (unless (w3m-same-window-p (buffer-name (if (consp buffer)
-						  (cdr buffer)
-						buffer)))
-	(condition-case nil
-	    (split-window cur-win (if (> size 0) size window-min-height))
-	  (error
-	   (delete-other-windows)
-	   (split-window cur-win (- (window-height cur-win)
-				    w3m-form-input-textarea-buffer-lines))))
-	(select-window (next-window)))
-      (let ((pop-up-windows nil))
-	(switch-to-buffer (if (consp buffer) (cdr buffer) buffer))))))
-
-(defun w3m-form-use-textarea-backup-p ()
-  (and w3m-form-use-textarea-backup
-       (let ((cbuf (current-buffer))
-	     (curl w3m-current-url))
-	 (catch 'loop
-	   (save-current-buffer
-	     (dolist (buf (w3m-list-buffers))
-	       (when (eq buf cbuf)
-		 (throw 'loop t))
-	       (set-buffer buf)
-	       (when (string= w3m-current-url curl)
-		 (throw 'loop nil)))
-	     t)))))
-
-(defun w3m-form-textarea-same-check (str1 str2)
-  "Compare STR1 and STR2 without tailed whitespace."
-  (when (string-match "[ \t\n\r]+$" str1)
-    (setq str1 (substring str1 0 (match-beginning 0))))
-  (when (string-match "[ \t\n\r]+$" str2)
-    (setq str2 (substring str2 0 (match-beginning 0))))
-  (string= str1 str2))
-
-(defun w3m-form-textarea-file-cleanup ()
-  "Remove all textarea files."
-  (remove-hook 'kill-emacs-hook 'w3m-form-textarea-file-cleanup)
-  (let ((dir (file-chase-links
-	      (expand-file-name w3m-form-textarea-directory)))
-	(checktime t)
-	files file time)
-    (when (and w3m-form-textarea-file-expire-date
-	       (file-directory-p dir))
-      (when (integerp w3m-form-textarea-file-expire-date)
-	(setq checktime (decode-time (current-time)))
-	(setq checktime (encode-time (nth 0 checktime) ;; seconds
-				     (nth 1 checktime) ;; minutes
-				     (nth 2 checktime) ;; hour
-				     (- (nth 3 checktime) ;; day
-					w3m-form-textarea-file-expire-date)
-				     (nth 4 checktime) ;; month
-				     (nth 5 checktime) ;; year
-				     (nth 6 checktime) ;; dow
-				     (nth 7 checktime) ;; dst
-				     (nth 8 checktime)))) ;; zone
-      (setq files (directory-files dir 'full "[^.]" 'nosort))
-      (while (setq file (car files))
-	(setq files (cdr files))
-	(when (file-writable-p file)
-	  (if (eq checktime t)
-	      (delete-file file)
-	    (setq time (nth 5 (file-attributes file)))
-	    (when (w3m-time-newer-p checktime time)
-	      (delete-file file))))))))
-
-(defun w3m-form-textarea-files-remove ()
-  "Remove used files of textarea."
-  (let (file)
-    (while (setq file (car w3m-form-textarea-post-files))
-      (setq w3m-form-textarea-post-files (cdr w3m-form-textarea-post-files))
-      (when (and (member file w3m-form-textarea-files)
-		 (file-exists-p file)
-		 (file-writable-p file))
-	(delete-file file)
-	(setq file (make-backup-file-name file))
-	(when (and (file-exists-p file)
-		   (file-writable-p file))
-	  (delete-file file))))))
-
-(defun w3m-form-set-number (w3mbuf newname)
-  "Change parent w3m buffer in form buffers"
-  (save-current-buffer
-    (let ((newbuff (get-buffer newname)))
-      (when newbuff
-	(dolist (buffer (buffer-list))
-	  (set-buffer buffer)
-	  (cond
-	   ((and w3m-form-input-textarea-mode
-		 (eq w3m-form-input-textarea-buffer w3mbuf))
-	    (setq w3m-form-input-textarea-buffer newbuff))
-	   ((and (eq major-mode 'w3m-form-input-select-mode)
-		 (eq w3m-form-input-select-buffer w3mbuf))
-	    (setq w3m-form-input-select-buffer newbuff))
-	   ((and (eq major-mode 'w3m-form-input-map-mode)
-		 (eq w3m-form-input-map-buffer w3mbuf))
-	    (setq w3m-form-input-map-buffer newbuff))))))))
-
-(defun w3m-form-kill-buffer (w3mbuf)
-  "Kill form buffers"
-  (save-current-buffer
-    (dolist (buffer (buffer-list))
-      (set-buffer buffer)
-      (cond
-       ((and w3m-form-input-textarea-mode
-	     (eq w3m-form-input-textarea-buffer w3mbuf))
-	(w3m-form-input-textarea-exit))
-       ((and (eq major-mode 'w3m-form-input-select-mode)
-	     (eq w3m-form-input-select-buffer w3mbuf))
-	(w3m-form-input-select-exit))
-       ((and (eq major-mode 'w3m-form-input-map-mode)
-	     (eq w3m-form-input-map-buffer w3mbuf))
-	(w3m-form-input-map-exit))))))
-
-;;; SELECT
-
-(defcustom w3m-form-input-select-buffer-lines 10
-  "*Buffer lines for form select buffer."
-  :group 'w3m
-  :type '(integer :size 0))
-
-(defcustom w3m-form-input-select-mode-hook nil
-  "*A hook called after w3m-form-input-select-mode."
-  :group 'w3m
-  :type 'hook)
-
-(defcustom w3m-form-input-select-set-hook nil
-  "*A Hook called before w3m-form-input-select-set."
-  :group 'w3m
-  :type 'hook)
-
-(defcustom w3m-form-mouse-face 'highlight
-  "*Mouse face to highlight selected value."
-  :group 'w3m
-  :type 'face)
-
-(defvar w3m-form-input-select-keymap nil)
-(unless w3m-form-input-select-keymap
-  (setq w3m-form-input-select-keymap (make-sparse-keymap))
-  (define-key w3m-form-input-select-keymap "\C-c\C-c"
-    'w3m-form-input-select-set)
-  (define-key w3m-form-input-select-keymap "\r"
-    'w3m-form-input-select-set)
-  (define-key w3m-form-input-select-keymap "\C-m"
-    'w3m-form-input-select-set)
-  (define-key w3m-form-input-select-keymap "\C-c\C-q"
-    'w3m-form-input-select-exit)
-  (define-key w3m-form-input-select-keymap "\C-c\C-k"
-    'w3m-form-input-select-exit)
-  (define-key w3m-form-input-select-keymap "q"
-    'w3m-form-input-select-exit)
-  (define-key w3m-form-input-select-keymap "\C-g"
-    'w3m-form-input-select-exit)
-  (define-key w3m-form-input-select-keymap "h" 'backward-char)
-  (define-key w3m-form-input-select-keymap "j" 'next-line)
-  (define-key w3m-form-input-select-keymap "k" 'previous-line)
-  (define-key w3m-form-input-select-keymap "l" 'forward-char)
-  (if (featurep 'xemacs)
-      (define-key w3m-form-input-select-keymap [(button2)]
-	'w3m-form-input-select-set-mouse)
-    (define-key w3m-form-input-select-keymap [mouse-2]
-      'w3m-form-input-select-set-mouse)))
-
-(defun w3m-form-input-select-set-mouse (event)
-  "Save and exit from w3m form select mode with mouse."
-  (interactive "e")
-  (mouse-set-point event)
-  (w3m-form-input-select-set))
-
-(defun w3m-form-input-select-set ()
-  "Save and exit from w3m form select mode."
-  (interactive)
-  (run-hooks 'w3m-form-input-select-set-hook)
-  (let* ((cur (get-text-property (point)
-				 'w3m-form-select-value))
-	 (buffer (current-buffer))
-	 (name w3m-form-input-select-name)
-	 (id w3m-form-input-select-id)
-	 (form w3m-form-input-select-form)
-	 (point w3m-form-input-select-point)
-	 (w3mbuffer w3m-form-input-select-buffer)
-	 (wincfg w3m-form-input-select-wincfg)
-	 input)
-    (setcar w3m-form-input-select-candidates cur)
-    (setq input w3m-form-input-select-candidates)
-    (or (one-window-p) (delete-window))
-    (kill-buffer buffer)
-    (when (buffer-live-p w3mbuffer)
-      (pop-to-buffer w3mbuffer)
-      (set-window-configuration wincfg)
-      (when (and form point)
-	(goto-char point)
-	(w3m-form-put form id name input)
-	(w3m-form-replace (cdr (assoc cur (cdr input))))))))
-
-(defun w3m-form-input-select-exit ()
-  "Exit from w3m form select mode."
-  (interactive)
-  (let* ((buffer (current-buffer))
-	 (point w3m-form-input-select-point)
-	 (w3mbuffer w3m-form-input-select-buffer)
-	 (wincfg w3m-form-input-select-wincfg))
-    (or (one-window-p) (delete-window))
-    (kill-buffer buffer)
-    (when (buffer-live-p w3mbuffer)
-      (pop-to-buffer w3mbuffer)
-      (set-window-configuration wincfg)
-      (when point (goto-char point)))))
-
-(defun w3m-form-input-select-mode ()
-  "\\<w3m-form-input-select-keymap>
-   Major mode for w3m form select.
-
-\\[w3m-form-input-select-set]\
-	Save and exit from w3m form select mode.
-\\[w3m-form-input-select-exit]\
-	Exit from w3m form select mode.
-\\[w3m-form-input-select-set-mouse]\
-	Save and exit from w3m form select mode with mouse.
-"
-  (setq mode-name "w3m form select"
-	major-mode 'w3m-form-input-select-mode)
-  (setq buffer-read-only t)
-  (use-local-map w3m-form-input-select-keymap)
-  (w3m-run-mode-hooks 'w3m-form-input-select-mode-hook))
-
-(defun w3m-form-input-select (form id name)
-  (let* ((value (w3m-form-get form id))
-	 (cur-win (selected-window))
-	 (wincfg (current-window-configuration))
-	 (urlid (format "%s:%s:%d" w3m-current-url name id))
-	 (w3mbuffer (current-buffer))
-	 (point (point))
-	 (size (min
-		(- (window-height cur-win)
-		   window-min-height 1)
-		(- (window-height cur-win)
-		   (max window-min-height
-			(1+ w3m-form-input-select-buffer-lines)))))
-	 buffer cur pos)
-    (setq buffer
-	  (catch 'detect-buffer
-	    (save-current-buffer
-	      (dolist (buffer (buffer-list))
-		(set-buffer buffer)
-		(when (and w3m-form-input-select-buffer
-			   (eq w3m-form-input-select-buffer w3mbuffer)
-			   (string= w3m-form-input-select-urlid urlid))
-		  (throw 'detect-buffer (cons t buffer)))))
-	    (generate-new-buffer "*w3m form select*")))
-    (unless (consp buffer)
-      (with-current-buffer buffer
-	(setq w3m-form-input-select-form form)
-	(setq w3m-form-input-select-name name)
-	(setq w3m-form-input-select-id id)
-	(setq w3m-form-input-select-buffer w3mbuffer)
-	(setq w3m-form-input-select-point point)
-	(setq w3m-form-input-select-candidates value)
-	(setq w3m-form-input-select-wincfg wincfg)
-	(setq w3m-form-input-select-urlid urlid)
-	(when value
-	  (setq cur (car value))
-	  (setq value (cdr value))
-	  (dolist (candidate value)
-	    (setq pos (point))
-	    (insert (if (zerop (length (cdr candidate)))
-			" "		; "" -> " "
-		      (cdr candidate)))
-	    (add-text-properties pos (point)
-				 (list 'w3m-form-select-value (car candidate)
-				       'mouse-face w3m-form-mouse-face))
-	    (insert "\n")))
-	(goto-char (point-min))
-	(while (and (not (eobp))
-		    (not (equal cur
-				(get-text-property (point)
-						   'w3m-form-select-value))))
-	  (goto-char (next-single-property-change (point)
-						  'w3m-form-select-value)))
-	(set-buffer-modified-p nil)
-	(beginning-of-line)
-	(w3m-form-input-select-mode)))
-    (if (and (consp buffer)
-	     (get-buffer-window (cdr buffer)))
-	;; same frame only
-	(select-window (get-buffer-window (cdr buffer)))
-      (condition-case nil
-	  (split-window cur-win (if (> size 0) size window-min-height))
-	(error
-	 (delete-other-windows)
-	 (split-window cur-win (- (window-height cur-win)
-				  w3m-form-input-select-buffer-lines))))
-      (select-window (next-window))
-      (let ((pop-up-windows nil))
-	(switch-to-buffer (if (consp buffer) (cdr buffer) buffer))))))
-
-;;; MAP
-
-(defcustom w3m-form-input-map-buffer-lines 10
-  "*Buffer lines for form select map buffer."
-  :group 'w3m
-  :type '(integer :size 0))
-
-(defcustom w3m-form-input-map-mode-hook nil
-  "*A hook called after w3m-form-input-map-mode."
-  :group 'w3m
-  :type 'hook)
-
-(defcustom w3m-form-input-map-set-hook nil
-  "*A Hook called before w3m-form-input-map-set."
-  :group 'w3m
-  :type 'hook)
-
-(defvar w3m-form-input-map-keymap nil)
-(unless w3m-form-input-map-keymap
-  (setq w3m-form-input-map-keymap (make-sparse-keymap))
-  (define-key w3m-form-input-map-keymap "\C-c\C-c"
-    'w3m-form-input-map-set)
-  (define-key w3m-form-input-map-keymap "\r"
-    'w3m-form-input-map-set)
-  (define-key w3m-form-input-map-keymap "\C-m"
-    'w3m-form-input-map-set)
-  (define-key w3m-form-input-map-keymap "\C-c\C-q"
-    'w3m-form-input-map-exit)
-  (define-key w3m-form-input-map-keymap "\C-c\C-k"
-    'w3m-form-input-map-exit)
-  (define-key w3m-form-input-map-keymap "q"
-    'w3m-form-input-map-exit)
-  (define-key w3m-form-input-map-keymap "\C-g"
-    'w3m-form-input-map-exit)
-  (define-key w3m-form-input-map-keymap "h" 'backward-char)
-  (define-key w3m-form-input-map-keymap "j" 'next-line)
-  (define-key w3m-form-input-map-keymap "k" 'previous-line)
-  (define-key w3m-form-input-map-keymap "l" 'forward-char)
-  (if (featurep 'xemacs)
-      (define-key w3m-form-input-map-keymap [(button2)]
-	'w3m-form-input-map-set-mouse)
-    (define-key w3m-form-input-map-keymap [mouse-2]
-      'w3m-form-input-map-set-mouse)))
-
-(defun w3m-form-input-map-set-mouse (event)
-  "Save and exit from w3m form select map mode with mouse."
-  (interactive "e")
-  (mouse-set-point event)
-  (w3m-form-input-map-set))
-
-(defun w3m-form-input-map-set ()
-  "Save and exit from w3m form select map mode."
-  (interactive)
-  (run-hooks 'w3m-form-input-map-set-hook)
-  (let* ((map (get-text-property (point) 'w3m-form-map-value))
-	 (buffer (current-buffer))
-	 (w3mbuffer w3m-form-input-map-buffer)
-	 (wincfg w3m-form-input-map-wincfg)
-	 (point w3m-form-input-map-point))
-    (or (one-window-p) (delete-window))
-    (kill-buffer buffer)
-    (when (buffer-live-p w3mbuffer)
-      (pop-to-buffer w3mbuffer)
-      (set-window-configuration wincfg)
-      (when point (goto-char point))
-      (w3m-goto-url (w3m-expand-url map)))))
-
-(defun w3m-form-input-map-exit ()
-  "Exit from w3m form select map mode."
-  (interactive)
-  (let* ((buffer (current-buffer))
-	 (w3mbuffer w3m-form-input-map-buffer)
-	 (wincfg w3m-form-input-map-wincfg)
-	 (point w3m-form-input-map-point))
-    (or (one-window-p) (delete-window))
-    (kill-buffer buffer)
-    (when (buffer-live-p w3mbuffer)
-      (pop-to-buffer w3mbuffer)
-      (set-window-configuration wincfg)
-      (when point (goto-char point)))))
-
-(defun w3m-form-input-map-mode ()
-  "\\<w3m-form-input-map-keymap>
-   Major mode for w3m map select.
-
-\\[w3m-form-input-map-set]\
-	Save and exit from w3m form select map mode.
-\\[w3m-form-input-map-exit]\
-	Exit from w3m form select map mode.
-\\[w3m-form-input-map-set-mouse]\
-	Save and exit from w3m form select map mode with mouse.
-"
-  (setq mode-name "w3m map select"
-	major-mode 'w3m-form-input-map-mode)
-  (setq buffer-read-only t)
-  (use-local-map w3m-form-input-map-keymap)
-  (w3m-run-mode-hooks 'w3m-form-input-map-mode-hook))
-
-(defun w3m-form-input-map (form name)
-  (let* ((value (w3m-form-get-by-name form name))
-	 (urlname (format "%s:%s" w3m-current-url name))
-	 (cur-win (selected-window))
-	 (wincfg (current-window-configuration))
-	 (w3mbuffer (current-buffer))
-	 (point (point))
-	 (size (min
-		(- (window-height cur-win)
-		   window-min-height 1)
-		(- (window-height cur-win)
-		   (max window-min-height
-			(1+ w3m-form-input-map-buffer-lines)))))
-	 buffer pos)
-    (setq buffer
-	  (catch 'detect-buffer
-	    (save-current-buffer
-	      (dolist (buffer (buffer-list))
-		(set-buffer buffer)
-		(when (and w3m-form-input-map-buffer
-			   (eq w3m-form-input-map-buffer w3mbuffer)
-			   (string= w3m-form-input-map-urlname urlname))
-		  (throw 'detect-buffer (cons t buffer)))))
-	    (generate-new-buffer "*w3m map select*")))
-    (unless (consp buffer)
-      (with-current-buffer buffer
-	(setq w3m-form-input-map-buffer w3mbuffer)
-	(setq w3m-form-input-map-wincfg wincfg)
-	(setq w3m-form-input-map-point point)
-	(setq w3m-form-input-map-urlname urlname)
-	(when value
-	  (dolist (candidate value)
-	    (setq pos (point))
-	    (insert (if (zerop (length (cdr candidate)))
-			(car candidate)
-		      (cdr candidate)))
-	    (add-text-properties pos (point)
-				 (list 'w3m-form-map-value (car candidate)
-				       'mouse-face w3m-form-mouse-face))
-	    (insert "\n")))
-	(goto-char (point-min))
-	(set-buffer-modified-p nil)
-	(beginning-of-line)
-	(w3m-form-input-map-mode)))
-    (if (and (consp buffer)
-	     (get-buffer-window (cdr buffer)))
-	;; same frame only
-	(select-window (get-buffer-window (cdr buffer)))
-      (condition-case nil
-	  (split-window cur-win (if (> size 0) size window-min-height))
-	(error
-	 (delete-other-windows)
-	 (split-window cur-win (- (window-height cur-win)
-				  w3m-form-input-map-buffer-lines))))
-      (select-window (next-window))
-      (let ((pop-up-windows nil))
-	(switch-to-buffer (if (consp buffer) (cdr buffer) buffer))))))
-
-;;;
-(defun w3m-form-submit-get-textarea-files (form)
-  (when w3m-form-use-textarea-backup-p
-    (let ((plist (w3m-form-plist form))
-	  pos id file files)
-      (while plist
-	(setq id (car plist))
-	(setq plist (cddr plist))
-	(setq pos (text-property-any (point-min) (point-max) 'w3m-form-id id))
-	(when (and pos
-		   (setq file (get-text-property pos 'w3m-form-file-name)))
-	  (setq files (cons file files))))
-      files)))
-
-(defun w3m-form-submit (form &optional id name value new-session download)
-  (if (w3m-anchor (point))
-      ;; cf SA17565
-      (w3m-goto-url (w3m-anchor (point)))
-    (when (and id name
-	       (> (length name) 0))
-      (w3m-form-put form id name value))
-    (let* ((orig-url w3m-current-url)
-	   (url (or (w3m-form-action form)
-		    (if (string-match "\\?" w3m-current-url)
-			(substring w3m-current-url 0 (match-beginning 0))
-		      w3m-current-url))))
-      (setq w3m-form-textarea-post-files
-	    (w3m-form-submit-get-textarea-files form))
-      (cond ((and (not (string= url orig-url))
-		  (string-match "^https://" orig-url)
-		  (string-match "^http://" url)
-		  (not (y-or-n-p (format "Send POST data to '%s'?" url))))
-	     (ding))
-	    ((or (eq 'post (w3m-form-method form))
-		 ;; While some sites, e.g., emacswiki.org, specify the
-		 ;; `get' method for the enctype `multipart/form-data',
-		 ;; we use the `post' method according to the proposal
-		 ;; of RFC2070.
-		 (eq 'multipart/form-data (w3m-form-enctype form)))
-	     (if download 
-		 (funcall 'w3m-download
-			  url nil nil nil
-			  (w3m-form-make-form-data form))
-	       (funcall (if new-session
-			    'w3m-goto-url-new-session
-			  'w3m-goto-url)
-			url 'reload nil
-			(w3m-form-make-form-data form)
-			w3m-current-url)))
-	    ((eq 'get (w3m-form-method form))
-	     (funcall (if download 
-			  'w3m-download
-			(if new-session
-			    'w3m-goto-url-new-session
-			  'w3m-goto-url))
-		      (concat (w3m-url-strip-query url) 
-			      "?" (w3m-form-make-form-data form))))
-	    (t
-	     (w3m-message "This form's method has not been supported: %s"
-			  (let (print-level print-length)
-			    (prin1-to-string (w3m-form-method form)))))))))
-
-(defun w3m-form-real-reset (form sexp)
-  (and (eq 'w3m-form-input (car sexp))
-       (eq form (nth 1 sexp))
-       (w3m-form-put form (nth 2 sexp) (nth 3 sexp) (nth 7 sexp))
-       (w3m-form-replace (nth 7 sexp))))
-
-(defun w3m-form-reset (form)
-  (save-excursion
-    (let (pos prop)
-      (when (setq prop (w3m-action (goto-char (point-min))))
-	(goto-char (or (w3m-form-real-reset form prop)
-		       (next-single-property-change pos 'w3m-action))))
-      (while (setq pos (next-single-property-change (point) 'w3m-action))
-	(goto-char pos)
-	(goto-char (or (w3m-form-real-reset form (w3m-action pos))
-		       (next-single-property-change pos 'w3m-action)))))))
-
-
-(provide 'w3m-form)
-
-;;; w3m-form.el ends here

=== removed file 'share/emacs/site-lisp/w3m/w3m-hist.el'
--- share/emacs/site-lisp/w3m/w3m-hist.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-hist.el	1970-01-01 00:00:00 +0000
@@ -1,740 +0,0 @@
-;;; w3m-hist.el --- the history management system for emacs-w3m
-
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008, 2009, 2010
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Author: Katsumi Yamaoka <yamaoka@jpl.org>
-;; Keywords: w3m, WWW, hypermedia
-
-;; This file is a part of emacs-w3m.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; Emacs-w3m keeps history in the buffer-local variables `w3m-history'
-;; and `w3m-history-flat'.  Each variable contains a list of all the
-;; links you have visited.  The behavior tracing history backward or
-;; forward is controlled by the `w3m-history-reuse-history-elements'
-;; variable.  See the documentations for those variables for details.
-
-;;; Code:
-
-(eval-when-compile
-  (require 'cl))
-
-(defcustom w3m-history-reuse-history-elements nil
-  "Non-nil means reuse the history element when re-visiting the page.
-Otherwise, a new history element will be created even if there are
-elements for the same url in the history.
-
-Emacs-w3m used to operate as the case in which it is non-nil, however
-it sometimes brought about users' dissatisfaction.  For example, if a
-user visited the pages A -> B -> C -> B in order, performing BACK on
-the second B would let a user visit A.  The reason why a user was
-taken to A rather than C is that the `w3m-history' variable only had
-the list `(A B C)' as a history and B was the current position at that
-time.
-
-The default value for this variable is nil which allows the
-`w3m-history' variable to have the list `(A B C B)'.  Where contents
-of two B's are the identical Lisp objects.  So, too much wasting the
-Lisp resources will be avoided.
-
-See the documentation for the variables `w3m-history' and
-`w3m-history-flat' for more information."
-  :group 'w3m
-  :type '(boolean :format "%{%t%}: %[%v%]" :on "On" :off "Off"))
-
-(defcustom w3m-history-minimize-in-new-session nil
-  "Non-nil means minimize copied history so that there's only current page.
-This variable is effective when creating of the new session by copying
-\(i.e., `w3m-copy-buffer')."
-  :group 'w3m
-  :type '(boolean :format "%{%t%}: %[%v%]" :on "On" :off "Off"))
-
-(defvar w3m-history nil
-  "A tree-structured complex list of all the links which you have visited.
-This is a buffer-local variable.  For example, it will grow as follows:
-
-\[Branch-1.0.0.0]:                 +--> U1.0.0.0.0 --> U1.0.0.0.1
-                                  |
-    [Branch-1.0]:         +--> U1.0.0 --> U1.0.1 --> U1.0.2
-                          |
-         [Trunk]: U0 --> U1 --> U2 --> U3 --> U4 --> U5 --> U6
-                                 |
-    [Branch-2.0]:                +--> U2.0.0 --> U2.0.1
-                                 |
-    [Branch-2.1]:                +--> U2.1.0 --> U2.1.1 --> U2.1.2
-                                                    |
-\[Branch-2.1.1.0]:                                   +--> U2.1.1.0.0
-
-In this case, the U1.0.0.0.0 history element represents the first link
-of the first branch which is sprouted from the U1.0.0 history element.
-
-The trunk or each branch is a simple list which will contain some
-history elements.  History elements in the trunk or each branch will
-be arranged in increasing order (the newest history element will be
-the last element of the list).  Each history element represents a link
-which consists of the following records:
-
-	(URL PROPERTIES BRANCH BRANCH ...)
-
-Where URL is a string of an address of a link.  PROPERTIES is a plist
-which is able to contain any kind of data to supplement the URL as
-follows:
-
-	(KEYWORD VALUE KEYWORD VALUE ...)
-
-A note for programmers: PROPERTIES should always be a non-nil value in
-order to make it easy to share the value in every history element in
-every emacs-w3m buffer.
-
-The remaining BRANCHes are branches of the history element.  Branches
-will also be arranged in increasing order (the newest one will be the
-rightmost element).  Each BRANCH will also be a tree-structured
-complex list.  Therefore, the history structure will grow up
-infinitely.
-
-In order to save the Lisp resources, URL strings and PROPERTIES in the
-`w3m-history' variables are shared in every emacs-w3m buffer (it means
-each element in two `w3m-history' variables can be compared by `eq'
-rather than `equal').  If there is necessity to make buffer-local
-properties, in other words, to make properties of which values differ
-in every emacs-w3m buffer, use the `w3m-history-flat' variable instead.
-
-There are special rules on the emacs-w3m history management system.
-As you perhaps foresaw, the operation BACK on U2.0.0 brings you to U2,
-and one more BACK brings you to U1.  Well, where do you think we
-should go next when the operation FORWARD is performed on U1?  The
-rule is to go to the newest link you have ever visited.  So, that
-operation should take you to U1.0.0.
-
-Another rule is that the new U4 link should sprout from U1.0.1 if
-`w3m-history-reuse-history-elements' is nil when you visit the U4 link
-directly from U1.0.1.  In contrast, you should be taken to the
-existing U4 link instead of sprouting the new branch from U1.0.1 if
-`w3m-history-reuse-history-elements' is non-nil.
-
-In addition, the first element of `w3m-history' is special.  It is a
-list containing pointers which point to three history elements as
-shown below:
-
-	(PREV CURRENT NEXT)
-
-PREV points to the previous history element, CURRENT points to the
-current one and NEXT points to the next one.  Each of them is a list
-which contains an odd number of integers.  For example, `(0)' does
-point to U0 and `(2 1 0)' does point to U2.1.0.  Finally, the value of
-the `w3m-history' variable will be constructed as follows:
-
-\(((1) (2) (2 1 0))
- (\"http://www.U0.org/\" (:title \"U0\" :foo \"bar\"))
- (\"http://www.U1.org/\" (:title \"U1\" :foo \"bar\")
-  ((\"http://www.U100.org/\" (:title \"U100\" :foo \"bar\")
-    ((\"http://www.U10000.org/\" (:title \"U10000\" :foo \"bar\"))
-     (\"http://www.U10001.org/\" (:title \"U10001\" :foo \"bar\"))))
-   (\"http://www.U101.org/\" (:title \"U101\" :foo \"bar\"))
-   (\"http://www.U102.org/\" (:title \"U102\" :foo \"bar\"))))
- (\"http://www.U2.org/\" (:title \"U2\" :foo \"bar\")
-  ((\"http://www.U200.org/\" (:title \"U200\" :foo \"bar\"))
-   (\"http://www.U201.org/\" (:title \"U201\" :foo \"bar\")))
-  ((\"http://www.U210.org/\" (:title \"U210\" :foo \"bar\"))
-   (\"http://www.U211.org/\" (:title \"U211\" :foo \"bar\")
-    ((\"http://www.U21100.org/\" (:title \"U21100\" :foo \"bar\"))))
-   (\"http://www.U212.org/\" (:title \"U212\" :foo \"bar\"))))
- (\"http://www.U3.org/\" (:title \"U3\" :foo \"bar\"))
- (\"http://www.U4.org/\" (:title \"U4\" :foo \"bar\"))
- (\"http://www.U5.org/\" (:title \"U5\" :foo \"bar\"))
- (\"http://www.U6.org/\" (:title \"U6\" :foo \"bar\")))")
-
-(defvar w3m-history-flat nil
-  "A flattened alist of all the links which you have visited.
-All history elements except for buffer-local properties are the same
-as ones of `w3m-history'.  Each element will contain the following
-records:
-
-    (URL PROPERTIES POSITION [KEYWORD VALUE [KEYWORD VALUE ...]])
-
-Where URL is a string of an address of a link, PROPERTIES is a plist
-which is able to contain any kind of data to supplement the URL.  Each
-PROPERTIES is the Lisp object identical with that corresponding
-element of `w3m-history'.  POSITION is a list of integers to designate
-the current position in the history.
-
-The remaining [KEYWORD VALUE [KEYWORD VALUE ...]] is a plist similar
-to PROPERTIES, but it is buffer-local.  You can manipulate
-buffer-local properties using the functions `w3m-history-plist-get',
-`w3m-history-plist-put', `w3m-history-add-properties' and
-`w3m-history-remove-properties'.  See the documentation for the
-`w3m-history' variable for more information.")
-
-(make-variable-buffer-local 'w3m-history)
-(make-variable-buffer-local 'w3m-history-flat)
-
-;; Inline functions.
-(defsubst w3m-history-assoc (url)
-  "Extract a history element associated with URL from `w3m-history-flat'."
-  (assoc url w3m-history-flat))
-
-;; Functions for internal use.
-(defun w3m-history-set-current (position)
-  "Modify `w3m-history' so that POSITION might be the current position.
-What is called the current position is the `cadar' of `w3m-history'.
-The previous position and the next position will be computed
-automatically."
-  (setcar w3m-history (w3m-history-regenerate-pointers position)))
-
-(defun w3m-history-element (position &optional flat)
-  "Return a history element located in the POSITION of the history.
-If FLAT is nil, the value will be extracted from `w3m-history' and
-represented with the `(URL PROPERTIES BRANCH BRANCH ...)' form.
-Otherwise, the value will be extracted from `w3m-history-flat' and
-represented with the `(URL PROPERTIES POSITION [KEYWORD VALUE ...])'
-form.  FYI, to know the current position, the `(cadar w3m-history)'
-form for example can be used."
-  (when position
-    (if flat
-	(let ((flat w3m-history-flat)
-	      element)
-	  (while flat
-	    (if (equal (caddr (setq element (pop flat))) position)
-		(setq flat nil)
-	      (setq element nil)))
-	  element)
-      (let ((element (nth (pop position) (cdr w3m-history))))
-	(while position
-	  (setq element (nth (pop position) (cddr element))
-		element (nth (pop position) element)))
-	element))))
-
-(defun w3m-history-previous-position (position)
-  "Return a history position of the previous location of POSITION.
-POSITION is a list of integers of the same form as being used in one
-of the elements of the `car' of `w3m-history' (which see)."
-  (let (class number previous)
-    (when position
-      (setq class (1- (length position))
-	    number (nth class position))
-      (if (zerop number)
-	  ;; This POSITION is the beginning of the branch.
-	  (unless (zerop class)
-	    ;; There's a parent.
-	    (setq previous (copy-sequence position))
-	    (setcdr (nthcdr (- class 2) previous) nil))
-	;; This POSITION is not the beginning of the branch.
-	(setq previous (copy-sequence position))
-	(setcar (nthcdr class previous) (1- number))))
-    previous))
-
-(defun w3m-history-next-position (position)
-  "Return a history position of the next location of POSITION.
-POSITION is a list of integers of the same form as being used in one
-of the elements of the `car' of `w3m-history' (which see)."
-  (let (next branch element number)
-    (when position
-      (setq next position
-	    branch (cdr w3m-history)
-	    element (nth (pop next) branch))
-      (while next
-	(setq branch (nth (pop next) (cddr element))
-	      element (nth (pop next) branch)))
-      (cond ((nth 2 element)
-	     ;; There're branches sprouted from the POSITION.
-	     (setq next (copy-sequence position))
-	     (setcdr (nthcdr (1- (length next)) next)
-		     (list (- (length element) 3) 0)))
-	    ((> (length branch)
-		(setq number (1+ (nth (1- (length position)) position))))
-	     ;; This POSITION is not the end of the branch.
-	     (setq next (copy-sequence position))
-	     (setcar (nthcdr (1- (length next)) next) number))))
-    next))
-
-(defun w3m-history-set-plist (plist property value)
-  "Similar to `plist-put' but PLIST is actually modified even in XEmacs.
-If VALUE is nil, the pair of PROPERTY and VALUE is removed from PLIST.
-Exceptionally, if PLIST is made empty because of removing, it will be
-instead set to `(nil nil)'.  Return PLIST itself."
-  (let ((pair (memq property plist)))
-    (if pair
-	(if value
-	    (setcar (cdr pair) value)
-	  (if (eq (car plist) property)
-	      (progn
-		(setcar plist (nth 2 plist))
-		(setcar (cdr plist) (nth 3 plist))
-		(setcdr (cdr plist) (nthcdr 4 plist)))
-	    (setcdr (nthcdr (- (length plist) (length pair) 1) plist)
-		    (nthcdr 2 pair))))
-      (when value
-	(setcdr (nthcdr (1- (length plist)) plist) (list property value)))))
-  plist)
-
-(defun w3m-history-modify-properties (old new &optional replace)
-  "Merge NEW plist into OLD plist and return a modified plist.
-If REPLACE is non-nil, OLD will be replaced with NEW.  OLD plist is
-modified and also the new value is shared in all the history
-elements containing OLD plist.  Properties whose values are nil are
-removed from OLD plist, but if OLD plist is made empty because of
-removing, it will be instead set to `(nil nil)'."
-  (prog1
-      old
-    (if replace
-	(progn
-	  (setcar old (car new))
-	  (setcdr old (or (cdr new) (list nil))))
-      (while new
-	(w3m-history-set-plist old (car new) (cadr new))
-	(setq new (cddr new))))
-    (setq new (copy-sequence old))
-    (while new
-      (w3m-history-set-plist old (car new) (cadr new))
-      (setq new (cddr new)))))
-
-(defun w3m-history-seek-element (url &optional newprops replace)
-  "Return a copy of history element corresponding to URL.
-Searching is performed in all emacs-w3m buffers and the first match
-found is returned.  If REPLACE is nil, NEPROPS will be merged into
-properties of an element.  Otherwise, properties of an element will be
-replaced with NEWPROPS."
-  (let* ((current (current-buffer))
-	 (buffers (cons current (delq current (buffer-list))))
-	 element)
-    (while buffers
-      (set-buffer (pop buffers))
-      (when (and (eq major-mode 'w3m-mode)
-		 (setq element (w3m-history-assoc url)))
-	(setq buffers nil)))
-    (set-buffer current)
-    (prog1
-	(copy-sequence element)
-      (when element
-	(w3m-history-modify-properties (cadr element) newprops replace)))))
-
-;; Generic functions.
-(defun w3m-history-previous-link-available-p ()
-  "Return non-nil if the previous history element is available."
-  (caar w3m-history))
-
-(defun w3m-history-next-link-available-p ()
-  "Return non-nil if the next history element is available."
-  (caddar w3m-history))
-
-(defun w3m-history-backward (&optional count)
-  "Move backward COUNT times in the history structure.
-Return a cons of a new history element and new position pointers of
-the history.  The position pointers of `w3m-history' will not change.
-If COUNT is omitted, it defaults to the number one.  If COUNT is
-negative, moving forward is performed.  Return nil if there is no
-previous element."
-  (when w3m-history
-    (let ((oposition (copy-sequence (car w3m-history)))
-	  position last)
-      (cond ((or (unless count
-		   (setq count 1))
-		 (> count 0))
-	     (while (and (> count 0)
-			 (setq position (caar w3m-history)))
-	       (w3m-history-set-current (setq last position))
-	       (decf count)))
-	    ((< count 0)
-	     (while (and (< count 0)
-			 (setq position (caddar w3m-history)))
-	       (w3m-history-set-current (setq last position))
-	       (incf count)))
-	    (t ;; Don't move.
-	     (setq last (cadar w3m-history))))
-      (prog1
-	  (when last
-	    (cons (w3m-history-element (cadar w3m-history))
-		  (car w3m-history)))
-	(setcar w3m-history oposition)))))
-
-(defun w3m-history-forward (&optional count)
-  "Move forward COUNT times in the history structure.
-Return a cons of a new history element and new position pointers of
-the history.  The position pointers of `w3m-history' will not change.
-If COUNT is omitted, it defaults to the number one.  If COUNT is
-negative, moving backward is performed.  If there is no room to move
-in the history, move as far as possible."
-  (w3m-history-backward (- (or count 1))))
-
-(defun w3m-history-regenerate-pointers (position)
-  "Regenerate the position pointers due to only the current POSITION.
-The history position pointers are made with the `(PREV CURRENT NEXT)'
-form which is mentioned in the documentation for `w3m-history'."
-  (list (w3m-history-previous-position position)
-	position
-	(w3m-history-next-position position)))
-
-(defun w3m-history-flat ()
-  "Set the value of `w3m-history-flat' due to the value of `w3m-history'.
-See also the documentations for those variables."
-  (setq w3m-history-flat nil)
-  (when w3m-history
-    (let ((history (cdr w3m-history))
-	  (position (list 0))
-	  element branches flag children)
-      (while (setq element (pop history))
-	(if (stringp (car element))
-	    (progn
-	      (push (list (car element) (cadr element) (reverse position))
-		    w3m-history-flat)
-	      (if (setq element (cddr element))
-		  (progn
-		    (setq history (append element history)
-			  position (append (list 0 0) position))
-		    (push (length element) branches))
-		(setcar position (1+ (car position)))
-		(setq flag t)
-		(while (and flag
-			    children
-			    (zerop (setcar children (1- (car children)))))
-		  (setq children (cdr children))
-		  (if (zerop (setcar branches (1- (car branches))))
-		      (progn
-			(setq branches (cdr branches)
-			      position (cddr position))
-			(setcar position (1+ (car position))))
-		    (setcar position 0)
-		    (setcar (cdr position) (1+ (cadr position)))
-		    (setq flag nil)))))
-	  (setq history (append element history))
-	  (push (length element) children))))
-    (setq w3m-history-flat (nreverse w3m-history-flat))))
-
-(defun w3m-history-tree (&optional newpos)
-  "Set the value of `w3m-history' due to the value of `w3m-history-flat'.
-See also the documentations for those variables.  NEWPOS specifies the
-current position of the history.  It defaults to the beginning
-position of the history."
-  (if w3m-history-flat
-      (let ((flat w3m-history-flat)
-	    element positions rest position)
-	(setq w3m-history (list (list nil nil)))
-	(while (setq element (pop flat))
-	  (setq positions (caddr element)
-		rest w3m-history)
-	  (while positions
-	    (setq position (pop positions))
-	    (unless (> (length rest) position)
-	      (setcdr (nthcdr (1- (length rest)) rest)
-		      (make-list (- position (length rest) -1)
-				 (list nil nil))))
-	    (setq rest (nth position rest))
-	    (when positions
-	      (setq position (pop positions))
-	      (unless (> (- (length rest) 2) position)
-		(setcdr (nthcdr (1- (length rest)) rest)
-			(make-list (- position (length rest) -3)
-				   (list (list nil nil)))))
-	      (setq rest (nth (+ position 2) rest))))
-	  (setcar rest (car element))
-	  (setcar (cdr rest) (cadr element)))
-	(push 'dummy w3m-history)
-	(w3m-history-set-current (or newpos (list 0)))
-	w3m-history)
-    (setq w3m-history nil)))
-
-(defun w3m-history-push (url &optional newprops replace)
-  "Push URL into the history structure.
-A history which corresponds to URL becomes the current one.  NEWPROPS
-is a plist which supplements URL.  Return a new history position
-pointers.  How this function behaves to the history structure (i.e.,
-`w3m-history' and `w3m-history-flat') is controlled by the value of
-`w3m-history-reuse-history-elements'.
-
-The case where `w3m-history-reuse-history-elements' is nil:
-  A new history element is always created.  If there is another
-  element corresponding to the same URL, its properties are inherited
-  into the new history element.
-
-The case where `w3m-history-reuse-history-elements' is non-nil:
-  If there is an element corresponding to URL in the history, it
-  becomes the current history element.  Otherwise, this function
-  behaves like the case where `w3m-history-reuse-history-elements' is
-  nil.
-
-If REPLACE is nil, NEWPROPS is merged into properties of the current
-history element.  Otherwise, properties of the current history element
-are replaced with NEWPROPS."
-  (let ((element (w3m-history-seek-element url newprops replace))
-	position class number branch)
-    (if element
-	(setcdr (cdr element) nil)
-      (setq element (list url (w3m-history-modify-properties newprops nil))))
-    (cond
-     ((null w3m-history)
-      ;; The dawn of the history.
-      (setq position (list nil (list 0) nil)
-	    w3m-history (list position element)
-	    w3m-history-flat (list (append element (list (list 0)))))
-      position)
-
-     ((and w3m-history-reuse-history-elements
-	   (setq position (caddr (w3m-history-assoc url))))
-      ;; Reuse the existing history element assigned to the current one.
-      ;; The position pointers will be fixed with correct values after
-      ;; visiting a page when moving back, moving forward or jumping from
-      ;; the about://history/ page.
-      (w3m-history-set-current position))
-
-     (t
-      ;; Sprout a new history element.
-      (setq position (copy-sequence (cadar w3m-history))
-	    class (1- (length position))
-	    number 0
-	    branch (nthcdr (car position) (cdr w3m-history)))
-      (while (> class number)
-	(setq number (1+ number)
-	      branch (nth (nth number position) (cddar branch))
-	      number (1+ number)
-	      branch (nthcdr (nth number position) branch)))
-      (if (cdr branch)
-	  ;; We should sprout a new branch.
-	  (progn
-	    (setq number (1- (length (car branch))))
-	    (setcdr (nthcdr class position) (list (1- number) 0))
-	    (setcdr (nthcdr number (car branch)) (list (list element))))
-	;; The current position is the last of the branch.
-	(setcar (nthcdr class position)
-		(1+ (car (nthcdr class position))))
-	(setcdr branch (list element)))
-      (setq w3m-history-flat (nconc w3m-history-flat
-				    (list (append element (list position)))))
-      (setcar w3m-history (list (cadar w3m-history) position nil))))))
-
-(defun w3m-history-copy (buffer)
-  "Copy the history structure from BUFFER to the current buffer.
-This function keeps corresponding elements identical Lisp objects
-between buffers while copying the frameworks of `w3m-history' and
-`w3m-history-flat'.  Exceptionally, buffer-local properties contained
-in `w3m-history-flat' will not be copied except for the positions.  If
-`w3m-history-minimize-in-new-session' is non-nil, the copied history
-structure will be shrunk so that it may contain only the current
-history element."
-  (let ((current (current-buffer))
-	position flat element props window-start rest)
-    (set-buffer buffer)
-    (when w3m-history
-      (setq position (copy-sequence (cadar w3m-history))
-	    flat w3m-history-flat))
-    (set-buffer current)
-    (when position
-      (if w3m-history-minimize-in-new-session
-	  (progn
-	    (setq w3m-history-flat flat
-		  element (copy-sequence (w3m-history-element position t)))
-	    (setcdr (cdr element) nil)
-	    (setq w3m-history (list (list nil (list 0) nil) element)
-		  w3m-history-flat (list (append element (list (list 0))))))
-	;; Remove buffer-local properties, except for the positions,
-	;; from the new `w3m-history-flat'.
-	(while flat
-	  (setq element (copy-sequence (car flat))
-		flat (cdr flat)
-		props (cdddr element)
-		window-start (plist-get props :window-start))
-	  (if window-start
-	      (setcdr (cddr element)
-		      (list :window-start window-start
-			    :position (plist-get props :position)
-			    :window-hscroll (plist-get props :window-hscroll)))
-	    (setcdr (cddr element) nil))
-	  (push element rest))
-	(setq w3m-history-flat (nreverse rest))
-	(w3m-history-tree position)))))
-
-(defun w3m-history-plist-get (keyword &optional not-buffer-local)
-  "Extract a value from the properties of the current history element.
-KEYWORD is usually a symbol.  This function returns the value
-corresponding to KEYWORD, but it returns nil if the properties don't
-contain KEYWORD.  If NOT-BUFFER-LOCAL is nil, this function searches a
-value in buffer-local properties, otherwise looks over the global
-properties instead."
-  (let ((element (w3m-history-element (cadar w3m-history) t)))
-    (plist-get (if not-buffer-local
-		   (cadr element)
-		 (cdddr element))
-	       keyword)))
-
-(defun w3m-history-add-properties (newprops &optional not-buffer-local)
-  "Add NEWPROPS to the properties of the current history element.
-NEWPROPS should be a plist, which is merged into the properties.
-Return new properties.  If NOT-BUFFER-LOCAL is nil, NEWPROPS will be
-added to the buffer-local properties.  Otherwise, NEWPROPS will be
-added to the global properties instead."
-  (if not-buffer-local
-      (cadr (w3m-history-seek-element
-	     (car (w3m-history-element (cadar w3m-history)))
-	     newprops))
-    (let ((element (w3m-history-element (cadar w3m-history) t))
-	  properties)
-      (if element
-	  (progn
-	    (setq properties (cdddr element)
-		  properties
-		  (if properties
-		      (w3m-history-modify-properties properties newprops)
-		    ;; Use `w3m-history-modify-properties' to remove
-		    ;; keyword-value pairs whose value is nil.
-		    (w3m-history-modify-properties newprops nil)))
-	    (unless (car properties) ;; check whether it is `(nil nil)'.
-	      (setq properties nil))
-	    (setcdr (cddr element) properties))
-	(message "\
-Warning: the history database in this session seems corrupted.")
-	(sit-for 1)
-	nil))))
-
-(defun w3m-history-plist-put (keyword value &optional not-buffer-local)
-  "Put KEYWORD and VALUE into the current history element.
-Return new properties.  If NOT-BUFFER-LOCAL is nil, KEYWORD and VALUE
-will be put into the buffer-local properties.  Otherwise, KEYWORD and
-VALUE will be put into the global properties instead."
-  (w3m-history-add-properties (list keyword value) not-buffer-local))
-
-(defun w3m-history-remove-properties (properties &optional not-buffer-local)
-  "Remove PROPERTIES from the current history element.
-PROPERTIES should be one or more keyword-value pairs (i.e., plist) but
-values are ignored (treated as nil).  Return new properties.  If
-NOT-BUFFER-LOCAL is nil, the buffer-local properties will be modified.
-Otherwise, the global properties will be modified instead."
-  (let (rest)
-    (while properties
-      (setq rest (cons nil (cons (car properties) rest))
-	    properties (cddr properties)))
-    (w3m-history-add-properties (nreverse rest) not-buffer-local)))
-
-(defun w3m-history-store-position ()
-  "Store the current cursor position into the current history element.
-Data consist of the position where the window starts and the cursor
-position.  Naturally, those should be treated as buffer-local."
-  (interactive)
-  (when (cadar w3m-history)
-    (w3m-history-add-properties
-     (list :window-start (window-start)
-	   :position (cons (count-lines (point-min) (point-at-bol))
-			   (current-column))
-	   :window-hscroll (window-hscroll)))
-    (when (interactive-p)
-      (message "The current cursor position saved"))))
-
-(defun w3m-history-restore-position ()
-  "Restore the saved cursor position in the page.
-Even if the page has been shrunk (by reloading, for example), somehow
-it works although it may not be perfect."
-  (interactive)
-  (when (cadar w3m-history)
-    (let ((start (w3m-history-plist-get :window-start))
-	  position window)
-      (cond ((and start
-		  (setq position (w3m-history-plist-get :position)))
-	     (when (<= start (point-max))
-	       (setq window (get-buffer-window (current-buffer) 'all-frames))
-	       (when window
-		 (set-window-start window start)
-		 (set-window-hscroll
-		  window (or (w3m-history-plist-get :window-hscroll) 0)))
-	       (goto-char (point-min))
-	       (forward-line (car position))
-	       (move-to-column (cdr position))
-	       (let ((deactivate-mark nil))
-		 (run-hooks 'w3m-after-cursor-move-hook))))
-	    ((interactive-p)
-	     (message "No cursor position saved"))))))
-
-(defun w3m-history-minimize ()
-  "Minimize the history so that there may be the current page only."
-  (interactive)
-  (let ((position (cadar w3m-history))
-	element)
-    (when position
-      (setq element (w3m-history-element position t))
-      (setcar (cddr element) (list 0))
-      (setq w3m-history-flat (list element)
-	    w3m-history (list (list nil (list 0) nil)
-			      (list (car element) (cadr element)))))))
-
-(defun w3m-history-slimmed-history-flat ()
-  "Return slimmed history."
-  (let ((position (cadar w3m-history))
-	flat-map new-flat)
-    (dolist (l w3m-history-flat)
-      (setq flat-map (cons (cons (nth 2 l) l)
-			   flat-map)))
-    (setq new-flat (cons (cdr (assoc position flat-map)) nil))
-    (let ((pos (w3m-history-previous-position position)))
-      (while pos
-	(setq new-flat (cons (cdr (assoc pos flat-map))
-			     new-flat))
-	(setq pos (w3m-history-previous-position pos))))
-    (let ((pos (w3m-history-next-position position)))
-      (while pos
-	(setq new-flat (cons (cdr (assoc pos flat-map))
-			     new-flat))
-	(setq pos (w3m-history-next-position pos))))
-    new-flat))
-
-(defun w3m-history-slim ()
-  "Slim the history.
-This makes the history slim so that it may have only the pages that
-are accessible by PREV and NEXT operations."
-  (interactive)
-  (let ((position (cadar w3m-history)))
-    (setq w3m-history-flat (w3m-history-slimmed-history-flat))
-    (w3m-history-tree position)))
-
-(eval-when-compile
-  (defvar w3m-arrived-db)
-  (autoload 'w3m-goto-url "w3m"))
-
-(defun w3m-history-add-arrived-db ()
-  "Add the arrived database to the history structure unreasonably.
-This function is useless normally, so you may not want to use it.
-\(The reason it is here is because it is useful once in a while when
-debugging w3m-hist.el.)"
-  (interactive)
-  (unless (eq 'w3m-mode major-mode)
-    (error "`%s' must be invoked from an emacs-w3m buffer" this-command))
-  (when (and w3m-arrived-db
-	     (prog1
-		 (yes-or-no-p
-		  "Are you sure you really want to destroy the history? ")
-	       (message "")))
-    (setq w3m-history nil
-	  w3m-history-flat nil)
-    (let ((w3m-history-reuse-history-elements t)
-	  url-title title)
-      (mapatoms (lambda (symbol)
-		  (when symbol
-		    (if (setq title (get symbol 'title))
-			(push (list (symbol-name symbol)
-				    (list :title title))
-			      url-title)
-		      (push (list (symbol-name symbol)) url-title))))
-		w3m-arrived-db)
-      (apply 'w3m-history-push (nth (random (length url-title)) url-title))
-      (while url-title
-	(w3m-history-push (car (nth (random (length w3m-history-flat))
-				    w3m-history-flat)))
-	(apply 'w3m-history-push (pop url-title))))
-    (w3m-goto-url "about://history/" t)))
-
-(provide 'w3m-hist)
-
-;;; w3m-hist.el ends here

=== removed file 'share/emacs/site-lisp/w3m/w3m-image.el'
--- share/emacs/site-lisp/w3m/w3m-image.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-image.el	1970-01-01 00:00:00 +0000
@@ -1,266 +0,0 @@
-;;; w3m-image.el --- Image conversion routines.
-
-;; Copyright (C) 2001, 2002, 2003, 2005, 2007, 2008
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Authors: Yuuichi Teranishi  <teranisi@gohome.org>
-;; Keywords: w3m, WWW, hypermedia
-
-;; This file is a part of emacs-w3m.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-
-;;; Commentary:
-
-;; This file contains the stuffs to convert images for emacs-w3m.
-;; For more detail about emacs-w3m, see:
-;;
-;;    http://emacs-w3m.namazu.org/
-;;
-;; Routines in this file require ImageMagick's convert.
-;; For more detail about ImageMagick, see:
-;;
-;;    http://www.imagemagick.org/
-
-;;; Code:
-
-(eval-when-compile
-  (require 'cl))
-
-(require 'w3m-util)
-(require 'w3m-proc)
-
-(eval-when-compile
-  (if (not (fboundp 'defcustom))
-      (require 'pcustom)))
-
-;; Functions and variables which should be defined in the other module
-;; at run-time.
-(eval-when-compile
-  (defvar w3m-async-exec)
-  (defvar w3m-current-url)
-  (defvar w3m-profile-directory)
-  (defvar w3m-work-buffer-name)
-  (defvar w3m-work-buffer-list))
-
-(defcustom w3m-imagick-convert-program (if noninteractive
-					   nil
-					 (w3m-which-command "convert"))
-  "*Program name of ImageMagick's `convert'."
-  :group 'w3m
-  :set (lambda (symbol value)
-	 (custom-set-default symbol (if (and (not noninteractive)
-					     value)
-					(if (file-name-absolute-p value)
-					    (if (file-executable-p value)
-						value)
-					  (w3m-which-command value)))))
-  :type 'file)
-
-(defcustom w3m-imagick-identify-program (if noninteractive
-					    nil
-					  (w3m-which-command "identify"))
-  "*Program name of ImageMagick's `identify'."
-  :group 'w3m
-  :set (lambda (symbol value)
-	 (custom-set-default symbol (if (and (not noninteractive)
-					     value)
-					(if (file-name-absolute-p value)
-					    (if (file-executable-p value)
-						value)
-					  (w3m-which-command value)))))
-  :type 'file)
-
-;;; Image handling functions.
-(defcustom w3m-resize-images (and w3m-imagick-convert-program t)
-  "*If non-nil, resize images to the specified width and height."
-  :group 'w3m
-  :set (lambda (symbol value)
-	 (custom-set-default symbol (and w3m-imagick-convert-program value)))
-  :type 'boolean)
-
-(put 'w3m-imagick-convert-program 'available-p 'unknown)
-
-(defun w3m-imagick-convert-program-available-p ()
-  "Return non-nil if ImageMagick's `convert' program is available.
-If not, `w3m-imagick-convert-program' and `w3m-resize-images' are made
-nil forcibly."
-  (cond ((eq (get 'w3m-imagick-convert-program 'available-p) 'yes)
-	 t)
-	((eq (get 'w3m-imagick-convert-program 'available-p) 'no)
-	 nil)
-	((and (stringp w3m-imagick-convert-program)
-	      (file-executable-p w3m-imagick-convert-program))
-	 (put 'w3m-imagick-convert-program 'available-p 'yes)
-	 ;; Check whether convert supports png32.
-	 (put 'w3m-imagick-convert-program 'png32
-	      (unless (or (featurep 'xemacs)
-			  (< emacs-major-version 22))
-		(with-temp-buffer
-		  (set-buffer-multibyte nil)
-		  (insert "P1 1 1 1")
-		  (condition-case nil
-		      (call-process-region (point-min) (point-max)
-					   w3m-imagick-convert-program
-					   t t nil "pbm:-" "png32:-")
-		    (error))
-		  (goto-char (point-min))
-		  (looking-at "\211PNG\r\n"))))
-	 t)
-	(t
-	 (when w3m-imagick-convert-program
-	   (message "ImageMagick's `convert' program is not available")
-	   (sit-for 1))
-	 (setq w3m-imagick-convert-program nil
-	       w3m-resize-images nil)
-	 (put 'w3m-imagick-convert-program 'available-p 'no)
-	 nil)))
-
-;;; Synchronous image conversion.
-(defun w3m-imagick-convert-buffer (from-type to-type &rest args)
-  (when (w3m-imagick-convert-program-available-p)
-    (let* ((in-file (make-temp-name
-		     (expand-file-name "w3mel" w3m-profile-directory)))
-	   (buffer-file-coding-system 'binary)
-	   (coding-system-for-read 'binary)
-	   (coding-system-for-write 'binary)
-	   (default-process-coding-system (cons 'binary 'binary))
-	   return)
-      (write-region (point-min) (point-max) in-file nil 'nomsg)
-      (erase-buffer)
-      (setq return
-	    (apply 'call-process
-		   w3m-imagick-convert-program
-		   nil t nil
-		   (append args (list
-				 (concat
-				  (if from-type
-				      (concat from-type ":"))
-				  in-file)
-				 (if to-type
-				     (if (and (string-equal to-type "png")
-					      (get 'w3m-imagick-convert-program
-						   'png32))
-					 "png32:-"
-				       (concat to-type ":-"))
-				   "-")))))
-      (when (file-exists-p in-file) (delete-file in-file))
-      (if (and (numberp return)
-	       (zerop return))
-	  t
-	(message "Image conversion failed (code `%s')"
-		 (if (stringp return)
-		     (string-as-multibyte return)
-		   return))
-	nil))))
-
-(defun w3m-imagick-convert-data (data from-type to-type &rest args)
-  (with-temp-buffer
-    (set-buffer-multibyte nil)
-    (insert data)
-    (and (apply 'w3m-imagick-convert-buffer from-type to-type args)
-	 (not (zerop (buffer-size)))
-	 (buffer-string))))
-
-;;; Asynchronous image conversion.
-(defun w3m-imagick-start-convert-data (handler
-				       data from-type to-type &rest args)
-  (w3m-process-do-with-temp-buffer
-      (success (when (w3m-imagick-convert-program-available-p)
-		 (set-buffer-multibyte nil)
-		 (insert data)
-		 (apply 'w3m-imagick-start-convert-buffer
-			handler from-type to-type args)))
-    (if (and success
-	     (not (zerop (buffer-size))))
-	(buffer-string))))
-
-(defun w3m-imagick-start-convert-buffer (handler from-type to-type &rest args)
-  (lexical-let ((in-file (make-temp-name
-			  (expand-file-name "w3mel" w3m-profile-directory)))
-		(out-buffer (current-buffer)))
-    (setq w3m-current-url "non-existent")
-    (let ((coding-system-for-write 'binary)
-	  (buffer-file-coding-system 'binary)
-	  jka-compr-compression-info-list
-	  format-alist)
-      (write-region (point-min) (point-max) in-file nil 'nomsg))
-    (w3m-process-do
-	(success (with-current-buffer out-buffer
-		   (erase-buffer)
-		   (w3m-process-start
-		    handler
-		    w3m-imagick-convert-program
-		    (append args
-			    (list
-			     (concat
-			      (if from-type
-				  (concat from-type ":"))
-			      in-file)
-			     (if to-type
-				 (if (and (string-equal to-type "png")
-					  (get 'w3m-imagick-convert-program
-					       'png32))
-				     "png32:-"
-				   (concat to-type ":-"))
-			       "-"))))))
-      (when (file-exists-p in-file)
-	(delete-file in-file))
-      success)))
-
-(defun w3m-resize-image (data width height handler)
-  "Resize image DATA to WIDTH and HEIGHT asynchronously.
-HANDLER is called after conversion with resized data as an argument."
-  (w3m-process-do
-      (result (w3m-imagick-start-convert-data
-	       handler
-	       data nil nil "-geometry"
-	       (concat (number-to-string width)
-		       "x"
-		       (number-to-string height)
-		       "!")))
-    result))
-
-(defun w3m-resize-image-by-rate (data rate handler)
-  "Resize image DATA at RATE asynchronously.
-HANDLER is called after conversion with resized data as an argument.
-Note that this function requires that the `convert' program allows the
-`-resize' option."
-  (w3m-process-do
-      (result (w3m-imagick-start-convert-data
-	       handler
-	       data nil nil "-resize"
-	       (concat (number-to-string rate) "%")))
-    result))
-
-(defun w3m-favicon-usable-p ()
-  "Check whether ImageMagick's `convert' supports a Windoze ico format in
-a large number of bits per pixel."
-  (let ((xpm (condition-case nil
-		 (w3m-imagick-convert-data
-		  (string 0 0 1 0 1 0 2 1 0 0 1 0 24 0 52 0
-			  0 0 22 0 0 0 40 0 0 0 2 0 0 0 2 0
-			  0 0 1 0 24 0 0 0 0 0 0 0 0 0 0 0
-			  0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-			  0 255 255 255 0 0 0 0 0 0)
-		  "ico" "xpm")
-	       (error nil))))
-    (and xpm (string-match "\"2 1 2 1\"" xpm) t)))
-
-(provide 'w3m-image)
-
-;;; w3m-image.el ends here

=== removed file 'share/emacs/site-lisp/w3m/w3m-lnum.el'
--- share/emacs/site-lisp/w3m/w3m-lnum.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-lnum.el	1970-01-01 00:00:00 +0000
@@ -1,564 +0,0 @@
-;;; w3m-lnum.el --- Operations using link numbers
-
-;; Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-;; Modified by Andrey Kotlarski <m00naticus@gmail.com>
-;; Keywords: w3m, WWW, hypermedia
-
-;; This file is a part of emacs-w3m.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; This file provides a minor mode to enable Conkeror style operations
-;; using link numbers.  Mostly point operations are extended beyond
-;; current point but there are also new features like
-;; `w3m-go-to-linknum' for quickly navigating to links, form fields
-;; or buttons and `w3m-linknum-follow' for visiting links, activating
-;; form fields or pushing buttons.
-
-;;; Usage:
-
-;; Install this file to an appropriate directory, and add this
-;; expression to your ~/.emacs-w3m if you want automatically
-;; activating this minor mode
-;; (w3m-link-numbering-mode 1)
-;; or alternatively this to your .emacs file before loading w3m
-;; (add-hook 'w3m-mode-hook 'w3m-link-numbering-mode)
-;; or just use interactive command `w3m-link-numbering-mode' to toggle
-;; mode.
-
-;;; Code:
-
-(eval-when-compile
-  (require 'cl))
-
-(require 'w3m)
-
-(defface w3m-link-numbering
-  '((((class color) (background light)) (:foreground "gray60"))
-    (((class color) (background dark)) (:foreground "gray50")))
-  "Face used to highlight link numbers."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-link-numbering-face 'face-alias 'w3m-link-numbering)
-
-(defface w3m-linknum-minibuffer-prompt
-  '((((class color) (background light) (type tty)) (:foreground "blue"))
-    (((class color) (background dark)) (:foreground "cyan"))
-    (t (:foreground "medium blue")))
-  "Face for w3m linknum minibuffer prompt."
-  :group 'w3m-face)
-
-(defface w3m-linknum-match
-  '((((class color) (background light) (type tty))
-     (:background "yellow" :foreground "black"))
-    (((class color) (background dark) (type tty))
-     (:background "blue" :foreground "white"))
-    (((class color) (background light)) (:background "yellow1"))
-    (((class color) (background dark)) (:background "RoyalBlue3"))
-    (t (:background "gray")))
-  "Face used to highlight matches in `w3m-link-numbering-mode'."
-  :group 'w3m-face)
-
-(defcustom w3m-link-numbering-mode-hook nil
-  "*Hook run after `w3m-link-numbering-mode' initialization."
-  :group 'w3m
-  :type 'hook)
-
-(defmacro w3m-substitute-key-definitions (new-map old-map &rest keys)
-  "In NEW-MAP substitute cascade of OLD-MAP KEYS.
-KEYS is alternating list of key-value."
-  (let ((n-map new-map)
-	(o-map old-map))
-    `(progn
-       ,@(let ((res nil))
-	   (while keys
-	     (push `(substitute-key-definition
-		     ,(car keys) ,(cadr keys) ,n-map ,o-map)
-		   res)
-	     (setq keys (cddr keys)))
-	   (nreverse res)))))
-
-(defvar w3m-link-numbering-mode-map nil
-  "Keymap used when `w3m-link-numbering-mode' is active.")
-(unless w3m-link-numbering-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "f" 'w3m-linknum-follow)
-    (define-key map "F" 'w3m-go-to-linknum)
-    (w3m-substitute-key-definitions
-     map w3m-mode-map
-     'w3m-view-image 'w3m-linknum-view-image
-     'w3m-save-image 'w3m-linknum-save-image
-     'w3m-download-this-url 'w3m-linknum-download-this-url
-     'w3m-edit-this-url 'w3m-linknum-edit-this-url
-     'w3m-toggle-inline-image 'w3m-linknum-toggle-inline-image
-     'w3m-print-this-url 'w3m-linknum-print-this-url
-     'w3m-external-view-this-url 'w3m-linknum-external-view-this-url
-     'w3m-bookmark-add-this-url 'w3m-linknum-bookmark-add-this-url
-     'w3m-zoom-in-image 'w3m-linknum-zoom-in-image
-     'w3m-zoom-out-image 'w3m-linknum-zoom-out-image)
-    (setq w3m-link-numbering-mode-map map)))
-
-(defvar w3m-link-numbering-mode nil
-  "Non-nil if w3m operations using link numbers are enabled.")
-(make-variable-buffer-local 'w3m-link-numbering-mode)
-(unless (assq 'w3m-link-numbering-mode minor-mode-alist)
-  (push (list 'w3m-link-numbering-mode "[ln]") minor-mode-alist))
-(unless (assq 'w3m-link-numbering-mode minor-mode-map-alist)
-  (push (cons 'w3m-link-numbering-mode w3m-link-numbering-mode-map)
-	minor-mode-map-alist))
-
-(defun w3m-linknum-remove-overlays ()
-  "Remove numbering and match overlays."
-  (dolist (overlay (overlays-in (point-min) (point-max)))
-    (if (or (overlay-get overlay 'w3m-link-numbering-overlay)
-	    (overlay-get overlay 'w3m-linknum-match))
-	(delete-overlay overlay))))
-
-;;;###autoload
-(defun w3m-link-numbering-mode (&optional arg)
-  "Minor mode to extend point commands by using Conkeror style number selection.
-With prefix ARG 0 disable battery included point functions, otherwise
-enable them.  With no prefix ARG - toggle."
-  (interactive "P")
-  (let ((w3m-linknum-status w3m-link-numbering-mode))
-    ;; find current numbering status of w3m buffers
-    (or (eq major-mode 'w3m-mode)
-	(save-current-buffer
-	  (setq w3m-linknum-status
-		(catch 'found-w3m
-		  (dolist (buf (buffer-list))
-		    (set-buffer buf)
-		    (if (eq major-mode 'w3m-mode)
-			(throw 'found-w3m
-			       w3m-link-numbering-mode)))))))
-    (setq arg (not (if arg (zerop arg)
-		     w3m-linknum-status)))
-    (unless (eq arg w3m-linknum-status)	; if change of mode status
-      (if arg
-	  (progn (add-hook 'w3m-mode-hook 'w3m-link-numbering-mode)
-		 (run-hooks 'w3m-link-numbering-mode-hook)
-		 (w3m-message "Link numbering keys on"))
-	(remove-hook 'w3m-mode-hook 'w3m-link-numbering-mode)
-	(w3m-message "Link numbering keys off"))
-      ;; change numbering status of all w3m buffers
-      (save-current-buffer
-	(dolist (buf (buffer-list))
-	  (set-buffer buf)
-	  (if (eq major-mode 'w3m-mode)
-	      (setq w3m-link-numbering-mode arg)))))))
-
-(defun w3m-link-numbering (arg)
-  "Make overlays that display link numbers.
-With ARG 0 clear numbering overlay.  With ARG 2 index only images.
-With ARG 4 index form fields and buttons along links."
-  (if (zerop arg)
-      (w3m-linknum-remove-overlays)
-    (save-excursion
-      (goto-char (point-min))
-      (let ((i 0)
-	    (next-func 'w3m-goto-next-anchor)
-	    pos overlay num)
-	(if (= arg 2)
-	    (setq next-func (lambda () (if (w3m-goto-next-image)
-				      (point)))))
-	(catch 'already-numbered
-	  (while (setq pos (funcall next-func))
-	    (when (or (> arg 1)
-		      (get-char-property pos 'w3m-href-anchor))
-	      (if (get-char-property pos
-				     'w3m-link-numbering-overlay)
-		  (throw 'already-numbered nil))
-	      (setq overlay (make-overlay pos (1+ pos))
-		    num (format "[%d]" (incf i)))
-	      (overlay-put overlay 'before-string num)
-	      (w3m-static-if (featurep 'xemacs)
-		  (set-glyph-face (extent-begin-glyph overlay)
-				  'w3m-link-numbering)
-		(w3m-add-face-property 0 (length num)
-				       'w3m-link-numbering num)
-		(overlay-put overlay 'evaporate t))
-	      (overlay-put overlay
-			   'w3m-link-numbering-overlay i))))))))
-
-(defun w3m-read-int-interactive (prompt fun &optional default)
-  "Interactively read a valid integer from minubuffer with PROMPT.
-Execute a one argument function FUN with every current valid integer.
-Initial value is DEFAULT if specified or 0.
-Use <return> to submit current value, <backspace> for correction
-and <C-g> or <escape> to quit action."
-  (let ((prompt (propertize prompt 'face
-			    'w3m-linknum-minibuffer-prompt))
-	(num (or default 0))
-	(min-len (length prompt))
-	ch)
-    (let ((temp-prompt (format "%s%d" prompt num)))
-      (while (not (memq
-		   (setq ch (w3m-static-if (featurep 'xemacs)
-				(let (event key)
-				  (display-message 'no-log temp-prompt)
-				  (setq event (next-command-event))
-				  (and (key-press-event-p event)
-				       (or (event-to-character event)
-					   (characterp
-					    (setq key (event-key event)))
-					   key)))
-			      (read-event temp-prompt)))
-		   '(return 10 13 ?\n ?\r ?\C-g escape 27 ?\e)))
-	(cond ((and (memq ch '(backspace 8 ?\C-h))
-		    (> (length temp-prompt) min-len))
-	       (setq num (/ num 10)
-		     temp-prompt (format "%s%d" prompt num))
-	       (funcall fun num))
-	      ((memq ch '(32 ?\ )) (w3m-scroll-up-or-next-url nil))
-	      ((eq ch 'delete)
-	       (w3m-scroll-down-or-previous-url nil))
-	      ((memq ch '(60 ?<)) (w3m-scroll-right nil))
-	      ((memq ch '(62 ?>)) (w3m-scroll-left nil))
-	      ((and (w3m-static-if (featurep 'xemacs)
-			(characterp ch)
-		      (numberp ch))
-		    (> ch 47) (< ch 58))
-	       (setq num (+ (* num 10) (- ch 48))
-		     temp-prompt (format "%s%d" prompt num))
-	       (funcall fun num))))
-      (if (memq ch '(?\C-g escape 27 ?\e))
-	  (keyboard-quit))
-      num)))
-
-(defmacro w3m-with-linknum (type &rest body)
-  "Within TYPE anchor numbering execute BODY.
-Types are: 0 no numbering, 1 links, 2 images,
-4 links, form fields and buttons.
-Then restore previous numbering condition."
-  `(progn (w3m-link-numbering ,type)
-	  (unwind-protect (progn ,@body)
-	    (w3m-linknum-remove-overlays))))
-
-(defun w3m-highlight-numbered-anchor (arg)
-  "Highlight specified by ARG number anchor."
-  (catch 'done
-    (let (found-prev marked-new)
-      (dolist (overlay (overlays-in (point-min) (point-max)))
-	(cond
-	 ((overlay-get overlay 'w3m-linknum-match)
-	  (delete-overlay overlay)
-	  (setq found-prev t))
-	 ((eq arg (overlay-get overlay 'w3m-link-numbering-overlay))
-	  (let* ((start (overlay-start overlay))
-		 (match-overlay
-		  (make-overlay
-		   start
-		   (next-single-property-change
-		    start
-		    (cond ((get-text-property start 'w3m-href-anchor)
-			   'w3m-href-anchor)
-			  ((get-text-property start 'w3m-image)
-			   'w3m-image)
-			  (t 'w3m-action))))))
-	    (overlay-put match-overlay 'w3m-linknum-match t)
-	    (overlay-put match-overlay 'face 'w3m-linknum-match))
-	  (setq marked-new t)))
-	(and found-prev marked-new (throw 'done nil))))))
-
-(defun w3m-get-anchor-info (&optional num)
-  "Get info (url/action position [image image-alt]) of anchor numbered as NUM.
-If NUM is not specified, use currently highlighted anchor."
-  (macrolet
-      ((get-match-info
-	(condition)
-	`(dolist (overlay (overlays-in (point-min) (point-max)))
-	   (if ,condition
-	       (let* ((pos (overlay-start overlay))
-		      (href (get-text-property pos 'w3m-href-anchor)))
-		 (throw
-		  'found
-		  (if href (list href pos
-				 (get-text-property pos 'w3m-image)
-				 (get-text-property pos 'w3m-image-alt))
-		    (list (get-text-property pos 'w3m-action)
-			  pos))))))))
-    (catch 'found
-      (if num (get-match-info
-	       (eq num (overlay-get
-			overlay 'w3m-link-numbering-overlay)))
-	(get-match-info (overlay-get overlay 'w3m-linknum-match))))))
-
-;;;###autoload
-(defun w3m-go-to-linknum (arg)
-  "Turn on link and form numbers and ask for one to go to.
-With prefix ARG don't highlight current link.
-0 corresponds to location url."
-  (interactive "P")
-  (w3m-with-linknum
-   4
-   (let ((info (if arg
-		   (let ((num (w3m-read-number "Anchor number: ")))
-		     (if (zerop num)
-			 (list nil 16)
-		       (w3m-get-anchor-info num)))
-		 (if (zerop (w3m-read-int-interactive
-			     "Anchor number: "
-			     'w3m-highlight-numbered-anchor))
-		     (list nil 16)
-		   (w3m-get-anchor-info)))))
-     (if info
-	 (progn
-	   (push-mark (point))
-	   (goto-char (cadr info)))
-       (w3m-message "No valid anchor selected")))))
-
-(defun w3m-linknum-get-action (&optional prompt type)
-  "Turn on link numbers and return list of url or action, position
-and image url if such of  PROMPT selected anchor.
-TYPE sets types of anchors to be numbered, if nil or 4, number urls,
-form fields and buttons. 1 - only links, 2 - only images.
-Highlight every intermediate result anchor.
-Input 0 corresponds to current page url."
-  (w3m-with-linknum
-   (or type 4)
-   (if (and (zerop (w3m-read-int-interactive
-		    (or prompt "Anchor number: ")
-		    'w3m-highlight-numbered-anchor))
-	    (not (eq type 2)))
-       (list w3m-current-url 16 nil nil)
-     (w3m-get-anchor-info))))
-
-;;;###autoload
-(defun w3m-linknum-follow (arg)
-  "Turn on link numbers, ask for one and execute appropriate action on it.
-When link - visit it, when button - press, when input - activate it.
-With prefix ARG visit link in new session or move over field/button
-before activate/press."
-  (interactive "P")
-  (let ((info (w3m-linknum-get-action
-	       (concat "Follow " (if arg "in new session ")
-		       "(select anchor): "))))
-    (if info
-	(let ((action (car info)))
-	  (cond ((stringp action)	; url
-		 (if arg (w3m-goto-url-new-session action)
-		   (push-mark (point))
-		   (goto-char (cadr info))
-		   (w3m-history-store-position)
-		   (w3m-goto-url action)))
-		((eq (car action) 'w3m-form-submit) ; button
-		 (when arg
-		   (push-mark (point))
-		   (goto-char (cadr info)))
-		 (widget-button-press (cadr info) action))
-		(t (if arg		; form field
-		       (progn (push-mark (point))
-			      (goto-char (cadr info))
-			      (let ((w3m-form-new-session t)
-				    (w3m-form-download nil))
-				(eval action)))
-		     (save-excursion
-		       (goto-char (cadr info))
-		       (let ((w3m-form-new-session nil)
-			     (w3m-form-download nil))
-			 (eval action)))))))
-      (w3m-message "No valid anchor selected"))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; linknum alternatives to w3m user commands on point
-
-;;;###autoload
-(defun w3m-linknum-toggle-inline-image (&optional arg)
-  "If image at point, toggle it.
-Otherwise turn on link numbers and toggle selected image.
-With prefix ARG open url under image in new session.
-If no such url, move over image and toggle it."
-  (interactive "P")
-  (if (w3m-image)
-      (let ((url (get-char-property (point) 'w3m-href-anchor)))
-	(if (and arg url)
-	    (w3m-goto-url-new-session url)
-	  (w3m-toggle-inline-image)))
-    (let ((im (w3m-linknum-get-action
-	       (if arg
-		   "Open image url in new session: "
-		 "Toggle image: ")
-	       2)))
-      (if im
-	  (if arg
-	      (if (car im)
-		  (w3m-goto-url-new-session (car im))
-		(push-mark (point))
-		(goto-char (cadr im))
-		(w3m-toggle-inline-image))
-	    (save-excursion (goto-char (cadr im))
-			    (w3m-toggle-inline-image)))
-	(w3m-message "No image selected")))))
-
-;;;###autoload
-(defun w3m-linknum-view-image ()
-  "Display the image under point in the external viewer.
-If no image at poing, turn on image numbers and display selected.
-The viewer is defined in `w3m-content-type-alist' for every type of an
-image."
-  (interactive)
-  (let ((im (w3m-url-valid (w3m-image))))
-    (cond (im (w3m-external-view im))
-	  ((setq im (w3m-linknum-get-action
-		     "Open image url in external viewer: " 2))
-	   (w3m-external-view (caddr im)))
-	  (t (w3m-message "No image selected")))))
-
-;;;###autoload
-(defun w3m-linknum-save-image ()
-  "Save the image under point to a file.
-If no image at poing, turn on image numbers and save selected.
-The default name will be the original name of the image."
-  (interactive)
-  (let ((im (w3m-url-valid (w3m-image))))
-    (cond (im (w3m-download im))
-	  ((setq im (w3m-linknum-get-action "Save image: " 2))
-	   (w3m-download (caddr im)))
-	  (t (w3m-message "No image selected")))))
-
-(defmacro w3m-linknum-zoom-image (rate &optional in)
-  "Zoom image under the point.
-Numeric prefix RATE specifies how many percent the image is
-changed by.  Default is the value of the `w3m-resize-image-scale'
-variable.  If no image under point, activate numbering and ask
-for one.  When IN zoom in, otherwise zoom out."
-  `(progn
-     (or (w3m-display-graphic-p)
-	 (error "Can't display images in this environment"))
-     (or (w3m-imagick-convert-program-available-p)
-	 (error "ImageMagick's `convert' program is required"))
-     (let ((im (w3m-image)))
-       (cond
-	(im (w3m-resize-inline-image-internal
-	     im
-	     (,(if in '+ '-) 100 (or ,rate w3m-resize-image-scale))))
-	((setq im (w3m-linknum-get-action
-		   ,(concat "Zoom " (if in "in" "out") " image: ") 2))
-	 (save-excursion
-	   (goto-char (cadr im))
-	   (w3m-resize-inline-image-internal
-	    (car im)
-	    (,(if in '+ '-) 100 (or ,rate w3m-resize-image-scale)))))
-	(t (w3m-message "No image at point"))))))
-
-(defun w3m-linknum-zoom-in-image (&optional rate)
-  "Zoom in an image on the point.
-Numeric prefix RATE specifies how many percent the image is
-enlarged by \(30 means enlarging the image by 130%).  The default
-is the value of the `w3m-resize-image-scale' variable.  If no
-image under point, activate numbering and ask for one."
-  (interactive "P")
-  (w3m-linknum-zoom-image rate t))
-
-(defun w3m-linknum-zoom-out-image (&optional rate)
-  "Zoom out an image on the point.
-Numeric prefix RATE specifies how many percent the image is shrunk by
-\(30 means shrinking the image by 70%).  The default is the value of
-the `w3m-resize-image-scale' variable.
-If no image under point, activate numbering and ask for one."
-  (interactive "P")
-  (w3m-linknum-zoom-image rate))
-
-;;;###autoload
-(defun w3m-linknum-external-view-this-url ()
-  "Launch the external browser and display the link at point.
-If no link at point, turn on link numbers and open selected externally."
-  (interactive)
-  (let ((url (w3m-url-valid (or (w3m-anchor) (w3m-image)
-				(car
-				 (w3m-linknum-get-action
-				  "Open in external browser: " 1))))))
-    (if url
-	(w3m-external-view url)
-      (w3m-message "No URL selected"))))
-
-;;;###autoload
-(defun w3m-linknum-edit-this-url ()
-  "Edit the page linked from the anchor under the cursor.
-If no such, turn on link numbers and edit selected."
-  (interactive)
-  (let ((url (or (w3m-url-valid (w3m-anchor))
-		 (car (w3m-linknum-get-action
-		       "Select link to edit: " 1)))))
-    (if url
-	(w3m-edit-url url)
-      (w3m-message "No URL selected"))))
-
-;;;###autoload
-(defun w3m-linknum-print-this-url ()
-  "Display the url under point in the echo area and put it into `kill-ring'.
-If no url under point, activate numbering and select one."
-  (interactive)
-  (if (or (w3m-anchor) (w3m-image))
-      (w3m-print-this-url t)
-    (let ((link (w3m-linknum-get-action "Select URL to copy: " 1)))
-      (if link
-	  (let ((url (car link)))
-	    (kill-new url)
-	    (w3m-message "%s%s" (let ((im-alt (cadddr link)))
-				  (if (zerop (length im-alt))
-				      ""
-				    (concat im-alt ": ")))
-			 url))
-	(w3m-message "No URL selected")))))
-
-;;;###autoload
-(defun w3m-linknum-download-this-url ()
-  "Download the file or the page pointed to by the link under point.
-If no point, activate numbering and select andchor to download."
-  (interactive)
-  (if (or (w3m-anchor) (w3m-image) (w3m-action))
-      (w3m-download-this-url)
-    (let ((info (w3m-linknum-get-action
-		 "Select anchor to download: ")))
-      (if info
-	  (save-excursion
-	    (goto-char (cadr info))
-	    (w3m-download-this-url))
-	(w3m-message "No anchor selected")))))
-
-;;;###autoload
-(defun w3m-linknum-bookmark-add-this-url ()
-  "Add link under cursor to bookmark.
-If no link under point, activate numbering and ask for one."
-  (interactive)
-  (let ((url (w3m-anchor)))
-    (cond
-     (url (w3m-bookmark-add
-	   url
-	   (buffer-substring-no-properties
-	    (previous-single-property-change (+ 1 (point))
-					     'w3m-href-anchor)
-	    (next-single-property-change (point) 'w3m-href-anchor)))
-	  (message "Added"))
-     ((setq url (w3m-linknum-get-action "Select URL to bookmark: " 1))
-      (w3m-bookmark-add
-       (car url)
-       (buffer-substring-no-properties
-	(previous-single-property-change (+ 1 (cadr url))
-					 'w3m-href-anchor)
-	(next-single-property-change (cadr url) 'w3m-href-anchor)))
-      (w3m-message "added"))
-     (t (w3m-message "No url selected")))))
-
-(provide 'w3m-lnum)
-
-;;; w3m-lnum.el ends here

=== removed file 'share/emacs/site-lisp/w3m/w3m-load.el'
--- share/emacs/site-lisp/w3m/w3m-load.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-load.el	1970-01-01 00:00:00 +0000
@@ -1,520 +0,0 @@
-;;; w3m-load.el --- automatically extracted autoload
-;;
-;; This file should be generated by make in emacs-w3m source directory.
-;;
-;;; Code:
-
-(provide 'w3m-load)
-
-;;;### (autoloads (w3m-buffer w3m-region w3m-find-file w3m-browse-url
-;;;;;;  w3m w3m-gohome w3m-goto-url-new-session w3m-goto-url w3m-download
-;;;;;;  w3m-retrieve) "w3m" "w3m.el" (19594 1591))
-;;; Generated autoloads from w3m.el
-
-(autoload 'w3m-retrieve "w3m" "\
-Retrieve web contents pointed to by URL.
-It will put the retrieved contents into the current buffer.
-
-If HANDLER is nil, this function will retrieve web contents, return
-the content type of the retrieved data, and then come to an end.  This
-behavior is what is called a synchronous operation.  You have to
-specify HANDLER in order to make this function show its real ability,
-which is called an asynchronous operation.
-
-If HANDLER is a function, this function will come to an end in no time.
-In this case, contents will be retrieved by the asynchronous process
-after a while.  And after finishing retrieving contents successfully,
-HANDLER will be called on the buffer where this function starts.  The
-content type of the retrieved data will be passed to HANDLER as a
-string argument.
-
-NO-UNCOMPRESS specifies whether this function should not uncompress contents.
-NO-CACHE specifies whether this function should not use cached contents.
-POST-DATA and REFERER will be sent to the web server with a request.
-
-\(fn URL &optional NO-UNCOMPRESS NO-CACHE POST-DATA REFERER HANDLER)" nil nil)
-
-(autoload 'w3m-download "w3m" "\
-Download contents of URL to a file named FILENAME.
-NO-CHACHE (which the prefix argument gives when called interactively)
-specifies not using the cached data.
-
-\(fn URL &optional FILENAME NO-CACHE HANDLER POST-DATA)" t nil)
-
-(autoload 'w3m-goto-url "w3m" "\
-Visit World Wide Web pages.  This is the primitive function of `w3m'.
-If the second argument RELOAD is non-nil, reload a content of URL.
-Except that if it is 'redisplay, re-display the page without reloading.
-The third argument CHARSET specifies a charset to be used for decoding
-a content.
-The fourth argument POST-DATA should be a string or a cons cell.  If
-it is a string, it makes this function request a body as if the
-content-type is \"x-www-form-urlencoded\".  If it is a cons cell, the
-car of a cell is used as the content-type and the cdr of a cell is
-used as the body.
-If the fifth argument REFERER is specified, it is used for a Referer:
-field for this request.
-The remaining HANDLER, ELEMENT[1], and NO-POPUP are for the
-internal operations of emacs-w3m.
-You can also use \"quicksearch\" url schemes such as \"gg:emacs\" which
-would search for the term \"emacs\" with the Google search engine.  See
-the `w3m-search' function and the variable `w3m-uri-replace-alist'.
-
-\[1] A note for the developers: ELEMENT is a history element which has
-already been registered in the `w3m-history-flat' variable.  It is
-corresponding to URL to be retrieved at this time, not for the url of
-the current page.
-
-\(fn URL &optional RELOAD CHARSET POST-DATA REFERER HANDLER ELEMENT NO-POPUP)" t nil)
-
-(autoload 'w3m-goto-url-new-session "w3m" "\
-Visit World Wide Web pages in a new session.
-If you invoke this command in the emacs-w3m buffer, the new session
-will be created by copying the current session.  Otherwise, the new
-session will start afresh.
-
-\(fn URL &optional RELOAD CHARSET POST-DATA REFERER)" t nil)
-
-(autoload 'w3m-gohome "w3m" "\
-Go to the Home page.
-
-\(fn)" t nil)
-
-(autoload 'w3m "w3m" "\
-Visit World Wide Web pages using the external w3m command.
-
-When you invoke this command interactively for the first time, it will
-visit a page which is pointed to by a string like url around the
-cursor position or the home page specified by the `w3m-home-page'
-variable, but you will be prompted for a URL if `w3m-quick-start' is
-nil (default t) or `w3m-home-page' is nil.
-
-The variables `w3m-pop-up-windows' and `w3m-pop-up-frames' control
-whether this command should pop to a window or a frame up for the
-session.
-
-When emacs-w3m sessions have already been opened, this command will
-pop to the existing window or frame up, but if `w3m-quick-start' is
-nil, (default t), you will be prompted for a URL (which defaults to
-`popup' meaning to pop to an existing emacs-w3m buffer up).
-
-In addition, if the prefix argument is given or you enter the empty
-string for the prompt, it will visit the home page specified by the
-`w3m-home-page' variable or the \"about:\" page.
-
-You can also run this command in the batch mode as follows:
-
-  emacs -f w3m http://emacs-w3m.namazu.org/ &
-
-In that case, or if this command is called non-interactively, the
-variables `w3m-pop-up-windows' and `w3m-pop-up-frames' will be ignored
-\(treated as nil) and it will run emacs-w3m at the current (or the
-initial) window.
-
-If the optional NEW-SESSION is non-nil, this function makes a new
-emacs-w3m buffer.  Besides that, it also makes a new emacs-w3m buffer
-if `w3m-make-new-session' is non-nil and a user specifies a url string.
-
-The optional INTERACTIVE-P is for the internal use; it is mainly used
-to check whether Emacs 22 or later calls this function as an
-interactive command in the batch mode.
-
-\(fn &optional URL NEW-SESSION INTERACTIVE-P)" t nil)
-
-(autoload 'w3m-browse-url "w3m" "\
-Ask emacs-w3m to browse URL.
-NEW-SESSION specifies whether to create a new emacs-w3m session.  URL
-defaults to the string looking like a url around the cursor position.
-Pop to a window or a frame up according to `w3m-pop-up-windows' and
-`w3m-pop-up-frames'.
-
-\(fn URL &optional NEW-SESSION)" t nil)
-
-(autoload 'w3m-find-file "w3m" "\
-Function used to open FILE whose name is expressed in ordinary format.
-The file name will be converted into the file: scheme.
-
-\(fn FILE)" t nil)
-
-(autoload 'w3m-region "w3m" "\
-Render the region of the current buffer between START and END.
-URL specifies the address where the contents come from.  It can be
-omitted or nil when the address is not identified.  CHARSET is used
-for decoding the contents.  If it is nil, this function attempts to
-parse the meta tag to extract the charset.
-
-\(fn START END &optional URL CHARSET)" t nil)
-
-(autoload 'w3m-buffer "w3m" "\
-Render the current buffer.
-See `w3m-region' for the optional arguments.
-
-\(fn &optional URL CHARSET)" t nil)
-
-;;;***
-
-;;;### (autoloads (w3m-antenna w3m-about-antenna) "w3m-antenna" "w3m-antenna.el"
-;;;;;;  (19188 5056))
-;;; Generated autoloads from w3m-antenna.el
-
-(autoload 'w3m-about-antenna "w3m-antenna" "\
-Not documented
-
-\(fn URL &optional NO-DECODE NO-CACHE POST-DATA REFERER HANDLER)" nil nil)
-
-(autoload 'w3m-antenna "w3m-antenna" "\
-Report changes of WEB sites, which is specified in `w3m-antenna-sites'.
-
-\(fn &optional NO-CACHE)" t nil)
-
-;;;***
-
-;;;### (autoloads (w3m-setup-bookmark-menu w3m-about-bookmark w3m-bookmark-view-new-session
-;;;;;;  w3m-bookmark-view w3m-bookmark-add-current-url-group w3m-bookmark-add-all-urls
-;;;;;;  w3m-bookmark-add-current-url w3m-bookmark-add-this-url) "w3m-bookmark"
-;;;;;;  "w3m-bookmark.el" (19529 31699))
-;;; Generated autoloads from w3m-bookmark.el
-
-(autoload 'w3m-bookmark-add-this-url "w3m-bookmark" "\
-Add link under cursor to bookmark.
-
-\(fn)" t nil)
-
-(autoload 'w3m-bookmark-add-current-url "w3m-bookmark" "\
-Add a url of the current page to the bookmark.
-With prefix, ask for a new url instead of the present one.
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'w3m-bookmark-add-all-urls "w3m-bookmark" "\
-Add urls of all pages being visited to the bookmark.
-
-\(fn)" t nil)
-
-(autoload 'w3m-bookmark-add-current-url-group "w3m-bookmark" "\
-Add link of the group of current urls to the bookmark.
-
-\(fn)" t nil)
-
-(autoload 'w3m-bookmark-view "w3m-bookmark" "\
-Display the bookmark.
-
-\(fn &optional RELOAD)" t nil)
-
-(autoload 'w3m-bookmark-view-new-session "w3m-bookmark" "\
-Display the bookmark on a new session.
-
-\(fn &optional RELOAD)" t nil)
-
-(autoload 'w3m-about-bookmark "w3m-bookmark" "\
-Not documented
-
-\(fn &rest ARGS)" nil nil)
-
-(autoload 'w3m-setup-bookmark-menu "w3m-bookmark" "\
-Setup w3m bookmark items in menubar.
-
-\(fn)" nil nil)
-
-;;;***
-
-;;;### (autoloads (w3m-about-cookie w3m-cookie w3m-cookie-get w3m-cookie-set
-;;;;;;  w3m-cookie-shutdown) "w3m-cookie" "w3m-cookie.el" (19450
-;;;;;;  19230))
-;;; Generated autoloads from w3m-cookie.el
-
-(autoload 'w3m-cookie-shutdown "w3m-cookie" "\
-Save cookies, and reset cookies' data.
-
-\(fn)" t nil)
-
-(autoload 'w3m-cookie-set "w3m-cookie" "\
-Register cookies which correspond to URL.
-BEG and END should be an HTTP response header region on current buffer.
-
-\(fn URL BEG END)" nil nil)
-
-(autoload 'w3m-cookie-get "w3m-cookie" "\
-Get a cookie field string which corresponds to the URL.
-
-\(fn URL)" nil nil)
-
-(autoload 'w3m-cookie "w3m-cookie" "\
-Display cookies and enable you to manage them.
-
-\(fn &optional NO-CACHE)" t nil)
-
-(autoload 'w3m-about-cookie "w3m-cookie" "\
-Make the html contents to display and to enable you to manage cookies.
-
-\(fn URL &optional NO-DECODE NO-CACHE POST-DATA &rest ARGS)" nil nil)
-
-;;;***
-
-;;;### (autoloads (w3m-dtree w3m-about-dtree) "w3m-dtree" "w3m-dtree.el"
-;;;;;;  (18965 10114))
-;;; Generated autoloads from w3m-dtree.el
-
-(autoload 'w3m-about-dtree "w3m-dtree" "\
-Not documented
-
-\(fn URL &optional NODECODE ALLFILES &rest ARGS)" nil nil)
-
-(autoload 'w3m-dtree "w3m-dtree" "\
-Display directory tree on local file system.
-If called with 'prefix argument', display all directorys and files.
-
-\(fn ALLFILES PATH)" t nil)
-
-;;;***
-
-;;;### (autoloads (w3m-fb-mode) "w3m-fb" "w3m-fb.el" (17681 2386))
-;;; Generated autoloads from w3m-fb.el
-
-(defvar w3m-fb-mode nil "\
-Non-nil if W3m-Fb mode is enabled.
-See the command `w3m-fb-mode' for a description of this minor mode.
-Setting this variable directly does not take effect;
-either customize it (see the info node `Easy Customization')
-or call the function `w3m-fb-mode'.")
-
-(custom-autoload 'w3m-fb-mode "w3m-fb" nil)
-
-(autoload 'w3m-fb-mode "w3m-fb" "\
-Toggle W3M Frame Buffer mode.
-This allows frame-local lists of buffers (tabs).
-
-\(fn &optional ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads (w3m-filter) "w3m-filter" "w3m-filter.el" (18560
-;;;;;;  26042))
-;;; Generated autoloads from w3m-filter.el
-
-(autoload 'w3m-filter "w3m-filter" "\
-Apply filtering rule of URL against a content in this buffer.
-
-\(fn URL)" nil nil)
-
-;;;***
-
-;;;### (autoloads (w3m-fontify-forms) "w3m-form" "w3m-form.el" (19563
-;;;;;;  45473))
-;;; Generated autoloads from w3m-form.el
-
-(autoload 'w3m-fontify-forms "w3m-form" "\
-Process half-dumped data and fontify forms in this buffer.
-
-\(fn)" nil nil)
-
-;;;***
-
-;;;### (autoloads (w3m-linknum-bookmark-add-this-url w3m-linknum-download-this-url
-;;;;;;  w3m-linknum-print-this-url w3m-linknum-edit-this-url w3m-linknum-external-view-this-url
-;;;;;;  w3m-linknum-save-image w3m-linknum-view-image w3m-linknum-toggle-inline-image
-;;;;;;  w3m-linknum-follow w3m-go-to-linknum w3m-link-numbering-mode)
-;;;;;;  "w3m-lnum" "w3m-lnum.el" (19590 4486))
-;;; Generated autoloads from w3m-lnum.el
-
-(autoload 'w3m-link-numbering-mode "w3m-lnum" "\
-Minor mode to extend point commands by using Conkeror style number selection.
-With prefix ARG 0 disable battery included point functions, otherwise
-enable them.  With no prefix ARG - toggle.
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'w3m-go-to-linknum "w3m-lnum" "\
-Turn on link and form numbers and ask for one to go to.
-With prefix ARG don't highlight current link.
-0 corresponds to location url.
-
-\(fn ARG)" t nil)
-
-(autoload 'w3m-linknum-follow "w3m-lnum" "\
-Turn on link numbers, ask for one and execute appropriate action on it.
-When link - visit it, when button - press, when input - activate it.
-With prefix ARG visit link in new session or move over field/button
-before activate/press.
-
-\(fn ARG)" t nil)
-
-(autoload 'w3m-linknum-toggle-inline-image "w3m-lnum" "\
-If image at point, toggle it.
-Otherwise turn on link numbers and toggle selected image.
-With prefix ARG open url under image in new session.
-If no such url, move over image and toggle it.
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'w3m-linknum-view-image "w3m-lnum" "\
-Display the image under point in the external viewer.
-If no image at poing, turn on image numbers and display selected.
-The viewer is defined in `w3m-content-type-alist' for every type of an
-image.
-
-\(fn)" t nil)
-
-(autoload 'w3m-linknum-save-image "w3m-lnum" "\
-Save the image under point to a file.
-If no image at poing, turn on image numbers and save selected.
-The default name will be the original name of the image.
-
-\(fn)" t nil)
-
-(autoload 'w3m-linknum-external-view-this-url "w3m-lnum" "\
-Launch the external browser and display the link at point.
-If no link at point, turn on link numbers and open selected externally.
-
-\(fn)" t nil)
-
-(autoload 'w3m-linknum-edit-this-url "w3m-lnum" "\
-Edit the page linked from the anchor under the cursor.
-If no such, turn on link numbers and edit selected.
-
-\(fn)" t nil)
-
-(autoload 'w3m-linknum-print-this-url "w3m-lnum" "\
-Display the url under point in the echo area and put it into `kill-ring'.
-If no url under point, activate numbering and select one.
-
-\(fn)" t nil)
-
-(autoload 'w3m-linknum-download-this-url "w3m-lnum" "\
-Download the file or the page pointed to by the link under point.
-If no point, activate numbering and select andchor to download.
-
-\(fn)" t nil)
-
-(autoload 'w3m-linknum-bookmark-add-this-url "w3m-lnum" "\
-Add link under cursor to bookmark.
-If no link under point, activate numbering and ask for one.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads (w3m-namazu w3m-about-namazu) "w3m-namazu" "w3m-namazu.el"
-;;;;;;  (18965 10114))
-;;; Generated autoloads from w3m-namazu.el
-
-(autoload 'w3m-about-namazu "w3m-namazu" "\
-Not documented
-
-\(fn URL &optional NO-DECODE NO-CACHE &rest ARGS)" nil nil)
-
-(autoload 'w3m-namazu "w3m-namazu" "\
-Search indexed files with Namazu.
-
-\(fn INDEX QUERY &optional RELOAD)" t nil)
-
-;;;***
-
-;;;### (autoloads (w3m-perldoc w3m-about-perldoc) "w3m-perldoc" "w3m-perldoc.el"
-;;;;;;  (18199 13480))
-;;; Generated autoloads from w3m-perldoc.el
-
-(autoload 'w3m-about-perldoc "w3m-perldoc" "\
-Not documented
-
-\(fn URL &optional NO-DECODE NO-CACHE &rest ARGS)" nil nil)
-
-(autoload 'w3m-perldoc "w3m-perldoc" "\
-View Perl documents.
-
-\(fn DOCNAME)" t nil)
-
-;;;***
-
-;;;### (autoloads (w3m-search-uri-replace w3m-search-new-session
-;;;;;;  w3m-search) "w3m-search" "w3m-search.el" (19563 45473))
-;;; Generated autoloads from w3m-search.el
-
-(autoload 'w3m-search "w3m-search" "\
-Search QUERY using SEARCH-ENGINE.
-When called interactively with a prefix argument, you can choose one of
-the search engines defined in `w3m-search-engine-alist'.  Otherwise use
-`w3m-search-default-engine'.
-If Transient Mark mode, use the region as an initial string of query
-and deactivate the mark.
-
-\(fn SEARCH-ENGINE QUERY)" t nil)
-
-(autoload 'w3m-search-new-session "w3m-search" "\
-Like `w3m-search', but do the search in a new session.
-
-\(fn SEARCH-ENGINE QUERY)" t nil)
-
-(autoload 'w3m-search-uri-replace "w3m-search" "\
-Generate query string for ENGINE from URI matched by last search.
-
-\(fn URI ENGINE)" nil nil)
-
-;;;***
-
-;;;### (autoloads (w3m-session-last-crashed-session w3m-session-last-autosave-session
-;;;;;;  w3m-setup-session-menu w3m-session-select w3m-session-save)
-;;;;;;  "w3m-session" "w3m-session.el" (19563 45473))
-;;; Generated autoloads from w3m-session.el
-
-(autoload 'w3m-session-save "w3m-session" "\
-Save list of displayed session.
-
-\(fn)" t nil)
-
-(autoload 'w3m-session-select "w3m-session" "\
-Select session from session list.
-
-\(fn)" t nil)
-
-(autoload 'w3m-setup-session-menu "w3m-session" "\
-Setup w3m session items in menubar.
-
-\(fn)" nil nil)
-
-(autoload 'w3m-session-last-autosave-session "w3m-session" "\
-Not documented
-
-\(fn)" nil nil)
-
-(autoload 'w3m-session-last-crashed-session "w3m-session" "\
-Not documented
-
-\(fn)" nil nil)
-
-;;;***
-
-;;;### (autoloads (w3m-replace-symbol) "w3m-symbol" "w3m-symbol.el"
-;;;;;;  (18791 12168))
-;;; Generated autoloads from w3m-symbol.el
-
-(autoload 'w3m-replace-symbol "w3m-symbol" "\
-Not documented
-
-\(fn)" nil nil)
-
-;;;***
-
-;;;### (autoloads (w3m-about-weather w3m-weather) "w3m-weather" "w3m-weather.el"
-;;;;;;  (18199 13480))
-;;; Generated autoloads from w3m-weather.el
-
-(autoload 'w3m-weather "w3m-weather" "\
-Display weather report.
-
-\(fn AREA)" t nil)
-
-(autoload 'w3m-about-weather "w3m-weather" "\
-Not documented
-
-\(fn URL NO-DECODE NO-CACHE POST-DATA REFERER HANDLER)" nil nil)
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; w3m-load.el ends here

=== removed file 'share/emacs/site-lisp/w3m/w3m-mail.el'
--- share/emacs/site-lisp/w3m/w3m-mail.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-mail.el	1970-01-01 00:00:00 +0000
@@ -1,396 +0,0 @@
-;;; w3m-mail.el --- an interface to mail-user-agent for sending web pages
-
-;; Copyright (C) 2006, 2009 TSUCHIYA Masatoshi
-
-;; Author: Katsumi Yamaoka <yamaoka@jpl.org>
-;; Keywords: w3m, WWW, hypermedia
-
-;; This file is a part of emacs-w3m.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; This module provides the `w3m-mail' command which enables you to
-;; send web pages as mails respecting those content types (typically
-;; text/html).  Currently this program works if and only if you set
-;; the `mail-user-agent' variable to one of the following agents:
-;;      `gnus-user-agent'
-;;      `message-user-agent'
-;;      `mew-user-agent'
-;;      `vm-user-agent'
-;;      `wl-user-agent'
-;; To send the page you are looking at, type `M-x w3m-mail' or click
-;; the menu button, fill message headers properly, and type `C-c C-c'.
-
-;;; Code:
-
-(require 'w3m)
-
-(defcustom w3m-mail-subject '("Emailing:" url)
-  "A list of strings and symbols used to generate the subject header.
-Valid symbols include `url' which is replaced with the url of the page
-and `title' which is replaced with the page title.  You can also use
-just a string for this variable."
-  :group 'w3m
-  :type '(radio (editable-list :format "\n%v%i\n"
-			       (radio-button-choice
-				(const :format "%v " url)
-				(const :format "%v " title)
-				string))
-		string
-		(const :format "no subject" nil)))
-
-(defvar w3m-mail-user-agent-compose-function-alist
-  (let ((alist '((gnus-user-agent . w3m-mail-compose-with-mml)
-		 (message-user-agent . w3m-mail-compose-with-mml)
-		 (mew-user-agent . w3m-mail-compose-with-mew)
-		 (vm-user-agent . w3m-mail-compose-with-vm)
-		 (wl-user-agent . w3m-mail-compose-with-semi)))
-	composer)
-    (delq nil (mapcar (lambda (agent)
-			(if (setq composer (cdr (assq agent alist)))
-			    (cons agent composer)))
-		      w3m-mail-user-agents)))
-  "Alist of mail user agents and functions to compose a mail.
-The function will be called with the arguments `source', `url',
-`charset', `content-type', `to', `subject', and `other-headers'; where
-`source' is a string containing the page source, `url' is the url of
-the page, `charset' is a charset that the page uses, `content-type' is
-the one such as \"text/html\", and the rest are the same as those of
-`compose-mail'.")
-
-(eval-when-compile
-  (autoload 'message-add-action "message")
-  (autoload 'mml-insert-empty-tag "mml")
-  (autoload 'vm-mime-attach-buffer "vm-mime")
-  (condition-case nil
-      (require 'mime-edit)
-    (error
-     (dolist (symbol '(encode-mime-charset-region
-		       detect-mime-charset-region
-		       std11-wrap-as-quoted-string
-		       mime-find-file-type
-		       mime-edit-insert-tag
-		       mime-edit-define-encoding
-		       mime-encode-region))
-       (defalias symbol 'ignore)))))
-
-(eval-and-compile
-  (autoload 'mm-find-mime-charset-region "mm-util")
-  (autoload 'w3m-mail-compose-with-mew "mew-w3m"
-    "Compose a mail using Mew." t))
-
-(defun w3m-mail-make-subject ()
-  "Return a string used for the Subject header."
-  (cond ((consp w3m-mail-subject)
-	 (w3m-replace-in-string
-	  (w3m-replace-in-string
-	   (mapconcat (lambda (elem)
-			(cond ((eq elem 'url) w3m-current-url)
-			      ((eq elem 'title) w3m-current-title)
-			      ((stringp elem) elem)
-			      (t (format "%s" elem))))
-		      w3m-mail-subject
-		      " ")
-	   "[\t\n ]+" " ")
-	  "\\(?:\\` \\| \\'\\)" ""))
-	((stringp w3m-mail-subject) w3m-mail-subject)
-	(t "(no subject)")))
-
-(defun w3m-mail-compute-base-url ()
-  "Compute a base url of the page if it is not provided."
-  (let ((url (substring w3m-current-url 15)))
-    (unless (string-match "\\`about:" url)
-      (save-excursion
-	(goto-char (point-min))
-	(let ((case-fold-search t)
-	      start end)
-	  (unless (and (setq start (search-forward "<head>" nil t))
-		       (setq end (search-forward "</head>" nil t))
-		       (progn
-			 (goto-char start)
-			 (re-search-forward "<base[\t\n\r ]+" end t))
-		       (w3m-parse-attributes (href) (> (length href) 0)))
-	    (substring (w3m-expand-url "x" url) 0 -1)))))))
-
-(defun w3m-mail-embed-base-url (source base-url)
-  "Embed BASE-URL in SOURCE."
-  (with-temp-buffer
-    (w3m-static-unless (featurep 'xemacs)
-      (set-buffer-multibyte t))
-    (setq case-fold-search t)
-    (insert source)
-    (goto-char (point-min))
-    (while (search-forward "\r\n" nil t)
-      (replace-match "\n"))
-    (goto-char (point-min))
-    (let ((nohead t)
-	  (points (list (point-min) (point-min)))
-	  (margin 0))
-      (when (re-search-forward "\\(<html>\\)[\t\n ]*" nil t)
-	(setq points (list (match-end 1) (match-end 0))
-	      margin (current-column)))
-      (when (re-search-forward "\\(<head>\\)[\t\n ]*" nil t)
-	(setq nohead nil
-	      points (list (match-end 1) (match-end 0))
-	      margin (current-column)))
-      (setq margin (make-string margin ? ))
-      (goto-char (car points))
-      (apply 'delete-region points)
-      (if nohead
-	  (insert "\n" margin "<head><base href=\"" base-url "\"></head>\n"
-		  margin)
-	(insert "\n" margin "<base href=\"" base-url "\">\n" margin)))
-    (buffer-string)))
-
-(defun w3m-mail-goto-body-and-clear-body ()
-  "Go to the beginning of the body and clear the body."
-  (goto-char (point-min))
-  (if (re-search-forward (concat "^\\(?:"
-				 (regexp-quote mail-header-separator)
-				 "\\)?\n")
-			 nil 'move)
-      (delete-region (point) (point-max))
-    (insert (if (bolp) "\n" "\n\n"))))
-
-(defun w3m-mail-position-point (bob)
-  "Go to empty or bogus header, otherwise the beginning of the body BOB."
-  (goto-char (point-min))
-  (when (re-search-forward "^\\(Subject: \\)(no subject)\\|\
-^\\([0-9A-Za-z-]+: ?\\)[\t ]*\n\\(?:[\t ]+\n\\)*[^\t ]"
-			   bob 'move)
-    (goto-char (or (match-end 1) (match-end 2)))))
-
-(defun w3m-mail-compose-with-mml (source url charset content-type
-					 to subject other-headers)
-  "Compose a mail using MML."
-  (let ((buffer (generate-new-buffer " *w3m-mail*")))
-    (with-current-buffer buffer
-      (w3m-static-unless (featurep 'xemacs)
-	(set-buffer-multibyte (not (string-match "\\`image/" content-type))))
-      (insert source))
-    (if (eq mail-user-agent 'gnus-user-agent)
-	(progn
-	  (require 'gnus)
-	  (let (gnus-newsgroup-name)
-	    (compose-mail to subject other-headers)))
-      (compose-mail to subject other-headers))
-    (message-add-action `(kill-buffer ,buffer) 'exit 'kill 'postpone 'send)
-    (w3m-mail-goto-body-and-clear-body)
-    (w3m-mail-position-point
-     (prog1
-	 (point)
-       (mml-insert-empty-tag
-	'part
-	'type content-type
-	'buffer (buffer-name buffer)
-	;; Use the base64 encoding if the body contains non-ASCII text
-	;; or very long lines which might be broken by MTAs.
-	'encoding "base64"
-	'charset (when charset (symbol-name charset))
-	'disposition "inline"
-	'description url)))))
-
-;; This function is implemented in mew-w3m.el.
-;; (defun w3m-mail-compose-with-mew (source url charset content-type
-;;                                         to subject other-headers)
-;;   "Compose a mail using Mew.")
-
-(defun w3m-mail-compose-with-vm (source url charset content-type
-					to subject other-headers)
-  "Compose a mail using VM."
-  (let* ((coding (and charset (w3m-charset-to-coding-system charset)))
-	 (multibytep (and (not coding)
-			  (or charset
-			      (and (not (string-match "\\`image/"
-						      content-type))
-				   (w3m-static-if (featurep 'xemacs)
-				       (string-match "[^\000-\177]" source)
-				     (multibyte-string-p source))))))
-	 (buffer (generate-new-buffer " *w3m-mail*")))
-    (with-current-buffer buffer
-      (w3m-static-unless (featurep 'xemacs)
-	(set-buffer-multibyte (and (not coding) multibytep)))
-      (cond (coding
-	     (insert (encode-coding-string source coding)))
-	    (multibytep
-	     (insert source)
-	     (when (and (setq charset (car (mm-find-mime-charset-region
-					    (point-min) (point-max))))
-			(setq coding (w3m-charset-to-coding-system charset)))
-	       (w3m-static-if (featurep 'xemacs)
-		   (encode-coding-region (point-min) (point-max) coding)
-		 (insert (prog1
-			     (encode-coding-string (buffer-string) coding)
-			   (erase-buffer)
-			   (set-buffer-multibyte nil))))))
-	    (t
-	     (insert source))))
-    (require 'vm-startup)
-    (compose-mail to subject other-headers)
-    (add-to-list 'mail-send-actions `(kill-buffer ,buffer))
-    (w3m-add-local-hook 'kill-buffer-hook `(lambda nil (kill-buffer ,buffer)))
-    (w3m-mail-goto-body-and-clear-body)
-    (w3m-mail-position-point
-     (prog1
-	 (point)
-       (vm-mime-attach-buffer buffer content-type
-			      (when charset (symbol-name charset))
-			      url)))))
-
-(defun w3m-mail-compose-with-semi (source url charset content-type
-					  to subject other-headers)
-  "Compose a mail using SEMI."
-  (require 'mime-edit)
-  (let* ((content-type (and content-type
-			    (split-string (downcase content-type) "/")))
-	 (basename (file-name-nondirectory (w3m-url-strip-query url)))
-	 (filename (cond
-		    ((and (string-match "^[\t ]*$" basename)
-			  (equal content-type '("text" "html")))
-		     "index.html")
-		    ((string-match "^[\t ]*$" basename)
-		     "dummy")
-		    (t
-		     basename)))
-	 (type (or (nth 0 content-type) "text"))
-	 (subtype (or (nth 1 content-type) "html"))
-	 parameters
-	 (encoding "base64")
-	 (disposition-type "inline")
-	 disposition-params
-	 (guess (mime-find-file-type filename))
-	 (textp (string= type "text")))
-    (when (and guess
-	       (string= (nth 0 guess) type)
-	       (string= (nth 1 guess) subtype))
-      (setq parameters (nth 2 guess)
-	    encoding (or (nth 3 guess) encoding)
-	    disposition-type (or (nth 4 guess) disposition-type)
-	    disposition-params (nth 5 guess)))
-    (compose-mail to subject other-headers)
-    (w3m-mail-goto-body-and-clear-body)
-    (let ((parameters-to-string
-	   (lambda (parameters)
-	     (when parameters
-	       (mapconcat
-		(lambda (parameter)
-		  (concat "; " (car parameter)
-			  "=" (if (eq (cdr parameter) 'file)
-				  (std11-wrap-as-quoted-string filename)
-				(cdr parameter))))
-		parameters
-		""))))
-	  (body (point))
-	  (edit-buffer (current-buffer))
-	  work-buffer)
-      (with-temp-buffer
-	(if textp
-	    (progn
-	      (insert source)
-	      (unless charset
-		(setq charset (detect-mime-charset-region (point-min)
-							  (point-max))))
-	      (when charset
-		(setq parameters (cons (cons "charset" (symbol-name charset))
-				       parameters))
-		(encode-mime-charset-region (point-min) (point-max) charset)))
-	  (set-buffer-multibyte nil)
-	  (insert source))
-	(mime-encode-region (point-min) (point-max) encoding)
-	(setq work-buffer (current-buffer))
-	(set-buffer edit-buffer)
-	(mime-edit-insert-tag
-	 type subtype
-	 (concat (funcall parameters-to-string parameters)
-		 "\nContent-Disposition: " disposition-type
-		 (funcall parameters-to-string disposition-params)
-		 "\nContent-Description: " url))
-	(mime-edit-define-encoding encoding)
-	(save-restriction
-	  (narrow-to-region (point) (point))
-	  (insert-buffer-substring work-buffer)
-	  (unless (bolp)
-	    (insert "\n"))
-	  (when (or (string= disposition-type "attachment")
-		    (not (member encoding '("7bit" "8bit" "binary"))))
-	    (add-text-properties
-	     (point-min) (point-max) '(invisible t mime-edit-invisible t)))))
-      (w3m-mail-position-point body))))
-
-(defun w3m-mail (&optional headers)
-  "Send a web page as a mail.
-By default the subject is generated according to `w3m-mail-subject'.
-The optional HEADERS is a list in which each element is a cons of the
-symbol of a header name and a string.  Here is an example to use this
-function:
-
-\(w3m-mail '((To . \"foo@bar\") (Subject . \"The emacs-w3m home page\")))"
-  (interactive (unless (eq major-mode 'w3m-mode)
-		 (error "`%s' must be invoked from an emacs-w3m buffer"
-			this-command)))
-  (let ((composer (cdr (assq mail-user-agent
-			     w3m-mail-user-agent-compose-function-alist)))
-	;; Don't move the history position.
-	(w3m-history-reuse-history-elements t)
-	source base url charset content-type to subject)
-    (cond
-     ((not composer)
-      (error "`%s' is not supported (yet) by `w3m-mail'" mail-user-agent))
-     ((not w3m-current-url)
-      (error "The source for this page is not available"))
-     ((string-match "\\`about://source/" w3m-current-url)
-      (setq source (buffer-string)
-	    base (w3m-mail-compute-base-url))
-      (w3m-view-source)
-      (setq url w3m-current-url
-	    charset (w3m-coding-system-to-charset w3m-current-coding-system)
-	    content-type (or (w3m-arrived-content-type w3m-current-url)
-			     (w3m-content-type w3m-current-url)))
-      (w3m-view-source))
-     ((string-match "\\`about://header/" w3m-current-url)
-      (w3m-view-source)
-      (setq source (buffer-string)
-	    base (w3m-mail-compute-base-url))
-      (w3m-view-source)
-      (setq url w3m-current-url
-	    charset (w3m-coding-system-to-charset w3m-current-coding-system)
-	    content-type (or (w3m-arrived-content-type w3m-current-url)
-			     (w3m-content-type w3m-current-url)))
-      (w3m-view-header))
-     (t
-      (setq url w3m-current-url
-	    charset (w3m-coding-system-to-charset w3m-current-coding-system)
-	    content-type (or (w3m-arrived-content-type w3m-current-url)
-			     (w3m-content-type w3m-current-url)))
-      (w3m-view-source)
-      (setq source (buffer-string)
-	    base (w3m-mail-compute-base-url))
-      (w3m-view-source)))
-    (when (and base (string= "text/html" content-type))
-      (setq source (w3m-mail-embed-base-url source base)))
-    (setq to (or (assq 'To headers) (assq 'to headers))
-	  subject (or (assq 'Subject headers) (assq 'subject headers)))
-    (when (or to subject)
-      (setq headers (delq to (delq subject (copy-sequence headers)))
-	    to (cdr to)
-	    subject (cdr subject)))
-    (unless subject
-      (setq subject (let ((w3m-current-url url)) (w3m-mail-make-subject))))
-    (funcall composer source url charset content-type to subject headers)))
-
-;;; w3m-mail.el ends here

=== removed file 'share/emacs/site-lisp/w3m/w3m-namazu.el'
--- share/emacs/site-lisp/w3m/w3m-namazu.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-namazu.el	1970-01-01 00:00:00 +0000
@@ -1,278 +0,0 @@
-;;; w3m-namazu.el --- The add-on program to search files with Namazu.
-
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2009
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Author: TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-;; Keywords: w3m, WWW, hypermedia, namazu
-
-;; This file is a part of emacs-w3m.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-
-;;; Commentary:
-
-;; w3m-namazu.el is the add-on program of emacs-w3m to search files
-;; with Namazu.  For more detail about emacs-w3m, see:
-;;
-;;    http://emacs-w3m.namazu.org/
-
-
-;;; History:
-
-;; Original program was posted by
-;; Takayuki Arakawa <takayu@pop02.odn.ne.jp> in [emacs-w3m:01340] at
-;; Jul 31, 2001.
-
-;; Many codes are imported from namazu.el written by
-;; Yukihiro Matsumoto <matz@netlab.co.jp> et al.
-
-;; All stuffs are rewritten by
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org> at Aug 2, 2001.
-
-
-;;; Code:
-
-(eval-when-compile
-  (require 'cl))
-
-(require 'w3m)
-
-(eval-and-compile
-  (autoload 'w3m-search-read-query "w3m-search"))
-
-(defgroup w3m-namazu nil
-  "w3m-namazu front-end for Emacs."
-  :group 'w3m
-  :prefix "w3m-namazu-")
-
-(defcustom w3m-namazu-command "namazu"
-  "*Name of the executable file of Namazu."
-  :group 'w3m-namazu
-  :type '(string :size 0))
-
-(defcustom w3m-namazu-arguments
-  '("-h"			; print in HTML format.
-    "-H"			; print further result links.
-    "-n" w3m-namazu-page-max	; set number of documents shown to NUM.
-    "-w" whence)		; set first number of documents shown to NUM.
-  "*Arguments of Namazu."
-  :group 'w3m-namazu
-  :type '(repeat
-	  (restricted-sexp :format "Argument: %v\n"
-			   :match-alternatives
-			   (stringp 'w3m-namazu-page-max 'whence)
-			   :size 0)))
-
-(defcustom w3m-namazu-page-max
-  (if (boundp 'namazu-search-num)
-      (symbol-value 'namazu-search-num)
-    30)
-  "*A maximum number of documents which are retrieved by one-time search."
-  :group 'w3m-namazu
-  :type '(integer :size 0))
-
-(defconst w3m-namazu-default-index-customize-spec
-  '`(choice
-     (const :tag "No default index" nil)
-     ,@(mapcar (lambda (x) (list 'const (car x)))
-	       w3m-namazu-index-alist)
-     (directory :format "Index directory: %v\n" :size 0)))
-
-(defcustom w3m-namazu-index-alist
-  (when (boundp 'namazu-dir-alist)
-    (mapcar (lambda (pair)
-	      (cons (car pair)
-		    (split-string (cdr pair))))
-	    (symbol-value 'namazu-dir-alist)))
-  "*Alist of alias and index directories."
-  :group 'w3m-namazu
-  :type '(repeat
-	  (group
-	   :indent 0 :inline t
-	   (cons :format "%v"
-		 (string :format "Alias: %v\n" :size 0)
-		 (repeat
-		  :format "%v%i\n" :indent 8
-		  (directory :format "Index directory: %v\n" :size 0)))))
-  :set (lambda (symbol value)
-	 (custom-set-default symbol value)
-	 (put 'w3m-namazu-default-index 'custom-type
-	      (eval w3m-namazu-default-index-customize-spec))))
-
-(defcustom w3m-namazu-default-index
-  (unless (and (boundp 'namazu-always-query-index-directory)
-	       (symbol-value 'namazu-always-query-index-directory))
-    (when (boundp 'namazu-default-dir)
-      (symbol-value 'namazu-default-dir)))
-  "*Alias or directory of the default index.
-If this variable equals nil, it is required to input an index path
-whenever `w3m-namazu' is called interactively without prefix
-argument."
-  :group 'w3m-namazu
-  :type (eval w3m-namazu-default-index-customize-spec))
-
-(defcustom w3m-namazu-output-coding-system
-  (if (boundp 'namazu-cs-write)
-      (symbol-value 'namazu-cs-write)
-    (if (memq system-type '(OS/2 emx windows-nt))
-	'shift_jis-dos
-      'euc-japan-unix))
-  "*Coding system for namazu process."
-  :group 'w3m-namazu
-  :type '(coding-system :size 0))
-
-(defcustom w3m-namazu-input-coding-system
-  (if (boundp 'namazu-cs-read)
-      (symbol-value 'namazu-cs-read)
-    'undecided)
-  "*Coding system for namazu process."
-  :group 'w3m-namazu
-  :type '(coding-system :size 0))
-
-
-(defun w3m-namazu-call-process (index query whence)
-  (setq index (if (assoc index w3m-namazu-index-alist)
-		  (mapcar 'expand-file-name
-			  (cdr (assoc index w3m-namazu-index-alist)))
-		(list (expand-file-name index))))
-  (let ((file-name-coding-system w3m-file-name-coding-system)
-	(coding-system-for-read w3m-namazu-input-coding-system)
-	(coding-system-for-write w3m-namazu-output-coding-system)
-	(default-process-coding-system
-	  (cons w3m-namazu-input-coding-system
-		w3m-namazu-output-coding-system)))
-    (apply 'call-process w3m-namazu-command nil t nil
-	   (let ((w3m-namazu-page-max
-		  (number-to-string w3m-namazu-page-max)))
-	     (nconc (mapcar 'eval w3m-namazu-arguments)
-		    (list query)
-		    index)))))
-
-;;;###autoload
-(defun w3m-about-namazu (url &optional no-decode no-cache &rest args)
-  (let (index query (whence "0"))
-    (when (string-match "\\`about://namazu/\\?" url)
-      (dolist (s (split-string (substring url (match-end 0)) "&"))
-	(when (string-match "\\`\\(?:index\\|\\(query\\)\\|\\(whence\\)\\)=" s)
-	  (set (cond
-		((match-beginning 1) 'query)
-		((match-beginning 2) 'whence)
-		(t 'index))
-	       (substring s (match-end 0)))))
-      (when (zerop (w3m-namazu-call-process (w3m-url-decode-string index)
-					    (w3m-url-decode-string query)
-					    whence))
-	(let ((case-fold-search t))
-	  (goto-char (point-min))
-	  (let ((max (if (re-search-forward
-			  "<!-- HIT -->\\([0-9]+\\)<!-- HIT -->" nil t)
-			 (string-to-number (match-string 1))
-		       0))
-		(cur (string-to-number whence)))
-	    (goto-char (point-min))
-	    (when (search-forward "<head>" nil t)
-	      (when (> cur 0)
-		(insert
-		 (format "
-<link rel=\"prev\" href=\"about://namazu/?index=%s&query=%s&whence=%d\">"
-			 index
-			 query
-			 (max (- cur w3m-namazu-page-max) 0))))
-	      (when (> max (+ cur w3m-namazu-page-max))
-		(insert
-		 (format "
-<link rel=\"next\" href=\"about://namazu/?index=%s&query=%s&whence=%d\">"
-			 index
-			 query
-			 (+ cur w3m-namazu-page-max))))))
-	  (goto-char (point-min))
-	  (while (search-forward "<a href=\"/" nil t)
-	    (forward-char -1)
-	    (insert "file://"))
-	  (goto-char (point-min))
-	  (while (re-search-forward "<a href=\"\\(\\?\\)&\\(?:amp;\\)?whence="
-				    nil t)
-	    (goto-char (match-beginning 1))
-	    (delete-char 1)
-	    (insert (format "about://namazu/?index=%s&query=%s" index query))))
-	"text/html"))))
-
-(defun w3m-namazu-complete-index (index predicate flag)
-  "Function to complete index name"
-  (if (eq flag 'lambda)
-      (and (or (and (assoc index w3m-namazu-index-alist) t)
-	       (file-directory-p index))
-	   (or (not predicate)
-	       (funcall predicate index)))
-    (let ((alist
-	   (mapcar
-	    'list
-	    (nconc
-	     (all-completions index w3m-namazu-index-alist)
-	     (let ((partial (file-name-nondirectory index))
-		   (dir (file-name-as-directory
-			 (or (file-name-directory index)
-			     default-directory))))
-	       (delq nil
-		     (mapcar
-		      (lambda (file)
-			(when (file-directory-p (expand-file-name file dir))
-			  (concat dir file)))
-		      (file-name-all-completions partial dir))))))))
-      (cond
-       ((not flag) (try-completion index alist predicate))
-       ((eq flag t) (all-completions index alist predicate))))))
-
-(defvar w3m-namazu-index-history nil)
-(defvar w3m-namazu-query-history nil)
-
-;;;###autoload
-(defun w3m-namazu (index query &optional reload)
-  "Search indexed files with Namazu."
-  (interactive
-   (list
-    (if (if w3m-namazu-default-index
-	    current-prefix-arg
-	  (not (and current-prefix-arg
-		    w3m-namazu-index-history)))
-	(let* ((default (or (car w3m-namazu-index-history)
-			    w3m-namazu-default-index))
-	       (s (completing-read
-		   (if default
-		       (format "Namazu index (default %s): " default)
-		     "Namazu index: ")
-		   'w3m-namazu-complete-index nil t nil
-		   'w3m-namazu-index-history)))
-	  (if (string= s "") default s))
-      (or w3m-namazu-default-index
-	  (car w3m-namazu-index-history)))
-    (w3m-search-read-query "Namazu query: " "Namazu query (default %s): "
-			   'w3m-namazu-query-history)
-    current-prefix-arg))
-  (unless (stringp index)
-    (error "%s" "Index is required"))
-  (unless (stringp query)
-    (error "%s" "Query is required"))
-  (w3m-goto-url (format "about://namazu/?index=%s&query=%s&whence=0"
-			(w3m-url-encode-string index)
-			(w3m-url-encode-string query))
-		reload))
-
-(provide 'w3m-namazu)
-
-;;; w3m-namazu.el ends here

=== removed file 'share/emacs/site-lisp/w3m/w3m-perldoc.el'
--- share/emacs/site-lisp/w3m/w3m-perldoc.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-perldoc.el	1970-01-01 00:00:00 +0000
@@ -1,124 +0,0 @@
-;;; w3m-perldoc.el --- The add-on program to view Perl documents.
-
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Author: TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-;; Keywords: w3m, perldoc
-
-;; This file is a part of emacs-w3m.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-
-;;; Commentary:
-
-;; w3m-perldoc.el is the add-on program of emacs-w3m to view Perl
-;; documents.  For more detail about emacs-w3m, see:
-;;
-;;    http://emacs-w3m.namazu.org/
-
-;;; Code:
-(require 'w3m)
-
-(defgroup w3m-perldoc nil
-  "Perldoc front-end for emacs-w3m."
-  :group 'w3m
-  :prefix "w3m-perldoc-")
-
-(defcustom w3m-perldoc-command "perldoc"
-  "*Name of the executable file of perldoc."
-  :group 'w3m-perldoc
-  :type '(string :size 0))
-
-(defcustom w3m-perldoc-pod2html-command "pod2html"
-  "*Name of the executable file of pod2html."
-  :group 'w3m-perldoc
-  :type '(string :size 0))
-
-(defcustom w3m-perldoc-pod2html-arguments
-  '("--noindex")
-  "*Arguments of pod2html."
-  :group 'w3m-perldoc
-  :type '(repeat (string :format "Argument: %v\n" :size 0))
-  :get (lambda (symbol)
-	 (delq nil (delete "" (mapcar (lambda (x) (if (stringp x) x))
-				      (default-value symbol)))))
-  :set (lambda (symbol value)
-	 (custom-set-default
-	  symbol
-	  (delq nil (delete "" (mapcar (lambda (x) (if (stringp x) x))
-				       value))))))
-
-(defcustom w3m-perldoc-input-coding-system
-  (if (string= "Japanese" w3m-language)
-      'euc-japan
-    (if (w3m-find-coding-system 'utf-8)
-	'utf-8
-      'iso-latin-1))
-  "*Coding system used when writing to `w3m-perldoc-command'."
-  :group 'w3m-perldoc
-  :type '(coding-system :size 0))
-
-(defcustom w3m-perldoc-output-coding-system
-  'undecided
-  "*Coding system used when reading from `w3m-perldoc-command'."
-  :group 'w3m-perldoc
-  :type '(coding-system :size 0))
-
-;;;###autoload
-(defun w3m-about-perldoc (url &optional no-decode no-cache &rest args)
-  (when (string-match "\\`about://perldoc/" url)
-    (let ((docname (if (= (length url) (match-end 0))
-		       "perl"
-		     (w3m-url-decode-string (substring url (match-end 0)))))
-	  (default-directory w3m-profile-directory)
-	  (process-environment (copy-sequence process-environment)))
-      ;; To specify the place in which pod2html generates its cache files.
-      (setenv "HOME" (expand-file-name w3m-profile-directory))
-      (and (let ((coding-system-for-read w3m-perldoc-output-coding-system))
-	     (zerop (call-process w3m-perldoc-command
-				  nil t nil "-u" docname)))
-	   (let ((coding-system-for-write w3m-perldoc-input-coding-system)
-		 (coding-system-for-read w3m-perldoc-input-coding-system))
-	     (zerop (apply (function call-process-region)
-			   (point-min) (point-max)
-			   w3m-perldoc-pod2html-command
-			   t '(t nil) nil
-			   (append w3m-perldoc-pod2html-arguments
-				   '("--htmlroot=about://perldoc")))))
-	   (let ((case-fold-search t))
-	     (goto-char (point-min))
-	     (while (re-search-forward
-		     "<a href=\"about://perldoc/\\([^\"]*\\)\\(\\.html\\)\">" nil t)
-	       (delete-region (match-beginning 2) (match-end 2))
-	       (save-restriction
-		 (narrow-to-region (match-beginning 1) (match-end 1))
-		 (while (search-backward "/" nil t)
-		   (delete-char 1)
-		   (insert "::"))
-		 (goto-char (point-max))))
-	     "text/html")))))
-
-;;;###autoload
-(defun w3m-perldoc (docname)
-  "View Perl documents."
-  (interactive "sDocument: ")
-  (w3m-goto-url (concat "about://perldoc/" (w3m-url-encode-string docname))))
-
-(provide 'w3m-perldoc)
-
-;;; w3m-perldoc.el ends here.

=== removed file 'share/emacs/site-lisp/w3m/w3m-proc.el'
--- share/emacs/site-lisp/w3m/w3m-proc.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-proc.el	1970-01-01 00:00:00 +0000
@@ -1,801 +0,0 @@
-;;; w3m-proc.el --- Functions and macros to control sub-processes
-
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
-;;          Shun-ichi GOTO     <gotoh@taiyo.co.jp>,
-;;          Satoru Takabayashi <satoru-t@is.aist-nara.ac.jp>,
-;;          Hideyuki SHIRAI    <shirai@meadowy.org>,
-;;          Keisuke Nishida    <kxn30@po.cwru.edu>,
-;;          Yuuichi Teranishi  <teranisi@gohome.org>,
-;;          Akihiro Arisawa    <ari@mbf.sphere.ne.jp>,
-;;          Katsumi Yamaoka    <yamaoka@jpl.org>
-;; Keywords: w3m, WWW, hypermedia
-
-;; This file is a part of emacs-w3m.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; This module is a part of emacs-w3m which provides functions and
-;; macros to control sub-processes.  Visit
-;; <URL:http://emacs-w3m.namazu.org/> for more details of emacs-w3m.
-
-;;; Code:
-
-(eval-when-compile
-  (require 'cl))
-
-(require 'w3m-util)
-
-(eval-when-compile
-  ;; Variable(s) which are used in the following inline functions.
-  ;; They should be defined in the other module at run-time.
-  (defvar w3m-current-url)
-  (defvar w3m-current-buffer)
-  (defvar w3m-current-process)
-  (defvar w3m-profile-directory)
-  (defvar w3m-terminal-coding-system)
-  (defvar w3m-command)
-  (defvar w3m-command-arguments)
-  (defvar w3m-command-environment)
-  (defvar w3m-async-exec)
-  (defvar w3m-process-connection-type)
-  (defvar w3m-process-modeline-format)
-  (defvar w3m-work-buffer-list)
-  (autoload 'w3m-idle-images-show-unqueue "w3m"))
-
-;; Silence the Emacs' byte-compiler that says ``might not be defined''.
-(eval-when-compile
-  (defun w3m-decode-coding-string-with-priority (str coding)
-    ()))
-
-(defvar w3m-process-inhibit-quit t
-  "`w3m-process-sentinel' binds `inhibit-quit' according to this variable.")
-(defvar w3m-process-timeout 300
-  "Number of seconds idle time waiting for processes to terminate.")
-(defvar w3m-process-kill-surely (featurep 'meadow)
-  "If non-nil, kill the process surely.")
-
-(defconst w3m-process-max 5 "The maximum limit of the working processes.")
-(defvar w3m-process-queue nil "Queue of processes.")
-
-(defvar w3m-process-exit-status nil "The last exit status of a process.")
-(defvar w3m-process-authinfo-alist nil)
-(defvar w3m-process-accept-alist nil)
-
-(defvar w3m-process-user nil)
-(defvar w3m-process-passwd nil)
-(defvar w3m-process-realm nil)
-(defvar w3m-process-object nil)
-(make-variable-buffer-local 'w3m-process-user)
-(make-variable-buffer-local 'w3m-process-passwd)
-(make-variable-buffer-local 'w3m-process-realm)
-(make-variable-buffer-local 'w3m-process-object)
-
-(defvar w3m-process-modeline-string nil
-  "Modeline string to show status of retrieving process.")
-(make-variable-buffer-local 'w3m-process-modeline-string)
-
-(defvar w3m-process-proxy-user nil "User name of the proxy server.")
-(defvar w3m-process-proxy-passwd nil "Password of the proxy server.")
-(defvar w3m-process-ssl-passphrase nil
-  "Passphrase for the client certificate.")
-
-(defmacro w3m-process-with-coding-system (&rest body)
-  "Set coding systems for `w3m-command', and evaluate BODY."
-  `(let ((coding-system-for-read 'binary)
-	 (coding-system-for-write w3m-terminal-coding-system)
-	 (default-process-coding-system
-	   (cons 'binary w3m-terminal-coding-system))
-	 (process-connection-type w3m-process-connection-type))
-     ,@body))
-(put 'w3m-process-with-coding-system 'lisp-indent-function 0)
-(put 'w3m-process-with-coding-system 'edebug-form-spec '(body))
-
-(defmacro w3m-process-with-environment (alist &rest body)
-  "Set the environment variables according to ALIST, and evaluate BODY."
-  `(let ((process-environment (copy-sequence process-environment))
-	 (temporary-file-directory
-	  (if (file-directory-p w3m-profile-directory)
-	      (file-name-as-directory w3m-profile-directory)
-	    ,(if (featurep 'xemacs)
-		 ;; Though `temporary-file-directory' exists even in XEmacs,
-		 ;; that's only an imitation provided by APEL.
-		 '(temp-directory)
-	       'temporary-file-directory)))
-	 (default-directory
-	   (cond ((file-directory-p w3m-profile-directory)
-		  (file-name-as-directory w3m-profile-directory))
-		 ((file-directory-p (expand-file-name "~/"))
-		  (expand-file-name "~/"))
-		 (t temporary-file-directory))))
-     ;; XEmacs obtains tmp-dir from the `temp-directory' function of which
-     ;; return value can only be modified by the following env vars.
-     ,@(if (featurep 'xemacs)
-	   '((setenv "TEMP" temporary-file-directory) ;; Windoze
-	     (setenv "TMPDIR" temporary-file-directory))) ;; Un|x
-     (dolist (pair ,alist)
-       (setenv (car pair) (cdr pair)))
-     ,@body))
-(put 'w3m-process-with-environment 'lisp-indent-function 1)
-(put 'w3m-process-with-environment 'edebug-form-spec '(form body))
-
-(defun w3m-process-p (object)
-  "Return t if OBJECT is a `w3m-process' object."
-  (and (consp object)
-       (vectorp (cdr object))
-       (eq 'w3m-process-object (aref (cdr object) 0))))
-
-(put 'w3m-process-new 'edebug-form-spec '(form form form &optional form form))
-(defmacro w3m-process-new (command arguments buffer &optional process handlers)
-  "Return a new `w3m-process' object."
-  `(cons (cons ,command ,arguments)
-	 (vector 'w3m-process-object
-		 ,buffer
-		 ,process
-		 ,handlers)))
-
-(defmacro w3m-process-command (object)
-  `(car (car ,object)))
-(defmacro w3m-process-arguments (object)
-  `(cdr (car ,object)))
-(defmacro w3m-process-buffer (object)
-  `(aref (cdr ,object) 1))
-(defmacro w3m-process-process (object)
-  `(aref (cdr ,object) 2))
-(defmacro w3m-process-handlers (object)
-  `(aref (cdr ,object) 3))
-
-(put 'w3m-process-handler-new 'edebug-form-spec '(form form form))
-(defmacro w3m-process-handler-new (buffer parent-buffer functions)
-  `(vector ,buffer ,parent-buffer ,functions nil))
-(defmacro w3m-process-handler-buffer (handler)
-  `(aref ,handler 0))
-(defmacro w3m-process-handler-parent-buffer (handler)
-  `(aref ,handler 1))
-(defmacro w3m-process-handler-functions (handler)
-  `(aref ,handler 2))
-(defmacro w3m-process-handler-result (handler)
-  `(aref ,handler 3))
-
-(defun w3m-process-push (handler command arguments)
-  "Generate a new `w3m-process' object which is provided by HANDLER,
-ARGUMENTS and this buffer, regist it to `w3m-process-queue', and
-return it."
-  (let ((x (assoc (cons command arguments) w3m-process-queue)))
-    (unless x
-      (setq x (w3m-process-new command arguments (current-buffer)))
-      (push x w3m-process-queue))
-    (push (w3m-process-handler-new (current-buffer) w3m-current-buffer handler)
-	  (w3m-process-handlers x))
-    (with-current-buffer (w3m-process-buffer x)
-      (setq w3m-process-object x))))
-
-(defun w3m-process-kill-process (process)
-  "Kill process PROCESS safely."
-  (when (processp process)
-    (set-process-filter process 'ignore)
-    (set-process-sentinel process 'ignore)
-    (when (memq (process-status process) '(run stop))
-      (kill-process process)
-      (when w3m-process-kill-surely
-	(while (memq (process-status process) '(run stop))
-	  (sit-for 0.1))))))
-
-(defun w3m-process-start-process (object &optional no-sentinel)
-  "Start a process specified by the OBJECT, return always nil.
-When NO-SENTINEL is not equal to nil, all status changes of the
-generated asynchronous process is ignored.  Otherwise,
-`w3m-process-sentinel' is given to the process as the sentinel."
-  (if (w3m-process-process object)
-      (when no-sentinel
-	(set-process-sentinel (w3m-process-process object) 'ignore))
-    (with-current-buffer (w3m-process-buffer object)
-      (w3m-process-with-coding-system
-	(w3m-process-with-environment w3m-command-environment
-	  (let* ((command (w3m-process-command object))
-		 (proc (apply 'start-process command
-			      (current-buffer) command
-			      (w3m-process-arguments object)))
-		 (authinfo (when w3m-current-url
-			     (w3m-url-authinfo w3m-current-url)))
-		 (set-process-query-on-exit-flag
-		  (if (fboundp 'set-process-query-on-exit-flag)
-		      'set-process-query-on-exit-flag
-		    'process-kill-without-query)))
-	    (setq w3m-process-user (car authinfo)
-		  w3m-process-passwd (cdr authinfo)
-		  w3m-process-realm nil)
-	    (setf (w3m-process-process object) proc)
-	    (set-process-filter proc 'w3m-process-filter)
-	    (set-process-sentinel proc (if no-sentinel
-					   'ignore
-					 'w3m-process-sentinel))
-	    (funcall set-process-query-on-exit-flag proc nil))))))
-  nil)	;; The return value of `w3m-process-start-process'.
-
-(defun w3m-process-kill-stray-processes ()
-  "Kill stray processes."
-  (dolist (obj w3m-process-queue)
-    (unless (buffer-name (w3m-process-buffer obj))
-      (setq w3m-process-queue (delq obj w3m-process-queue))
-      (when (w3m-process-process obj)
-	(w3m-process-kill-process (w3m-process-process obj))))))
-
-(defun w3m-process-start-queued-processes ()
-  "Start a process which is registerd in `w3m-process-queue' if the
-number of current working processes is less than `w3m-process-max'."
-  (w3m-process-kill-stray-processes)
-  (let ((num 0))
-    (catch 'last
-      (dolist (obj (reverse w3m-process-queue))
-	(when (buffer-name (w3m-process-buffer obj))
-	  (if (> (incf num) w3m-process-max)
-	      (throw 'last nil)
-	    (w3m-process-start-process obj)))))))
-
-(defun w3m-process-stop (buffer)
-  "Remove handlers related to the buffer BUFFER, and stop processes
-which have no handler."
-  (interactive (list (current-buffer)))
-  (w3m-cancel-refresh-timer buffer)
-  (setq w3m-process-queue
-	(delq nil
-	      (mapcar
-	       (lambda (obj)
-		 (let ((handlers
-			;; List up handlers related to other buffer
-			;; than the buffer BUFFER.
-			(delq nil
-			      (mapcar
-			       (lambda (handler)
-				 (unless (eq buffer
-					     (w3m-process-handler-parent-buffer
-					      handler))
-				   handler))
-			       (w3m-process-handlers obj)))))
-		   (if handlers
-		       (w3m-process-new
-			(w3m-process-command obj)
-			(w3m-process-arguments obj)
-			(w3m-process-buffer obj)
-			(w3m-process-process obj)
-			(if (memq (w3m-process-buffer obj)
-				  (mapcar (lambda (x)
-					    (w3m-process-handler-buffer x))
-					  handlers))
-			    handlers
-			  (cons
-			   ;; Dummy handler to remove buffer.
-			   (w3m-process-handler-new
-			    (w3m-process-buffer obj)
-			    (w3m-process-handler-parent-buffer (car handlers))
-			    (lambda (x) (w3m-kill-buffer (current-buffer))))
-			   handlers)))
-		     (when (w3m-process-process obj)
-		       (w3m-process-kill-process (w3m-process-process obj)))
-		     (dolist (handler (w3m-process-handlers obj))
-		       (w3m-kill-buffer (w3m-process-handler-buffer handler)))
-		     nil)))
-	       w3m-process-queue)))
-  (when (buffer-name buffer)
-    (with-current-buffer buffer
-      (setq w3m-current-process nil)))
-  (w3m-process-start-queued-processes)
-  (w3m-force-window-update-later buffer))
-
-(defun w3m-process-shutdown ()
-  (let ((list w3m-process-queue))
-    (setq w3m-process-queue nil
-	  w3m-process-authinfo-alist nil
-	  w3m-process-accept-alist nil)
-    (dolist (obj list)
-      (when (buffer-name (w3m-process-buffer obj))
-	(when (w3m-process-process obj)
-	  (w3m-process-kill-process (w3m-process-process obj))))
-      (w3m-kill-buffer (w3m-process-buffer obj)))))
-
-(defmacro w3m-process-with-null-handler (&rest body)
-  "Generate the null handler, and evaluate BODY.
-When BODY is evaluated, the local variable `handler' keeps the null
-handler."
-  (let ((var (gensym "--tempvar--")))
-    `(let ((,var (let (handler) ,@body)))
-       (when (w3m-process-p ,var)
-	 (w3m-process-start-process ,var))
-       ,var)))
-(put 'w3m-process-with-null-handler 'lisp-indent-function 0)
-(put 'w3m-process-with-null-handler 'edebug-form-spec '(body))
-
-;; Error symbol:
-(put 'w3m-process-timeout 'error-conditions '(error w3m-process-timeout))
-(put 'w3m-process-timeout 'error-message "Time out")
-
-(defun w3m-process-error-handler (error-data process)
-  (setq w3m-process-queue (delq process w3m-process-queue))
-  (w3m-process-kill-process (w3m-process-process process))
-  (signal (car error-data) (cdr error-data)))
-
-(defvar w3m-process-waited nil
-  "Non-nil means that `w3m-process-with-wait-handler' is being evaluated.")
-
-(defun w3m-process-wait-process (process seconds)
-  "Wait for SECONDS seconds or until PROCESS will exit.
-Returns the exit status of the PROCESS when it exit normally,
-otherwise returns nil."
-  (catch 'timeout
-    (let ((start (current-time)))
-      (while (or (and (prog2
-			  (discard-input)
-			  (not (save-current-buffer (sit-for 0.1)))
-			(discard-input))
-		      ;; Some input is detected but it may be a key
-		      ;; press event which should be ignored when the
-		      ;; process is not running.
-		      (memq (process-status process) '(open run)))
-		 (memq (process-status process) '(open run stop)))
-	(and seconds
-	     (< seconds (w3m-time-lapse-seconds start (current-time)))
-	     (throw 'timeout nil)))
-      (process-exit-status process))))
-
-(defmacro w3m-process-with-wait-handler (&rest body)
-  "Generate the waiting handler, and evaluate BODY.
-When BODY is evaluated, the local variable `handler' keeps the handler
-which will wait for the end of the evaluation."
-  (let ((result (gensym "--result--"))
-	(wait-function (gensym "--wait-function--")))
-    `(let ((w3m-process-waited t)
-	   (,result)
-	   (,wait-function (make-symbol "wait-function")))
-       (fset ,wait-function 'identity)
-       (setq ,result (let ((handler (list ,wait-function))) ,@body))
-       (while (w3m-process-p ,result)
-	 (condition-case error
-	     (let (w3m-process-inhibit-quit inhibit-quit)
-	       ;; No sentinel function is registered and the process
-	       ;; sentinel function is called from this macro, in
-	       ;; order to avoid the dead-locking which occurs when
-	       ;; this macro is called in the environment that
-	       ;; `w3m-process-sentinel' is evaluated.
-	       (w3m-process-start-process ,result t)
-	       (unless (w3m-process-wait-process (w3m-process-process ,result)
-						 w3m-process-timeout)
-		 (w3m-process-error-handler (cons 'w3m-process-timeout nil)
-					    ,result)))
-	   (quit (w3m-process-error-handler error ,result)))
-	 (w3m-process-sentinel (w3m-process-process ,result) "finished\n" t)
-	 (setq ,result
-	       (catch 'result
-		 (dolist (handler (w3m-process-handlers ,result))
-		   (when (memq ,wait-function
-			       (w3m-process-handler-functions handler))
-		     (throw 'result (w3m-process-handler-result handler))))
-		 (w3m-process-error-handler (cons 'error
-						  "Can't find wait handler")
-					    ,result))))
-       ,result)))
-(put 'w3m-process-with-wait-handler 'lisp-indent-function 0)
-(put 'w3m-process-with-wait-handler 'edebug-form-spec '(body))
-
-;;; Explanation of w3m-process-do in Japanese:
-;;
-;; w3m-process-do $B$O!"HsF14|=hM}$r4JC1$K=q$/$?$a$N%^%/%m$G$"$k!#Nc$($P!"(B
-;;
-;;    (w3m-process-do
-;;        (var (async-form...))
-;;      post-body...)
-;;
-;; $B$H$$$&$h$&$K=q$/$H!"0J2<$N=g=x$G=hM}$,9T$o$l$k!#(B
-;;
-;;   (1) async-form $B$rI>2A(B
-;;       --> async-form $BFb$GHsF14|%W%m%;%9$,@8@.$5$l$?>l9g$O!"$=$NHsF1(B
-;;           $B4|%W%m%;%9=*N;8e$K(B post-body $B$,I>2A$5$l$k$h$&$K!"%O%s%I%i(B
-;;           $B$KDI2C(B
-;;       --> $BHsF14|%W%m%;%9$,@8@.$5$l$J$+$C$?>l9g$O!"C1$K<!$N%9%F%C%W(B
-;;           $B$K?J$`(B(= post-body $B$rI>2A$9$k(B)$B!#(B
-;;   (2) post-body $B$rI>2A(B
-;;
-;; $B$J$*!"(Basync-form / post-body $B$,I>2A$5$l$k;~!"$=$NFbIt$GHsF14|%W%m%;(B
-;; $B%9$,@8@.$5$l$?>l9g$K!"$=$NJV$jCM$r=hM}$9$k$?$a$N%O%s%I%i$,!"JQ?t(B
-;; handler $B$K@_Dj$5$l$F$$$k!#HsF14|$J=hM}$r9T$&4X?t$r8F$S=P$9>l9g$K$O!"(B
-;; $B$=$N4X?t$N0z?t$H$7$FI,$:(B handler $B$rEO$5$J$1$l$P$J$i$J$$!#(B
-;;
-;; $B$^$?!"(Bw3m-process-do $B$O!"8=:_$N%O%s%I%i$NFbMF$rD4$Y$k$?$a!"$=$N%^%/(B
-;; $B%m$,8F$S=P$5$l$F$$$k4D6-$NJQ?t(B handler $B$r;2>H$9$k!#Nc$($P!"(B
-;;
-;;    (let (handler) (w3m-process-do ...))
-;;
-;; $B$HJQ?t(B handler $B$r(B nil $B$KB+G{$7$F$*$/$H!"!V8=;~E@$N%O%s%I%i$O6u$G$"(B
-;; $B$k(B = $BHsF14|%W%m%;%9<B9T8e$KI,MW$J=hM}$OB8:_$7$J$$!W$H$$$&0UL#$K$J$j!"(B
-;; w3m-process-do() $B$O!"HsF14|%W%m%;%9$,@8@.$5$l$?>l9g$K$OC1$K(B nil $B$r(B
-;; $BJV$7!"$=$l0J30$N>l9g$O(B post-body $B$NCM$rJV$9!#(B
-;;
-(defmacro w3m-process-do (spec &rest body)
-  "(w3m-process-do (VAR FORM) BODY...): Eval the body BODY asynchronously.
-If an asynchronous process is generated in the evaluation of the form
-FORM, this macro returns its object immdiately, and the body BODY will
-be evaluated after the end of the process with the variable VAR which
-is set to the result of the form FORM.  Otherwise, the body BODY is
-evaluated at the same time, and this macro returns the result of the
-body BODY."
-  (let ((var (or (car spec) (gensym "--tempvar--")))
-	(form (cdr spec))
-	(post-function (gensym "--post-function--")))
-    `(let ((,post-function (lambda (,var) ,@body)))
-       (let ((,var (let ((handler (cons ,post-function handler)))
-		     ,@form)))
-	 (if (w3m-process-p ,var)
-	     (if handler
-		 ,var
-	       (w3m-process-start-process ,var))
-	   (if (w3m-process-p (setq ,var (funcall ,post-function ,var)))
-	       (if handler
-		   ,var
-		 (w3m-process-start-process ,var))
-	     ,var))))))
-(put 'w3m-process-do 'lisp-indent-function 1)
-(put 'w3m-process-do 'edebug-form-spec '((symbolp form) def-body))
-
-(defmacro w3m-process-do-with-temp-buffer (spec &rest body)
-  "(w3m-process-do-with-temp-buffer (VAR FORM) BODY...):
-Like `w3m-process-do', but the form FORM and the body BODY are
-evaluated in a temporary buffer."
-  (let ((var (or (car spec) (gensym "--tempvar--")))
-	(form (cdr spec))
-	(post-body (gensym "--post-body--"))
-	(post-handler (gensym "--post-handler--"))
-	(temp-buffer (gensym "--temp-buffer--"))
-	(current-buffer (gensym "--current-buffer--")))
-    `(lexical-let ((,temp-buffer
-		    (w3m-get-buffer-create
-		     (generate-new-buffer-name w3m-work-buffer-name)))
-		   (,current-buffer (current-buffer)))
-       (labels ((,post-body (,var)
-			    (when (buffer-name ,temp-buffer)
-			      (set-buffer ,temp-buffer))
-			    ,@body)
-		(,post-handler (,var)
-			       (w3m-kill-buffer ,temp-buffer)
-			       (when (buffer-name ,current-buffer)
-				 (set-buffer ,current-buffer))
-			       ,var))
-	 (let ((,var (let ((handler
-			    (cons ',post-body (cons ',post-handler handler))))
-		       (with-current-buffer ,temp-buffer ,@form))))
-	   (if (w3m-process-p ,var)
-	       (if handler
-		   ,var
-		 (w3m-process-start-process ,var))
-	     (if (w3m-process-p
-		  (setq ,var (save-current-buffer
-			       (let ((handler (cons ',post-handler handler)))
-				 (,post-body ,var)))))
-		 (if handler
-		     ,var
-		   (w3m-process-start-process ,var))
-	       (,post-handler ,var))))))))
-(put 'w3m-process-do-with-temp-buffer 'lisp-indent-function 1)
-(put 'w3m-process-do-with-temp-buffer 'edebug-form-spec
-     '((symbolp form) def-body))
-
-
-(defun w3m-process-start (handler command arguments)
-  "Run COMMAND with ARGUMENTS, and eval HANDLER asynchronously."
-  (if w3m-async-exec
-      (w3m-process-do
-	  (exit-status (w3m-process-push handler command arguments))
-	(w3m-process-start-after exit-status))
-    (w3m-process-start-after
-     (w3m-process-with-coding-system
-       (w3m-process-with-environment w3m-command-environment
-	 (apply 'call-process command nil t nil arguments))))))
-
-(defun w3m-process-start-after (exit-status)
-  (when w3m-current-buffer
-    (with-current-buffer w3m-current-buffer
-      (setq w3m-process-modeline-string nil)))
-  (cond
-   ((numberp exit-status)
-    (zerop (setq w3m-process-exit-status exit-status)))
-   ((not exit-status)
-    (setq w3m-process-exit-status nil))
-   (t
-    (setq w3m-process-exit-status
-	  (string-as-multibyte (format "%s" exit-status)))
-    nil)))
-
-(defvar w3m-process-background nil
-  "Non-nil means that an after handler is being evaluated.")
-
-(defun w3m-process-sentinel (process event &optional ignore-queue)
-  ;; Ensure that this function will be never called repeatedly.
-  (set-process-sentinel process 'ignore)
-  (let ((inhibit-quit w3m-process-inhibit-quit)
-	(w3m-process-background t))
-    (unwind-protect
-	(if (buffer-name (process-buffer process))
-	    (with-current-buffer (process-buffer process)
-	      (w3m-static-unless (featurep 'xemacs)
-		(accept-process-output process 1))
-	      (setq w3m-process-queue
-		    (delq w3m-process-object w3m-process-queue))
-	      (let ((exit-status (process-exit-status process))
-		    (buffer (current-buffer))
-		    (realm  w3m-process-realm)
-		    (user   w3m-process-user)
-		    (passwd w3m-process-passwd)
-		    (obj    w3m-process-object))
-		(setq w3m-process-object nil)
-		(dolist (x (w3m-process-handlers obj))
-		  (when (and
-			 (buffer-name (w3m-process-handler-buffer x))
-			 (buffer-name (w3m-process-handler-parent-buffer x)))
-		    (set-buffer (w3m-process-handler-buffer x))
-		    (unless (eq buffer (current-buffer))
-		      (insert-buffer-substring buffer))))
-		(dolist (x (w3m-process-handlers obj))
-		  (when (and
-			 (buffer-name (w3m-process-handler-buffer x))
-			 (buffer-name (w3m-process-handler-parent-buffer x)))
-		    (set-buffer (w3m-process-handler-buffer x))
-		    (let ((w3m-process-exit-status)
-			  (w3m-current-buffer
-			   (w3m-process-handler-parent-buffer x))
-			  (handler
-			   (w3m-process-handler-functions x))
-			  (exit-status exit-status))
-		      (when realm
-			(w3m-process-set-authinfo w3m-current-url
-						  realm user passwd))
-		      (while (and handler
-				  (not (w3m-process-p
-					(setq exit-status
-					      (funcall (pop handler)
-						       exit-status))))))
-		      (setf (w3m-process-handler-result x) exit-status))))))
-	  ;; Something wrong has been occured.
-	  (catch 'last
-	    (dolist (obj w3m-process-queue)
-	      (when (eq process (w3m-process-process obj))
-		(setq w3m-process-queue (delq obj w3m-process-queue))
-		(throw 'last nil)))))
-      (delete-process process)
-      (unless ignore-queue
-	(w3m-process-start-queued-processes)))))
-
-(defun w3m-process-filter (process string)
-  (when (buffer-name (process-buffer process))
-    (with-current-buffer (process-buffer process)
-      (let ((inhibit-read-only t)
-	    (case-fold-search nil))
-	(goto-char (process-mark process))
-	(insert string)
-	(set-marker (process-mark process) (point))
-	(unless (string= "" string)
-	  (goto-char (point-min))
-	  (cond
-	   ((and (looking-at
-		  "\\(?:Accept [^\n]+\n\\)*\\([^\n]+: accept\\? \\)(y/n)")
-		 (= (match-end 0) (point-max)))
-	    ;; SSL certificate
-	    (message "")
-	    (let ((yn (w3m-process-y-or-n-p w3m-current-url (match-string 1))))
-	      (ignore-errors
-		(process-send-string process (if yn "y\n" "n\n"))
-		(delete-region (point-min) (point-max)))))
-	   ((and (looking-at "\n?Accept unsecure SSL session:.*\n")
-		 (= (match-end 0) (point-max)))
-	    (delete-region (point-min) (point-max)))
-	   ((and (looking-at "\\(\n?Wrong username or password\n\\)?\
-Proxy Username for \\(?:.*\\): Proxy Password: ")
-		 (= (match-end 0) (point-max)))
-	    (when (or (match-beginning 1)
-		      (not (stringp w3m-process-proxy-passwd)))
-	      (setq w3m-process-proxy-passwd
-		    (read-passwd "Proxy Password: ")))
-	    (ignore-errors
-	      (process-send-string process
-				   (concat w3m-process-proxy-passwd "\n"))
-	      (delete-region (point-min) (point-max))))
-	   ((and (looking-at "\\(\n?Wrong username or password\n\\)?\
-Proxy Username for \\(.*\\): ")
-		 (= (match-end 0) (point-max)))
-	    (when (or (match-beginning 1)
-		      (not (stringp w3m-process-proxy-user)))
-	      (setq w3m-process-proxy-user
-		    (read-from-minibuffer (concat
-					   "Proxy Username for "
-					   (match-string 2) ": "))))
-	    (ignore-errors
-	      (process-send-string process
-				   (concat w3m-process-proxy-user "\n"))))
-	   ((and (looking-at "\\(\n?Wrong username or password\n\\)?\
-Username for [^\n]*\n?: Password: ")
-		 (= (match-end 0) (point-max)))
-	    (when (or (match-beginning 1)
-		      (not (stringp w3m-process-passwd)))
-	      (setq w3m-process-passwd
-		    (w3m-process-read-passwd w3m-current-url
-					     w3m-process-realm
-					     w3m-process-user
-					     (match-beginning 1))))
-	    (ignore-errors
-	      (process-send-string process
-				   (concat w3m-process-passwd "\n"))
-	      (delete-region (point-min) (point-max))))
-	   ((and (looking-at "\\(\n?Wrong username or password\n\\)?\
-Username for \\(.*\\)\n?: ")
-		 (= (match-end 0) (point-max)))
-	    (setq w3m-process-realm (w3m-decode-coding-string-with-priority
-				     (match-string 2) nil))
-	    (when (or (match-beginning 1)
-		      (not (stringp w3m-process-user)))
-	      (setq w3m-process-user
-		    (w3m-process-read-user w3m-current-url
-					   w3m-process-realm
-					   (match-beginning 1))))
-	    (ignore-errors
-	      (process-send-string process
-				   (concat w3m-process-user "\n"))))
-	   ((and (looking-at "Enter PEM pass phrase:")
-		 (= (match-end 0) (point-max)))
-	    (unless (stringp w3m-process-ssl-passphrase)
-	      (setq w3m-process-ssl-passphrase
-		    (read-passwd "PEM pass phrase: ")))
-	    (ignore-errors
-	      (process-send-string process
-				   (concat w3m-process-ssl-passphrase "\n"))
-	      (delete-region (point-min) (point-max))))
-	   ((progn
-	      (or (search-forward "\nW3m-current-url:" nil t)
-		  (goto-char (process-mark process)))
-	      (re-search-backward
-	       "^W3m-\\(?:in-\\)?progress: \\([.0-9]+/[.0-9]+[a-zA-Z]?b\\)$"
-	       nil t))
-	    (let ((str (w3m-process-modeline-format (match-string 1)))
-		  (buf))
-	      (save-current-buffer
-		(dolist (handler (w3m-process-handlers w3m-process-object))
-		  (when (setq buf (w3m-process-handler-parent-buffer handler))
-		    (if (buffer-name buf)
-			(progn
-			  (set-buffer buf)
-			  (setq w3m-process-modeline-string str))
-		      (w3m-process-kill-stray-processes)))))))))))))
-
-(defun w3m-process-modeline-format (str)
-  (ignore-errors
-    (cond
-     ((stringp w3m-process-modeline-format)
-      (format w3m-process-modeline-format
-	      (if (string-match "/0\\([a-zA-Z]?b\\)\\'" str)
-		  (replace-match "\\1" t nil str)
-		str)))
-     ((functionp w3m-process-modeline-format)
-      (funcall w3m-process-modeline-format str)))))
-
-;; w3m-process-authinfo-alist has an association list as below format.
-;; (("root1" ("realm11" ("user11" . "pass11")
-;;                      ("user12" . "pass12"))
-;;           ("realm12" ("user13" . "pass13")))
-;;  ("root2" ("realm21" ("user21" . "pass21"))))
-(defun w3m-process-set-authinfo (url realm username password)
-  (let (x y z (root (w3m-get-server-hostname url)))
-    (if (setq x (assoc root w3m-process-authinfo-alist))
-	(if (setq y (assoc realm x))
-	    (if (setq z (assoc username y))
-		;; Change a password only.
-		(setcdr z password)
-	      ;; Add a pair of a username and a password.
-	      (setcdr y (cons (cons username password) (cdr y))))
-	  ;; Add a 3-tuple of a realm, a username and a password.
-	  (setcdr x (cons (cons realm (list (cons username password)))
-			  (cdr x))))
-      ;; Add a 4-tuple of a server root, a realm, a username and a password.
-      (push (cons root (list (cons realm (list (cons username password)))))
-	    w3m-process-authinfo-alist))))
-
-(defun w3m-process-read-user (url &optional realm ignore-history)
-  "Read a user name for URL and REALM."
-  (let* ((root (when (stringp url) (w3m-get-server-hostname url)))
-	 (ident (or realm root))
-	 (alist))
-    (if (and (not ignore-history)
-	     (setq alist
-		   (cdr (assoc realm
-			       (cdr (assoc root
-					   w3m-process-authinfo-alist))))))
-	(if (= 1 (length alist))
-	    (caar alist)
-	  (completing-read (if ident
-			       (format "Select username for %s: " ident)
-			     "Select username: ")
-			   (mapcar (lambda (x) (cons (car x) (car x))) alist)
-			   nil t))
-      (read-from-minibuffer (if ident
-				(format "Username for %s: " ident)
-			      "Username: ")))))
-
-(defun w3m-process-read-passwd (url &optional realm username ignore-history)
-  "Read a password for URL, REALM, and USERNAME."
-  (let* ((root (when (stringp url) (w3m-get-server-hostname url)))
-	 (ident (or realm root))
-	 (pass (cdr (assoc username
-			   (cdr (assoc realm
-				       (cdr (assoc root
-						   w3m-process-authinfo-alist))))))))
-    (if (and pass (not ignore-history))
-	pass
-      (read-passwd (format (if ident
-			       (format "Password for %s%%s: " ident)
-			     "Password%s: ")
-			   (if (and (stringp pass)
-				    (> (length pass) 0)
-				    (not (featurep 'xemacs)))
-			       (concat " (default "
-				       (make-string (length pass) ?\*)
-				       ")")
-			     ""))
-		   nil pass))))
-
-(defun w3m-process-y-or-n-p (url prompt)
-  "Ask user a \"y or n\" question.  Return t if answer is \"y\".
-NOTE: This function is designed to avoid annoying questions.  So when
-the same questions is reasked, its previous answer is reused without
-prompt."
-  (let ((root (w3m-get-server-hostname url))
-	(map (copy-keymap query-replace-map))
-	elem answer)
-    ;; ignore [space] to avoid answering y without intention.
-    (define-key map " " 'ignore)
-    (let ((query-replace-map map))
-      (if (setq elem (assoc root w3m-process-accept-alist))
-	  (if (member prompt (cdr elem))
-	      ;; When the same question has been asked, the previous
-	      ;; answer is reused.
-	      (setq answer t)
-	    ;; When any question for the same server has been asked,
-	    ;; regist the pair of this question and its answer to
-	    ;; `w3m-process-accept-alist'.
-	    (when (setq answer (y-or-n-p prompt))
-	      (setcdr elem (cons prompt (cdr elem)))))
-	;; When no question for the same server has been asked, regist
-	;; the 3-tuple of the server, the question and its answer to
-	;; `w3m-process-accept-alist'.
-	(when (setq answer (y-or-n-p prompt))
-	  (push (cons root (list prompt)) w3m-process-accept-alist)))
-      answer)))
-
-;; Silence the byte compiler complaining against `gensym' like:
-;; "Warning: the function `gensym' might not be defined at runtime."
-(eval-when-compile
-  (and (boundp 'byte-compile-unresolved-functions)
-       (fboundp 'gensym)
-       (symbol-file 'gensym)
-       (string-match "/cl-macs\\.el[^/]*\\'" (symbol-file 'gensym))
-       (condition-case nil
-	   (setq byte-compile-unresolved-functions
-		 (delq (assq 'gensym byte-compile-unresolved-functions)
-		       byte-compile-unresolved-functions))
-	 (error))))
-
-(provide 'w3m-proc)
-
-;;; w3m-proc.el ends here

=== removed file 'share/emacs/site-lisp/w3m/w3m-rss.el'
--- share/emacs/site-lisp/w3m/w3m-rss.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-rss.el	1970-01-01 00:00:00 +0000
@@ -1,169 +0,0 @@
-;;; w3m-rss.el --- RSS functions
-
-;; Copyright (C) 2004, 2005 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-;; Keywords: w3m, WWW, hypermedia
-
-;; This file is a part of emacs-w3m.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-
-;;; Commentary:
-
-;; w3m-rss.el provides RSS-related functions for emacs-w3m.  For more
-;; detail about emacs-w3m, see:
-;;
-;;    http://emacs-w3m.namazu.org/
-
-
-;;; Acknowledgment:
-
-;; I refered functions in `sb-rss.el' to implement this module.
-;; Thanks to Koichiro Ohba and NAKAJIMA Mikio.
-
-
-;;; Code:
-
-(eval-when-compile (require 'cl))
-(autoload 'xml-parse-region "xml")
-
-(eval-and-compile
-  (autoload 'timezone-parse-date "timezone")
-  (autoload 'timezone-parse-time "timezone"))
-
-(eval-when-compile
-  ;; Avoid warning for Emacs 19 and XEmacs.
-  (unless (fboundp 'match-string-no-properties)
-    (autoload 'match-string-no-properties "poe"))
-  ;; Avoid warning for Emacs 19.
-  (unless (fboundp 'split-string)
-    (autoload 'split-string "poe")))
-
-(defun w3m-rss-parse-date-string (date)
-  "Decode DATE string written in the ISO 8601 format or the RFC822 style.
-Return a list of numbers which conforms to the Emacs internal format.
-Valid types in the ISO 8601 format include:
-
-    Year:
-       YYYY (eg 1997)
-    Year and month:
-       YYYY-MM (eg 1997-07)
-    Complete date:
-       YYYY-MM-DD (eg 1997-07-16)
-    Complete date plus hours and minutes:
-       YYYY-MM-DDThh:mmTZD (eg 1997-07-16T19:20+01:00)
-    Complete date plus hours, minutes and seconds:
-       YYYY-MM-DDThh:mm:ssTZD (eg 1997-07-16T19:20:30+01:00)
-    Complete date plus hours, minutes, seconds and a decimal fraction
-    of a second
-       YYYY-MM-DDThh:mm:ss.sTZD (eg 1997-07-16T19:20:30.45+01:00)
-
-where:
-  YYYY = four-digit year
-  MM   = two-digit month (01=January, etc.)
-  DD   = two-digit day of month (01 through 31)
-  hh   = two digits of hour (00 through 23) (am/pm NOT allowed)
-  mm   = two digits of minute (00 through 59)
-  ss   = two digits of second (00 through 59)
-  s    = one or more digits representing a decimal fraction of a second
-  TZD  = time zone designator (Z or +hh:mm or -hh:mm)
-
-For more detail about ISO 8601 date format, see
-<URL:http://www.w3.org/TR/NOTE-datetime>.
-
-In addition to the above, it also supports the date format in the
-RFC822 style which RSS 2.0 allows.  Valid types are the same as ones
-which are supported by the `timezone-parse-date' function (which see)."
-  (cond ((not date) nil)
-	((string-match " [0-9]+ " date)
-	 (let* ((vector (timezone-parse-date date))
-		(year (string-to-number (aref vector 0)))
-		time)
-	   (when (>= year 1970)
-	     (setq time (timezone-parse-time (aref vector 3)))
-	     (encode-time
-	      (string-to-number (aref time 2))
-	      (string-to-number (aref time 1))
-	      (string-to-number (aref time 0))
-	      (string-to-number (aref vector 2))
-	      (string-to-number (aref vector 1))
-	      year
-	      (aref vector 4)))))
-	((string-match "\
-\\([0-9][0-9][0-9][0-9]\\)\\(?:-\\([0-9][0-9]\\)\\)?\\(?:-\\([0-9][0-9]\\)\\)?\
-T?\\(?:\\([0-9][0-9]\\):\\([0-9][0-9]\\)\\(?::\\([.0-9]+\\)\\)?\\)?\
-\\(?:\\([-+]\\)\\([0-9][0-9]\\):?\\([0-9][0-9]\\)\\|Z\\)?"
-		       date)
-	 (labels ((substr (n default)
-			  (if (match-beginning n)
-			      (string-to-number
-			       (match-string-no-properties n date))
-			    default)))
-	   (encode-time
-	    (substr 6 0) ;; seconds
-	    (substr 5 0) ;; minitue
-	    (substr 4 0) ;; hour
-	    (substr 3 1) ;; day
-	    (substr 2 1) ;; month
-	    (substr 1 0) ;; year
-	    (if (match-beginning 7)
-		(funcall (intern (match-string-no-properties 7 date))
-			 0
-			 (* 3600 (substr 8 0))
-			 (* 60 (substr 9 0)))
-	      0))))))
-
-(defun w3m-rss-find-el (tag data)
-  "Find the all matching elements in the data.  Careful with this on
-large documents!"
-  (let (found)
-    (when (listp data)
-      (dolist (bit data)
-	(when (car-safe bit)
-	  (when (equal tag (car bit))
-	    (setq found (nconc found (list bit))))
-	  (setq found
-		(nconc found
-		       (w3m-rss-find-el
-			tag
-			(if (and (listp (car-safe (caddr bit)))
-				 (not (stringp (caddr bit))))
-			    (caddr bit)
-			  (cddr bit))))))))
-    found))
-
-(defun w3m-rss-get-namespace-prefix (el uri)
-  "Given EL (containing a parsed element) and URI (containing a string
-that gives the URI for which you want to retrieve the namespace
-prefix), return the prefix.
-See http://feeds.archive.org/validator/docs/howto/declare_namespaces.html
-for more RSS namespaces."
-  (let* ((prefix (car (rassoc uri (cadar el))))
-	 (nslist (when prefix
-		   (split-string (symbol-name prefix) ":")))
-	 (ns (cond ((eq (length nslist) 1) ; no prefix given
-		    "")
-		   ((eq (length nslist) 2) ; extract prefix
-		    (cadr nslist)))))
-    (if (and ns (not (equal ns "")))
-	(concat ns ":")
-      ns)))
-
-(provide 'w3m-rss)
-
-;;; w3m-rss.el ends here

=== removed file 'share/emacs/site-lisp/w3m/w3m-search.el'
--- share/emacs/site-lisp/w3m/w3m-search.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-search.el	1970-01-01 00:00:00 +0000
@@ -1,365 +0,0 @@
-;;; w3m-search.el --- functions convenient to access web search engines
-
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Authors: Keisuke Nishida    <kxn30@po.cwru.edu>,
-;;          Shun-ichi GOTO     <gotoh@taiyo.co.jp>,
-;;          TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
-;;          Romain FRANCOISE   <romain@orebokech.com>
-;; Keywords: w3m, WWW, hypermedia
-
-;; This file is a part of emacs-w3m.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; This module contains the `w3m-search' command and some utilities
-;; to improve your cyberlife.  For more detail about emacs-w3m, see:
-;;
-;;    http://emacs-w3m.namazu.org/
-
-;;; Code:
-
-(eval-when-compile
-  (require 'cl))
-
-(require 'w3m)
-
-(defcustom w3m-search-engine-alist
-  (let* ((ja (equal "Japanese" w3m-language))
-	 (utf-8 (or (and (boundp 'mule-version)
-			 (not (string< (symbol-value 'mule-version) "6.0")))
-		    (featurep 'un-define)
-		    (fboundp 'utf-translate-cjk-mode)
-		    (and (not ja) (w3m-find-coding-system 'utf-8)))))
-    `(,@(if ja
-	    '(("yahoo"
-	       "http://search.yahoo.co.jp/bin/search?p=%s"
-	       euc-japan)
-	      ("yahoo-en"
-	       "http://search.yahoo.com/bin/search?p=%s"))
-	  '(("yahoo"
-	     "http://search.yahoo.com/bin/search?p=%s")
-	    ("yahoo-ja"
-	     "http://search.yahoo.co.jp/bin/search?p=%s"
-	     euc-japan)))
-      ("alc" "http://eow.alc.co.jp/%s/UTF-8/" utf-8)
-      ,@(cond
-	 ((and ja utf-8)
-	  '(("blog"
-	     "http://blogsearch.google.com/blogsearch?q=%s&hl=ja&lr=lang_ja&oe=utf-8&ie=utf-8"
-	     utf-8)
-	    ("blog-en"
-	     "http://blogsearch.google.com/blogsearch?q=%s&hl=en&oe=utf-8&ie=utf-8"
-	     utf-8)))
-	 (ja
-	  '(("blog"
-	     "http://blogsearch.google.com/blogsearch?q=%s&hl=ja&lr=lang_ja&ie=Shift_JIS&oe=Shift_JIS"
-	     shift_jis)
-	    ("blog-en"
-	     "http://blogsearch.google.com/blogsearch?q=%s&hl=en")))
-	 (utf-8
-	  '(("blog"
-	     "http://blogsearch.google.com/blogsearch?q=%s&oe=utf-8&ie=utf-8"
-	     utf-8)
-	    ("blog-en"
-	     "http://blogsearch.google.com/blogsearch?q=%s&hl=en&oe=utf-8&ie=utf-8"
-	     utf-8)))
-	 (t
-	  '(("blog"
-	     "http://blogsearch.google.com/blogsearch?q=%s")
-	    ("blog-ja"
-	     "http://blogsearch.google.com/blogsearch?q=%s&lr=lang_ja&ie=Shift_JIS&oe=Shift_JIS"
-	     shift_jis))))
-      ,@(cond
-	 ((and ja utf-8)
-	  '(("google"
-	     "http://www.google.com/search?q=%s&hl=ja&lr=lang_ja&ie=utf-8&oe=utf-8"
-	     utf-8)
-	    ("google-en"
-	     "http://www.google.com/search?q=%s&hl=en&ie=utf-8&oe=utf-8"
-	     utf-8)))
-	 (ja
-	  '(("google"
-	     "http://www.google.com/search?q=%s&hl=ja&lr=lang_ja&ie=Shift_JIS&oe=Shift_JIS"
-	     shift_jis)
-	    ("google-en"
-	     "http://www.google.com/search?q=%s&hl=en")))
-	 (utf-8
-	  '(("google"
-	     "http://www.google.com/search?q=%s&ie=utf-8&oe=utf-8"
-	     utf-8)
-	    ("google-en"
-	     "http://www.google.com/search?q=%s&hl=en&ie=utf-8&oe=utf-8"
-	     utf-8)))
-	 (t
-	  '(("google"
-	     "http://www.google.com/search?q=%s")
-	    ("google-ja"
-	     "http://www.google.com/search?q=%s&hl=ja&lr=lang_ja&ie=Shift_JIS&oe=Shift_JIS"
-	     shift_jis))))
-      ,@(cond
-	 ((and ja utf-8)
-	  '(("google news"
-	     "http://news.google.co.jp/news?hl=ja&ie=utf-8&q=%s&oe=utf-8"
-	     utf-8)
-	    ("google news-en"
-	     "http://news.google.com/news?hl=en&q=%s")))
-	 (ja
-	  '(("google news"
-	     "http://news.google.co.jp/news?hl=ja&ie=Shift_JIS&q=%s&oe=Shift_JIS"
-	     shift_jis)
-	    ("google news-en"
-	     "http://news.google.com/news?hl=en&q=%s")))
-	 (utf-8
-	  '(("google news"
-	     "http://news.google.com/news?ie=utf-8&q=%s&oe=utf-8"
-	     utf-8)
-	    ("google news-en"
-	     "http://news.google.com/news?hl=en&ie=utf-8&q=%s&oe=utf-8")))
-	 (t
-	  '(("google news"
-	     "http://news.google.com/news?q=%s")
-	    ("google news-ja"
-	     "http://news.google.co.jp/news?hl=ja&ie=Shift_JIS&q=%s&oe=Shift_JIS"
-	     shift_jis))))
-      ("google groups"
-       "http://groups.google.com/groups?q=%s")
-      ,@(if ja
-	    '(("All the Web"
-	       "http://www.alltheweb.com/search?web&_sb_lang=ja&cs=euc-jp\
-&q=%s"
-	       euc-japan)
-	      ("All the Web-en"
-	       "http://www.alltheweb.com/search?web&_sb_lang=en&q=%s"))
-	  '(("All the Web"
-	     "http://www.alltheweb.com/search?web&_sb_lang=en&q=%s")
-	    ("All the Web-ja"
-	     "http://www.alltheweb.com/search?web&_sb_lang=ja&cs=euc-jp&q=%s"
-	     euc-japan)))
-      ,@(if ja
-	    '(("technorati"
-	       "http://www.technorati.jp/search/search.html?query=%s&language=ja"
-	       utf-8)
-	      ("technorati-en"
-	       "http://www.technorati.com/search/%s"
-	       utf-8))
-	  '(("technorati"
-	     "http://www.technorati.com/search/%s"
-	     utf-8)
-	    ("technorati-ja"
-	     "http://www.technorati.jp/search/search.html?query=%s&language=ja"
-	     utf-8)))
-      ("technorati-tag"
-       "http://www.technorati.com/tag/%s"
-       utf-8)
-      ("goo-ja"
-       "http://search.goo.ne.jp/web.jsp?MT=%s"
-       euc-japan)
-      ("excite-ja"
-       "http://www.excite.co.jp/search.gw?target=combined&look=excite_jp\
-&lang=jp&tsug=-1&csug=-1&search=%s"
-       shift_jis)
-      ("altavista"
-       "http://altavista.com/sites/search/web?q=\"%s\"&kl=ja&search=Search")
-      ("rpmfind"
-       "http://rpmfind.net/linux/rpm2html/search.php?query=%s"
-       nil)
-      ("debian-pkg"
-       "http://packages.debian.org/cgi-bin/search_contents.pl\
-?directories=yes&arch=i386&version=unstable&case=insensitive&word=%s")
-      ("debian-bts"
-       "http://bugs.debian.org/cgi-bin/pkgreport.cgi?archive=yes&pkg=%s")
-      ("freebsd-users-jp"
-       "http://home.jp.FreeBSD.org/cgi-bin/namazu.cgi?key=\"%s\"&whence=0\
-&max=50&format=long&sort=score&dbname=FreeBSD-users-jp"
-       euc-japan)
-      ("iij-archie"
-       "http://www.iij.ad.jp/cgi-bin/archieplexform?query=%s\
-&type=Case+Insensitive+Substring+Match&order=host&server=archie1.iij.ad.jp\
-&hits=95&nice=Nice")
-      ("waei"
-       "http://dictionary.goo.ne.jp/search.php?MT=%s&kind=je"
-       euc-japan)
-      ("eiwa"
-       "http://dictionary.goo.ne.jp/search.php?MT=%s&kind=ej")
-      ("kokugo"
-       "http://dictionary.goo.ne.jp/search.php?MT=%s&kind=jn"
-       euc-japan)
-      ("eiei"
-       "http://www.dictionary.com/cgi-bin/dict.pl?term=%s&r=67")
-      ,@(if ja
-	    '(("amazon"
-	       "http://www.amazon.co.jp/gp/search?\
-__mk_ja_JP=%%83J%%83%%5E%%83J%%83i&url=search-alias%%3Daps&field-keywords=%s"
-	       shift_jis)
-	      ("amazon-en"
-	       "http://www.amazon.com/exec/obidos/search-handle-form/\
-250-7496892-7797857"
-	       iso-8859-1
-	       "url=index=blended&field-keywords=%s"))
-	  '(("amazon"
-	     "http://www.amazon.com/exec/obidos/search-handle-form/\
-250-7496892-7797857"
-	     iso-8859-1
-	     "url=index=blended&field-keywords=%s")
-	    ("amazon-ja"
-	       "http://www.amazon.co.jp/gp/search?\
-__mk_ja_JP=%%83J%%83%%5E%%83J%%83i&url=search-alias%%3Daps&field-keywords=%s"
-	       shift_jis)))
-      ("emacswiki" "http://www.emacswiki.org/cgi-bin/wiki?search=%s")
-      ("en.wikipedia" "http://en.wikipedia.org/wiki/Special:Search?search=%s")
-      ("de.wikipedia" "http://de.wikipedia.org/wiki/Spezial:Search?search=%s"
-       utf-8)
-      ("ja.wikipedia" "http://ja.wikipedia.org/wiki/Special:Search?search=%s"
-       utf-8)
-      ("msdn" "http://search.msdn.microsoft.com/search/default.aspx?query=%s")
-      ("freshmeat" "http://freshmeat.net/search/?q=%s&section=projects")))
-  "*An alist of search engines.
-Each element looks like (ENGINE ACTION CODING POST-DATA)
-ENGINE is a string, the name of the search engine.
-ACTION is a string, the URL that performs a search.
-ACTION must contain a \"%s\", which is substituted by a query string.
-CODING is optional value which is coding system for query string.
-POST-DATA is optional value which is a string for POST method search engine.
-If CODING is omitted, it defaults to `w3m-default-coding-system'."
-  :group 'w3m
-  :type `(repeat
-	  (group :indent 2
-		 (string :format "Engine: %v\n" :size 0)
-		 (string :format "       Action: %v\n" :size 0)
-		 (coding-system :format "%t: %v\n" :size 0)
-		 (checklist :inline t
-			    :entry-format ,(if (w3m-device-on-window-system-p)
-					       "%b   %v"
-					     "%b  %v")
-			    (string :format "PostData: %v\n" :size 0)))))
-
-(defcustom w3m-search-default-engine "google"
-  "*Name of the default search engine.
-See also `w3m-search-engine-alist'."
-  :group 'w3m
-  :type '(string :size 0))
-
-(defcustom w3m-search-word-at-point t
-  "*Non-nil means that the word at point is used as an initial string.
-If Transient Mark mode, this option is ignored and the region is used
-as an initial string."
-  :group 'w3m
-  :type 'boolean)
-
-(defvar w3m-search-engine-history nil
-  "History variable used by `w3m-search' for prompting a search engine.")
-
-(defvar w3m-search-thing-at-point-arg 'word
-  "Argument for `thing-at-point' used in `w3m-search-read-query'")
-
-(defun w3m-search-escape-query-string (str &optional coding)
-  (mapconcat
-   (lambda (s)
-     (w3m-url-encode-string s (or coding w3m-default-coding-system)))
-   (split-string str)
-   "+"))
-
-(defun w3m-search-read-query (prompt prompt-with-default &optional history)
-  "Read a query from the minibuffer, prompting with string PROMPT.
-When a default value for the query is discovered, prompt with string
-PROMPT-WITH-DEFAULT instead of string PROMPT."
-  (let ((default
-	  (if (w3m-region-active-p)
-	      (buffer-substring (region-beginning) (region-end))
-	    (unless (and (eq major-mode 'w3m-mode)
-			 (listp (get-text-property (point-at-bol) 'face))
-			 (memq 'w3m-header-line-location-title
-			       (get-text-property (point-at-bol) 'face)))
-	      (thing-at-point w3m-search-thing-at-point-arg))))
-	initial)
-    (when default
-      (set-text-properties 0 (length default) nil default)
-      (when (or w3m-search-word-at-point (w3m-region-active-p))
-	(setq initial default
-	      default nil))
-      (when (w3m-region-active-p)
-	(w3m-deactivate-region)))
-    (read-string (if default
-		     (format prompt-with-default default)
-		   prompt)
-		 initial history default)))
-
-(defun w3m-search-read-variables ()
-  "Ask for a search engine and words to query and return them as a list."
-  (let* ((search-engine
-	  (if current-prefix-arg
-	      (let ((default (or (car w3m-search-engine-history)
-				 w3m-search-default-engine))
-		    (completion-ignore-case t))
-		(completing-read (format "Which engine? (default %s): "
-					 default)
-				 w3m-search-engine-alist nil t nil
-				 'w3m-search-engine-history default))
-	    w3m-search-default-engine))
-	 (query
-	  (w3m-search-read-query
-	   (format "%s search: " search-engine)
-	   (format "%s search (default %%s): " search-engine))))
-    (list search-engine query)))
-
-(defun w3m-search-do-search (w3m-goto-function search-engine query)
-  "Call W3M-GOTO-FUNCTION with the URL for the search."
-  (unless (string= query "")
-    (let ((info (assoc search-engine w3m-search-engine-alist)))
-      (if info
-	  (let ((query-string (w3m-search-escape-query-string query
-							      (caddr info)))
-		(post-data (cadddr info)))
-	    (funcall w3m-goto-function
-		     (format (cadr info) query-string)
-		     post-data
-		     nil
-		     (and post-data (format post-data query-string))))
-	(error "Unknown search engine: %s" search-engine)))))
-
-;;;###autoload
-(defun w3m-search (search-engine query)
-  "Search QUERY using SEARCH-ENGINE.
-When called interactively with a prefix argument, you can choose one of
-the search engines defined in `w3m-search-engine-alist'.  Otherwise use
-`w3m-search-default-engine'.
-If Transient Mark mode, use the region as an initial string of query
-and deactivate the mark."
-  (interactive (w3m-search-read-variables))
-  (w3m-search-do-search 'w3m-goto-url search-engine query))
-
-;;;###autoload
-(defun w3m-search-new-session (search-engine query)
-  "Like `w3m-search', but do the search in a new session."
-  (interactive (w3m-search-read-variables))
-  (w3m-search-do-search 'w3m-goto-url-new-session search-engine query))
-
-;;;###autoload
-(defun w3m-search-uri-replace (uri engine)
-  "Generate query string for ENGINE from URI matched by last search."
-  (let ((query (substring uri (match-end 0)))
-	(info (assoc engine w3m-search-engine-alist)))
-    (when info
-      (format (cadr info)
-	      (w3m-search-escape-query-string query (caddr info))))))
-
-(provide 'w3m-search)
-
-;;; w3m-search.el ends here

=== removed file 'share/emacs/site-lisp/w3m/w3m-session.el'
--- share/emacs/site-lisp/w3m/w3m-session.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-session.el	1970-01-01 00:00:00 +0000
@@ -1,909 +0,0 @@
-;;; w3m-session.el --- Functions to operate session of w3m -*- coding: iso-2022-7bit; -*-
-
-;; Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Author: Hideyuki SHIRAI <shirai@meadowy.org>
-;; Keywords: w3m, WWW, hypermedia
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; w3m-session.el is the add-on program of emacs-w3m to save and load
-;; sessions.   For more detail about emacs-w3m, see:
-;;
-;;    http://emacs-w3m.namazu.org/
-
-
-;;; Code:
-(eval-when-compile (require 'cl))
-(require 'w3m-util)
-
-(eval-when-compile
-  (defvar w3m-async-exec)
-  (defvar w3m-async-exec-with-many-urls)
-  (defvar w3m-current-title)
-  (defvar w3m-current-url)
-  (defvar w3m-history)
-  (defvar w3m-history-flat)
-  (defvar w3m-language)
-  (defvar w3m-mode-map)
-  (defvar w3m-profile-directory)
-  (autoload 'w3m-goto-url-new-session "w3m")
-  (autoload 'w3m-history-tree "w3m-hist")
-  (autoload 'w3m-load-list "w3m")
-  (autoload 'w3m-save-list "w3m"))
-
-(defcustom w3m-session-file
-  (expand-file-name ".sessions" w3m-profile-directory)
-  "*File name to keep sessions."
-  :group 'w3m
-  :type '(file :size 0))
-
-(defcustom w3m-session-autosave t
-  "*Non-nil means save automatically when w3m quit."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-session-deleted-save t
-  "*Non-nil means save deleted sessions."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-session-crash-recovery t
-  "*Non-nil means emacs-w3m save session set automatically, and recover it when emacs-w3m crash."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-session-time-format
-  (if (and (equal "Japanese" w3m-language)
-	   (not (featurep 'xemacs)))
-      "%Y$BG/(B%m$B7n(B%d$BF|(B(%a) %H:%M"
-    "%Y-%m-%d (%a) %H:%M")
-  "*Format of saved time."
-  :group 'w3m
-  :type '(string :size 0))
-
-(defcustom w3m-session-automatic-title
-  (if (equal "Japanese" w3m-language)
-      "$B<+F0J]B8(B"
-    "Automatic saved sessions")
-  "*String of title to save session automatically."
-  :group 'w3m
-  :type '(string :size 0))
-
-(defcustom w3m-session-deleted-title
-  (if (equal "Japanese" w3m-language)
-      "$B:o=|%;%C%7%g%s(B"
-    "Removed sessions")
-  "*String of title to save session when buffer delete."
-  :group 'w3m
-  :type '(string :size 0))
-
-(defcustom w3m-session-crash-recovery-title
-  (if (equal "Japanese" w3m-language)
-      "$B%/%i%C%7%e2sI|(B"
-    "Crash recovery sessions")
-  "*String of title to save session to use for crash recovering."
-  :group 'w3m
-  :type '(string :size 0))
-
-(defcustom w3m-session-deleted-keep-number 5
-  "*Number to keep sessions when buffers delete."
-  :group 'w3m
-  :type '(integer :size 0))
-
-(defcustom w3m-session-automatic-keep-number 5
-  "*Number to keep sessions automatically."
-  :group 'w3m
-  :type '(integer :size 0))
-
-(defcustom w3m-session-unknown-title "<Unknown Title>"
-  "*String of title to use when title is not specified."
-  :group 'w3m
-  :type '(string :size 0))
-
-(defcustom w3m-session-load-last-sessions nil
-  "*Whether to load the last sessions when emacs-w3m starts."
-  :group 'w3m
-  :type '(radio (const :format "Load the last sessions automatically." t)
-		(const :format "Ask whether to load the last sessions." ask)
-		(const :format "Never load the last sessions automatically." nil)))
-
-(defcustom w3m-session-load-crashed-sessions 'ask
-  "*Whether to load the crashed sessions when emacs-w3m starts."
-  :group 'w3m
-  :type '(radio (const :format "Load the crashed sessions automatically." t)
-		(const :format "Ask whether to load the crashed sessions." ask)
-		(const :format "Never load the crashed sessions automatically." nil)))
-
-(defface w3m-session-select
-  `((((class color) (background light) (type tty))
-     (:foreground "black"))
-    (((class color) (background dark) (type tty))
-     (:foreground "cyan"))
-    (((class color) (background light))
-     (:foreground "dark blue"))
-    (((class color) (background dark))
-     (:foreground "white"))
-    (t nil))
-  "Face of w3m-session."
-  :group 'w3m)
-;; backward-compatibility alias
-(put 'w3m-session-select-face 'face-alias 'w3m-session-select)
-
-(defface w3m-session-selected
-  `((((class color) (background light) (type tty))
-     (:foreground "blue" :bold t :underline t))
-    (((class color) (background dark) (type tty))
-     (:foreground "cyan" :bold t :underline t))
-    (((class color) (background light))
-     (:foreground "dark blue" :bold t :underline t))
-    (((class color) (background dark))
-     (:foreground "white" :bold t :underline t))
-    (t (:bold t :underline t)))
-  "Face of selected w3m-session."
-  :group 'w3m)
-;; backward-compatibility alias
-(put 'w3m-session-selected-face 'face-alias 'w3m-session-selected)
-
-(defun w3m-session-history-to-save ()
-  "Return a copy of `w3m-history-flat' without current page data."
-  (let ((pos (cadar w3m-history)))
-    (apply
-     'append
-     (mapcar (lambda (x)
-	       (unless (equal (nth 2 x) pos)
-		 (list x)))
-	     (copy-sequence (w3m-history-slimmed-history-flat))))))
-
-;; format of sessin file.
-;; '((sessiontitle1 time1 ((url11 pos11 hflat11 urltitle11)
-;;                         (url12 pos12 hflat12 urltitle12) ...) current1)
-;;   ...
-
-(defmacro w3m-session-ignore-errors (&rest forms)
-  "Run FORMS.  Remove `w3m-session-file' and quit if any error happens."
-  `(condition-case err
-       (progn ,@forms)
-     (error
-      (if (and (file-exists-p w3m-session-file)
-	       (yes-or-no-p (format
-			     "\
-Sorry, an error found in \"%s\"; may we remove it? "
-			     ,(if (featurep 'xemacs)
-				  '(abbreviate-file-name w3m-session-file t)
-				'(abbreviate-file-name w3m-session-file)))))
-	  (progn
-	    (delete-file w3m-session-file)
-	    (run-at-time 0.1 nil #'message
-			 "\"%s\" has been removed; try again"
-			 (abbreviate-file-name w3m-session-file))
-	    (keyboard-quit))
-	(signal (car err) (cdr err))))))
-
-;;;###autoload
-(defun w3m-session-save ()
-  "Save list of displayed session."
-  (interactive)
-  (w3m-session-ignore-errors
-   (let ((sessions (w3m-load-list w3m-session-file))
-	 (bufs (w3m-list-buffers))
-	 (prompt "New session title: ")
-	 (cnum 0)
-	 (i 0)
-	 title titles urls len buf cbuf)
-     (mapc (lambda (x)
-	     (setq titles (cons (cons (car x) (car x)) titles)))
-	   sessions)
-     (setq title (or w3m-current-title
-		     (with-current-buffer (car bufs)
-		       w3m-current-title)))
-     (setq titles (cons (cons title title) titles))
-     (catch 'loop
-       (while t
-	 (setq title (completing-read prompt titles nil nil title))
-	 (if (or (string= title "")
-		 (and (assoc title sessions)
-		      (not (y-or-n-p (format "\"%s\" is exist. Overwrite? "
-					     title)))))
-	     (setq prompt "Again New session title: ")
-	   (throw 'loop t))))
-     (setq cbuf (current-buffer))
-     (save-current-buffer
-       (while (setq buf (car bufs))
-	 (setq bufs (cdr bufs))
-	 (set-buffer buf)
-	 (when w3m-current-url
-	   (when (eq cbuf (current-buffer))
-	     (setq cnum i))
-	   (setq i (1+ i))
-	   (setq urls (cons (list w3m-current-url
-				  (copy-sequence (caar w3m-history))
-				  (w3m-session-history-to-save)
-				  w3m-current-title)
-			    urls)))))
-     (if (not urls)
-	 (message "%s: no session save...done" title)
-       (setq len (length urls))
-       (setq urls (nreverse urls))
-       (when (assoc title sessions)
-	 (setq sessions (delete (assoc title sessions) sessions)))
-       (setq sessions (cons (list title (current-time) urls cnum) sessions))
-       (w3m-save-list w3m-session-file sessions)
-       (if (= len 1)
-	   (message "%s: 1 session save...done" title)
-	 (message "%s: %d sessions save...done" title len))))))
-
-(defun w3m-session-automatic-save ()
-  "Save list of displayed session automatically."
-  (when w3m-session-autosave
-    (w3m-session-ignore-errors
-     (let ((sessions (w3m-load-list w3m-session-file))
-	   (bufs (w3m-list-buffers))
-	   (title (concat w3m-session-automatic-title "-1"))
-	   (titleregex (concat "^"
-			       (regexp-quote w3m-session-automatic-title)
-			       "-[0-9]+$"))
-	   (cnum 0)
-	   (i 0)
-	   urls buf cbuf session
-	   tmp tmptitle tmptime tmpurls)
-       (when bufs
-	 (setq cbuf (current-buffer))
-	 (save-current-buffer
-	   (while (setq buf (car bufs))
-	     (setq bufs (cdr bufs))
-	     (set-buffer buf)
-	     (when w3m-current-url
-	       (when (eq cbuf (current-buffer))
-		 (setq cnum i))
-	       (setq i (1+ i))
-	       (setq urls (cons (list w3m-current-url
-				      (copy-sequence (caar w3m-history))
-				      (w3m-session-history-to-save)
-				      w3m-current-title)
-				urls)))))
-	 (when urls
-	   (setq i 2)
-	   (while (setq session (car sessions))
-	     (setq sessions (cdr sessions))
-	     (if (string-match titleregex (nth 0 session))
-		 (when (<= i w3m-session-automatic-keep-number)
-		   (setq tmptitle (format (concat w3m-session-automatic-title
-						  "-%d") i))
-		   (setq tmptime (nth 1 session))
-		   (setq tmpurls (nth 2 session))
-		   (setq tmp (cons (list tmptitle tmptime tmpurls nil) tmp))
-		   (setq i (1+ i)))
-	       (setq tmp (cons session tmp))))
-	   (setq sessions (nreverse tmp))
-	   (setq urls (nreverse urls))
-	   (setq sessions (cons (list title (current-time) urls cnum)
-				sessions))
-	   (w3m-save-list w3m-session-file sessions)))))))
-
-(defun w3m-session-deleted-save (buffers)
-  "Save list of deleted session."
-  (when w3m-session-deleted-save
-    (w3m-session-ignore-errors
-     (let ((sessions (w3m-load-list w3m-session-file))
-	   (title (concat w3m-session-deleted-title "-1"))
-	   (titleregex (concat "^"
-			       (regexp-quote w3m-session-deleted-title)
-			       "-[0-9]+$"))
-	   (bufs (copy-sequence buffers))
-	   (i 2)
-	   urls buf session
-	   tmp tmptitle tmptime tmpurls)
-       (when bufs
-	 (setq bufs (sort bufs 'w3m-buffer-name-lessp))
-	 (save-current-buffer
-	   (while (setq buf (car bufs))
-	     (setq bufs (cdr bufs))
-	     (set-buffer buf)
-	     (when w3m-current-url
-	       (setq urls (cons (list w3m-current-url
-				      (copy-sequence (caar w3m-history))
-				      (w3m-session-history-to-save)
-				      w3m-current-title)
-				urls)))))
-	 (when urls
-	   (while (setq session (car sessions))
-	     (setq sessions (cdr sessions))
-	     (if (string-match titleregex (nth 0 session))
-		 (when (<= i w3m-session-deleted-keep-number)
-		   (setq tmptitle (format (concat w3m-session-deleted-title
-						  "-%d") i))
-		   (setq tmptime (nth 1 session))
-		   (setq tmpurls (nth 2 session))
-		   (setq tmp (cons (list tmptitle tmptime tmpurls nil) tmp))
-		   (setq i (1+ i)))
-	       (setq tmp (cons session tmp))))
-	   (setq sessions (nreverse tmp))
-	   (setq urls (nreverse urls))
-	   (setq sessions (cons (list title (current-time) urls nil) sessions))
-	   (w3m-save-list w3m-session-file sessions)))))))
-
-(defun w3m-session-crash-recovery-save ()
-  "Save list of displayed session."
-  (when w3m-session-crash-recovery
-    (w3m-session-ignore-errors
-     (let ((sessions (w3m-load-list w3m-session-file))
-	   (bufs (w3m-list-buffers))
-	   (title w3m-session-crash-recovery-title)
-	   urls buf tmp)
-       (when bufs
-	 (save-current-buffer
-	   (while (setq buf (car bufs))
-	     (setq bufs (cdr bufs))
-	     (set-buffer buf)
-	     (when w3m-current-url
-	       (setq urls (cons (list w3m-current-url
-				      (copy-sequence (caar w3m-history))
-				      (w3m-session-history-to-save)
-				      w3m-current-title)
-				urls)))))
-	 (when urls
-	   (setq urls (nreverse urls))
-	   (setq tmp (assoc title sessions))
-	   (when tmp (setq sessions (delete tmp sessions)))
-	   (setq sessions (cons (list title (current-time) urls nil) sessions))
-	   (w3m-save-list w3m-session-file sessions)))))))
-
-(defun w3m-session-crash-recovery-remove ()
-  "Remove crash recovery session set."
-  (when w3m-session-crash-recovery
-    (w3m-session-ignore-errors
-     (let* ((sessions (w3m-load-list w3m-session-file))
-	    (item (assoc w3m-session-crash-recovery-title sessions)))
-       (when item
-	 (setq sessions (delete item sessions))
-	 (w3m-save-list w3m-session-file sessions))))))
-
-(defvar w3m-session-select-mode-map nil)
-(unless w3m-session-select-mode-map
-  (let ((map (make-keymap)))
-    (suppress-keymap map)
-    (define-key map "q" 'w3m-session-select-quit)
-    (define-key map "Q" 'w3m-session-select-quit)
-    (define-key map "\C-g" 'w3m-session-select-quit)
-    (define-key map "\C-m" 'w3m-session-select-select)
-    (define-key map "\M-s" 'w3m-session-select-open-session-group)
-    (define-key map "d" 'w3m-session-select-delete)
-    (define-key map "D" 'w3m-session-select-delete)
-    (define-key map "s" 'w3m-session-select-save)
-    (define-key map "S" 'w3m-session-select-save)
-    (define-key map "r" 'w3m-session-select-rename)
-    (define-key map "R" 'w3m-session-select-rename)
-    (define-key map "n" 'w3m-session-select-next)
-    (define-key map "j" 'w3m-session-select-next)
-    (define-key map "\C-n" 'w3m-session-select-next)
-    (define-key map [down] 'w3m-session-select-next)
-    (define-key map "p" 'w3m-session-select-previous)
-    (define-key map "k" 'w3m-session-select-previous)
-    (define-key map "\C-p" 'w3m-session-select-previous)
-    (define-key map [up] 'w3m-session-select-previous)
-    (setq w3m-session-select-mode-map map)))
-
-;;; Local variables
-(defvar w3m-session-select-wincfg nil)
-(defvar w3m-session-select-sessions nil)
-(make-variable-buffer-local 'w3m-session-select-wincfg)
-(make-variable-buffer-local 'w3m-session-select-sessions)
-
-(defun w3m-session-select-mode (&optional sessions)
-  "Major mode for selecting emacs-w3m session.
-
-\\<w3m-session-select-mode-map>
-\\[w3m-session-select-select]	Select the session.
-\\[w3m-session-select-open-session-group]	Open the session group.
-\\[w3m-session-select-delete]	Delete the session.
-\\[w3m-session-select-rename]	Rename the session.
-\\[w3m-session-select-save]	Save the session.
-\\[w3m-session-select-next]	Move the point to the next session.
-\\[w3m-session-select-previous]	Move the point to the previous session.
-\\[w3m-session-select-quit]	Exit selecting session.
-"
-  (w3m-session-ignore-errors
-   (let ((sessions (or sessions
-		       (w3m-load-list w3m-session-file))))
-     (buffer-disable-undo)
-     (setq mode-name "w3m session"
-	   truncate-lines t
-	   buffer-read-only nil
-	   major-mode 'w3m-session-select-mode
-	   w3m-session-select-sessions sessions
-	   buffer-read-only t)
-     (use-local-map w3m-session-select-mode-map)
-     (w3m-session-select-list-all-sessions))))
-
-(defun w3m-session-select-list-all-sessions ()
-  "List up all saved sessions."
-  (let ((sessions w3m-session-select-sessions)
-	(num 0)
-	(max 0)
-	(inhibit-read-only t)
-	title titles time times url urls wid pos)
-    (if (not sessions)
-	(progn
-	  (message "No saved session")
-	  (w3m-session-select-quit))
-      (mapc (lambda (x)
-	      (setq title (format "%s[%d]" (nth 0 x) (length (nth 2 x))))
-	      (setq wid (string-width title))
-	      (when (> wid max)
-		(setq max wid))
-	      (setq titles (cons title titles))
-	      (setq times (cons (format-time-string w3m-session-time-format
-						    (nth 1 x))
-				times))
-	      (setq urls (cons (mapconcat (lambda (url)
-					    (if (stringp url)
-						url
-					      (car url)))
-					  (nth 2 x) ", ")
-			       urls)))
-	    sessions)
-      (setq titles (nreverse titles))
-      (setq times (nreverse times))
-      (setq urls (nreverse urls))
-      (setq max (+ max 2))
-      (erase-buffer)
-      (insert "Select session:\n\n")
-      (while (and (setq title (car titles))
-		  (setq time (car times))
-		  (setq url (car urls)))
-	(setq titles (cdr titles))
-	(setq times (cdr times))
-	(setq urls (cdr urls))
-	(setq pos (point))
-	(insert title)
-	(add-text-properties pos (point)
-			     `(face w3m-session-select
-				    w3m-session-number ,num))
-	(setq num (1+ num))
-	(insert (make-string (- max (string-width title)) ?\ ))
-	(insert time "  " url "\n"))
-      (goto-char (point-min))
-      (goto-char (next-single-property-change
-		  (point) 'w3m-session-number))
-      (put-text-property (point)
-			 (next-single-property-change
-			  (point) 'w3m-session-number)
-			 'face 'w3m-session-selected)
-      (set-buffer-modified-p nil)
-      (setq buffer-read-only t))))
-
-(defun w3m-session-select-list-session-group (arg)
-  (let ((session (nth 2 (nth arg w3m-session-select-sessions)))
-	(num 0)
-	(max 0)
-	(inhibit-read-only t)
-	title url wid
-	titles urls pos)
-    (when session
-      (mapc (lambda (x)
-	      (setq title (format "%s" (or (nth 3 x) w3m-session-unknown-title)))
-	      (setq wid (string-width title))
-	      (when (> wid max)
-		(setq max wid))
-	      (setq titles (cons title titles))
-	      (setq urls (cons (nth 0 x)
-			       urls)))
-	    session)
-      (setq titles (nreverse titles))
-      (setq urls (nreverse urls))
-      (setq max (+ max 2))
-      (erase-buffer)
-      (insert "Select session:\n\n")
-      (setq pos (point))
-      (insert "Open all sessions")
-      (add-text-properties pos (point)
-			   `(face w3m-session-selected
-				  w3m-session-number ,arg))
-      (insert "\n")
-      (while (and (setq title (car titles))
-		  (setq url (car urls)))
-	(setq titles (cdr titles))
-	(setq urls (cdr urls))
-	(setq pos (point))
-	(insert title)
-	(add-text-properties pos (point)
-			     `(face w3m-session-select
-				    w3m-session-number ,(cons arg num)))
-	(setq num (1+ num))
-	(insert (make-string (- max (string-width title)) ?\ ))
-	(insert url "\n"))
-      (goto-char (point-min))
-      (goto-char (next-single-property-change
-		  (point) 'w3m-session-number)))
-    (set-buffer-modified-p nil)
-    (setq buffer-read-only t)))
-
-(defun w3m-session-select-next (&optional arg)
-  "Move the point to the next session."
-  (interactive "p")
-  (unless arg (setq arg 1))
-  (let ((positive (< 0 arg))
-	(inhibit-read-only t))
-    (beginning-of-line)
-    (put-text-property (point)
-		       (next-single-property-change
-			(point) 'w3m-session-number)
-		       'face 'w3m-session-select)
-    (while (not (zerop arg))
-      (forward-line (if positive 1 -1))
-      (unless (get-text-property (point) 'w3m-session-number)
-	(if positive
-	    (goto-char (next-single-property-change
-			(point-min) 'w3m-session-number))
-	  (goto-char (previous-single-property-change
-		      (point-max) 'w3m-session-number))))
-      (setq arg (if positive
-		    (1- arg)
-		  (1+ arg))))
-    (beginning-of-line)
-    (put-text-property (point)
-		       (next-single-property-change
-			(point) 'w3m-session-number)
-		       'face 'w3m-session-selected)
-    (set-buffer-modified-p nil)))
-
-(defun w3m-session-select-previous (&optional arg)
-  "the point to the previous session."
-  (interactive "p")
-  (w3m-session-select-next (- arg)))
-
-(defun w3m-session-select-quit ()
-  "Exit from w3m session select mode."
-  (interactive)
-  (let ((buffer (current-buffer))
-	(wincfg w3m-session-select-wincfg))
-    (or (one-window-p) (delete-window))
-    (kill-buffer buffer)
-    (set-window-configuration wincfg)))
-
-(defun w3m-session-select-select ()
-  "Select the session."
-  (interactive)
-  (beginning-of-line)
-  (let* ((num (get-text-property
-	       (point) 'w3m-session-number))
-	 (item (if (consp num) 
-		   (nth (cdr num)
-			(caddr (nth (car num) 
-				    w3m-session-select-sessions)))
-		 (nth num w3m-session-select-sessions)))
-	 (session (if (consp num)
-		      (list (or (cadddr item) w3m-session-unknown-title)
-			    nil
-			    (list item) 
-			    nil)
-		    item)))
-    (w3m-session-select-quit)
-    (w3m-session-goto-session session)))
-
-(defun w3m-session-select-open-session-group ()
-  "Open the session group."
-  (interactive)
-  (beginning-of-line)
-  (let ((num (get-text-property
-	      (point) 'w3m-session-number))
-	wheight)
-    (if (consp num)
-	(message "There is no session group.")
-      (setq wheight 
-	    (max (+ (length (caddr (nth num w3m-session-select-sessions))) 6)
-		 window-min-height))
-      (condition-case nil
-	  (enlarge-window (- wheight (window-height)))
-	(error nil))
-      (w3m-session-select-list-session-group num))))
-
-(defun w3m-session-select-save ()
-  "Save the session."
-  (interactive)
-  (when (y-or-n-p "Save this sessions? ")
-    (w3m-session-select-quit)
-    (w3m-session-save)
-    (w3m-session-select)))
-
-(defun w3m-session-select-rename ()
-  "Rename this session."
-  (interactive)
-  (beginning-of-line)
-  (let ((num (get-text-property
-	      (point) 'w3m-session-number))
-	(sessions w3m-session-select-sessions))
-    (w3m-session-select-quit)
-    (w3m-session-rename sessions num)
-    (w3m-session-select)))
-
-(defun w3m-session-select-delete ()
-  "Delete the session."
-  (interactive)
-  (when (y-or-n-p "Delete this session? ")
-    (beginning-of-line)
-    (let ((num (get-text-property
-		(point) 'w3m-session-number))
-	  (sessions w3m-session-select-sessions))
-      (w3m-session-select-quit)
-      (w3m-session-delete sessions num)
-      (w3m-session-select))))
-
-;;;###autoload
-(defun w3m-session-select ()
-  "Select session from session list."
-  (interactive)
-  (w3m-session-ignore-errors
-   (let* ((sessions (w3m-load-list w3m-session-file))
-	  (showbuf (w3m-get-buffer-create " *w3m-session select*"))
-	  (wheight (max (+ (length sessions) 5) window-min-height))
-	  (wincfg (current-window-configuration))
-	  window last-window)
-     (setq last-window (previous-window
-			(w3m-static-if (fboundp 'frame-highest-window)
-			    (frame-highest-window)
-			  (frame-first-window))))
-     (while (minibuffer-window-active-p last-window)
-       (setq last-window (previous-window last-window)))
-     (while (and
-	     (not (one-window-p))
-	     (or (< (window-width last-window)
-		    (frame-width))
-		 (< (window-height last-window)
-		    (+ wheight window-min-height))))
-       (setq window last-window)
-       (setq last-window (previous-window window))
-       (delete-window window))
-     (select-window (split-window last-window))
-     (condition-case nil
-	 (shrink-window (- (window-height) wheight))
-       (error nil))
-     (switch-to-buffer showbuf)
-     (setq w3m-session-select-wincfg wincfg)
-     (w3m-session-select-mode sessions))))
-
-(defun w3m-session-goto-session (session)
-  "Goto URLs."
-  (let ((title (nth 0 session))
-	(urls (nth 2 session))
-	(cnum (nth 3 session))
-	(i 0)
-	(w3m-async-exec (and w3m-async-exec-with-many-urls w3m-async-exec))
-	url cbuf buf pos history)
-    (message "Session goto(%s)..." title)
-    (while (setq url (car urls))
-      (setq urls (cdr urls))
-      (unless (stringp url)
-	(setq pos     (nth 1 url)
-	      history (nth 2 url)
-	      url     (nth 0 url)))
-      (w3m-goto-url-new-session url)
-      (setq buf (car (nreverse (w3m-list-buffers))))
-      (when (or (and (numberp cnum) (= cnum i))
-		(and (not cnum) (= i 0)))
-	(setq cbuf buf))
-      (when (and buf pos history)
-	(set-buffer buf)
-	(setq w3m-history-flat history)
-	(w3m-history-tree pos))
-      (setq i (1+ i)))
-    (when (and cbuf (eq major-mode 'w3m-mode))
-      (set-window-buffer (selected-window) cbuf))
-    (message "Session goto(%s)...done" title)))
-
-(defun w3m-session-rename (sessions num)
-    (if (consp num)
-	(message "This command can execute in Main session area")
-      (let ((prompt "New session title: ")
-	    (overwrite nil)
-	    tmp title otitle)
-	(setq tmp (nth num sessions))
-	(setq otitle (car tmp))
-	(setq title otitle)
-	(catch 'loop
-	  (while t
-	    (setq title (read-from-minibuffer prompt otitle))
-	    (cond
-	     ((string= title "")
-	      nil)
-	     ((string= title otitle)
-	      (when (y-or-n-p
-		     (format "\"%s\" is same as original title. Do not rename? "
-			     title))
-		(throw 'loop t)))
-	     ((assoc title sessions)
-	      (when (y-or-n-p (format "\"%s\" is exist. Overwrite? " title))
-		(setq overwrite t)
-		(throw 'loop t))))
-	    (setq prompt "Again New session title: ")))
-	(when overwrite
-	  (setq sessions (delete (assoc title sessions) sessions)))
-	(unless (string= title otitle)
-	  (setq sessions (delete tmp sessions))
-	  (setcar tmp title)
-	  (setq sessions (cons tmp sessions))
-	  (w3m-save-list w3m-session-file sessions)))))
-
-(defun w3m-session-delete (sessions num)
-  (let (tmp)
-    (if (consp num)
-	(let ((item (nth 2 (nth (car num) sessions))))
-	  (setq tmp (delete (nth (cdr num) item)
-			    item))
-	  (setf (nth 2 (nth (car num) sessions))
-		tmp))
-      (setq tmp (nth num sessions))
-      (setq sessions (delete tmp sessions)))
-    (if sessions
-	(w3m-save-list w3m-session-file sessions)
-      (let ((file (expand-file-name w3m-session-file)))
-	(when (and (file-exists-p file)
-		   (file-writable-p file))
-	  (delete-file file))))))
-
-(defvar w3m-session-menu-items
-  `([,(w3m-make-menu-item "$B?7$7$$%;%C%7%g%s$r:n$k(B..."
-			  "Create New Session...")
-     w3m-goto-new-session-url t]
-    [,(w3m-make-menu-item "$B$3$N%;%C%7%g%s$rJ#@=$9$k(B" "Copy This Session")
-     w3m-copy-buffer w3m-current-url]
-    "----" ;; separator
-    [,(w3m-make-menu-item "$BA0$N%;%C%7%g%s$K0\F0$9$k(B"
-			  "Move Previous Session")
-     w3m-previous-buffer
-     (> (safe-length (w3m-list-buffers)) 1)]
-    [,(w3m-make-menu-item "$B<!$N%;%C%7%g%s$K0\F0$9$k(B" "Move Next Session")
-     w3m-next-buffer
-     (> (safe-length (w3m-list-buffers)) 1)]
-    "----" ;; separator
-    [,(w3m-make-menu-item "$B$3$N%;%C%7%g%s$rJD$8$k(B" "Close This Session")
-     w3m-delete-buffer
-     (> (safe-length (w3m-list-buffers)) 1)]
-    [,(w3m-make-menu-item "$BB>$N%;%C%7%g%s$rJD$8$k(B" "Close Other Sessions")
-     w3m-delete-other-buffers
-     (> (safe-length (w3m-list-buffers)) 1)]
-    [,(w3m-make-menu-item "$B8=:_$N%;%C%7%g%s$rJ]B8$9$k(B"
-			  "Save Displayed Sessions")
-     w3m-session-save t]
-    [,(w3m-make-menu-item "$B%;%C%7%g%s$rA*Br$9$k(B" "Select Sessions")
-     w3m-session-select t])
-    "*List of the session menu items.")
-
-;;;###autoload
-(defun w3m-setup-session-menu ()
-  "Setup w3m session items in menubar."
-  (w3m-static-if (featurep 'xemacs)
-      (unless (car (find-menu-item current-menubar '("Session")))
-	(easy-menu-define w3m-session-menu w3m-mode-map
-	  "" '("Session" ["(empty)" ignore nil]))
-	(easy-menu-add w3m-session-menu)
-	(add-hook 'activate-menubar-hook 'w3m-session-menubar-update))
-    (unless (lookup-key w3m-mode-map [menu-bar Session])
-      (easy-menu-define w3m-session-menu w3m-mode-map "" '("Session"))
-      (easy-menu-add w3m-session-menu)
-      (add-hook 'menu-bar-update-hook 'w3m-session-menubar-update))))
-
-(defvar w3m-session-menu-items-pre nil)
-(defvar w3m-session-menu-items-time nil)
-
-(defun w3m-session-menubar-update ()
-  "Update w3m session menubar."
-  (when (and (eq major-mode 'w3m-mode)
-	     (w3m-static-if (featurep 'xemacs)
-		 (frame-property (selected-frame) 'menubar-visible-p)
-	       menu-bar-mode))
-    (let ((items w3m-session-menu-items)
-	  (pages (w3m-session-make-menu-items)))
-      (easy-menu-define w3m-session-menu w3m-mode-map
-	"The menu kepmap for the emacs-w3m session."
-	(cons "Session" (if pages
-			     (append items '("----") pages)
-			   items)))
-      (w3m-static-when (featurep 'xemacs)
-	(when (setq items (car (find-menu-item current-menubar '("Session"))))
-	  (setcdr items (cdr w3m-session-menu))
-	  (set-buffer-menubar current-menubar))))))
-
-(defun w3m-session-file-modtime ()
-  "Return the modification time of the session file `w3m-session-file'.
-The value is a list of two time values `(HIGH LOW)' if the session
-file exists, otherwise nil."
-  (nth 5 (file-attributes w3m-session-file)))
-
-(defvar w3m-session-make-item-xmas
-  (and (equal "Japanese" w3m-language) (featurep 'xemacs)))
-
-(defun w3m-session-make-item (item)
-  (if w3m-session-make-item-xmas
-      (concat item "%_ ")
-    item))
-
-(defun w3m-session-make-menu-items ()
-  "Create w3m session menu items."
-  (if (and w3m-session-menu-items-pre
-	   w3m-session-menu-items-time
-	   (equal w3m-session-menu-items-time
-		  (w3m-session-file-modtime)))
-      w3m-session-menu-items-pre
-    (w3m-session-ignore-errors
-     (let ((sessions (w3m-load-list w3m-session-file)))
-       (setq w3m-session-menu-items-time (w3m-session-file-modtime))
-       (setq w3m-session-menu-items-pre
-	     (and sessions
-		  (mapcar
-		   (lambda (entry)
-		     (cons (w3m-session-make-item (car entry))
-			   (cons (vector "Open all sessions"
-					 `(w3m-session-goto-session
-					   (quote ,entry)))
-				 (mapcar
-				  (lambda (item)
-				    (let ((title
-					   (w3m-session-make-item
-					    (or (nth 3 item)
-						w3m-session-unknown-title))))
-				      (vector
-				       title
-				       `(w3m-session-goto-session
-					 (quote
-					  ,(list title
-						 nil
-						 (list item)
-						 nil))))))
-				  (nth 2 entry)))))
-		   sessions)))))))
-
-;;;###autoload
-(defun w3m-session-last-autosave-session ()
-  (when w3m-session-load-last-sessions
-    (w3m-session-ignore-errors
-     (let ((item
-	    (let ((sessions (w3m-load-list w3m-session-file))
-		  (n 1) x)
-	      (catch 'loop
-		(while t
-		  (if (< w3m-session-automatic-keep-number n)
-		      (throw 'loop nil)
-		    (setq x (assoc (format "%s-%d"
-					   w3m-session-automatic-title n)
-				   sessions))
-		    (when x (throw 'loop x)))
-		  (setq n (1+ n)))))))
-       (when (and item
-		  (or (and (eq w3m-session-load-last-sessions 'ask)
-			   (y-or-n-p "Load the last sessions? "))
-		      w3m-session-load-last-sessions))
-	 item)))))
-
-;;;###autoload
-(defun w3m-session-last-crashed-session ()
-  (when (and w3m-session-crash-recovery w3m-session-load-crashed-sessions)
-    (w3m-session-ignore-errors
-     (let ((item (assoc w3m-session-crash-recovery-title
-			(w3m-load-list w3m-session-file))))
-       (when (and item
-		  (or (and (eq w3m-session-load-crashed-sessions 'ask)
-			   (y-or-n-p "Load the crashed sessions? "))
-		      (eq w3m-session-load-crashed-sessions t)))
-	 item)))))
-
-(provide 'w3m-session)
-
-;;; w3m-session.el ends here

=== removed file 'share/emacs/site-lisp/w3m/w3m-symbol.el'
--- share/emacs/site-lisp/w3m/w3m-symbol.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-symbol.el	1970-01-01 00:00:00 +0000
@@ -1,230 +0,0 @@
-;;; w3m-symbol.el --- Stuffs to replace symbols for emacs-w3m -*- coding: iso-2022-7bit; -*-
-
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009
-;; ARISAWA Akihiro <ari@mbf.sphere.ne.jp>
-
-;; Author: ARISAWA Akihiro <ari@mbf.sphere.ne.jp>
-;; Keywords: w3m, WWW, hypermedia, i18n
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;;
-
-;;; Code:
-
-(eval-when-compile
-  (require 'cl))
-
-(eval-when-compile
-  (defvar w3m-output-coding-system)
-  (defvar w3m-language)
-  (defvar w3m-use-symbol)
-  (autoload 'w3m-mule-unicode-p "w3m"))
-
-(defgroup w3m-symbol nil
-  "Symbols for w3m"
-  :group 'w3m)
-
-(defvar w3m-symbol-custom-type
-  '(list
-    :convert-widget w3m-widget-type-convert-widget
-    (let* ((w `(sexp :match (lambda (widget value) (stringp value))
-		     :size 4 :value ""
-		     ,@(if (not (widget-get widget :copy))
-			   ;; Emacs versions prior to 22.
-			   '(:value-to-internal
-			     (lambda (widget value)
-			       (if (string-match "\\`\".*\"\\'" value)
-				   value
-				 (prin1-to-string value)))))))
-	   (a `(,@w :format "%v "))
-	   (b `(,@w :format "%v\n"))
-	   (c (list a a a a a a a b))
-	   (d (list a a a a a b)))
-      `(:indent 4 :tag "Customize"
-		,@c ,@c ,@c ,@c ,@d ,@d ,b ,b))))
-
-(defcustom w3m-default-symbol
-  '("-+" " |" "--" " +" "-|" " |" "-+" ""
-    "--" " +" "--" ""   "-+" ""   ""   ""
-    "-+" " |" "--" " +" "-|" " |" "-+" ""
-    "--" " +" "--" ""   "-+" ""   ""   ""
-    " *" " +" " o" " #" " @" " -"
-    " =" " x" " %" " *" " o" " #"
-    " #"
-    "<=UpDn ")
-  "List of symbol string, used by defaultly."
-  :group 'w3m-symbol
-  :type w3m-symbol-custom-type)
-
-(defcustom w3m-Chinese-BIG5-symbol
-  '("$(0#3(B" "$(0#7(B" "$(0#5(B" "$(0#<(B" "$(0#6(B" "$(0#:(B" "$(0#=(B" ""
-    "$(0#4(B" "$(0#>(B" "$(0#9(B" ""   "$(0#?(B" ""   ""   ""
-    "$(0#3(B" "$(0#7(B" "$(0#5(B" "$(0#<(B" "$(0#6(B" "$(0#:(B" "$(0#=(B" ""
-    "$(0#4(B" "$(0#>(B" "$(0#9(B" ""   "$(0#?(B" ""   ""   ""
-    "$(0!&(B" "$(0!{(B" "$(0!w(B" "$(0!r(B" "$(0!|(B" "$(0!x(B"
-    "$(0!v(B" "$(0!s(B" "$(0!t(B" "$(0!s(B" "$(0!r(B" "$(0!{(B"
-    "$(0!s(B"
-    "$(0!N"U"V(B")
-  "List of symbol string, used in Chienese-BIG5 environment."
-  :group 'w3m-symbol
-  :type w3m-symbol-custom-type)
-
-(defcustom w3m-Chinese-CNS-symbol
-  '("$(G#3(B" "$(G#7(B" "$(G#5(B" "$(G#<(B" "$(G#6(B" "$(G#:(B" "$(G#=(B" ""
-    "$(G#4(B" "$(G#>(B" "$(G#9(B" ""   "$(G#?(B" ""   ""   ""
-    "$(G#3(B" "$(G#7(B" "$(G#5(B" "$(G#<(B" "$(G#6(B" "$(G#:(B" "$(G#=(B" ""
-    "$(G#4(B" "$(G#>(B" "$(G#9(B" ""   "$(G#?(B" ""   ""   ""
-    "$(G!&(B" "$(G!{(B" "$(G!w(B" "$(G!r(B" "$(G!|(B" "$(G!x(B"
-    "$(G!v(B" "$(G!s(B" "$(G!t(B" "$(G!s(B" "$(G!r(B" "$(G!{(B"
-    "$(G!s(B"
-    "$(G!N"U"V(B")
-  "List of symbol string, used in Chienese-CNS environment."
-  :group 'w3m-symbol
-  :type w3m-symbol-custom-type)
-
-(defcustom w3m-Chinese-GB-symbol
-  '("$A)`(B" "$A)@(B" "$A)P(B" "$A)0(B" "$A)H(B" "$A)&(B" "$A)4(B" ""
-    "$A)X(B" "$A)8(B" "$A)$(B" ""   "$A)<(B" ""   ""   ""
-    "$A)`(B" "$A)D(B" "$A)S(B" "$A)3(B" "$A)L(B" "$A)'(B" "$A)7(B" ""
-    "$A)[(B" "$A);(B" "$A)%(B" ""   "$A)?(B" ""   ""   ""
-    "$A!$(B" "$A!u(B" "$A!n(B" "$A!p(B" "$A!v(B" "$A!o(B"
-    "$A!r(B" "$A!q(B" "$A!w(B" "$A!q(B" "$A!p(B" "$A!u(B"
-    "$A!q(B"
-    "$A!6!|!}(B")
-  "List of symbol string, used in Chienese-GB environment."
-  :group 'w3m-symbol
-  :type w3m-symbol-custom-type)
-
-(defcustom w3m-Japanese-symbol
-  '("$B(+(B" "$B('(B" "$B(((B" "$B(#(B" "$B()(B" "$B("(B" "$B($(B" ""
-    "$B(*(B" "$B(&(B" "$B(!(B" ""   "$B(%(B" ""   ""   ""
-    "$B(+(B" "$B(7(B" "$B(8(B" "$B(.(B" "$B(9(B" "$B(-(B" "$B(/(B" ""
-    "$B(:(B" "$B(1(B" "$B(,(B" ""   "$B(0(B" ""   ""   ""
-    "$B!&(B" "$B""(B" "$B!y(B" "$B!{(B" "$B"#(B" "$B!z(B"
-    "$B!}(B" "$B!|(B" "$B"$(B" "$B!|(B" "$B!{(B" "$B""(B"
-    "$B!|(B"
-    "$B"c","-(B")
-  "List of symbol string, used in Japanese environment."
-  :group 'w3m-symbol
-  :type w3m-symbol-custom-type)
-
-(defcustom w3m-Korean-symbol
-  '("$(C&+(B" "$(C&'(B" "$(C&((B" "$(C&#(B" "$(C&)(B" "$(C&"(B" "$(C&$(B" ""
-    "$(C&*(B" "$(C&&(B" "$(C&!(B" ""   "$(C&%(B" ""   ""   ""
-    "$(C&+(B" "$(C&7(B" "$(C&8(B" "$(C&.(B" "$(C&9(B" "$(C&-(B" "$(C&/(B" ""
-    "$(C&:(B" "$(C&1(B" "$(C&,(B" ""   "$(C&0(B" ""   ""   ""
-    "$(C!$(B" "$(C!`(B" "$(C!Y(B" "$(C![(B" "$(C!a(B" "$(C!Z(B"
-    "$(C!](B" "$(C!\(B" "$(C!b(B" "$(C!\(B" "$(C![(B" "$(C!`(B"
-    "$(C!\(B"
-    "$(C!l!h!i(B")
-  "List of symbol string, used in Korean environment."
-  :group 'w3m-symbol
-  :type w3m-symbol-custom-type)
-
-(defcustom w3m-mule-unicode-symbol
-  (when (w3m-mule-unicode-p)
-    (append
-     (mapcar (lambda (p)
-	       (if p
-		   (char-to-string
-		    (make-char (or (nth 2 p) 'mule-unicode-2500-33ff)
-			       (car p) (cadr p)))
-		 ""))
-	     '((32 92) (32 60) (32 76) (32 44) (32 68) (32 34) (32 48) nil
-	       (32 84) (32 52) (32 32) nil     (32 56) nil     nil     nil
-	       (32 92) (32 64) (32 79) (32 47) (32 72) (32 35) (32 51) nil
-	       (32 87) (32 55) (32 33) nil     (32 59) nil     nil     nil
-	       (115 34 mule-unicode-0100-24ff) (33 97) (34 102) (34 43) (33 96) (34 101)
-	       (34 46) (34 47) (33 115) (34 47) (34 43) (33 97)
-	       (34 47)))
-     (list (format "%c %c %c "
-		   (make-char 'mule-unicode-0100-24ff 121 42)
-		   (make-char 'mule-unicode-0100-24ff 118 113)
-		   (make-char 'mule-unicode-0100-24ff 118 115)))))
-  "List of symbol string, using mule-unicode characters."
-  :group 'w3m-symbol
-  :type (if (w3m-mule-unicode-p)
-	    w3m-symbol-custom-type
-	  '(const :format "%{%t%}: %v")))
-
-(defcustom w3m-symbol nil
-  "List of symbol string."
-  :group 'w3m-symbol
-  :type `(radio (const :format "Auto detect  " nil)
-		(const :tag "Default" w3m-default-symbol)
-		(const :format "Chinese BIG5 " w3m-Chinese-BIG5-symbol)
-		(const :format "Chinese CNS " w3m-Chinese-CNS-symbol)
-		(const :tag "Chinese GB" w3m-Chinese-GB-symbol)
-		(const :format "Japanese     " w3m-Japanese-symbol)
-		(const :format "Korean      " w3m-Korean-symbol)
-		,@(when w3m-mule-unicode-symbol
-		   '((const :tag "Mule-Unicode" w3m-mule-unicode-symbol)))
-		(variable :format "%t symbol: %v\n" :size 0
-			  :value w3m-default-symbol)
-		,w3m-symbol-custom-type))
-
-(defun w3m-use-symbol ()
-  (cond ((functionp w3m-use-symbol)
-	 (funcall w3m-use-symbol))
-	(t w3m-use-symbol)))
-
-(eval-when-compile (defvar current-language-environment))
-
-(defun w3m-symbol ()
-  (cond (w3m-symbol
-	 (if (symbolp w3m-symbol)
-	     (symbol-value w3m-symbol)
-	   w3m-symbol))
-	((and (eq w3m-output-coding-system 'utf-8)
-	      w3m-mule-unicode-symbol))
-	((let ((lang (or w3m-language
-			 (and (boundp 'current-language-environment)
-			      current-language-environment
-			      ;; In XEmacs 21.5 it may be the one like
-			      ;; "Japanese (UTF-8)".
-			      (if (string-match "[\t ]+("
-						current-language-environment)
-				  (substring current-language-environment
-					     0 (match-beginning 0))
-				current-language-environment)))))
-	   (when (boundp (intern (format "w3m-%s-symbol" lang)))
-	     (symbol-value (intern (format "w3m-%s-symbol" lang))))))
-	(t w3m-default-symbol)))
-
-;;;###autoload
-(defun w3m-replace-symbol ()
-  (when (w3m-use-symbol)
-    (let ((symbol-list (w3m-symbol)))
-      (save-excursion
-	(goto-char (point-min))
-	(while (re-search-forward "<_SYMBOL TYPE=\\([0-9]+\\)>" nil t)
-	  (let ((symbol (nth (string-to-number (match-string 1)) symbol-list))
-		(start (point))
-		end symbol-cnt)
-	    (search-forward "</_SYMBOL>" nil t)
-	    (setq end (match-beginning 0)
-		  symbol-cnt (/ (string-width (buffer-substring start end))
-				(string-width symbol)))
-	    (goto-char start)
-	    (delete-region start end)
-	    (insert (apply 'concat (make-list symbol-cnt symbol)))))))))
-
-(provide 'w3m-symbol)
-
-;;; w3m-symbol.el ends here

=== removed file 'share/emacs/site-lisp/w3m/w3m-tabmenu.el'
--- share/emacs/site-lisp/w3m/w3m-tabmenu.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-tabmenu.el	1970-01-01 00:00:00 +0000
@@ -1,188 +0,0 @@
-;;; w3m-tabmenu.el --- Functions for TAB menu browsing
-
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Authors: Hideyuki SHIRAI    <shirai@meadowy.org>,
-;;          TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-;; Keywords: w3m, WWW, hypermedia
-
-;; This file is a part of emacs-w3m.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; This file contains the functions for TAB browsing.  For more detail
-;; about emacs-w3m, see:
-;;
-;;    http://emacs-w3m.namazu.org/
-
-;;; Code:
-
-(eval-when-compile
-  (require 'cl))
-
-(require 'w3m-util)
-(require 'w3m)
-(require 'easymenu)
-
-(defun w3m-setup-tab-menu ()
-  "Setup w3m tab menubar."
-  (when w3m-use-tab-menubar
-    (w3m-static-if (featurep 'xemacs)
-	(unless (car (find-menu-item current-menubar '("Tab")))
-	  (easy-menu-define w3m-tab-menu w3m-mode-map
-	    "" '("Tab" ["dummy" w3m-switch-buffer t]))
-	  (easy-menu-add w3m-tab-menu)
-	  (add-hook 'activate-menubar-hook 'w3m-tab-menubar-update))
-      (unless (lookup-key w3m-mode-map [menu-bar Tab])
-	(easy-menu-define w3m-tab-menu w3m-mode-map "" '("Tab"))
-	(easy-menu-add w3m-tab-menu)
-	(add-hook 'menu-bar-update-hook 'w3m-tab-menubar-update)))))
-
-(defun w3m-switch-buffer ()
-  "Switch `w3m-mode' buffer in the current window."
-  (interactive)
-  (let ((items (w3m-tab-menubar-make-items 'nomenu))
-	(minibuffer-setup-hook
-	 (append minibuffer-setup-hook '(beginning-of-line)))
-	(count 1)
-	(form "%s [%s]")
-	(completion-ignore-case t)
-	comp hist histlen default buf)
-    (dolist (item items)
-      (when (nth 2 item)	;; current-buffer
-	(setq default count))
-      (setq comp (cons
-		  (cons
-		   (format form (nth 1 item) (nth 0 item)) (nth 0 item))
-		  comp))
-      (setq hist (cons (format form (nth 1 item) (nth 0 item)) hist))
-      (setq count (1+ count)))
-    (setq comp (nreverse comp))
-    (setq histlen (length hist))
-    (setq hist (append hist hist hist hist hist)) ;; STARTPOS at 3rd hist
-    (setq buf
-	  (completing-read
-	   "Switch to w3m buffer: "
-	   comp nil t (car (nth (1- default) comp))
-	   (cons 'hist (+ (* 3 histlen) (- histlen default -1)))
-	   (car (nth (1- default) comp))))
-    (setq buf (cdr (assoc buf comp)))
-    (when (get-buffer buf)
-      (switch-to-buffer buf))))
-
-(defun w3m-tab-menubar-open-item (buf)
-  "Open w3m buffer from tab menubar."
-  (interactive)
-  (when (get-buffer buf)
-    (switch-to-buffer buf)))
-
-(defun w3m-tab-menubar-update ()
-  "Update w3m tab menubar."
-  (when (and (eq major-mode 'w3m-mode)
-	     (w3m-static-if (featurep 'xemacs)
-		 (frame-property (selected-frame) 'menubar-visible-p)
-	       menu-bar-mode))
-    (easy-menu-define w3m-tab-menu w3m-mode-map
-      "The menu kepmap for the emacs-w3m tab."
-      (cons "Tab" (w3m-tab-menubar-make-items)))
-    (w3m-static-when (featurep 'xemacs)
-      (let ((items (car (find-menu-item current-menubar '("Tab")))))
-	(when items
-	  (setcdr items (cdr w3m-tab-menu))
-	  (set-buffer-menubar current-menubar))))))
-
-(defvar w3m-tab-menubar-items-sub-coeff 30) ;; 30?
-(defvar w3m-tab-menubar-items-width 50) ;; 50?
-
-(defun w3m-tab-menubar-make-items-1 (buffers &optional nomenu)
-  (let ((i 0)
-	(current (current-buffer))
-	(width w3m-tab-menubar-items-width)
-	title unseen)
-    (mapcar
-     (lambda (buffer)
-       (if nomenu
-	   (list (buffer-name buffer)
-		 (format "%s%s"
-			 (if (w3m-unseen-buffer-p buffer) "(u)" "")
-			 (w3m-buffer-title buffer))
-		 (eq buffer current))
-	 (setq title (w3m-buffer-title buffer))
-	 (setq unseen (w3m-unseen-buffer-p buffer))
-	 (when (>= (string-width title) width)
-	   (setq title
-		 (concat (w3m-truncate-string title
-					      (- width 3))
-			 "...")))
-	 (vector (format "%d:%s%s"
-			 (incf i)
-			 (cond ((eq buffer current) "* ")
-			       (unseen "u ")
-			       (t "  "))
-			 title)
-		 `(w3m-tab-menubar-open-item ,(buffer-name buffer))
-		 buffer)))
-     buffers)))
-
-(defvar w3m-tab-menubar-make-items-precbuf nil)
-(defvar w3m-tab-menubar-make-items-prebuflst nil)
-(defvar w3m-tab-menubar-make-items-preurl nil)
-(defvar w3m-tab-menubar-make-items-preitems nil)
-
-(defun w3m-tab-menubar-force-update (&rest args)
-  (setq w3m-tab-menubar-make-items-preitems nil)
-  (w3m-tab-menubar-update))
-
-(add-hook 'w3m-display-functions 'w3m-tab-menubar-force-update)
-
-(defun w3m-tab-menubar-make-items (&optional nomenu)
-  "Create w3m tab menu items."
-  (let (menu buflst total max)
-    (if nomenu
-	(w3m-tab-menubar-make-items-1 (w3m-list-buffers) t)
-      (setq w3m-tab-button-menu-current-buffer (current-buffer))
-      (setq buflst (w3m-list-buffers))
-      (if (and w3m-tab-menubar-make-items-preitems
-	       (eq w3m-tab-button-menu-current-buffer
-		   w3m-tab-menubar-make-items-precbuf)
-	       (equal w3m-tab-menubar-make-items-prebuflst buflst)
-	       (equal w3m-tab-menubar-make-items-preurl w3m-current-url))
-	  w3m-tab-menubar-make-items-preitems
-	(setq w3m-tab-menubar-make-items-precbuf
-	      w3m-tab-button-menu-current-buffer)
-	(setq w3m-tab-menubar-make-items-prebuflst buflst)
-	(setq w3m-tab-menubar-make-items-preurl w3m-current-url)
-	(setq total (length buflst))
-	(setq max (- (frame-height (selected-frame))
-		     w3m-tab-menubar-items-sub-coeff))
-	(if (< total max)
-	    (setq menu (w3m-tab-menubar-make-items-1 buflst))
-	  (setq menu (list `(,(w3m-make-menu-item "¥¿¥Ö¤ÎÁªÂò"
-						  "Select TAB")
-			     ,@(w3m-tab-menubar-make-items-1 buflst)))))
-	(setq w3m-tab-menubar-make-items-preitems
-	      (append menu
-		      '("-")
-		      '("-")
-		      (w3m-make-menu-commands
-		       w3m-tab-button-menu-commands)))))))
-
-(provide 'w3m-tabmenu)
-
-;;; w3m-tabmenu.el ends here

=== removed file 'share/emacs/site-lisp/w3m/w3m-ucs.el'
--- share/emacs/site-lisp/w3m/w3m-ucs.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-ucs.el	1970-01-01 00:00:00 +0000
@@ -1,109 +0,0 @@
-;;; w3m-ucs.el --- CCL programs to process Unicode.
-
-;; Copyright (C) 2001, 2005, 2007 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
-;;          ARISAWA Akihiro <ari@mbf.sphere.ne.jp>
-;; Keywords: w3m, WWW, hypermedia
-
-;; This file is a part of emacs-w3m.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; This file contains CCL codes to handle UCS characters in emacs-w3m.
-;; For more detail about emacs-w3m, see:
-;;
-;;    http://emacs-w3m.namazu.org/
-
-;; This module requires `Mule-UCS' package.  It can be downloaded from:
-;;
-;;    ftp://ftp.m17n.org/pub/mule/Mule-UCS/
-
-;;; Code:
-
-;; Enable XEmacs 21.5-Mule to compile this module anyway.
-(eval-when-compile
-  (if (featurep 'xemacs)
-      (let ((mucs-ignore-version-incompatibilities t))
-	(defvar font-ccl-encoder-alist nil)
-	(require 'un-define))))
-
-(require 'un-define)
-(require 'w3m-ccl)
-
-(eval-and-compile
-  (autoload 'w3m-make-ccl-coding-system "w3m"))
-
-(defun w3m-ucs-to-char (codepoint)
-  (condition-case nil
-      (or (ucs-to-char codepoint) ?~)
-    (error ?~)))
-
-(eval-and-compile
-  (defconst w3m-ccl-get-ucs-codepoint-with-mule-ucs
-    '(;; (1) Convert a set of r1 (charset-id) and r0 (codepoint) to a
-      ;; character in Emacs internal representation.
-      (if (r0 > 255)
-	  ((r4 = (r0 & 127))
-	   (r0 = (((r0 >> 7) * 96) + r4))
-	   (r0 |= (r1 << 16)))
-	((r0 |= (r1 << 16))))
-      ;; (2) Convert a character in Emacs to a UCS codepoint.
-      (call emacs-char-to-ucs-codepoint-conversion)
-      (if (r0 <= 0)
-	  (write-repeat ?~)))		; unknown character.
-    "CCL program to convert multibyte char to ucs with Mule-UCS."))
-
-(define-ccl-program w3m-euc-japan-mule-ucs-encoder
-  `(4
-    (loop
-     ,@w3m-ccl-write-euc-japan-character
-     ,@w3m-ccl-get-ucs-codepoint-with-mule-ucs
-     ,@w3m-ccl-generate-ncr)))
-
-(w3m-make-ccl-coding-system
- 'w3m-euc-japan-mule-ucs ?E
- "ISO 2022 based EUC encoding for Japanese with w3m internal characters.
-A character that can not be encoded with `euc-japan' is converted to a
-UCS codepoint with Mule-UCS, and the codepoint is represented as a
-string which represents the character in Numeric Character
-References (NCR).
-  (generated by `w3m')"
- 'w3m-euc-japan-decoder
- 'w3m-euc-japan-mule-ucs-encoder)
-
-(define-ccl-program w3m-iso-latin-1-mule-ucs-encoder
-  `(4
-    (loop
-     ,@w3m-ccl-write-iso-latin-1-character
-     ,@w3m-ccl-get-ucs-codepoint-with-mule-ucs
-     ,@w3m-ccl-generate-ncr)))
-
-(w3m-make-ccl-coding-system
- 'w3m-iso-latin-1-mule-ucs ?1
- "ISO 2022 based 8-bit encoding for Latin-1 with w3m internal characters.
-A character that can not be encoded with `iso-latin-1' is converted to
-a UCS codepoint with Mule-UCS, and the codepoint is represented as a
-string which represents the character in Numeric Character
-References (NCR).
-  (generated by `w3m')"
- 'w3m-iso-latin-1-decoder
- 'w3m-iso-latin-1-mule-ucs-encoder)
-
-(provide 'w3m-ucs)
-;;; w3m-ucs.el ends here.

=== removed file 'share/emacs/site-lisp/w3m/w3m-util.el'
--- share/emacs/site-lisp/w3m/w3m-util.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-util.el	1970-01-01 00:00:00 +0000
@@ -1,1421 +0,0 @@
-;;; w3m-util.el --- Utility macros and functions for emacs-w3m
-
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
-;;          Shun-ichi GOTO     <gotoh@taiyo.co.jp>,
-;;          Satoru Takabayashi <satoru-t@is.aist-nara.ac.jp>,
-;;          Hideyuki SHIRAI    <shirai@meadowy.org>,
-;;          Keisuke Nishida    <kxn30@po.cwru.edu>,
-;;          Yuuichi Teranishi  <teranisi@gohome.org>,
-;;          Akihiro Arisawa    <ari@mbf.sphere.ne.jp>,
-;;          Katsumi Yamaoka    <yamaoka@jpl.org>
-;; Keywords: w3m, WWW, hypermedia
-
-;; This file is a part of emacs-w3m.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; This module is a part of emacs-w3m which provides utility macros
-;; and inline functions.  Visit <URL:http://emacs-w3m.namazu.org/> for
-;; more details of emacs-w3m.
-
-;;; Code:
-
-(eval-when-compile
-  (require 'cl))
-
-;; Variables and functions which are used in the following inline
-;; functions.  They should be defined in the other module at run-time.
-(eval-when-compile
-  (defvar w3m-current-process)
-  (defvar w3m-current-refresh)
-  (defvar w3m-current-title)
-  (defvar w3m-current-url)
-  (defvar w3m-fb-list-buffers-frame)
-  (defvar w3m-fb-mode)
-  (defvar w3m-mode-hook)
-  (defvar w3m-pop-up-frames)
-  (defvar w3m-pop-up-windows)
-  (defvar w3m-popup-frame-parameters)
-  (defvar w3m-refresh-timer)
-  (defvar w3m-select-buffer-name)
-  (defvar w3m-use-refresh)
-  (defvar w3m-use-tab)
-  (defvar w3m-work-buffer-list)
-  (defvar w3m-use-japanese-menu)
-  (defvar w3m-mode-map)
-  (defvar w3m-use-title-buffer-name)
-  (defvar w3m-buffer-unseen)
-  (defvar w3m-puny-utf-16be)
-  (unless (fboundp 'select-frame-set-input-focus)
-    (defalias 'select-frame-set-input-focus 'ignore)))
-
-(eval-and-compile
-  (when (featurep 'xemacs)
-    (require 'poe)
-    (require 'poem)))
-
-;;; Things should be defined in advance:
-(eval-when-compile
-  (autoload 'w3m-fb-frame-parameter "w3m-fb")
-  (autoload 'w3m-history-restore-position "w3m-hist" nil t))
-
-;;; Control structures:
-
-(defmacro w3m-static-if (cond then &rest else)
-  "Like `if', except that it evaluates COND at compile-time."
-  (if (eval cond) then `(progn  ,@else)))
-(put 'w3m-static-if 'lisp-indent-function 2)
-
-(put 'w3m-static-when 'lisp-indent-function 1)
-(defmacro w3m-static-when (cond &rest body)
-  "Like `when', but evaluate COND at compile time."
-  (if (eval cond)
-      `(progn ,@body)))
-
-(put 'w3m-static-unless 'lisp-indent-function 1)
-(defmacro w3m-static-unless (cond &rest body)
-  "Like `unless', but evaluate COND at compile time."
-  (if (eval cond)
-      nil
-    `(progn ,@body)))
-
-(defmacro w3m-static-cond (&rest clauses)
-  "Like `cond', except that it evaluates CONDITION part of each clause at
-compile-time."
-  (while (and clauses
-	      (not (eval (car (car clauses)))))
-    (setq clauses (cdr clauses)))
-  (if clauses
-      (cons 'progn (cdr (car clauses)))))
-
-(put 'w3m-condition-case lisp-indent-function 2)
-(defmacro w3m-condition-case (var bodyform &rest handlers)
-  "Like `condition-case', except that signal an error if `debug-on-error'
-or `debug-on-quit' is non-nil."
-  `(if (or debug-on-error debug-on-quit)
-       ,bodyform
-     (condition-case ,var
-	 ,bodyform
-       ,@handlers)))
-
-
-;;; Text props:
-
-(defmacro w3m-add-text-properties (start end props &optional object)
-  "Like `add-text-properties' but always add non-sticky properties."
-  (let ((non-stickies
-	 (if (featurep 'xemacs)
-	     ;; Default to start-closed and end-open in XEmacsen.
-	     '(list 'start-open t)
-	   ;; Default to front-nonsticky and rear-sticky in Emacsen.
-	   '(list 'rear-nonsticky t))))
-    `(add-text-properties ,start ,end
-			  (append ,non-stickies ,props)
-			  ,object)))
-
-(defun w3m-add-face-property (start end name &optional object)
-  "Add face NAME to the face text property of the text from START to END.
-The value of the existing text property should be a list.
-If the optional fourth argument OBJECT is a buffer (or nil, which means
-the current buffer), START and END are buffer positions (integers or
-markers).  If OBJECT is a string, START and END are 0-based indices
-into it."
-  (let ((pos start)
-	next prop)
-    (while (< pos end)
-      (setq prop (get-text-property pos 'face object)
-	    next (next-single-property-change pos 'face object end))
-      (w3m-add-text-properties pos next (list 'face (cons name prop)) object)
-      (setq pos next))))
-
-(defun w3m-remove-face-property (start end name &optional object)
-  "Remove face NAME from the face text property of text from START to END.
-The value of the existing text property should be a list.
-If the optional fourth argument OBJECT is a buffer (or nil, which means
-the current buffer), START and END are buffer positions (integers or
-markers).  If OBJECT is a string, START and END are 0-based indices
-into it."
-  (let ((pos start)
-	next prop new-prop elem)
-    (while (< pos end)
-      (setq prop (get-text-property pos 'face object))
-      (setq next (next-single-property-change pos 'face object end))
-      (setq new-prop nil)
-      (while prop
-	(setq elem (pop prop))
-	(unless (eq elem name)
-	  (push elem new-prop)))
-      (when new-prop
-	(w3m-add-text-properties pos next
-				 (list 'face new-prop)))
-      (setq pos next))))
-
-(defmacro w3m-get-text-property-around (prop)
-  "Search for the text property PROP in one character before and behind
-the current position.  Return the value corresponding to PROP or nil.
-If PROP is not found at the current position, point will move to the
-position where PROP exists."
-  `(let ((position (point))
-	 value)
-     (or (get-text-property position ,prop)
-	 (and (not (bolp))
-	      (setq value (get-text-property (1- position) ,prop))
-	      (goto-char (1- position))
-	      value)
-	 (and (not (eolp))
-	      (setq value (get-text-property (1+ position) ,prop))
-	      (goto-char (1+ position))
-	      value))))
-
-(defmacro w3m-action (&optional position)
-  "Return the value of the `w3m-action' property at the given POSITION.
-NOTE: If POSITION is omitted, it searches for the property in one
-character before and behind the current position, and point will move
-to the position where the property exists."
-  (if position
-      `(get-text-property ,position 'w3m-action)
-    `(w3m-get-text-property-around 'w3m-action)))
-
-(defmacro w3m-anchor (&optional position)
-  "Return the value of the `w3m-href-anchor' property at the given POSITION.
-NOTE: If POSITION is omitted, it searches for the property in one
-character before and behind the current position, and point will move
-to the position where the property exists."
-  (if position
-      `(get-text-property ,position 'w3m-href-anchor)
-    `(w3m-get-text-property-around 'w3m-href-anchor)))
-
-(defmacro w3m-image (&optional position)
-  "Return the value of the `w3m-image' property at the given POSITION.
-NOTE: If POSITION is omitted, it searches for the property in one
-character before and behind the current position, and point will move
-to the position where the property exists."
-  (if position
-      `(get-text-property ,position 'w3m-image)
-    `(w3m-get-text-property-around 'w3m-image)))
-
-(defmacro w3m-image-alt (&optional position)
-  "Return the value of the `w3m-image-alt' property at the given POSITION.
-NOTE: If POSITION is omitted, it searches for the property in one
-character before and behind the current position, and point will move
-to the position where the property exists."
-  (if position
-      `(get-text-property ,position 'w3m-image-alt)
-    `(w3m-get-text-property-around 'w3m-image-alt)))
-
-(defmacro w3m-submit (&optional position)
-  "Return the value of the `w3m-submit' property at the given POSITION.
-NOTE: If POSITION is omitted, it searches for the property in one
-character before and behind the current position, and point will move
-to the position where the property exists."
-  (if position
-      `(get-text-property ,position 'w3m-submit)
-    `(w3m-get-text-property-around 'w3m-submit)))
-
-(defmacro w3m-anchor-sequence (&optional position)
-  "Return the value of the `w3m-anchor-sequence' property at POSITION.
-If POSITION is omitted, the current position is assumed."
-  (if position
-      `(get-text-property ,position 'w3m-anchor-sequence)
-    '(get-text-property (point) 'w3m-anchor-sequence)))
-
-
-;;; Attributes:
-
-(eval-and-compile
-  ;; `eval-and-compile' is necessary since the value of the constant
-  ;; is referred to at the compile time.
-  (defconst w3m-html-string-regexp
-    "\\(\"\\([^\"]+\\)\"\\|'\\([^']+\\)'\\|[^\"'<> \t\r\f\n]*\\)"
-    "Regexp matching a string of the field-value like <a href=\"VALUE\">."))
-
-(put 'w3m-parse-attributes 'lisp-indent-function '1)
-(def-edebug-spec w3m-parse-attributes
-  ((&rest &or (symbolp &optional symbolp) symbolp) body))
-(defmacro w3m-parse-attributes (attributes &rest forms)
-  "Extract ATTRIBUTES, KEYWORD=\"VALUE\" pairs, in a tag and run FORMS.
-ATTRIBUTES is a list of symbols that looks like `(KEYWORD KEYWORD...)'.
-A symbol KEYWORD, that will express a value extracted from a tag, can
-be used as a Lisp variable within FORMS.  The point has to be within
-a tag initially, and only attributes that follow the point will be
-extracted.
-
-The value of KEYWORD is a string by default, or is nil if the KEYWORD
-is not found in a tag.  KEYWORD can be `(KEYWORD TYPE)', where TYPE is
-one of `:case-ignore', `:integer', `:bool', and `:decode-entity'.
-Those types mean converting the value into a lower-case string,
-an integer, a boolean (t or nil), and a decoded string respectively."
-  `(let (,@(mapcar (lambda (attr)
-		     (if (listp attr)
-			 (car attr)
-		       attr))
-		   attributes))
-     (skip-chars-forward " \t\r\f\n")
-     (while
-	 (cond
-	  ,@(mapcar
-	     (lambda (attr)
-	       (or (symbolp attr)
-		   (and (listp attr)
-			(<= (length attr) 2)
-			(symbolp (car attr)))
-		   (error "Internal error, type mismatch"))
-	       (let ((sexp (quote
-			    (w3m-remove-redundant-spaces
-			     (or (match-string-no-properties 2)
-				 (match-string-no-properties 3)
-				 (match-string-no-properties 1)))))
-		     type)
-		 (when (listp attr)
-		   (setq type (nth 1 attr))
-		   (cond
-		    ((eq type :case-ignore)
-		     (setq sexp (list 'downcase sexp)))
-		    ((eq type :integer)
-		     (setq sexp (list 'string-to-number sexp)))
-		    ((eq type :bool)
-		     (setq sexp t))
-		    ((eq type :decode-entity)
-		     (setq sexp (list 'w3m-decode-entities-string sexp)))
-		    ((nth 1 attr)
-		     (error "Internal error, unknown modifier")))
-		   (setq attr (car attr)))
-		 `((looking-at
-		    ,(if (eq type :bool)
-			 (format "%s\\(?:[ \t\r\f\n]*=[ \t\r\f\n]*%s\\)?"
-				 (symbol-name attr)
-				 w3m-html-string-regexp)
-		       (format "%s[ \t\r\f\n]*=[ \t\r\f\n]*%s"
-			       (symbol-name attr)
-			       w3m-html-string-regexp)))
-		   (setq ,attr ,sexp))))
-	     attributes)
-	  ((looking-at ,(concat "[A-Za-z]*[ \t\r\f\n]*=[ \t\r\f\n]*"
-				w3m-html-string-regexp)))
-	  ((looking-at "[^<> \t\r\f\n]+")))
-       (goto-char (match-end 0))
-       (skip-chars-forward " \t\r\f\n"))
-     (skip-chars-forward "^>")
-     (forward-char)
-     ,@forms))
-
-
-;;; Working buffers:
-
-(defun w3m-get-buffer-create (name)
-  "Return the buffer named NAME, or create such a buffer and return it."
-  (or (get-buffer name)
-      (let ((buf (get-buffer-create name)))
-	(setq w3m-work-buffer-list (cons buf w3m-work-buffer-list))
-	(buffer-disable-undo buf)
-	buf)))
-
-(defun w3m-kill-buffer (buffer)
-  "Kill the buffer BUFFER and remove it from `w3m-work-buffer-list'.
-The argument may be a buffer or may be the name of a buffer.
-An argument of nil means kill the current buffer."
-  (unless buffer
-    (setq buffer (current-buffer)))
-  (when (stringp buffer)
-    (setq buffer (get-buffer buffer)))
-  (when (buffer-live-p buffer)
-    (kill-buffer buffer))
-  (setq w3m-work-buffer-list (delq buffer w3m-work-buffer-list))
-  nil)
-
-(defun w3m-kill-all-buffer ()
-  "Kill all working buffer."
-  (dolist (buf w3m-work-buffer-list)
-    (when (buffer-live-p buf)
-      (kill-buffer buf)))
-  (setq w3m-work-buffer-list nil))
-
-(defun w3m-current-title ()
-  "Return the title of the current buffer."
-  (cond
-   (w3m-current-process
-     "<retrieving>")
-   ((and (stringp w3m-current-title)
-	 (not (string= w3m-current-title "<no-title>")))
-    w3m-current-title)
-   ((stringp w3m-current-url)
-    (directory-file-name
-     (if (string-match "^[^/:]+:/+" w3m-current-url)
-	 (substring w3m-current-url (match-end 0))
-       w3m-current-url)))
-   (t "<no-title>")))
-
-(defun w3m-buffer-title (buffer)
-  "Return the title of the buffer BUFFER."
-  (with-current-buffer buffer
-    (w3m-current-title)))
-
-(defun w3m-buffer-number (buffer)
-  (when (and (bufferp buffer)
-	     (string-match "\\*w3m\\*\\(<\\([0-9]+\\)>\\)?\\'"
-			   (buffer-name buffer)))
-    (if (match-beginning 1)
-	(string-to-number (match-string 2 (buffer-name buffer)))
-      1))) ;; `1' should not be represented in the buffer name.
-
-(defun w3m-buffer-set-number (buffer number)
-  (with-current-buffer buffer
-    (let ((newname (if w3m-use-title-buffer-name
-		       (if (= number 1)
-			   (format "%s *w3m*" (w3m-current-title))
-			 (format "%s *w3m*<%d>" (w3m-current-title) number))
-		     (if (= number 1)
-			 "*w3m*"
-		       (format "*w3m*<%d>" number)))))
-      (if (eq (w3m-buffer-number buffer) number)
-	  (when w3m-use-title-buffer-name
-	    (unless (get-buffer newname)
-	      (rename-buffer newname)))
-	(unless (get-buffer newname)
-	  (rename-buffer newname))))))
-
-(defun w3m-buffer-name-add-title ()
-  "Add current tile to buffer name."
-  (when w3m-use-title-buffer-name
-    (let ((number (w3m-buffer-number (current-buffer)))
-	  newname)
-      (if (= number 1)
-	  (setq newname (format "%s *w3m*" (w3m-current-title)))
-	(setq newname (format "%s *w3m*<%d>" (w3m-current-title) number)))
-      (rename-buffer newname))))
-
-(defun w3m-generate-new-buffer (name)
-  (if w3m-use-title-buffer-name
-      (let* ((maxbuf (let ((w3m-fb-mode nil))
-		       (car (nreverse (w3m-list-buffers)))))
-	     (number (w3m-buffer-number maxbuf)))
-	(when (string-match "\\*w3m\\*\\(<\\([0-9]+\\)>\\)?\\'" name)
-	  (setq name "*w3m*"))
-	(if (and maxbuf number)
-	    (generate-new-buffer (format "%s<%d>" name (1+ number)))
-	  (generate-new-buffer name)))
-    (generate-new-buffer name)))
-
-(defun w3m-buffer-name-lessp (x y)
-  "Return t if first arg buffer's name is less than second."
-  (when (bufferp x)
-    (setq x (buffer-name x)))
-  (when (bufferp y)
-    (setq y (buffer-name y)))
-  (if (and (string-match "\\*w3m\\*\\(<\\([0-9]+\\)>\\)?\\'" x)
-	   (setq x (cons x
-			 (if (match-beginning 1)
-			     (string-to-number (match-string 2 x))
-			   1))))
-      (if (string-match "\\*w3m\\*\\(<\\([0-9]+\\)>\\)?\\'" y)
-	  (< (cdr x)
-	     (if (match-beginning 1)
-		 (string-to-number (match-string 2 y))
-	       1))
-	(string< (car x) y))
-    (string< x y)))
-
-(defun w3m-list-buffers (&optional nosort)
-  "Return a list of buffers in which emacs-w3m sessions are open.
-If the optional NOSORT is nil, the list is sorted in the order of
-buffer names."
-  (let ((buffers (buffer-list))
-	buffer rest)
-    (save-current-buffer
-      (while buffers
-	(set-buffer (setq buffer (pop buffers)))
-	(when (eq major-mode 'w3m-mode)
-	  (push buffer rest))))
-    (setq buffers (if nosort
-		      (nreverse rest)
-		    (sort rest #'w3m-buffer-name-lessp)))
-    (when (and (boundp 'w3m-fb-mode)
-	       w3m-fb-mode
-	       (if (or w3m-pop-up-frames
-		       (not (memq 'w3m-fb-add w3m-mode-hook)))
-		   ;; `w3m-fb-mode' might have been set by something
-		   ;; other than the `w3m-fb-mode' function.
-		   (setq w3m-fb-mode nil)
-		 t))
-      ;; Don't just return `w3m-fb-buffer-list' for the selected frame
-      ;; because `buffers' may have been sorted.
-      (let ((fbs (w3m-fb-frame-parameter w3m-fb-list-buffers-frame
-					 'w3m-fb-buffer-list)))
-	(setq rest buffers)
-	(while rest
-	  (unless (memq (setq buffer (pop rest)) fbs)
-	    (setq buffers (delq buffer buffers))))))
-    buffers))
-
-
-;;; Pop up and delete buffers, windows or frames:
-
-(defmacro w3m-popup-frame-parameters ()
-  "Return a pop-up frame plist if this file is compiled for XEmacs,
-otherwise return an alist."
-  (if (featurep 'xemacs)
-      '(let ((params (or w3m-popup-frame-parameters pop-up-frame-plist)))
-	 (if (consp (car-safe params))
-	     (alist-to-plist params)
-	   params))
-    '(let ((params (or w3m-popup-frame-parameters pop-up-frame-alist))
-	   alist)
-       (if (consp (car-safe params))
-	   params
-	 (while params
-	   (push (cons (car params) (cdr params)) alist)
-	   (setq params (cddr params)))
-	 (nreverse alist)))))
-
-(defun w3m-device-on-window-system-p ()
-  "Return non-nil if the selected frame is on a widnow system"
-  (w3m-static-if (featurep 'xemacs)
-      (device-on-window-system-p)
-    window-system))
-
-(defmacro w3m-popup-frame-p ()
-  "Return non-nil if `w3m-pop-up-frames' is non-nil and Emacs really
-supports separate frames."
-  '(and w3m-pop-up-frames (w3m-device-on-window-system-p)))
-
-(defmacro w3m-use-tab-p ()
-  "Return non-nil if `w3m-use-tab' is non-nil and Emacs really supports
-the tabs line."
-  (cond ((featurep 'xemacs)
-	 '(and w3m-use-tab (device-on-window-system-p)))
-	(t
-	 'w3m-use-tab)))
-
-(defun w3m-lefttab-exist-p (&optional buffer)
-  (not (eq (or buffer (current-buffer)) (car (w3m-list-buffers)))))
-
-(defun w3m-righttab-exist-p (&optional buffer)
-  (let ((bufs (w3m-list-buffers))
-	(cbuf (or buffer (current-buffer)))
-	buf)
-    (catch 'exist
-      (while (setq buf (car bufs))
-	(setq bufs (cdr bufs))
-	(when (eq cbuf buf)
-	  (throw 'exist bufs))))))
-
-(defmacro w3m-popup-window-p ()
-  "Return non-nil if `w3m-pop-up-windows' is non-nil and the present
-situation allows it."
-  '(and w3m-pop-up-windows
-	(not (w3m-use-tab-p))
-	(not (get-buffer-window w3m-select-buffer-name))))
-
-(defvar w3m-initial-frames nil
-  "Variable used to keep a list of the frame-IDs when emacs-w3m sessions
-are popped-up as new frames.  This variable is used for the control
-for not deleting frames made for aims other than emacs-w3m sessions.")
-(make-variable-buffer-local 'w3m-initial-frames)
-
-(defun w3m-popup-buffer (buffer)
-  "Pop up BUFFER as a new window or a new frame
-according to `w3m-pop-up-windows' and `w3m-pop-up-frames' (which see)."
-  (let ((window (get-buffer-window buffer t))
-	(oframe (selected-frame))
-	(popup-frame-p (w3m-popup-frame-p))
-	frame pop-up-frames buffers other)
-    (if (setq
-	 pop-up-frames
-	 (if window ;; The window showing BUFFER already exists.
-	     ;; Don't pop up a new frame if it is just the current frame.
-	     (not (eq (setq frame (window-frame window)) oframe))
-	   ;; There is no window for BUFFER, so look for the existing
-	   ;; emacs-w3m window if the tabs line is enabled or the
-	   ;; selection window exists (i.e., we can reuse it).
-	   (if (or (w3m-use-tab-p)
-		   (get-buffer-window w3m-select-buffer-name t))
-	       (progn
-		 (setq buffers (delq buffer (w3m-list-buffers t)))
-		 (while (and (not window)
-			     buffers)
-		   (setq window
-			 (get-buffer-window (setq other (pop buffers)) t)))
-		 (if window ;; The window showing another buffer exists.
-		     (not (eq (setq frame (window-frame window)) oframe))
-		   (setq other nil)
-		   ;; There is no window after all, so leave to the value
-		   ;; of `w3m-pop-up-frames' whether to pop up a new frame.
-		   popup-frame-p))
-	     ;; Ditto.
-	     popup-frame-p)))
-	(progn
-	  (cond (other
-		 ;; Pop up another emacs-w3m buffer and switch to BUFFER.
-		 (pop-to-buffer other)
-		 ;; Change the value for BUFFER's `w3m-initial-frames'.
-		 (setq w3m-initial-frames
-		       (prog1
-			   (copy-sequence w3m-initial-frames)
-			 (switch-to-buffer buffer))))
-		(frame
-		 ;; Pop up the existing frame which shows BUFFER.
-		 (pop-to-buffer buffer))
-		(t
-		 ;; Pop up a new frame.
-		 (let* ((pop-up-frame-alist (w3m-popup-frame-parameters))
-			(pop-up-frame-plist pop-up-frame-alist))
-		   (pop-to-buffer buffer))
-		 (setq frame (window-frame (get-buffer-window buffer t)))))
-	  ;; Raise, select and focus the frame.
-	  (if (fboundp 'select-frame-set-input-focus)
-	      (select-frame-set-input-focus frame)
-	    (raise-frame frame)
-	    (select-frame frame)
-	    (w3m-static-when (featurep 'xemacs)
-	      (focus-frame frame)))
-	  (w3m-history-restore-position))
-      (unless (prog1
-		  (eq buffer (current-buffer))
-		;; Simply switch to BUFFER in the current frame.
-		(if (w3m-popup-window-p)
-		    (let ((pop-up-windows t))
-		      (pop-to-buffer buffer))
-		  (switch-to-buffer buffer)))
-	(w3m-history-restore-position)))))
-
-(eval-when-compile
-  (when (and (fboundp 'select-frame-set-input-focus)
-	     (eq (symbol-function 'select-frame-set-input-focus) 'ignore))
-    (fmakunbound 'select-frame-set-input-focus)))
-
-(defun w3m-add-w3m-initial-frames (&optional frame)
-  "Add FRAME into `w3m-initial-frames', the buffer-local variable.
-It is done when FRAME is newly created for the emacs-w3m session.
-This function is added to the hook which is different with the Emacs
-version as follows:
-
-XEmacs          `create-frame-hook'
-Emacs 21,22     `after-make-frame-functions'
-Emacs 19        `after-make-frame-hook'
-
-Note that `after-make-frame-hook' doesn't take an argument."
-  (unless frame
-    (setq frame (selected-frame)))
-  ;; Share the opened frame in `w3m-initial-frames' over all emacs-w3m
-  ;; buffers if `w3m-use-tab' is non-nil.  Otherwise, the frame is
-  ;; appended into `w3m-initial-frames' only in the current buffer.
-  (with-current-buffer (window-buffer (frame-first-window frame))
-    (when (eq major-mode 'w3m-mode)
-      (unless (memq frame w3m-initial-frames)
-	(push frame w3m-initial-frames))
-      (when w3m-use-tab
-	(dolist (buffer (delq (current-buffer) (w3m-list-buffers t)))
-	  (set-buffer buffer)
-	  (unless (memq frame w3m-initial-frames)
-	    (push frame w3m-initial-frames)))))))
-
-(add-hook (if (featurep 'xemacs)
-	      'create-frame-hook
-	    'after-make-frame-functions)
-	  'w3m-add-w3m-initial-frames)
-
-(defun w3m-delete-w3m-initial-frames (frame)
-  "Delete FRAME from `w3m-initial-frames', the buffer-local variable.
-It is done when the FRAME in which emacs-w3m is running is deleted.
-This function is added to `delete-frame-hook' (`delete-frame-functions'
-is used instead in Emacs 22) or merged into the `delete-frame' function
-using `defadvice'."
-  (save-current-buffer
-    (dolist (buffer (w3m-list-buffers t))
-      (set-buffer buffer)
-      (setq w3m-initial-frames (delq frame w3m-initial-frames)))))
-
-(cond ((boundp 'delete-frame-functions)
-       (add-hook 'delete-frame-functions 'w3m-delete-w3m-initial-frames))
-      (t
-       (add-hook 'delete-frame-hook 'w3m-delete-w3m-initial-frames)))
-
-(defun w3m-delete-frames-and-windows (&optional exception)
-  "Delete all frames and windows related to emacs-w3m buffers.
-If EXCEPTION is a buffer, a window or a frame, it and related visible
-objects will not be deleted.  There are special cases; the following
-objects will not be deleted:
-
-1. The sole frame in the display device.
-2. Frames created not for emacs-w3m sessions.
-3. Frames showing not only emacs-w3m sessions but also other windows.\
-"
-  (let ((buffers (delq exception (w3m-list-buffers t)))
-	buffer windows window frame one-window-p flag)
-    (save-current-buffer
-      (while buffers
-	(setq buffer (pop buffers)
-	      windows (delq exception
-			    (get-buffer-window-list buffer 'no-minibuf t)))
-	(set-buffer buffer)
-	(while windows
-	  (setq window (pop windows)
-		frame (window-frame window))
-	  (when (and frame
-		     (not (eq frame exception)))
-	    (setq one-window-p
-		  (w3m-static-if (featurep 'xemacs)
-		      (one-window-p t frame)
-		    ;; Emulate XEmacs version's `one-window-p'.
-		    (prog2
-			(setq flag nil)
-			(catch 'exceeded
-			  (walk-windows (lambda (w)
-					  (when (eq (window-frame w) frame)
-					    (if flag
-						(throw 'exceeded nil)
-					      (setq flag t))))
-					'no-minibuf t)
-			  flag)
-		      (set-buffer buffer))))
-	    (if (and (memq frame w3m-initial-frames)
-		     (not (eq (next-frame frame) frame)))
-		(if (or
-		     ;; A frame having the sole window can be deleted.
-		     one-window-p
-		     ;; Also a frame having only windows for emacs-w3m
-		     ;; sessions or the buffer selection can be deleted.
-		     (progn
-		       (setq flag t)
-		       (walk-windows
-			(lambda (w)
-			  (when flag
-			    (if (eq w exception)
-				(setq flag nil)
-			      (set-buffer (window-buffer w))
-			      (setq flag (or (memq major-mode
-						   '(w3m-mode
-						     w3m-select-buffer-mode
-						     w3m-session-select-mode))
-					     (string-match "\\` ?\\*w3m[ -]"
-							   (buffer-name)))))))
-			'no-minibuf)
-		       (set-buffer buffer)
-		       flag))
-		    (delete-frame frame)
-		  (delete-window window))
-	      (unless one-window-p
-		(delete-window window)))))))))
-
-
-;;; Miscellaneous:
-
-(defconst w3m-url-fallback-base "http:///")
-(defconst w3m-url-invalid-regexp "\\`http:///")
-
-(defun w3m-url-valid (url)
-  (and url (not (string-match w3m-url-invalid-regexp url))
-       url))
-
-(defmacro w3m-set-match-data (list)
-  "Same as the `set-match-data'; convert points into markers under XEmacs."
-  (if (featurep 'xemacs)
-      `(let ((list ,list))
-	 (store-match-data (dolist (pt (prog1 list (setq list nil))
-				       (nreverse list))
-			     (push (if (markerp pt)
-				       pt
-				     (set-marker (make-marker) pt))
-				   list))))
-    `(set-match-data ,list)))
-
-(defun w3m-search-tag-1 (regexp)
-  "Subroutine used by `w3m-search-tag'."
-  (let ((start (point))
-	begin end)
-    (if (and (re-search-forward regexp nil t)
-	     (setq begin (match-beginning 0)
-		   end (match-end 0))
-	     (or (looking-at "/?>")
-		 (and (looking-at "[ \t\f\n]")
-		      (search-forward ">" nil t))))
-	(prog1
-	    (goto-char (match-end 0))
-	  (w3m-set-match-data
-	   (cond ((= end (match-beginning 0))
-		  (list begin (match-end 0)
-			(1+ begin) end))
-		 ((eq (char-before (match-beginning 0)) ?/)
-		  (if (= end (1- (match-beginning 0)))
-		      (list begin (match-end 0)
-			    (1+ begin) end)
-		    (list begin (match-end 0)
-			  (1+ begin) end
-			  end (- (match-end 0) 2))))
-		 (t
-		  (list begin (match-end 0)
-			(1+ begin) end
-			end (1- (match-end 0)))))))
-      (set-match-data nil)
-      (goto-char start)
-      nil)))
-
-(defmacro w3m-search-tag (&rest names)
-  "Search forward for a tag which begins with one of NAMES.
-This macro generates the form equivalent to:
-
-\(re-search-forward \"<\\\\(NAMES\\\\)\\\\([ \\t\\f\\n]+[^>]*\\\\)?/?>\" nil t)
-
-but it works even if the tag is considerably large.
-
-Note: this macro allows only strings for NAMES, that is, a form
-something like `(if foo \"bar\" \"baz\")' cannot be used."
-  `(w3m-search-tag-1 ,(concat "<" (regexp-opt names t))))
-
-(defun w3m-string-match-url-components-1 (string)
-  "Subroutine used by `w3m-string-match-url-components'."
-
-  ;; ^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?
-  ;;  12            3  4          5       6  7        8 9
-
-  (let ((md (make-vector 20 nil))
-	pt)
-    (with-temp-buffer
-      (w3m-static-unless (featurep 'xemacs)
-	(set-buffer-multibyte (multibyte-string-p string)))
-      (insert string)
-      (goto-char (point-min))
-      (aset md 0 0)
-      (aset md 1 (1- (point-max)))
-      (when (looking-at "[^:/?#]+:")
-	(aset md 2 0)
-	(aset md 4 0)
-	(goto-char (match-end 0))
-	(aset md 3 (setq pt (1- (point))))
-	(aset md 5 (1- pt)))
-      (when (looking-at "//")
-	(aset md 6 (1- (point)))
-	(forward-char 2)
-	(aset md 8 (1- (point)))
-	(skip-chars-forward "^/?#")
-	(aset md 7 (setq pt (1- (point))))
-	(aset md 9 pt))
-      (aset md 10 (1- (point)))
-      (skip-chars-forward "^?#")
-      (aset md 11 (setq pt (1- (point))))
-      (when (eq (char-after) ??)
-	(aset md 12 pt)
-	(forward-char 1)
-	(aset md 14 (1- (point)))
-	(skip-chars-forward "^#")
-	(aset md 13 (setq pt (1- (point))))
-	(aset md 15 pt))
-      (unless (eobp)
-	(aset md 16 (1- (point)))
-	(aset md 18 (point))
-	(aset md 17 (setq pt (1- (point-max))))
-	(aset md 19 pt)))
-    (set-match-data (append md nil)))
-  0)
-
-(defconst w3m-url-components-regexp
-  "\\`\\(\\([^:/?#]+\\):\\)?\\(//\\([^/?#]*\\)\\)?\
-\\([^?#]*\\)\\(\\?\\([^#]*\\)\\)?\\(#\\(.*\\)\\)?\\'"
-  "Regexp used for parsing a URI Reference.
-It matches the potential four components and fragment identifier of a
-URI reference.  See RFC2396, Appendix B for details.")
-
-(defmacro w3m-string-match-url-components (string)
-  "Do the same thing as `(string-match w3m-url-components-regexp STRING)'.
-But this function should work even if STRING is considerably long."
-  `(let ((string ,string))
-     (condition-case nil
-	 (string-match w3m-url-components-regexp string)
-       (error ;; Stack overflow in regexp matcher
-	(w3m-string-match-url-components-1 string)))))
-
-(defun w3m-time-newer-p (a b)
-  "Return t, if A is newer than B.  Otherwise return nil.
-A and B are lists which represent time in Emacs-style.  If value is
-nil, it is regarded as the oldest time."
-  (and a
-       (or (not b)
-	   (or (> (car a) (car b))
-	       (and (= (car a) (car b))
-		    (> (nth 1 a) (nth 1 b)))))))
-
-(defun w3m-time-lapse-seconds (start end)
-  "Return lapse seconds from START to END.
-START and END are lists which represent time in Emacs-style."
-  (+ (* (- (car end) (car start)) 65536)
-     (cadr end)
-     (- (cadr start))))
-
-(defalias 'w3m-float-time
-  (if (fboundp 'float-time)
-      'float-time
-    (lambda (&optional specified-time)
-      "Return the current time, as a float number of seconds since the epoch.
-If an argument is given, it specifies a time to convert to float
-instead of the current time.  The argument should have the forms:
- (HIGH . LOW) or (HIGH LOW USEC) or (HIGH LOW . USEC).
-
-WARNING: Since the result is floating point, it may not be exact.
-Do not use this function if precise time stamps are required."
-      (let ((time (or specified-time (current-time))))
-	(+ (* (car time) 65536.0)
-	   (cadr time)
-	   (cond ((consp (setq time (cddr time)))
-		  (/ (car time) 1000000.0))
-		 (time
-		  (/ time 1000000.0))
-		 (t
-		  0)))))))
-
-(defun w3m-url-local-p (url)
-  "If URL points a file on the local system, return non-nil value.
-Otherwise return nil."
-  (string-match "\\`file:" url))
-
-(defconst w3m-url-authinfo-regexp
-  "\\`\\([^:/?#]+:\\)?//\\([^/?#:]+\\)\\(?::\\([^/?#@]+\\)\\)?@"
-  "Regular expression for parsing the authentication part of a URI reference")
-
-(defun w3m-url-authinfo (url)
-  "Return a user name and a password to authenticate URL."
-  (when (string-match w3m-url-authinfo-regexp url)
-    (cons (match-string 2 url)
-	  (match-string 3 url))))
-
-(defun w3m-url-strip-authinfo (url)
-  "Remove the authentication part from the URL."
-  (if (string-match w3m-url-authinfo-regexp url)
-      (concat (match-string 1 url)
-	      "//"
-	      (substring url (match-end 0)))
-    url))
-
-(defun w3m-url-strip-fragment (url)
-  "Remove the fragment identifier from the URL."
-  (if (string-match "\\`\\([^#]*\\)#" url)
-      (match-string 1 url)
-    url))
-
-(defun w3m-url-strip-query (url)
-  "Remove the query part and the fragment identifier from the URL."
-  (if (string-match "\\`\\([^?#]*\\)[?#]" url)
-      (match-string 1 url)
-    url))
-
-(defun w3m-get-server-hostname (url)
-  "Extract a server root from URL."
-  (when (string-match "\\`about://[^/?#]+/" url)
-    (setq url (substring url (match-end 0))))
-  (setq url (w3m-url-strip-authinfo url))
-  (if (string-match "\\`[^:/?#]+://\\([^/?#]+\\)" url)
-      (downcase (match-string 1 url))
-    url))
-
-(defun w3m-which-command (command)
-  (when (stringp command)
-    (if (and (file-name-absolute-p command)
-	     (file-executable-p command))
-	command
-      (setq command (file-name-nondirectory command))
-      (catch 'found-command
-	(let (bin)
-	  (dolist (dir exec-path)
-	    (setq bin (expand-file-name command dir))
-	    (when (or (and (file-executable-p bin)
-			   (not (file-directory-p bin)))
-		      (and (file-executable-p (setq bin (concat bin ".exe")))
-			   (not (file-directory-p bin))))
-	      (throw 'found-command bin))))))))
-
-(defun w3m-cancel-refresh-timer (&optional buffer)
-  "Cancel the timer for REFRESH attribute in META tag."
-  (when w3m-use-refresh
-    (with-current-buffer (or buffer (current-buffer))
-      (setq w3m-current-refresh nil)
-      (when w3m-refresh-timer
-	(w3m-static-if (featurep 'xemacs)
-	    (delete-itimer w3m-refresh-timer)
-	  (cancel-timer w3m-refresh-timer))
-	(setq w3m-refresh-timer nil)))))
-
-(cond ((featurep 'xemacs)
-       ;; The function of the XEmacs version doesn't work correctly
-       ;; for wide characters.
-       (defun w3m-truncate-string (str end-column)
-	 "Truncate string STR to end at column END-COLUMN."
-	 (let ((len (length str))
-	       (column 0)
-	       (idx 0))
-	   (condition-case nil
-	       (while (< column end-column)
-		 (setq column (+ column (char-width (aref str idx)))
-		       idx (1+ idx)))
-	     (args-out-of-range (setq idx len)))
-	   (when (> column end-column)
-	     (setq idx (1- idx)))
-	   (substring str 0 idx))))
-      (t
-       (defalias 'w3m-truncate-string 'truncate-string-to-width)))
-
-(defun w3m-assoc-ignore-case (name alist)
-  "Return the element of ALIST whose car equals NAME ignoring its case."
-  (let ((dname (downcase name))
-	match)
-    (while alist
-      (when (and (consp (car alist))
-		 (string= dname (downcase (car (car alist)))))
-	(setq match (car alist)
-	      alist nil))
-      (setq alist (cdr alist)))
-    match))
-
-(defun w3m-prin1 (object &optional stream)
-  "Like `prin1', except that control chars will be represented with ^ as
-`cat -v' does."
-  (if (stringp object)
-      (let (rest)
-	(dolist (char (append object nil) rest)
-	  (cond ((eq char ?\C-?)
-		 (push "^?" rest))
-		((or (memq char '(?\t ?\n))
-		     (>= char ?\ ))
-		 (push (char-to-string char) rest))
-		(t
-		 (push (concat "^" (char-to-string (+ 64 char))) rest))))
-	(prin1 (apply 'concat (nreverse rest)) stream))
-    (prin1 object stream)))
-
-(defun w3m-modify-plist (plist &rest properties)
-  "Change values in PLIST corresponding to PROPERTIES.  This is similar
-to `plist-put', but handles plural symbol and value pairs and remove
-pairs from PLIST whose value is nil."
-  (while properties
-    (setq plist (plist-put plist (car properties) (cadr properties))
-	  properties (cddr properties)))
-  (while plist
-    (if (cadr plist)
-	(setq properties (nconc properties (list (car plist) (cadr plist)))))
-    (setq plist (cddr plist)))
-  properties)
-
-(def-edebug-spec w3m-insert-string (form))
-(defmacro w3m-insert-string (string)
-  "Insert STRING at point without conversions in either case the
-multibyteness of the buffer."
-  (if (and (fboundp 'string-as-multibyte)
-	   (subrp (symbol-function 'string-as-multibyte)))
-      `(let ((string ,string))
-	 (insert (if enable-multibyte-characters
-		     (string-as-multibyte string)
-		   (string-as-unibyte string))))
-    `(insert ,string)))
-
-(defun w3m-custom-hook-initialize (symbol value)
-  "Initialize the hook option pointed by the SYMBOL with the default VALUE."
-  (if (boundp symbol)
-      (progn
-	(setq value (eval value))
-	(while value
-	  (add-hook symbol (car value))
-	  (setq value (cdr value))))
-    (custom-initialize-set symbol value)))
-
-(defun w3m-run-mode-hooks (&rest funcs)
-  "Run `run-mode-hooks' if it is available, otherwise `run-hooks'."
-  (if (fboundp 'run-mode-hooks)
-      (apply 'run-mode-hooks funcs)
-    (apply 'run-hooks funcs)))
-
-(defmacro w3m-keep-region-active ()
-  "Keep the region active after evaluating this current command.
-In XEmacs, `zmacs-region-stays' is set to nil everywhen a command is
-evaluated.  This means that the region is always deactivated after
-evaluating the current command.  This macro sets t to it, and keeps
-the region active."
-  (when (featurep 'xemacs)
-    '(if (interactive-p)
-	 (setq zmacs-region-stays t))))
-
-(defmacro w3m-deactivate-region ()
-  "Deactivate the region."
-  (if (featurep 'xemacs)
-      '(zmacs-deactivate-region)
-    '(deactivate-mark)))
-
-(defmacro w3m-region-active-p ()
-  "Say whether the region is active."
-  (if (fboundp 'region-active-p)
-      (list 'region-active-p)
-    (list 'and 'transient-mark-mode 'mark-active)))
-
-(eval-and-compile
-  (cond
-   ((fboundp 'replace-regexp-in-string)
-    (defun w3m-replace-in-string  (string regexp newtext &optional literal)
-      ;;(replace-regexp-in-string regexp newtext string nil literal)))
-      ;;
-      ;; Don't call the symbol function `replace-regexp-in-string' directly
-      ;; in order to silence the byte-compiler when an Emacs which doesn't
-      ;; provide it is used.  The following form generates exactly the same
-      ;; byte-code.
-      (funcall (symbol-function 'replace-regexp-in-string)
-	       regexp newtext string nil literal)))
-   (t
-    (defalias 'w3m-replace-in-string 'replace-in-string))))
-
-(if (fboundp 'compare-strings)
-    (defalias 'w3m-compare-strings 'compare-strings)
-  (defun w3m-compare-strings (string1 start1 end1 string2 start2 end2)
-    "Compare the contents of two strings."
-    (let* ((str1 (substring string1 start1 end1))
-	   (str2 (substring string2 start2 end2))
-	   (len (min (length str1) (length str2)))
-	   (i 0))
-      (if (string= str1 str2)
-	  t
-	(setq i (catch 'ignore
-		  (while (< i len)
-		    (when (not (eq (aref str1 i) (aref str2 i)))
-		      (throw 'ignore i))
-		    (setq i (1+ i)))
-		  i))
-	(1+ i)))))
-
-(eval-and-compile
-  ;; This function will be redefined in w3m-ems.el.
-  (unless (fboundp 'w3m-force-window-update)
-    (defalias 'w3m-force-window-update 'ignore)))
-
-(if (boundp 'header-line-format)
-    (defun w3m-force-window-update-later (buffer &optional seconds)
-      "Update the header-line appearance in BUFFER after SECONDS.
-If SECONDS is omitted, it defaults to 0.5."
-      (run-at-time (or seconds 0.5) nil
-		   (lambda (buffer)
-		     (when (and (buffer-live-p buffer)
-				(eq (get-buffer-window buffer t)
-				    (selected-window)))
-		       (w3m-force-window-update)))
-		   buffer))
-  (defalias 'w3m-force-window-update-later 'ignore))
-
-(if (fboundp 'read-number)
-    (defalias 'w3m-read-number 'read-number)
-  (defun w3m-read-number (prompt &optional default)
-    "Read a numeric value in the minibuffer, prompting with PROMPT.
-DEFAULT specifies a default value to return if the user just types RET.
-The value of DEFAULT is inserted into PROMPT."
-    (let ((n nil))
-      (when default
-	(setq prompt
-	      (if (string-match "\\(\\):[ \t]*\\'" prompt)
-		  (replace-match (format " (default %s)" default) t t prompt 1)
-		(w3m-replace-in-string prompt "[ \t]*\\'"
-				       (format " (default %s) " default)
-				       t))))
-      (while
-	  (progn
-	    (let ((str (read-from-minibuffer
-			prompt nil nil nil nil
-			(and default (number-to-string default)))))
-	      (condition-case nil
-		  (setq n (cond
-			   ((zerop (length str)) default)
-			   ((stringp str) (read str))))
-		(error nil)))
-	    (unless (numberp n)
-	      (message "Please enter a number.")
-	      (sit-for 1)
-	      t)))
-      n)))
-
-(defun w3m-make-menu-item (japan english)
-  "Make menu item."
-  (cond
-   ((and w3m-use-japanese-menu (featurep 'xemacs))
-    (concat japan "%_ "))
-   (w3m-use-japanese-menu
-    japan)
-   (t
-    english)))
-
-(defvar w3m-make-menu-commands-keys nil)
-
-(defun w3m-make-menu-commands (menu-commands)
-  "Make menu items."
-  (mapcar
-   (lambda (c)
-     (if (consp c)
-	 (vector
-	  (cadr c)
-	  (if (nth 3 c)
-	      `(progn
-		 (switch-to-buffer w3m-tab-button-menu-current-buffer)
-		 (funcall (function ,(car c)) ,@(nthcdr 4 c)))
-	    `(save-window-excursion
-	       (switch-to-buffer w3m-tab-button-menu-current-buffer)
-	       (funcall (function ,(car c)) ,@(nthcdr 4 c))))
-	  :active (nth 2 c)
-	  :keys (or (and (assq (car c) w3m-make-menu-commands-keys)
-			 (cdr (assq (car c) w3m-make-menu-commands-keys)))
-		    (let ((key (where-is-internal (car c) w3m-mode-map)))
-		      (when key
-			(setq w3m-make-menu-commands-keys
-			      (cons (cons (car c)
-					  (key-description (car key)))
-				    w3m-make-menu-commands-keys))
-			(cdr (car w3m-make-menu-commands-keys))))))
-       (symbol-name c)))
-   menu-commands))
-
-(eval-when-compile (require 'wid-edit))
-(defun w3m-widget-type-convert-widget (widget)
-  "Convert the car of `:args' as a widget type in WIDGET."
-  (apply 'widget-convert (widget-type widget)
-	 (eval (car (widget-get widget :args)))))
-
-(defun w3m-unseen-buffer-p (buffer)
-  "Return t if buffer unseen."
-  (with-current-buffer buffer
-    w3m-buffer-unseen))
-
-(defun w3m-visited-file-modtime ()
-  "Replacement of `visited-file-modtime'.
-It returns a list of two integers if the current buffer visits a file,
-otherwise returns the number 0.  In modern Emacsen, this function will
-get to be the alias to `visited-file-modtime'."
-  (let ((modtime (visited-file-modtime)))
-    (cond ((consp (cdr-safe modtime))
-	   (defalias 'w3m-visited-file-modtime 'visited-file-modtime)
-	   modtime)
-	  ((integerp (cdr-safe modtime))
-	   ;; XEmacs version returns `(0 . 0)' if no file is visited.
-	   (if (and (= (car modtime) 0) (= (cdr modtime) 0))
-	       0
-	     (list (car modtime) (cdr modtime))))
-	  (t
-	   modtime))))
-
-;;; Punycode RFC 3492:
-
-(defconst w3m-puny-code-regex "xn--\\([-0-9a-zA-z]+\\)")
-(defconst w3m-puny-code-nonascii "[^\000-\177]")
-
-(defconst w3m-puny-base 36)
-(defconst w3m-puny-tmin 1)
-(defconst w3m-puny-tmax 26)
-(defconst w3m-puny-damp 700)
-(defconst w3m-puny-skew 38)
-(defconst w3m-puny-initial-bias 72)
-(defconst w3m-puny-initial-n 128)
-(defconst w3m-puny-delimiter ?-)
-
-(defun w3m-puny-adapt (delta numpoints firsttime)
-  (let ((k 0))
-    (if firsttime
-	(setq delta (/ delta w3m-puny-damp))
-      (setq delta (/ delta 2)))
-    (setq delta (+ delta (/ delta numpoints)))
-    (while (> delta (/ (* (- w3m-puny-base w3m-puny-tmin) w3m-puny-tmax) 2))
-      (setq delta (/ delta (- w3m-puny-base w3m-puny-tmin)))
-      (setq k (+ k w3m-puny-base)))
-    (+ k (/ (* (1+ (- w3m-puny-base w3m-puny-tmin)) delta) (+ delta w3m-puny-skew)))))
-
-(defun w3m-puny-decode-digit (cp)
-  (if (< (- cp 48) 10)
-      (- cp 22)
-    (if (< (- cp 65) 26)
-	(- cp 65)
-      (if (< (- cp 97) 26)
-	  (- cp 97)
-	w3m-puny-base))))
-
-(defun w3m-puny-encode-digit (d)
-  (if (< d 26)
-      (+ d 22 75) ;; a-z
-    (+ d 22))) ;; 0-9
-
-(defun w3m-puny-decode1 (input)
-  (let* ((n w3m-puny-initial-n)
-	 (bias w3m-puny-initial-bias)
-	 (len (length input))
-	 (in 0) (out 0)
-	 (i 0) (b 0)
-	 digit thr oldi w k output ret)
-    (dotimes (j len)
-      (if (= (aref input j) w3m-puny-delimiter) (setq b j)))
-    (dotimes (j b)
-      (setq output (cons (aref input j) output))
-      (setq out (1+ out)))
-    (setq output (nreverse output))
-    (if (> b 0) (setq in (1+ b)) (setq in 0))
-    (while (< in len)
-      (setq oldi i)
-      (setq w 1)
-      (setq k w3m-puny-base)
-      (catch 'loop
-	(while t
-	  (if (>= in len) (error "punycode bad input"))
-	  (setq digit (w3m-puny-decode-digit (aref input in)))
-	  (if (>= digit w3m-puny-base) (error "punycode bad input"))
-	  (setq in (1+ in))
-	  (setq i (+ i (* digit w)))
-	  (if (<= k bias)
-	      (setq thr w3m-puny-tmin)
-	    (if (>= k (+ bias w3m-puny-tmax))
-		(setq thr w3m-puny-tmax)
-	      (setq thr (- k bias))))
-	  (if (< digit thr) (throw 'loop nil))
-	  (setq w (* w (- w3m-puny-base thr)))
-	  (setq k (+ k w3m-puny-base))))
-      (setq out (1+ out))
-      (setq bias (w3m-puny-adapt (- i oldi) out (= oldi 0)))
-      (setq n (+ n (/ i out)))
-      (setq i (% i out))
-      (if (= i 0)
-	  (setq output (cons n (nthcdr i output)))
-	(setcdr (nthcdr (1- i) output) (cons n (nthcdr i output))))
-      (setq i (1+ i)))
-    (setq ret (make-string (* out 2) ?a))
-    (let ((j 0))
-      (dolist (op output)
-	(aset ret j (/ op 256))
-	(setq j (1+ j))
-	(aset ret j (% op 256))
-	(setq j (1+ j))))
-    ret))
-
-(defun w3m-puny-decode (input)
-  (condition-case nil
-      (save-match-data
-	(decode-coding-string
-	 (w3m-puny-decode1 (substring input 4)) ;; xn--
-	 w3m-puny-utf-16be))
-    (error input)))
-
-(defun w3m-puny-decode-url (url)
-  "Decode URL from punycode."
-  (let ((case-fold-search t)
-	prot host after)
-    (when (and w3m-puny-utf-16be
-	       (string-match w3m-puny-code-regex url))
-      (when (string-match "\\`[^:/]+://\\([^/]+\\)" url)
-	(setq prot (substring url 0 (match-beginning 1)))
-	(setq host (substring url (match-beginning 1) (match-end 1)))
-	(setq after (substring url (match-end 0)))
-	(while (string-match w3m-puny-code-regex host)
-	  (setq host
-		(concat (substring host 0 (match-beginning 0))
-			(w3m-puny-decode
-			 (substring host (match-beginning 0) (match-end 0)))
-			(substring host (match-end 0)))))
-	(setq url (concat prot host after))))
-    url))
-
-(defun w3m-puny-encode1 (input)
-  (let* ((len (length input))
-	 (h-len (/ len 2))
-	 (n w3m-puny-initial-n)
-	 (bias w3m-puny-initial-bias)
-	 (delta 0) (out 0)
-	 (output (make-string (* len 4) ?a))
-	 h b m q k thr uni)
-    (dotimes (j len)
-      (setq uni (aref input j))
-      (setq j (1+ j))
-      (setq uni (+ (* uni 256) (aref input j)))
-      (when (< uni 128) ;; basic
-	(aset output out uni)
-	(setq out (1+ out))))
-    (setq h out)
-    (setq b out)
-    (when (> b 0)
-      (aset output out w3m-puny-delimiter)
-      (setq out (1+ out)))
-    (while (< h h-len)
-      (setq m 65536) ;; 17bits
-      (dotimes (j len)
-	(setq uni (aref input j))
-	(setq j (1+ j))
-	(setq uni (+ (* uni 256) (aref input j)))
-	(if (and (>= uni n) (< uni m)) (setq m uni)))
-      (setq delta (+ delta (* (- m n) (1+ h))))
-      (setq n m)
-      (dotimes (j len)
-	(setq uni (aref input j))
-	(setq j (1+ j))
-	(setq uni (+ (* uni 256) (aref input j)))
-	(when (< uni n)
-	  (setq delta (1+ delta))
-	  (if (= delta 0) (error "punycode overflow")))
-	(when (= uni n)
-	  (setq q delta)
-	  (setq k w3m-puny-base)
-	  (catch 'loop
-	    (while t
-	      (if (<= k bias)
-		  (setq thr w3m-puny-tmin)
-		(if (>= k (+ bias w3m-puny-tmax))
-		    (setq thr w3m-puny-tmax)
-		  (setq thr (- k bias))))
-	      (if (< q thr) (throw 'loop nil))
-	      (aset output out (w3m-puny-encode-digit (+ thr (% (- q thr) (- w3m-puny-base thr)))))
-	      (setq out (1+ out))
-	      (setq q (/ (- q thr) (- w3m-puny-base thr)))
-	      (setq k (+ k w3m-puny-base))))
-	  (aset output out (w3m-puny-encode-digit q))
-	  (setq out (1+ out))
-	  (setq bias (w3m-puny-adapt delta (1+ h) (= h b)))
-	  (setq delta 0)
-	  (setq h (1+ h))))
-      (setq delta (1+ delta))
-      (setq n (1+ n)))
-    (substring output 0 out)))
-
-(defun w3m-puny-encode (input)
-  (condition-case nil
-      (concat "xn--" (w3m-puny-encode1
-		      (encode-coding-string input w3m-puny-utf-16be)))
-    (error input)))
-
-(defun w3m-puny-encode-url (url)
-  "Encode URL to punycode."
-  (if (and w3m-puny-utf-16be
-	   (not (w3m-url-local-p url))
-	   (string-match w3m-puny-code-nonascii url))
-      (let (beg end idn)
-	(with-temp-buffer
-	  (insert url)
-	  (goto-char (point-min))
-	  (if (search-forward "://" nil t)
-	      (setq beg (point))
-	    (setq beg (point-min)))
-	  (if (search-forward "/" nil t)
-	      (setq end (1- (point)))
-	    (setq end (point-max)))
-	  (save-restriction
-	    (narrow-to-region beg end)
-	    (goto-char (point-min))
-	    (while (re-search-forward "[^.]?[^.\000-\177][^.]*" nil t)
-	      (setq idn (match-string-no-properties 0))
-	      (delete-region (match-beginning 0) (match-end 0))
-	      (insert (w3m-puny-encode idn))))
-	  (buffer-substring-no-properties (point-min) (point-max))))
-    url))
-
-(provide 'w3m-util)
-
-;;; w3m-util.el ends here

=== removed file 'share/emacs/site-lisp/w3m/w3m-weather.el'
--- share/emacs/site-lisp/w3m/w3m-weather.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m-weather.el	1970-01-01 00:00:00 +0000
@@ -1,510 +0,0 @@
-;;; w3m-weather.el --- Look weather forecast -*- coding: iso-2022-7bit; -*-
-
-;; Copyright (C) 2001, 2002, 2003, 2005
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-;; Keywords: w3m, WWW, hypermedia
-
-;; This file is a part of emacs-w3m.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-
-;;; Commentary:
-
-;; w3m-weather.el is the add-on program of emacs-w3m to look weather
-;; foracast.  For more detail about emacs-w3m, see:
-;;
-;;    http://emacs-w3m.namazu.org/
-
-
-;;; How to install:
-
-;; Please put this file to appropriate directory, and if you want
-;; byte-compile it.  And add following lisp expressions to your
-;; ~/.emacs.
-;;
-;;     (autoload 'w3m-weather "w3m-weather" "Display weather report." t)
-
-
-;;; Code:
-
-(eval-when-compile (require 'cl))
-(require 'w3m)
-
-(defconst w3m-weather-completion-table
-  (eval-when-compile
-    (let* ((format "http://weather.yahoo.co.jp/weather/jp/%s.html")
-	   (alist
-	    '(;; URL$B$N0lIt(B, $B4A;zI=5-(B, $B%m!<%^;zI=5-(B, $BJLL>(B
-	      ;; ($B%m!<%^;zI=5-$G$OD92;$r>JN,$7$J$$$3$H(B)
-	      ("1a/1100" "$BF;KL!&=!C+(B" "douhokusouya" "souya")
-	      ("1a/1200" "$BF;KL!&>e@n(B" "douhokukamikawa" "kamikawa")
-	      ("1a/1300" "$BF;KL!&N1K((B" "douhokurumoi" "rumoi")
-	      ("1c/1710" "$BF;El!&LVAv(B" "doutouabashiri" "abashiri")
-	      ("1c/1720" "$BF;El!&KL8+(B" "doutoukitami" "kitami")
-	      ("1c/1730" "$BF;El!&LfJL(B" "doutoumonbetsu" "monbetsu")
-	      ("1c/1800" "$BF;El!&:,<<(B" "doutounemuro" "nemuro")
-	      ("1c/1900" "$BF;El!&6|O)(B" "doutoukushiro" "kushiro")
-	      ("1c/2000" "$BF;El!&==>!(B" "doutoutokachi" "tokachi")
-	      ("1b/1400" "$BF;1{!&@P<m(B" "dououishikari" "ishikari")
-	      ("1b/1500" "$BF;1{!&6uCN(B" "douousorachi" "sorachi")
-	      ("1b/1600" "$BF;1{!&8e;V(B" "dououshiribeshi" "shiribeshi")
-	      ("1d/2400" "$BF;Fn!&I0;3(B" "dounanhiyama" "hiyama")
-	      ("1d/2100" "$BF;Fn!&C@?6(B" "dounaniburi" "iburi")
-	      ("1d/2200" "$BF;Fn!&F|9b(B" "dounanhidaka" "hidaka")
-	      ("1d/2300" "$BF;Fn!&EOEg(B" "dounanoshima" "oshima")
-	      ("1d/2400" "$BF;Fn!&[X;3(B" "dounanhiyama" "hiyama")
-	      ("2/3110" "$B@D?98)!&DE7Z(B" "aomorikentsugaru" "tsugaru")
-	      ("2/3120" "$B@D?98)!&2<KL(B" "aomorikenshimokita" "shimokita")
-	      ("2/3130" "$B@D?98)!&;0H,>eKL(B"
-	       "aomorikensanpachikamikita" "sanpachikamikita")
-	      ("3/3310" "$B4d<j8)!&FbN&It(B" "iwatekennairikubu")
-	      ("3/3320" "$B4d<j8)!&1h4_KLIt(B" "iwatekenenganhokubu")
-	      ("3/3330" "$B4d<j8)!&1h4_FnIt(B" "iwatekenengannanbu")
-	      ("5/3210" "$B=)ED8)!&1h4_It(B" "akitakenenganbu")
-	      ("5/3220" "$B=)ED8)!&FbN&It(B" "akitakennairikubu")
-	      ("4/3410" "$B5\>k8)!&ElIt(B" "miyagikentoubu")
-	      ("4/3420" "$B5\>k8)!&@>It(B" "miyagikenseibu")
-	      ("6/3510" "$B;37A8)!&B<;3(B" "yamagatakenmurayama" "murayama")
-	      ("6/3520" "$B;37A8)!&CV;r(B" "yamagatakenokitama" "okitama")
-	      ("6/3530" "$B;37A8)!&>1Fb(B" "yamagatakenshonai" "shounai")
-	      ("6/3540" "$B;37A8)!&:G>e(B" "yamagatakenmogami" "mogami")
-	      ("7/3610" "$BJ!Eg8)!&CfDL$j(B" "hukushimakennakadoori" "nakadoori")
-	      ("7/3620" "$BJ!Eg8)!&IMDL$j(B" "hukushimakenhamadoori" "hamadoori")
-	      ("7/3630" "$BJ!Eg8)!&2qDE(B" "hukushimakenaidu" "aidu")
-	      ("8/4010" "$B0q>k8)!&KLIt(B" "ibaragikenhokubu")
-	      ("8/4020" "$B0q>k8)!&FnIt(B" "ibaragikennanbu")
-	      ("9/4110" "$BFJLZ8)!&FnIt(B" "tochigikennanbu")
-	      ("9/4120" "$BFJLZ8)!&KLIt(B" "tochigikenhokubu")
-	      ("10/4210" "$B72GO8)!&FnIt(B" "gunmakennanbu")
-	      ("10/4220" "$B72GO8)!&KLIt(B" "gunmakenhokubu")
-	      ("11/4310" "$B:k6L8)!&FnIt(B" "saitamakennanbu")
-	      ("11/4320" "$B:k6L8)!&KLIt(B" "saitamakenhokubu")
-	      ("11/4330" "$B:k6L8)!&CaIc(B" "saitamakenchichibu")
-	      ("12/4510" "$B@iMU8)!&KL@>It(B" "chibakenhokuseibu")
-	      ("12/4520" "$B@iMU8)!&KLElIt(B" "chibakenhokutoubu")
-	      ("12/4530" "$B@iMU8)!&FnIt(B" "chibakennanbu")
-	      ("13/4410" "$BEl5~ET!&El5~(B" "toukyoutotoukyou" "toukyou")
-	      ("13/4420" "$BEl5~ET!&0KF&=tEgKLIt(B"
-	       "toukyoutoizushotouhokubu" "izushotouhokubu")
-	      ("13/100" "$BEl5~ET!&0KF&=tEgFnIt(B"
-	       "toukyoutoizushotounanbu" "izushotounanbu")
-	      ("13/9600" "$BEl5~ET!&>.3^86=tEg(B"
-	       "toukyoutoogasawarashotou" "ogasawarashotou")
-	      ("14/4610" "$B?@F`@n8)!&ElIt(B" "kanagawakentoubu")
-	      ("14/4620" "$B?@F`@n8)!&@>It(B" "kanagawakenseibu")
-	      ("15/5410" "$B?73c8)!&2<1[(B" "niigatakenkaetsu" "kaetsu")
-	      ("15/5420" "$B?73c8)!&Cf1[(B" "niigatakenchuuetsu" "chuuetsu")
-	      ("15/5430" "$B?73c8)!&>e1[(B" "niigatakenjouetsu" "jouetsu")
-	      ("15/5440" "$B?73c8)!&:4EO(B" "niigatakensado" "sado")
-	      ("16/5510" "$BIY;38)!&ElIt(B" "toyamakentoubu")
-	      ("16/5520" "$BIY;38)!&@>It(B" "toyamakenseibu")
-	      ("17/5610" "$B@P@n8)!&2C2l(B" "ishikawakenkaga" "kaga")
-	      ("17/5620" "$B@P@n8)!&G=EP(B" "ishikawakennoto" "noto")
-	      ("18/5710" "$BJ!0f8)!&NfKL(B" "hukuikenreihoku" "reihoku")
-	      ("18/5720" "$BJ!0f8)!&NfFn(B" "hukuikenreinan" "reinan")
-	      ("19/4910" "$B;3M|8)!&Cf@>It(B" "yamanashikenchuuseibu")
-	      ("19/4920" "$B;3M|8)!&IY;N8^8P(B" "yamanashikenhujigoko" "hujigoko")
-	      ("20/4810" "$BD9Ln8)!&KLIt(B" "naganokenhokubu")
-	      ("20/4820" "$BD9Ln8)!&CfIt(B" "naganokenchuubu")
-	      ("20/4830" "$BD9Ln8)!&FnIt(B" "naganokennanbu")
-	      ("21/5210" "$B4tIl8)!&H~G;(B" "gihukenmino" "mino")
-	      ("21/5220" "$B4tIl8)!&HtBM(B" "gihukenhida" "hida")
-	      ("22/5010" "$B@E2,8)!&CfIt(B" "shizuokakenchuubu")
-	      ("22/5020" "$B@E2,8)!&0KF&(B" "shizuokakenizu" "izu")
-	      ("22/5030" "$B@E2,8)!&ElIt(B" "shizuokakentoubu")
-	      ("22/5040" "$B@E2,8)!&@>It(B" "shizuokakenseibu")
-	      ("23/5110" "$B0&CN8)!&@>It(B" "aichikenseibu")
-	      ("23/5120" "$B0&CN8)!&ElIt(B" "aichikentoubu")
-	      ("24/5310" "$B;0=E8)!&KLCfIt(B" "miekenhokuchuubu")
-	      ("24/5320" "$B;0=E8)!&FnIt(B" "miekennanbu")
-	      ("25/6010" "$B<"2l8)!&FnIt(B" "shigakennanbu")
-	      ("25/6020" "$B<"2l8)!&KLIt(B" "shigakenhokubu")
-	      ("26/400" "$B5~ETI\!&KLIt(B" "kyoutohuhokubu")
-	      ("26/6100" "$B5~ETI\!&FnIt(B" "kyoutohunanbu")
-	      ("27/6200" "$BBg:eI\(B" "oosakahu" "oosaka")
-	      ("28/500" "$BJ<8K8)!&KLIt(B" "hyougokenhokubu")
-	      ("28/6300" "$BJ<8K8)!&FnIt(B" "hyougokennanbu")
-	      ("29/6410" "$BF`NI8)!&KLIt(B" "narakenhokubu")
-	      ("29/6420" "$BF`NI8)!&FnIt(B" "narakennanbu")
-	      ("30/6510" "$BOB2N;38)!&KLIt(B" "wakayamakenhokubu")
-	      ("30/6520" "$BOB2N;38)!&FnIt(B" "wakayamakennanbu")
-	      ("31/6910" "$BD;<h8)!&ElIt(B" "tottorikentoubu")
-	      ("31/6920" "$BD;<h8)!&@>It(B" "tottorikenseibu")
-	      ("32/600" "$BEg:,8)!&1#4t(B" "shimanekenoki" "oki")
-	      ("32/6810" "$BEg:,8)!&ElIt(B" "shimanekentoubu")
-	      ("32/6820" "$BEg:,8)!&@>It(B" "shimanekenseibu")
-	      ("33/6610" "$B2,;38)!&FnIt(B" "okayamakennanbu")
-	      ("33/6620" "$B2,;38)!&KLIt(B" "okayamakenhokubu")
-	      ("34/6710" "$B9-Eg8)!&FnIt(B" "hiroshimakennanbu")
-	      ("34/6720" "$B9-Eg8)!&KLIt(B" "hiroshimakenhokubu")
-	      ("35/8110" "$B;38}8)!&@>It(B" "yamaguchikenseibu")
-	      ("35/8120" "$B;38}8)!&CfIt(B" "yamaguchikenchuubu")
-	      ("35/8140" "$B;38}8)!&KLIt(B" "yamaguchikenhokubu")
-	      ("35/8130" "$B;38}8)!&ElIt(B" "yamaguchikentoubu")
-	      ("36/7110" "$BFAEg8)!&KLIt(B" "tokushimakenhokubu")
-	      ("36/7120" "$BFAEg8)!&FnIt(B" "tokushimakennanbu")
-	      ("37/7200" "$B9a@n8)(B" "kagawaken" "kagawa")
-	      ("38/7320" "$B0&I28)!&ElM=(B" "ehimekentouyo" "touyo")
-	      ("38/7330" "$B0&I28)!&FnM=(B" "ehimekennanyo" "nanyo")
-	      ("38/7310" "$B0&I28)!&CfM=(B" "ehimekenchuuyo" "chuuyo")
-	      ("39/7410" "$B9bCN8)!&CfIt(B" "kouchikenchuubu")
-	      ("39/7420" "$B9bCN8)!&ElIt(B" "kouchikentoubu")
-	      ("39/7430" "$B9bCN8)!&@>It(B" "kouchikenseibu")
-	      ("40/8210" "$BJ!2,8)!&J!2,(B" "hukuokakenhukuoka" "hukuoka")
-	      ("40/8220" "$BJ!2,8)!&KL6e=#(B" "hukuokakenkitakyushu" "kitakyuushu")
-	      ("40/8230" "$BJ!2,8)!&C^K-(B" "hukuokakenchikuhou" "chikuhou")
-	      ("40/8240" "$BJ!2,8)!&C^8e(B" "hukuokakenchikugo" "chikugo")
-	      ("41/8510" "$B:42l8)!&FnIt(B" "sagakennanbu")
-	      ("41/8520" "$B:42l8)!&KLIt(B" "sagakenhokubu")
-	      ("42/700" "$BD9:j8)!&0m4tBPGO(B"
-	       "nagasakikenikitsushima" "iki" "tsushima" "ikitsushima")
-	      ("42/800" "$BD9:j8)!&8^Eg(B" "nagasakikengotou" "gotou")
-	      ("42/8410" "$BD9:j8)!&FnIt(B" "nagasakikennanbu")
-	      ("42/8420" "$BD9:j8)!&KLIt(B" "nagasakikenhokubu")
-	      ("43/8610" "$B7'K\8)!&7'K\(B" "kumamotokenkumamoto" "kumamoto")
-	      ("43/8620" "$B7'K\8)!&0$AI(B" "kumamotokenaso" "aso")
-	      ("43/8630" "$B7'K\8)!&E7Ap02KL(B"
-	       "kumamotokenamakusaashikita" "amakusa" "ashikita" "amakusaashikita")
-	      ("43/8640" "$B7'K\8)!&5eKa(B" "kumamotokenkuma" "kuma")
-	      ("44/8310" "$BBgJ,8)!&CfIt(B" "ooitakenchuubu")
-	      ("44/8320" "$BBgJ,8)!&KLIt(B" "ooitakenhokubu")
-	      ("44/8330" "$BBgJ,8)!&@>It(B" "ooitakenseibu")
-	      ("44/8340" "$BBgJ,8)!&FnIt(B" "ooitakennanbu")
-	      ("45/8710" "$B5\:j8)!&FnItJ?LnIt(B" "miyazakikennanbuheiyabu")
-	      ("45/8720" "$B5\:j8)!&KLItJ?LnIt(B" "miyazakikenhokubuheiyabu")
-	      ("45/8730" "$B5\:j8)!&FnIt;31h$$(B" "miyazakikennanbuyamazoi")
-	      ("45/8740" "$B5\:j8)!&KLIt;31h$$(B" "miyazakikenhokubuyamazoi")
-	      ("46/8810" "$B</;yEg8)!&;'K`(B" "kagoshimakensatsuma" "satsuma")
-	      ("46/8820" "$B</;yEg8)!&Bg6y(B" "kagoshimakenoosumi" "oosumi")
-	      ("46/900" "$B</;yEg8)!&<o;REg!&205WEg(B"
-	       "kagoshimakentanegashimayakushima" "tanegashima" "yakushima" "tanegashimayakushima")
-	      ("46/1000" "$B</;yEg8)!&1bH~(B" "kagoshimakenamami" "amami")
-	      ("47/9110" "$B2-Fl8)!&K\EgCfFnIt(B"
-	       "okinawakenhontouchuunanbu" "hontouchuunanbu")
-	      ("47/9120" "$B2-Fl8)!&K\EgKLIt(B"
-	       "okinawakenhontouhokubu" "hontouhokubu")
-	      ("47/9130" "$B2-Fl8)!&5WJFEg(B" "okinawakenkumejima" "kumejima")
-	      ("47/9200" "$B2-Fl8)!&BgElEg(B" "okinawakendaitoujima" "daitoujima")
-	      ("47/9300" "$B2-Fl8)!&5\8EEg(B" "okinawakenmiyakojima" "miyakojima")
-	      ("47/9400" "$B2-Fl8)!&@P3@Eg(B"
-	       "okinawakenishigakijima" "ishigakijima")
-	      ("47/9500" "$B2-Fl8)!&M?Fa9qEg(B"
-	       "okinawakenyonagunijima" "yonagunijima")))
-	   (table)
-	   ;; $B%X%\%s<0$H71Na<0$NBP1~I=(B
-	   (hepburn-table
-	    (let (table)
-	      (dolist (x '(("si" "shi")
-			   ("zi" "ji")
-			   ("zu" "du")
-			   ("ti" "chi")
-			   ("tu" "tsu")
-			   ("hu" "fu")))
-		(push x table)
-		(push (reverse x)table))
-	      (dolist (x '(("sy" . "sh")
-			   ("zy" . "j")
-			   ("ty" . "ch")))
-		(dolist (y '("a" "u" "o"))
-		  (push (list (concat (car x) y) (concat (cdr x) y)) table)
-		  (push (list (concat (cdr x) y) (concat (car x) y)) table)))
-	      table))
-	   ;; $BBP1~I=$K>h$C$F$$$kJ8;zNs$rC5$9@55,I=8=(B
-	   (hepburn-regexp
-	    (format "\\(?:\\`\\|[aiueo]\\)\\(n\\([^aiueoy]\\)\\|%s\\)"
-		    (regexp-opt (mapcar (function car) hepburn-table))))
-	   ;; $BD92;$NM-L5$K$h$kGI@87A$NI=(B
-	   (prolonged-table
-	    (let (table)
-	      (dolist (x '("k" "ky"
-			   "s" "sy" "sh"
-			   "t" "ty" "ch"
-			   "n" "ny"
-			   "h" "hy"
-			   "m" "my"
-			   "y"
-			   "r" "ry"
-			   "w"
-			   "g" "gy"
-			   "z" "zy" "j"
-			   "d" "dy"
-			   "b" "by"
-			   "p" "py"))
-		(let ((long-vowels '("ou" "oo" "o-")))
-		  (dolist (y long-vowels)
-		    (push (cons (concat x y)
-				(append
-				 (mapcar
-				  (lambda (z) (concat x z))
-				  (delete y (copy-sequence long-vowels)))
-				 (list (concat x "o"))))
-			  table)))
-		(push (list (concat x "uu") (concat x "u"))
-		      table))
-	      table))
-	   ;; $BGI@87A$NI=$K>h$C$F$$$kJ8;zNs$rC5$9@55,I=8=(B
-	   (prolonged-regexp (format "\\(?:\\`\\|[aiueo]\\)\\(%s\\)"
-				     (regexp-opt (mapcar (function car)
-							 prolonged-table)))))
-      (labels ((hepburn-candidates
-		(str)
-		"$B%X%\%s<0$H71Na<0$N:9$K$h$C$F@8$8$kGI@87A$rF@$k(B"
-		(if (string-match hepburn-regexp str)
-		    (let ((prefix (substring str 0 (match-beginning 1)))
-			  (candidates (if (match-beginning 2)
-					  '("n" "nn")
-					(assoc (match-string 1 str)
-					       hepburn-table)))
-			  (suffixes
-			   (hepburn-candidates
-			    (substring str (or (match-beginning 2)
-					       (match-end 0)))))
-			  (buf))
-		      (dolist (x candidates)
-			(dolist (y suffixes)
-			  (push (concat prefix x y) buf)))
-		      buf)
-		  (list str)))
-	       (prolonged-candidates
-		(str)
-		"$BD92;$NM-L5$K$h$C$F@8$8$kGI@87A$rF@$k(B"
-		(let (buf)
-		  (if (string-match prolonged-regexp str)
-		      (let ((prefix (substring str 0 (match-beginning 1)))
-			    (candidates (assoc (match-string 1 str)
-					       prolonged-table))
-			    (suffixes (prolonged-candidates
-				       (substring str (match-end 0)))))
-			(dolist (x candidates)
-			  (dolist (y suffixes)
-			    (push (concat prefix x y) buf))))
-		    (setq buf (list str)))
-		  (dolist (x buf)
-		    (when (string-match "\\(\\`\\|[aiue]\\)oo" x)
-		      (let ((prefix (substring x 0 (match-end 1)))
-			    (suffix (substring x (match-end 0))))
-			(dolist (y '("o" "oh" "o-"))
-			  (push (concat prefix y suffix) buf)))))
-		  buf))
-	       (romaji-candidates
-		(str)
-		"$BA4$F$NGI@87A$rF@$k(B"
-		(let (buf)
-		  (dolist (x (hepburn-candidates str))
-		    (dolist (y (prolonged-candidates x))
-		      (push y buf)))
-		  buf)))
-	(dolist (area alist)
-	  (let ((url (format format (car area)))
-		(kanji (cadr area)))
-	    (push (list kanji (nth 2 area) url) table)
-	    (dolist (romaji (cddr area))
-	      (dolist (x (romaji-candidates romaji))
-		(push (list x kanji) table)))))
-	(nreverse table))))
-  "Completion table of areas and urls.")
-
-(defcustom w3m-weather-default-area
-  "$B5~ETI\!&FnIt(B"
-  "Default region to check weather."
-  :group 'w3m
-  :type (cons 'radio
-	      (delq nil
-		    (mapcar (lambda (area)
-			      (when (nth 2 area)
-				(list 'const (car area))))
-			    w3m-weather-completion-table))))
-
-(defcustom w3m-weather-filter-functions
-  '(w3m-weather-extract-contents
-    w3m-weather-adjust-contents
-    w3m-weather-expand-anchors
-    w3m-weather-insert-title)
-  "Filter functions to remove useless tags."
-  :group 'w3m
-  :type 'hook)
-
-(defvar w3m-weather-input-history nil)
-
-(defun w3m-weather-input-area ()
-  (let* ((str
-	  (completing-read (format "Input area (default %s): "
-				   w3m-weather-default-area)
-			   'w3m-weather-area-completion nil t nil
-			   'w3m-weather-input-history))
-	 (area
-	  (cond
-	   ((string= "" str) w3m-weather-default-area)
-	   ((string-match "[^-a-zA-Z]" str) str)
-	   (t (cadr (assoc str w3m-weather-completion-table))))))
-    (setq w3m-weather-input-history
-	  (cons area
-		(delete area
-			(delete str w3m-weather-input-history))))
-    area))
-
-(defun w3m-weather-area-completion (partial predicate flag)
-  (if (eq flag 'lambda)
-      (and (assoc partial w3m-weather-completion-table)
-	   (or (not predicate)
-	       (funcall predicate partial))
-	   t)
-    (let ((kanji "")
-	  (romaji "")
-	  (romaji-partial partial))
-      (when (string-match "\\`\\(?:[^-a-zA-Z]+\\)" partial)
-	(let ((suffix (substring partial (match-end 0))))
-	  (setq kanji (substring partial 0 (match-end 0))
-		romaji (try-completion
-			""
-			(mapcar
-			 (lambda (x)
-			   (list (cadr (assoc x w3m-weather-completion-table))))
-			 (all-completions kanji w3m-weather-completion-table)))
-		romaji-partial (concat romaji suffix))))
-      (let ((collection)
-	    (regexp
-	     (and (string-match "$B!&(B\\'" kanji)
-		  (string-match "[aiueo]n\\'" romaji)
-		  (concat "\\`" romaji "n[^aiueoy]"))))
-	(dolist (x (all-completions romaji-partial w3m-weather-completion-table))
-	  (unless (and regexp (string-match regexp x))
-	    (setq x (assoc x w3m-weather-completion-table))
-	    (unless (assoc (cadr x) collection)
-	      (push (cons (cadr x) (car x)) collection))))
-	(cond
-	 ((not flag)
-	  (let ((s (try-completion kanji collection predicate)))
-	    (if (and (stringp s) (string< s partial))
-		(when (setq s (try-completion romaji-partial
-					      (mapcar (lambda (x) (list (cdr x)))
-						      collection)
-					      predicate))
-		  (concat kanji (substring s (if romaji (length romaji) 0))))
-	      s)))
-	 ((eq flag t)
-	  (all-completions kanji collection predicate)))))))
-
-;;;###autoload
-(defun w3m-weather (area)
-  "Display weather report."
-  (interactive
-   (list (if current-prefix-arg
-	     (w3m-weather-input-area)
-	   w3m-weather-default-area)))
-  (w3m-goto-url (format "about://weather/%s" area)))
-
-;;;###autoload
-(defun w3m-about-weather (url no-decode no-cache post-data referer handler)
-  (if (string-match "\\`about://weather/" url)
-      (lexical-let* ((url url)
-		     (no-cache no-cache)
-		     (area (substring url (match-end 0)))
-		     (furl (nth 2 (assoc area w3m-weather-completion-table))))
-	(w3m-process-do
-	    (type (w3m-retrieve furl nil no-cache nil nil handler))
-	  (when type
-	    (w3m-decode-buffer furl)
-	    (w3m-weather-run-filter-functions w3m-weather-filter-functions
-					      area furl no-cache handler))))
-    (w3m-message "Unknown URL: %s" url)
-    nil))
-
-(defun w3m-weather-run-filter-functions (functions area url no-cache handler)
-  (if functions
-      (lexical-let ((functions functions)
-		    (area area)
-		    (url url)
-		    (no-cache no-cache))
-	(w3m-process-do
-	    (nil (funcall (pop functions) area url no-cache handler))
-	  (w3m-weather-run-filter-functions functions area url
-					    no-cache handler)))
-    "text/html"))
-
-(defun w3m-weather-extract-contents (&rest args)
-  "Remove both header and footer in the weather forecast pages."
-  (goto-char (point-min))
-  (when (search-forward "<!---MAIN_CONTENTS_table--->" nil t)
-    (delete-region (point-min) (match-beginning 0)))
-  (goto-char (point-max))
-  (when (search-backward "<!---Local_Link--->" nil t)
-    (delete-region (match-beginning 0) (point-max))))
-
-(defun w3m-weather-adjust-contents (&rest args)
-  ;; Remove spacers.
-  (goto-char (point-min))
-  (while (search-forward "<tr><td>\
-<img src=\"http://img.yahoo.co.jp/images/clear.gif\" width=1>\
-</td></tr>" nil t)
-    (delete-region (match-beginning 0) (match-end 0)))
-  ;; Remove execessive tables.
-  (goto-char (point-min))
-  (while (re-search-forward "<table[^>]*>[ \t\r\f\n]*</table>" nil t)
-    (delete-region (match-beginning 0) (match-end 0)))
-  (goto-char (point-min))
-  ;; Remove too narrow width parameters.
-  (while (re-search-forward "<td[^>]*\\(width=1%\\)" nil t)
-    (delete-region (match-beginning 1) (match-end 1)))
-  ;; Display border lines.
-  (goto-char (point-min))
-  (while (re-search-forward "\
-<table border=\\(0\\) cellpadding=[1-9][0-9]* cellspacing=[1-9][0-9]*" nil t)
-    (goto-char (match-beginning 1))
-    (delete-char 1)
-    (insert "1"))
-  (goto-char (point-min))
-  (while (re-search-forward
-	  "<td align=center width=25%>[ \t\r\f\n]*<table border=1" nil t)
-    (delete-char -1)
-    (insert "0")))
-
-(defun w3m-weather-insert-title (area url &rest args)
-  "Insert title."
-  (goto-char (point-min))
-  (insert "<head><title>Weather forecast of "
-	  area
-	  "</title></head>\n"
-	  "<body><p align=left><a href=\""
-	  url
-	  "\">[Yahoo!]</a></p>\n")
-  (goto-char (point-max))
-  (insert "</body>"))
-
-(defun w3m-weather-expand-anchors (area url &rest args)
-  ;; FIXME: $BE75$M=Js%Z!<%8$K4^$^$l$F$$$kAjBP%j%s%/$r@dBP%j%s%/$K=q$-49(B
-  ;; $B$($k$?$a$N4X?t!%$3$l$i$NAjBP%j%s%/$r0BA4$K<h$j07$&$?$a$K$O!$(Bbase
-  ;; URL $B$rJV$;$k$h$&$K!$(Babout:// $B$N9=B$$r=q$-D>$9I,MW$,$"$k$H9M$($i$l(B
-  ;; $B$k$,!$$H$j$"$($:8e2s$7!%(B
-  (goto-char (point-min))
-  (while (re-search-forward
-	  (eval-when-compile
-	    (concat "<a[ \t\r\f\n]+href=" w3m-html-string-regexp))
-	  nil t)
-    (replace-match (format
-		    "<a href=\"%s\""
-		    (w3m-expand-url (w3m-remove-redundant-spaces
-				     (or (match-string-no-properties 2)
-					 (match-string-no-properties 3)
-					 (match-string-no-properties 1)))
-				    url)))))
-
-(provide 'w3m-weather)
-
-;;; w3m-weather.el ends here.

=== removed file 'share/emacs/site-lisp/w3m/w3m.el'
--- share/emacs/site-lisp/w3m/w3m.el	2010-09-13 10:14:52 +0000
+++ share/emacs/site-lisp/w3m/w3m.el	1970-01-01 00:00:00 +0000
@@ -1,10807 +0,0 @@
-;;; w3m.el --- an Emacs interface to w3m -*- coding: iso-2022-7bit; -*-
-
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-;; 2010 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
-
-;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
-;;          Shun-ichi GOTO     <gotoh@taiyo.co.jp>,
-;;          Satoru Takabayashi <satoru-t@is.aist-nara.ac.jp>,
-;;          Hideyuki SHIRAI    <shirai@meadowy.org>,
-;;          Keisuke Nishida    <kxn30@po.cwru.edu>,
-;;          Yuuichi Teranishi  <teranisi@gohome.org>,
-;;          Akihiro Arisawa    <ari@mbf.sphere.ne.jp>,
-;;          Katsumi Yamaoka    <yamaoka@jpl.org>,
-;;          Tsuyoshi CHO       <tsuyoshi_cho@ybb.ne.jp>
-;; Keywords: w3m, WWW, hypermedia
-
-;; This file is the main part of emacs-w3m.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-
-;;; Commentary:
-
-;; Emacs-w3m is an Emacs interface to the w3m program.  For more
-;; detail about w3m, see:
-;;
-;;    http://w3m.sourceforge.net/
-
-
-;;; How to install:
-
-;; See the README file in any case.  We also recommend you check
-;; whether a newer version of w3m is released.
-;;
-;; The outline of installation is: run the `configure' script and type
-;; `make install' in the top directory of the emacs-w3m distribution.
-
-
-;;; Code:
-
-;; Developers, you must not use the cl functions (e.g., `coerce',
-;; `equalp', `merge', etc.) in any emacs-w3m or shimbun modules.  To
-;; exclude run-time cl is the policy of emacs-w3m.  However, XEmacs
-;; employs the cl package for all time, or those functions are
-;; possibly provided in the other modules like APEL, so you may use
-;; them only in w3m-xmas.el.  Note that `caaaar', for example, is not
-;; a cl function if it is byte compiled; see cl-macs.el.
-(eval-when-compile
-  (require 'cl))
-
-(eval-when-compile
-  (unless (dolist (var nil t))
-    ;; Override the `dolist' macro which may be faultily provided by
-    ;; old egg.el.
-    (load "cl-macs" nil t)))
-
-;; The following variables will be referred to by the external modules
-;; which bind such variables only when compiling themselves.  And also
-;; some modules have the `defadvice' forms including them and run
-;; `byte-compile' at run-time.
-(eval-and-compile
-  (defvar w3m-current-title nil
-    "Title of a page visiting in the current buffer.")
-  (defvar w3m-current-url nil
-    "A url of a page visiting in the current buffer."))
-
-(require 'w3m-util)
-(require 'w3m-proc)
-
-;; Silence the Emacs' byte-compiler that says ``might not be defined''.
-(eval-when-compile
-  (defalias 'w3m-setup-menu 'ignore))
-
-(eval-and-compile
-  (cond
-   ((featurep 'xemacs)
-    (require 'w3m-xmas))
-   ((>= emacs-major-version 21)
-    (require 'w3m-ems))
-   (t
-    (error "Emacs-w3m of this version no longer supports Emacs %s"
-	   (mapconcat 'identity
-		      (nbutlast (split-string emacs-version "\\."))
-		      ".")))))
-
-(require 'w3m-fb)
-(require 'w3m-hist)
-(require 'timezone)
-(require 'image-mode nil t)
-
-;; Add-on programs:
-(eval-and-compile
-  (autoload 'w3m-bookmark-view "w3m-bookmark"
-    "Display the bookmark" t)
-  (autoload 'w3m-bookmark-view-new-session "w3m-bookmark"
-    "Display the bookmark on a new session" t)
-  (autoload 'w3m-bookmark-add-this-url "w3m-bookmark"
-    "Add a link under point to the bookmark." t)
-  (autoload 'w3m-bookmark-add-current-url "w3m-bookmark"
-    "Add a url of the current page to the bookmark." t)
-  (autoload 'w3m-bookmark-add-all-urls "w3m-bookmark"
-    "Add urls of all pages being visited to the bookmark." t)
-  (autoload 'w3m-bookmark-add "w3m-bookmark" "Add URL to bookmark.")
-  (autoload 'w3m-search "w3m-search"
-    "Search a word using search engines." t)
-  (autoload 'w3m-search-new-session "w3m-search"
-    "Search a word using search engines in a new session." t)
-  (autoload 'w3m-search-uri-replace "w3m-search")
-  (autoload 'w3m-weather "w3m-weather"
-    "Display a weather report." t)
-  (autoload 'w3m-about-weather "w3m-weather")
-  (autoload 'w3m-antenna "w3m-antenna"
-    "Report changes of web sites." t)
-  (autoload 'w3m-antenna-add-current-url "w3m-antenna"
-    "Add a link address of the current page to the antenna database." t)
-  (autoload 'w3m-about-antenna "w3m-antenna")
-  (autoload 'w3m-dtree "w3m-dtree"
-    "Display a directory tree." t)
-  (autoload 'w3m-about-dtree "w3m-dtree")
-  (autoload 'w3m-namazu "w3m-namazu"
-    "Search files with Namazu." t)
-  (autoload 'w3m-about-namazu "w3m-namazu")
-  (autoload 'w3m-perldoc "w3m-perldoc"
-    "View Perl documents" t)
-  (autoload 'w3m-about-perldoc "w3m-perldoc")
-  (autoload 'w3m-fontify-forms "w3m-form")
-  (autoload 'w3m-fontify-textareas "w3m-form")
-  (autoload 'w3m-form-textarea-file-cleanup "w3m-form")
-  (autoload 'w3m-form-textarea-files-remove "w3m-form")
-  (autoload 'w3m-form-kill-buffer "w3m-form")
-  (autoload 'w3m-form-set-number "w3m-form")
-  (autoload 'w3m-filter "w3m-filter")
-  (autoload 'w3m-setup-tab-menu "w3m-tabmenu")
-  (autoload 'w3m-setup-bookmark-menu "w3m-bookmark")
-  (autoload 'w3m-switch-buffer "w3m-tabmenu")
-  (autoload 'w3m-cookie-set "w3m-cookie")
-  (autoload 'w3m-cookie-get "w3m-cookie")
-  (autoload 'w3m-cookie "w3m-cookie")
-  (autoload 'w3m-about-cookie "w3m-cookie")
-  (autoload 'w3m-cookie-shutdown "w3m-cookie" nil t)
-  (autoload 'report-emacs-w3m-bug "w3m-bug" nil t)
-  (autoload 'w3m-replace-symbol "w3m-symbol" nil t)
-  (autoload 'w3m-mail "w3m-mail" nil t)
-  (autoload 'w3m-link-numbering-mode "w3m-lnum" nil t)
-  (autoload 'w3m-linknum-follow "w3m-lnum" nil t)
-  (autoload 'w3m-go-to-linknum "w3m-lnum" nil t)
-  (autoload 'w3m-linknum-toggle-inline-image "w3m-lnum" nil t)
-  (autoload 'w3m-linknum-view-image "w3m-lnum" nil t)
-  (autoload 'w3m-linknum-external-view-this-url "w3m-lnum" nil t)
-  (autoload 'w3m-linknum-edit-this-url "w3m-lnum" nil t)
-  (autoload 'w3m-linknum-print-this-url "w3m-lnum" nil t)
-  (autoload 'w3m-linknum-download-this-url "w3m-lnum" nil t)
-  (autoload 'w3m-linknum-bookmark-add-this-url "w3m-lnum" nil t)
-  (autoload 'w3m-linknum-zoom-in-image "w3m-lnum" nil t)
-  (autoload 'w3m-linknum-zoom-out-image "w3m-lnum" nil t)
-  (autoload 'w3m-session-select "w3m-session"
-    "Select session from session list." t)
-  (autoload 'w3m-session-save "w3m-session"
-    "Save list of displayed session." t)
-  (autoload 'w3m-setup-session-menu "w3m-session")
-  (autoload 'w3m-session-automatic-save "w3m-session")
-  (autoload 'w3m-session-deleted-save "w3m-session")
-  (autoload 'w3m-session-last-autosave-session "w3m-session")
-  (autoload 'w3m-session-goto-session "w3m-session")
-  (autoload 'w3m-session-crash-recovery-save "w3m-session")
-  (autoload 'w3m-session-last-crashed-session "w3m-session"))
-
-;; Avoid byte-compile warnings.
-(eval-when-compile
-  (autoload 'doc-view-mode "doc-view" nil t)
-  (autoload 'doc-view-mode-p "doc-view")
-  (autoload 'image-backward-hscroll "image-mode" nil t)
-  (autoload 'image-bol "image-mode" nil t)
-  (autoload 'image-eol "image-mode" nil t)
-  (autoload 'image-forward-hscroll "image-mode" nil t)
-  (autoload 'image-mode-setup-winprops "image-mode")
-  (autoload 'image-scroll-down "image-mode" nil t)
-  (autoload 'image-scroll-up "image-mode" nil t)
-  (autoload 'quit-window "window" nil t)
-  (autoload 'rfc2368-parse-mailto-url "rfc2368")
-  (autoload 'widget-convert-button "wid-edit")
-  (autoload 'widget-forward "wid-edit" nil t)
-  (autoload 'widget-get "wid-edit")
-  (unless (fboundp 'char-to-int)
-    (defalias 'char-to-int 'identity))
-  (defvar doc-view-mode-map)
-  (defvar w3m-bookmark-mode)
-  (defvar w3m-bookmark-menu-items)
-  (defvar w3m-bookmark-menu-items-pre)
-  (defvar w3m-tab-menubar-make-items-preitems)
-  (defvar w3m-session-menu-items-pre)
-  (defvar w3m-session-menu-items))
-
-(defconst emacs-w3m-version
-  (eval-when-compile
-    (let ((rev "$Revision: 1.1499 $"))
-      (and (string-match "\\.\\([0-9]+\\) \\$\\'" rev)
-	   (setq rev (- (string-to-number (match-string 1 rev)) 1136))
-	   (format "1.4.%d" (+ rev 50)))))
-  "Version number of this package.")
-
-(defgroup w3m nil
-  "Emacs-w3m - the web browser of choice."
-  :group 'hypermedia)
-
-(defgroup w3m-face nil
-  "Faces used for emacs-w3m."
-  :group 'w3m
-  :prefix "w3m-")
-
-(defcustom w3m-command nil
-  "*Name of the executable file of the w3m command.
-You normally don't have to specify the value, since emacs-w3m looks
-for the existing commands in order of w3m, w3mmee and w3m-m17n in the
-`exec-path' directories in order if it is nil in the beginning.
-
-If you want to use the other w3m command, specify the value of this
-variable explicitly in the .emacs file or customize the value and save
-it.  In this case, you need to restart Emacs and emacs-w3m.  That is,
-there is currently no way to apply the changing of the w3m command to
-all the emacs-w3m programs safely after loading the w3m.elc module."
-  :group 'w3m
-  :type '(radio (const :format "Not specified " nil)
-		(string :format "Command: %v\n" :size 0)))
-
-(defcustom w3m-display-ins-del 'auto
-  "*Value of `display_ins_del' option."
-  :group 'w3m
-  :type '(radio (const :format "Delect automatically" auto)
-		(const :format "Use fontify" fontify)
-		(const :format "Use tag" tag)
-		(const :format "No have option" nil)))
-
-(defvar w3m-type nil
-  "Type of the w3m command.
-The valid values include `w3m', `w3mmee', and `w3m-m17n'.")
-(defvar w3m-compile-options nil
-  "Compile options that the w3m command was built with.")
-(defvar w3m-version nil
-  "Version string of the w3m command.")
-
-;; Set w3m-command, w3m-type, w3m-version and w3m-compile-options
-(if noninteractive ;; Don't call the external command when compiling.
-    (unless w3m-command
-      (setq w3m-command "w3m"))
-  (when (or (null w3m-command)
-	    (null w3m-type)
-	    (null w3m-version)
-	    (null w3m-compile-options))
-    (let ((command (or w3m-command
-		       (w3m-which-command "w3m")
-		       (w3m-which-command "w3mmee")
-		       (w3m-which-command "w3m-m17n"))))
-      (when command
-	(setq w3m-command command)
-	(with-temp-buffer
-	  (call-process command nil t nil "-version")
-	  (goto-char (point-min))
-	  (when (re-search-forward "version \\(w3m/0\\.[3-9]\
-\\(?:\\.[0-9\\]\\)*\\(?:rc[0-9]+\\)?\
-\\(?:-stable\\|\\(?:\\+cvs\\(?:-[0-9]+\\.[0-9]+\\)?\\)\\)?\
-\\(?:-inu\\|\\(-m17n\\|\\(\\+mee\\)\\)\\)?[^,]*\\)" nil t)
-	    (setq w3m-version (match-string 1))
-	    (setq w3m-type
-		  (cond
-		   ((match-beginning 3) 'w3mmee)
-		   ((match-beginning 2) 'w3m-m17n)
-		   ((match-beginning 1) 'w3m)
-		   (t 'other))))
-	  (when (re-search-forward "options +" nil t)
-	    (setq w3m-compile-options
-		  (or (split-string (buffer-substring (match-end 0)
-						      (point-at-eol))
-				    ",")
-		      (list nil)))
-	    (when (member "m17n" w3m-compile-options)
-	      (setq w3m-type 'w3m-m17n))))))))
-
-(when (not (stringp w3m-command))
-  (error "\
-Install w3m command in `exec-path' or set `w3m-command' variable correctly"))
-
-(defcustom w3m-user-agent (concat "Emacs-w3m/" emacs-w3m-version
-				  " " w3m-version)
-  "String used for the User-Agent field.  See also `w3m-add-user-agent'."
-  :group 'w3m
-  :type '(string :size 0))
-
-(defcustom w3m-add-user-agent t
-  "Non-nil means add the User-Agent field to the request header.
-The value of `w3m-user-agent' is used for the field body."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-language
-  (if (and (boundp 'current-language-environment)
-	   ;; In XEmacs 21.5 it may be the one like "Japanese (UTF-8)".
-	   (string-match "\\`Japanese"
-			 (symbol-value 'current-language-environment)))
-      "Japanese")
-  "*Your preferred language used in emacs-w3m sessions."
-  :group 'w3m
-  :type '(radio (const :format "%v " "Japanese")
-		(const :tag "Other" nil))
-  :get (lambda (symbol)
-	 (let ((value (format "%s" (default-value symbol)))
-	       (case-fold-search t))
-	   (prog1
-	       (setq value (if (string-match "\\`japan" value) "Japanese"))
-	     (custom-set-default symbol value))))
-  :set (lambda (symbol value)
-	 (custom-set-default symbol (if (equal value "Japanese") "Japanese"))))
-
-(defcustom w3m-command-arguments
-  (if (eq w3m-type 'w3mmee) '("-o" "concurrent=0" "-F") nil)
-  "*List of the default arguments passed to the w3m command.
-See also `w3m-command-arguments-alist'."
-  :group 'w3m
-  :type '(repeat (string :format "Argument: %v\n" :size 0)))
-
-(defcustom w3m-command-arguments-alist nil
-  "*Alist of regexps matching urls and additional arguments passed to w3m.
-A typical usage of this variable is to specify whether to use the proxy
-server for the particular hosts.  The first match made will be used.
-Here is an example of how to set this variable:
-
-\(setq w3m-command-arguments-alist
-      '(;; Don't use the proxy server to visit local web pages.
-	(\"^http://\\\\(?:[^/]*\\\\.\\\\)*your-company\\\\.com\\\\(?:/\\\\|$\\\\)\"
-	 \"-no-proxy\")
-	;; Use the proxy server to visit any foreign urls.
-	(\"\"
-	 \"-o\" \"http_proxy=http://proxy.your-company.com:8080/\")))
-
-Where the first element matches the url that the scheme is \"http\" and
-the hostname is either \"your-company.com\" or a name ended with
-\".your-company.com\", and the proxy server is not used for those hosts.
-If you are a novice on the regexps, you can use the
-`w3m-no-proxy-domains' variable instead."
-  :group 'w3m
-  :type '(repeat (cons :format "%v" :indent 4
-		       (regexp :format "%t: %v\n" :size 0)
-		       (repeat :tag "Arguments passed to w3m command"
-			       (string :format "Arg: %v\n" :size 0)))))
-
-(defcustom w3m-no-proxy-domains nil
-  "*List of domain names with which emacs-w3m will not use a proxy server.
-Each element should be exactly a domain name which means the latter
-common part of the host names, not a regexp."
-  :group 'w3m
-  :type '(repeat (string :format "Domain name: %v\n" :size 0)))
-
-(defcustom w3m-command-environment
-  (delq nil
-	(list
-	 (if (eq w3m-type 'w3mmee)
-	     (cons "W3MLANG" "ja_JP.kterm"))
-	 (if (eq system-type 'windows-nt)
-	     (cons "CYGWIN" "binmode tty"))))
-  "*Alist of environment variables for subprocesses to inherit."
-  :group 'w3m
-  :type '(repeat
-	  (cons :format "%v" :indent 4
-		(string :format "Name: %v\n" :size 0)
-		(string :format "    Value: %v\n" :size 0))))
-
-(defcustom w3m-fill-column -1
-  "*Integer used as the value for `fill-column' in emacs-w3m buffers.
-If it is positive, pages will be displayed within the columns of that
-number.  If it is zero or negative, the number of columns which
-subtracted that number from the window width is applied to the maximum
-width of pages.  Note that XEmacs does not always obey this setting."
-  :group 'w3m
-  :type '(integer :size 0))
-
-(defcustom w3m-mailto-url-function nil
-  "*Function used to handle the `mailto' urls.
-Function is called with one argument, just a url.  If it is nil, a
-function specified by the `mail-user-agent' variable will be used for
-composing mail messages."
-  :group 'w3m
-  :type '(radio (const :tag "Not specified" nil)
-		(function :format "%t: %v\n" :size 0)))
-
-(defcustom w3m-mailto-url-popup-function-alist
-  '((cmail-mail-mode . pop-to-buffer)
-    (mail-mode . pop-to-buffer)
-    (message-mode . pop-to-buffer)
-    (mew-draft-mode . pop-to-buffer)
-    (mh-letter-mode . pop-to-buffer)
-    (wl-draft-mode . pop-to-buffer))
-  "*Alist of (MAJOR-MODE . FUNCTION) pairs used to pop to a mail buffer up.
-If a user clicks on a `mailto' url and a mail buffer is composed by
-`mail-user-agent' with the MAJOR-MODE, FUNCTION will be called with a
-mail buffer as an argument.  Note that the variables
-`special-display-buffer-names', `special-display-regexps',
-`same-window-buffer-names' and `same-window-regexps' will be bound to
-nil while popping to a buffer up."
-  :group 'w3m
-  :type '(repeat (cons :format "%v" :indent 11
-		       (symbol :format "Major-mode: %v\n" :size 0)
-		       (function :format "%t: %v\n" :size 0))))
-
-(defcustom w3m-use-mule-ucs
-  (and (eq w3m-type 'w3m) (featurep 'un-define))
-  "*Non-nil means use the multi-script support with Mule-UCS."
-  :group 'w3m
-  :type 'boolean
-  :require 'w3m-ucs)
-
-(when w3m-use-mule-ucs
-  (condition-case nil
-      (require 'w3m-ucs)
-    (error (setq w3m-use-mule-ucs nil))))
-
-(defcustom w3m-use-ange-ftp nil
-  "*Non-nil means that `ange-ftp' or `efs' is used to access FTP servers."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-doc-view-content-types
-  (condition-case nil
-      (delq nil (mapcar (lambda (type)
-			  (if (doc-view-mode-p type)
-			      (format "application/%s" type)))
-			'(dvi postscript pdf)))
-    (error nil))
-  "List of content types for which to use `doc-view-mode' to view contents.
-This overrides `w3m-content-type-alist'."
-  :group 'w3m
-  :type '(repeat (string :tag "Type" :value "application/")))
-
-(defcustom w3m-imitate-widget-button '(eq major-mode 'gnus-article-mode)
-  "*If non-nil, imitate the widget buttons on link (anchor) buttons.
-It is useful for moving about in a Gnus article buffer using TAB key.
-It can also be any Lisp form that should return a boolean value."
-  :group 'w3m
-  :type '(sexp :size 0))
-
-(defcustom w3m-treat-image-size t
-  "*Non-nil means let w3m mind the ratio of the size of images and text.
-
-If it is non-nil, the w3m command will make a halfdump which reserves
-rectangle spaces in which images will be put, and also `alt' texts
-will be truncated or padded with spaces so that their display width
-will be the same as the width of images.
-
-See also `w3m-pixels-per-character' and `w3m-pixels-per-line'.  Those
-values will be passed to the w3m command in order to compute columns
-and lines which images occupy."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-pixels-per-line 64
-  "*Integer used for the `-ppl' argument of the w3m command.
-If nil, the height of the default face is used.  It is valid only when
-`w3m-treat-image-size' is non-nil.  Note that a small value may not
-induce a good result.  If you want to use emacs-w3m in a character
-terminal and make `w3m-treat-image-size' effective, you need to set
-this variable properly."
-  :group 'w3m
-  :type '(choice (const :tag "Auto Detect" nil)
-		 (integer :tag "Specify Pixels")))
-
-(defcustom w3m-pixels-per-character nil
-  "*Integer used for the `-ppc' argument of the w3m command.
-If nil, the width of the default face is used.  It is valid only when
-`w3m-treat-image-size' is non-nil.  If you want to use emacs-w3m in a
-character terminal and make `w3m-treat-image-size' effective, you need
-to set this variable properly."
-  :group 'w3m
-  :type '(radio (const :tag "Auto Detect" nil)
-		(integer :format "Specify Pixels: %v\n" :size 0)))
-
-(defcustom w3m-image-default-background nil
-  "Color name used as transparent color of image.
-Nil means to use the background color of the Emacs frame.  Note that
-this value is effective only to xbm and monochrome pbm images in Emacs
-22 and greater."
-  :group 'w3m
-  :type '(radio (string :format "Color: %v\n" :size 0
-			:match (lambda (widget value)
-				 (and (stringp value) (> (length value) 0))))
-		(const :tag "Use the background color of the Emacs frame" nil)
-		(const :tag "Null string" "")))
-
-(defvar w3m-accept-japanese-characters
-  (and (not noninteractive)
-       (featurep 'mule)
-       (or (memq w3m-type '(w3mmee w3m-m17n))
-	   ;; Examine whether the w3m command specified by `w3m-command'
-	   ;; uses `euc-japan' for the internal character set.
-	   (let ((str
-		  (eval-when-compile
-		    (format
-		     (concat
-		      "<!doctype html public \"-//W3C//DTD HTML 3.2//EN\">"
-		      "<html><head><meta http-equiv=\"Content-Type\" "
-		      "content=\"text/html; charset=ISO-2022-JP\">"
-		      "</head><body>%s</body>\n")
-		     (string 27 36 66 52 65 59 122 27 40 66)))))
-	     (with-temp-buffer
-	       (set-buffer-multibyte nil)
-	       (insert str)
-	       (let ((coding-system-for-write 'binary)
-		     (coding-system-for-read 'binary)
-		     (default-process-coding-system (cons 'binary 'binary)))
-		 (call-process-region (point-min) (point-max) w3m-command
-				      t t nil "-T" "text/html" "-halfdump")
-		 (goto-char (point-min))
-		 (and (re-search-forward (string ?\264 ?\301 ?\273 ?\372)
-					 nil t)
-		      t))))))
-  "Non-nil means that the w3m command accepts Japanese characters.")
-
-(defcustom w3m-coding-system (if (featurep 'mule)
-				 (if (eq w3m-type 'w3mmee)
-				     'iso-2022-7bit-ss2
-				   'iso-2022-7bit)
-			       'iso-8859-1)
-  "*Default coding system used to communicate with the w3m command."
-  :group 'w3m
-  :type '(coding-system :size 0))
-
-(defcustom w3m-terminal-coding-system
-  (if w3m-accept-japanese-characters
-      'euc-japan 'iso-8859-1)
-  "*Default coding system used when writing to w3m processes.
-It is just a default value to set process' coding system initially.
-\(This variable name is analogically derived from the behavior of the
-w3m command which accepts data from Emacs just like reads from the
-terminal.)"
-  :group 'w3m
-  :type '(coding-system :size 0))
-
-(defcustom w3m-output-coding-system
-  (cond
-   ((not (featurep 'mule)) 'iso-8859-1)
-   ((eq w3m-type 'w3mmee) 'ctext)
-   ((eq w3m-type 'w3m-m17n)
-    (if (and (w3m-find-coding-system 'utf-8)
-	     (not (and (equal "Japanese" w3m-language)
-		       (featurep 'w3m-ems)
-		       (= emacs-major-version 21))))
-	'utf-8
-      'iso-2022-7bit-ss2))
-   (w3m-accept-japanese-characters 'w3m-euc-japan)
-   (t 'w3m-iso-latin-1))
-  "*Coding system used when reading from w3m processes."
-  :group 'w3m
-  :type '(coding-system :size 0))
-
-(defcustom w3m-input-coding-system
-  (if (memq w3m-type '(w3mmee w3m-m17n))
-      w3m-output-coding-system
-    (if w3m-accept-japanese-characters
-	(if w3m-use-mule-ucs
-	    'w3m-euc-japan-mule-ucs
-	  (if (featurep 'w3m-ems)
-	      'w3m-euc-japan
-	    'euc-japan))
-      (if w3m-use-mule-ucs
-	  'w3m-iso-latin-1-mule-ucs
-	(if (featurep 'w3m-ems)
-	    'w3m-iso-latin-1
-	  'iso-8859-1))))
-  "*Coding system used when writing to w3m processes.
-It overrides `coding-system-for-write' if it is not `binary'.
-Otherwise, the value of the `w3m-current-coding-system' variable is
-used instead."
-  :group 'w3m
-  :type '(coding-system :size 0))
-
-(defcustom w3m-file-coding-system (if (featurep 'mule)
-				      'iso-2022-7bit
-				    'iso-8859-1)
-  "*Coding system used when writing configuration files.
-This value will be referred to by the `w3m-save-list' function."
-  :group 'w3m
-  :type '(coding-system :size 0))
-
-(defvar w3m-file-coding-system-for-read nil
-  "*Coding system used when reading configuration files.
-It is strongly recommended that you do not set this variable if there
-is no particular reason.  The value will be referred to by the
-`w3m-load-list' function.")
-
-(defcustom w3m-file-name-coding-system
-  (if (memq system-type '(windows-nt OS/2 emx))
-      'shift_jis 'euc-japan)
-  "*Coding system used to convert pathnames when emacs-w3m accesses files."
-  :group 'w3m
-  :type '(coding-system :size 0))
-
-(defcustom w3m-default-coding-system
-  (if (equal "Japanese" w3m-language) 'shift_jis 'iso-8859-1)
-  "*Default coding system used to encode url strings and post-data."
-  :group 'w3m
-  :type '(coding-system :size 0))
-
-(defcustom w3m-coding-system-priority-list
-  (if (equal "Japanese" w3m-language) '(shift_jis))
-  "*Coding systems in order of priority used for emacs-w3m sessions."
-  :group 'w3m
-  :type '(repeat (coding-system :format "%t: %v\n" :size 0)))
-
-(defcustom w3m-key-binding nil
-  "*Type of key binding set used in emacs-w3m sessions.
-The valid values include `info' which provides Info-like keys, and
-nil which provides Lynx-like keys."
-  :group 'w3m
-  :type '(choice
-	  (const :tag "Use Info-like key mapping." info)
-	  (const :tag "Use Lynx-like key mapping." nil))
-  ;; Since the following form won't be byte-compiled, you developers
-  ;; should never use CL macros like `caaaar', `when', `unless' ...
-  :set (lambda (symbol value)
-	 (prog1
-	     (custom-set-default symbol value)
-	   (if (or noninteractive
-		   ;; Loading w3m.elc is just in progress...
-		   (not (featurep 'w3m)))
-	       nil
-	     (if (and;; Gnus binds `w3m-mode-map' for compiling.
-		  (boundp 'w3m-mode-map)
-		  (boundp 'w3m-info-like-map)
-		  (boundp 'w3m-lynx-like-map))
-		 ;; It won't be bound at the first time.
-		 (eval
-		  '(setq w3m-mode-map (if (eq value 'info)
-					  w3m-info-like-map
-					w3m-lynx-like-map)
-			 w3m-minor-mode-map (w3m-make-minor-mode-keymap))))
-	     (let ((buffers (buffer-list)))
-	       (save-current-buffer
-		 (while buffers
-		   (set-buffer (car buffers))
-		   (if (eq major-mode 'w3m-mode)
-		       (condition-case nil
-			   (progn
-			     (use-local-map (symbol-value 'w3m-mode-map))
-			     (w3m-setup-toolbar)
-			     (w3m-setup-menu))
-			 (error)))
-		   (setq buffers (cdr buffers)))))))))
-
-(defcustom w3m-use-cygdrive (eq system-type 'windows-nt)
-  "*If non-nil, use the /cygdrive/ rule when performing `expand-file-name'."
-  :group 'w3m
-  :type 'boolean)
-
-(eval-and-compile
-  (defconst w3m-treat-drive-letter (memq system-type '(windows-nt OS/2 emx))
-    "Say whether the system uses drive letters."))
-
-(defcustom w3m-profile-directory
-  (concat "~/." (file-name-sans-extension
-		 (file-name-nondirectory w3m-command)))
-  "*Directory where emacs-w3m config files are loaded from or saved to."
-  :group 'w3m
-  :type '(directory :size 0))
-
-(defcustom w3m-init-file "~/.emacs-w3m"
-  "*Your emacs-w3m startup file name.
-If a file with the `.el' or `.elc' suffixes exists, it will be read
-instead.
-
-Note: This file is used as the startup configuration *NOT* for the w3m
-command but for emacs-w3m.  In order to modify configurations for the
-w3m command, edit the file named \"~/.w3m/config\" normally."
-  :group 'w3m
-  :type '(file :size 0))
-
-(defcustom w3m-default-save-directory
-  (concat "~/." (file-name-sans-extension
-		 (file-name-nondirectory w3m-command)))
-  "*Default directory where downloaded files will be saved to."
-  :group 'w3m
-  :type '(directory :size 0))
-
-(defcustom w3m-default-directory nil
-  "*Directory used as the current directory in emacs-w3m buffers.
-The valid values include a string specifying an existing directory,
-a symbol of which the value specifies an existing directory,
-a function which takes a url as an argument and returns a directory,
-and nil.  If the specified directory does not exist or it is nil,
-the value of `w3m-profile-directory' is used.
-
-Note that there is an exception: if a page visits a local file or
-visits a remote file using ftp, the directory in which the file exists
-is used as the current directory instead."
-  :group 'w3m
-  :type '(radio (directory :format "%{%t%}: %v\n" :size 0 :value "~/")
-		(symbol :format "%{%t%}: %v\n"
-			:match (lambda (widget value) value)
-			:size 0
-			:value default-directory)
-		(function :format "%{%t%}: %v\n"
-			  :size 0)
-		(const nil)))
-
-(defcustom w3m-accept-languages
-  (let ((file (expand-file-name "config" w3m-profile-directory)))
-    (or (when (file-readable-p file)
-	  (with-temp-buffer
-	    (insert-file-contents file)
-	    (goto-char (point-min))
-	    (when (re-search-forward "^accept_language[\t ]+\\(.+\\)$" nil t)
-	      (delete "" (split-string (match-string 1)
-				       "[ \t\r\f\n]*,[ \t\r\f\n]*")))))
-	(when (string= w3m-language "Japanese")
-	  '("ja" "en"))))
-  "*List of acceptable languages in descending order of priority.
-The default value is set according to the accept_language entry of the
-w3m configuration file (normally \"~/.w3m/config\")."
-  :group 'w3m
-  :type '(repeat (string :format "Lang: %v\n" :size 0)))
-
-(defcustom w3m-delete-duplicated-empty-lines t
-  "*Non-nil means display two or more continuous empty lines into single."
-  :group 'w3m
-  :type 'boolean)
-
-(defvar w3m-display-inline-images nil
-  "Internal variable controls whether to show images in emacs-w3m buffers.
-This variable is buffer-local which defaults to the value of
-`w3m-default-display-inline-images'.  Don't set it directly; modify
-the `w3m-default-display-inline-images' variable or use the\
- `\\<w3m-mode-map>\\[w3m-toggle-inline-images]' command
-to change the appearance of images.
-See also `w3m-toggle-inline-images-permanently'.")
-(make-variable-buffer-local 'w3m-display-inline-images)
-
-(defcustom w3m-default-display-inline-images nil
-  "*Non-nil means display images inline in emacs-w3m buffers.
-You can toggle the visibility of images by the\
- `\\<w3m-mode-map>\\[w3m-toggle-inline-images]' command.
-See also `w3m-toggle-inline-images-permanently'."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-toggle-inline-images-permanently t
-  "*Non-nil means let the visibility of images continue permanently.
-The visibility of images is initialized according to
-`w3m-default-display-inline-images' at the first time, and except that
-it may be toggled by the `\\<w3m-mode-map>\\[w3m-toggle-inline-images]'\
- command, it does not change hereafter, if
-it is non-nil.  Otherwise, whether images are visible is initialized
-according to `w3m-default-display-inline-images' whenever you visit a
-new page or reload the current page in an emacs-w3m buffer."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-icon-directory
-  (let (dir)
-    (or
-     (catch 'found-dir
-       (let* ((path (locate-library "w3m"))
-	      (paths (if path
-			 (cons (file-name-directory path) load-path)
-		       load-path)))
-	 (while paths
-	   (setq path (car paths)
-		 paths (cdr paths))
-	   (if path
-	       (progn
-		 (if (file-directory-p
-		      (setq dir
-			    (expand-file-name "../../etc/images/w3m/" path)))
-		     (throw 'found-dir dir))
-		 (if (file-directory-p
-		      (setq dir
-			    (expand-file-name "../etc/images/w3m/" path)))
-		     (throw 'found-dir dir))
-		 (if (file-directory-p
-		      (setq dir
-			    (expand-file-name "../../etc/w3m/icons/" path)))
-		     (throw 'found-dir dir))
-		 (if (file-directory-p
-		      (setq dir
-			    (expand-file-name "../etc/w3m/icons/" path)))
-		     (throw 'found-dir dir)))))))
-     (and (fboundp 'locate-data-directory)
-	  (or (locate-data-directory "images/w3m")
-	      (locate-data-directory "w3m")))
-     (and (file-directory-p
-	   (setq dir (expand-file-name "images/w3m/" data-directory)))
-	  dir)
-     (and (file-directory-p
-	   (setq dir (expand-file-name "w3m/icons/" data-directory)))
-	  dir)))
-  "*Directory where emacs-w3m should find icon files."
-  :group 'w3m
-  :type '(radio (const :tag "Not specified")
-		(directory :format "%t: %v\n" :size 0)))
-
-(defcustom w3m-broken-proxy-cache nil
-  "*Set it to t if the proxy server seems not to work properly in caching.
-Note that this may be the double-edged sword; setting it to t will
-likely be harmful if the proxy server sends bad requests (e.g., not
-including the Host header, see RFC2616 section 14.23) to foreign
-servers when the w3m command specifies the \"no-cache\" directive.  Also
-note that it may not be effective if you are using old w3m command."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-quick-start t
-  "*Non-nil means let emacs-w3m start quickly w/o requiring confirmation.
-When you invoke the `w3m' command, it attempts to visit the page of a
-string like url around the cursor or the value of `w3m-home-page'.
-You won't be asked for the confirmation then if this value is non-nil.
-Otherwise, you will be prompted for that url with the editing form."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-home-page
-  (or (getenv "HTTP_HOME")
-      (getenv "WWW_HOME")
-      "about:")
-  "*This variable specifies the url string to open when emacs-w3m starts.
-Don't say HP, which is the abbreviated name of a certain company. ;-)"
-  :group 'w3m
-  :type '(radio
-	  :convert-widget w3m-widget-type-convert-widget
-	  `(,@(if (getenv "HTTP_HOME")
-		  `((const :format "HTTP_HOME: \"%v\"\n"
-			   ,(getenv "HTTP_HOME"))))
-	    ,@(if (getenv "WWW_HOME")
-		  `((const :format "WWW_HOME: \"%v\"\n"
-			   (getenv "WWW_HOME"))))
-	    (const :tag "About emacs-w3m" "about:")
-	    (const :tag "Blank page" "about:blank")
-	    (string :format "URL: %v\n" :size 0))))
-
-(defcustom w3m-arrived-file
-  (expand-file-name ".arrived" w3m-profile-directory)
-  "*Name of the file to keep the arrived URLs database."
-  :group 'w3m
-  :type '(file :size 0))
-
-(defcustom w3m-keep-arrived-urls 500
-  "*Maximum number of URLs which the arrived URLs database keeps."
-  :group 'w3m
-  :type '(integer :size 0))
-
-(defcustom w3m-prefer-cache nil
-  "*Non-nil means that cached contents are used without checking headers."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-keep-cache-size 300
-  "*Maximum number of pages to be cached in emacs-w3m."
-  :group 'w3m
-  :type '(integer :size 0))
-
-(defcustom w3m-follow-redirection 9
-  "*Maximum number of redirections which emacs-w3m honors and follows.
-If nil, redirections are followed by the w3m command.  Don't set it to
-nil if you allow to use cookies (i.e., you have set `w3m-use-cookies'
-to non-nil) since cookies may be shared among many redirected pages."
-  :group 'w3m
-  :type '(radio (const :format "Ignore redirections " nil)
-		(integer :size 0)))
-
-(defcustom w3m-redirect-with-get t
-  "*If non-nil, use the GET method after redirection.
-It controls how emacs-w3m works when a server responds the code 301 or
-302.  Here is an extract from RFC2616:
-
-Note: RFC 1945 and RFC 2068 specify that the client is not allowed
-to change the method on the redirected request.  However, most
-existing user agent implementations treat 302 as if it were a 303
-response, performing a GET on the Location field-value regardless
-of the original request method."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-resize-image-scale 50
-  "*Number of steps in percent used when resizing images."
-  :group 'w3m
-  :type '(integer :size 0))
-
-(defface w3m-anchor
-  '((((class color) (background light)) (:foreground "blue"))
-    (((class color) (background dark)) (:foreground "cyan"))
-    (t (:underline t)))
-  "Face used for displaying anchors."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-anchor-face 'face-alias 'w3m-anchor)
-
-(defface w3m-arrived-anchor
-  '((((class color) (background light)) (:foreground "navy"))
-    (((class color) (background dark)) (:foreground "LightSkyBlue"))
-    (t (:underline t)))
-  "Face used for displaying anchors which have already arrived."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-arrived-anchor-face 'face-alias 'w3m-arrived-anchor)
-
-(defface w3m-current-anchor
-  '((t (:underline t :bold t)))
-  "Face used to highlight the current anchor."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-current-anchor-face 'face-alias 'w3m-current-anchor)
-
-(defface w3m-image
-  '((((class color) (background light)) (:foreground "ForestGreen"))
-    (((class color) (background dark)) (:foreground "PaleGreen"))
-    (t (:underline t)))
-  "Face used for displaying alternate strings of images."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-image-face 'face-alias 'w3m-image)
-
-(defface w3m-image-anchor
-  '((((class color) (background light)) (:background "light yellow"))
-    (((class color) (background dark)) (:background "dark green"))
-    (t (:underline t)))
-  "Face used for displaying alternate strings of images which are in anchors."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-image-anchor-face 'face-alias 'w3m-image-anchor)
-
-(defface w3m-history-current-url
-  ;; The following strange code compounds the attributes of the
-  ;; `secondary-selection' face and the `w3m-arrived-anchor' face,
-  ;; and generates the new attributes for this face.
-  (let ((base 'secondary-selection)
-	(fn (if (featurep 'xemacs)
-		'face-custom-attributes-get
-	      'custom-face-attributes-get));; What a perverseness it is.
-	;; Both `face-custom-attributes-get' in XEmacs and
-	;; `custom-face-attributes-get' in CUSTOM 1.9962 attempt to
-	;; require `font' in Emacs/w3 and `cl' arbitrarily. :-/
-	(features (cons 'font features))
-	base-attributes attributes attribute)
-    (setq base-attributes (funcall fn base nil)
-	  attributes (funcall fn 'w3m-arrived-anchor nil))
-    (while base-attributes
-      (setq attribute (car base-attributes))
-      (unless (memq attribute '(:foreground :underline))
-	(setq attributes (plist-put attributes attribute
-				    (cadr base-attributes))))
-      (setq base-attributes (cddr base-attributes)))
-    (list (list t attributes)))
-  "Face used to highlight the current url in the \"about://history/\" page."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-history-current-url-face 'face-alias 'w3m-history-current-url)
-
-(defface w3m-bold '((t (:bold t)))
-  "Face used for displaying bold text."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-bold-face 'face-alias 'w3m-bold)
-
-(defface w3m-italic '((((type tty)) (:underline t))
-		      (t (:italic t)))
-  "Face used for displaying italic text.
-By default it will be a underline face on a non-window system."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-italic-face 'face-alias 'w3m-italic)
-
-(defface w3m-underline '((t (:underline t)))
-  "Face used for displaying underlined text."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-underline-face 'face-alias 'w3m-underline)
-
-(defface w3m-strike-through
-  `((((class color))
-     ,(if (featurep 'xemacs)
-	  '(:strikethru t)
-	'(:strike-through t)))
-    (t (:underline t)))
-  "Face used for displaying strike-through text."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-strike-through-face 'face-alias 'w3m-strike-through)
-
-(defface w3m-insert
-  '((((class color) (background light))
-     (:foreground "purple"))
-    (((class color) (background dark))
-     (:foreground "orchid"))
-    (t (:underline t)))
-  "Face used for displaying insert text."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-insert-face 'face-alias 'w3m-insert)
-
-(defcustom w3m-mode-hook nil
-  "*Hook run after `w3m-mode' initialization.
-This hook is evaluated by the `w3m-mode' function."
-  :group 'w3m
-  :type 'hook)
-
-(defcustom w3m-fontify-before-hook nil
-  "*Hook run when starting to fontify emacs-w3m buffers.
-This hook is evaluated by the `w3m-fontify' function."
-  :group 'w3m
-  :type 'hook)
-
-(defcustom w3m-fontify-after-hook nil
-  "*Hook run after fontifying emacs-w3m buffers.
-This hook is evaluated by the `w3m-fontify' function."
-  :group 'w3m
-  :type 'hook)
-
-(defcustom w3m-display-hook
-  '(w3m-move-point-for-localcgi
-    w3m-history-highlight-current-url)
-  "*Hook run after displaying pages in emacs-w3m buffers.
-Each function is called with a url string as the argument.  This hook
-is evaluated by the `w3m-goto-url' function."
-  :group 'w3m
-  :type 'hook
-  :initialize 'w3m-custom-hook-initialize)
-
-(defcustom w3m-after-cursor-move-hook
-  '(w3m-highlight-current-anchor
-    w3m-print-this-url
-    w3m-auto-show)
-  "*Hook run each time after the cursor moves in emacs-w3m buffers.
-This hook is called by the `w3m-check-current-position' function by
-way of `post-command-hook'."
-  :group 'w3m
-  :type 'hook
-  :initialize 'w3m-custom-hook-initialize)
-
-(defcustom w3m-delete-buffer-hook
-  '(w3m-pack-buffer-numbers)
-  "*Hook run when every emacs-w3m buffer is deleted."
-  :group 'w3m
-  :type 'hook
-  :initialize 'w3m-custom-hook-initialize)
-
-(defcustom w3m-select-buffer-hook nil
-  "*Hook run when a different emacs-w3m buffer is selected."
-  :group 'w3m
-  :type 'hook)
-
-(defcustom w3m-async-exec t
-  "*Non-nil means execute the w3m command asynchronously in Emacs process."
-  :group 'w3m
-  :type 'boolean)
-
-;; As far as we know, Emacs 21 under Mac OS X[1] and XEmacs under
-;; Solaris[2] won't run the asynchronous operations correctly when
-;; both `w3m-async-exec' and `w3m-process-connection-type' are non-nil;
-;; [1]the final kilobyte or so might get lost from raw data downloaded
-;; from a web site; [2]XEmacs hangs up.
-
-(defcustom w3m-process-connection-type
-  (not (or (and (memq system-type '(darwin macos))
-		(let ((ver (shell-command-to-string "uname -r")))
-		  (and (string-match "^\\([0-9]+\\)\\." ver)
-		       (< (string-to-number (match-string 1 ver)) 7))))
-	   (and (featurep 'xemacs)
-		(string-match "solaris" system-configuration))))
-  "*Value for `process-connection-type' used when communicating with w3m."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-async-exec-with-many-urls
-  ;; XEmacs 21.5 tends to freeze when retrieving many urls at a time. :-<
-  (not (and (featurep 'xemacs) (not (featurep 'sxemacs))
-	    (= emacs-major-version 21) (= emacs-minor-version 5)))
-  "Non-nil means allow retrieving many urls asynchronously.
-The value affects how emacs-w3m will work with group:* urls and the
-`w3m-session-select' feature.  If it is nil, the asynchronous operation
-is inhibited in those cases even if `w3m-async-exec' is non-nil."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-default-content-type "text/html"
-  "*Default value assumed as the content type of local files."
-  :group 'w3m
-  :type '(string :size 0))
-
-(defvar w3m-image-viewer
-  (or (w3m-which-command "display")
-      (w3m-which-command "eeyes")
-      (w3m-which-command "xloadimage")
-      (w3m-which-command "xv"))
-  "*Command used to view image files externally.
-Note that this option is installed temporally.  It will be abolished
-when we implement the mailcap parser to set `w3m-content-type-alist'.")
-
-;; FIXME: we need to improve so that to set up the value of this
-;; variable may be performed by parsing the mailcap file.
-(defcustom w3m-content-type-alist
-  (let* ((fiber-viewer (when (and (eq system-type 'windows-nt)
-				  (w3m-which-command "fiber"))
-			 (list "fiber.exe" "-s" 'file)))
-	 (external-browser
-	  (if (and (eq system-type 'windows-nt) (w3m-which-command "fiber"))
-	      'w3m-w32-browser-with-fiber
-	    (or (when (condition-case nil (require 'browse-url) (error nil))
-		  (if (or (not (boundp 'browse-url-browser-function))
-			  (eq 'w3m-browse-url
-			      (symbol-value 'browse-url-browser-function)))
-		      (cond
-		       ((and (memq system-type '(windows-nt ms-dos cygwin))
-			     (fboundp 'browse-url-default-windows-browser))
-			'browse-url-default-windows-browser)
-		       ((and (memq system-type '(darwin))
-			     (fboundp 'browse-url-default-macosx-browser))
-			'browse-url-default-macosx-browser)
-		       ((fboundp 'browse-url-default-browser)
-			'browse-url-default-browser)
-		       ((fboundp 'browse-url-netscape)
-			'browse-url-netscape))
-		    (symbol-value 'browse-url-browser-function)))
-		(when (w3m-which-command "netscape")
-		  (list "netscape" 'url)))))
-	 (image-viewer (or fiber-viewer
-			   (when w3m-image-viewer
-			     (list w3m-image-viewer 'file))))
-	 (video-viewer (or fiber-viewer
-			   (when (w3m-which-command "mpeg_play")
-			     (list "mpeg_play" 'file))))
-	 (dvi-viewer (or fiber-viewer
-			 (cond ((w3m-which-command "xdvi") (list "xdvi" 'file))
-			       ((w3m-which-command "dvitty")
-				(list "dvitty" 'file)))))
-	 (ps-viewer (or fiber-viewer
-			(cond
-			 ((w3m-which-command "gv") (list "gv" 'file))
-			 ((w3m-which-command "gs") (list "gs" 'file)))))
-	 (pdf-viewer (or fiber-viewer
-			 (cond
-			  ((w3m-which-command "xpdf") (list "xpdf" 'file))
-			  ((w3m-which-command "acroread")
-			   (list "acroread" 'file))))))
-    `(("text/plain" "\\.\\(?:txt\\|tex\\|el\\)\\'" nil nil)
-      ("text/html" "\\.s?html?\\'" ,external-browser nil)
-      ("text/sgml" "\\.sgml?\\'" nil "text/plain")
-      ("text/xml" "\\.xml\\'" nil "text/plain")
-      ("image/jpeg" "\\.jpe?g\\'" ,image-viewer nil)
-      ("image/png" "\\.png\\'" ,image-viewer nil)
-      ("image/gif" "\\.gif\\'" ,image-viewer nil)
-      ("image/tiff" "\\.tif?f\\'" ,image-viewer nil)
-      ("image/x-xwd" "\\.xwd\\'" ,image-viewer nil)
-      ("image/x-xbm" "\\.xbm\\'" ,image-viewer nil)
-      ("image/x-xpm" "\\.xpm\\'" ,image-viewer nil)
-      ("image/x-bmp" "\\.bmp\\'" ,image-viewer nil)
-      ("video/mpeg" "\\.mpe?g\\'" ,video-viewer nil)
-      ("video/quicktime" "\\.mov\\'" ,video-viewer nil)
-      ("application/dvi" "\\.dvi\\'" ,dvi-viewer nil)
-      ("application/postscript" "\\.e?ps\\'" ,ps-viewer nil)
-      ("application/pdf" "\\.pdf\\'" ,pdf-viewer nil)
-      ("application/x-pdf" "\\.pdf\\'" ,pdf-viewer nil)
-      ("application/xml" "\\.xml\\'" nil w3m-detect-xml-type)
-      ("application/rdf+xml" "\\.rdf\\'" nil "text/plain")
-      ("application/rss+xml" "\\.rss\\'" nil "text/plain")
-      ("application/xhtml+xml" nil nil "text/html")))
-  "*Alist of content types, regexps, commands to view, and filters.
-Each element is a list which consists of the following data:
-
-1. Content type.
-
-2. Regexp matching a url or a file name.
-
-3. Method to view contents.  The following three types may be used:
-   a. Lisp function which takes the url to view as an argument.
-   b. (\"COMMAND\" [ARG...]) -- where \"COMMAND\" is the external command
-      and ARG's are the arguments passed to the command if any.  The
-      symbols `file' and `url' that appear in ARG's will be replaced
-      respectively with the name of a temporary file which contains
-      the contents and the string of the url to view.
-   c. nil which means to download the url into the local file.
-
-4. Content type that overrides the one specified by `1. Content type'.
-   Valid values include:
-   a. Lisp function that takes three arguments URL, CONTENT-TYPE, and
-      CHARSET, and returns a content type.
-   b. String that specifies a content type.
-   c. nil that means not to override the content type."
-  :group 'w3m
-  :type '(repeat
-	  (group
-	   :indent 2
-	   (string :format "Type: %v\n" :size 0)
-	   (radio :format "%{Regexp%}: %v" :extra-offset 8
-		  :sample-face underline
-		  (const :tag "Not specified" nil)
-		  (regexp :format "String: %v\n" :size 0))
-	   (radio :format "%{Viewer%}: %v" :extra-offset 8
-		  :sample-face underline
-		  (const :tag "Not specified" nil)
-		  (cons :tag "External viewer" :extra-offset 2
-			(string :format "Command: %v\n" :size 0)
-			(repeat :format "Arguments:\n%v%i\n" :extra-offset 2
-				(restricted-sexp
-				 :format "%v\n"
-				 :match-alternatives (stringp 'file 'url)
-				 :size 0)))
-		  (function :format "%t: %v\n" :size 0))
-	   (radio :format "%{Filter%}: %v" :extra-offset 8
-		  :sample-face underline
-		  (const :tag "Not specified" nil)
-		  (string :format "Equivalent type: %v\n" :size 0)
-		  (function :format "Function: %v\n" :size 0)))))
-
-;; FIXME: we need to rearrange the complicated and redundant relation of
-;; `w3m-encoding-type-alist', `w3m-decoder-alist', and `w3m-encoding-alist'.
-(defcustom w3m-encoding-type-alist
-  '(("\\.gz\\'" . "gzip")
-    ("\\.bz2?\\'" . "bzip"))
-  "*Alist of file suffixes and content encoding types."
-  :group 'w3m
-  :type '(repeat
-	  (cons :format "%v" :indent 14
-		(string :format "Regexp of Suffixes: %v\n" :size 0)
-		(string :format "Encoding Type: %v\n" :size 0))))
-
-(defcustom w3m-decoder-alist
-  `((gzip "gzip" ("-d"))	;; Don't use "gunzip" and "bunzip2"
-    (bzip "bzip2" ("-d"))	;; for broken OS and implementations.
-    (deflate
-      ,(if (not noninteractive)
-	   (let ((exec-path
-		  (let ((prefix (file-name-directory
-				 (directory-file-name
-				  (file-name-directory
-				   (w3m-which-command w3m-command))))))
-		    (list (expand-file-name "libexec/w3m" prefix)
-			  (expand-file-name "lib/w3m" prefix)))))
-	     (w3m-which-command "inflate")))
-      nil))
-  "Alist of encoding types, decoder commands, and arguments."
-  :group 'w3m
-  :type '(repeat
-	  (group :indent 4
-		 (radio :format "Encoding: %v"
-			(const :format "%v " gzip)
-			(const :format "%v " bzip)
-			(const deflate))
-		 (string :format "Command: %v\n" :size 0)
-		 (repeat :tag "Arguments" :extra-offset 2
-			 (string :format "%v\n" :size 0)))))
-
-(defcustom w3m-charset-coding-system-alist
-  (let ((rest
-	 '((us_ascii      . raw-text)
-	   (us-ascii      . raw-text)
-	   (gb2312	  . cn-gb-2312)
-	   (cn-gb	  . cn-gb-2312)
-	   (iso-2022-jp-2 . iso-2022-7bit-ss2)
-	   (iso-2022-jp-3 . iso-2022-7bit-ss2)
-	   (tis-620	  . tis620)
-	   (windows-874	  . tis-620)
-	   (cp874	  . tis-620)
-	   (x-ctext       . ctext)
-	   (unknown       . undecided)
-	   (x-unknown     . undecided)
-	   (windows-1250  . cp1250)
-	   (windows-1251  . cp1251)
-	   (windows-1252  . cp1252)
-	   (windows-1253  . cp1253)
-	   (windows-1254  . cp1254)
-	   (windows-1255  . cp1255)
-	   (windows-1256  . cp1256)
-	   (windows-1257  . cp1257)
-	   (windows-1258  . cp1258)
-	   (euc-jp	  . euc-japan)
-	   (shift-jis     . shift_jis)
-	   (shift_jis     . shift_jis)
-	   (sjis	  . shift_jis)
-	   (x-euc-jp      . euc-japan)
-	   (x-shift-jis   . shift_jis)
-	   (x-shift_jis   . shift_jis)
-	   (x-sjis	  . shift_jis)))
-	dest)
-    (while rest
-      (or (w3m-find-coding-system (car (car rest)))
-	  (setq dest (cons (car rest) dest)))
-      (setq rest (cdr rest)))
-    dest)
-  "Alist of MIME charsets and coding systems.
-Both charsets and coding systems must be symbols."
-  :group 'w3m
-  :type '(repeat (cons :format "%v" :indent 2
-		       (symbol :format "%t: %v\n" :size 0)
-		       (coding-system :format "%t: %v\n" :size 0))))
-
-(defcustom w3m-correct-charset-alist
-  '(("windows-874"  . "tis-620")
-    ("cp874"	    . "tis-620")
-    ("cp1250" . "windows-1250")
-    ("cp1251" . "windows-1251")
-    ("cp1252" . "windows-1252")
-    ("cp1253" . "windows-1253")
-    ("cp1254" . "windows-1254")
-    ("cp1255" . "windows-1255")
-    ("cp1256" . "windows-1256")
-    ("cp1257" . "windows-1257")
-    ("cp1258" . "windows-1258")
-    ("shift-jis"    . "shift_jis")
-    ("sjis"	    . "shift_jis")
-    ("x-euc-jp"     . "euc-jp")
-    ("x-shift-jis"  . "shift_jis")
-    ("x-shift_jis"  . "shift_jis")
-    ("x-sjis"	    . "shift_jis"))
-  "Alist of MIME charsets; strange ones and standard ones."
-  :group 'w3m
-  :type '(repeat (cons :format "%v" :indent 11
-		       (string :format "From: %v\n" :size 0)
-		       (string :format "To: %v\n" :size 0))))
-
-(defcustom w3m-horizontal-scroll-columns 10
-  "*Number of steps in columns used when scrolling a window horizontally."
-  :group 'w3m
-  :type '(integer :size 0))
-
-(defcustom w3m-horizontal-shift-columns 2
-  "*Number of steps in columns used when shifting a window horizontally.
-The term `shifting' means a fine level scrolling."
-  :group 'w3m
-  :type '(integer :size 0))
-
-(defcustom w3m-view-recenter 1
-  "Recenter window contents when going to an anchor.
-An integer is passed to `recenter', for instance the default 1
-    means put the anchor on the second line of the screen.
-t means `recenter' with no arguments, which puts it in the middle
-    of the screen.
-nil means don't recenter, let the display follow point in the
-    usual way."
-  :group 'w3m
-  ;; radio items in the same order as in the docstring, and `integer' first
-  ;; because it's the default
-  :type '(radio (integer :format "%{%t%}: %v\n" :value 1 :size 1)
-                (const :format "%t\n" t)
-                (const :format "%t\n" nil)))
-
-(defcustom w3m-use-form t
-  "*Non-nil means make it possible to use form extensions. (EXPERIMENTAL)"
-  :group 'w3m
-  :type 'boolean
-  :require 'w3m-form)
-
-(defcustom w3m-submit-form-safety-check nil
-  "Non-nil means ask you for confirmation when submitting a form."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-use-cookies nil
-  "*Non-nil means enable emacs-w3m to use cookies.  (EXPERIMENTAL)"
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-use-filter nil
-  "*Non-nil means use filter programs to convert web contents.
-See also `w3m-filter-rules'."
-  :group 'w3m
-  :type 'boolean
-  :require 'w3m-filter)
-
-(defcustom w3m-use-symbol
-  (when (and (featurep 'mule)
-	     (eq w3m-type 'w3m-m17n))
-    (if (eq w3m-output-coding-system 'utf-8)
-	(and (w3m-mule-unicode-p)
-	     (or (featurep 'xemacs)
-		 (< emacs-major-version 23))
-	     'w3m-device-on-window-system-p)
-      t))
-  "*Non-nil means replace symbols that the <_SYMBOL> tags lead into.
-It is meaningful only when the w3m-m17n command is used and (X)Emacs
-handles unicode charsets."
-  :group 'w3m
-  :type 'boolean
-  :require 'w3m-symbol)
-
-(defcustom w3m-edit-function 'find-file
-  "*Function used for editing local files.
-It is used when either `w3m-edit-current-url' or `w3m-edit-this-url'
-is invoked for local pages."
-  :group 'w3m
-  :type '(radio
-	  (const :tag "Edit it in the current window" find-file)
-	  (const :tag "Edit it in another window" find-file-other-window)
-	  (const :tag "Edit it in another frame" find-file-other-frame)
-	  (const :tag "View it in another window" view-file-other-window)
-	  (function :format "Other function: %v\n" :size 0
-		    :value view-file)))
-
-(defcustom w3m-edit-function-alist
-  '(("\\`[^?]+/hiki\\.cgi\\?" . hiki-edit-url))
-  "*Alist of functions used for editing pages.
-This option is referred to decide which function should be used to
-edit a specified page, when either `w3m-edit-current-url' or
-`w3m-edit-this-url' is invoked.  When no suitable function is found
-from this alist, `w3m-edit-function' is used."
-  :group 'w3m
-  :type '(repeat (cons :format "%v" :indent 3
-		       (regexp :format "URL: %v\n" :size 0)
-		       (function))))
-
-(defcustom w3m-url-local-directory-alist
-  (when (boundp 'yahtml-path-url-alist)
-    (mapcar
-     (lambda (pair)
-       (cons (cdr pair) (car pair)))
-     (symbol-value 'yahtml-path-url-alist)))
-  "*Alist of URLs and local directories.
-If directory names of a given URL and the car of an element are the
-same, emacs-w3m assumes that the file exists in the local directory
-where the cdr of an element points to.  The default value will be set
-to a value of the `yahtml-path-url-alist' variable which exchanged the
-car and the cdr in each element if it is available."
-  :type '(repeat
-	  (cons :format "%v" :indent 3
-		(string :format "URL: %v\n" :size 0)
-		(directory :format "%t: %v\n" :size 0)))
-  :group 'w3m)
-
-(defcustom w3m-track-mouse t
-  "*Whether to track the mouse and message the url under the mouse.
-See also `show-help-function' if you are using GNU Emacs.
-
-A tip for XEmacs users:
-
-You can also use the `balloon-help' feature by the
-`M-x balloon-help-mode' command with arg 1.  If the window manager
-decorates the balloon-help frame, and that is not to your taste, you
-may strip it off with the following directives:
-
-For ol[v]wm use this in .Xdefaults:
-   olvwm.NoDecor: balloon-help
-     or
-   olwm.MinimalDecor: balloon-help
-
-For fvwm version 1 use this in your .fvwmrc:
-   NoTitle balloon-help
-or
-   Style \"balloon-help\" NoTitle, NoHandles, BorderWidth 0
-
-For twm use this in your .twmrc:
-   NoTitle { \"balloon-help\" }
-
-See the balloon-help.el file for more information."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-show-decoded-url
-  '(("\\`http://\\(?:[^./?#]+\\.\\)*wikipedia\\.org/" . utf-8)
-    ("\\`http://\\(?:[^./?#]+\\.\\)*nikkei\\.co\\.jp/" . nil)
-    ("\\`http://\\(?:[^./?#]+\\.\\)*hatena\\.ne\\.jp/" . euc-jp)
-    ("\\`http://\\(?:[^./?#]+\\.\\)*ohmynews\\.co\\.jp/" . utf-8)
-    (t . t))
-  "*Non-nil means show decoded URIs in the echo area, the balloon, etc.
-This variable can take one of the following five kinds of forms:
-
-1. t
-  Decode URIs using the encoding guessed from the value of
-  `w3m-coding-system-priority-list'.
-
-2. Coding system
-  Decode URIs using this value.
-
-3. List of coding systems:
-  Decode URIs using the encoding assumed based on this list.
-
-4. Alist of predicates and forms described below:
-  Each element looks like the `(PREDICATE . ENCODING)' form.  PREDICATE
-  should be a regexp, a function or a Lisp form, and ENCODING should be
-  one of the forms described here excluding this form.  If PREDICATE is
-  a regexp, it will be tested whether it matches to the target url.
-  If it is a function, it will be called with the target url.  If it
-  is a Lisp form, it will be simply evaluated.  Elements are tested in
-  turn until the result of the test of the predicate is true and the
-  encoding which is associated to the predicate is used for decoding
-  URIs.
-
-5. nil
-  Don't decode URIs."
-  :group 'w3m
-  :type
-  '(choice
-    :format "%{%t%}: %[Value Menu%]\n  %v"
-    (coding-system :tag "Specify encoding" :format "Use this encoding: %v"
-		   :match (lambda (widget value)
-			    (w3m-find-coding-system value)))
-    (const :tag "Prefer the encoding of the current page"
-	   :format "%t: %{t%}\n" :sample-face widget-field-face
-	   t)
-    (group :tag "List of prefered encodings"
-	   :match (lambda (widget value)
-		    (and (car-safe value)
-			 (symbolp (car-safe value))))
-	   (repeat :format "List of prefered encodings:\n%v%i\n"
-		   :inline t
-		   (coding-system :tag "Encoding")))
-    (group :tag "Rules to select an encoding of URIs on the current page"
-	   :match (lambda (widget value) value)
-	   (repeat
-	    :format
-	    "Rules to select an encoding of URIs on the current page:\n%v%i\n"
-	    :inline t
-	    (cons
-	     :format "%v" :indent 2
-	     (choice
-	      :format "\n  %[Value Menu for the car%]\n    %v"
-	      (regexp :tag "Regexp matches the current page")
-	      (function :tag "Predicate checks for the current page")
-	      (sexp :tag "Expression checks for the current page"))
-	     (choice
-	      :format "%[Value Menu for the cdr%]\n    %v"
-	      (coding-system :tag "Specify encoding"
-			     :format "Use this encoding: %v"
-			     :match (lambda (widget value)
-				      (if (featurep 'xemacs)
-					  nil ;; ??
-					(w3m-find-coding-system value))))
-	      (const :tag "Prefer the encoding of the current page"
-		     :format "%t: %{t%}\n" :sample-face widget-field-face
-		     t)
-	      (group :tag "List of prefered encodings"
-		     (repeat :tag "List of prefered encodings"
-			     :inline t
-			     :extra-offset 4
-			     (coding-system :tag "Encoding")))
-	      (const :tag "Don't decode URIs"
-		     :format "%t: %{nil%}\n" :sample-face widget-field-face
-		     nil)))))
-    (const :tag "Don't decode URIs"
-	   :format "%t: %{nil%}\n" :sample-face widget-field-face
-	   nil)))
-
-(defcustom w3m-use-title-buffer-name nil
-  "Non-nil means use name of buffer included current title."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-use-japanese-menu
-  (and (equal "Japanese" w3m-language)
-       ;; Emacs 21, XEmacs 21.4 and SXEmacs don't seem to support
-       ;; non-ASCII text in the popup menu.
-       (not (featurep 'sxemacs))
-       (if (featurep 'xemacs)
-	   (or (> emacs-major-version 21)
-	       (and (= emacs-major-version 21)
-		    (>= emacs-minor-version 5)))
-	 (or (>= emacs-major-version 22)
-	     (featurep 'meadow))))
-  "Non-nil means use Japanese characters for Menu if possible."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-menu-on-forefront nil
-  "Non-nil means place the emacs-w3m menus on the forefront of the menu bar."
-  :group 'w3m
-  :type 'boolean
-  :set (lambda (symbol value)
-	 (prog1
-	     (custom-set-default symbol value)
-	   (unless noninteractive
-	     (w3m-menu-on-forefront value)))))
-
-(defcustom w3m-use-tab t
-  "Non-nil means make emacs-w3m a tab browser.
-It makes it possible to show all emacs-w3m buffers in a single window
-with the tabs line, and you can choose one by clicking a mouse on it.
-See also `w3m-use-tab-menubar'."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-add-tab-number nil
-  "Non-nil means put sequential number to a title on tab."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-use-tab-menubar t
-  "Non-nil means use the TAB pull-down menu in the menubar.
-It makes it possible to show all emacs-w3m buffers in a single window,
-and you can choose one by clicking a mouse on it.  This feature
-requires that Emacs has been built to be able to display multilingual
-text in the menubar if you often visit web sites written in non-ascii
-text.  See also `w3m-use-tab'."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-new-session-url "about://bookmark/"
-  "*Default url to be opened in a tab or a session which is created newly."
-  :group 'w3m
-  :type '(radio
-	  :convert-widget w3m-widget-type-convert-widget
-	  `((const :tag "About emacs-w3m" "about:")
-	    (const :tag "Blank page" "about:blank")
-	    (const :tag "Bookmark" "about://bookmark/")
-	    (const :tag ,(format "Home page (%s)" w3m-home-page)
-		   ,w3m-home-page)
-	    (string :format "URL: %v\n" :size 0
-		    :value "http://emacs-w3m.namazu.org"))))
-
-(defcustom w3m-make-new-session nil
-  "*Non-nil means making new emacs-w3m buffers when visiting new pages.
-If it is non-nil and there are already emacs-w3m buffers, the `w3m'
-command makes a new emacs-w3m buffer if a user specifies a url string
-in the minibuffer, and the `w3m-safe-view-this-url' command also makes
-a new buffer if a user invokes it in a buffer not being running the
-`w3m-mode'."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-use-favicon t
-  "*Non-nil means show favicon images if they are available.
-It will be set to nil automatically if ImageMagick's `convert' program
-does not support the ico format."
-  :get (lambda (symbol)
-	 (and (not noninteractive)
-	      (default-value symbol)
-	      (w3m-favicon-usable-p)))
-  :set (lambda (symbol value)
-	 (custom-set-default symbol (and (not noninteractive)
-					 value
-					 (w3m-favicon-usable-p))))
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-show-graphic-icons-in-mode-line t
-  "Non-nil means show graphic status indicators in the mode-line.
-If it is nil, also the favicon won't be shown in the mode-line even if
-`w3m-use-favicon' is non-nil."
-  :set (lambda (symbol value)
-	 (prog1
-	     (custom-set-default symbol value)
-	   (if (and (not noninteractive)
-		    ;; Make sure it is not the first time.
-		    (featurep 'w3m)
-		    (fboundp 'w3m-initialize-graphic-icons))
-	       (w3m-initialize-graphic-icons))))
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-show-graphic-icons-in-header-line t
-  "Non-nil means show graphic status indicators in the header-line.
-If it is nil, also the favicon won't be shown in the header-line even
-if `w3m-use-favicon' is non-nil.  This variable is currently
-meaningless under XEmacs."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-pop-up-windows t
-  "Non-nil means split the windows when a new emacs-w3m session is created.
-This variable is similar to `pop-up-windows' and quite overridden by
-`w3m-pop-up-frames' as if `pop-up-frames' influences.  Furthermore, if
-`w3m-use-tab' is non-nil or there is the buffers selection window (for
-the `w3m-select-buffer' feature), this variable is ignored when
-creating the second or more emacs-w3m session."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-pop-up-frames nil
-  "Non-nil means pop to a new frame up for an emacs-w3m session.
-This variable is similar to `pop-up-frames' and does override
-`w3m-pop-up-windows'.  If `w3m-use-tab' is non-nil or there is the
-buffers selection window (for the `w3m-select-buffer' feature), this
-variable is ignored when creating the second or more emacs-w3m session."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-view-this-url-new-session-in-background nil
-  "*Obsolete."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-new-session-in-background
-  w3m-view-this-url-new-session-in-background
-  "*Say whether not to focus on a new tab or a new session in target.
-It influences only when a new emacs-w3m buffer is created."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-popup-frame-parameters nil
-  "Alist of frame parameters used when creating a new emacs-w3m frame.
-It allows not only the alist form but also XEmacs' plist form."
-  :group 'w3m
-  :type '(choice (group :inline t :tag "Frame Parameters (Emacs)"
-			(repeat :inline t :tag "Frame Parameters (Emacs)"
-				(cons :format "%v" :indent 3
-				      (symbol :format "Parameter: %v\n"
-					      :size 0)
-				      (sexp :format "%t: %v\n" :size 0))))
-		 (group :inline t :tag "Frame Plist (XEmacs)"
-			(repeat :inline t :tag "Frame Plist (XEmacs)"
-				(group :indent 2 :inline t
-				       (symbol :format "Property: %v\n"
-					       :size 0)
-				       (sexp :format "%t: %v\n" :size 0))))))
-
-(defcustom w3m-auto-show t
-  "*Non-nil means provide the ability to horizontally scroll the window.
-Automatic horizontal scrolling is made when the point gets away from
-both ends of the window, but nothing occurs if `truncate-lines' is set
-to nil.
-
-This feature works with the specially made program in emacs-w3m; usual
-`auto-hscroll-mode', `automatic-hscrolling', `auto-show-mode' or
-`hscroll-mode' will all be invalidated in emacs-w3m buffers."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-horizontal-scroll-division 4
-  "*Integer used by the program making the point certainly visible.
-The cursor definitely does not go missing even when it has been driven
-out of the window while wandering around anchors and forms in an
-emacs-w3m buffer.
-
-Suppose that the value of this variable is N.  When the point is
-outside the left of the window, emacs-w3m scrolls the window so that
-the point may be displayed on the position within 1/N of the width of
-the window from the left.  Similarly, when the point is outside the
-right of the window, emacs-w3m scrolls the window so that the point
-may be displayed on the position of 1/N of the width of the window
-from the right.
-
-This feature doesn't work if `w3m-auto-show' is nil.  The value must
-be a larger integer than 1."
-  :group 'w3m
-  :type '(integer :size 0)
-  :set (lambda (symbol value)
-	 (custom-set-default symbol (if (and (integerp value) (> value 1))
-					value
-				      4))))
-
-(defcustom w3m-show-error-information t
-  "*Non-nil means show an error information as a web page.
-Page is made when the foreign server doesn't respond to a request to
-retrieve data."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-use-refresh t
-  "*Non-nil means honor the REFRESH attribute in META tags.
-Emacs-w3m arbitrarily takes you to a url specified by that attribute.
-Note that they may be malicious traps."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-mbconv-command "mbconv"
-  "*Name of the \"mbconv\" command provided by the \"libmoe\" package.
-The \"libmoe\" package is used when you use the w3mmee command instead
-of the w3m command.  See also `w3m-command'."
-  :group 'w3m
-  :type '(string :size 0))
-
-(defcustom w3m-local-find-file-regexps
-  (cons nil
-	(concat "\\."
-		(regexp-opt (append '("htm"
-				      "html"
-				      "shtm"
-				      "shtml"
-				      "xhtm"
-				      "xhtml"
-				      "txt")
-				    (and (w3m-image-type-available-p 'jpeg)
-					 '("jpeg" "jpg"))
-				    (and (w3m-image-type-available-p 'gif)
-					 '("gif"))
-				    (and (w3m-image-type-available-p 'png)
-					 '("png"))
-				    (and (w3m-image-type-available-p 'xbm)
-					 '("xbm"))
-				    (and (w3m-image-type-available-p 'xpm)
-					 '("xpm")))
-			    t) ;; with surrounding parens (for old Emacsen).
-		"\\'"))
-  "*Cons of two regexps matching and not matching with local file names.
-If a url of the `file:' scheme in which you entered matches the first
-form and does not match the latter form, it will be opened by the
-function specified by the `w3m-local-find-file-function' variable.
-Nil for the regexp matches any file names.
-
-For instance, the value `(nil . \"\\\\.[sx]?html?\\\\'\")' allows
-\"file:///some/where/w3m.el\", not \"file:///any/where/index.html\", to
-open by the function specified by `w3m-local-find-file-function'.  The
-latter will be opened as a normal web page.  Furthermore, if you would
-like to view some types of contents in the local system using the
-viewers specified by the `w3m-content-type-alist' variable, you can
-add regexps matching those file names to the second element of this
-variable.  For example:
-
-\(setq w3m-local-find-file-regexps
-      '(nil . \"\\\\.\\\\(?:[sx]?html?\\\\|dvi\\\\|ps\\\\|pdf\\\\)\\\\'\"))
-
-It is effective only when the `w3m-local-find-file-function' variable
-is set properly."
-  :group 'w3m
-  :type '(cons (radio :tag "Match"
-		      (const :format "All " nil)
-		      (regexp :format "%t: %v\n" :size 0))
-	       (radio :tag "Nomatch"
-		      (const :format "All " nil)
-		      (regexp :format "%t: %v\n" :size 0))))
-
-(defcustom w3m-local-find-file-function
-  '(if (w3m-popup-frame-p)
-       'find-file-other-frame
-     'find-file-other-window)
-  "*Function used to open local files.
-If a url of the `file:' scheme in which you entered agrees with the
-rule of the `w3m-local-find-file-regexps' variable (which see), it is
-used to open the file.
-
-Function should take one argument, the string naming the local file.
-It can also be any Lisp form returning a function.  Set this to nil if
-you want to always use emacs-w3m to see local files."
-  :group 'w3m
-  :type '(sexp :size 0))
-
-(defcustom w3m-local-directory-view-method 'w3m-cgi
-  "*Symbol of the method to view a local directory tree.
-The valid values include `w3m-cgi' using the CGI program specified by
-the `w3m-dirlist-cgi-program' variable (which see), and `w3m-dtree'
-using the w3m-dtree Lisp module."
-  :group 'w3m
-  :type '(radio (const :format "Dirlist CGI  " w3m-cgi)
-		(const :tag "Directory tree" w3m-dtree)))
-
-(defcustom w3m-dirlist-cgi-program
-  (cond ((eq system-type 'windows-nt)
-	 "c:/usr/local/lib/w3m/dirlist.cgi")
-	((memq system-type '(OS/2 emx))
-	 (expand-file-name "dirlist.cmd" (getenv "W3M_LIB_DIR")))
-	(t nil))
-  "*Name of the CGI program to list a local directory.
-If it is nil, the dirlist.cgi module of the w3m command will be used."
-  :group 'w3m
-  :type `(radio
-	  (const :tag "w3m internal CGI" nil)
-	  (file :format "path of 'dirlist.cgi': %v\n"
-		:size 0
-		:value ,(if (not noninteractive)
-			    (expand-file-name
-			     (concat "../lib/"
-				     (file-name-nondirectory w3m-command)
-				     "/dirlist.cgi")
-			     (file-name-directory
-			      (w3m-which-command w3m-command)))))))
-
-(defcustom w3m-add-referer
-  (if (boundp 'w3m-add-referer-regexps)
-      (symbol-value 'w3m-add-referer-regexps)
-    (cons "\\`http:" "\\`http://\\(?:localhost\\|127\\.0\\.0\\.1\\)/"))
-  "*Rule of sending referers.
-There are five choices as the valid values of this option.
-
-\(1\) nil: this means that emacs-w3m never send referers.
-\(2\) t: this means that emacs-w3m always send referers.
-\(3\) lambda: this means that emacs-w3m send referers only when both
-    the current page and the target page are provided by the same
-    server.
-\(4\) a cons cell keeping two regular expressions: this means that
-    emacs-w3m send referers when the url of the current page matches
-    the first regular expression and does not match the second regular
-    expression.  Nil for the regexp matches any url.
-\(5\) a function: emacs-w3m send referers when this function which has
-    two arguments, URL and REFERER, returns non-nil.
-
-If you become nervous about leak of your private WEB browsing history,
-set `nil' or `lambda' to this option.  When your computer belongs to a
-secret network, you may set a pair of regular expressions to inhibit
-sending referers which will disclose your private informations, as
-follows:
-
-\(setq w3m-add-referer
-      '(\"\\\\`http:\"
-	. \"\\\\`http://\\\\(?:[^./]+\\\\.\\\\)*example\\\\.net/\")\)
-"
-  :group 'w3m
-  :type '(choice
-	  (const :tag "Never send referers" nil)
-	  (const :tag "Always send referers" t)
-	  (const :tag "Send referers when accessing the same server" lambda)
-	  (cons :tag "Send referers when URI matches:"
-		(list :inline t :format "%v"
-		      (radio :indent 2 :sample-face underline
-			     :tag "Allow"
-			     (regexp :format "%t: %v\n" :size 0)
-			     (const :tag "Don't allow all" nil))
-		      (radio :indent 2 :sample-face underline
-			     :tag "Don't allow"
-			     (regexp :format "%t: %v\n" :size 0)
-			     (const :tag "Allow all" nil))))
-	  (function :tag "Send referers when your function returns non-nil")))
-
-(defcustom w3m-touch-command (w3m-which-command "touch")
-  "*Name of the executable file of the touch command.
-Note that the command is required to be able to modify file's
-timestamp with the `-t' option."
-  :group 'w3m
-  :type '(string :size 0))
-
-(defcustom w3m-puny-utf-16be
-  (cond
-   ((w3m-find-coding-system 'utf-16-be-no-signature)
-    'utf-16-be-no-signature)
-   ((w3m-find-coding-system 'utf-16be)
-    'utf-16be)
-   (t nil))
-  "*Coding system for PUNY coding. if nil, don't use PUNY code."
-  :group 'w3m
-  :type '(radio (coding-system :tag "UTF-16BE without BOM")
-		(const "Don't use" nil)))
-
-(defcustom w3m-uri-replace-alist
-  '(("\\`gg:" w3m-search-uri-replace "google")
-    ("\\`ggg:" w3m-search-uri-replace "google groups")
-    ("\\`ya:" w3m-search-uri-replace "yahoo")
-    ("\\`al:" w3m-search-uri-replace "altavista")
-    ("\\`bts:" w3m-search-uri-replace "debian-bts")
-    ("\\`dpkg:" w3m-search-uri-replace "debian-pkg")
-    ("\\`archie:" w3m-search-uri-replace "iij-archie")
-    ("\\`alc:"  w3m-search-uri-replace "alc")
-    ("\\`urn:ietf:rfc:\\([0-9]+\\)" w3m-pattern-uri-replace
-     "http://www.ietf.org/rfc/rfc\\1.txt"))
-  "*Alist of regexps matching URIs, and some types of replacements.
-It can be used universally to replace URI strings in the local rule to
-the valid forms in the Internet.
-
-Each element looks like the `(REGEXP FUNCTION OPTIONS...)' form.
-FUNCTION takes one or more arguments, a uri and OPTIONS.  You can use
-the grouping constructs \"\\\\(...\\\\)\" in REGEXP, and they can be
-referred by the \"\\N\" forms in a replacement (which is one of OPTIONS).
-
-Here are some predefined functions which can be used for those ways:
-
-`w3m-pattern-uri-replace'
-    Replace a URI using PATTERN (which is just an OPTION).  It is
-    allowed that PATTERN contains the \"\\N\" forms in the same manner
-    of `replace-match'.
-
-`w3m-search-uri-replace'
-    Generate the valid forms to query words to some specified search
-    engines.  For example, the element
-
-    (\"\\\\`gg:\" w3m-search-uri-replace \"google\")
-
-    makes it possible to replace the URI \"gg:emacs\" to the form to
-    query the word \"emacs\" to the Google site.\
-"
-  :group 'w3m
-  :type '(repeat
-	  :convert-widget w3m-widget-type-convert-widget
-	  `((choice
-	     :format "%[Value Menu%] %v" :tag "Replacing URI with"
-	     (list :indent 4 :tag "Replacement Using Pattern"
-		   (regexp :format "%t: %v\n" :size 0)
-		   (function-item :format "" w3m-pattern-uri-replace)
-		   (string :format "Pattern: %v\n" :size 0))
-	     (list :format "%t:\n%v" :indent 4 :tag "Quick Search"
-		   (regexp :format "Prefix URI %t: %v\n"
-			   :size 0 :value "")
-		   (function-item :format "" w3m-search-uri-replace)
-		   (string :format "Quick Search Engine: %v\n"
-			   :size 0 :value ""))
-	     ,@(progn
-		 (require 'w3m-search)
-		 (mapcar
-		  (lambda (elem)
-		    (let* ((engine (car elem))
-			   (prefix (mapconcat 'identity
-					      (split-string (downcase engine))
-					      "-")))
-		      `(list
-			:format "Quick Search:\n%v"
-			:indent 4
-			:tag ,(concat "Quick Search: " prefix)
-			(regexp :tag "Prefix URL Regexp"
-				,(concat "\\`" (regexp-quote prefix) ":"))
-			(function-item :format "" w3m-search-uri-replace)
-			(string :tag "Quick Search Engine" ,engine))))
-		  w3m-search-engine-alist))
-	     (list :indent 4 :tag "User Defined Function"
-		   (regexp :format "%t: %v\n" :size 0)
-		   (function
-		    :format "%t: %v\n" :size 0
-		    ;; Fix a bug in Emacs versions prior to 22.
-		    :value-to-internal
-		    (lambda (widget value)
-		      (if (stringp value)
-			  (if (string-match "\\`\".*\"\\'" value)
-			      (substring value 1 -1)
-			    value)
-			(prin1-to-string value))))
-		   (repeat :extra-offset 2 :tag "Options"
-			   (sexp :format "%t: %v\n" :size 0)))))))
-
-(defcustom w3m-relationship-estimate-rules
-  `((w3m-relationship-simple-estimate
-     "\\`http://\\(?:www\\|blogsearch\\|groups\\|news\\|images\\)\
-\\.google\\.[^/]+/\\(?:\\(?:blog\\|code\\)?search\\|groups\\|news\\|images\
-\\|cse\\?cx=\\|custom\\?\\(?:q\\|hl\\)=\\)"
-     ,(concat "<a[^>]+?href=" w3m-html-string-regexp "[^>]*>[\t\n ]*"
-	      "\\(?:\\(?:</?span[^>]*>[\t\n ]*\\)*<span[^>]+>Next</span>"
-	      "\\|\\(?:</?span[^>]*>[\t\n ]*\\)*"
-	      "<b>\\(?:$B2<0lJG(B\\|$B<!$X(B\\|$(C4Y@=(B\\)</b>\\)")
-     ,(concat "<a[^>]+?href=" w3m-html-string-regexp "[^>]*>[\t\n ]*"
-	      "\\(?:\\(?:</?span[^>]*>[\t\n ]*\\)*<span[^>]+>Previous</span>"
-	      "\\|\\(?:</?span[^>]*>[\t\n ]*\\)*"
-	      "<b>\\(?:$B>e0lJG(B\\|$BA0$X(B\\|$(C@L@|(B\\)</b>\\)")
-     nil nil)
-    (w3m-relationship-simple-estimate
-     "\\`http://www\\.google\\.[^/]+/gwt/n\\?u="
-     ,(concat "<a[^>]+?href=" w3m-html-string-regexp
-	      "[ \t\n]+accesskey=\"3\">")
-     ,(concat "<a[^>]+?href=" w3m-html-string-regexp
-	      "[ \t\n]+accesskey=\"1\">")
-     nil nil)
-    (w3m-relationship-simple-estimate
-     "\\`http://beta\\.search\\.yahoo\\.co\\.jp/"
-     ,(concat "<a href=" w3m-html-string-regexp
-	      "><img src=http://i\\.yimg\\.jp/images/common/ar_next\\.gif")
-     ,(concat "<a href=" w3m-html-string-regexp
-	      "><img src=http://i\\.yimg\\.jp/images/common/ar_prev\\.gif")
-     nil nil)
-    (w3m-relationship-simple-estimate
-     "\\`http://www\\.zdnet\\.co\\.jp/news/"
-     ,(concat "<a href=" w3m-html-string-regexp ">$B<!$N%Z!<%8(B</a>")
-     ,(concat "<a href=" w3m-html-string-regexp ">$BA0$N%Z!<%8(B</a>")
-     nil nil)
-    (w3m-relationship-simple-estimate
-     "\\`http://freshmeat\\.net/\\(search\\|browse\\)/"
-     ,(concat "<A HREF=" w3m-html-string-regexp ">\\[&raquo;\\]</A>")
-     ,(concat "<A HREF=" w3m-html-string-regexp ">\\[&laquo;\\]</A>")
-     nil nil)
-    (w3m-relationship-oddmuse-estimate)
-    (w3m-relationship-magicpoint-estimate)
-    (w3m-relationship-slashdot-estimate)
-    (w3m-relationship-alc-estimate))
-  "*Rules to estimate relationships between a retrieved page and others."
-  :group 'w3m
-  :type '(repeat
-	  (choice
-	   :format "%[Value Menu%] %v"
-	   (list :tag "Estimate relationships from anchors matching"
-		 :indent 1
-		 (const :format "Function: %v\n"
-			w3m-relationship-simple-estimate)
-		 (regexp :tag "URL")
-		 (regexp :tag "Next")
-		 (regexp :tag "Prev")
-		 (radio :format "Start: %v"
-			(const :format "%v " nil) regexp)
-		 (radio :format "Contents: %v"
-			(const :format "%v " nil) regexp))
-	   (list :tag "Estimate with a user defined function"
-		 :indent 1
-		 function
-		 (repeat :tag "Args" :extra-offset 1 (sexp :format "%v"))))))
-
-(defcustom w3m-enable-google-feeling-lucky t
-  "Non-nil enables you to enter any words as well as a url when prompted.
-In that case, emacs-w3m uses Google to search for the words."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-google-feeling-lucky-charset
-  (cond
-   ((or (featurep 'un-define) (fboundp 'utf-translate-cjk-mode))
-    "UTF-8")
-   ((equal "Japanese" w3m-language)
-    "SHIFT_JIS")
-   ((w3m-find-coding-system 'utf-8)
-    "UTF-8")
-   (t "US-ASCII"))
-  "*Character set for \"I'm Feeling Lucky on Google\"."
-  :group 'w3m
-  :type '(string :size 0))
-
-(defconst w3m-entity-table
-  (let ((table (make-hash-table :test 'equal)))
-    (dolist (entity '(("nbsp" . " ")
-		      ("gt" . ">")
-		      ("lt" . "<")
-		      ("amp" . "&")
-		      ("quot" . "\"")
-		      ("apos" . "'")
-		      ("circ" . "^")
-		      ("tilde" . "~")))
-      (puthash (car entity) (cdr entity) table))
-    (dolist (entity
-	     '(;("nbsp" . 160)
-	       ("iexcl" . 161) ("cent" . 162) ("pound" . 163) ("curren" . 164)
-	       ("yen" . 165) ("brvbar" . 166) ("sect" . 167) ("uml" . 168)
-	       ("copy" . 169) ("ordf" . 170) ("laquo" . 171) ("not" . 172)
-	       ("shy" . 173) ("reg" . 174) ("macr" . 175) ("deg" . 176)
-	       ("plusmn" . 177) ("sup2" . 178) ("sup3" . 179) ("acute" . 180)
-	       ("micro" . 181) ("para" . 182) ("middot" . 183) ("cedil" . 184)
-	       ("sup1" . 185) ("ordm" . 186) ("raquo" . 187) ("frac14" . 188)
-	       ("frac12" . 189) ("frac34" . 190) ("iquest" . 191)
-	       ("Agrave" . 192) ("Aacute" . 193) ("Acirc" . 194)
-	       ("Atilde" . 195) ("Auml" . 196) ("Aring" . 197) ("AElig" . 198)
-	       ("Ccedil" . 199) ("Egrave" . 200) ("Eacute" . 201)
-	       ("Ecirc" . 202) ("Euml" . 203) ("Igrave" . 204) ("Iacute" . 205)
-	       ("Icirc" . 206) ("Iuml" . 207) ("ETH"  . 208) ("Ntilde" . 209)
-	       ("Ograve" . 210) ("Oacute" . 211) ("Ocirc" . 212)
-	       ("Otilde" . 213) ("Ouml" . 214) ("times" . 215) ("Oslash" . 216)
-	       ("Ugrave" . 217) ("Uacute" . 218) ("Ucirc" . 219) ("Uuml" . 220)
-	       ("Yacute" . 221) ("THORN" . 222) ("szlig" . 223) ("agrave" . 224)
-	       ("aacute" . 225) ("acirc" . 226) ("atilde" . 227) ("auml" . 228)
-	       ("aring" . 229) ("aelig" . 230) ("ccedil" . 231) ("egrave" . 232)
-	       ("eacute" . 233) ("ecirc" . 234) ("euml" . 235) ("igrave" . 236)
-	       ("iacute" . 237) ("icirc" . 238) ("iuml" . 239) ("eth" . 240)
-	       ("ntilde" . 241) ("ograve" . 242) ("oacute" . 243)
-	       ("ocirc" . 244) ("otilde" . 245) ("ouml" . 246) ("divide" . 247)
-	       ("oslash" . 248) ("ugrave" . 249) ("uacute" . 250)
-	       ("ucirc" . 251) ("uuml" . 252) ("yacute" . 253) ("thorn" . 254)
-	       ("yuml" . 255)))
-      (puthash (car entity)
-	       (char-to-string (make-char 'latin-iso8859-1 (cdr entity)))
-	       table))
-    (dolist (entity
-	     '(("Alpha" . 65) ("Beta" . 66) ("Gamma" . 67) ("Delta" . 68)
-	       ("Epsilon" . 69) ("Zeta" . 70) ("Eta" . 71) ("Theta" . 72)
-	       ("Iota" . 73) ("Kappa" . 74) ("Lambda" . 75) ("Mu" . 76)
-	       ("Nu" . 77) ("Xi" . 78) ("Omicron" . 79) ("Pi" . 80)
-	       ("Rho" . 81)	; No ("Sigmaf" . 82)
-	       ("Sigma" . 83) ("Tau" . 84) ("Upsilon" . 85) ("Phi" . 86)
-	       ("Chi" . 87) ("Psi" . 88) ("Omega" . 89)
-	       ("alpha" . 97) ("beta" . 98) ("gamma" . 99) ("delta" . 100)
-	       ("epsilon" . 101) ("zeta" . 102) ("eta" . 103) ("theta" . 104)
-	       ("iota" . 105) ("kappa" . 106) ("lambda" . 107) ("mu" . 108)
-	       ("nu" . 109) ("xi" . 110) ("omicron" . 111) ("pi" . 112)
-	       ("rho" . 113) ("sigmaf" . 114) ("sigma" . 115) ("tau" . 116)
-	       ("upsilon" . 117) ("phi" . 118) ("chi" . 119) ("psi" . 120)
-	       ("omega" . 121)))
-      (puthash (car entity)
-	       (char-to-string (make-char 'greek-iso8859-7 (cdr entity)))
-	       table))
-    (when (w3m-mule-unicode-p)
-      (let ((latin-extended-a
-	     '((32 . (("OElig" . 114) ("oelig" . 115)))
-	       (33 . (("Scaron" . 32) ("scaron" . 33) ("Yuml" . 56)))))
-	    (latin-extended-b '((33 . (("fnof" . 82)))))
-	    ;;(spacing-modifier-letters '(36 . (("circ" . 120) ("tilde" . 124))))
-	    (general-punctuation
-	     '((114 .
-		    (("ensp" . 98) ("emsp" . 99) ("thinsp" . 105) ("zwnj" . 108)
-		     ("zwj" . 109) ("lrm" . 110) ("rlm" . 111) ("ndash" . 115)
-		     ("mdash" . 116) ("lsquo" . 120) ("rsquo" . 121)
-		     ("sbquo" . 122) ("ldquo" . 124) ("rdquo" . 125)
-		     ("bdquo" . 126)))
-	       (115 .
-		    (("dagger" . 32) ("Dagger" . 33) ("permil" . 48)
-		     ("lsaquo" . 57) ("rsaquo" . 58)
-		     ("bull" . 34) ("hellip" . 38) ("prime" . 50) ("Prime" . 51)
-		     ("oline" . 62) ("frasl" . 68)))
-	       (116 .
-		    (("euro" . 76)))))
-	    (greek '((39 . (("thetasym" . 81) ("upsih" . 82) ("piv" . 86)))))
-	    (letterlike-symbols
-	     '((117 .
-		    (("weierp" . 88) ("image" . 81) ("real" . 92)
-		     ("trade" . 98) ("alefsym" . 117)))))
-	    (arrows
-	     '((118 .
-		    (("larr" . 112) ("uarr" . 113) ("rarr" . 114) ("darr" . 115)
-		     ("harr" . 116)))
-	       (119 .
-		    (("crarr" . 53) ("lArr" . 80) ("uArr" . 81) ("rArr" . 81)
-		     ("dArr" . 83) ("hArr" . 84)))))
-	    (mathematical-operators
-	     '((120 .
-		    (("forall" . 32) ("part" . 34) ("exist" . 35) ("empty" . 37)
-		     ("nabla" . 39) ("isin" . 40) ("notin" . 41) ("ni" . 43)
-		     ("prod" . 47) ("sum" . 49) ("minus" . 50) ("lowast" . 55)
-		     ("radic" . 58) ("prop" . 61) ("infin" . 62) ("ang" . 64)
-		     ("and" . 71) ("or" . 72) ("cap" . 73) ("cup" . 74)
-		     ("int" . 75) ("there4" . 84) ("sim" . 92) ("cong" . 101)
-		     ("asymp" . 104)))
-	       (121 .
-		    (("ne" . 32) ("equiv" . 33) ("le" . 36) ("ge" . 37)
-		     ("sub" . 66) ("sup" . 67) ("nsub" . 68) ("sube" . 70)
-		     ("supe" . 71) ("oplus" . 85) ("otimes" . 87)
-		     ("perp" . 101)))
-	       (122 . (("sdot" . 37)))))
-	    (miscellaneous-technical
-	     '((122 . (("lceil" . 104) ("rceil" . 105) ("lfloor" . 106)
-		       ("rfloor" . 107)))
-	       (123 . (("lang" . 41) ("rang" . 42)))))
-	    (suit
-	     '(("loz" . (34 . 42)) ("spades" . (35 . 96)) ("clubs" . (35 . 99))
-	       ("hearts" . (35 . 101)) ("diams" . (35 . 102)))))
-	(dolist (entities `(,@latin-extended-a
-			    ,@latin-extended-b
-			    ,@general-punctuation
-			    ,@greek ,@letterlike-symbols ,@arrows
-			    ,@mathematical-operators
-			    ,@miscellaneous-technical))
-	  (let ((code1 (car entities)))
-	    (dolist (entity (cdr entities))
-	      (puthash (car entity)
-		       (char-to-string
-			(make-char 'mule-unicode-0100-24ff
-				   code1 (cdr entity)))
-		       table))))
-	(dolist (entity suit)
-	  (puthash (car entity)
-		   (char-to-string
-		    (make-char 'mule-unicode-2500-33ff
-			       (car (cdr entity)) (cdr (cdr entity))))
-		   table))))
-    table)
-  "Table of html character entities and values.")
-
-(defvar w3m-extra-numeric-character-reference
-  (mapcar
-   (lambda (item)
-     (cons (car item) (string (w3m-ucs-to-char (cdr item)))))
-   '((#x80 . #x20AC) (#x82 . #x201A) (#x83 . #x0192) (#x84 . #x201E)
-     (#x85 . #x2026) (#x86 . #x2020) (#x87 . #x2021) (#x88 . #x02C6)
-     (#x89 . #x2030) (#x8A . #x0160) (#x8B . #x2039) (#x8C . #x0152)
-     (#x8E . #x017D) (#x91 . #x2018) (#x92 . #x2019) (#x93 . #x201C)
-     (#x94 . #x201D) (#x95 . #x2022) (#x96 . #x2013) (#x97 . #x2014)
-     (#x98 . #x02DC) (#x99 . #x2122) (#x9A . #x0161) (#x9B . #x203A)
-     (#x9C . #x0153) (#x9E . #x017E) (#x9F . #x0178)))
-  "*Alist of (numeric . string) pairs for numeric character reference
-other than ISO 10646.")
-
-(defconst w3m-entity-reverse-table
-  (let ((table (make-hash-table :test 'equal)))
-    (maphash (lambda (key val) (puthash val key table))
-	     w3m-entity-table)
-    table)
-  "Revision table of html character entities and values.")
-
-(defconst w3m-entity-regexp
-  (let (buf)
-    (maphash (lambda (key val) (push key buf))
-	     w3m-entity-table)
-    (concat "&\\("
-	    (let ((max-specpdl-size (* 1024 1024))) ;; For old Emacsen.
-	      (regexp-opt buf))
-	    "\\|#\\(?:[xX][0-9a-fA-F]+\\|[0-9]+\\)\\)\\(\\'\\|[^0-9a-zA-Z]\\)"))
-  "Regexp matching html character entities.")
-
-(defconst w3m-encoding-alist
-  (eval-when-compile
-    (apply 'nconc
-	   (mapcar (lambda (elem)
-		     (mapcar (lambda (x) (cons x (car elem)))
-			     (cdr elem)))
-		   '((gzip . ("gzip" "x-gzip" "compress" "x-compress"))
-		     (bzip . ("x-bzip" "bzip" "bzip2"))
-		     (deflate . ("x-deflate" "deflate"))))))
-  "Alist of content encoding types and decoder symbols.
-Decoders are specified by `w3m-decoder-alist' (which see).")
-
-(defconst w3m-emacs-w3m-icon "\
-R0lGODlhUwAOAPIAAFUq/H8AvwC/AP8AAAAAv79/Af///wAAACH/C05FVFNDQVBFMi4wAwEA
-AAAh+QQAIQD/ACwAAAAAUwAOAAADxmi63P4wykmrvXiWvbP/4NIpY2ieUFlSQRssrRG7DGET
-DQEAzL5PAoEiSCo0RoOBIblkKmKyV/RFsymsBqzh99vyvBKiYbQaG5vKZFoZfUqhUO0C2613
-gUJzsVhy+tkuNG2DWjd0Xw0+iEGMYgJGHWVjbH8KTlAMcThZm1iHEYwakKMOlU2WgFKZUp6d
-m3YKdwtiEmRnfZS5qG5Ub6yuVzg+C1xfAES0EbZ7u6fOTlOqrcFzxcSyjRXLqGoLptAo4eLj
-5OUNCQAh+QQAIQD/ACwAAAAAUwAOAAADImi63P4wykmrvTjrzbv/YCiOZGmeaKqubOu+cCzP
-dG3fagIAIfkEACEA/wAsAAAAAFMADgAAAz5outz+MMpJq7046827/2AYBWSwkAZaimyFpiZs
-rm0tvXj82rxT0rmekLE7xYZIRVF5TA5XQWfyJ61ar9hsAgAh+QQAIQD/ACwAAAAAUwAOAAAD
-Vmi63P4wykmrvTjrzbv/YBgFZLCQBloyREs0rxiiqVmba6voBi//tKCN5lsUf7OSUEGM9VxO
-ZNLR3MV4R6mHxqg+rVrpavktZ8MgpfHKNqLf8Lh8XkkAACH5BAAhAP8ALAAAAABTAA4AAANw
-aLrc/jDKSau9OOvNu/9gGAVksJAGWjJESzQEADCyLGJoaurm2io/Q9BgsxFnx5slx9zlhoug
-cWpULktNxfMFdHGrtJq1kmNsu2jhFznulE+7oHytoLY1q6w6/RPXZ1N3F1hRXHNRRWx+goyN
-jo+QCQAh+QQAIQD/ACwAAAAAUwAOAAADhWi63P4wykmrvTjrzbv/YBgFZLCQBloyREs0BAAw
-sjwJgoKHaGr6plVLMTQUDTYbcraU7ESKnvTXOy6KyqzyloMCV77o7+jCMhu1M2797EJ7jOrL
-OC+aI2tvBX4a1/8KWoFnC096EitTRIB0S2dJTAA7hocjYI2YZJALNQxslaChoqOkDgkAIfkE
-ACEA/wAsAAAAAFMADgAAA6doutz+MMpJq714lr2z/+DSKWNonlBZUkEbLK0RuwxhEw0BAMy+
-TwKBIkgqNFaSmOy1fNFsCqhBavj9qjyshGgYIZERpZippC6k1/QVKOwa3UVw2DVWlHHRG37d
-8y2CgFwCRh1gbxVKDHd5jFN7WQ+AGoSUJokwTFKajwpqDlwSXm9yLDNkmXibWJBWWQBEoBGi
-RSB0Z6m4Z60Lfn+SFLMowsPExcbFCQAh+QQAIQD/ACwAAAAAUwAOAAADxmi63P4wykmrvXiW
-vbP/4NIpY2ieUFlSQRssrRG7DGETDQEAzL5PAoEiSCo0RoOBIblkKmKyV/RFsymsBqzh99vy
-vBKiYbQaG5vKZFoZfUqhUO0C2613gUJzsVhy+tkuNG2DWjd0Xw0+iEGMYgJGHWVjbH8KTlAM
-cThZm1iHEYwakKMOlU2WgFKZUp6dm3YKdwtiEmRnfZS5qG5Ub6yuVzg+C1xfAES0EbZ7u6fO
-TlOqrcFzxcSyjRXLqGoLptAo4eLj5OUNCQA7"
-  "A small image to be displayed in the about: page.
-It is encoded in the optimized interlaced endlessly animated gif format
-and base64.  Emacs can display only the 1st frame of an animation, but
-XEmacs can fully display it with the help of the gifsicle program.")
-
-(defcustom w3m-process-modeline-format " loaded: %s"
-  "*Format used when displaying the progress of the external w3m process.
-It shows a percentage of the data loaded from the web server."
-  :group 'w3m
-  :type '(choice (string :tag "Format") function))
-
-(defcustom w3m-ignored-image-url-regexp nil
-  "*Regexp matching image urls which you don't want to view.
-It is effective even if `w3m-display-inline-images' is non-nil.
-For instance, the value \"^http://www\\.google\\.com/\" conceals
-Google's logo and navigation images, but display YouTube's
-thumbnail."
-  :group 'w3m
-  :type '(radio (const :format "Accept any image\n" nil)
-		(regexp :format "URL regexp: %v\n" :size 0)))
-
-(defcustom w3m-refresh-minimum-interval 60
-  "*Minimum seconds to wait for refresh, when visiting a page by
-history-back or history-next."
-  :group 'w3m
-  :type '(integer :size 0))
-
-(defvar w3m-modeline-process-status-on "<PRC>"
-  "Modeline control for displaying the status when the process is running.
-The value will be modified for displaying the graphic icon.")
-
-(defvar w3m-modeline-image-status-on "[IMG]"
-  "Modeline control to display the status when inline images are turned on.
-The value will be modified for displaying the graphic icon.")
-
-(defvar w3m-modeline-status-off "[ - ]"
-  "Modeline control for displaying the status for the default.
-The value will be modified for displaying the graphic icon.")
-
-(defvar w3m-modeline-ssl-image-status-on "[IMG(SSL)]"
-  "Modeline control for displaying the status when images and SSL are on.
-The value will be modified for displaying the graphic icon.")
-
-(defvar w3m-modeline-ssl-status-off "[SSL]"
-  "Modeline control for displaying the status when SSL is turned on.
-The value will be modified for displaying the graphic icon.")
-
-(defvar w3m-modeline-separator " / "
-  "String used to separate a status and a title in the modeline.")
-
-(defvar w3m-modeline-favicon nil
-  "Modeline control for displaying a favicon.
-This variable will be made buffer-local.")
-
-(defvar w3m-favicon-image nil
-  "Favicon image of the page.
-This variable will be made buffer-local")
-
-(defvar w3m-current-process nil
-  "Flag used to say whether the external process is running in the buffer.
-This variable will be made buffer-local.")
-(make-variable-buffer-local 'w3m-current-process)
-
-(defvar w3m-refresh-timer nil
-  "Variable used to keep a timer object for refreshing a page.
-It will be supplied by the REFRESH attribute in the META tag, and made
-buffer-local in each emacs-w3m buffer.")
-(make-variable-buffer-local 'w3m-refresh-timer)
-
-(defvar w3m-mail-user-agents '(gnus-user-agent
-			       message-user-agent
-			       mew-user-agent
-			       vm-user-agent
-			       wl-user-agent)
-  "List of mail user agents that `w3m-mail' supports.
-See also w3m-mail.el.")
-
-(defvar w3m-current-base-url nil
-  "URL specified by <base...> tag in <head> element of the page source.")
-(defvar w3m-current-forms nil
-  "Variable used to keep forms data for the current emacs-w3m buffer.")
-(defvar w3m-current-coding-system nil
-  "Coding system used when decoding the current emacs-w3m buffer.")
-(defvar w3m-current-content-charset nil
-  "Content charset of the page specified by the server or the META tag.")
-(defvar w3m-icon-data nil
-  "Cons of icon data and its image-type for the current emacs-w3m buffer.
-It is used for favicon data.  The type is often `ico'.")
-(defvar w3m-next-url nil
-  "URL as the next document in the author-defined sequence.")
-(defvar w3m-previous-url nil
-  "URL as the previous document in the author-defined sequence.")
-(defvar w3m-start-url nil
-  "URL as the first document in the author-defined sequence.")
-(defvar w3m-contents-url nil
-  "URL as the table of contents for the current page.")
-(defvar w3m-max-anchor-sequence nil
-  "Maximum number of the anchor sequence in the current page.")
-(defvar w3m-current-refresh nil
-  "Cons of number of seconds and a url specified by the REFRESH attribute.")
-(defvar w3m-current-ssl nil
-  "SSL certification indicator for the current emacs-w3m buffer.")
-(defvar w3m-name-anchor-from-hist nil
-  "List of the points of where `w3m-search-name-anchor' come from.")
-
-(make-variable-buffer-local 'w3m-current-url)
-(make-variable-buffer-local 'w3m-current-base-url)
-(make-variable-buffer-local 'w3m-current-title)
-(make-variable-buffer-local 'w3m-current-forms)
-(make-variable-buffer-local 'w3m-current-coding-system)
-(make-variable-buffer-local 'w3m-current-content-charset)
-(make-variable-buffer-local 'w3m-icon-data)
-(make-variable-buffer-local 'w3m-next-url)
-(make-variable-buffer-local 'w3m-previous-url)
-(make-variable-buffer-local 'w3m-start-url)
-(make-variable-buffer-local 'w3m-contents-url)
-(make-variable-buffer-local 'w3m-max-anchor-sequence)
-(make-variable-buffer-local 'w3m-current-refresh)
-(make-variable-buffer-local 'w3m-current-ssl)
-(make-variable-buffer-local 'w3m-name-anchor-from-hist)
-
-(defun w3m-clear-local-variables ()
-  (setq w3m-current-url nil
-	w3m-current-base-url nil
-	w3m-current-title nil
-	w3m-current-coding-system nil
-	w3m-current-content-charset nil
-	w3m-icon-data nil
-	w3m-next-url nil
-	w3m-previous-url nil
-	w3m-start-url nil
-	w3m-contents-url nil
-	w3m-max-anchor-sequence nil
-	w3m-current-refresh nil
-	w3m-current-ssl nil
-	w3m-name-anchor-from-hist nil))
-
-(defun w3m-copy-local-variables (from-buffer)
-  (let (url base title cs char icon next prev start toc hseq refresh ssl)
-    (with-current-buffer from-buffer
-      (setq url w3m-current-url
-	    base w3m-current-base-url
-	    title w3m-current-title
-	    cs w3m-current-coding-system
-	    char w3m-current-content-charset
-	    icon w3m-icon-data
-	    next w3m-next-url
-	    prev w3m-previous-url
-	    start w3m-start-url
-	    toc w3m-contents-url
-	    hseq w3m-max-anchor-sequence
-	    refresh w3m-current-refresh
-	    ssl w3m-current-ssl))
-    (setq w3m-current-url url
-	  w3m-current-base-url base
-	  w3m-current-title title
-	  w3m-current-coding-system cs
-	  w3m-current-content-charset char
-	  w3m-icon-data icon
-	  w3m-next-url next
-	  w3m-previous-url prev
-	  w3m-start-url start
-	  w3m-contents-url toc
-	  w3m-max-anchor-sequence hseq
-	  w3m-current-refresh refresh
-	  w3m-current-ssl ssl)))
-
-(defvar w3m-verbose nil
-  "*Flag controls whether to log messages in the *Messages* buffer.
-If it is nil, a lot of messages issued by emacs-w3m will be displayed
-only in the echo area.")
-
-(defvar w3m-safe-url-regexp nil
-  "Regexp matching urls which are considered to be safe.
-The nil value means all urls are considered to be safe.
-
-Note: The value, that might be bound to a certain value while rendering
-contents, will be held by the `w3m-safe-url-regexp' text property that
-is set over the rendered contents in a buffer.  So, programs that use
-the value to test whether a url of a link in a buffer is safe should
-use the value of the text property, not the value of this variable.
-See the function definitions of `w3m-toggle-inline-image',
-`w3m-toggle-inline-images', `w3m-safe-view-this-url', and
-`w3m-mouse-safe-view-this-url'.")
-
-(defvar w3m-current-buffer nil)
-(defvar w3m-cache-buffer nil)
-(defvar w3m-cache-articles nil)
-(defvar w3m-cache-hashtb nil)
-(defvar w3m-input-url-history nil)
-
-(defconst w3m-arrived-db-size 1023)
-(defvar w3m-arrived-db nil
-  "Hash table, the arrived URLs database.
-The name of each symbol represents a url, the arrival time in the
-Emacs style (a list of three integers) is stored as the value, and
-informations including a title, a modification time, a content charset
-and a content type are stored as the properties of the symbol.  The
-nil value means it has not been initialized.")
-
-(defvar w3m-arrived-setup-functions nil
-  "Hook functions run after setting up the arrived URLs database.")
-(defvar w3m-arrived-shutdown-functions nil
-  "Hook functions run after saving the arrived URLs database.")
-
-(defconst w3m-image-type-alist
-  '(("image/jpeg" . jpeg)
-    ("image/gif" . gif)
-    ("image/png" . png)
-    ("image/x-xbm" . xbm)
-    ("image/x-xpm" . xpm))
-  "Alist of content types and image types defined as the Emacs' features.")
-
-(defconst w3m-toolbar-buttons
-  '("back" "parent" "forward" "reload" "open" "home" "search" "image"
-    "copy" "weather" "antenna" "history" "db-history")
-  "List of prefix strings for the toolbar buttons.")
-
-(defconst w3m-toolbar
-  (if (equal "Japanese" w3m-language)
-      (let ((a (decode-coding-string "\e$B%\"\e(B" 'iso-2022-jp))) ;; $B%"(B
-	`([w3m-toolbar-back-icon w3m-view-previous-page
-				 (w3m-history-previous-link-available-p)
-				 "$BA0$N%Z!<%8$KLa$k(B"]
-	  [w3m-toolbar-parent-icon w3m-view-parent-page
-				   (w3m-parent-page-available-p)
-				   "$B>e$N%G%#%l%/%H%j$X0\F0$9$k(B"]
-	  [w3m-toolbar-forward-icon w3m-view-next-page
-				    (w3m-history-next-link-available-p)
-				    "$B<!$N%Z!<%8$K?J$`(B"]
-	  [w3m-toolbar-reload-icon w3m-reload-this-page
-				   w3m-current-url
-				   "$B%5!<%P$+$i%Z!<%8$r$b$&0lEYFI$_9~$`(B"]
-	  [w3m-toolbar-open-icon w3m-goto-url t "URL $B$rF~NO$7$F%Z!<%8$r3+$/(B"]
-	  [w3m-toolbar-home-icon w3m-gohome w3m-home-page
-				 "$B%[!<%`%Z!<%8$X%8%c%s%W(B"]
-	  [w3m-toolbar-search-icon w3m-search t "$B%$%s%?!<%M%C%H>e$r8!:w(B"]
-	  [w3m-toolbar-image-icon w3m-toggle-inline-images t
-				  "$B2hA|$NI=<($r%H%0%k$9$k(B"]
-	  [w3m-toolbar-copy-icon w3m-copy-buffer t
-				 "$B$3$N%;%C%7%g%s$N%3%T!<$r:n$k(B"]
-	  [w3m-toolbar-weather-icon w3m-weather t "$BE75$M=Js$r8+$k(B"]
-	  [w3m-toolbar-antenna-icon w3m-antenna t
-				    ,(concat a "$B%s%F%J$G<u?.$9$k(B")]
-	  [w3m-toolbar-history-icon w3m-history t "$B%R%9%H%j!<(B"]
-	  [w3m-toolbar-db-history-icon w3m-db-history t
-				       "$B2a5n$KK,Ld$7$?(B URL $B$NMzNr$r8+$k(B"]))
-    '([w3m-toolbar-back-icon w3m-view-previous-page
-			     (w3m-history-previous-link-available-p)
-			     "Back to Previous Page"]
-      [w3m-toolbar-parent-icon w3m-view-parent-page
-			       (w3m-parent-page-available-p)
-			       "View the parent page"]
-      [w3m-toolbar-forward-icon w3m-view-next-page
-				(w3m-history-next-link-available-p)
-				"Forward to Next Page"]
-      [w3m-toolbar-reload-icon w3m-reload-this-page
-			       w3m-current-url
-			       "Reload This Page"]
-      [w3m-toolbar-open-icon w3m-goto-url t "Go to..."]
-      [w3m-toolbar-home-icon w3m-gohome w3m-home-page "Go to Home Page"]
-      [w3m-toolbar-search-icon w3m-search t "Search the Internet"]
-      [w3m-toolbar-image-icon w3m-toggle-inline-images t "Toggle Images"]
-      [w3m-toolbar-copy-icon w3m-copy-buffer t "Make a Copy of This Session"]
-      [w3m-toolbar-weather-icon w3m-weather t "Weather Forecast"]
-      [w3m-toolbar-antenna-icon w3m-antenna t "Investigate with Antenna"]
-      [w3m-toolbar-history-icon w3m-history t "Show a History"]
-      [w3m-toolbar-db-history-icon w3m-db-history t "View Arrived URLs"]))
-  "Toolbar definition for emacs-w3m.")
-
-;; "View" is page viewing
-;; "Show" is link list showing
-(defconst w3m-menubar
-  (let ((a (when w3m-use-japanese-menu
-	     (decode-coding-string "\e$B%\"\e(B" 'iso-2022-jp)))) ;; $B%"(B
-    `("w3m"
-      [,(w3m-make-menu-item "$B$3$N(B URL $B$r?7$7$$%;%C%7%g%s$G3+$/(B"
-	  "Open This URL in a new session")
-       w3m-view-this-url-new-session (or (w3m-anchor) (w3m-image))]
-      [,(w3m-make-menu-item "$B$3$N(B URL $B$r%@%&%s%m!<%I$9$k(B" "Download This URL")
-       w3m-download-this-url (or (w3m-anchor) (w3m-image))]
-      [,(w3m-make-menu-item "$B%@%&%s%m!<%I(B..." "Download to...")
-       w3m-download t]
-      "----" ;; separator
-      [,(w3m-make-menu-item "$BA0$N%Z!<%8$KLa$k(B" "Back to Previous Page")
-       w3m-view-previous-page
-       (w3m-history-previous-link-available-p)]
-      [,(w3m-make-menu-item "$B<!$N%Z!<%8$K0\F0$9$k(B" "Forward to Next Page")
-       w3m-view-next-page
-       (w3m-history-next-link-available-p)]
-      [,(w3m-make-menu-item "$B>e$N3,AX$K0\F0$9$k(B" "Up to Parent Page")
-       w3m-view-parent-page
-       (w3m-parent-page-available-p)]
-      "----" ;; separator
-      [,(w3m-make-menu-item "$B$3$N%Z!<%8$r30It%V%i%&%6$G3+$/(B"
-	  "Open This Page in an External Browser")
-       w3m-external-view-current-url w3m-current-url]
-      [,(w3m-make-menu-item "$B$3$N(B URL $B$r30It%V%i%&%6$G3+$/(B"
-	  "Open This URL in an External Browser")
-       w3m-external-view-this-url (or (w3m-anchor) (w3m-image))]
-      [,(w3m-make-menu-item "$B$3$N%Z!<%8$N%=!<%9$r%3%^%s%I$KAw$k(B..."
-	  "Pipe Page Source to Command...")
-       w3m-pipe-source  w3m-current-url]
-      "----" ;; separator
-      (,(w3m-make-menu-item "$B:FI=<((B" "Redisplay")
-       [,(w3m-make-menu-item "$B$3$N%Z!<%8$r:F<hF@$9$k(B" "Reload This Page")
-	w3m-reload-this-page w3m-current-url]
-       [,(w3m-make-menu-item "$B$9$Y$F$N%Z!<%8$r:F<hF@$9$k(B" "Reload All Pages")
-       w3m-reload-all-pages (cdr (w3m-list-buffers))]
-       "----" ;; separator
-       [,(w3m-make-menu-item "$B2hA|I=<($N@ZBX(B($BA4It(B)" "Toggle Images")
-	w3m-toggle-inline-images (w3m-display-graphic-p)]
-       [,(w3m-make-menu-item "$B2hA|I=<($N@ZBX(B($B$3$N2hA|(B)" "Toggle This Image")
-	w3m-toggle-inline-image (w3m-image)]
-       [,(w3m-make-menu-item "$B2hA|I=<($r;_$a$k(B" "Turn off Images")
-	w3m-turnoff-inline-images (w3m-display-graphic-p)]
-       "----" ;; separator
-       [,(w3m-make-menu-item "$B:FIA2h$9$k(B" "Redisplay This Page")
-	w3m-redisplay-this-page w3m-current-url]
-       [,(w3m-make-menu-item "Charset $B$r;XDj$7$F:FIA2h$9$k(B"
-	   "Redisplay This Page with Charset")
-	w3m-redisplay-with-charset w3m-current-url]
-       [,(w3m-make-menu-item "Content-type $B$r;XDj$7$F:FIA2h$9$k(B"
-	   "Redisplay This Page with Content-type")
-	w3m-redisplay-with-content-type w3m-current-url]
-       [,(w3m-make-menu-item "$B;XDj$7$?(B Charset $B$H(B Content-type $B$rGK4~$9$k(B"
-	   "Reset Charset and Content-type")
-	w3m-redisplay-and-reset w3m-current-url]
-       ) ;; end redisplay
-      [,(w3m-make-menu-item "$B%[!<%`%Z!<%8$X0\F0(B" "Go to Home Page")
-       w3m-gohome w3m-home-page]
-      (,(w3m-make-menu-item "$B%V%C%/%^!<%/(B" "Bookmark")
-       [,(w3m-make-menu-item "$B%V%C%/%^!<%/$rI=<((B" "View Bookmark")
-	w3m-bookmark-view t]
-       [,(w3m-make-menu-item "$B?7$7$$%;%C%7%g%s$G%V%C%/%^!<%/$rI=<((B"
-			     "View Bookmark in a New Session")
-	w3m-bookmark-view-new-session t])
-      [,(w3m-make-menu-item "$B0\F0(B..." "Go to...")
-       w3m-goto-url t]
-      "----" ;; separator
-      (,(w3m-make-menu-item "$BMzNr(B" "History")
-       [,(w3m-make-menu-item "$BLZ9=B$$GMzNr$rI=<((B" "Show a Visited URLs Tree")
-	w3m-history t]
-       [,(w3m-make-menu-item "$B%j%9%H$GMzNr$rI=<((B" "Show an Arrived URLs List")
-	w3m-db-history t]
-       ) ;; end history
-      [,(w3m-make-menu-item "$B%$%s%?!<%M%C%H$G$N8!:w(B..."
-			    "Search the Internet...")
-       w3m-search t]
-      [,(w3m-make-menu-item "$B?7$7$$%;%C%7%g%s$G8!:w(B..."
-			    "Search the Internet in a New Session...")
-       w3m-search-new-session t]
-      [,(w3m-make-menu-item "$BE75$M=Js(B" "Weather Forecast")
-       w3m-weather t]
-      [,(w3m-make-menu-item (concat a "$B%s%F%J$G<hF@(B")
-			    "Investigate with Antenna")
-       w3m-antenna t]
-      (,(w3m-make-menu-item "$B%X%k%W(B" "Resource")
-       [,(w3m-make-menu-item "$B%W%m%;%9$rCf;_$9$k(B" "Cancel Process")
-	w3m-process-stop w3m-current-process]
-       [,(w3m-make-menu-item "$B%=!<%9$r8+$k(B" "View Source")
-	w3m-view-source t]
-       [,(w3m-make-menu-item "$B%X%C%@!<$r8+$k(B" "View Header")
-	w3m-view-header t]
-       ) ;; end resource
-      "----" ;; separator
-      [,(w3m-make-menu-item "$B$3$N%Z!<%8$r%a!<%k$GAw$k(B" "Mail this page")
-       w3m-mail (memq mail-user-agent w3m-mail-user-agents)]
-      "----" ;; separator
-      [,(w3m-make-menu-item "$B%P%0%l%]!<%H$rAw$k(B" "Send a Bug Report")
-       report-emacs-w3m-bug t]
-      "----" ;; separator
-      [,(w3m-make-menu-item "$B$3$N(B URL $B$rI=<($9$k(B" "Print the Current URL")
-       w3m-print-current-url t]
-      [,(w3m-make-menu-item "w3m $B$rJD$8$k(B" "Close w3m")
-       w3m-close-window t]
-      [,(w3m-make-menu-item "w3m $B$r=*N;$9$k(B" "Quit w3m")
-       w3m-quit t]
-      )) ;; end w3m
-  "Menubar definition for emacs-w3m.")
-
-(defvar w3m-rmouse-menubar
-  `("w3m"
-    [,(w3m-make-menu-item "$BA0$N%Z!<%8$KLa$k(B" "Back to Previous Page")
-     w3m-view-previous-page
-     (w3m-history-previous-link-available-p)]
-    [,(w3m-make-menu-item "$B<!$N%Z!<%8$K0\F0$9$k(B" "Forward to Next Page")
-     w3m-view-next-page
-     (w3m-history-next-link-available-p)]
-    [,(w3m-make-menu-item "$B>e$N3,AX$K0\F0$9$k(B" "Up to Parent Page")
-     w3m-view-parent-page
-     (w3m-parent-page-available-p)]
-    "----" ;; separator
-    [,(w3m-make-menu-item "$B$3$N%Z!<%8$r:F<hF@$9$k(B" "Reload This Page")
-     w3m-reload-this-page w3m-current-url]
-    [,(w3m-make-menu-item "$B$9$Y$F$N%Z!<%8$r:F<hF@$9$k(B" "Reload All Pages")
-     w3m-reload-all-pages (cdr (w3m-list-buffers))]
-    [,(w3m-make-menu-item "$B%W%m%;%9$rCf;_$9$k(B" "Cancel Process")
-     w3m-process-stop w3m-current-process])
-  "*Menubar for click the right mouse button.")
-
-(defvar w3m-cid-retrieve-function-alist nil)
-(defvar w3m-force-redisplay t)
-
-(defvar w3m-work-buffer-list nil)
-(defconst w3m-work-buffer-name " *w3m-work*")
-(defconst w3m-select-buffer-name " *w3m buffers*")
-
-(defconst w3m-dump-head-source-command-arguments
-  (cond ((eq w3m-type 'w3mmee)
-	 (list "-dump=extra,head,source"))
-	(t
-	 (list
-	  '(if w3m-accept-languages
-	       '("-o"
-		 (concat "accept_language="
-			 (mapconcat 'identity w3m-accept-languages ","))))
-	  "-dump_extra")))
-  "Arguments passed to the w3m command to run \"dump_extra\".")
-
-(defvar w3m-halfdump-command nil
-  "Alternative w3m command used to run \"halfdump\".
-If it is nil, the command specified to `w3m-command' is used.")
-
-(defconst w3m-halfdump-command-arguments
-  (cond ((eq w3m-type 'w3mmee)
-	 (list '(if w3m-treat-image-size
-		    "-dump=half-buffer,single-row-image"
-		  "-dump=half-buffer")
-	       '(if (eq w3m-input-coding-system 'ctext)
-		    (list "-I" "x-ctext")
-		  (when (and (eq w3m-input-coding-system 'binary)
-			     charset)
-		    (list "-I" 'charset)))
-	       "-o" "concurrent=0"))
-	((eq w3m-type 'w3m-m17n)
-	 (list "-halfdump"
-	       "-o" "ext_halfdump=1"
-	       "-o" "strict_iso2022=0"
-	       "-o" "fix_width_conv=1"
-	       "-o" "use_jisx0201=0"
-	       "-o" "ucs_conv=1"
-	       '(if (eq w3m-input-coding-system 'binary)
-		    (if charset (list "-I" 'charset))
-		  (list "-I" (cond
-			      ((eq w3m-input-coding-system 'utf-8)
-			       "UTF-8")
-			      ((eq w3m-input-coding-system 'iso-8859-1)
-			       "ISO-8859-1")
-			      (t
-			       "ISO-2022-JP-2"))))
-	       "-O"
-	       '(cond
-		 ((eq w3m-output-coding-system 'utf-8)
-		  "UTF-8")
-		 ((eq w3m-output-coding-system 'iso-8859-1)
-		  "ISO-8859-1")
-		 (t
-		  "ISO-2022-JP-2"))))
-	((eq w3m-input-coding-system 'w3m-euc-japan)
-	 (list "-halfdump" "-I" "e"))
-	(t (list "-halfdump")))
-  "Arguments passed to the w3m command to run \"halfdump\".")
-
-(defconst w3m-halfdump-command-common-arguments
-  (list "-T" "text/html" "-t" tab-width "-cols" '(w3m-display-width)
-	'(cond
-	  ((and (eq w3m-display-ins-del 'fontify)
-		(w3m-device-on-window-system-p))
-	   (list "-o" "display_ins_del=2"))
-	  ((or (eq w3m-display-ins-del 'tag)
-	       (and (eq w3m-display-ins-del 'fontify)
-		    (not (w3m-device-on-window-system-p))))
-	   (list "-o" "display_ins_del=1"))))
-  "Arguments used in common by the w3m command variants to run \"halfdump\".")
-
-(defconst w3m-arrived-ignored-regexp
-  "\\`about:\\(?://\\(?:header\\|source\\|history\\|\
-db-history\\|antenna\\|namazu\\|dtree\\)/.*\\)?\\'\
-\\|\\`about:/*blank/?\\'"
-  "Regexp matching urls which aren't stored in the arrived URLs database.")
-
-(defconst w3m-history-ignored-regexp
-  "\\`about:\\(?://\\(?:header\\|source\\|history\\|\
-db-history\\|antenna\\|namazu\\|dtree\\)/.*\\)?\\'\
-\\|\\`about:/*blank/?\\'"
-  "Regexp matching urls which aren't stored in the history.")
-
-(defvar w3m-mode-map nil "Keymap for emacs-w3m buffers.")
-(defvar w3m-link-map nil "Keymap used on links.")
-(defvar w3m-doc-view-map nil
-  "Keymap used in `doc-view-mode' that emacs-w3m launches.
-`doc-view-mode-map' gets to be its parent keymap.")
-
-(defvar w3m-mode-setup-functions nil
-  "Hook functions run after setting up the `w3m-mode'.")
-(defvar w3m-display-functions nil
-  "Hook functions run after displaying pages in emacs-w3m buffers.
-Each function is called with a url string as the argument.  This hook
-is evaluated just before evaluating `w3m-display-hook'.")
-
-(defvar w3m-load-hook nil
-  "*Hook run after loading the w3m.elc module.
-It is not recommended that you use this hook instead of writing into
-`w3m-init-file' for customization.")
-
-
-;; Generic functions:
-(defun w3m-url-to-file-name (url)
-  "Return the file name which is pointed to by URL.
-When URL does not point to any local files, it returns nil.  The
-actual performance of this function is to strip off the scheme part
-and the net_loc part from URL.  It is meaningless to give an argument
-whose net_loc part is not empty, a null string or the localhost name
-to this function."
-  (cond
-   ((string-match "\\`\\(\\(file:/\\{0,2\\}\\)\\|about://dtree\\)/" url)
-    (setq url (substring url (match-end 1)))
-    (when (and (match-beginning 2) ;; file:
-	       (< (match-end 2) 7) ;; file:// or file:/
-	       (string-match "\\`\\(/[^/]+[^/:|]\\)/" url))
-      (cond ((file-directory-p (match-string 0 url))
-	     ) ;; The directory "/hostname/" exists.
-	    ((string-match (concat "\\`/\\(localhost\\|127\\.0\\.0\\.1\\|"
-				   (regexp-quote (system-name)) "\\)/")
-			   url)
-	     ;; Strip the localhost name.
-	     (setq url (substring url (match-end 1))))
-	    (t
-	     ;; Make it a Tramp url: /hostname:/...
-	     ;; See `tramp-default-method' and `tramp-default-method-alist'.
-	     (setq url (concat (substring url 0 (match-end 1))
-			       ":"
-			       (substring url (match-end 1)))))))
-    ;; Process abs_path part in Windows.
-    (when (and w3m-treat-drive-letter
-	       (string-match
-		"\\`/\\(?:\\([a-zA-Z]\\)[|:]?\\|cygdrive/\\([a-zA-Z]\\)\\)/"
-		url))
-      (setq url (concat (or (match-string 1 url) (match-string 2 url))
-			":/"
-			(substring url (match-end 0)))))
-    (if (string-match "\\`/[^/:]\\{2,\\}:/" url)
-	;; Don't check for a Tramp url.
-	url
-      (if (file-exists-p url)
-	  url
-	(let ((x (w3m-url-decode-string url w3m-file-name-coding-system)))
-	  (if (file-exists-p x) x url)))))
-   ((string-match "\\`\\(?:[~/]\\|[a-zA-Z]:/\\|\\.\\.?/\\)" url) url)
-   (t
-    (catch 'found-file
-      (dolist (pair w3m-url-local-directory-alist)
-	(and (string-match (concat "\\`"
-				   (regexp-quote
-				    (file-name-as-directory (car pair))))
-			   url)
-	     (let ((file (expand-file-name (substring url (match-end 0))
-					   (cdr pair))))
-	       (when (or (file-exists-p file)
-			 (file-exists-p
-			  (setq file (w3m-url-decode-string
-				      file w3m-file-name-coding-system))))
-		 (throw 'found-file file)))))))))
-
-(defun w3m-expand-file-name-as-url (file &optional directory)
-  "Return a url string which points to the FILE.
-Optional DIRECTORY is a directory to start with if FILE is relative
-\(i.e., FILE doesn't start with slash).  It defaults to the current
-directory."
-  (setq file (expand-file-name file directory))
-  (concat "file://"
-	  (if (string-match "\\`\\([a-zA-Z]\\):" file)
-	      (format (if w3m-use-cygdrive "/cygdrive/%s%s" "/%s|%s")
-		      (match-string 1 file)
-		      (substring file (match-end 0)))
-	    file)))
-
-
-;;; Managing the arrived URLs database:
-(defmacro w3m-arrived-intern (url &optional soft)
-  "Normalize URL by stripping last / and intern it into `w3m-arrived-db'.
-If SOFT is non-nil, use `intern-soft' instead."
-  (let ((fn (if soft 'intern-soft 'intern))
-	(str (if (consp url)
-		 `(let* ((url ,url)
-			 (len (length url)))
-		    (if (and (not (zerop len))
-			     (eq (aref url (1- len)) ?/))
-			(substring url 0 -1)
-		      url))
-	       `(if (let ((len (length ,url)))
-		      (and (not (zerop len))
-			   (eq (aref ,url (1- len)) ?/)))
-		    (substring ,url 0 -1)
-		  ,url))))
-    `(,fn ,str w3m-arrived-db)))
-
-(defun w3m-arrived-add (url &optional title modification-time
-			    arrival-time content-charset content-type)
-  "Add URL to the arrived URLs database.
-Optional TITLE, MODIFICATION-TIME, ARRIVAL-TIME, CONTENT-CHARSET and
-CONTENT-TYPE are also be added."
-  (unless (string-match w3m-arrived-ignored-regexp url)
-    (let ((ident (w3m-arrived-intern url)))
-      (if (string-match "\\`\\([^#]+\\)#" url)
-	  (w3m-arrived-add (substring url 0 (match-end 1))
-			   title modification-time arrival-time
-			   content-charset content-type)
-	(when title
-	  (put ident 'title title))
-	(when modification-time
-	  (put ident 'last-modified modification-time))
-	(when content-charset
-	  (put ident 'content-charset content-charset))
-	(when content-type
-	  (put ident 'content-type content-type)))
-      (set ident arrival-time))))
-
-(defun w3m-arrived-p (url)
-  "Return non-nil if a page of URL has arrived."
-  (or (string-match w3m-arrived-ignored-regexp url)
-      (w3m-arrived-intern url t)))
-
-(defun w3m-arrived-time (url)
-  "Return the arrival time of a page of URL if it has arrived.
-Otherwise return nil."
-  (let ((v (w3m-arrived-intern url t)))
-    (and v (boundp v) (symbol-value v))))
-(defsetf w3m-arrived-time (url) (value)
-  (list 'w3m-arrived-add url nil nil value))
-
-(defun w3m-arrived-put (url property value)
-  "Store VALUE in the arrived URLs database as the PROPERTY of URL.
-Return VALUE if a page of URL has arrived.  Otherwise, VALUE is
-ignored and return nil."
-  (let ((symbol (w3m-arrived-intern url t)))
-    (and symbol (put symbol property value))))
-
-(defun w3m-arrived-get (url property)
-  "Return the value of URL's PROPERTY stored in the arrived URLs database.
-If a page of URL has not arrived, return nil."
-  (let ((symbol (w3m-arrived-intern url t)))
-    (and symbol (get symbol property))))
-
-(defsetf w3m-arrived-get w3m-arrived-put)
-
-(defmacro w3m-arrived-title (url)
-  "Return the title of URL having stored in the arrived URLs database."
-  `(w3m-arrived-get ,url 'title))
-
-(defmacro w3m-arrived-last-modified (url)
-  "Return the mod time of URL having stored in the arrived URLs database.
-If a page of URL has not arrived yet, return nil."
-  `(w3m-arrived-get ,url 'last-modified))
-
-(defmacro w3m-arrived-content-charset (url)
-  "Return the content charset of URL stored in the arrived URLs database.
-If it has not been specified or a page of URL has not arrived yet,
-return nil."
-  `(w3m-arrived-get ,url 'content-charset))
-
-(defmacro w3m-arrived-content-type (url)
-  "Return the content type of URL stored in the arrived URLs database.
-If it has not been specified or a page of URL has not arrived yet,
-return nil."
-  `(w3m-arrived-get ,url 'content-type))
-
-(defun w3m-arrived-load-list ()
-  "Load the arrived URLs database file.
-The file is specified by `w3m-arrived-file'.  If the data is in old
-format, they will simply be ignored."
-  (let ((list (w3m-load-list w3m-arrived-file)))
-    (when (or
-	   ;; Before the revision 1.120, every element of the list was
-	   ;; a string that represented an arrived URL.
-	   (stringp (car list))
-	   ;; Before the revision 1.135, every element was a cons
-	   ;; cell: its car kept a URL, and its cdr kept a time when
-	   ;; the URL was arrived.
-	   ;; Before the revision 1.178, every element was a 4-tuple
-	   ;; that consisted of a URL, a title, a modification time,
-	   ;; and an arrival time.
-	   ;; An element of the modern database is a 6-tuple that
-	   ;; consisted of a URL, a title, a modification time, an
-	   ;; arrival time, a charset, and a content type.
-	   ;; Thus, the following condition eliminates the revision
-	   ;; 1.177 and olders.
-	   (<= (length (car list)) 4))
-      (setq list nil)
-      (when (file-exists-p w3m-arrived-file)
-	(delete-file w3m-arrived-file)))
-    list))
-
-(defun w3m-arrived-setup ()
-  "Load the arrived URLs database file and set up the hashed database.
-It is performed only when `w3m-arrived-db' has not been initialize yet.
-The file is specified by `w3m-arrived-file'."
-  (unless w3m-arrived-db
-    (setq w3m-arrived-db (make-vector w3m-arrived-db-size 0))
-    (let ((list (w3m-arrived-load-list)))
-      (dolist (elem list)
-	;; Ignore an element that lacks an arrival time information.
-	(when (nth 3 elem)
-	  (w3m-arrived-add (if (string-match "\\`/" (car elem))
-			       (w3m-expand-file-name-as-url (car elem))
-			     (car elem))
-			   (nth 1 elem)
-			   (nth 2 elem)
-			   (nth 3 elem)
-			   (when (stringp (nth 4 elem)) (nth 4 elem))
-			   (nth 5 elem))))
-      (unless w3m-input-url-history
-	(setq w3m-input-url-history (mapcar (function car) list))))
-    (run-hooks 'w3m-arrived-setup-functions)))
-
-(defun w3m-arrived-shutdown ()
-  "Save the arrived URLs database in the file.
-The database `w3m-arrived-db' will be cleared after saving.  The file
-is specified by `w3m-arrived-file'."
-  (when w3m-arrived-db
-    ;; Re-read the database file, and if there are data which another
-    ;; Emacs process registered, merge them to the current database.
-    (dolist (elem (w3m-arrived-load-list))
-      (when (w3m-time-newer-p (nth 3 elem) (w3m-arrived-time (car elem)))
-	(w3m-arrived-add (if (string-match "\\`/" (car elem))
-			     (w3m-expand-file-name-as-url (car elem))
-			   (car elem))
-			 (nth 1 elem)
-			 (nth 2 elem)
-			 (nth 3 elem)
-			 (when (stringp (nth 4 elem)) (nth 4 elem))
-			 (nth 5 elem))))
-    ;; Convert current database to a list.
-    (let (list)
-      (mapatoms
-       (lambda (sym)
-	 (and sym
-	      (boundp sym)
-	      (symbol-value sym) ; Ignore an entry lacks an arrival time.
-	      (push (list (symbol-name sym)
-			  (get sym 'title)
-			  (get sym 'last-modified)
-			  (symbol-value sym)
-			  (get sym 'content-charset)
-			  (get sym 'content-type))
-		    list)))
-       w3m-arrived-db)
-      (w3m-save-list w3m-arrived-file
-		     (w3m-sub-list
-		      (sort list
-			    (lambda (a b)
-			      (if (equal (nth 3 a) (nth 3 b))
-				  (string< (car a) (car b))
-				(w3m-time-newer-p (nth 3 a) (nth 3 b)))))
-		      w3m-keep-arrived-urls)
-		     nil t))
-    (setq w3m-arrived-db nil)
-    (run-hooks 'w3m-arrived-shutdown-functions)))
-
-(add-hook 'kill-emacs-hook 'w3m-arrived-shutdown)
-(add-hook 'kill-emacs-hook 'w3m-cookie-shutdown)
-(add-hook 'w3m-arrived-shutdown-functions 'w3m-session-automatic-save)
-(add-hook 'w3m-arrived-shutdown-functions 'w3m-session-crash-recovery-remove)
-(add-hook 'w3m-arrived-shutdown-functions 'w3m-cleanup-temp-files)
-
-;;; Generic macros and inline functions:
-(defun w3m-attributes (url &optional no-cache handler)
-  "Return a list of attributes corresponding to URL.
-Return nil if it failed in retrieving of the header.
-Otherwise, return a list which includes the following elements:
-
- 0. Type of contents.
- 1. Charset of contents.
- 2. Size in bytes.
- 3. Encoding of contents.
- 4. Last modification time.
- 5. Real URL.
-
-If the optional argument NO-CACHE is non-nil, cache is not used."
-  (if (not handler)
-      (condition-case nil
-	  (w3m-process-with-wait-handler
-	    (w3m-attributes url no-cache handler))
-	(w3m-process-timeout nil))
-    (setq url (w3m-url-strip-fragment url))
-    (cond
-     ((string= "about://emacs-w3m.gif" url)
-      (list "image/gif" nil nil nil nil url url))
-     ((string-match "\\`about://source/" url)
-      (lexical-let ((src (substring url (match-end 0))))
-	(w3m-process-do
-	    (attrs (w3m-attributes src no-cache handler))
-	  (list "text/plain"
-		(or (w3m-arrived-content-charset (w3m-url-strip-authinfo src))
-		    (cadr attrs))
-		(nth 2 attrs)
-		(nth 3 attrs)
-		(nth 4 attrs)
-		(concat "about://source/" (nth 5 attrs))))))
-     ((string-match "\\`about:" url)
-      (list "text/html" w3m-coding-system nil nil nil url))
-     ((string-match "\\`cid:" url)
-      (let ((w3m-current-buffer (current-buffer)))
-	(w3m-process-do-with-temp-buffer
-	    (type (w3m-cid-retrieve url nil nil))
-	  (list type nil nil nil nil url url))))
-     ((string-match "\\`data:" url)
-      (let ((w3m-current-buffer (current-buffer)))
-	(w3m-process-do-with-temp-buffer
-	    (type (w3m-data-retrieve url nil nil))
-	  (list type nil nil nil nil url url))))
-     ((w3m-url-local-p url)
-      (w3m-local-attributes url))
-     (t
-      (w3m-w3m-attributes url no-cache handler)))))
-
-(defmacro w3m-content-type (url &optional no-cache handler)
-  (if handler
-      `(let ((handler ,handler))
-	 (w3m-process-do
-	     (attrs (w3m-attributes ,url ,no-cache handler))
-	   (car attrs)))
-    `(car (w3m-attributes ,url ,no-cache))))
-(defmacro w3m-content-charset (url &optional no-cache handler)
-  (if handler
-      `(let ((handler ,handler))
-	 (w3m-process-do
-	     (attrs (w3m-attributes ,url ,no-cache handler))
-	   (nth 1 attrs)))
-    `(nth 1 (w3m-attributes ,url ,no-cache))))
-(defmacro w3m-content-length (url &optional no-cache handler)
-  (if handler
-      `(let ((handler ,handler))
-	 (w3m-process-do
-	     (attrs (w3m-attributes ,url ,no-cache handler))
-	   (nth 2 attrs)))
-    `(nth 2 (w3m-attributes ,url ,no-cache))))
-(defmacro w3m-content-encoding (url &optional no-cache handler)
-  (if handler
-      `(let ((handler ,handler))
-	 (w3m-process-do
-	     (attrs (w3m-attributes ,url ,no-cache handler))
-	   (nth 3 attrs)))
-    `(nth 3 (w3m-attributes ,url ,no-cache))))
-(defmacro w3m-last-modified (url &optional no-cache handler)
-  (if handler
-      `(let ((handler ,handler))
-	 (w3m-process-do
-	     (attrs (w3m-attributes ,url ,no-cache handler))
-	   (nth 4 attrs)))
-    `(nth 4 (w3m-attributes ,url ,no-cache))))
-(defmacro w3m-real-url (url &optional no-cache handler)
-  (if handler
-      `(let ((handler ,handler))
-	 (w3m-process-do
-	     (attrs (w3m-attributes ,url ,no-cache handler))
-	   (nth 5 attrs)))
-    `(nth 5 (w3m-attributes ,url ,no-cache))))
-
-(defmacro w3m-make-help-echo (property)
-  "Make a function returning a string used for the `help-echo' message.
-PROPERTY is a symbol (which doesn't need to be quoted) of a text
-property (in XEmacs, it is an extent) with the value of a string which
-should be in the place where having to show a help message.  If you
-need to know what function will be made, use `macroexpand'."
-  (if (featurep 'xemacs)
-      (let ((str `(get-text-property (extent-start-position extent)
-				     ',property)))
-	`(lambda (extent)
-	   (if (and w3m-track-mouse
-		    (eq (extent-object extent) (current-buffer)))
-	       (w3m-url-readable-string ,str))))
-    `(lambda (window object pos)
-       (if w3m-track-mouse
-	   (let ((deactivate-mark nil))
-	     (message nil)	; Clear the echo area.
-	     (w3m-url-readable-string
-	      (get-text-property pos ',property
-				 (window-buffer window))))))))
-
-(defmacro w3m-make-balloon-help (property)
-  "Make a function returning a string used for the `balloon-help' message.
-Functions made are used only when emacs-w3m is running under XEmacs.
-It returns an interned symbol of a function.  PROPERTY is a symbol
-\(which doesn't need to be quoted) of an extent with the value of a
-string which should be in the place where having to show a help
-message."
-  (when (featurep 'xemacs)
-    (let ((str `(get-text-property (extent-start-position extent)
-				   ',property)))
-      `(let ((fn (intern (format "w3m-balloon-help-for-%s"
-				 ',property))))
-	 (prog1
-	     fn
-	   (unless (fboundp fn)
-	     (defalias fn
-	       (lambda (extent)
-		 (if (and w3m-track-mouse
-			  (eq (extent-object extent) (current-buffer)))
-		     (w3m-url-readable-string ,str)))))
-	   (when (and (featurep 'bytecomp)
-		      (not (compiled-function-p (symbol-function fn))))
-	     (byte-compile fn)))))))
-
-(defvar w3m-current-message nil
-  "The string currently displayed by `w3m-message' in the echo area.")
-(defvar w3m-message-silent nil
-  "When set to `t', w3m-message is just ignored.")
-
-(defun w3m-message (&rest args)
-  "Print a one-line message at the bottom of the screen.
-It displays a given message without logging, when the cursor is
-neither in the minibuffer or in the echo area and `w3m-verbose' is
-nil.  When the cursor is either in the minibuffer or in the echo area
-and `w3m-verbose' is nil, it behaves as `format' and simply returns a
-string.  When `w3m-verbose' is non-nil, it behaves identically as
-`message', that displays a given message with logging."
-  ;; Always clear previous message in order to shrink the window height
-  ;; for the echo area.
-  (unless (or (featurep 'xemacs)
-	      (< emacs-major-version 22)
-	      (< (string-width (or (current-message) "")) (window-width)))
-    (message nil))
-  (unless w3m-message-silent
-    (if w3m-verbose
-	(apply (function message) args)
-      (if (when w3m-process-background
-	    (or (window-minibuffer-p (selected-window))
-		(when (current-message)
-		  (not (equal (current-message) w3m-current-message)))))
-	  (apply (function format) args)
-	(w3m-static-if (featurep 'xemacs)
-	    (progn
-	      (setq w3m-current-message (apply (function format) args))
-	      (display-message 'no-log w3m-current-message))
-	  (let (message-log-max)
-	    (setq w3m-current-message (apply (function message) args))))))))
-
-(defun w3m-time-parse-string (string)
-  "Parse the time-string STRING into a time in the Emacs style."
-  (ignore-errors
-    (let ((x (timezone-fix-time string nil nil)))
-      (encode-time (aref x 5) (aref x 4) (aref x 3)
-		   (aref x 2) (aref x 1) (aref x 0)
-		   (aref x 6)))))
-
-;; When a buggy timezone.el is loaded, we use parse-time.el instead.
-(unless (equal (w3m-time-parse-string "Thursday, 01-Jan-1970 00:00:00 GMT")
-	       '(0 0))
-  (ignore-errors
-    (require 'parse-time))
-  (defun w3m-time-parse-string (string)
-    "Parse the time-string STRING and return its time as Emacs style."
-    (ignore-errors
-      (let ((fn (when (fboundp 'parse-time-string)
-		  'parse-time-string)))
-	(when fn
-	  (apply (function encode-time) (funcall fn string)))))))
-
-(defun w3m-sub-list (list n)
-  "Return a list of the first N elements of LIST.
-If N is negative, return a list of the last N elements of LIST."
-  (if (integerp n)
-      (if (< n 0)
-	  ;; N is negative, extract the last items
-	  (if (>= (- n) (length list))
-	      (copy-sequence list)
-	    (nthcdr (+ (length list) n) (copy-sequence list)))
-	;; N is positive, extract the first items
-	(if (>= n (length list))
-	    (copy-sequence list)
-	  (nreverse (nthcdr (- (length list) n) (reverse list)))))
-    (copy-sequence list)))
-
-(defun w3m-load-list (file &optional coding-system)
-  "Read an emacs-w3m data file FILE and return contents as a list.
-It is used for loading `w3m-arrived-file', `w3m-cookie-file',
-`w3m-favicon-cache-file' and `w3m-antenna-file' (which see).
-CODING-SYSTEM is used to read FILE which defaults to the value of
-`w3m-file-coding-system-for-read'."
-  (when (and (file-readable-p file)
-	     ;; XEmacs 21.4 might crash when inserting a directory.
-	     (not (file-directory-p file)))
-    (with-temp-buffer
-      (when (condition-case nil
-		(let ((coding-system-for-read
-		       (or coding-system w3m-file-coding-system-for-read)))
-		  (insert-file-contents file))
-	      (error
-	       (message "Error while loading %s" file)
-	       nil))
-	;; point is not always moved to the beginning of the buffer
-	;; after `insert-file-contents' is done.
-	(goto-char (point-min))
-	(condition-case err
-	    (read (current-buffer))
-	  (error
-	   (message "Error while reading %s; %s"
-		    file (error-message-string err))
-	   nil))))))
-
-(defun w3m-save-list (file list &optional coding-system escape-ctl-chars)
-  "Save a LIST form into the emacs-w3m data file FILE.
-Contents will be encoded with CODING-SYSTEM which defaults to the
-value of `w3m-file-coding-system'.  Optional ESCAPE-CTL-CHARS if it is
-non-nil, control chars will be represented with ^ as `cat -v' does."
-  (when (and list (file-writable-p file))
-    (with-temp-buffer
-      (let ((coding-system-for-write (or coding-system w3m-file-coding-system))
-	    (standard-output (current-buffer))
-	    (print-fn (if escape-ctl-chars
-			  'w3m-prin1
-			'prin1))
-	    element print-length print-level)
-	(insert (format "\
-;;; %s  -*- mode: emacs-lisp%s -*-
-;; This file is generated automatically by emacs-w3m v%s.
-
-"
-			(file-name-nondirectory file)
-			(if coding-system-for-write
-			    (format "; coding: %s" coding-system-for-write)
-			  "")
-			emacs-w3m-version))
-	(insert "(")
-	(while list
-	  (setq element (car list)
-		list (cdr list))
-	  (if (consp element)
-	      (progn
-		(insert "(")
-		(funcall print-fn (car element))
-		(insert "\n")
-		(while (setq element (cdr element))
-		  (insert "  ")
-		  (funcall print-fn (car element))
-		  (insert "\n"))
-		(backward-delete-char 1)
-		(insert ")\n "))
-	    (funcall print-fn element)
-	    (insert "\n")))
-	(skip-chars-backward "\n ")
-	(delete-region (point) (point-max))
-	(insert ")\n")
-	(let ((mode (and (file-exists-p file)
-			 (file-modes file))))
-	  (write-region (point-min) (point-max) file nil 'nomsg)
-	  (when mode (set-file-modes file mode)))))))
-
-(defun w3m-url-encode-string (str &optional coding encode-space)
-  (apply (function concat)
-	 (mapcar
-	  (lambda (ch)
-	    (cond
-	     ((eq ch ?\n)		; newline
-	      "%0D%0A")
-	     ((string-match "[-a-zA-Z0-9_:/.]" (char-to-string ch)) ; xxx?
-	      (char-to-string ch))	; printable
-	     ((and (char-equal ch ?\x20); space
-		   encode-space)
-	      "+")
-	     (t
-	      (format "%%%02X" ch))))	; escape
-	  ;; Coerce a string into a list of chars.
-	  (append (encode-coding-string (or str "")
-					(or coding
-					    w3m-default-coding-system
-					    w3m-coding-system
-					    'iso-2022-7bit))
-		  nil))))
-
-(defun w3m-url-decode-string (str &optional coding)
-  (let ((start 0)
-	(buf)
-	(case-fold-search t))
-    (while (string-match "%\\(?:\\([0-9a-f][0-9a-f]\\)\\|0d%0a\\)" str start)
-      (push (substring str start (match-beginning 0)) buf)
-      (push (if (match-beginning 1)
-		(vector (string-to-number (match-string 1 str) 16))
-	      "\n")
-	    buf)
-      (setq start (match-end 0)))
-    (setq str (apply 'concat (nreverse (cons (substring str start) buf))))
-    (w3m-decode-coding-string-with-priority str coding)))
-
-(defun w3m-url-readable-string (url)
-  "Return a readable string for a given encoded URL.
-If `w3m-show-decoded-url' has a non-nil value, it is referred to to
-decide a decoding scheme."
-  (when (stringp url)
-    (setq url (w3m-puny-decode-url url))
-    (let ((rule
-	   (cond ((string-match "[^\000-\177]" url)
-		  ;; It looks not to have been encoded.
-		  nil)
-		 ((and (listp w3m-show-decoded-url)
-		       (consp (car w3m-show-decoded-url)))
-		  (catch 'found-rule
-		    (save-match-data
-		      (dolist (elem w3m-show-decoded-url)
-			(when (if (stringp (car elem))
-				  (string-match (car elem) url)
-				(if (functionp (car elem))
-				    (funcall (car elem) url)
-				  (eval (car elem))))
-			  (throw 'found-rule (cdr elem)))))))
-		 (t w3m-show-decoded-url))))
-      (if rule
-	  (w3m-url-decode-string url
-				 (if (eq t rule)
-				     w3m-coding-system-priority-list
-				   rule))
-	url))))
-
-(defun w3m-url-transfer-encode-string (url &optional coding)
-  "Encode non-ascii characters in URL into the sequence of escaped octets.
-CODING which defaults to `w3m-current-coding-system' (which see) is a
-coding system used when encoding non-ascii characters.
-
-This function is designed for conversion for safe transmission of URL,
-i.e., it handles only non-ASCII characters that can not be transmitted
-safely through the network.  For the other general purpose, you should
-use `w3m-url-encode-string' instead."
-  (setq url (w3m-puny-encode-url url))
-  (let ((start 0)
-	(buf))
-    (while (string-match "[^\x21-\x7e]+" url start)
-      (setq buf
-	    (cons (apply 'concat
-			 (mapcar
-			  (lambda (c) (format "%%%02X" c))
-			  (append (encode-coding-string
-				   (match-string 0 url)
-				   (or coding
-				       w3m-current-coding-system)))))
-		  (cons (substring url start (match-beginning 0))
-			buf))
-	    start (match-end 0)))
-    (apply 'concat
-	   (nreverse (cons (substring url start) buf)))))
-
-
-;;; HTML character entity handling:
-(defun w3m-entity-value (name)
-  "Get a char corresponding to NAME from the html char entities database.
-The database is kept in `w3m-entity-table'."
-  ;; Return a value of the specified entity, or nil if it is unknown.
-  (or (gethash name w3m-entity-table)
-      (and (eq (aref name 0) ?#)
-	   (let ((num (if (memq (aref name 1) '(?X ?x))
-			  (string-to-number (substring name 2) 16)
-			(string-to-number (substring name 1)))))
-	     (or (cdr (assq num w3m-extra-numeric-character-reference))
-		 (string (w3m-ucs-to-char num)))))))
-
-(defun w3m-fontify-bold ()
-  "Fontify bold text in the buffer containing halfdump."
-  (goto-char (point-min))
-  (while (search-forward "<b>" nil t)
-    (let ((start (match-beginning 0)))
-      (delete-region start (match-end 0))
-      (when (re-search-forward "</b[ \t\r\f\n]*>" nil t)
-	(delete-region (match-beginning 0) (match-end 0))
-	(w3m-add-face-property start (match-beginning 0) 'w3m-bold)))))
-
-(defun w3m-fontify-italic ()
-  "Fontify italic text in the buffer containing halfdump."
-  (goto-char (point-min))
-  (while (search-forward "<i>" nil t)
-    (let ((start (match-beginning 0)))
-      (delete-region start (match-end 0))
-      (when (re-search-forward "</i[ \t\r\f\n]*>" nil t)
-	(delete-region (match-beginning 0) (match-end 0))
-	(w3m-add-face-property start (match-beginning 0) 'w3m-italic)))))
-
-(defun w3m-fontify-underline ()
-  "Fontify underline text in the buffer containing halfdump."
-  (goto-char (point-min))
-  (while (search-forward "<u>" nil t)
-    (let ((start (match-beginning 0)))
-      (delete-region start (match-end 0))
-      (when (re-search-forward "</u[ \t\r\f\n]*>" nil t)
-	(delete-region (match-beginning 0) (match-end 0))
-	(w3m-add-face-property start (match-beginning 0) 'w3m-underline)))))
-
-(defun w3m-fontify-strike-through ()
-  "Fontify strike-through text in the buffer containing halfdump."
-  (goto-char (point-min))
-  (cond
-   ((and (eq w3m-display-ins-del 'fontify)
-	 (w3m-device-on-window-system-p))
-    (while (search-forward "<s>" nil t)
-      (let ((start (match-beginning 0)))
-	(delete-region start (match-end 0))
-	(when (re-search-forward "</s[ \t\r\f\n]*>" nil t)
-	  (delete-region (match-beginning 0) (match-end 0))
-	  (w3m-add-face-property start (match-beginning 0)
-				 'w3m-strike-through)))))
-   ((w3m-device-on-window-system-p)
-    (while (re-search-forward
-	    (concat "<U>\\(?:\\(?::\\(?:\\(?:DEL\\|S\\)]\\)\\|"
-		    "\\[\\(?:\\(?:DEL\\|S\\):\\)\\)</U>\\)")
-	    nil t)
-      (w3m-add-face-property (match-beginning 0) (match-end 0)
-			     'w3m-strike-through)))))
-
-(defun w3m-fontify-insert ()
-  "Fontify insert text in the buffer containing halfdump."
-  (goto-char (point-min))
-  (cond
-   ((and (eq w3m-display-ins-del 'fontify)
-	 (w3m-device-on-window-system-p))
-    (while (search-forward "<ins>" nil t)
-      (let ((start (match-beginning 0)))
-	(delete-region start (match-end 0))
-	(when (re-search-forward "</ins[ \t\r\f\n]*>" nil t)
-	  (delete-region (match-beginning 0) (match-end 0))
-	  (w3m-add-face-property start (match-beginning 0) 'w3m-insert)))))
-   ((w3m-device-on-window-system-p)
-    (while (re-search-forward "<U>\\(?:\\(?::INS]\\|\\[INS:\\)</U>\\)"
-			      nil t)
-      (w3m-add-face-property (match-beginning 0) (match-end 0) 'w3m-insert)))))
-
-(defun w3m-decode-anchor-string (str)
-  ;; FIXME: This is a quite ad-hoc function to process encoded url string.
-  ;; More discussion about timing &-sequence decode is required.  The
-  ;; following article (written in Japanese) is the origin of this issue:
-  ;;
-  ;; [emacs-w3m:00150] <URL:http://emacs-w3m.namazu.org/ml/msg00149.html>
-  ;;
-  ;; Takaaki MORIYAMA wrote in the article that the string "&amp;" which
-  ;; is replaced from "&" and embedded in the w3m's halfdump should be
-  ;; restored into "&" some time.
-  (let ((start 0) (buf))
-    (while (string-match "\\(&amp;\\)\\|\\([\t\r\f\n]+\\)" str start)
-      (setq buf (cons (if (match-beginning 1) "&" " ")
-		      (cons (substring str start (match-beginning 0)) buf))
-	    start (match-end 0)))
-    (apply (function concat)
-	   (nreverse (cons (substring str start) buf)))))
-
-(defun w3m-image-type (content-type)
-  "Return an image type which corresponds to CONTENT-TYPE."
-  (cdr (assoc content-type w3m-image-type-alist)))
-
-(defun w3m-imitate-widget-button ()
-  "Return a boolean value corresponding to the variable of the same name."
-  (if (listp w3m-imitate-widget-button)
-      (condition-case nil
-	  (eval w3m-imitate-widget-button)
-	(error nil))
-    (and w3m-imitate-widget-button t)))
-
-(defun w3m-fontify-anchors ()
-  "Fontify anchor tags in the buffer which contains halfdump."
-  (let ((help (w3m-make-help-echo w3m-balloon-help))
-	(balloon (w3m-make-balloon-help w3m-balloon-help))
-	prenames start end)
-    (goto-char (point-min))
-    (setq w3m-max-anchor-sequence 0)	;; reset max-hseq
-    (while (re-search-forward "<_id[ \t\r\f\n]+" nil t)
-      (setq start (match-beginning 0))
-      (setq prenames (get-text-property start 'w3m-name-anchor))
-      (w3m-parse-attributes (id)
-	(delete-region start (point))
-	(w3m-add-text-properties start (point-max)
-				 (list 'w3m-name-anchor
-				       (cons
-					(w3m-decode-entities-string
-					 (w3m-url-transfer-encode-string
-					  id))
-					prenames)))))
-    (goto-char (point-min))
-    (while (re-search-forward "<a[ \t\r\f\n]+" nil t)
-      (setq start (match-beginning 0))
-      (setq prenames (get-text-property start 'w3m-name-anchor2))
-      (w3m-parse-attributes (href name id charset
-				  (rel :case-ignore) (hseq :integer))
-	(unless name
-	  (setq name id))
-	(when rel
-	  (setq rel (split-string rel))
-	  (cond
-	   ((member "next" rel) (setq w3m-next-url href))
-	   ((or (member "prev" rel) (member "previous" rel))
-	    (setq w3m-previous-url href))
-	   ((member "start" rel) (setq w3m-start-url href))
-	   ((member "contents" rel) (setq w3m-contents-url href))))
-	(delete-region start (point))
-	(cond
-	 (href
-	  (when (re-search-forward "[ \t\r\f\n]*\\(</a>\\)" nil t)
-	    (setq end (match-beginning 0))
-	    (delete-region (match-beginning 1) (match-end 1))
-	    (setq href (w3m-expand-url (w3m-decode-anchor-string href)))
-	    (unless (w3m-url-local-p href)
-	      (w3m-string-match-url-components href)
-	      (setq href (if (match-beginning 8)
-			     (let ((tmp (match-string 9 href)))
-			       (concat (w3m-url-transfer-encode-string
-					(substring href 0 (match-beginning 8))
-					(w3m-charset-to-coding-system charset))
-				       "#" tmp))
-			 (w3m-url-transfer-encode-string
-			  href
-			  (w3m-charset-to-coding-system charset)))))
-	    (setq hseq (or (and (null hseq) 0) (abs hseq)))
-	    (setq w3m-max-anchor-sequence (max hseq w3m-max-anchor-sequence))
-	    (w3m-add-face-property start end (if (w3m-arrived-p href)
-						     'w3m-arrived-anchor
-						   'w3m-anchor))
-	    (w3m-add-text-properties start end
-				     (list 'w3m-href-anchor href
-					   'w3m-balloon-help href
-					   'mouse-face 'highlight
-					   'w3m-anchor-sequence hseq
-					   'help-echo help
-					   'balloon-help balloon
-					   'keymap w3m-link-map))
-	    (when (w3m-imitate-widget-button)
-	      (require 'wid-edit)
-	      (let ((widget-button-face (if (w3m-arrived-p href)
-					    'w3m-arrived-anchor
-					  'w3m-anchor))
-		    (widget-mouse-face 'highlight)
-		    w)
-		(setq w (widget-convert-button 'default start end
-					       :button-keymap nil
-					       :help-echo href))
-		(w3m-static-unless (featurep 'xemacs)
-		  (overlay-put (widget-get w :button-overlay) 'evaporate t))))
-	    (when name
-	      (w3m-add-text-properties start (point-max)
-				       (list 'w3m-name-anchor2
-					     (cons
-					      (w3m-decode-entities-string
-					       (w3m-url-transfer-encode-string
-						name))
-					      prenames))))))
-	 (name
-	  (w3m-add-text-properties start (point-max)
-				   (list 'w3m-name-anchor2
-					 (cons
-					  (w3m-decode-entities-string
-					   (w3m-url-transfer-encode-string
-					    name))
-					  prenames)))))))
-    (when w3m-icon-data
-      (setq w3m-icon-data (cons (and (car w3m-icon-data)
-				     (w3m-expand-url (car w3m-icon-data)))
-				(or (w3m-image-type (cdr w3m-icon-data))
-				    'ico))))
-    (when w3m-next-url
-      (setq w3m-next-url (w3m-expand-url w3m-next-url)))
-    (when w3m-previous-url
-      (setq w3m-previous-url (w3m-expand-url w3m-previous-url)))
-    (when w3m-start-url
-      (setq w3m-start-url (w3m-expand-url w3m-start-url)))
-    (when w3m-contents-url
-      (setq w3m-contents-url (w3m-expand-url w3m-contents-url)))))
-
-(eval-and-compile
-  (unless (featurep 'xemacs)
-    (defun w3m-setup-menu ()
-      "Define menubar buttons for Emacsen."
-      (w3m-menu-on-forefront w3m-menu-on-forefront t)
-      (unless (keymapp (lookup-key w3m-mode-map [menu-bar w3m]))
-	(let ((map (make-sparse-keymap (car w3m-menubar))))
-	  (define-key w3m-mode-map [menu-bar] (make-sparse-keymap))
-	  (w3m-setup-session-menu)
-	  (when w3m-use-tab-menubar (w3m-setup-tab-menu))
-	  (w3m-setup-bookmark-menu)
-	  (define-key w3m-mode-map [menu-bar w3m] (cons (car w3m-menubar) map))
-	  (require 'easymenu)
-	  (easy-menu-define
-	    w3m-mode-menu w3m-mode-map
-	    "w3m menu item" w3m-menubar)
-	  (easy-menu-add w3m-mode-menu))
-	(let ((map (make-sparse-keymap)))
-	  (easy-menu-define
-	    w3m-rmouse-menu map
-	    "w3m rmouse menu item" w3m-rmouse-menubar))))))
-
-(defun w3m-fontify-images ()
-  "Fontify img_alt strings of images in the buffer containing halfdump."
-  (goto-char (point-min))
-  (let ((help (w3m-make-help-echo w3m-balloon-help))
-	(balloon (w3m-make-balloon-help w3m-balloon-help))
-	upper start end help src1)
-    (while (re-search-forward "<\\(img_alt\\)[^>]+>" nil t)
-      (setq upper (string= (match-string 1) "IMG_ALT")
-	    start (match-beginning 0)
-	    end (match-end 0))
-      (goto-char (match-end 1))
-      (w3m-parse-attributes (src
-			     (width :integer)
-			     (height :integer)
-			     title
-			     usemap)
-	(delete-region start end)
-	(setq src (w3m-expand-url (w3m-decode-anchor-string src)))
-	;; Use the identical Lisp object for a string used as the value of
-	;; the `w3m-image' property.  A long title string will be chopped in
-	;; w3m's halfdump; since it makes `next-single-property-change' not
-	;; work properly, XEmacs didn't display images in shimbun articles.
-	(if (equal src src1)
-	    (setq src src1)
-	  (setq src1 src))
-	(when (search-forward "</img_alt>" nil t)
-	  (delete-region (setq end (match-beginning 0)) (match-end 0))
-	  (setq help (get-text-property start 'w3m-balloon-help))
-	  (cond
-	   ((and help title)
-	    (setq help (format "%s\nalt: %s\nimg: %s" help title src)))
-	   (help
-	    (setq help (format "%s\nimg: %s" help src)))
-	   (title
-	    (setq help (format "alt: %s\nimg: %s" title src)))
-	   (t
-	    (setq help (format "img: %s" src))))
-	  (w3m-add-text-properties start end
-				   (list 'w3m-image src
-					 'w3m-image-size
-					 (when (or width height)
-					   (cons width height))
-					 'w3m-image-alt title
-					 'w3m-balloon-help help
-					 'w3m-image-usemap usemap
-					 'w3m-image-status 'off
-					 'w3m-image-redundant upper
-					 'keymap w3m-link-map))
-	   (unless (w3m-action start)
-	     ;; No need to use `w3m-add-text-properties' here.
-	     (w3m-add-face-property start end
-				    (if (w3m-anchor start)
-					'w3m-image-anchor
-				      'w3m-image))
-	     (unless (w3m-anchor start)
-	       (add-text-properties start end (list 'mouse-face 'highlight
-						    'help-echo help
-						    'balloon-help balloon)))))))))
-
-(defvar w3m-idle-images-show-timer nil)
-(defvar w3m-idle-images-show-list nil)
-(defvar w3m-idle-images-show-interval 1)
-
-(defun w3m-idle-images-show ()
-  (let ((repeat t)
-	(onbuffer (member (current-buffer) (w3m-list-buffers))))
-    (while (and repeat w3m-idle-images-show-list)
-      (let* ((item (or (and onbuffer
-			    (or (get-text-property (point) 'w3m-idle-image-item)
-				(let* ((prev (previous-single-property-change
-					      (point) 'w3m-idle-image-item))
-				       (next (next-single-property-change
-					      (point) 'w3m-idle-image-item))
-				       (prev-diff (and prev (abs (- (point) prev))))
-				       (next-diff (and next (abs (- (point) next)))))
-				  (cond
-				   ((and prev next)
-				    (get-text-property
-				     (if (< prev-diff next-diff) prev next)
-				     'w3m-idle-image-item))
-				   (prev
-				    (get-text-property prev
-						       'w3m-idle-image-item))
-				   (next
-				    (get-text-property next
-						       'w3m-idle-image-item))
-				   (t nil)))))
-		       (car (last w3m-idle-images-show-list))))
-	     (start    (nth 0 item))
-	     (end      (nth 1 item))
-	     (iurl     (nth 2 item))
-	     (url      (nth 3 item))
-	     (no-cache (nth 4 item))
-	     (size     (nth 5 item)))
-	(setq w3m-idle-images-show-list
-	      (delete item w3m-idle-images-show-list))
-	(if (buffer-live-p (marker-buffer start))
-	    (with-current-buffer (marker-buffer start)
-	      (save-restriction
-		(widen)
-		(let ((inhibit-read-only t))
-		  (remove-text-properties start end '(w3m-idle-image-item))
-		  (set-buffer-modified-p nil))
-		(w3m-process-with-null-handler
-		  (lexical-let ((start start)
-				(end end)
-				(iurl iurl)
-				(url url))
-		    (w3m-process-do
-			(image (let ((w3m-current-buffer (current-buffer))
-				     (w3m-message-silent t))
-				 (w3m-create-image
-				  iurl no-cache
-				  url
-				  size handler)))
-		      (when (buffer-live-p (marker-buffer start))
-			(with-current-buffer (marker-buffer start)
-			  (save-restriction
-			    (widen)
-			    (if image
-				(when (equal url w3m-current-url)
-				  (let ((inhibit-read-only t))
-				    (w3m-insert-image start end image iurl))
-				  ;; Redisplay
-				  (when w3m-force-redisplay
-				    (sit-for 0)))
-			      (let ((inhibit-read-only t))
-				(w3m-add-text-properties
-				 start end '(w3m-image-status off))))
-			    (set-buffer-modified-p nil))
-			  (set-marker start nil)
-			  (set-marker end nil))))))))
-	  (set-marker start nil)
-	  (set-marker end nil)
-	  (w3m-idle-images-show-unqueue (marker-buffer start))))
-      (setq repeat (sit-for 0.1 t)))
-    (if w3m-idle-images-show-list
-      (when (input-pending-p)
-	(cancel-timer w3m-idle-images-show-timer)
-	(setq w3m-idle-images-show-timer
-	      (run-with-idle-timer w3m-idle-images-show-interval
-				   t
-				   'w3m-idle-images-show)))
-      (cancel-timer w3m-idle-images-show-timer)
-      (setq w3m-idle-images-show-timer nil))))
-
-(defun w3m-idle-images-show-unqueue (buffer)
-  (when w3m-idle-images-show-timer
-    (cancel-timer w3m-idle-images-show-timer)
-    (setq w3m-idle-images-show-timer nil)
-    (setq w3m-idle-images-show-list
-	  (delq nil
-		(mapcar (lambda (x)
-			  (and (not (eq buffer (marker-buffer (nth 0 x))))
-			       x))
-			w3m-idle-images-show-list)))
-    (when w3m-idle-images-show-list
-      (setq w3m-idle-images-show-timer
-	    (run-with-idle-timer w3m-idle-images-show-interval
-				 t
-				 'w3m-idle-images-show)))))
-
-(defvar w3m-image-no-idle-timer nil)
-(defun w3m-toggle-inline-images-internal (status
-					  &optional no-cache url
-					  begin-pos end-pos
-					  safe-regexp)
-  "Toggle displaying of inline images on current buffer.
-STATUS is current image status.
-If NO-CACHE is non-nil, cache is not used.
-If URL is specified, only the image with URL is toggled."
-  (let ((cur-point (point))
-	(inhibit-read-only t)
-	(end (or begin-pos (point-min)))
-	(allow-non-secure-images (not w3m-confirm-leaving-secure-page))
-	start iurl image size)
-    (unless end-pos (setq end-pos (point-max)))
-    (save-excursion
-      (if (equal status 'off)
-	  (while (< (setq start
-			  (if (w3m-image end)
-			      end
-			    (next-single-property-change end 'w3m-image
-							 nil end-pos)))
-		    end-pos)
-	    (setq end (or (next-single-property-change start 'w3m-image)
-			  (point-max))
-		  iurl (w3m-image start)
-		  size (get-text-property start 'w3m-image-size))
-	    (when (and (or (and (not url)
-				(or (not w3m-ignored-image-url-regexp)
-				    (not (string-match
-					  w3m-ignored-image-url-regexp
-					  iurl))))
-			   ;; URL is specified and is same as the image URL.
-			   (string= url iurl))
-		       (not (eq (get-text-property start 'w3m-image-status)
-				'on)))
-	      (w3m-add-text-properties start end '(w3m-image-status on))
-	      (if (get-text-property start 'w3m-image-redundant)
-		  (progn
-		    ;; Insert a dummy string instead of a redundant image.
-		    (setq image (make-string
-				 (string-width (buffer-substring start end))
-				 ? ))
-		    (w3m-add-text-properties start end '(invisible t))
-		    (goto-char end)
-		    (w3m-add-text-properties
-		     end (progn (insert image) (point))
-		     '(w3m-image-dummy t w3m-image "dummy"))
-		    (setq end (point)))
-		(goto-char cur-point)
-		(when (and (w3m-url-valid iurl)
-			   (or (null safe-regexp)
-			       (string-match safe-regexp iurl))
-			   (not (and (not (w3m-url-local-p w3m-current-url))
-				     (w3m-url-local-p iurl)))
-			   (or (not w3m-current-ssl)
-			       (string-match "\\`\\(?:ht\\|f\\)tps://" iurl)
-			       allow-non-secure-images
-			       (and (prog1
-					(y-or-n-p "\
-You are retrieving non-secure image(s).  Continue? ")
-				      (message nil))
-				    (setq allow-non-secure-images t))))
-		  (if (or w3m-image-no-idle-timer
-			  (and (null (and size w3m-resize-images))
-			       (or (string-match "\\`\\(?:cid\\|data\\):" iurl)
-				   (w3m-url-local-p iurl)
-				   (w3m-cache-available-p iurl))))
-		      (w3m-process-with-null-handler
-			(lexical-let ((start (set-marker (make-marker) start))
-				      (end (set-marker (make-marker) end))
-				      (iurl iurl)
-				      (url w3m-current-url))
-			  (w3m-process-do
-			      (image (let ((w3m-current-buffer (current-buffer)))
-				       (w3m-create-image
-					iurl no-cache
-					w3m-current-url
-					size handler)))
-			    (when (buffer-live-p (marker-buffer start))
-			      (with-current-buffer (marker-buffer start)
-				(if image
-				    (when (equal url w3m-current-url)
-				      (let ((inhibit-read-only t))
-					(w3m-insert-image start end image iurl))
-				      ;; Redisplay
-				      (when w3m-force-redisplay
-					(sit-for 0)))
-				  (let ((inhibit-read-only t))
-				    (w3m-add-text-properties
-				     start end '(w3m-image-status off))))
-				(set-buffer-modified-p nil)))
-			    (set-marker start nil)
-			    (set-marker end nil))))
-		    (let ((item (list (set-marker (make-marker) start)
-				      (set-marker (make-marker) end)
-				      (w3m-url-transfer-encode-string iurl)
-				      w3m-current-url
-				      no-cache
-				      size)))
-		      (setq w3m-idle-images-show-list
-			    (cons item w3m-idle-images-show-list))
-		      (w3m-add-text-properties
-		       start end
-		       `(w3m-idle-image-item ,item))
-		      (unless w3m-idle-images-show-timer
-			(setq w3m-idle-images-show-timer
-			      (run-with-idle-timer w3m-idle-images-show-interval
-						   t
-						   'w3m-idle-images-show)))))))))
-	;; Remove.
-	(while (< (setq start (if (w3m-image end)
-				  end
-				(next-single-property-change end 'w3m-image
-							     nil end-pos)))
-		  end-pos)
-	  (setq end (or (next-single-property-change start 'w3m-image)
-			(point-max))
-		iurl (w3m-image start))
-	  ;; IMAGE-ALT-STRING DUMMY-STRING
-	  ;; <--------w3m-image---------->
-	  ;; <---redundant--><---dummy--->
-	  ;; <---invisible-->
-	  (when (and (or (not url)
-			 ;; URL is specified and is not same as the image URL.
-			 (string= url iurl))
-		     (not (eq (get-text-property start 'w3m-image-status)
-			      'off)))
-	    (cond
-	     ((get-text-property start 'w3m-image-redundant)
-	      ;; Remove invisible property.
-	      (put-text-property start end 'invisible nil))
-	     ((get-text-property start 'w3m-image-dummy)
-	      ;; Remove dummy string.
-	      (delete-region start end)
-	      (setq end start))
-	     (t (w3m-remove-image start end)))
-	    (w3m-add-text-properties start end
-				     '(w3m-image-status off
-							w3m-idle-image-item nil))))
-	(set-buffer-modified-p nil)))))
-
-(defun w3m-toggle-inline-image (&optional force no-cache)
-  "Toggle the visibility of an image under point or images in the region.
-If FORCE is non-nil, displaying an image is forced.  If NO-CACHE is
-non-nil, cached data will not be used."
-  (interactive "P")
-  (unless (w3m-display-graphic-p)
-    (error "Can't display images in this environment"))
-  (let (toggle-list begin end)
-    (if (w3m-region-active-p)
-	(let ((p (region-beginning))
-	    iurl)
-	  (setq begin (region-beginning)
-		end (region-end))
-	  (w3m-deactivate-region)
-	  (while (< p end)
-	    (setq p (next-single-property-change p 'w3m-image nil end))
-	    (when (and (< p end)
-		       (setq iurl (w3m-image p))
-		       (not (assoc iurl toggle-list)))
-	    (setq toggle-list (cons (cons iurl p) toggle-list)))))
-      (setq toggle-list (and (w3m-image)
-			     `(,(cons (w3m-image) (point))))))
-    (if toggle-list
-	(dolist (x toggle-list)
-	  (let* ((url (car x))
-		 (pos (cdr x))
-		 (status (get-text-property pos 'w3m-image-status))
-		 safe-regexp)
-	    (if (and (get-text-property pos 'w3m-image-scale)
-		     (equal status 'off))
-		(w3m-zoom-in-image 0)
-	      (if (w3m-url-valid url)
-		  (if (eq status 'on)
-		      (progn
-			(if force (setq status 'off))
-			(w3m-toggle-inline-images-internal
-			 status no-cache url
-			 (or begin (point-min))
-			 (or end (point-max))))
-		    (setq safe-regexp
-			  (get-text-property (point) 'w3m-safe-url-regexp))
-		    (if (or force
-			    (not safe-regexp)
-			    (string-match safe-regexp url))
-			(w3m-toggle-inline-images-internal
-			 status no-cache url
-			 (or begin (point-min))
-			 (or end (point-max)))
-		      (when (interactive-p)
-			(w3m-message "This image is considered to be unsafe;\
- use the prefix arg to force display"))))))))
-      (if begin
-	  (w3m-message "No images in region")
-	(w3m-message "No image at point")))))
-
-(defun w3m-turnoff-inline-images ()
-  "Turn off to display all images in the buffer or in the region."
-  (interactive)
-  (w3m-toggle-inline-images 'turnoff))
-
-(defun w3m-toggle-inline-images (&optional force no-cache)
-  "Toggle the visibility of all images in the buffer or in the region.
-If FORCE is neither nil nor `turnoff', displaying images is forced.
-The value `turnoff' is special; it turns displaying images off anyway.
-If NO-CACHE is non-nil, cached data will not be used.
-
-Note that the status of whether images are visible is kept hereafter
-even in new sessions if the `w3m-toggle-inline-images-permanently'
-variable is non-nil (default=t)."
-  (interactive "P")
-  (unless (w3m-display-graphic-p)
-    (error "Can't display images in this environment"))
-  (let ((status (cond ((eq force 'turnoff) t)
-		      (force nil)
-		      (t w3m-display-inline-images)))
-	(safe-p t)
-	beg end safe-regexp pos url)
-    (if (w3m-region-active-p)
-	(progn
-	  (setq beg (region-beginning)
-		end (region-end))
-	  (w3m-deactivate-region))
-      (setq beg (point-min)
-	    end (point-max)))
-    (unless status
-      (when (setq safe-regexp (get-text-property (point) 'w3m-safe-url-regexp))
-	;; Scan the buffer for searching for an insecure image url.
-	(setq pos beg)
-	(setq
-	 safe-p
-	 (catch 'done
-	   (when (setq url (get-text-property pos 'w3m-image))
-	     (unless (string-match safe-regexp url)
-	       (throw 'done nil))
-	     (setq pos (next-single-property-change pos 'w3m-image)))
-	   (while (< pos end)
-	     (when (and
-		    (setq pos (next-single-property-change pos 'w3m-image
-							   nil end))
-		    (setq url (get-text-property pos 'w3m-image)))
-	       (unless (string-match safe-regexp url)
-		 (throw 'done nil)))
-	     (setq pos (next-single-property-change pos 'w3m-image
-						    nil end)))
-	   t))))
-    (if (or force
-	    status
-	    (not safe-regexp)
-	    safe-p)
-	(progn
-	  (unwind-protect
-	      (w3m-toggle-inline-images-internal (if status 'on 'off)
-						 no-cache nil beg end
-						 (unless (interactive-p)
-						   safe-regexp))
-	    (setq w3m-display-inline-images (not status))
-	    (when status 
-	      (w3m-process-stop (current-buffer))
-	      (w3m-idle-images-show-unqueue (current-buffer)))
-	    (force-mode-line-update)))
-      (w3m-message "There are some images considered unsafe;\
- use the prefix arg to force display"))))
-
-(defun w3m-resize-inline-image-internal (url rate)
-  "Resize an inline image on the cursor position.
-URL is a url of an image.  RATE is a number of percent used when
-resizing an image."
-  (let* ((inhibit-read-only t)
-	 (start (point))
-	 (end (or (next-single-property-change start 'w3m-image)
-		  (point-max)))
-	 (iurl (w3m-image start))
-	 (size (get-text-property start 'w3m-image-size))
-	 (iscale (or (get-text-property start 'w3m-image-scale) '100))
-	 (allow-non-secure-images (not w3m-confirm-leaving-secure-page))
-	 scale image)
-    (w3m-add-text-properties start end '(w3m-image-status on))
-    (setq scale (truncate (* iscale rate 0.01)))
-    (w3m-add-text-properties start end (list 'w3m-image-scale scale))
-    (if (get-text-property start 'w3m-image-redundant)
-	(progn
-	  ;; Insert a dummy string instead of a redundant image.
-	  (setq image (make-string
-		       (string-width (buffer-substring start end))
-		       ? ))
-	  (w3m-add-text-properties start end '(invisible t))
-	  (w3m-add-text-properties (point)
-				   (progn (insert image) (point))
-				   '(w3m-image-dummy t
-						     w3m-image "dummy")))
-      (when (and (w3m-url-valid iurl)
-		 (or (not w3m-current-ssl)
-		     (string-match "\\`\\(?:ht\\|f\\)tps://" iurl)
-		     allow-non-secure-images
-		     (and (prog1
-			      (y-or-n-p "\
-You are retrieving non-secure image(s).  Continue? ")
-			    (message nil))
-			  (setq allow-non-secure-images t))))
-	(w3m-process-with-null-handler
-	  (lexical-let ((start (set-marker (make-marker) start))
-			(end (set-marker (make-marker) end))
-			(iurl iurl)
-			(rate scale)
-			(url w3m-current-url))
-	    (w3m-process-do
-		(image (let ((w3m-current-buffer (current-buffer)))
-			 (w3m-create-resized-image
-			  iurl
-			  rate
-			  w3m-current-url
-			  size handler)))
-	      (when (buffer-live-p (marker-buffer start))
-		(with-current-buffer (marker-buffer start)
-		  (if image
-		      (when (equal url w3m-current-url)
-			(let ((inhibit-read-only t))
-			  (w3m-static-when (featurep 'xemacs)
-			    (w3m-remove-image start end))
-			  (w3m-insert-image start end image iurl))
-			;; Redisplay
-			(when w3m-force-redisplay
-			  (sit-for 0)))
-		    (let ((inhibit-read-only t))
-		      (w3m-add-text-properties
-		       start end '(w3m-image-status off))))
-		  (set-buffer-modified-p nil))
-		(set-marker start nil)
-		(set-marker end nil)))))))))
-
-(defun w3m-zoom-in-image (&optional rate)
-  "Zoom in an image on the point.
-Numeric prefix specifies how many percent the image is enlarged by
-\(30 means enlarging the image by 130%).  The default is the value of
-the `w3m-resize-image-scale' variable."
-  (interactive "P")
-  (unless (w3m-display-graphic-p)
-    (error "Can't display images in this environment"))
-  (unless (w3m-imagick-convert-program-available-p)
-    (error "ImageMagick's `convert' program is required"))
-  (let ((url (w3m-image)))
-    (if url
-	(w3m-resize-inline-image-internal
-	 url
-	 (+ 100 (or rate w3m-resize-image-scale)))
-      (w3m-message "No image at point"))))
-
-(defun w3m-zoom-out-image (&optional rate)
-  "Zoom out an image on the point.
-Numeric prefix specifies how many percent the image is shrunk by
-\(30 means shrinking the image by 70%).  The default is the value of
-the `w3m-resize-image-scale' variable."
-  (interactive "P")
-  (unless (w3m-display-graphic-p)
-    (error "Can't display images in this environment"))
-  (unless (w3m-imagick-convert-program-available-p)
-    (error "ImageMagick's `convert' program is required"))
-  (let ((url (w3m-image)))
-    (if url
-	(w3m-resize-inline-image-internal
-	 url
-	 (- 100 (or rate w3m-resize-image-scale)))
-      (w3m-message "No image at point"))))
-
-(defun w3m-decode-entities (&optional keep-properties)
-  "Decode entities in the current buffer.
-If optional KEEP-PROPERTIES is non-nil, text property is reserved."
-  (save-excursion
-    (goto-char (point-min))
-    ;; Character entity references are case-sensitive.
-    ;; Cf. http://www.w3.org/TR/1999/REC-html401-19991224/charset.html#h-5.3.2
-    (let (case-fold-search start fid prop value)
-      (while (re-search-forward w3m-entity-regexp nil t)
-	(setq start (match-beginning 0)
-	      fid (get-text-property start 'w3m-form-field-id))
-	(unless (and fid
-		     (save-match-data
-		       (string-match "/type=\\(?:text\\|select\\)/name=[^/]+/"
-				     fid)))
-	  (when keep-properties
-	    (setq prop (text-properties-at start)))
-	  (unless (eq (char-after (match-end 1)) ?\;)
-	    (goto-char (match-end 1)))
-	  ;; Note that `w3m-entity-value' breaks `match-data' at the 1st
-	  ;; time in XEmacs because of the autoloading unicode.elc for
-	  ;; the `ucs-to-char' function.
-	  (when (setq value (w3m-entity-value (match-string 1)))
-	    (delete-region start (point))
-	    (insert value))
-	  (when prop
-	    (w3m-add-text-properties start (point) prop)))))))
-
-(defun w3m-decode-entities-string (str)
-  "Decode entities in the string STR."
-  (save-match-data
-    ;; Character entity references are case-sensitive.
-    ;; Cf. http://www.w3.org/TR/1999/REC-html401-19991224/charset.html#h-5.3.2
-    (let ((case-fold-search) (pos 0) (buf))
-      (while (string-match w3m-entity-regexp str pos)
-	(setq buf (cons (or (w3m-entity-value (match-string 1 str))
-			    (match-string 1 str))
-			(cons (substring str pos (match-beginning 0))
-			      buf))
-	      pos (if (eq (aref str (match-end 1)) ?\;)
-		      (match-end 0)
-		    (match-end 1))))
-      (if buf
-	  (apply 'concat (nreverse (cons (substring str pos) buf)))
-	str))))
-
-(defun w3m-encode-specials-string (str)
-  "Encode special characters in the string STR."
-  (let ((pos 0)
-	(buf))
-    (while (string-match "[<>&]" str pos)
-      (setq buf
-	    (cons ";"
-		  (cons (gethash (match-string 0 str) w3m-entity-reverse-table)
-			(cons "&"
-			      (cons (substring str pos (match-beginning 0))
-				    buf))))
-	    pos (match-end 0)))
-    (if buf
-	(apply 'concat (nreverse (cons (substring str pos) buf)))
-      str)))
-
-(defun w3m-fontify ()
-  "Fontify the current buffer."
-  (let ((case-fold-search t)
-	(inhibit-read-only t))
-    (w3m-message "Fontifying...")
-    (run-hooks 'w3m-fontify-before-hook)
-    ;; Remove hidden anchors like "<a href=url> </a>".
-    (goto-char (point-min))
-    (while (re-search-forward "<a[\t\n ]+[^>]+>[\t\n ]*</a>" nil t)
-      (delete-region (match-beginning 0) (match-end 0)))
-    ;; Delete <?xml ... ?> tag
-    (goto-char (point-min))
-    (if (search-forward "<?xml" nil t)
-	(let ((start (match-beginning 0)))
-	  (search-forward "?>" nil t)
-	  (delete-region start (match-end 0))
-	  (goto-char (point-min))))
-    ;; Delete extra title tag.
-    (let (start)
-      (and (search-forward "<title>" nil t)
-	   (setq start (match-beginning 0))
-	   (search-forward "</title>" nil t)
-	   (delete-region start (match-end 0))))
-    (w3m-fontify-bold)
-    (w3m-fontify-italic)
-    (w3m-fontify-strike-through)
-    (w3m-fontify-insert)
-    (w3m-fontify-underline)
-    (when w3m-use-symbol
-      (w3m-replace-symbol))
-    (w3m-fontify-anchors)
-    (when w3m-use-form
-      (w3m-fontify-forms))
-    (w3m-fontify-images)
-    ;; Remove other markups.
-    (goto-char (point-min))
-    (while (re-search-forward "</?[A-Za-z_][^>]*>" nil t)
-      (let* ((start (match-beginning 0))
-	     (fid (get-text-property start 'w3m-form-field-id)))
-	(if (and fid (string-match "/type=text\\(?:area\\)?/" fid))
-	    (goto-char (1+ start))
-	  (delete-region start (match-end 0)))))
-    ;; Decode escaped characters (entities).
-    (w3m-decode-entities 'reserve-prop)
-    (when w3m-use-form
-      (w3m-fontify-textareas))
-    (goto-char (point-min))
-    (when w3m-delete-duplicated-empty-lines
-      (while (re-search-forward "^[ \t]*\n\\(?:[ \t]*\n\\)+" nil t)
-	(delete-region (match-beginning 0) (1- (match-end 0)))))
-
-    ;; FIXME: The code above reduces number of empty lines but one line
-    ;; remains.  While such empty lines might have been inserted for
-    ;; making sure of rooms for displaying images, they all should be
-    ;; removed since they are useless for emacs-w3m.  However, currently
-    ;; we don't have a proper way to identify whether they were inserted
-    ;; intentionally by the author or not.  So, we decided to remove only
-    ;; that one at the beginning of the buffer though it is unwillingness.
-    (goto-char (point-min))
-    (skip-chars-forward "\t\n $B!!(B")
-    (delete-region (point-min) (point-at-bol))
-
-    (w3m-header-line-insert)
-    (put-text-property (point-min) (point-max)
-		       'w3m-safe-url-regexp w3m-safe-url-regexp)
-    (w3m-message "Fontifying...done")
-    (run-hooks 'w3m-fontify-after-hook)))
-
-(defun w3m-refontify-anchor (&optional buff)
-  "Refontify anchors as they have already arrived.
-It replaces the faces on the arrived anchors from `w3m-anchor' to
-`w3m-arrived-anchor'."
-  (with-current-buffer (or buff (current-buffer))
-    (let (prop)
-      (when (and (eq major-mode 'w3m-mode)
-		 (get-text-property (point) 'w3m-anchor-sequence)
-		 (setq prop (get-text-property (point) 'face))
-		 (listp prop)
-		 (member 'w3m-anchor prop))
-	(let ((start)
-	      (end (next-single-property-change (point) 'w3m-anchor-sequence))
-	      (inhibit-read-only t))
-	  (when (and end
-		     (setq start (previous-single-property-change
-				  end 'w3m-anchor-sequence))
-		     (w3m-arrived-p (get-text-property (point)
-						       'w3m-href-anchor)))
-	    (w3m-remove-face-property start end 'w3m-anchor)
-	    (w3m-remove-face-property start end 'w3m-arrived-anchor)
-	    (w3m-add-face-property start end 'w3m-arrived-anchor))
-	  (set-buffer-modified-p nil))))))
-
-(defun w3m-url-completion (url predicate flag)
-  "Completion function for URL."
-  (if (string-match "\\`\\(?:file:\\|[/~]\\|\\.\\.?/\\|[a-zA-Z]:\\)" url)
-      (if (eq flag 'lambda)
-	  (file-exists-p (w3m-url-to-file-name url))
-	(let* ((partial
-		(expand-file-name
-		 (cond
-		  ((string-match "\\`file:[^/]" url)
-		   (substring url 5))
-		  ((string-match "/\\(~\\)" url)
-		   (substring url (match-beginning 1)))
-		  (t (w3m-url-to-file-name url)))))
-	       (collection
-		(let ((dir (file-name-directory partial)))
-		  (mapcar
-		   (lambda (f)
-		     (list (w3m-expand-file-name-as-url f dir)))
-		   (file-name-all-completions (file-name-nondirectory partial)
-					      dir)))))
-	  (setq partial
-		(if (string-match "/\\.\\'" url)
-		    (concat (file-name-as-directory
-			     (w3m-expand-file-name-as-url partial))
-			    ".")
-		  (w3m-expand-file-name-as-url partial)))
-	  (cond
-	   ((not flag)
-	    (try-completion partial collection predicate))
-	   ((eq flag t)
-	    (all-completions partial collection predicate)))))
-    (cond
-     ((not flag)
-      (try-completion url w3m-arrived-db))
-     ((eq flag t)
-      (all-completions url w3m-arrived-db))
-     ((eq flag 'lambda)
-      (if (w3m-arrived-p url) t nil)))))
-
-(defun w3m-gmane-url-at-point ()
-  "Return a url that indicates the thread page in Gmane.
-This function works only when the cursor stays in the References
-header or the Message-ID header, otherwise returns nil.
-
-On the Message-ID header, the url that asks Gmane for the thread
-beginning with the current article will be generated.
-On the References header, the url that asks Gmane for the whole thread
-\(namely it begins with the article of the first ID in the header) will
-be generated.  In that case, Gmane might fail to find the thread since
-it is possible that the root article has been posted to another group.
-
-That it returns an invalid url for the article of the group which is
-not being archived in Gmane cannot be helped."
-  (save-excursion
-    (let ((fmt "http://news.gmane.org/group/thread=%s/force_load=t")
-	  (start (point))
-	  (inhibit-point-motion-hooks t)
-	  case-fold-search)
-      (goto-char (point-min))
-      (re-search-forward (concat "^\\(?:"
-				 (regexp-quote mail-header-separator)
-				 "\\)?$")
-			 nil 'move)
-      (when (< start (point))
-	(setq case-fold-search t)
-	(save-restriction
-	  (narrow-to-region (point-min) (point))
-	  (goto-char start)
-	  (beginning-of-line)
-	  (while (and (memq (char-after) '(?\t ? ))
-		      (zerop (forward-line -1))))
-	  (when (looking-at
-		 "\\(?:Message-ID\\|References\\):[\t\n ]*<\\([^\t\n <>]+\\)>")
-	    (format
-	     fmt
-	     (w3m-url-encode-string (match-string-no-properties 1)
-				    nil t))))))))
-
-(defun w3m-header-line-url ()
-  "Return w3m-current-url if point on header line."
-  (let ((faces (get-text-property (point) 'face)))
-    (when (and (eq major-mode 'w3m-mode)
-	       (listp faces)
-	       (or (memq 'w3m-header-line-location-title faces)
-		   (memq 'w3m-header-line-location-content faces))
-	       w3m-current-url)
-      w3m-current-url)))
-
-(eval-and-compile
-  (autoload 'ffap-url-at-point "ffap")
-  (defalias 'w3m-url-at-point
-    (cond ((and (featurep 'xemacs) (featurep 'mule))
-	   (lambda nil "\
-Like `ffap-url-at-point', except that text props will be stripped and
-iso646 characters are unified into ascii characters."
-	     (or (w3m-gmane-url-at-point)
-		 (w3m-header-line-url)
-		 (let ((left (buffer-substring-no-properties (point-at-bol)
-							     (point)))
-		       (right (buffer-substring-no-properties (point)
-							      (point-at-eol)))
-		       (regexp (format "[%c-%c]"
-				       (make-char 'latin-jisx0201 33)
-				       (make-char 'latin-jisx0201 126)))
-		       (diff (- (char-to-int (make-char 'latin-jisx0201 33))
-				33))
-		       index)
-		   (while (setq index (string-match regexp left))
-		     (aset left index (- (aref left index) diff)))
-		   (while (setq index (string-match regexp right))
-		     (aset right index (- (aref right index) diff)))
-		   (with-temp-buffer
-		     (insert right)
-		     (goto-char (point-min))
-		     (insert left)
-		     (ffap-url-at-point))))))
-	  ((featurep 'xemacs)
-	   (lambda nil "\
-Like `ffap-url-at-point', except that text props will be stripped."
-	     (or (w3m-gmane-url-at-point)
-		 (w3m-header-line-url)
-		 (unless (fboundp 'ffap-url-at-point)
-		   ;; It is necessary to bind `ffap-xemacs'.
-		   (load "ffap" nil t))
-		 (let (ffap-xemacs)
-		   (ffap-url-at-point)))))
-	  (t
-	   (lambda nil
-	     (or (w3m-gmane-url-at-point)
-		 (w3m-header-line-url)
-		 (ffap-url-at-point)))))))
-
-(eval-after-load "ffap"
-  '(progn
-     ;; Under XEmacs, `ffap-url-regexp' won't match to https urls.
-     (if (and ffap-url-regexp
-	      (not (string-match ffap-url-regexp "https://foo"))
-	      (string-match "\\((\\|\\\\|\\)\\(http\\)\\(\\\\|\\|\\\\)\\)"
-			    ffap-url-regexp))
-	 (setq ffap-url-regexp (replace-match "\\1\\2s?\\3"
-					      nil nil ffap-url-regexp)))
-     ;; Add nntp:.
-     (if (and ffap-url-regexp
-	      (not (string-match ffap-url-regexp "nntp://bar"))
-	      (string-match "\\(\\\\(news\\\\(post\\\\)\\?:\\)\\(\\\\|\\)"
-			    ffap-url-regexp))
-	 (setq ffap-url-regexp (replace-match "\\1\\\\|nntp:\\2"
-					      nil nil ffap-url-regexp)))))
-
-(defun w3m-active-region-or-url-at-point (&optional default=current)
-  "Return an active region or a url around the cursor.
-In Transient Mark mode, deactivate the mark.  If DEFAULT=CURRENT is
-non-nil, return the url of the current page by default."
-  (if (w3m-region-active-p)
-      (prog1
-	  (let ((string (buffer-substring-no-properties
-			 (region-beginning) (region-end))))
-	    (with-temp-buffer
-	      (insert string)
-	      (skip-chars-backward "\t\n\f\r $B!!(B")
-	      (delete-region (point) (point-max))
-	      (goto-char (point-min))
-	      (skip-chars-forward "\t\n\f\r $B!!(B")
-	      (delete-region (point-min) (point))
-	      (while (re-search-forward "\
-\\(?:[\t\f\r $B!!(B]+\n[\t\f\r $B!!(B]*\\|[\t\f\r $B!!(B]*\n[\t\f\r $B!!(B]+\\)+" nil t)
-		(delete-region (match-beginning 0) (match-end 0)))
-	      (buffer-string)))
-	(w3m-deactivate-region))
-    (or (w3m-url-at-point)
-	(w3m-anchor)
-	(unless w3m-display-inline-images
-	  (w3m-image))
-	(and default=current
-	     (stringp w3m-current-url)
-	     (if (string-match "\\`about://\\(?:header\\|source\\)/"
-			       w3m-current-url)
-		 (substring w3m-current-url (match-end 0))
-	       w3m-current-url)))))
-
-(defun w3m-canonicalize-url (url &optional feeling-lucky)
-  "Add a scheme part to an URL or make an URL for \"I'm Feeling Lucky on Google\"
-if it has no scheme part."
-  (w3m-string-match-url-components url)
-  (cond
-   ((match-beginning 1)
-    url)
-   ((and (file-name-absolute-p url) (file-exists-p url))
-    (concat "file://" url))
-   (feeling-lucky
-    (let* ((charset w3m-google-feeling-lucky-charset)
-	   (cs (w3m-charset-to-coding-system charset))
-	   (str (w3m-url-encode-string url cs t)))
-      (format (concat "http://www.google.com/search"
-		      "?btnI=I%%27m+Feeling+Lucky&ie=%s&oe=%s&q=%s")
-	      charset charset str)))
-   (t
-    (concat "http://" url))))
-
-(defun w3m-input-url (&optional prompt initial default quick-start
-				feeling-lucky)
-  "Read a url from the minibuffer, prompting with string PROMPT."
-  (let (url)
-    (w3m-arrived-setup)
-    (cond ((null initial)
-	   (when (and (setq initial (w3m-active-region-or-url-at-point t))
-		      (not (string-match "[^\000-\177]" initial)))
-	     (setq initial (w3m-url-decode-string initial
-						  w3m-current-coding-system))))
-	  ((string= initial "")
-	   (setq initial nil)))
-    (when initial
-      (setq initial (w3m-puny-decode-url initial)))
-    (cond ((null default)
-	   (setq default w3m-home-page))
-	  ((string= default "")
-	   (setq default nil)))
-    (if (and quick-start
-	     default
-	     (not initial))
-	default
-      (unless w3m-enable-google-feeling-lucky
-	(setq feeling-lucky nil))
-      (setq url (let ((minibuffer-setup-hook
-		       (append minibuffer-setup-hook
-			       (list (lambda ()
-				       (beginning-of-line)
-				       (if (looking-at "[a-z]+:\\(?:/+\\)?")
-					   (goto-char (match-end 0)))))))
-		      (ofunc (lookup-key minibuffer-local-completion-map " ")))
-		  (when feeling-lucky
-		    (define-key minibuffer-local-completion-map " "
-		      'self-insert-command))
-		  (unwind-protect
-		      (completing-read
-		       (if prompt
-			   (if default
-			       (progn
-				 (when (string-match " *: *\\'" prompt)
-				   (setq prompt
-					 (substring prompt 0
-						    (match-beginning 0))))
-				 (concat prompt " (default "
-					 (if (equal default w3m-home-page)
-					     "HOME"
-					   default)
-					 "): "))
-			     prompt)
-			 (if default
-			     (format "URL %s(default %s): "
-				     (if feeling-lucky "or Keyword " "")
-				     (if (stringp default)
-					 (if (eq default w3m-home-page)
-					     "HOME" default)
-				       (prin1-to-string default)))
-			   (if feeling-lucky "URL or Keyword: " "URL: ")))
-		       'w3m-url-completion nil nil initial
-		       'w3m-input-url-history default)
-		    (define-key minibuffer-local-completion-map " " ofunc))))
-      (if (stringp url)
-	  (progn
-	    ;; remove duplication
-	    (setq w3m-input-url-history
-		  (cons url (delete url w3m-input-url-history)))
-	    (w3m-canonicalize-url url feeling-lucky))
-	;; It may be `popup'.
-	url))))
-
-;;; Cache:
-(defun w3m-cache-setup ()
-  "Initialize the variables for managing the cache."
-  (unless (and (bufferp w3m-cache-buffer)
-	       (buffer-live-p w3m-cache-buffer))
-    (with-current-buffer (w3m-get-buffer-create " *w3m cache*")
-      (buffer-disable-undo)
-      (set-buffer-multibyte nil)
-      (setq buffer-read-only t
-	    w3m-cache-buffer (current-buffer)
-	    w3m-cache-hashtb (make-vector 1021 0)))))
-
-(defun w3m-cache-shutdown ()
-  "Clear all the variables managing the cache, and the cache itself."
-  (when (buffer-live-p w3m-cache-buffer)
-    (kill-buffer w3m-cache-buffer))
-  (setq w3m-cache-hashtb nil
-	w3m-cache-articles nil))
-
-(defun w3m-cache-header-delete-variable-part (header)
-  (let (buf flag)
-    (dolist (line (split-string header "\n+"))
-      (if (string-match "\\`\\(?:Date\\|Server\\|W3m-[^:]+\\):" line)
-	  (setq flag t)
-	(unless (and flag (string-match "\\`[ \t]" line))
-	  (setq flag nil)
-	  (push line buf))))
-    (mapconcat (function identity) (nreverse buf) "\n")))
-
-(defun w3m-cache-header (url header &optional overwrite)
-  "Store HEADER into the cache so that it corresponds to URL.
-If OVERWRITE is non-nil, it forces the storing even if there has
-already been the data corresponding to URL in the cache."
-  (w3m-cache-setup)
-  (let ((ident (intern url w3m-cache-hashtb)))
-    (if (boundp ident)
-	(if (and
-	     (not overwrite)
-	     (string=
-	      (w3m-cache-header-delete-variable-part header)
-	      (w3m-cache-header-delete-variable-part (symbol-value ident))))
-	    (symbol-value ident)
-	  (w3m-cache-remove url)
-	  (set ident header))
-      (set ident header))))
-
-(defun w3m-cache-request-header (url)
-  "Return the header string of URL when it is stored in the cache."
-  (w3m-cache-setup)
-  (let ((ident (intern url w3m-cache-hashtb)))
-    (and (boundp ident)
-	 (symbol-value ident))))
-
-(defun w3m-cache-remove-oldest ()
-  (with-current-buffer w3m-cache-buffer
-    (goto-char (point-min))
-    (unless (zerop (buffer-size))
-      (let ((ident (get-text-property (point) 'w3m-cache))
-	    (inhibit-read-only t))
-	;; Remove the ident from the list of articles.
-	(when ident
-	  (setq w3m-cache-articles (delq ident w3m-cache-articles)))
-	;; Delete the article itself.
-	(delete-region (point)
-		       (next-single-property-change
-			(1+ (point)) 'w3m-cache nil (point-max)))))))
-
-(defun w3m-cache-remove (url)
-  "Remove the data coresponding to URL from the cache."
-  (w3m-cache-setup)
-  (let ((ident (intern url w3m-cache-hashtb))
-	beg end)
-    (when (memq ident w3m-cache-articles)
-      ;; It was in the cache.
-      (with-current-buffer w3m-cache-buffer
-	(let ((inhibit-read-only t))
-	  (when (setq beg (text-property-any
-			   (point-min) (point-max) 'w3m-cache ident))
-	    ;; Find the end (i. e., the beginning of the next article).
-	    (setq end (next-single-property-change
-		       (1+ beg) 'w3m-cache (current-buffer) (point-max)))
-	    (delete-region beg end)))
-	(setq w3m-cache-articles (delq ident w3m-cache-articles))))))
-
-(defun w3m-cache-contents (url buffer)
-  "Store the contents of URL into the cache.
-The contents are assumed to be in BUFFER.  Return a symbol which
-identifies the data in the cache."
-  (w3m-cache-setup)
-  (let ((ident (intern url w3m-cache-hashtb)))
-    (w3m-cache-remove url)
-    ;; Remove the oldest article, if necessary.
-    (and (numberp w3m-keep-cache-size)
-	 (>= (length w3m-cache-articles) w3m-keep-cache-size)
-	 (w3m-cache-remove-oldest))
-    ;; Insert the new article.
-    (with-current-buffer w3m-cache-buffer
-      (let ((inhibit-read-only t))
-	(goto-char (point-max))
-	(let ((b (point)))
-	  (insert-buffer-substring buffer)
-	  ;; Tag the beginning of the article with the ident.
-	  (when (> (point-max) b)
-	    (w3m-add-text-properties b (1+ b) (list 'w3m-cache ident))
-	    (setq w3m-cache-articles (cons ident w3m-cache-articles))
-	    ident))))))
-
-(defun w3m-cache-request-contents (url &optional buffer)
-  "Insert contents of URL into BUFFER.
-Return t if the contents are found in the cache, otherwise nil.  When
-BUFFER is nil, all contents will be inserted in the current buffer."
-  (w3m-cache-setup)
-  (let ((ident (intern url w3m-cache-hashtb)))
-    (when (memq ident w3m-cache-articles)
-      ;; It was in the cache.
-      (let (beg end)
-	(with-current-buffer w3m-cache-buffer
-	  (if (setq beg (text-property-any
-			 (point-min) (point-max) 'w3m-cache ident))
-	      ;; Find the end (i.e., the beginning of the next article).
-	      (setq end (next-single-property-change
-			 (1+ beg) 'w3m-cache (current-buffer) (point-max)))
-	    ;; It wasn't in the cache after all.
-	    (setq w3m-cache-articles (delq ident w3m-cache-articles))))
-	(and beg
-	     end
-	     (with-current-buffer (or buffer (current-buffer))
-	       (let ((inhibit-read-only t))
-		 (insert-buffer-substring w3m-cache-buffer beg end))
-	       t))))))
-
-;; FIXME: we need to check whether contents were updated in remote servers.
-(defun w3m-cache-available-p (url)
-  "Return non-nil if a content of URL has already been cached."
-  (w3m-cache-setup)
-  (when (stringp url)
-    (let ((ident (intern url w3m-cache-hashtb)))
-      (and
-       (memq ident w3m-cache-articles)
-       (or
-	w3m-prefer-cache
-	(save-match-data
-	  (let ((case-fold-search t)
-		(head (and (boundp ident) (symbol-value ident)))
-		time expire)
-	    (cond
-	     ((and (string-match "^\\(?:date\\|etag\\):[ \t]" head)
-		   (or (string-match "^pragma:[ \t]+no-cache\n" head)
-		       (string-match
-			"^cache-control:\\(?:[^\n]+\\)?[ \t,]\\(?:no-cache\\|max-age=0\\)[,\n]"
-			head)))
-	      nil)
-	     ((and
-	       (string-match "^date:[ \t]\\([^\n]+\\)\n" head)
-	       (setq time (match-string 1 head))
-	       (setq time (w3m-time-parse-string time))
-	       (string-match "^cache-control:\\(?:[^\n]+\\)?[ \t,]max-age=\\([1-9][0-9]*\\)"
-			     head)
-	       (setq expire (string-to-number (match-string 1 head))))
-	      (setq time (decode-time time))
-	      (setcar time (+ (car time) expire))
-	      ;; Work around too large integer.
-	      (when (floatp (car time))
-		(setcar time (eval '(lsh -1 -1))))
-	      (setq expire (apply 'encode-time time))
-	      (w3m-time-newer-p expire (current-time)))
-	     ((and
-	       (string-match "^expires:[ \t]+\\([^\n]+\\)\n" head)
-	       (setq expire (match-string 1 head))
-	       (setq expire (w3m-time-parse-string expire)))
-	      (w3m-time-newer-p expire (current-time)))
-	     (t
-	      ;; Adhoc heuristic rule: pages with neither
-	      ;; Last-Modified header and ETag header are treated as
-	      ;; dynamically-generated pages.
-	      (string-match "^\\(?:last-modified\\|etag\\):" head))))))
-       ident))))
-
-(defun w3m-read-file-name (&optional prompt dir default existing)
-  (when default
-    (setq default (file-name-nondirectory (w3m-url-strip-query default))))
-  (unless prompt
-    (setq prompt (if (and default (not (string-equal default "")))
-		     (format "Save to (%s): " default)
-		   "Save to: ")))
-  (setq dir (file-name-as-directory (or dir w3m-default-save-directory)))
-  (let ((default-directory dir)
-	(file (read-file-name prompt dir nil existing default)))
-    (if (not (file-directory-p file))
-	(setq w3m-default-save-directory
-	      (or (file-name-directory file) w3m-default-save-directory))
-      (setq w3m-default-save-directory file)
-      (if default
-	  (setq file (expand-file-name default file))))
-    (expand-file-name file)))
-
-;;; Handling character sets:
-(defun w3m-charset-to-coding-system (charset)
-  "Return a coding system which is most suitable to CHARSET.
-CHARSET is a symbol whose name is MIME charset.
-This function is imported from mcharset.el."
-  (if (stringp charset)
-      (setq charset (intern (downcase charset))))
-  (let ((cs (assq charset w3m-charset-coding-system-alist)))
-    (w3m-find-coding-system (if cs (cdr cs) charset))))
-
-(defun w3m-coding-system-to-charset (coding-system)
-  "Return the MIME charset corresponding to CODING-SYSTEM."
-  (when coding-system
-    (w3m-static-if (featurep 'xemacs)
-	(when (or (fboundp 'coding-system-to-mime-charset)
-		  (progn
-		    (require 'mcharset)
-		    (fboundp 'coding-system-to-mime-charset)))
-	  (defalias 'w3m-coding-system-to-charset
-	    'coding-system-to-mime-charset)
-	  (w3m-coding-system-to-charset coding-system))
-      (or (coding-system-get coding-system :mime-charset)
-	  (coding-system-get coding-system 'mime-charset)))))
-
-;; FIXME: we need to investigate the kind of Content-Charsets being
-;; actually possible.
-(defun w3m-read-content-charset (prompt &optional default)
-  "Read a content charset from the minibuffer, prompting with string PROMPT.
-The second argument DEFAULT is the default value, which is used as the
-value to return if the user enters the empty string."
-  (let ((charset (completing-read
-		  prompt
-		  (nconc
-		   (mapcar (lambda (c) (cons (symbol-name c) c))
-			   (coding-system-list))
-		   (mapcar (lambda (c) (cons (symbol-name (car c)) c))
-			   w3m-charset-coding-system-alist))
-		  nil t)))
-    (if (string= "" charset)
-	default
-      charset)))
-
-
-;;; Handling encoding of contents:
-(defun w3m-decode-encoded-contents (encoding)
-  "Decode encoded contents in the current buffer.
-It supports the encoding types of gzip, bzip2, deflate, etc."
-  (let ((x (and (stringp encoding)
-		(assoc (downcase encoding) w3m-encoding-alist))))
-    (or (not (and x (setq x (cdr (assq (cdr x) w3m-decoder-alist)))))
-	(let ((coding-system-for-write 'binary)
-	      (coding-system-for-read 'binary)
-	      (default-process-coding-system (cons 'binary 'binary)))
-	  (w3m-process-with-environment w3m-command-environment
-	    (zerop (apply 'call-process-region
-			  (point-min) (point-max)
-			  (w3m-which-command (car x))
-			  t '(t nil) nil (cadr x))))))))
-
-(defmacro w3m-correct-charset (charset)
-  `(or (and ,charset (stringp ,charset)
-	    (cdr (assoc (downcase ,charset) w3m-correct-charset-alist)))
-       ,charset))
-
-(defun w3m-detect-meta-charset ()
-  (let ((case-fold-search t))
-    (goto-char (point-min))
-    (catch 'found
-      (while (re-search-forward "<meta[ \t\r\f\n]+" nil t)
-	(w3m-parse-attributes ((http-equiv :case-ignore)
-			       (content :case-ignore))
-	  (when (and (string= http-equiv "content-type")
-		     content
-		     (string-match ";[ \t\n]*charset=\\([^\";]+\\)" content))
-	    (throw 'found (match-string 1 content))))))))
-
-(defun w3m-detect-xml-charset ()
-  (let ((case-fold-search t))
-    (goto-char (point-min))
-    (when (looking-at "[ \t\r\f\n]*<\\?xml[ \t\r\f\n]+")
-      (goto-char (match-end 0))
-      (or (w3m-parse-attributes ((encoding :case-ignore))
-	    encoding)
-	  "utf-8"))))
-
-(defvar w3m-compatible-encoding-alist
-  '((gb2312 . gbk)
-    (iso-8859-1 . windows-1252)
-    (iso-8859-8 . windows-1255)
-    (iso-8859-9 . windows-1254))
-  "Alist of encodings and those supersets.
-The cdr of each element is used to decode data if it is available when
-the car is what the data specify as the encoding.  Or, the car is used
-for decoding when the cdr that the data specify is not available.")
-
-(defvar w3m-view-source-decode-level 0
-  "Say whether `w3m-view-source' decodes html sources.
-Users should never modify the value.  See also `w3m-view-source'.")
-
-(defun w3m-decode-buffer (url &optional content-charset content-type)
-  (let* ((sourcep (string-match "\\`about://source/" url))
-	 (level (if sourcep w3m-view-source-decode-level 0))
-	 cs)
-    (unless (>= level 4)
-      (unless content-type
-	(setq content-type (w3m-content-type url)))
-      (unless content-charset
-	(setq content-charset
-	      (or (w3m-content-charset url)
-		  (when (or (string= "text/html" content-type) sourcep)
-		    (w3m-detect-meta-charset))
-		  (w3m-detect-xml-charset))))
-      (cond
-       ((or (and (stringp content-charset)
-		 (string= "x-moe-internal" (downcase content-charset)))
-	    (eq content-charset 'x-moe-internal))
-	(setq cs (w3m-x-moe-decode-buffer))
-	(setq content-charset (symbol-name cs)))
-       (content-charset
-	(setq content-charset (w3m-correct-charset content-charset))
-	(setq cs (w3m-charset-to-coding-system content-charset))))
-      (setq w3m-current-content-charset content-charset)
-      (unless cs
-	(setq cs (w3m-detect-coding-region
-		  (point-min) (point-max) (if (w3m-url-local-p url)
-					      nil
-					    w3m-coding-system-priority-list))))
-      (setq w3m-current-coding-system
-	    (or (w3m-find-coding-system
-		 (cdr (assq cs w3m-compatible-encoding-alist)))
-		(w3m-find-coding-system cs)
-		(w3m-find-coding-system
-		 (car (rassq cs w3m-compatible-encoding-alist)))))
-      ;; Decode `&#nnn;' entities in 128..159 and 160.
-      (when (and (<= level 1)
-		 (rassq w3m-current-coding-system
-			w3m-compatible-encoding-alist))
-	(goto-char (point-min))
-	(let ((case-fold-search t))
-	  (while (re-search-forward "\
-\\(?:&#\\(12[89]\\|1[3-5][0-9]\\)\;\\)\\|\\(?:&#x\\([89][0-9a-f]\\)\;\\)"
-				    nil t)
-	    (insert (prog1
-			(if (match-beginning 1)
-			    (string-to-number (match-string 1))
-			  (string-to-number (match-string 2) 16))
-		      (delete-region (match-beginning 0) (match-end 0)))))
-	  (goto-char (point-min))
-	  (while (re-search-forward "\240\\|&#160;\\|&#xa0;" nil t)
-	    (replace-match "&nbsp;"))))
-      (insert
-       (prog1
-	   (decode-coding-string (buffer-string) w3m-current-coding-system)
-	 (erase-buffer)
-	 (set-buffer-multibyte t))))))
-
-(defun w3m-x-moe-decode-buffer ()
-  (let ((args '("-i" "-cs" "x-moe-internal"))
-	(coding-system-for-read 'binary)
-	(coding-system-for-write 'binary)
-	(default-process-coding-system (cons 'binary 'binary))
-	charset)
-    (if (w3m-find-coding-system 'utf-8)
-	(setq args (append args '("-o" "-cs" "utf-8"))
-	      charset 'utf-8)
-      (setq args
-	    (append args (list "-o" "-cs" (symbol-name w3m-coding-system))))
-      (setq charset w3m-coding-system))
-    (w3m-process-with-environment w3m-command-environment
-      (apply 'call-process-region (point-min) (point-max)
-	     w3m-mbconv-command t t nil args))
-    charset))
-
-(defun w3m-safe-decode-buffer (url &optional content-charset content-type)
-  (and (not w3m-current-coding-system)
-       (stringp content-type)
-       (string-match "\\`text/" content-type)
-       (w3m-decode-buffer url content-charset content-type)))
-
-;;; Retrieving local data:
-(defun w3m-local-file-type (url)
-  "Return the content type and the content encoding of URL."
-  (setq url (or (w3m-url-to-file-name url)
-		(file-name-nondirectory url)))
-  (if (or (and (file-name-absolute-p url)
-	       (file-directory-p url))
-	  (string-match "\\`news:" url)) ;; FIXME: isn't this a kludge?
-      (cons "text/html" nil)
-    (let ((encoding
-	   (catch 'encoding-detected
-	     (dolist (elem w3m-encoding-type-alist)
-	       (when (string-match (car elem) url)
-		 (setq url (substring url 0 (match-beginning 0)))
-		 (throw 'encoding-detected (cdr elem)))))))
-      (cons (catch 'type-detected
-	      (dolist (elem w3m-content-type-alist)
-		(when (and (cadr elem) (string-match (cadr elem) url))
-		  (throw 'type-detected (car elem))))
-	      "unknown")
-	    encoding))))
-
-(defmacro w3m-local-content-type (url)
-  `(car (w3m-local-file-type ,url)))
-
-(defun w3m-local-attributes (url &rest args)
-  "Return a list of attributes corresponding to URL.
-Return nil if it failed in retrieving of the header.
-Otherwise, return a list which includes the following elements:
-
- 0. Type of contents.
- 1. Charset of contents.
- 2. Size in bytes.
- 3. Encoding of contents.
- 4. Last modification time.
- 5. Real URL.
-"
-  (let* ((file (w3m-url-to-file-name url))
-	 (attr (when (file-exists-p file)
-		 (file-attributes file)))
-	 (type (w3m-local-file-type url)))
-    (list (or (w3m-arrived-content-type url) (car type))
-	  nil
-	  (nth 7 attr)
-	  (cdr type)
-	  (nth 5 attr)
-	  (w3m-expand-file-name-as-url (file-truename file)))))
-
-(defun w3m-local-retrieve (url &optional no-uncompress &rest args)
-  "Retrieve contents of local URL and put it into the current buffer.
-This function will return the content-type of URL as a string when
-retrieval is successful."
-  (let ((file (w3m-url-to-file-name url)))
-    (when (file-readable-p file)
-      (if (file-directory-p file)
-	  (w3m-local-dirlist-cgi url)
-	(let ((coding-system-for-read 'binary))
-	  (if no-uncompress
-	      (let (jka-compr-compression-info-list
-		    format-alist)
-		(insert-file-contents file))
-	    (insert-file-contents file))))
-      (or (w3m-arrived-content-type url)
-	  (w3m-local-content-type file)))))
-
-(defun w3m-local-dirlist-cgi (url)
-  (w3m-message "Reading %s..." (w3m-url-readable-string url))
-  (if w3m-dirlist-cgi-program
-      (if (file-executable-p w3m-dirlist-cgi-program)
-	  (let ((coding-system-for-read 'binary)
-		(default-process-coding-system
-		  (cons 'binary 'binary))
-		(lcookie (make-temp-name
-			  (format "%s.%d." (user-login-name) (emacs-pid))))
-		(cfile (make-temp-name
-			(expand-file-name "w3melck" w3m-profile-directory)))
-		(env (copy-sequence w3m-command-environment))
-		file)
-	    (with-temp-buffer
-	      (insert lcookie)
-	      (write-region (point-min) (point-max) cfile 'nomsg))
-	    (w3m-process-with-environment
-		(append
-		 (list
-		  (cons "LOCAL_COOKIE" lcookie)
-		  (cons "LOCAL_COOKIE_FILE" cfile)
-		  (cons "QUERY_STRING"
-			(format
-			 "dir=%s&cookie=%s"
-			 (encode-coding-string (w3m-url-to-file-name url)
-					       w3m-file-name-coding-system)
-			 lcookie)))
-		 (delq (assoc "LOCAL_COOKIE" env)
-		       (delq (assoc "LOCAL_COOKIE_FILE" env)
-			     (delq (assoc "QUERY_STRING" env) env))))
-	      (call-process w3m-dirlist-cgi-program nil t nil))
-	    ;; delete local cookie file
-	    (when (and (file-exists-p cfile) (file-writable-p cfile))
-	      (delete-file cfile))
-	    (goto-char (point-min))
-	    (when (re-search-forward "^<html>" nil t)
-	      (delete-region (point-min) (match-beginning 0))
-	      (while (re-search-forward "<a href=\"\\([^\"]+\\)\"\\(?:>\\| \\)"
-					nil t)
-		(setq file (match-string 1))
-		(delete-region (goto-char (match-beginning 1)) (match-end 1))
-		(if (file-directory-p file)
-		    (setq file (w3m-expand-file-name-as-url
-				(file-name-as-directory file)))
-		  (setq file (w3m-expand-file-name-as-url file)))
-		(insert (encode-coding-string
-			 (w3m-url-decode-string file
-						w3m-file-name-coding-system)
-			 w3m-file-name-coding-system)))))
-	(error "Can't execute: %s" w3m-dirlist-cgi-program))
-    ;; execute w3m internal CGI
-    (w3m-process-with-wait-handler
-      (setq w3m-current-url url)
-      (w3m-process-start handler
-			 w3m-command
-			 (append w3m-command-arguments
-				 (list "-dump_source" url)))))
-  ;; bind charset to w3m-file-name-coding-system
-  (let ((charset (or (car (rassq w3m-file-name-coding-system
-				 w3m-charset-coding-system-alist))
-		     w3m-file-name-coding-system))
-	beg)
-    (goto-char (point-min))
-    (when (search-forward "<head>" nil t)
-      (insert "\n<meta http-equiv=\"CONTENT-TYPE\" "
-	      "content=\"text/html; charset="
-	      (symbol-name charset)
-	      "\">"))
-    (goto-char (point-min))
-    ;; Remove <form>...</form>
-    (when (search-forward "<form " nil t)
-      (setq beg (match-beginning 0))
-      (when (search-forward "</form>" nil t)
-	(delete-region beg (match-end 0)))))
-  (w3m-message "Reading %s...done" (w3m-url-readable-string url)))
-
-;;; Retrieving data via HTTP:
-(defun w3m-remove-redundant-spaces (str)
-  "Remove leading and trailing whitespace from STR."
-  (save-match-data
-    (when (string-match "\\`[ \t\r\f\n]+" str)
-      (setq str (substring str (match-end 0))))
-    (if (string-match "[ \t\r\f\n]+\\'" str)
-	(substring str 0 (match-beginning 0))
-      str)))
-
-(defun w3m-w3m-parse-header (url header)
-  "Parse a given string HEADER as a MIME header of URL.
-Return a list which includes:
-
- 0. Status code.
- 1. Type of contents.
- 2. Charset of contents.
- 3. Size in bytes.
- 4. Encoding of contents.
- 5. Last modification time.
- 6. Real URL.
-"
-  (let ((case-fold-search t)
-	(headers)
-	(status))
-    (dolist (line (split-string header "[ \f\t\r]*\n"))
-      (cond
-       ((string-match "\\`HTTP/1\\.[0-9] \\([0-9][0-9][0-9]\\)\\b" line)
-	(setq status (string-to-number (match-string 1 line))))
-       ((string-match (eval-when-compile
-			(concat "\\`\\("
-				(regexp-opt
-				 '(;; MEMO: $B%U%!%$%k$r%@%&%s%m!<%I$9$k(B
-				   ;; $B$H$-$N(B $BE,@Z$J%G%U%)%k%HL>$r7hDj(B
-				   ;; $B$9$k$?$a$K$O(B content-disposition
-				   ;; $B$N2r<a$,I,MW!%(B
-				   "content-disposition"
-				   "content-encoding"
-				   "content-length"
-				   ;; MEMO: See [emacs-w3m:02341].
-				   "content-transfer-encoding"
-				   "content-type"
-				   "last-modified"
-				   "location"
-				   "w3m-current-url"
-				   "w3m-document-charset"
-				   "w3m-ssl-certificate"
-				   "x-w3m-content-encoding"
-				   "alternates"))
-				"\\):[ \t]*"))
-		      line)
-	(push (cons (downcase (match-string 1 line))
-		    (substring line (match-end 0)))
-	      headers))))
-    (let (alt real-url type charset xmoe)
-      (when (and (setq alt (cdr (assoc "alternates" headers)))
-		 (string-match "\\`{[\t ]*\"\\(.+\\)\"" alt))
-	(setq real-url (w3m-expand-url (match-string 1 alt) url))
-	(when (string-match "{[\t ]*type[\t ]+\\([^\t }]+\\)" alt)
-	  (setq type (downcase (match-string 1 alt))))
-	(when (string-match "{[\t ]*charset[\t ]+\\([^\t }]+\\)" alt)
-	  (setq charset (downcase (match-string 1 alt)))))
-      (when (and (not type)
-		 (setq type (cdr (assoc "content-type" headers))))
-	(if (string-match ";[ \t]*charset=\"?\\([^\"]+\\)\"?" type)
-	    (setq charset (w3m-remove-redundant-spaces
-			   (match-string 1 type))
-		  type (w3m-remove-redundant-spaces
-			(substring type 0 (match-beginning 0))))
-	  (setq type (w3m-remove-redundant-spaces type)))
-	(when (string-match ";" type)
-	  (setq type (substring type 0 (match-beginning 0))))
-	(setq type (downcase type)))
-      (setq w3m-current-ssl (cdr (assoc "w3m-ssl-certificate" headers)))
-      (when (string-match "\\`ftps?:" url)
-	(setq url (or (cdr (assoc "w3m-current-url" headers))
-		      url)))
-      (when (and (setq xmoe (cdr (assoc "w3m-document-charset" headers)))
-		 (string= xmoe "x-moe-internal"))
-	(setq charset xmoe))
-      (list status
-	    (if (string-match "\\`ftps?:.*/\\'" url)
-		"text/html"
-	      (or type (w3m-local-content-type url)))
-	    (if (string-match "\\`ftps?:.*/\\'" url)
-		(if w3m-accept-japanese-characters
-		    "w3m-euc-japan" "w3m-iso-latin-1")
-	      charset)
-	    (let ((v (cdr (assoc "content-length" headers))))
-	      (and v (setq v (string-to-number v)) (> v 0) v))
-	    (cdr (or (assoc "content-encoding" headers)
-		     (assoc "x-w3m-content-encoding" headers)))
-	    (let ((v (cdr (assoc "last-modified" headers))))
-	      (and v (w3m-time-parse-string v)))
-	    (or real-url
-		(let ((v (cdr (assoc "location" headers))))
-		  ;; RFC2616 says that the field value of the Location
-		  ;; response-header consists of a single absolute
-		  ;; URI.  However, some broken servers return
-		  ;; relative URIs.
-		  (and v (w3m-expand-url v url)))
-		url)))))
-
-(defun w3m-w3m-dump-head (url handler)
-  "Return the header string of URL."
-  (lexical-let ((url url)
-		(silent w3m-message-silent))
-    (w3m-message "Request sent, waiting for response...")
-    (w3m-process-do-with-temp-buffer
-	(success (progn
-		   (setq w3m-current-url url
-			 url (w3m-url-strip-authinfo url))
-		   (w3m-process-start handler
-				      w3m-command
-				      (append w3m-command-arguments
-					      (list "-o" "follow_redirection=0"
-						    "-dump_head" url)))))
-      (let ((w3m-message-silent silent))
-	(w3m-message "Request sent, waiting for response...done")
-	(when success
-	  (buffer-string))))))
-
-(defun w3m-w3m-canonicalize-url (url)
-  "Add a slash to an URL, when its server part is not ended with a slash."
-  ;; Because URLs encountered in WEB documents are no less reliable
-  ;; than URLs given by users, a minimum canonicalization may be
-  ;; required in the backend side.  For more detail, please see
-  ;; [emacs-w3m:07000].
-  (if (string-match "\\`\\(?:ht\\|f\\)tps?://[^/]+\\'" url)
-      (concat url "/")
-    url))
-
-(defun w3m-w3m-attributes (url no-cache handler)
-  "Return a list of attributes corresponding to URL.
-Return nil if it failed in retrieving of the header.
-Otherwise, return a list which includes the following elements:
-
- 0. Type of contents.
- 1. Charset of contents.
- 2. Size in bytes.
- 3. Encoding of contents.
- 4. Last modification time.
- 5. Real URL.
-
-If the optional argument NO-CACHE is non-nil, cache is not used."
-  (w3m-w3m-attributes-1 (w3m-w3m-canonicalize-url url)
-			no-cache
-			(or w3m-follow-redirection 0)
-			handler))
-
-(defun w3m-w3m-attributes-1 (url no-cache counter handler)
-  "A subroutine for `w3m-w3m-attributes'."
-  (lexical-let ((url url)
-		(no-cache no-cache)
-		(counter counter))
-    (w3m-process-do
-	(header (or (unless no-cache
-		      (w3m-cache-request-header url))
-		    (w3m-w3m-dump-head url handler)))
-      (when header
-	(let ((attr (w3m-w3m-parse-header url header)))
-	  (w3m-cache-header url header)
-	  (if (memq (car attr) '(301 302 303 304 305 306 307))
-	      (if (zerop counter)
-		  ;; Redirect counter exceeds `w3m-follow-redirection'.
-		  (list "text/html" "us-ascii" nil nil nil url)
-		;; Follow redirection.
-		(w3m-w3m-attributes-1 (nth 6 attr) no-cache
-				      (1- counter) handler))
-	    (cdr attr)))))))
-
-(defun w3m-w3m-expand-arguments (arguments)
-  (apply 'append
-	 (mapcar
-	  (lambda (x)
-	    (cond
-	     ((stringp x) (list x))
-	     ((setq x (eval x))
-	      (cond ((stringp x)
-		     (list x))
-		    ((listp x)
-		     (w3m-w3m-expand-arguments x))
-		    (t
-		     (let (print-level print-length)
-		       (list (prin1-to-string x))))))))
-		arguments)))
-
-(defun w3m-w3m-dump-extra (url handler)
-  "Retrive headers and contents pointed to by URL"
-  (lexical-let ((url url)
-		(silent w3m-message-silent))
-    (setq w3m-current-url url
-	  url (w3m-url-strip-authinfo url))
-    (w3m-message "Reading %s...%s"
-		 (w3m-url-readable-string url)
-		 (if (and w3m-async-exec (not w3m-process-waited))
-		     (substitute-command-keys "\
- (Type `\\<w3m-mode-map>\\[w3m-process-stop]' to stop asynchronous process)")
-		   ""))
-    (w3m-process-do
-	(success
-	 (w3m-process-start handler
-			    w3m-command
-			    (append w3m-command-arguments
-				    (w3m-w3m-expand-arguments
-				     w3m-dump-head-source-command-arguments)
-				    (list url))))
-      (let ((w3m-message-silent silent))
-	(w3m-message "Reading %s...done" (w3m-url-readable-string url))
-	(when success
-	  (goto-char (point-min))
-	  (let ((case-fold-search t))
-	    (when (and (re-search-forward "^w3m-current-url:" nil t)
-		       (progn
-			 (delete-region (point-min) (match-beginning 0))
-			 (search-forward "\n\n" nil t)))
-	      (let ((header (buffer-substring (point-min) (point))))
-		(when w3m-use-cookies
-		  (w3m-cookie-set url (point-min) (point)))
-		(delete-region (point-min) (point))
-		(w3m-cache-header url header)
-		(w3m-cache-contents url (current-buffer))
-		(w3m-w3m-parse-header url header)))))))))
-
-(defun w3m-additional-command-arguments (url)
-  "Return a list of additional arguments passed to the w3m command.
-You may specify additional arguments for the particular urls using the
-option `w3m-command-arguments-alist', or using `w3m-no-proxy-domains'
-to add the option \"-no-proxy\"."
-  (let ((defs w3m-command-arguments-alist)
-	def args host)
-    (while (and defs
-		(null args))
-      (setq def (car defs)
-	    defs (cdr defs))
-      (when (string-match (car def) url)
-	(setq args (cdr def))))
-    (when (and w3m-no-proxy-domains
-	       (not (member "-no-proxy" args))
-	       (string-match "^[a-z]+://\\([^/:]+\\)" url)
-	       (catch 'domain-match
-		 (setq host (match-string 1 url))
-		 (dolist (domain w3m-no-proxy-domains)
-		   (when (string-match (concat "\\(?:^\\|\\.\\)"
-					       (regexp-quote domain)
-					       "$")
-				       host)
-		     (throw 'domain-match t)))))
-      (push "-no-proxy" args))
-    args))
-
-(defun w3m-add-referer-p (url referer)
-  "Return non-nil when URL and REFERER satisfies the condition
-specified by `w3m-add-referer'."
-  (when (stringp referer)
-    (cond
-     ((eq w3m-add-referer 'lambda)
-      (let (host)
-	(w3m-string-match-url-components url)
-	(when (match-beginning 4)
-	  (setq host (match-string 4 url))
-	  (w3m-string-match-url-components referer)
-	  (when (match-beginning 4)
-	    (string= host (match-string 4 referer))))))
-     ((consp w3m-add-referer)
-      (and (not (and (cdr w3m-add-referer)
-		     (string-match (cdr w3m-add-referer) referer)))
-	   (car w3m-add-referer)
-	   (string-match (car w3m-add-referer) referer)))
-     ((functionp w3m-add-referer)
-      (funcall w3m-add-referer url referer))
-     (t w3m-add-referer))))
-
-;; Currently, -request argument is supported only by w3mmee.
-(defun w3m-request-arguments (method url temp-file
-				     &optional body referer content-type)
-  "Make the arguments for `-request' or `-header' option passed to w3m.
-METHOD is an HTTP method name.
-TEMP-FILE is a name of temporal file to write request content to.
-Optional BODY is the body content string.
-Second optional REFERER is the Referer: field content.
-Third optional CONTENT-TYPE is the Content-Type: field content."
-  (with-temp-buffer
-    (let ((modes (default-file-modes))
-	  (cookie (and w3m-use-cookies (w3m-cookie-get url))))
-      (if (and (null cookie)(null body)
-	       (null content-type))
-	  (append
-	   (when w3m-add-user-agent
-	     (list "-header" (concat "User-Agent:" w3m-user-agent)))
-	   (when (w3m-add-referer-p url referer)
-	     (list "-header" (concat "Referer: " referer)))
-	   (when w3m-accept-languages
-	     (list "-header" (concat
-			      "Accept-Language: "
-			      (mapconcat 'identity w3m-accept-languages
-					 " ")))))
-	(when w3m-add-user-agent (insert "User-Agent: " w3m-user-agent "\n"))
-	(when (w3m-add-referer-p url referer)
-	  (insert "Referer: " referer "\n"))
-	(when w3m-accept-languages
-	  (insert "Accept-Language: "
-		  (mapconcat 'identity w3m-accept-languages " ") "\n"))
-	(when cookie
-	  (insert "Cookie: " cookie "\n"))
-	(when content-type
-	  (insert "Content-Type: " content-type "\n"))
-	(insert "\n")
-	(when body
-	  (insert body))
-	(unwind-protect
-	    (let ((coding-system-for-write 'binary))
-	      (set-default-file-modes (* 64 6))
-	      (write-region (point-min) (point-max) temp-file nil 'silent))
-	  (set-default-file-modes modes))
-	(list "-request" (concat method ":" temp-file))))))
-
-;; Currently, w3m uses this function.
-(defun w3m-header-arguments (method url temp-file
-				    &optional body referer content-type)
-  "Make the arguments for the `-header' option passed to the w3m command.
-METHOD is an HTTP method name.
-TEMP-FILE is a name of temporal file to write post body to.
-Optional BODY is the post body content string.
-Optional second REFERER is the Referer: field content.
-Third optional CONTENT-TYPE is the Content-Type: field content."
-  (let ((modes (default-file-modes))
-	(cookie (and w3m-use-cookies (w3m-cookie-get url)))
-	args)
-    (when w3m-add-user-agent
-      (setq args (nconc args
-			(list "-o" (concat "user_agent=" w3m-user-agent)))))
-    (when cookie
-      (setq args (nconc args
-			(list "-header" (concat "Cookie: " cookie)))))
-    (when (and (string= method "post") temp-file)
-      (with-temp-buffer
-	(set-buffer-multibyte nil)
-	(when body (insert body))
-	(unwind-protect
-	    (let ((coding-system-for-write 'binary))
-	      (set-default-file-modes (* 64 6))
-	      (write-region (point-min) (point-max) temp-file nil 'silent))
-	  (set-default-file-modes modes)))
-      (setq args (nconc args
-			(when content-type
-			  (list "-header" (concat "Content-Type: "
-						  content-type)))
-			(list "-post" temp-file))))
-    (when (w3m-add-referer-p url referer)
-      (setq args (nconc args (list "-header" (concat "Referer: " referer)))))
-    args))
-
-(defun w3m-w3m-retrieve (url no-uncompress no-cache post-data referer handler)
-  "Retrieve web contents pointed to by URL using the external w3m command.
-It will put the retrieved contents into the current buffer.  See
-`w3m-retrieve' for how does it work asynchronously with the arguments."
-  (lexical-let ((url (w3m-w3m-canonicalize-url url))
-		(no-uncompress no-uncompress)
-		(current-buffer (current-buffer))
-		(silent w3m-message-silent))
-    (w3m-process-do-with-temp-buffer
-	(attr (progn
-		(set-buffer-multibyte nil)
-		(w3m-w3m-retrieve-1 url post-data referer no-cache
-				    (or w3m-follow-redirection 0) handler)))
-      (let ((w3m-message-silent silent))
-	(when attr
-	  (cond
-	   ((eq attr 'redirection-exceeded)
-	    "X-w3m-error/redirection")
-	   ((or (not (string-match "\\`https?:" url))
-		(memq (car attr) '(200 300)))
-	    (if (or no-uncompress
-		    (w3m-decode-encoded-contents (nth 4 attr)))
-		(let ((temp-buffer (current-buffer)))
-		  (with-current-buffer current-buffer
-		    (insert-buffer-substring temp-buffer))
-		  (goto-char (point-min))
-		  (cadr attr))
-	      (ding)
-	      (w3m-message "Can't decode encoded contents: %s" url)
-	      nil))
-	   (t nil)))))))
-
-(defun w3m-w3m-retrieve-1 (url post-data referer no-cache counter handler)
-  "A subroutine for `w3m-w3m-retrieve'."
-  (let ((w3m-command-arguments
-	 (append w3m-command-arguments
-		 (when (member "cookie" w3m-compile-options)
-		   (list "-no-cookie"))
-		 (list "-o" "follow_redirection=0")
-		 (w3m-additional-command-arguments url)))
-	(cachep (w3m-cache-available-p url))
-	temp-file)
-    (when (and w3m-broken-proxy-cache
-	       (or no-cache (not cachep)))
-      (setq w3m-command-arguments
-	    (append w3m-command-arguments '("-o" "no_cache=1"))))
-    (setq temp-file
-	  (when (or (eq w3m-type 'w3mmee) post-data)
-	    (make-temp-name
-	     (expand-file-name "w3mel" w3m-profile-directory))))
-    (setq w3m-command-arguments
-	  (append w3m-command-arguments
-		  (apply (if (eq w3m-type 'w3mmee)
-			     'w3m-request-arguments
-			   'w3m-header-arguments)
-			 (list (if post-data "post" "get")
-			       url
-			       temp-file
-			       (if (consp post-data)
-				   (cdr post-data)
-				 post-data)
-			       referer
-			       (if (consp post-data) (car post-data))))))
-    (lexical-let ((url url)
-		  (post-data post-data)
-		  (referer referer)
-		  (no-cache no-cache)
-		  (counter counter)
-		  (temp-file temp-file))
-      (w3m-process-do
-	  (attr (or (unless no-cache
-		      (and cachep
-			   (w3m-cache-request-contents url)
-			   (w3m-w3m-parse-header
-			    url (w3m-cache-request-header url))))
-		    (w3m-w3m-dump-extra url handler)))
-	(and temp-file
-	     (file-exists-p temp-file)
-	     (delete-file temp-file))
-	(if (memq (car attr) '(301 302 303 304 305 306 307))
-	    (if (zerop counter)
-		;; Redirect counter exceeds `w3m-follow-redirection'.
-		'redirection-exceeded
-	      ;; Follow redirection.
-	      (erase-buffer)
-	      (unless (and post-data
-			   (cond
-			    ((memq (car attr) '(301 302))
-			     (if w3m-redirect-with-get
-				 (setq post-data nil)
-			       (not (y-or-n-p
-				     (format "Send POST data to `%s'?" url)))))
-			    ((eq (car attr) 303) ; => See Other
-			     (setq post-data nil))
-			    ((eq (car attr) 307) ; => Temporally Redirect
-			     (not (y-or-n-p
-				   (format "Send POST data to `%s'?" url))))))
-		(w3m-w3m-retrieve-1 (nth 6 attr)
-				    post-data referer no-cache
-				    (1- counter) handler)))
-	  (if (and (eq (car attr) 406)
-		   (not (equal url (nth 6 attr))))
-	      ;; Attempt to retrieve an alternative url.
-	      (progn
-		(erase-buffer)
-		(w3m-w3m-retrieve-1 (nth 6 attr) post-data referer no-cache
-				    counter handler))
-	    attr))))))
-
-(defun w3m-about-retrieve (url &optional no-uncompress no-cache
-			       post-data referer handler)
-  "Retrieve the about: page which is pointed to by URL.
-It will put the retrieved contents into the current buffer.  See
-`w3m-retrieve' for how does it work asynchronously with the arguments."
-  (cond
-   ((string= "about://emacs-w3m.gif" url)
-    (let ((icon (base64-decode-string w3m-emacs-w3m-icon)))
-      (if (featurep 'xemacs)
-	  (insert icon)
-	(set-buffer-multibyte (multibyte-string-p icon))
-	(insert icon)
-	(set-buffer-multibyte nil)))
-    "image/gif")
-   ((string-match "\\`about://source/" url)
-    (lexical-let ((url (substring url (match-end 0))))
-      (w3m-process-do
-	  (type (w3m-retrieve url
-			      no-uncompress no-cache post-data referer handler))
-	(cond
-	 (type "text/plain")
-	 ((w3m-cache-request-contents url)
-	  (w3m-decode-encoded-contents (w3m-content-encoding url))
-	  "text/plain")
-	 (t nil)))))
-   ((string-match "\\`about:/*blank/?\\'" url)
-    "text/plain")
-   (t
-    (lexical-let ((output-buffer (current-buffer)))
-      (w3m-process-do-with-temp-buffer
-	  (type (let (func)
-		  (setq w3m-current-url url)
-		  (set-buffer-multibyte t)
-		  (if (and (string-match "\\`about://\\([^/]+\\)/" url)
-			   (setq func
-				 (intern-soft (concat "w3m-about-"
-						      (match-string 1 url))))
-			   (fboundp func))
-		      (funcall func url no-uncompress no-cache
-			       post-data referer handler)
-		    (w3m-about url no-uncompress no-cache))))
-	(when type
-	  (when (string-match "\\`text/" type)
-	    (encode-coding-region (point-min) (point-max) w3m-coding-system))
-	  (set-buffer-multibyte nil)
-	  (when (buffer-name output-buffer)
-	    (let ((temp-buffer (current-buffer)))
-	      (with-current-buffer output-buffer
-		(insert-buffer-substring temp-buffer))))
-	  type))))))
-
-(defun w3m-cid-retrieve (url &optional no-uncompress no-cache)
-  "Retrieve contents pointed to by URL prefixed with the cid: scheme.
-This function is mainly used when displaying text/html MIME parts in
-message user agents, e.g., Gnus, Mew, T-gnus, Wanderlust, and possibly
-VM.
-
-It calls a function according to the `major-mode' of the buffer
-specified by `w3m-current-buffer'.  Functions to be called are
-specified by the `w3m-cid-retrieve-function-alist' variable.
-
-Each function in that variable should take three arguments passed
-through this function, extract and insert contents specified by URL
-\(which can be found in the raw message itself) into the current buffer,
-and return the content type of the data.
-
-The optional two arguments can be omitted by functions; NO-UNCOMPRESS
-specifies whether functions should not uncompress extracted contents;
-NO-CACHE specifies whether functions should not use cached contents."
-  (let ((func (cdr (assq (with-current-buffer w3m-current-buffer major-mode)
-			 w3m-cid-retrieve-function-alist))))
-    (when func (funcall func url no-uncompress no-cache))))
-
-(defun w3m-data-retrieve (url &optional no-uncompress no-cache)
-  "Retrieve contents pointed to by URL prefixed with the data: scheme.
-See RFC2397."
-  (let ((case-fold-search t) (mime-type "text/plain")
-	(coding nil) (encode nil) (param "")
-	data-string)
-    (when (string-match
-	   "data:\\(\\([^/;,]+\\(/[^;,]+\\)?\\)\\(;[^;,]+\\)*\\)?,\\(.*\\)"
-	   url)
-      (setq  mime-type (or (match-string-no-properties 2 url)
-			   mime-type)
-	     param (or (match-string-no-properties 4 url)
-		       param)
-	     data-string (match-string-no-properties 5 url))
-      (when (string-match "^.*\\(;[ \t]*base64\\)$" param)
-	(setq param (substring param 0 (match-beginning 1)))
-	(setq encode 'base64))
-      (when (string-match "charset=\\([^;]+\\)" param)
-	(setq coding (w3m-charset-to-coding-system
-		      (match-string-no-properties 1 param))))
-      (when data-string
-	(erase-buffer)
-	(let (decode-string)
-	  (setq decode-string
-		(cond
-		 ((eq encode 'base64)
-		  (base64-decode-string data-string))
-		 (t
-		  (w3m-url-decode-string
-		   data-string coding))))
-	  (set-buffer-multibyte nil)
-	  (if (featurep 'xemacs)
-	      (insert decode-string)
-	    (set-buffer-multibyte (multibyte-string-p decode-string))
-	    (insert decode-string)
-	    (set-buffer-multibyte nil)))))
-    mime-type))
-
-;;;###autoload
-(defun w3m-retrieve (url &optional no-uncompress no-cache
-			 post-data referer handler)
-  "Retrieve web contents pointed to by URL.
-It will put the retrieved contents into the current buffer.
-
-If HANDLER is nil, this function will retrieve web contents, return
-the content type of the retrieved data, and then come to an end.  This
-behavior is what is called a synchronous operation.  You have to
-specify HANDLER in order to make this function show its real ability,
-which is called an asynchronous operation.
-
-If HANDLER is a function, this function will come to an end in no time.
-In this case, contents will be retrieved by the asynchronous process
-after a while.  And after finishing retrieving contents successfully,
-HANDLER will be called on the buffer where this function starts.  The
-content type of the retrieved data will be passed to HANDLER as a
-string argument.
-
-NO-UNCOMPRESS specifies whether this function should not uncompress contents.
-NO-CACHE specifies whether this function should not use cached contents.
-POST-DATA and REFERER will be sent to the web server with a request."
-  (if (not handler)
-      (condition-case nil
-	  (w3m-process-with-wait-handler
-	    (w3m-retrieve url
-			  no-uncompress no-cache post-data referer handler))
-	(w3m-process-timeout nil))
-    (unless (and w3m-safe-url-regexp
-		 (not (string-match w3m-safe-url-regexp url)))
-      (setq url (w3m-url-strip-fragment url))
-      (set-buffer-multibyte nil)
-      (cond
-       ((string-match "\\`about:" url)
-	(w3m-about-retrieve url
-			    no-uncompress no-cache post-data referer handler))
-       ((string-match "\\`cid:" url)
-	(w3m-cid-retrieve url no-uncompress no-cache))
-       ((string-match "\\`data:" url)
-	(w3m-data-retrieve url no-uncompress no-cache))
-       ((w3m-url-local-p url)
-	(w3m-local-retrieve url no-uncompress))
-       (t
-	(w3m-w3m-retrieve url
-			  no-uncompress no-cache post-data referer handler))))))
-
-(defvar w3m-touch-file-available-p 'undecided)
-
-(eval-and-compile
-  (if (fboundp 'set-file-times)
-      (defalias 'w3m-touch-file 'set-file-times)
-    (defun w3m-touch-file (file time)
-      "Change the access and/or modification TIME of the specified FILE."
-      ;; Check the validity of `touch' command.
-      (when (eq w3m-touch-file-available-p 'undecided)
-	(let ((file (make-temp-name
-		     (expand-file-name "w3mel" w3m-profile-directory)))
-	      time timefile)
-	  (while (progn
-		   (setq time (list (abs (% (random) 8192))
-				    (abs (% (random) 65536)))
-			 timefile (expand-file-name
-				   (format-time-string "%Y%m%d%H%M.%S" time)
-				   w3m-profile-directory))
-		   (file-exists-p timefile)))
-	  (unwind-protect
-	      (setq w3m-touch-file-available-p
-		    (when (w3m-which-command w3m-touch-command)
-		      (with-temp-buffer
-			(insert "touch check")
-			(write-region (point-min) (point-max) file nil 'nomsg))
-		      (and (let ((default-directory w3m-profile-directory)
-				 (w3m-touch-file-available-p t))
-			     (w3m-touch-file file time))
-			   (zerop (w3m-time-lapse-seconds
-				   time (nth 5 (file-attributes file)))))))
-	    (when (file-exists-p file)
-	      (ignore-errors (delete-file file)))
-	    (when (file-exists-p timefile)
-	      (ignore-errors (delete-file timefile))))))
-      (and w3m-touch-file-available-p
-	   time
-	   (w3m-which-command w3m-touch-command)
-	   (file-exists-p file)
-	   (zerop (let ((default-directory (file-name-directory file))
-			(coding-system-for-write
-			 (or
-			  (and (boundp 'file-name-coding-system)
-			       (symbol-value 'file-name-coding-system))
-			  (and (boundp 'default-file-name-coding-system)
-			       (symbol-value 'default-file-name-coding-system))
-			  ;; Some versions of X*macsen seem touched.
-			  (and (boundp 'coding-system-for-write)
-			       (symbol-value 'coding-system-for-write)))))
-		    (call-process w3m-touch-command nil nil nil
-				  "-t"
-				  (format-time-string "%Y%m%d%H%M.%S" time)
-				  file)))))))
-
-;;;###autoload
-(defun w3m-download (url &optional filename no-cache handler post-data)
-  "Download contents of URL to a file named FILENAME.
-NO-CHACHE (which the prefix argument gives when called interactively)
-specifies not using the cached data."
-  (interactive
-   (let* ((url (w3m-input-url "Download URL: "))
-	  (basename (file-name-nondirectory (w3m-url-strip-query url))))
-     (if (string-match "^[\t ]*$" basename)
-	 (list url
-	       (w3m-read-file-name (format "Download %s to: " url)
-				   w3m-default-save-directory "index.html")
-	       current-prefix-arg)
-       (list url
-	     (w3m-read-file-name (format "Download %s to: " basename)
-				 w3m-default-save-directory basename)
-	     current-prefix-arg))))
-  (if (and w3m-use-ange-ftp (string-match "\\`ftp://" url))
-      (w3m-goto-ftp-url url filename)
-    (lexical-let ((url url)
-		  (filename (or filename (w3m-read-file-name nil nil url))))
-      (w3m-process-do-with-temp-buffer
-	  (type (progn
-		  (w3m-clear-local-variables)
-		  (setq w3m-current-url url)
-		  (w3m-retrieve url t no-cache post-data nil handler)))
-	(if type
-	    (let ((buffer-file-coding-system 'binary)
-		  (coding-system-for-write 'binary)
-		  jka-compr-compression-info-list
-		  format-alist)
-	      (when (or (not (file-exists-p filename))
-			(prog1 (y-or-n-p
-				(format "File(%s) already exists. Overwrite? "
-					filename))
-			  (message nil)))
-		(write-region (point-min) (point-max) filename)
-		(w3m-touch-file filename (w3m-last-modified url))
-		t))
-	  (ding)
-	  (message "Cannot retrieve URL: %s%s"
-		   url
-		   (if w3m-process-exit-status
-		       (format " (exit status: %s)" w3m-process-exit-status)
-		     ""))
-	  nil)))))
-
-;;; Retrieve data:
-(w3m-make-ccl-coding-system
- 'w3m-euc-japan ?E
- "ISO 2022 based EUC encoding for Japanese with w3m internal characters.
-  (generated by `w3m')"
- 'w3m-euc-japan-decoder
- 'w3m-euc-japan-encoder)
-
-(w3m-make-ccl-coding-system
- 'w3m-iso-latin-1 ?1
- "ISO 2022 based 8-bit encoding for Latin-1 with w3m internal characters.
-  (generated by `w3m')"
- 'w3m-iso-latin-1-decoder
- 'w3m-iso-latin-1-encoder)
-
-(defun w3m-remove-comments ()
-  "Remove HTML comments in the current buffer."
-  (goto-char (point-min))
-  (let (beg)
-    (while (search-forward "<!--" nil t)
-      (setq beg (match-beginning 0))
-      (if (search-forward "-->" nil t)
-	  (delete-region beg (point))))))
-
-(defun w3m-remove-invisible-image-alt ()
-  "Remove alt=\"whitespace\" attributes in img tags.
-Such attributes not only obscure them but also might make images not
-be displayed especially in shimbun articles."
-  (goto-char (point-min))
-  (let ((case-fold-search t)
-	start end)
-    (while (and (re-search-forward "\\(<img\\)[\t\n\f\r ]+" nil t)
-		(progn
-		  (setq start (match-end 1))
-		  (search-forward ">" nil t))
-		(progn
-		  (setq end (match-beginning 0))
-		  (goto-char start)
-		  (re-search-forward "[\t\n\f\r ]+alt=\"[\t\n\f\r ]*\""
-				     end t)))
-      (delete-region (match-beginning 0) (match-end 0)))))
-
-(defun w3m-check-header-tags ()
-  "Process header tags (<LINK>,<BASE>) in the current buffer."
-  (let ((case-fold-search t)
-	tag)
-    (goto-char (point-min))
-    (when (re-search-forward "</head\\(?:[ \t\r\f\n][^>]*\\)?>" nil t)
-      (save-restriction
-	(narrow-to-region (point-min) (point))
-	(goto-char (point-min))
-	(while (re-search-forward "<\\(link\\|base\\)[ \t\r\f\n]+" nil t)
-	  (setq tag (downcase (match-string 1)))
-	  (cond
-	   ((string= tag "link")
-	    (w3m-parse-attributes ((rel :case-ignore) href type)
-	      (when rel
-		(setq rel (split-string rel))
-		(cond
-		 ((member "icon" rel) (setq w3m-icon-data (cons href type)))
-		 ((member "next" rel) (setq w3m-next-url href))
-		 ((or (member "prev" rel) (member "previous" rel))
-		  (setq w3m-previous-url href))
-		 ((member "start" rel) (setq w3m-start-url href))
-		 ((member "contents" rel) (setq w3m-contents-url href))))))
-	   ((string= tag "base")
-	    (w3m-parse-attributes (href)
-	      (when (< 0 (length href))
-		(setq w3m-current-base-url href))))))))))
-
-(defun w3m-check-refresh-attribute ()
-  "Get REFRESH attribute in META tags."
-  (setq w3m-current-refresh nil)
-  (when w3m-use-refresh
-    (let ((case-fold-search t)
-	  (refurl w3m-current-url)
-	  sec)
-      (goto-char (point-min))
-      (catch 'found
-	(while (re-search-forward "<meta[ \t\r\f\n]+" nil t)
-	  (w3m-parse-attributes ((http-equiv :case-ignore) content)
-	    (when (string= http-equiv "refresh")
-	      (cond
-	       ((string-match "\\`[0-9]+\\'" content)
-		(setq sec (match-string-no-properties 0 content)))
-	       ((string-match
-		 "\\([^;]+\\);[ \t\n]*url=[\"']?\\([^\"']+\\)"
-		 content)
-		(setq sec (match-string-no-properties 1 content))
-		(setq refurl (w3m-decode-entities-string
-			      (match-string-no-properties 2 content)))
-		(when (string-match "\\`[\"']\\(.*\\)[\"']\\'" refurl)
-		  (setq refurl (match-string 1 refurl)))))
-	      (when (and sec (string-match "\\`[0-9]+\\'" sec))
-		(when (and (eq w3m-use-refresh 'wait-minimum)
-			   (< (string-to-number sec) w3m-refresh-minimum-interval))
-		  (setq sec (number-to-string w3m-refresh-minimum-interval)))
-		(throw 'found
-		       (setq w3m-current-refresh
-			     (cons (string-to-number sec)
-				   (w3m-expand-url refurl))))))))))))
-
-(defun w3m-remove-meta-charset-tags ()
-  (let ((case-fold-search t))
-    (goto-char (point-min))
-    (catch 'found
-      (when (re-search-forward "<meta[ \t\r\f\n]+" nil t)
-	(let ((start (match-beginning 0)))
-	  (w3m-parse-attributes ((http-equiv :case-ignore)
-				 (content :case-ignore))
-	    (when (and (string= http-equiv "content-type")
-		       content
-		       (string-match ";[ \t\n]*charset=" content))
-	      (delete-region start (point))
-	      (throw 'found nil))))))))
-
-(defun w3m-rendering-extract-title ()
-  "Extract the title from the halfdump and put it into the current buffer."
-  (goto-char (point-min))
-  (or (when (re-search-forward "<title_alt[ \t\n]+title=\"\\([^\"]+\\)\">"
-			       nil t)
-	(prog1 (w3m-decode-entities-string
-		(mapconcat 'identity
-			   (save-match-data (split-string (match-string 1)))
-			   " "))
-	  (delete-region (match-beginning 0) (match-end 0))))
-      (when (and (stringp w3m-current-url)
-		 (string-match "/\\([^/]+\\)/?\\'" w3m-current-url))
-	(match-string 1 w3m-current-url))
-      "<no-title>"))
-
-(defun w3m-set-display-ins-del ()
-  (when (eq w3m-display-ins-del 'auto)
-    (with-temp-buffer
-      (let* ((coding-system-for-read w3m-output-coding-system)
-	     (coding-system-for-write (if (eq 'binary w3m-input-coding-system)
-					  w3m-current-coding-system
-					w3m-input-coding-system))
-	     (default-process-coding-system
-	       (cons coding-system-for-read coding-system-for-write))
-	     (env (copy-sequence w3m-command-environment))
-	     type)
-	(setq w3m-display-ins-del nil)
-	(w3m-process-with-environment (cons '("LANG" . "C")
-					    (delq (assoc "LANG" env) env))
-	  (call-process (or w3m-halfdump-command w3m-command) nil t nil "-o")
-	  (goto-char (point-min))
-	  (when (re-search-forward "display_ins_del=<\\([^>]+\\)>" nil t)
-	    (setq type (match-string 1))
-	    (cond
-	     ((string= type "number")
-	      (setq w3m-display-ins-del 'fontify))
-	     ((string= type "bool")
-	      (setq w3m-display-ins-del 'tag)))))))))
-
-(defun w3m-rendering-half-dump (charset)
-  ;; `charset' is used by `w3m-w3m-expand-arguments' to generate
-  ;; arguments for w3mmee and w3m-m17n from `w3m-halfdump-command-arguments'.
-  (w3m-set-display-ins-del)
-  (let* ((coding-system-for-read w3m-output-coding-system)
-	 (coding-system-for-write (if (eq 'binary w3m-input-coding-system)
-				      w3m-current-coding-system
-				    w3m-input-coding-system))
-	 (default-process-coding-system
-	   (cons coding-system-for-read coding-system-for-write)))
-    (w3m-process-with-environment w3m-command-environment
-      (apply 'call-process-region
-	     (point-min)
-	     (point-max)
-	     (or w3m-halfdump-command w3m-command)
-	     t t nil
-	     (w3m-w3m-expand-arguments
-	      (append w3m-halfdump-command-arguments
-		      w3m-halfdump-command-common-arguments
-		      ;; Image size conscious rendering
-		      (when (member "image" w3m-compile-options)
-			(if (and w3m-treat-image-size
-				 (or (w3m-display-graphic-p)
-				     (and w3m-pixels-per-line
-					  w3m-pixels-per-character)))
-			    (list "-o" "display_image=on"
-				  "-ppl" (number-to-string
-					  (or w3m-pixels-per-line
-					      (w3m-static-if
-						  (featurep 'xemacs)
-						  (font-height
-						   (face-font 'default))
-						(frame-char-height))))
-				  "-ppc" (number-to-string
-					  (or w3m-pixels-per-character
-					      (w3m-static-if
-						  (featurep 'xemacs)
-						  (font-width
-						   (face-font 'default))
-						(frame-char-width)))))
-			  (list "-o" "display_image=off")))))))))
-
-(defun w3m-rendering-buffer (&optional charset)
-  "Do rendering of contents in the currenr buffer as HTML and return title."
-  (w3m-message "Rendering...")
-  (w3m-remove-comments)
-  (w3m-remove-invisible-image-alt)
-  (w3m-check-header-tags)
-  (w3m-check-refresh-attribute)
-  (unless (eq w3m-type 'w3m-m17n)
-    (w3m-remove-meta-charset-tags))
-  (w3m-rendering-half-dump charset)
-  (w3m-message "Rendering...done")
-  (w3m-rendering-extract-title))
-
-(defcustom w3m-confirm-leaving-secure-page t
-  "If non-nil, you'll be asked for confirmation when leaving secure pages.
-This option controls whether the confirmation is made also when
-retrieving data (typically images) in a secure page from non-secure
-pages.  It is STRONGLY recommended to set non-nil value to this option.
-You MUST understand what you want to do completely before
-switching off this option."
-  :group 'w3m
-  :type 'boolean)
-
-(defun w3m-retrieve-and-render (url &optional no-cache charset
-				    post-data referer handler)
-  "Retrieve contents of URL and render them in the current buffer.
-It returns a `w3m-process' object and comes to an end immediately.
-The HANDLER function will be called when rendering is complete.  When
-a new content is retrieved in the buffer, the HANDLER function will be
-called with t as an argument.  Otherwise, it will be called with nil."
-  (unless (and w3m-current-ssl
-	       w3m-confirm-leaving-secure-page
-	       ;; Permit leaving safe pages without confirmation for
-	       ;; several safe commands.  For more detail of
-	       ;; definition of safe commands, see the thread
-	       ;; beginning at [emacs-w3m:09767].
-	       (not
-		(or (memq this-command
-			  '(w3m
-			    w3m-goto-url w3m-redisplay-this-page
-			    w3m-reload-this-page w3m-history
-			    w3m-view-next-page w3m-view-previous-page
-			    w3m-view-header w3m-view-source))
-		    (string-match "\\`\\(?:ht\\|f\\)tps://" url)
-		    (prog1
-			(y-or-n-p "You are leaving secure page.  Continue? ")
-		      (message nil)))))
-    (lexical-let ((url (w3m-url-strip-fragment url))
-		  (charset charset)
-		  (page-buffer (current-buffer))
-		  (arrival-time (current-time))
-		  (silent w3m-message-silent))
-      (w3m-process-do-with-temp-buffer
-	  (type (progn
-		  (w3m-clear-local-variables)
-		  (w3m-retrieve url nil no-cache post-data referer handler)))
-	(let ((w3m-message-silent silent))
-	  (when (buffer-live-p page-buffer)
-	    (setq url (w3m-url-strip-authinfo url))
-	    (if type
-		(if (string= type "X-w3m-error/redirection")
-		    (when (w3m-show-redirection-error-information url page-buffer)
-		      (w3m-message (w3m-message "Cannot retrieve URL: %s"
-						url)))
-		  (let ((modified-time (w3m-last-modified url)))
-		    (w3m-arrived-add url nil modified-time arrival-time)
-		    (unless modified-time
-		      (setf (w3m-arrived-last-modified url) nil))
-		    (let ((real (w3m-real-url url)))
-		      (unless (string= url real)
-			(w3m-arrived-add url nil nil arrival-time)
-			(setf (w3m-arrived-title real)
-			      (w3m-arrived-title url))
-			(setf (w3m-arrived-last-modified real)
-			      (w3m-arrived-last-modified url))
-			(setq url real)))
-		    (prog1 (w3m-create-page url
-					    (or (w3m-arrived-content-type url)
-						type)
-					    (or charset
-						(w3m-arrived-content-charset url)
-						(w3m-content-charset url))
-					    page-buffer)
-		      (w3m-force-window-update-later page-buffer)
-		      (unless (get-buffer-window page-buffer)
-			(w3m-message "The content (%s) has been retrieved in %s"
-				     url (buffer-name page-buffer))))))
-	      (ding)
-	      (when (eq (car w3m-current-forms) t)
-		(setq w3m-current-forms (cdr w3m-current-forms)))
-	      (prog1 (when (and w3m-show-error-information
-				(not (or (w3m-url-local-p url)
-					 (string-match "\\`about:" url))))
-		       (w3m-show-error-information url charset page-buffer))
-		(w3m-message "Cannot retrieve URL: %s%s"
-			     url
-			     (if w3m-process-exit-status
-				 (format " (exit status: %s)"
-					 w3m-process-exit-status)
-			       ""))))))))))
-
-(defun w3m-show-error-information (url charset page-buffer)
-  "Create and prepare the error information."
-  (or (when (w3m-cache-request-contents url)
-	(w3m-decode-encoded-contents (w3m-content-encoding url))
-	t) ; Even if decoding is failed, use the cached contents.
-      (let ((case-fold-search t)
-	    (header (w3m-cache-request-header url))
-	    (errmsg (format "\n<br><h1>Cannot retrieve URL: %s%s</h1>"
-			    (format "<a href=\"%s\">%s</a>" url url)
-			    (when w3m-process-exit-status
-			      (format " (exit status: %s)"
-				      w3m-process-exit-status)))))
-	(if (or (null header)
-		(string-match "\\`w3m: Can't load " header))
-	    (progn
-	      (erase-buffer)
-	      (setq charset "us-ascii")
-	      (insert
-	       errmsg
-	       (format "<br><br><b>%s</b> could not be found; "
-		       (w3m-get-server-hostname url))
-	       (if (string-match "\\`news:" url)
-		   "check the name of the <b>URL</b>\
- and the value of the <b>NNTPSERVER</b> environment variable\
- (that should be the address of the <b>NNTP</b> server)."
-		 "check the name of the <b>URL</b>.")))
-	  (goto-char (point-min))
-	  (when (or (re-search-forward "<body>" nil t)
-		    (re-search-forward "<html>" nil t))
-	    (goto-char (match-end 0)))
-	  (insert errmsg "<br><br><hr><br><br>")
-	  (when (or (re-search-forward "</body>" nil t)
-		    (re-search-forward "</html>" nil 'max))
-	    (goto-char (match-end 0)))
-	  (insert "\n<br><br><hr><br><br><h2>Header information</h2><br>\n<pre>"
-		  header "</pre>\n"))))
-  (w3m-create-page url "text/html" charset page-buffer)
-  nil)
-
-(defun w3m-show-redirection-error-information (url page-buffer)
-  (erase-buffer)
-  (insert
-   (format "\n<br><h1>Cannot retrieve URL: %s</h1><br><br>%s"
-	   (format "<a href=\"%s\">%s</a>" url url)
-	   "The number of redirections has exceeded a limit.  This may have<br>\n
-happened due to the server side miss-configuration.  Otherwise,<br>\n
-try increasing the limit, the value of <b>`w3m-follow-redirection'</b>.<br>\n"))
-  (w3m-create-page url "text/html" "us-ascii" page-buffer))
-
-(defun w3m-prepare-content (url type charset)
-  "Prepare contents in the current buffer according to TYPE.
-URL is assumed to be a place where the contents come from.  CHARSET is
-passed to the filter function  corresponding to TYPE if it is
-specified in the `w3m-content-type-alist' variable."
-  (let ((filter (nth 3 (assoc type w3m-content-type-alist))))
-    (cond
-     ; Filter function is specified.
-     ((functionp filter) (funcall filter url type charset))
-     ; Equivalent type is specified.
-     ((stringp filter) filter)
-     ; No filter is specified.
-     ((not filter) type)
-     ; Failed.
-     (t ""))))
-
-(defun w3m-detect-xml-type (url type charset)
-  "Check if the type of xml contents of URL is xhtml+xml.
-If so return \"text/html\", otherwise \"text/plain\"."
-  (with-temp-buffer
-    (w3m-retrieve url)
-    (w3m-decode-buffer url charset type)
-    (goto-char (point-min))
-    (setq case-fold-search t)
-    (if (re-search-forward
-	 "<[\t\n ]*html\\(?:\\(?:[\t\n ]+[^>]+\\)?>\\|[\t\n ]*>\\)"
-	 nil t)
-	"text/html"
-      "text/plain")))
-
-(defun w3m-create-text-page (url type charset page-buffer)
-  (w3m-safe-decode-buffer url charset type)
-  (setq w3m-current-url (if (w3m-arrived-p url)
-			    (w3m-real-url url)
-			  url)
-	w3m-current-title
-	(if (string= "text/html" type)
-	    (let ((title (w3m-rendering-buffer charset)))
-	      (setf (w3m-arrived-title url) title)
-	      title)
-	  (or (when (string-match "\\`about://\\(?:source\\|header\\)/" url)
-		(w3m-arrived-title (substring url (match-end 0))))
-	      (file-name-nondirectory (if (string-match "/\\'" url)
-					  (directory-file-name url)
-					url)))))
-  (let ((result-buffer (current-buffer)))
-    (with-current-buffer page-buffer
-      (let ((inhibit-read-only t))
-	(widen)
-	(delete-region (point-min) (point-max))
-	(insert-buffer-substring result-buffer)
-	(goto-char (point-min))
-	(w3m-copy-local-variables result-buffer)
-	(set-buffer-file-coding-system w3m-current-coding-system)
-	(when (string= "text/html" type) (w3m-fontify))
-	'text-page))))
-
-(defsubst w3m-image-page-displayed-p ()
-  (and (fboundp 'image-mode-setup-winprops)
-       w3m-current-url
-       (string-match "\\`image/" (w3m-content-type w3m-current-url))
-       (eq (get-text-property (point-min) 'w3m-image-status) 'on)))
-
-(defun w3m-create-image-page (url type charset page-buffer)
-  (when (w3m-image-type-available-p (w3m-image-type type))
-    (with-current-buffer page-buffer
-      (let ((inhibit-read-only t))
-	(w3m-clear-local-variables)
-	(setq w3m-current-url (w3m-real-url url)
-	      w3m-current-title (file-name-nondirectory url))
-	(widen)
-	(delete-region (point-min) (point-max))
-	(insert w3m-current-title)
-	(w3m-add-face-property (point-min) (point-max) 'w3m-image)
-	(w3m-add-text-properties (point-min) (point-max)
-				 (list 'w3m-image url
-				       'mouse-face 'highlight))
-	(when (fboundp 'image-mode-setup-winprops)
-	  (image-mode-setup-winprops))
-	'image-page))))
-
-(defun w3m-create-page (url type charset page-buffer)
-  ;; Select a content type.
-  (unless (and (stringp type)
-	       (assoc type w3m-content-type-alist))
-    (save-window-excursion
-      (pop-to-buffer (current-buffer))
-      (delete-other-windows)
-      (ding)
-      (setq type
-	    (completing-read
-	     (format "Input %s's content type (default Download): "
-		     (file-name-nondirectory url))
-	     w3m-content-type-alist nil t))
-      (setf (w3m-arrived-content-type url) type)))
-  (setq w3m-current-coding-system nil)	; Reset decoding status of this buffer.
-  (setq type (w3m-prepare-content url type charset))
-  (w3m-safe-decode-buffer url charset type)
-  (setq charset (or charset w3m-current-content-charset))
-  (when w3m-use-filter (w3m-filter url))
-  (w3m-relationship-estimate url)
-  ;; Create pages.
-  (cond
-   ((string-match "\\`text/" type)
-    (w3m-create-text-page url type charset page-buffer))
-   ((string-match "\\`image/" type)
-    (w3m-create-image-page url type charset page-buffer))
-   ((member type w3m-doc-view-content-types)
-    (w3m-doc-view url))
-   (t
-    (with-current-buffer page-buffer
-      (w3m-external-view url)
-      'external-view))))
-
-(defun w3m-relationship-estimate (url)
-  "Estimate relationships between a page and others."
-  (save-excursion
-    (save-match-data
-      (catch 'estimated
-	(dolist (rule w3m-relationship-estimate-rules)
-	  (when (apply (car rule) url (cdr rule))
-	    (throw 'estimated t)))))))
-
-(defun w3m-relationship-simple-estimate (url regexp &optional next previous
-					     start contents)
-  "Search relationships with given patterns
-when the URL of the retrieved page matches the REGEXP."
-  (when (string-match regexp url)
-    (w3m-relationship-search-patterns url next previous start contents)))
-
-(defun w3m-relationship-magicpoint-estimate (url)
-  "Search relationships for pages generated by MagicPoint."
-  (goto-char (point-max))
-  (when (search-backward
-	 "Generated by <A HREF=\"http://www.mew.org/mgp/\">MagicPoint</A>"
-	 nil t)
-    (goto-char (point-min))
-    (w3m-relationship-search-patterns
-     url
-     (eval-when-compile
-       (concat "<A HREF=" w3m-html-string-regexp ">\\[next&gt;\\]</A>"))
-     (eval-when-compile
-       (concat "<A HREF=" w3m-html-string-regexp ">\\[&lt;prev\\]</A>"))
-     (eval-when-compile
-       (concat "<A HREF=" w3m-html-string-regexp ">\\[&lt;&lt;start\\]</A>"))
-     (eval-when-compile
-       (concat "<A HREF=" w3m-html-string-regexp ">\\[index\\]</A>")))))
-
-(defun w3m-relationship-oddmuse-estimate (url)
-  (when (string-match "/wiki\\?search=.*" url)
-    (goto-char (point-min))
-    (and (re-search-forward "href=\"\\([^\"]+\\)\">Previous</a>" nil t)
-	 (setq w3m-previous-url (match-string 1)))
-    (and (re-search-forward "href=\"\\([^\"]+\\)\">Next</a>" nil t)
-	 (setq w3m-next-url (match-string 1)))))
-
-(defun w3m-relationship-slashdot-estimate (url)
-  (goto-char (point-min))
-  (when (and (string-match
-	      "slashdot\\.org/\\(article\\|comments\\)\\.pl\\?"
-	      url)
-	     (search-forward "<div class=\"linkCommentPage\">" nil t))
-    (let ((min (point)) (max (save-excursion (search-forward "</div>" nil t))))
-      ;; move to the position of the current page indicator and then search
-      ;; for the next and previous link within the current <div>
-      (when (and max (re-search-forward "<b>\\(([0-9]+)\\)</b>" max t))
-	(let ((re (concat "<a href=" w3m-html-string-regexp ">")))
-	  (when (save-excursion (re-search-backward re min t))
-	    (setq w3m-previous-url
-		  (w3m-expand-url (w3m-decode-anchor-string
-				   (or (match-string 2)
-				       (match-string 3)
-				       (match-string 1))))))
-	  (when (re-search-forward re max t)
-	    (setq w3m-next-url
-		  (w3m-expand-url (w3m-decode-anchor-string
-				   (or (match-string 2)
-				       (match-string 3)
-				       (match-string 1)))))))))))
-
-(defun w3m-relationship-alc-estimate (url)
-  ;; use filter
-  (when (string-match "\\`http://eow\\.alc\\.co\\.jp/[^/]+/UTF-8/" url)
-    (when (re-search-forward
-	   (concat "<a href=\\\"http://eow\\.alc\\.co\\.jp/[^/]+/UTF-8/"
-		   "\\(\\?pg=[0-9]+\\)\\\">$BA0$X(B</a>")
-	   nil t)
-      (setq w3m-previous-url
-	    (w3m-expand-url (match-string 1) url)))
-    (when (re-search-forward
-	   (concat "<a href=\\\"http://eow\\.alc\\.co\\.jp/[^/]+/UTF-8/"
-		   "\\(\\?pg=[0-9]+\\)\\\">$B<!$X(B</a>")
-	   nil t)
-      (setq w3m-next-url
-	    (w3m-expand-url (match-string 1) url)))
-    (unless (or w3m-previous-url w3m-next-url)
-      ;; no use filter
-      (goto-char (point-min))
-      (when (re-search-forward
-	     "<a href='javascript:goPage(\"\\([0-9+]\\)\")'>$BA0$X(B</a>"
-	     nil t)
-	(setq w3m-previous-url
-	      (w3m-expand-url (format "?pg=%s" (match-string 1)) url)))
-      (when (re-search-forward
-	     "<a href='javascript:goPage(\"\\([0-9+]\\)\")'>$B<!$X(B</a>"
-	     nil t)
-	(setq w3m-next-url
-	      (w3m-expand-url (format "?pg=%s" (match-string 1)) url))))))
-
-(defun w3m-relationship-search-patterns (url next previous
-					     &optional start contents)
-  "Search relationships with given patterns."
-  (goto-char (point-min))
-  (and next
-       (re-search-forward next nil t)
-       (setq w3m-next-url
-	     (w3m-expand-url (w3m-decode-anchor-string (or (match-string 2)
-							   (match-string 3)
-							   (match-string 1)))
-			     url))
-       (goto-char (point-min)))
-  (and previous
-       (re-search-forward previous nil t)
-       (setq w3m-previous-url
-	     (w3m-expand-url (w3m-decode-anchor-string (or (match-string 2)
-							   (match-string 3)
-							   (match-string 1)))
-			     url))
-       (goto-char (point-min)))
-  (and start
-       (re-search-forward start nil t)
-       (setq w3m-start-url
-	     (w3m-expand-url (w3m-decode-anchor-string (or (match-string 2)
-							   (match-string 3)
-							   (match-string 1)))
-			     url))
-       (goto-char (point-min)))
-  (and contents
-       (re-search-forward contents nil t)
-       (setq w3m-contents-url
-	     (w3m-expand-url (w3m-decode-anchor-string (or (match-string 2)
-							   (match-string 3)
-							   (match-string 1)))
-			     url))))
-
-(defun w3m-search-name-anchor (name &optional quiet no-record)
-  (interactive "sName: ")
-  (let ((pos (point-min))
-	(cur-pos (point))
-	found)
-    (catch 'found
-      (while (setq pos (next-single-property-change pos 'w3m-name-anchor))
-	(when (member name (get-text-property pos 'w3m-name-anchor))
-	  (goto-char pos)
-	  (when (eolp) (forward-line))
-	  (w3m-horizontal-on-screen)
-	  (throw 'found (setq found t))))
-      (setq pos (point-min))
-      (while (setq pos (next-single-property-change pos 'w3m-name-anchor2))
-	(when (member name (get-text-property pos 'w3m-name-anchor2))
-	  (goto-char pos)
-	  (when (eolp) (forward-line))
-	  (w3m-horizontal-on-screen)
-	  (throw 'found (setq found t))))
-      (unless quiet
-	(message "No such anchor: %s" name)))
-
-    (when (and found
-	       (not no-record)
-	       (/= (point) cur-pos))
-	(setq w3m-name-anchor-from-hist
-	      (append (list 1 nil (point) cur-pos)
-		      (and (integerp (car w3m-name-anchor-from-hist))
-			   (nthcdr (1+ (car w3m-name-anchor-from-hist))
-				   w3m-name-anchor-from-hist)))))
-    (when found
-      (w3m-recenter))
-    found))
-
-(defun w3m-parent-page-available-p ()
-  (if (null w3m-current-url)
-      nil
-    (save-match-data
-      (string-match "\\`[a-z]+://?[^/]+/." w3m-current-url))))
-
-(defun w3m-view-parent-page (&optional count)
-  "Attempt to move to the parent directory of the page currently displayed.
-For instance, it will let you visit \"http://foo/bar/\" if you are currently
-viewing \"http://foo/bar/baz\".
-If COUNT is a integer, you will visit the parent directory to step up the COUNT.
-If COUNT is zero, you will visit the top of this site."
-  (interactive "p")
-  (unless (integerp count)
-    (setq count 1))
-  (setq count (abs count))
-  (cond
-   ((and w3m-current-url
-	 (eq count 0)
-	 (string-match "\\`[a-z]+:///?[^/]+/" w3m-current-url))
-    (w3m-goto-url (match-string 0 w3m-current-url)))
-   (w3m-start-url (w3m-goto-url w3m-start-url))
-   (w3m-contents-url (w3m-goto-url w3m-contents-url))
-   (w3m-current-url
-    (let ((parent-url w3m-current-url))
-      (catch 'loop
-	(while (not (zerop count))
-	  (setq count (1- count))
-	  ;; Check whether http://foo/bar/ or http://foo/bar
-	  (if (string-match "/$" parent-url)
-	      (if (string-match "\\(.*\\)/[^/]+/$" parent-url)
-		  ;; http://foo/bar/ -> http://foo/
-		  (setq parent-url (concat (match-string 1 parent-url) "/")))
-	    (if (string-match "\\(.*\\)/.+$" parent-url)
-		;; http://foo/bar -> http://foo/
-		(setq parent-url (concat (match-string 1 parent-url) "/"))))
-	  ;; Ignore "http:/"
-	  (cond
-	   ((string-match "\\`[a-z]+:///?[^/]+/\\'" parent-url)
-	    (throw 'loop t))
-	   ((and parent-url
-		 (string-match "\\`[a-z]+:/+\\'" parent-url))
-	    (setq parent-url nil)
-	    (throw 'loop nil)))))
-      (if parent-url
-	  (w3m-goto-url parent-url)
-	(error "No parent page for: %s" w3m-current-url))))
-   (t (error "w3m-current-url is not set"))))
-
-(defun w3m-view-previous-page (&optional count)
-  "Move back COUNT pages in the history.
-If COUNT is a positive integer, move backward COUNT times in the
-history.  If COUNT is a negative integer, moving forward is performed.
-COUNT is treated as 1 by default if it is omitted."
-  (interactive "p")
-  (unless w3m-current-url
-    ;; This page may have not been registered in the history since an
-    ;; accident has probably occurred, so we should skip the page.
-    (if (integerp count)
-	(when (> count 0)
-	  (decf count))
-      (setq count 0)))
-  (let ((index (car w3m-name-anchor-from-hist))
-	pos)
-    (if (and (integerp count)
-	     (integerp index)
-	     (< 0 (setq index (+ index count)))
-	     (setq pos (nth index w3m-name-anchor-from-hist)))
-	(progn
-	  (when (and (= (point) pos)
-		     (nth (1+ index) w3m-name-anchor-from-hist))
-	    (setq index (1+ index)))
-	  (goto-char (nth index w3m-name-anchor-from-hist))
-	  (setcar w3m-name-anchor-from-hist index)
-	  ;; Restore last position.
-	  (w3m-history-restore-position))
-      (let ((hist ;; Cons of a new history element and position pointers.
-	     (if (integerp count)
-		 (w3m-history-backward count)
-	       (w3m-history-backward)))
-	    ;; Inhibit sprouting of a new history.
-	    (w3m-history-reuse-history-elements t)
-	    (w3m-use-refresh 'wait-minimum))
-	(if hist
-	    (let ((w3m-prefer-cache t))
-	      ;; Save last position.
-	      (w3m-history-store-position)
-	      (w3m-goto-url (caar hist) nil nil
-			    (w3m-history-plist-get :post-data)
-			    (w3m-history-plist-get :referer)
-			    nil
-			    (w3m-history-element (caddr hist) t))
-	      ;; Set the position pointers in the history.
-	      (setcar w3m-history (cdr hist))
-	      ;; Restore last position.
-	      (w3m-history-restore-position))
-	  (message "There's no more history"))))))
-
-(defun w3m-view-next-page (&optional count)
-  "Move forward COUNT pages in history.
-If COUNT is a positive integer, move forward COUNT times in the
-history.  If COUNT is a negative integer, moving backward is performed.
-COUNT is treated as 1 by default if it is omitted."
-  (interactive "p")
-  (w3m-view-previous-page (if (integerp count) (- count) -1)))
-
-(defun w3m-expand-path-name (file base)
-  (let ((input (if (eq (elt file 0) ?/)
-		   file
-		 (concat base file)))
-	(output ""))
-    (save-match-data
-      (while (string-match "^\\(?:\\.\\.?/\\)+" input)
-	(setq input (substring input (match-end 0))))
-      (while (not (zerop (length input)))
-	(cond
-	 ((string-match "^/\\.\\(?:/\\|$\\)" input)
-	  (setq input (concat "/" (substring input (match-end 0)))))
-	 ((string-match "^/\\.\\.\\(?:/\\|$\\)" input)
-	  (setq input (concat "/" (substring input (match-end 0))))
-	  (when (string-match "/?[^/]+$" output)
-	    (setq output (substring output 0 (match-beginning 0)))))
-	 ((string-match "^\\.\\.?$" input)
-	  (setq input ""))
-	 (t
-	  (let ((end (and (string-match "^/[^/]*" input)
-			  (match-end 0))))
-	    (setq output
-		  (concat output (substring input 0 end)))
-	    (setq input
-		  (substring input end))))))
-      output)))
-
-(defconst w3m-url-hierarchical-schemes
-  '("http" "https" "ftp" "ftps" "file")
-  "List of schemes which may have hierarchical parts.
-This list is refered to by `w3m-expand-url' to keep backward
-compatibility which is described in Section 5.2 of RFC 2396.")
-
-(defun w3m-expand-url (url &optional base)
-  "Convert URL to the absolute address, and canonicalize it."
-  (save-match-data
-    (if base
-	(if (progn
-	      (w3m-string-match-url-components base)
-	      (match-beginning 1))
-	    (and (not (match-beginning 3))
-		 (member (match-string 2 base) w3m-url-hierarchical-schemes)
-		 (setq base (concat
-			     (substring base 0 (match-end 1))
-			     "//"
-			     (substring base (match-beginning 5)))))
-	  (error "BASE must have a scheme part: %s" base))
-      (setq base (or w3m-current-base-url
-		     w3m-current-url
-		     w3m-url-fallback-base)))
-    (w3m-string-match-url-components url)
-    ;; Remove an empty fragment part.
-    (when (and (match-beginning 8)
-	       (= (match-beginning 9) (length url)))
-      (setq url (substring url 0 (match-beginning 8)))
-      (w3m-string-match-url-components url))
-    ;; Remove an empty query part.
-    (when (and (match-beginning 6)
-	       (= (match-beginning 7) (or (match-beginning 8)
-					  (length url))))
-      (setq url (concat (substring url 0 (match-beginning 6))
-			(if (match-beginning 8)
-			    (substring url (match-beginning 8))
-			  ""))
-	    base (progn (w3m-string-match-url-components base)
-			(substring base 0 (match-beginning 6))))
-      (w3m-string-match-url-components url))
-    (cond
-     ((match-beginning 1)
-      ;; URL has a scheme part. => URL may have an absolute spec.
-      (if (or (match-beginning 3)
-	      (and (< (match-beginning 5) (length url))
-		   (eq ?/ (aref url (match-beginning 5)))))
-	  ;; URL has a net-location part or an absolute hierarchical
-	  ;; part. => URL has an absolute spec.
-	  url
-	(let ((scheme (match-string 2 url)))
-	  (if (and (member scheme w3m-url-hierarchical-schemes)
-		   (progn
-		     (w3m-string-match-url-components base)
-		     (equal scheme (match-string 2 base))))
-	      (w3m-expand-url (substring url (match-end 1)) base)
-	    url))))
-     ((match-beginning 3)
-      ;; URL has a net-location part. => The hierarchical part of URL
-      ;; has an absolute spec.
-      (w3m-string-match-url-components base)
-      (concat (substring base 0 (match-end 1)) url))
-     ((> (match-end 5) (match-beginning 5))
-      (let ((path-end (match-end 5))
-	    expanded-path
-	    ;; See the following thread about a problem related to
-	    ;; the use of file-name-* functions for url string:
-	    ;; http://news.gmane.org/group/gmane.emacs.w3m/thread=4210
-	    file-name-handler-alist)
-	(w3m-string-match-url-components base)
-	(setq expanded-path
-	      (w3m-expand-path-name
-	       (substring url 0 path-end)
-	       (or (file-name-directory (match-string 5 base))
-		   "/")))
-	(concat
-	 (substring base 0 (match-beginning 5))
-	 (if (member (match-string 2 base) w3m-url-hierarchical-schemes)
-	     expanded-path
-	   (substring url 0 path-end))
-	 (substring url path-end))))
-     ((match-beginning 6)
-      ;; URL has a query part.
-      (w3m-string-match-url-components base)
-      (concat (substring base 0 (match-end 5)) url))
-     (t
-      ;; URL has only a fragment part.
-      (w3m-string-match-url-components base)
-      (concat (substring base 0 (match-beginning 8))
-	      url)))))
-
-(defun w3m-display-progress-message (url)
-  "Show \"Reading URL...\" message in the middle of a buffer."
-  (insert (make-string (max 0 (/ (1- (window-height)) 2)) ?\n)
-	  "Reading " (w3m-url-readable-string (w3m-url-strip-authinfo url))
-	  "...")
-  (beginning-of-line)
-  (let ((fill-column (window-width)))
-    (center-region (point) (point-max)))
-  (goto-char (point-min))
-  (put-text-property (point) (point-max) 'w3m-progress-message t)
-  (sit-for 0))
-
-(defun w3m-view-this-url-1 (url reload new-session)
-  (lexical-let ((cur w3m-current-url)
-		(url url)
-		(obuffer (current-buffer))
-		(wconfig (current-window-configuration))
-		pos buffer)
-    (if new-session
-	(let ((empty
-	       ;; If a new url has the #name portion, we simply copy
-	       ;; the buffer's contents to the new session, otherwise
-	       ;; creating an empty buffer.
-	       (not (and (progn
-			   (w3m-string-match-url-components url)
-			   (match-beginning 8))
-			 (string-equal w3m-current-url
-				       (substring url
-						  0 (match-beginning 8)))))))
-	  (setq pos (point-marker)
-		buffer (w3m-copy-buffer
-			nil nil nil empty w3m-new-session-in-background))
-	  (when w3m-new-session-in-background
-	    (set-buffer buffer))
-	  (when empty
-	    (w3m-display-progress-message url)))
-      (setq buffer (current-buffer)))
-    (let (handler)
-      (w3m-process-do
-	  (success (w3m-goto-url url reload nil nil w3m-current-url handler))
-	(set-window-hscroll (selected-window) 0)
-	;; Delete the newly created buffer if it's been made empty.
-	(when (and pos
-		   (buffer-name buffer))
-	  (w3m-delete-buffer-if-empty buffer))
-	(when pos ;; the new session is created.
-	  ;; FIXME: what we should actually do is to modify the `w3m-goto-url'
-	  ;; function so that it may return a proper value, and checking it.
-	  (when (and (marker-buffer pos) (buffer-name (marker-buffer pos)))
-	    (with-current-buffer (marker-buffer pos)
-	      (save-excursion
-		(goto-char pos)
-		(w3m-refontify-anchor)))))
-	;; We need to restore the window configuration to the former
-	;; one if `w3m-new-session-in-background' is non-nil unless
-	;; the buffer's major mode has changed from the w3m-mode to
-	;; another by visiting the new url (possibly a local file,
-	;; a mailto url, doc-view-mode, etc.).
-	(if (and w3m-new-session-in-background
-		 (not (eq obuffer (current-buffer)))
-		 (or (buffer-name buffer)
-		     ;; Clear "...has been retrieved in..." message.
-		     (progn (w3m-message "") nil))
-		 (or (eq major-mode 'w3m-mode)
-		     (not (eq (with-current-buffer buffer major-mode)
-			      'w3m-mode))))
-	    (set-window-configuration wconfig)
-	  (unless (eq cur w3m-current-url)
-	    (w3m-recenter)))))))
-
-(defun w3m-view-this-url (&optional arg new-session)
-  "Display the page pointed to by the link under point.
-If ARG is the number 2 or the list of the number 16 (you may produce
-this by typing `C-u' twice) or NEW-SESSION is non-nil and the link is
-an anchor, this function makes a copy of the current session in
-advance.  Otherwise, if ARG is non-nil, it forces to reload the url at
-point."
-  (interactive (if (member current-prefix-arg '(2 (16)))
-		   (list nil t)
-		 (list current-prefix-arg nil)))
-  ;; Store the current position in the history structure.
-  (w3m-history-store-position)
-  (let ((w3m-prefer-cache
-	 (or w3m-prefer-cache
-	     (and (stringp w3m-current-url)
-		  (string-match "\\`about://\\(?:db-\\)?history/"
-				w3m-current-url))))
-	act url)
-    (cond
-     ((setq act (w3m-action))
-      (let ((w3m-form-new-session new-session)
-	    (w3m-form-download nil))
-	(eval act)))
-     ((setq url (w3m-url-valid (w3m-anchor)))
-      (w3m-view-this-url-1 url arg new-session))
-     ((w3m-url-valid (w3m-image))
-      (if (w3m-display-graphic-p)
-	  (w3m-toggle-inline-image)
-	(w3m-view-image)))
-     ((setq url (w3m-active-region-or-url-at-point t))
-      (unless (eq 'quit (setq url (w3m-input-url nil url 'quit nil
-						 'feeling-lucky)))
-	(w3m-view-this-url-1 url arg new-session)))
-     (t (w3m-message "No URL at point")))))
-
-(eval-and-compile
-  (autoload 'mouse-set-point "mouse"))
-
-(defun w3m-mouse-view-this-url (event &optional arg)
-  "Follow the link under the mouse pointer."
-  (interactive "e\nP")
-  (mouse-set-point event)
-  (w3m-view-this-url arg))
-
-(defun w3m-open-all-links-in-new-session (start end &optional arg)
-  "Open all http links between START and END as new sessions.
-If the page looks like Google's search result and the START point is
-the beginning of a line, only the links displayed in the beginning of
-lines are picked up.  If ARG is non-nil, it forces to reload all links.
-If Transient Mark mode, deactivate the mark."
-  (interactive "r\nP")
-  (when (w3m-region-active-p)
-    (w3m-deactivate-region))
-  (let ((buffer (current-buffer))
-	(prev start)
-	(url (w3m-url-valid (w3m-anchor start)))
-	urls all)
-    (when url
-      (setq urls (list url)))
-    (save-excursion
-      (goto-char start)
-      (setq all (not (and (bolp)
-			  w3m-current-url
-			  (string-match "\\`http://\\(?:[^/]+\\.\\)*google\\."
-					w3m-current-url))))
-      (while (progn
-	       (w3m-next-anchor)
-	       (and (> (point) prev)
-		    (< (point) end)))
-	(setq prev (point))
-	(when (and (setq url (w3m-url-valid (w3m-anchor)))
-		   (string-match "\\`https?:" url)
-		   (or all
-		       (bolp)))
-	  (push url urls))))
-    (setq urls (nreverse urls))
-    (while urls
-      (setq url (car urls)
-	    urls (cdr urls))
-      (set-buffer buffer)
-      (w3m-view-this-url-1 url arg t))))
-
-(defun w3m-view-this-url-new-session ()
-  "Display the page of the link under point in a new session.
-If the region is active, use the `w3m-open-all-links-in-new-session'
-command instead."
-  (interactive)
-  (if (w3m-region-active-p)
-      (call-interactively 'w3m-open-all-links-in-new-session)
-    (w3m-view-this-url nil t)))
-
-(defun w3m-mouse-view-this-url-new-session (event)
-  "Follow the link under the mouse pointer in a new session."
-  (interactive "e")
-  (mouse-set-point event)
-  (w3m-view-this-url nil t))
-
-(defun w3m-submit-form (&optional new-session)
-  "Submit the form at point."
-  (interactive "P")
-  (let ((submit (w3m-submit)))
-    (if (and submit
-	     w3m-current-url
-	     (w3m-url-valid w3m-current-url)
-	     (if w3m-submit-form-safety-check
-		 (prog1 (y-or-n-p "Submit? ") (message nil))
-	       t))
-	(let ((w3m-form-new-session new-session)
-	      (w3m-form-download nil))
-	  (eval submit))
-      (w3m-message "Can't submit form at this point"))))
-
-(defun w3m-external-view (url &optional no-cache handler)
-  (when (w3m-url-valid url)
-    (lexical-let ((url url)
-		  (no-cache no-cache))
-      (w3m-process-do
-	  (type (w3m-content-type url no-cache handler))
-	(when type
-	  (lexical-let ((method
-			 (or (nth 2 (assoc type w3m-content-type-alist))
-			     (nth 2 (assoc (w3m-prepare-content url type nil)
-					   w3m-content-type-alist)))))
-	    (cond
-	     ((not method)
-	      (if (w3m-url-local-p url)
-		  (error "\
-No method to view `%s' is registered. Use `w3m-edit-this-url'"
-			 (file-name-nondirectory (w3m-url-to-file-name url)))
-		(w3m-download url nil no-cache handler)))
-	     ((functionp method)
-	      (funcall method url))
-	     ((consp method)
-	      (lexical-let
-		  ((command (w3m-which-command (car method)))
-		   (arguments (cdr method))
-		   (file (make-temp-name
-			  (expand-file-name "w3mel" w3m-profile-directory)))
-		   suffix)
-		(setq suffix (file-name-nondirectory url))
-		(when (string-match "\\.[a-zA-Z0-9]+$" suffix)
-		  (setq suffix (match-string 0 suffix))
-		  (when (< (length suffix) 5)
-		    (setq file (concat file suffix))))
-		(cond
-		 ((and command (memq 'file arguments))
-		  (let ((w3m-current-buffer (current-buffer)))
-		    (w3m-process-do
-			(success (w3m-download url file no-cache handler))
-		      (when success
-			(w3m-external-view-file command file url arguments)))))
-		 (command
-		  (w3m-external-view-file command nil url arguments))
-		 (t
-		  (w3m-download url nil no-cache handler))))))))))))
-
-(defun w3m-external-view-file (command file url arguments)
-  ;; The 3rd argument `url' is necessary to handle the constant `url'
-  ;; included in the 4th argument `arguments' which is provided by
-  ;; `w3m-content-type-alist'.
-  (lexical-let ((file file))
-    (let (proc)
-      (unwind-protect
-	  (with-current-buffer
-	      (generate-new-buffer " *w3m-external-view*")
-	    (setq proc
-		  (apply 'start-process
-			 "w3m-external-view"
-			 (current-buffer)
-			 command
-			 (mapcar (function eval) arguments)))
-	    (w3m-message "Start %s..." (file-name-nondirectory command))
-	    (set-process-sentinel
-	     proc
-	     (lambda (proc event)
-	       (let ((buffer (process-buffer proc)))
-		 (when (and (string-match "^\\(?:finished\\|exited\\)" event)
-			    (buffer-name buffer))
-		   (with-current-buffer buffer
-		     (and (stringp file)
-			  (file-exists-p file)
-			  (delete-file file)))
-		   (kill-buffer buffer))))))
-	(and (stringp file)
-	     (file-exists-p file)
-	     (unless (and (processp proc)
-			  (memq (process-status proc) '(run stop)))
-	       (delete-file file)))))))
-
-(defun w3m-view-image ()
-  "Display the image under point in the external viewer.
-The viewer is defined in `w3m-content-type-alist' for every type of an
-image."
-  (interactive)
-  (let ((url (w3m-url-valid (w3m-image))))
-    (if url
-	(w3m-external-view url)
-      (w3m-message "No image at point"))))
-
-(defun w3m-save-image ()
-  "Save the image under point to a file.
-The default name will be the original name of the image."
-  (interactive)
-  (let ((url (w3m-url-valid (w3m-image))))
-    (if url
-	(w3m-download url)
-      (w3m-message "No image at point"))))
-
-(defun w3m-external-view-this-url ()
-  "Launch the external browser and display the link an point."
-  (interactive)
-  (let ((url (w3m-url-valid (or (w3m-anchor) (w3m-image)))))
-    (if url
-	(w3m-external-view url)
-      (w3m-message "No URL at point"))))
-
-(defun w3m-external-view-current-url ()
-  "Launch the external browser and display the current URL."
-  (interactive)
-  (if w3m-current-url
-      (w3m-external-view w3m-current-url)
-    (w3m-message "No URL at this page")))
-
-(defun w3m-view-url-with-external-browser (&optional url)
-  "Launch the external browser and display the same web page.
-If the cursor points to a link, it visits the url of the link instead
-of the url currently displayed.  The browser is defined in
-`w3m-content-type-alist' for every type of a url."
-  (interactive)
-  (unless url
-    (setq url (or url
-		  (w3m-anchor)
-		  (unless w3m-display-inline-images
-		    (w3m-image))
-		  (when (y-or-n-p (format "Browse <%s> ? " w3m-current-url))
-		    w3m-current-url))))
-  (if (w3m-url-valid url)
-      (progn
-	(message "Browsing <%s>..." url)
-	(w3m-external-view url))
-    (w3m-message "No URL at point")))
-
-(defun w3m-download-this-url ()
-  "Download the file or the page pointed to by the link under point."
-  (interactive)
-  (let ((url (or (w3m-anchor) (w3m-image))) act)
-    (cond
-     ((w3m-url-valid url)
-      (lexical-let ((pos (point-marker))
-		    (curl w3m-current-url))
-	(w3m-process-with-null-handler
-	  (w3m-process-do
-	      (success (w3m-download url nil nil handler))
-	    (and success
-		 (buffer-name (marker-buffer pos))
-		 (with-current-buffer (marker-buffer pos)
-		   (when (equal curl w3m-current-url)
-		     (goto-char pos)
-		     (w3m-refontify-anchor))))))))
-     ((setq act (w3m-action))
-      (let ((w3m-form-download t))
-	(eval act)))
-     (t
-      (w3m-message "No URL at point")))))
-
-(defun w3m-download-this-image ()
-  "Download the image under point."
-  (interactive)
-  (let ((url (w3m-image)) act)
-    (cond
-     ((w3m-url-valid url)
-      (lexical-let ((pos (point-marker))
-		    (curl w3m-current-url))
-	(w3m-process-with-null-handler
-	  (w3m-process-do
-	      (success (w3m-download url nil nil handler))
-	    (and success
-		 (buffer-name (marker-buffer pos))
-		 (with-current-buffer (marker-buffer pos)
-		   (when (equal curl w3m-current-url)
-		     (goto-char pos)
-		     (w3m-refontify-anchor))))))))
-     ((setq act (w3m-action))
-      (let ((w3m-form-download t))
-	(eval act)))
-     (t
-      (w3m-message "No image at point")))))
-
-(defun w3m-print-current-url ()
-  "Display the current url in the echo area and put it into `kill-ring'."
-  (interactive)
-  (when w3m-current-url
-    (let ((deactivate-mark nil))
-      (kill-new w3m-current-url)
-      (w3m-message "%s" (w3m-url-readable-string w3m-current-url)))))
-
-(defun w3m-print-this-url (&optional interactive-p)
-  "Display the url under point in the echo area and put it into `kill-ring'."
-  (interactive (list t))
-  (let ((deactivate-mark nil)
-	(url (if interactive-p
-		 (or (w3m-anchor) (w3m-image))
-	       (or (w3m-anchor (point)) (w3m-image (point)))))
-	(alt (if interactive-p
-		 (w3m-image-alt)
-	       (w3m-image-alt (point)))))
-    (when (or url interactive-p)
-      (and url interactive-p (kill-new url))
-      (w3m-message "%s%s"
-		   (if (zerop (length alt))
-		       ""
-		     (concat alt ": "))
-		   (or (w3m-url-readable-string url)
-		       (and (w3m-action) "There is a form")
-		       "There is no url")))))
-
-(defun w3m-print-this-image-url (&optional interactive-p)
-  "Display image url under point in echo area and put it into `kill-ring'."
-  (interactive (list t))
-  (let ((deactivate-mark nil)
-	(url (if interactive-p
-		 (w3m-image)
-	       (w3m-image (point))))
-	(alt (if interactive-p
-		 (w3m-image-alt)
-	       (w3m-image-alt (point)))))
-    (when (or url interactive-p)
-      (and url interactive-p (kill-new url))
-      (w3m-message "%s%s"
-		   (if (zerop (length alt))
-		       ""
-		     (concat alt ": "))
-		   (or (w3m-url-readable-string url)
-		       (and (w3m-action) "There is a form")
-		       "There is no image url")))))
-
-(defmacro w3m-delete-all-overlays ()
-  "Delete all momentary overlays."
-  '(dolist (overlay (overlays-in (point-min) (point-max)))
-     (if (overlay-get overlay 'w3m-momentary-overlay)
-	 (delete-overlay overlay))))
-
-(defun w3m-highlight-current-anchor-1 (seq)
-  "Highlight an anchor in the line if the anchor sequence is the same as SEQ.
-Return t if highlighting is successful."
-  (let ((limit (point-at-eol))
-	ov beg pos pseq)
-    (save-excursion
-      (beginning-of-line)
-      (setq pos (point))
-      (while (and pos
-		  (< pos limit)
-		  (not (eq seq (setq pseq (w3m-anchor-sequence pos)))))
-	(setq pos (next-single-property-change pos 'w3m-anchor-sequence)))
-      (when (and pos (< pos limit) (eq seq pseq))
-	(setq beg pos)
-	(setq pos (next-single-property-change pos 'w3m-anchor-sequence))
-	(setq ov (make-overlay beg pos))
-	(overlay-put ov 'face 'w3m-current-anchor)
-	(overlay-put ov 'w3m-momentary-overlay t)
-	(overlay-put ov 'evaporate t)
-	t))))
-
-(defun w3m-highlight-current-anchor ()
-  "Highlight an anchor under point."
-  (when (let ((ovs (overlays-at (point))) ov)
-	  ;; If the anchor is already highlighted, it does nothing.
-	  (or (null ovs)
-	      (null (progn (while ovs
-			     (if (overlay-get (car ovs) 'w3m-momentary-overlay)
-				 (setq ov (car ovs)
-				       ovs nil))
-			     (setq ovs (cdr ovs)))
-			   ov))))
-    (w3m-delete-all-overlays)
-    (save-excursion
-      (let ((seq (w3m-anchor-sequence))
-	    (pos (point)))
-	(when (and seq
-		   (w3m-highlight-current-anchor-1 seq)
-		   (zerop (forward-line 1)))
-	  (while (and (w3m-highlight-current-anchor-1 seq)
-		      (zerop (forward-line 1))))
-	  (goto-char pos)
-	  (while (and (zerop (forward-line -1))
-		      (w3m-highlight-current-anchor-1 seq))))))))
-
-(defun w3m-edit-url (url)
-  "Edit the page pointed by URL."
-  (interactive (list (w3m-input-url)))
-  (when (string-match "\\`about://\\(?:header\\|source\\)/" url)
-    (setq url (substring url (match-end 0))))
-  (catch 'found
-    (dolist (pair w3m-edit-function-alist)
-      (when (and (string-match (car pair) url)
-		 (fboundp (cdr pair)))
-	(throw 'found (funcall (cdr pair) url))))
-    (funcall w3m-edit-function
-	     (or (w3m-url-to-file-name url)
-		 (error "URL:%s is not a local file" url)))))
-
-(defun w3m-edit-current-url ()
-  "Edit this viewing page."
-  (interactive)
-  (if w3m-current-url
-      (w3m-edit-url w3m-current-url)
-    (w3m-message "No URL")))
-
-(defun w3m-edit-this-url ()
-  "Edit the page linked from the anchor under the cursor."
-  (interactive)
-  (let ((url (w3m-url-valid (w3m-anchor))))
-    (if url
-	(w3m-edit-url url)
-      (w3m-message "No URL at point"))))
-
-(defvar w3m-goto-anchor-hist nil)
-(make-variable-buffer-local 'w3m-goto-anchor-hist)
-
-(defun w3m-goto-next-anchor ()
-  (let ((hseq (w3m-anchor-sequence))
-	(pos (next-single-property-change (point) 'w3m-anchor-sequence)))
-    (if (or (not hseq) (< hseq 1))
-	(and pos (goto-char pos))
-      (setq pos
-	    ;; hseq is not sequence in form.
-	    (catch 'loop
-	      (setq hseq (1+ hseq))
-	      (while (<= hseq w3m-max-anchor-sequence)
-		(setq pos (text-property-any
-			   (point-min) (point-max) 'w3m-anchor-sequence hseq))
-		(when pos (throw 'loop pos))
-		(setq hseq (1+ hseq)))))
-      (and pos (goto-char pos)))))
-
-(defun w3m-next-anchor (&optional arg)
-  "Move the point to the next anchor."
-  (interactive "p")
-  (w3m-keep-region-active)
-  (unless arg (setq arg 1))
-  (if (null (memq last-command '(w3m-next-anchor w3m-previous-anchor)))
-      (when (setq w3m-goto-anchor-hist (w3m-anchor-sequence))
-	(setq w3m-goto-anchor-hist (list w3m-goto-anchor-hist)))
-    (when (and (eq last-command 'w3m-previous-anchor) w3m-goto-anchor-hist)
-      (setcdr w3m-goto-anchor-hist nil)))
-  (if (< arg 0)
-      (w3m-previous-anchor (- arg))
-    (let (pos)
-      (while (> arg 0)
-	(unless (w3m-goto-next-anchor)
-	  (setq w3m-goto-anchor-hist nil)
-	  (if (w3m-imitate-widget-button)
-	      (widget-forward 1)
-	    (when (setq pos (text-property-any
-			     (point-min) (point-max) 'w3m-anchor-sequence 1))
-	      (goto-char pos))))
-	(setq arg (1- arg))
-	(if (member (w3m-anchor-sequence) w3m-goto-anchor-hist)
-	    (setq arg (1+ arg))
-	  (push (w3m-anchor-sequence) w3m-goto-anchor-hist))))
-    (w3m-horizontal-on-screen)
-    (w3m-print-this-url)))
-
-(defun w3m-goto-previous-anchor ()
-  (let ((hseq (w3m-anchor-sequence))
-	(pos (previous-single-property-change (point) 'w3m-anchor-sequence)))
-    (cond
-     ((and (not hseq) pos)
-      (if (w3m-anchor-sequence pos)
-	  (goto-char pos)
-	(setq pos (previous-single-property-change pos 'w3m-anchor-sequence))
-	(and pos (goto-char pos))))
-     ((or (not pos) (< hseq 2)) nil)
-     (t
-      (setq pos
-	    ;; hseq is not sequence in form.
-	    (catch 'loop
-	      (setq hseq (1- hseq))
-	      (while (> hseq 0)
-		(setq pos (text-property-any
-			   (point-min) (point-max) 'w3m-anchor-sequence hseq))
-		(when pos (throw 'loop pos))
-		(setq hseq (1- hseq)))))
-      (and pos (goto-char pos))))))
-
-(defun w3m-previous-anchor (&optional arg)
-  "Move the point to the previous anchor."
-  (interactive "p")
-  (w3m-keep-region-active)
-  (unless arg (setq arg 1))
-  (if (null (memq last-command '(w3m-next-anchor w3m-previous-anchor)))
-      (when (setq w3m-goto-anchor-hist (w3m-anchor-sequence))
-	(setq w3m-goto-anchor-hist (list w3m-goto-anchor-hist)))
-    (when (and (eq last-command 'w3m-next-anchor) w3m-goto-anchor-hist)
-      (setcdr w3m-goto-anchor-hist nil)))
-  (if (< arg 0)
-      (w3m-next-anchor (- arg))
-    (let (pos)
-      (while (> arg 0)
-	(unless (w3m-goto-previous-anchor)
-	  (setq w3m-goto-anchor-hist nil)
-	  (if (w3m-imitate-widget-button)
-	      (widget-forward -1)
-	    (when (setq pos (and w3m-max-anchor-sequence
-				 (text-property-any
-				  (point-min) (point-max)
-				  'w3m-anchor-sequence
-				  w3m-max-anchor-sequence)))
-	      (goto-char pos))))
-	(setq arg (1- arg))
-	(if (member (w3m-anchor-sequence) w3m-goto-anchor-hist)
-	    (setq arg (1+ arg))
-	  (push (w3m-anchor-sequence) w3m-goto-anchor-hist))))
-    (w3m-horizontal-on-screen)
-    (w3m-print-this-url)))
-
-(defun w3m-goto-next-form ()
-  ;; Move the point to the end of the current form.
-  (when (w3m-action (point))
-    (goto-char (next-single-property-change (point) 'w3m-action)))
-  ;; Find the next form.
-  (or (w3m-action (point))
-      (let ((pos (next-single-property-change (point) 'w3m-action)))
-	(when pos
-	  (goto-char pos)
-	  t))))
-
-(defun w3m-next-form (&optional arg)
-  "Move the point to the next form."
-  (interactive "p")
-  (w3m-keep-region-active)
-  (unless arg (setq arg 1))
-  (if (null (memq last-command '(w3m-next-form w3m-previous-form)))
-      (when (setq w3m-goto-anchor-hist (w3m-action (point)))
-	(setq w3m-goto-anchor-hist (list w3m-goto-anchor-hist)))
-    (when (and (eq last-command 'w3m-previous-form) w3m-goto-anchor-hist)
-      (setcdr w3m-goto-anchor-hist nil)))
-  (if (< arg 0)
-      (w3m-previous-form (- arg))
-    (while (> arg 0)
-      (unless (w3m-goto-next-form)
-	;; Make a search from the beginning of the buffer.
-	(setq w3m-goto-anchor-hist nil)
-	(goto-char (point-min))
-	(w3m-goto-next-form))
-      (setq arg (1- arg))
-      (if (member (w3m-action (point)) w3m-goto-anchor-hist)
-	  (setq arg (1+ arg))
-	(push (w3m-action (point)) w3m-goto-anchor-hist)))
-    (w3m-horizontal-on-screen)
-    (w3m-print-this-url)))
-
-(defun w3m-goto-previous-form ()
-  ;; Move the point to the beginning of the current form.
-  (when (w3m-action (point))
-    (goto-char (previous-single-property-change (1+ (point))
-						'w3m-action)))
-  ;; Find the previous form.
-  (let ((pos (previous-single-property-change (point) 'w3m-action)))
-    (if pos
-	(goto-char
-	 (if (w3m-action pos)
-	     pos
-	   (previous-single-property-change pos 'w3m-action))))))
-
-(defun w3m-previous-form (&optional arg)
-  "Move the point to the previous form."
-  (interactive "p")
-  (w3m-keep-region-active)
-  (unless arg (setq arg 1))
-  (if (null (memq last-command '(w3m-next-form w3m-previous-form)))
-      (when (setq w3m-goto-anchor-hist (w3m-action (point)))
-	(setq w3m-goto-anchor-hist (list w3m-goto-anchor-hist)))
-    (when (and (eq last-command 'w3m-next-form) w3m-goto-anchor-hist)
-      (setcdr w3m-goto-anchor-hist nil)))
-  (if (< arg 0)
-      (w3m-next-form (- arg))
-    (while (> arg 0)
-      (unless (w3m-goto-previous-form)
-	;; search from the end of the buffer
-	(setq w3m-goto-anchor-hist nil)
-	(goto-char (point-max))
-	(w3m-goto-previous-form))
-      (setq arg (1- arg))
-      (if (member (w3m-action (point)) w3m-goto-anchor-hist)
-	  (setq arg (1+ arg))
-	(push (w3m-action (point)) w3m-goto-anchor-hist)))
-    (w3m-horizontal-on-screen)
-    (w3m-print-this-url)))
-
-(defun w3m-goto-next-image ()
-  ;; Move the point to the end of the current image.
-  (when (w3m-image (point))
-    (goto-char (next-single-property-change (point) 'w3m-image)))
-  ;; Find the next form or image.
-  (or (w3m-image (point))
-      (let ((pos (next-single-property-change (point) 'w3m-image)))
-	(when pos
-	  (goto-char pos)
-	  t))))
-
-(defun w3m-next-image (&optional arg)
-  "Move the point to the next image."
-  (interactive "p")
-  (w3m-keep-region-active)
-  (unless arg (setq arg 1))
-  (if (null (memq last-command
-		  '(w3m-next-image w3m-previous-image)))
-      (when (setq w3m-goto-anchor-hist (w3m-image (point)))
-	(setq w3m-goto-anchor-hist (list w3m-goto-anchor-hist)))
-    (when (and (eq last-command 'w3m-previous-image)
-	       w3m-goto-anchor-hist)
-      (setcdr w3m-goto-anchor-hist nil)))
-  (if (< arg 0)
-      (w3m-previous-image (- arg))
-    (while (> arg 0)
-      (unless (w3m-goto-next-image)
-	;; Make a search for an image from the beginning of the buffer.
-	(setq w3m-goto-anchor-hist nil)
-	(goto-char (point-min))
-	(w3m-goto-next-image))
-      (setq arg (1- arg))
-      (if (member (w3m-image (point)) w3m-goto-anchor-hist)
-	  (setq arg (1+ arg))
-	(push (w3m-image (point)) w3m-goto-anchor-hist)))
-    (w3m-horizontal-on-screen)
-    (w3m-print-this-url)))
-
-(defun w3m-goto-previous-image ()
-  ;; Move the point to the beginning of the current image.
-  (when (w3m-image (point))
-    (goto-char (previous-single-property-change (1+ (point))
-						'w3m-image)))
-  ;; Find the previous form or image.
-  (let ((pos (previous-single-property-change (point) 'w3m-image)))
-    (if pos
-	(goto-char
-	 (if (w3m-image pos) pos
-	   (previous-single-property-change pos 'w3m-image))))))
-
-(defun w3m-previous-image (&optional arg)
-  "Move the point to the previous image."
-  (interactive "p")
-  (w3m-keep-region-active)
-  (unless arg (setq arg 1))
-  (if (null (memq last-command '(w3m-next-image w3m-previous-image)))
-      (when (setq w3m-goto-anchor-hist (w3m-image (point)))
-	(setq w3m-goto-anchor-hist (list w3m-goto-anchor-hist)))
-    (when (and (eq last-command 'w3m-next-image)
-	       w3m-goto-anchor-hist)
-      (setcdr w3m-goto-anchor-hist nil)))
-  (if (< arg 0)
-      (w3m-next-image (- arg))
-    (while (> arg 0)
-      (unless (w3m-goto-previous-image)
-	;; Make a search from the end of the buffer.
-	(setq w3m-goto-anchor-hist nil)
-	(goto-char (point-max))
-	(w3m-goto-previous-image))
-      (setq arg (1- arg))
-      (if (member (w3m-image (point)) w3m-goto-anchor-hist)
-	  (setq arg (1+ arg))
-	(push (w3m-image (point)) w3m-goto-anchor-hist)))
-    (w3m-horizontal-on-screen)
-    (w3m-print-this-url)))
-
-(defun w3m-copy-buffer (&optional buffer newname just-copy empty background)
-  "Create a copy of the BUFFER in which emacs-w3m is working.
-Return a new buffer.
-
-If BUFFER is nil, the current buffer is assumed.  If NEWNAME is nil,
-it defaults to the name of the current buffer.  If JUST-COPY is nil,
-this function lets a new buffer be the current buffer and pop up as a
-new window or a new frame according to `w3m-pop-up-windows' and
-`w3m-pop-up-frames' (which see), otherwise just creates BUFFER's copy.
-If EMPTY is nil, a page of the same url will be re-rendered in a new
-buffer, otherwise an empty buffer is created. If BACKGROUND is non-nil,
-this function stays on the current buffer.
-
-Note that this function should be called on the window displaying the
-original buffer BUFFER even if JUST-COPY is non-nil in order to render
-a page in a new buffer with the correct width."
-  (interactive (list (current-buffer)
-		     (if current-prefix-arg (read-string "Name: "))
-		     t))
-  (unless buffer
-    (setq buffer (current-buffer)))
-  (unless newname
-    (setq newname (buffer-name buffer)))
-  (when (string-match "<[0-9]+>\\'" newname)
-    (setq newname (substring newname 0 (match-beginning 0))))
-  (let (url coding images init-frames new)
-    (save-current-buffer
-      (set-buffer buffer)
-      (setq url (or w3m-current-url
-		    (car (w3m-history-element (cadar w3m-history))))
-	    coding w3m-current-coding-system
-	    images w3m-display-inline-images
-	    init-frames (when (w3m-popup-frame-p)
-			  (copy-sequence w3m-initial-frames)))
-      (unless url
-	(setq empty t))
-      ;;
-      (set-buffer (setq new (w3m-generate-new-buffer newname)))
-      (w3m-mode)
-      ;; Make copies of `w3m-history' and `w3m-history-flat'.
-      (w3m-history-copy buffer)
-      (setq w3m-current-coding-system coding
-	    w3m-initial-frames init-frames
-	    w3m-display-inline-images
-	    (if w3m-toggle-inline-images-permanently
-		images
-	      w3m-default-display-inline-images)))
-    (cond
-     ((and empty (not background))
-      ;; Pop to a window or a frame up because `w3m-goto-url' is not called.
-      (w3m-popup-buffer new))
-     (empty
-      ;; When empty and just-copy, stay origianl buffer.
-      )
-     (t
-      ;; Need to change to the `new' buffer in which `w3m-goto-url' runs.
-      (set-buffer new)
-      ;; Render a page.
-      (let ((positions (copy-sequence (car w3m-history)))
-	    (w3m-history-reuse-history-elements t)
-	    (w3m-prefer-cache t))
-	(w3m-process-with-wait-handler
-	  (w3m-goto-url url 'redisplay nil nil nil handler
-			;; Pass the properties of the history elements,
-			;; although it is currently always nil.
-			(w3m-history-element (cadr positions))))
-	(setcar w3m-history positions))
-      (when (and w3m-new-session-in-background
-		 just-copy
-		 (not (get-buffer-window buffer)))
-	(set-window-buffer (selected-window) buffer))))
-    new))
-
-(defun w3m-next-buffer (arg)
-  "Turn ARG pages of emacs-w3m buffers ahead."
-  (interactive "p")
-  (unless arg (setq arg 1))
-  (when (and (/= arg 0) (eq major-mode 'w3m-mode))
-    (w3m-history-store-position)
-    (let* ((buffers (w3m-list-buffers))
-	   (len (length buffers)))
-      (switch-to-buffer
-       (nth (mod (+ arg (- len (length (memq (current-buffer) buffers))))
-		 len)
-	    buffers)))
-    (w3m-history-restore-position)
-    (run-hooks 'w3m-select-buffer-hook)
-    (w3m-select-buffer-update)))
-
-(defun w3m-previous-buffer (arg)
-  "Turn ARG pages of emacs-w3m buffers behind."
-  (interactive "p")
-  (w3m-next-buffer (- arg)))
-
-(defun w3m-delete-buffer (&optional force)
-  "Delete the current emacs-w3m buffer and switch to the previous one.
-If there is the sole emacs-w3m buffer, it is assumed to be called for
-terminating the emacs-w3m session; the prefix argument FORCE will be
-passed to the `w3m-quit' function (which see)."
-  (interactive "P")
-  ;; Bind `w3m-fb-mode' to nil so that this function might not call
-  ;; `w3m-quit' when there is only one buffer belonging to the selected
-  ;; frame, but there are emacs-w3m buffers in other frames.
-  (let* ((w3m-fb-mode nil)
-	 (buffers (w3m-list-buffers t))
-	 (num (length buffers))
-	 cur buf bufs)
-    (if (= 1 num)
-	(w3m-quit force)
-      (setq cur (current-buffer))
-      (if (w3m-use-tab-p)
-	  (save-window-excursion
-	    (select-window (or (get-buffer-window cur t) (selected-window)))
-	    (w3m-next-buffer -1))
-	;; List buffers being shown in the other windows of the current frame.
-	(save-current-buffer
-	  (walk-windows (lambda (window)
-			  (set-buffer (setq buf (window-buffer window)))
-			  (when (and (eq major-mode 'w3m-mode)
-				     (not (eq buf cur)))
-			    (push buf bufs)))
-			'no-minibuf))
-	(cond ((= (1- num) (length bufs))
-	       ;; All the other buffers are shown in the current frame.
-	       (select-window (get-buffer-window (prog2
-						     (w3m-next-buffer -1)
-						     (current-buffer)
-						   (delete-window)))))
-	      (bufs
-	       ;; Look for the buffer which is not shown in the current frame.
-	       (setq buf nil)
-	       (while (progn
-			(w3m-next-buffer -1)
-			(unless buf
-			  (setq buf (current-buffer)))
-			(memq (current-buffer) bufs)))
-	       (when (memq buf bufs)
-		 ;; Go to the buffer which is most suitable to be called
-		 ;; the *previous* buffer.
-		 (select-window (get-buffer-window buf))))
-	      ((progn ;; List buffers being not shown anywhere.
-		 (setq bufs nil)
-		 (while buffers
-		   (unless (get-buffer-window (setq buf (pop buffers)) t)
-		     (push buf bufs)))
-		 bufs)
-	       (while (progn
-			(w3m-next-buffer -1)
-			(not (memq (current-buffer) bufs)))))
-	      ((memq (selected-frame) w3m-initial-frames)
-	       ;; Assume that this frame was created to show this buffer.
-	       (if (one-window-p t)
-		   (delete-frame)
-		 (delete-window)))
-	      (t
-	       (if (>= num 2)
-		   (w3m-next-buffer -1)
-		 (unless (one-window-p t)
-		   (delete-window))))))
-      (w3m-session-deleted-save (list cur))
-      (w3m-process-stop cur)
-      (w3m-idle-images-show-unqueue cur)
-      (kill-buffer cur)
-      (when w3m-use-form
-	(w3m-form-kill-buffer cur))
-      (w3m-history-restore-position)
-      (run-hooks 'w3m-delete-buffer-hook)
-      (w3m-session-crash-recovery-save)))
-  (w3m-select-buffer-update)
-  (unless w3m-fb-inhibit-buffer-selection
-    (w3m-fb-select-buffer)))
-
-(defun w3m-delete-buffer-if-empty (buffer)
-  "Delete a newly created emacs-w3m buffer BUFFER if it seems unnecessary.
-Some emacs-w3m commands create a buffer for the new session first, but
-it may be useless if the command is invoked for visiting a local file
-or a mail buffer.  This command will delete BUFFER if it is empty or
-there is only a progress message.  It also deletes windows and frames
-related to BUFFER."
-  (with-current-buffer buffer
-    (unless (or w3m-current-process
-		w3m-current-url
-		(not (or (zerop (buffer-size))
-			 (and (get-text-property (point-min)
-						 'w3m-progress-message)
-			      (get-text-property (1- (point-max))
-						 'w3m-progress-message)))))
-      (w3m-delete-buffer t))))
-
-(defun w3m-pack-buffer-numbers ()
-  "Renumber suffixes of names of emacs-w3m buffers.
-It aligns emacs-w3m buffers in order of *w3m*, *w3m<2>, *w3m*<3>,...
-as if the folder command of MH performs with the -pack option."
-  (interactive)
-  (let ((count 1) number newname)
-    (dolist (buffer (w3m-list-buffers))
-      (setq number (w3m-buffer-number buffer))
-      (when number
-	(unless (eq number count)
-	  (when (and (setq newname (w3m-buffer-set-number buffer count))
-		     w3m-use-form)
-	    (w3m-form-set-number buffer newname)))
-	(incf count)))))
-
-(defun w3m-delete-other-buffers (&optional buffer)
-  "Delete emacs-w3m buffers except for BUFFER or the current buffer."
-  (interactive)
-  (unless buffer
-    (setq buffer (current-buffer)))
-  (w3m-delete-frames-and-windows buffer)
-  (let ((buffers (delq buffer (w3m-list-buffers t))))
-    (w3m-delete-buffers buffers)))
-
-(defun w3m-delete-left-tabs ()
-  "Delete tabs on the left side of the current tab."
-  (interactive)
-  (let ((cbuf (current-buffer))
-	bufs)
-    (setq bufs (catch 'done
-		 (dolist (buf (w3m-list-buffers))
-		   (if (eq cbuf buf)
-		       (throw 'done bufs)
-		     (setq bufs (cons buf bufs))))))
-    (when bufs
-      (w3m-delete-buffers bufs))))
-
-(defun w3m-delete-right-tabs ()
-  "Delete tabs on the right side of the current tab."
-  (interactive)
-  (let ((bufs (w3m-righttab-exist-p)))
-    (when bufs
-      (w3m-delete-buffers bufs))))
-
-(defun w3m-delete-buffers (buffers)
-  "Delete emacs-w3m buffers."
-  (let (buffer)
-    (when buffers
-      (w3m-session-deleted-save buffers))
-    (while buffers
-      (setq buffer (pop buffers))
-      (w3m-process-stop buffer)
-      (w3m-idle-images-show-unqueue buffer)
-      (kill-buffer buffer)
-      (when w3m-use-form
-	(w3m-form-kill-buffer buffer))))
-  (run-hooks 'w3m-delete-buffer-hook)
-  (w3m-session-crash-recovery-save)
-  (w3m-select-buffer-update)
-  (w3m-force-window-update))
-
-(defvar w3m-ctl-c-map nil
-  "Sub-keymap used for the `C-c'-prefixed commands.
-
-Note: keys should not be alphabet since `C-c LETTER' keys are reserved
-for users.  See Info node `(elisp)Key Binding Conventions'.")
-(unless w3m-ctl-c-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "\C-@" 'w3m-history-store-position)
-    (if (featurep 'xemacs)
-	(define-key map [(control space)] 'w3m-history-store-position)
-      ;; `C- ' doesn't mean `C-SPC' in XEmacs.
-      (define-key map [?\C-\ ] 'w3m-history-store-position))
-    (define-key map "\C-v" 'w3m-history-restore-position)
-    (define-key map "\C-t" 'w3m-copy-buffer)
-    (define-key map "\C-p" 'w3m-previous-buffer)
-    (define-key map "\C-n" 'w3m-next-buffer)
-    (when (featurep 'w3m-ems)
-      (define-key map [?\C-,] 'w3m-tab-move-left)
-      (define-key map [?\C-<] 'w3m-tab-move-left)
-      (define-key map [?\C-.] 'w3m-tab-move-right)
-      (define-key map [?\C->] 'w3m-tab-move-right))
-    (define-key map "\C-w" 'w3m-delete-buffer)
-    (define-key map "\M-w" 'w3m-delete-other-buffers)
-    (define-key map "\M-l" 'w3m-delete-left-tabs)
-    (define-key map "\M-r" 'w3m-delete-right-tabs)
-    (define-key map "\C-s" 'w3m-select-buffer)
-    (define-key map "\C-a" 'w3m-switch-buffer)
-    (define-key map "\C-b" 'report-emacs-w3m-bug)
-    (define-key map "\C-c" 'w3m-submit-form)
-    (define-key map "\C-k" 'w3m-process-stop)
-    (define-key map "\C-m" 'w3m-move-unseen-buffer)
-    (define-key map "\C-l" 'w3m-go-to-linknum)
-    (setq w3m-ctl-c-map map)))
-
-(defvar w3m-redisplay-map nil
-  "Sub-keymap used for the `C'-prefixed redisplay commands.")
-(unless w3m-redisplay-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "t" 'w3m-redisplay-with-content-type)
-    (define-key map "c" 'w3m-redisplay-with-charset)
-    (define-key map "C" 'w3m-redisplay-and-reset)
-    (setq w3m-redisplay-map map)))
-
-(defvar w3m-linknum-map nil
-  "Sub-keymap used for the `L'-prefixed link numbering commands.")
-(unless w3m-linknum-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "F" 'w3m-go-to-linknum)
-    (define-key map "I" 'w3m-linknum-view-image)
-    (define-key map "\M-i" 'w3m-linknum-save-image)
-    (define-key map "d" 'w3m-linknum-download-this-url)
-    (define-key map "e" 'w3m-linknum-edit-this-url)
-    (define-key map "f" 'w3m-linknum-follow)
-    (define-key map "t" 'w3m-linknum-toggle-inline-image)
-    (define-key map "u" 'w3m-linknum-print-this-url)
-    (define-key map "b" 'w3m-linknum-bookmark-add-this-url)
-    (define-key map "]" 'w3m-linknum-zoom-in-image)
-    (define-key map "[" 'w3m-linknum-zoom-out-image)
-    (setq w3m-linknum-map map)))
-
-(defvar w3m-lynx-like-map nil
-  "Lynx-like keymap used in emacs-w3m buffers.")
-;; `C-t' is a prefix key reserved to commands that do something in all
-;; emacs-w3m buffers.  2006-05-18
-(unless w3m-lynx-like-map
-  (let ((map (make-keymap)))
-    (suppress-keymap map)
-    (define-key map " " 'w3m-scroll-up-or-next-url)
-    (define-key map "b" 'w3m-scroll-down-or-previous-url)
-    (define-key map [backspace] 'w3m-scroll-down-or-previous-url)
-    (define-key map [delete] 'w3m-scroll-down-or-previous-url)
-    (if (featurep 'xemacs)
-	(define-key map [(shift space)] 'w3m-scroll-down-or-previous-url)
-      (define-key map [?\S-\ ] 'w3m-scroll-down-or-previous-url))
-    (define-key map "h" 'backward-char)
-    (define-key map "j" 'next-line)
-    (define-key map "k" 'previous-line)
-    (define-key map "l" 'forward-char)
-    (define-key map "J" 'w3m-scroll-up-1)
-    (define-key map "K" (lambda () (interactive) (scroll-down 1)))
-    (define-key map "\C-?" 'w3m-scroll-down-or-previous-url)
-    (define-key map "\t" 'w3m-next-anchor)
-    (define-key map [tab] 'w3m-next-anchor)
-    (define-key map [(shift tab)] 'w3m-previous-anchor)
-    (define-key map [(shift iso-lefttab)] 'w3m-previous-anchor)
-    (define-key map [backtab] 'w3m-previous-anchor)
-    (define-key map [down] 'w3m-next-anchor)
-    (define-key map "\M-\t" 'w3m-previous-anchor)
-    (define-key map [up] 'w3m-previous-anchor)
-    (define-key map "\C-m" 'w3m-view-this-url)
-    (define-key map [(shift return)] 'w3m-view-this-url-new-session)
-    (define-key map [(shift kp-enter)] 'w3m-view-this-url-new-session)
-    (define-key map [right] 'w3m-view-this-url)
-    (cond ((featurep 'xemacs)
-	   (define-key map [(button3)] 'w3m-mouse-major-mode-menu))
-	  ;; Don't use [mouse-3], which gets submenus not working in GTK Emacs.
-	  ((featurep 'gtk)
-	   (define-key map [down-mouse-3] 'w3m-mouse-major-mode-menu)
-	   (define-key map [drag-mouse-3] 'undefined)
-	   (define-key map [mouse-3] 'undefined))
-	  (t
-	   (define-key map [mouse-3] 'w3m-mouse-major-mode-menu)))
-    (if (featurep 'xemacs)
-	(progn
-	  (define-key map [(button2)] 'w3m-mouse-view-this-url)
-	  (define-key map [(shift button2)]
-	    'w3m-mouse-view-this-url-new-session))
-      (define-key map [mouse-2] 'w3m-mouse-view-this-url)
-      ;; Support for mouse-1 on Emacs 22 and greater.
-      (define-key map [follow-link] 'mouse-face)
-      (define-key map [S-mouse-2] 'w3m-mouse-view-this-url-new-session))
-    (define-key map [left] 'w3m-view-previous-page)
-    (define-key map "B" 'w3m-view-previous-page)
-    (define-key map "N" 'w3m-view-next-page)
-    (define-key map "^" 'w3m-view-parent-page)
-    (define-key map "\M-d" 'w3m-download)
-    (define-key map "d" 'w3m-download-this-url)
-    (define-key map "u" 'w3m-print-this-url)
-    (define-key map "I" 'w3m-view-image)
-    (define-key map "\M-i" 'w3m-save-image)
-    (define-key map "c" 'w3m-print-current-url)
-    (define-key map "M" 'w3m-view-url-with-external-browser)
-    (define-key map "G" 'w3m-goto-url-new-session)
-    (define-key map "g" 'w3m-goto-url)
-    (define-key map "T" 'w3m-toggle-inline-images)
-    (define-key map "\M-T" 'w3m-turnoff-inline-images)
-    (define-key map "t" 'w3m-toggle-inline-image)
-    (when (w3m-display-graphic-p)
-      (define-key map "\M-[" 'w3m-zoom-out-image)
-      (define-key map "\M-]" 'w3m-zoom-in-image))
-    (define-key map "U" 'w3m-goto-url)
-    (define-key map "v" 'w3m-bookmark-view)
-    (define-key map "V" 'w3m-bookmark-view-new-session)
-    (define-key map "q" 'w3m-close-window)
-    (define-key map "Q" 'w3m-quit)
-    (define-key map "\M-n" 'w3m-copy-buffer)
-    (define-key map "\M-s" 'w3m-session-select)
-    (define-key map "\M-S" 'w3m-session-save)
-    (define-key map "r" 'w3m-redisplay-this-page)
-    (define-key map "R" 'w3m-reload-this-page)
-    (define-key map "\C-tR" 'w3m-reload-all-pages)
-    (define-key map "?" 'describe-mode)
-    (define-key map "\M-a" 'w3m-bookmark-add-this-url)
-    (define-key map "\M-k" 'w3m-cookie)
-    (define-key map "a" 'w3m-bookmark-add-current-url)
-    (define-key map "\C-ta" 'w3m-bookmark-add-all-urls)
-    (define-key map "+" 'w3m-antenna-add-current-url)
-    (define-key map "]" 'w3m-next-form)
-    (define-key map "[" 'w3m-previous-form)
-    (define-key map "}" 'w3m-next-image)
-    (define-key map "{" 'w3m-previous-image)
-    (define-key map "H" 'w3m-gohome)
-    (define-key map "A" 'w3m-antenna)
-    (define-key map "W" 'w3m-weather)
-    (define-key map "S" 'w3m-search)
-    (define-key map "D" 'w3m-dtree)
-    (define-key map ">" 'w3m-scroll-left)
-    (define-key map "<" 'w3m-scroll-right)
-    (define-key map "." 'w3m-shift-left)
-    (define-key map "," 'w3m-shift-right)
-    (define-key map "\M-l" 'w3m-horizontal-recenter)
-    (define-key map "\C-a" 'w3m-beginning-of-line)
-    (define-key map "\C-e" 'w3m-end-of-line)
-    (define-key map "\\" 'w3m-view-source)
-    (define-key map "=" 'w3m-view-header)
-    (define-key map "s" 'w3m-history)
-    (define-key map "E" 'w3m-edit-current-url)
-    (define-key map "e" 'w3m-edit-this-url)
-    (define-key map "|" 'w3m-pipe-source)
-    (define-key map "\C-c" w3m-ctl-c-map)
-    (define-key map "C" w3m-redisplay-map)
-    (define-key map "L" w3m-linknum-map)
-    (setq w3m-lynx-like-map map)))
-
-(defvar w3m-info-like-map nil
-  "Info-like keymap used in emacs-w3m buffers.")
-;; `C-t' is a prefix key reserved to commands that do something in all
-;; emacs-w3m buffers.  2006-05-18
-(unless w3m-info-like-map
-  (let ((map (make-keymap)))
-    (suppress-keymap map)
-    (define-key map [backspace] 'w3m-scroll-down-or-previous-url)
-    (define-key map [delete] 'w3m-scroll-down-or-previous-url)
-    (define-key map "\C-?" 'w3m-scroll-down-or-previous-url)
-    (if (featurep 'xemacs)
-	(define-key map [(shift space)] 'w3m-scroll-down-or-previous-url)
-      (define-key map [?\S-\ ] 'w3m-scroll-down-or-previous-url))
-    (define-key map "\t" 'w3m-next-anchor)
-    (define-key map [tab] 'w3m-next-anchor)
-    (define-key map [(shift tab)] 'w3m-previous-anchor)
-    (define-key map [(shift iso-lefttab)] 'w3m-previous-anchor)
-    (define-key map [backtab] 'w3m-previous-anchor)
-    (define-key map "\M-\t" 'w3m-previous-anchor)
-    (define-key map "\C-m" 'w3m-view-this-url)
-    (define-key map [(shift return)] 'w3m-view-this-url-new-session)
-    (define-key map [(shift kp-enter)] 'w3m-view-this-url-new-session)
-    (if (featurep 'xemacs)
-	(progn
-	  (define-key map [(button2)] 'w3m-mouse-view-this-url)
-	  (define-key map [(shift button2)]
-	    'w3m-mouse-view-this-url-new-session))
-      (define-key map [mouse-2] 'w3m-mouse-view-this-url)
-      ;; Support for mouse-1 on Emacs 22 and greater.
-      (define-key map [follow-link] 'mouse-face)
-      (define-key map [S-mouse-2] 'w3m-mouse-view-this-url-new-session))
-    (cond ((featurep 'xemacs)
-	   (define-key map [(button3)] 'w3m-mouse-major-mode-menu))
-	  ;; Don't use [mouse-3], which gets submenus not working in GTK Emacs.
-	  ((featurep 'gtk)
-	   (define-key map [down-mouse-3] 'w3m-mouse-major-mode-menu)
-	   (define-key map [drag-mouse-3] 'undefined)
-	   (define-key map [mouse-3] 'undefined))
-	  (t
-	   (define-key map [mouse-3] 'w3m-mouse-major-mode-menu)))
-    (define-key map " " 'w3m-scroll-up-or-next-url)
-    (define-key map "a" 'w3m-bookmark-add-current-url)
-    (define-key map "\C-ta" 'w3m-bookmark-add-all-urls)
-    (define-key map "\M-a" 'w3m-bookmark-add-this-url)
-    (define-key map "+" 'w3m-antenna-add-current-url)
-    (define-key map "A" 'w3m-antenna)
-    (define-key map "b" 'w3m-scroll-down-or-previous-url)
-    (define-key map "!" 'w3m-redisplay-with-content-type)
-    (define-key map "d" 'w3m-download)
-    (define-key map "D" 'w3m-download-this-url)
-    (define-key map "e" 'w3m-edit-current-url)
-    (define-key map "E" 'w3m-edit-this-url)
-    (define-key map "f" 'undefined) ;; reserved.
-    (define-key map "g" 'w3m-goto-url)
-    (define-key map "G" 'w3m-goto-url-new-session)
-    (define-key map "h" 'describe-mode)
-    (define-key map "H" 'w3m-gohome)
-    (define-key map "i" (if (w3m-display-graphic-p)
-			    'w3m-toggle-inline-image
-			  'w3m-view-image))
-    (define-key map "I" 'w3m-toggle-inline-images)
-    (define-key map "\M-I" 'w3m-turnoff-inline-images)
-    (when (w3m-display-graphic-p)
-      (define-key map "\M-[" 'w3m-zoom-out-image)
-      (define-key map "\M-]" 'w3m-zoom-in-image))
-    (define-key map "\M-i" 'w3m-save-image)
-    (define-key map "l" 'w3m-view-previous-page)
-    (define-key map "\C-l" 'recenter)
-    (define-key map [(control L)] 'w3m-reload-this-page)
-    (define-key map [(control t) (control L)] 'w3m-reload-all-pages)
-    (define-key map "M" 'w3m-view-url-with-external-browser)
-    (define-key map "n" 'w3m-view-next-page)
-    (define-key map "N" 'w3m-namazu)
-    (define-key map "\M-n" 'w3m-copy-buffer)
-    (define-key map "\M-k" 'w3m-cookie)
-    (define-key map "\M-s" 'w3m-session-select)
-    (define-key map "\M-S" 'w3m-session-save)
-    (define-key map "o" 'w3m-history)
-    (define-key map "O" 'w3m-db-history)
-    (define-key map "p" 'w3m-view-previous-page)
-    (define-key map "P" 'undecided) ;; reserved for print-this-buffer.
-    (define-key map "q" 'w3m-close-window)
-    (define-key map "Q" 'w3m-quit)
-    (define-key map "r" 'w3m-redisplay-this-page)
-    (define-key map "R" 'w3m-reload-this-page)
-    (define-key map "\C-tR" 'w3m-reload-all-pages)
-    (define-key map "s" 'w3m-search)
-    (define-key map "S" 'w3m-search-new-session)
-    (define-key map "T" 'w3m-dtree)
-    (define-key map "u" 'w3m-view-parent-page)
-    (define-key map "v" 'w3m-bookmark-view)
-    (define-key map "V" 'w3m-bookmark-view-new-session)
-    (define-key map "W" 'w3m-weather)
-    (define-key map "y" 'w3m-print-current-url)
-    (define-key map "Y" 'w3m-print-this-url)
-    (define-key map "=" 'w3m-view-header)
-    (define-key map "\\" 'w3m-view-source)
-    (define-key map "?" 'describe-mode)
-    (define-key map ">" 'w3m-scroll-left)
-    (define-key map "<" 'w3m-scroll-right)
-    (define-key map [(shift right)] 'w3m-shift-left)
-    (define-key map [(shift left)] 'w3m-shift-right)
-    (define-key map "\M-l" 'w3m-horizontal-recenter)
-    (define-key map "\C-a" 'w3m-beginning-of-line)
-    (define-key map "\C-e" 'w3m-end-of-line)
-    (define-key map "." 'beginning-of-buffer)
-    (define-key map "^" 'w3m-view-parent-page)
-    (define-key map "]" 'w3m-next-form)
-    (define-key map "[" 'w3m-previous-form)
-    (define-key map "}" 'w3m-next-image)
-    (define-key map "{" 'w3m-previous-image)
-    (define-key map "|" 'w3m-pipe-source)
-    (define-key map "\C-c" w3m-ctl-c-map)
-    (define-key map "C" w3m-redisplay-map)
-    (define-key map "L" w3m-linknum-map)
-    (setq w3m-info-like-map map)))
-
-(defun w3m-alive-p (&optional visible)
-  "Return a buffer in which emacs-w3m is running.
-If there is no emacs-w3m session, return nil.  If the optional VISIBLE
-is non-nil, a visible emacs-w3m buffer is preferred.  The last visited
-emacs-w3m buffer is likely to return if VISIBLE is omitted or there is
-no visible buffer."
-  (let* ((buffers (w3m-list-buffers t))
-	 (buf (car buffers)))
-    (if visible
-	(progn
-	  (setq visible nil)
-	  (while (and (not visible)
-		      buffers)
-	    (when (get-buffer-window (car buffers) t)
-	      (setq visible (car buffers)))
-	    (setq buffers (cdr buffers)))
-	  (or visible buf))
-      buf)))
-
-(defun w3m-quit (&optional force)
-  "Return to a peaceful life (exiting all emacs-w3m sessions).
-This command lets you quit browsing web after updating the arrived
-URLs database.  Quit browsing immediately if the prefix argument FORCE
-is specified, otherwise prompt you for the confirmation.  See also
-`w3m-close-window'."
-  (interactive "P")
-  (let ((buffers (w3m-list-buffers t))
-	(all-buffers (let ((w3m-fb-mode nil))
-		       (w3m-list-buffers t))))
-    (if (or (= (length buffers) (length all-buffers))
-	    (prog1 (y-or-n-p "Kill emacs-w3m buffers on other frames? ")
-	      (message nil)))
-	(let ((w3m-fb-mode nil))
-	  (when (or force
-		    (prog1 (y-or-n-p "Do you want to exit emacs-w3m? ")
-		      (message nil)))
-	    (w3m-session-automatic-save)
-	    (w3m-delete-frames-and-windows)
-	    (sit-for 0) ;; Delete frames seemingly fast.
-	    (dolist (buffer all-buffers)
-	      (w3m-cancel-refresh-timer buffer)
-	      (kill-buffer buffer)
-	      (when w3m-use-form
-		(w3m-form-kill-buffer buffer)))
-	    (when w3m-use-form
-	      (w3m-form-textarea-file-cleanup))
-	    (w3m-select-buffer-close-window)
-	    (w3m-cache-shutdown)
-	    (w3m-arrived-shutdown)
-	    (w3m-process-shutdown)
-	    (when w3m-use-cookies
-	      (w3m-cookie-shutdown))
-	    (w3m-kill-all-buffer)))
-      (w3m-session-automatic-save)
-      (w3m-fb-delete-frame-buffers)
-      (w3m-fb-select-buffer))))
-
-(defun w3m-close-window ()
-  "Return to a restless life (quitting all emacs-w3m sessions).
-This command closes all emacs-w3m windows, but all the emacs-w3m
-buffers remain.  Frames created for emacs-w3m sessions will also be
-closed.  See also `w3m-quit'."
-  (interactive)
-  (w3m-history-store-position)
-  ;; `w3m-list-buffers' won't return all the emacs-w3m buffers if
-  ;; `w3m-fb-mode' is turned on.
-  (let* ((buffers (w3m-list-buffers t))
-	 (bufs buffers)
-	 buf windows window)
-    (w3m-delete-frames-and-windows)
-    (while bufs
-      (setq buf (pop bufs))
-      (w3m-cancel-refresh-timer buf)
-      (bury-buffer buf))
-    (while buffers
-      (setq buf (pop buffers)
-	    windows (get-buffer-window-list buf 'no-minibuf t))
-      (while windows
-	(setq window (pop windows))
-	(set-window-buffer
-	 window
-	 (w3m-static-if (featurep 'xemacs)
-	     (other-buffer buf (window-frame window) nil)
-	   (other-buffer buf nil (window-frame window)))))))
-  (w3m-select-buffer-close-window)
-  ;; The current-buffer and displayed buffer are not necessarily the
-  ;; same at this point; if they aren't bury-buffer will be a nop, and
-  ;; we will infloop.
-  (set-buffer (window-buffer (selected-window)))
-  (while (eq major-mode 'w3m-mode)
-    (bury-buffer)))
-
-(unless w3m-mode-map
-  (setq w3m-mode-map
-	(if (eq w3m-key-binding 'info)
-	    w3m-info-like-map
-	  w3m-lynx-like-map)))
-
-(defun w3m-mouse-major-mode-menu (event)
-  "Pop up a W3M mode-specific menu of mouse commands."
-  (interactive "e")
-  (mouse-set-point event)
-  (let* ((bmkitems (if w3m-bookmark-mode
-		       (cdr w3m-bookmark-menu-items)
-		     (car w3m-bookmark-menu-items)))
-	 (bmkmenu (if w3m-bookmark-menu-items-pre
-		      `(,@bmkitems
-			"----"
-			,@w3m-bookmark-menu-items-pre)
-		    bmkitems)))
-    (w3m-static-if (featurep 'xemacs)
-	(let (menubar)
-	  (when current-menubar
-	    (run-hooks 'activate-menubar-hook))
-	  (setq menubar
-		(cons "w3m"
-		      (delq nil
-			    `(,@(cdr w3m-rmouse-menubar)
-			      "----"
-			      "----"
-			      ,(assoc "w3m" current-menubar)
-			      "----"
-			      ,(assoc "Bookmark" current-menubar)
-			      ,(assoc "Tab" current-menubar)
-			      ,(assoc "Session" current-menubar)))))
-	  (popup-menu menubar event))
-      (run-hooks 'menu-bar-update-hook)
-      (popup-menu (delete nil
-			  `(,@w3m-rmouse-menubar
-			    "----"
-			    "----"
-			    ,w3m-menubar
-			    "----"
-			    ,(cons "Bookmark" bmkmenu)
-			    ,(when w3m-tab-menubar-make-items-preitems
-			       (cons "Tab" w3m-tab-menubar-make-items-preitems))
-			    ,(cons "Session" (if w3m-session-menu-items-pre
-						 (append w3m-session-menu-items
-							 '("----")
-							 w3m-session-menu-items-pre)
-					       w3m-session-menu-items))))
-		  event))))
-
-(defvar w3m-tab-button-menu-current-buffer nil
-  "Internal variable used by `w3m-tab-button-menu'.")
-
-(defvar w3m-tab-button-menu-commands
-  (let ((manyp '(cdr (w3m-list-buffers)))
-	(currentp 'w3m-tab-button-menu-current-buffer)
-	(leftp '(and w3m-tab-button-menu-current-buffer
-		     (w3m-lefttab-exist-p w3m-tab-button-menu-current-buffer)))
-	(rightp '(and w3m-tab-button-menu-current-buffer
-		      (w3m-righttab-exist-p
-		       w3m-tab-button-menu-current-buffer)))
-	(many2p '(and w3m-tab-button-menu-current-buffer
-		      (cdr (w3m-list-buffers)))))
-    `((w3m-goto-url-new-session
-       ,(w3m-make-menu-item "$B?7$7$$%?%V(B" "New Tab")
-       t ,w3m-new-session-in-background w3m-new-session-url)
-      (w3m-copy-buffer
-       ,(w3m-make-menu-item "$B%?%V$rJ#@=(B" "Copy Tab")
-       ,currentp ,w3m-new-session-in-background)
-      -
-      (w3m-reload-this-page
-       ,(w3m-make-menu-item "$B%?%V$r:FFI$_9~$_(B" "Reload Tab")
-       ,currentp)
-      (w3m-reload-all-pages
-       ,(w3m-make-menu-item "$B$9$Y$F$N%?%V$r:FFI$_9~$_(B" "Reload All Tabs")
-       ,manyp)
-      -
-      (w3m-delete-buffer
-       ,(w3m-make-menu-item "$B$3$N%?%V$rJD$8$k(B" "Close This Tab")
-       ,currentp)
-      -
-      (w3m-delete-other-buffers
-       ,(w3m-make-menu-item "$BB>$N%?%V$r$9$Y$FJD$8$k(B" "Close Other Tabs")
-       ,many2p)
-      (w3m-delete-left-tabs
-       ,(w3m-make-menu-item "$B:8B&$N%?%V$r$9$Y$FJD$8$k(B" "Close Left Tabs")
-       ,leftp)
-      (w3m-delete-right-tabs
-       ,(w3m-make-menu-item "$B1&B&$N%?%V$r$9$Y$FJD$8$k(B" "Close Right Tabs")
-       ,rightp)
-      -
-      (w3m-view-url-with-external-browser
-       ,(w3m-make-menu-item "$B30It%V%i%&%6$G3+$/(B" "View with external browser")
-       ,currentp ,w3m-new-session-in-background w3m-current-url)
-      -
-      (w3m-session-save
-       ,(w3m-make-menu-item "$B$9$Y$F$N%?%V$rJ]B8$9$k(B" "Save All Tabs...")
-       t)
-      (w3m-session-select
-       ,(w3m-make-menu-item "$B%?%V%j%9%H$rA*Br$9$k(B" "Select List of Tabs...")
-       t)
-      (w3m-bookmark-add-current-url
-       ,(w3m-make-menu-item "$B$3$N%?%V$r%V%C%/%^!<%/(B" "Bookmark This Tab...")
-       ,currentp ,w3m-new-session-in-background)
-      (w3m-bookmark-add-all-urls
-       ,(w3m-make-menu-item
-	 "$B$9$Y$F$N%?%V$r%V%C%/%^!<%/(B" "Bookmark All Tabs..." )
-       ,manyp)))
-  "List of commands invoked by the tab button menu.
-Each item is the symbol `-' which is a separator,
-or a list which consists of the following elements:
-
-0: a function.
-1: a function description.
-2: a Lisp form which returns non-nil if the item is active.
-3: a flag specifying whether the buffer should be selected.
-&rest: arguments passed to the function.")
-
-(w3m-static-unless (featurep 'xemacs)
-  (easy-menu-define
-    w3m-tab-button-menu w3m-tab-map "w3m tab button menu."
-    (cons nil (w3m-make-menu-commands w3m-tab-button-menu-commands)))
-
-  ;; This function must be placed after `easy-menu-define'.
-  (defun w3m-tab-button-menu (event buffer)
-    (select-window (posn-window (event-start event)))
-    (setq w3m-tab-button-menu-current-buffer buffer)
-    (popup-menu w3m-tab-button-menu))
-
-  (defun w3m-tab-button-menu2 (event buffer)
-    (select-window (posn-window (event-start event)))
-    (setq w3m-tab-button-menu-current-buffer nil)
-    (popup-menu w3m-tab-button-menu)))
-
-(unless w3m-link-map
-  (setq w3m-link-map (make-sparse-keymap))
-  (cond ((featurep 'xemacs)
-	 (define-key w3m-link-map [(button3)] 'w3m-link-menu))
-	;; Don't use [mouse-3], which gets submenus not working in GTK Emacs.
-	((featurep 'gtk)
-	 (define-key w3m-link-map [down-mouse-3] 'w3m-link-menu)
-	 (define-key w3m-link-map [drag-mouse-3] 'undefined)
-	 (define-key w3m-link-map [mouse-3] 'undefined))
-	(t
-	 (define-key w3m-link-map [mouse-3] 'w3m-link-menu))))
-
-(easy-menu-define w3m-link-menu w3m-link-map "w3m link menu."
-  `("Link" ;; This cannot be omitted for at least MacOS.
-    [,(w3m-make-menu-item "$B%j%s%/$r$3$N%;%C%7%g%s$G3+$/(B"
-			  "Open Link in This Session")
-     w3m-view-this-url (w3m-anchor (point))]
-    [,(w3m-make-menu-item "$B%j%s%/$r?7$7$$%;%C%7%g%s$G3+$/(B"
-			  "Open Link in New Session")
-     w3m-view-this-url-new-session (w3m-anchor (point))]
-    [,(w3m-make-menu-item "$B%j%s%/$r30It%V%i%&%6$G3+$/(B"
-			  "Open Link in an External Browser")
-     w3m-external-view-this-url (w3m-anchor (point))]
-    "-"
-    [,(w3m-make-menu-item "$B$3$N%j%s%/$r%V%C%/%^!<%/(B..."
-			  "Bookmark This Link...")
-     w3m-bookmark-add-this-url (w3m-anchor (point))]
-    [,(w3m-make-menu-item "$BL>A0$rIU$1$F%j%s%/@h$rJ]B8(B..."
-			  "Save Link As...")
-     w3m-download-this-url (w3m-anchor (point))]
-    [,(w3m-make-menu-item "$BL>A0$rIU$1$F2hA|$rJ]B8(B..."
-			  "Save Image As...")
-     w3m-download-this-image (w3m-image (point))]
-    [,(w3m-make-menu-item "$B%j%s%/$N(B URL $B$r%3%T!<(B"
-			  "Copy Link Location")
-     w3m-print-this-url (w3m-anchor (point))]
-    [,(w3m-make-menu-item "$B2hA|$N(B URL $B$r%3%T!<(B"
-			  "Copy Image Location")
-     w3m-print-this-image-url (w3m-image (point))]))
-
-(defun w3m-link-menu (event)
-  "Pop up a link menu."
-  (interactive "e")
-  (mouse-set-point event)
-  (popup-menu w3m-link-menu))
-
-(defvar w3m-buffer-unseen nil)
-(make-variable-buffer-local 'w3m-buffer-unseen)
-
-(defun w3m-set-buffer-unseen (&optional url)
-  (setq w3m-buffer-unseen t)
-  (w3m-add-local-hook 'pre-command-hook 'w3m-set-buffer-seen))
-
-(defun w3m-set-buffer-seen ()
-  (setq w3m-buffer-unseen nil)
-  (w3m-remove-local-hook 'pre-command-hook 'w3m-set-buffer-seen))
-
-(defun w3m-move-unseen-buffer ()
-  "Move to the next unseen buffer."
-  (interactive)
-  (when (eq major-mode 'w3m-mode)
-    (let* ((bufs (w3m-list-buffers))
-	   (right (memq (current-buffer) bufs))
-      unseen)
-      (setq unseen
-	    (catch 'unseen
-	      (dolist (buf (append right bufs))
-		(when (w3m-unseen-buffer-p buf)
-		  (throw 'unseen buf)))))
-      (if (not unseen)
-	  (message "No unseen buffer.")
-	(switch-to-buffer unseen)
-	(run-hooks 'w3m-select-buffer-hook)
-	(w3m-select-buffer-update)))))
-
-(defun w3m-mode ()
-  "Major mode for browsing web.
-
-\\<w3m-mode-map>\
-\\[w3m-view-this-url]	Display the page pointed to by the link under point.
-	You may use the prefix arg `2' or\
- `\\[universal-argument] \\<universal-argument-map>\
-\\[universal-argument-more]\\<w3m-mode-map>' to make a new session.
-\\[w3m-mouse-view-this-url]	Follow the link under the mouse pointer.
-	If w3m-use-form is t, `\\[w3m-view-this-url]' and\
- `\\[w3m-mouse-view-this-url]' enable you to enter forms.
-	You may use the prefix arg `2' or\
- `\\[universal-argument] \\<universal-argument-map>\
-\\[universal-argument-more]\\<w3m-mode-map>' to make a new session.
-\\[w3m-view-this-url-new-session]	Display the page of the link\
- in a new session.
-	If the region is active, visit all the links within the region.
-\\[w3m-mouse-view-this-url-new-session]	Display the page of the link\
- in a new session by mouse.
-
-\\[w3m-submit-form]	Submit the form at point.
-
-\\[w3m-reload-this-page]	Reload the current page.
-\\[w3m-reload-all-pages]	Reload all the pages.
-\\[w3m-redisplay-this-page]	Redisplay the current page.
-\\[w3m-redisplay-with-content-type]	Redisplay the page, specifying\
- a content type.
-\\[w3m-redisplay-with-charset]	Redisplay the current page, specifying\
- a charset.
-\\[w3m-redisplay-and-reset]	Redisplay the current page and reset\
- the user-specified charset and\n\tcontent type.
-
-\\[w3m-next-anchor]	Move the point to the next anchor.
-\\[w3m-previous-anchor]	Move the point to the previous anchor.
-\\[w3m-go-to-linknum] Move the point to the numbered anchor.
-\\[w3m-next-form]	Move the point to the next form.
-\\[w3m-previous-form]	Move the point to the previous form.
-\\[w3m-next-image]	Move the point to the next image.
-\\[w3m-previous-image]	Move the point to the previous image.
-
-\\[w3m-view-previous-page]	Move back to the previous page in the history.
-\\[w3m-view-next-page]	Move forward to the next page in the history.
-\\[w3m-view-parent-page]	Attempt to move to the parent directory of\
- the page.
-
-\\[w3m-goto-url]	Visit the web page.
-\\[w3m-goto-url-new-session]	Visit the web page in a new session.
-\\[w3m-gohome]	Go to the Home page.
-\\[w3m-view-url-with-external-browser]	Display the current page using the\
- external browser.
-
-\\[w3m-download]	Download the URL.
-\\[w3m-download-this-url]	Download the URL under point.
-
-\\[w3m-view-image]	Display the image under point in the external viewer.
-\\[w3m-save-image]	Save the image under point to a file.
-\\[w3m-toggle-inline-images]	Toggle the visibility of all images.
-\\[w3m-turnoff-inline-images]	Turn off to display all images.
-\\[w3m-zoom-out-image]	Zoom in an image on the point.
-\\[w3m-zoom-in-image]	Zoom out an image on the point.
-
-\\[w3m-print-this-url]	Display the url under point and put it into\
- `kill-ring'.
-\\[w3m-print-current-url]	Display the url of the current page and put\
- it into `kill-ring'.
-
-\\[w3m-view-source]	Display the html source of the current page.
-\\[w3m-view-header]	Display the header of the current page.
-\\[w3m-edit-current-url]	Edit the local file displayed as the current\
- page.
-\\[w3m-edit-this-url]	Edit the local file which is pointed to by URL under\
- point.
-
-\\[w3m-scroll-up-or-next-url]	Scroll up the current window, or go to the\
- next page.
-\\[w3m-scroll-down-or-previous-url]	Scroll down the current window, or\
- go to the previous page.
-\\[w3m-scroll-left]	Scroll to the left.
-\\[w3m-scroll-right]	Scroll to the right.
-\\[w3m-shift-left]	Shift to the left.
-\\[w3m-shift-right]	Shift to the right.
-\\[w3m-horizontal-recenter]	Recenter horizontally.
-\\[w3m-beginning-of-line]	Go to the entire beginning of line, may be\
- accompanied by scrolling.
-\\[w3m-end-of-line]	Go to the entire end of line, may be accompanied\
- by scrolling.
-
-\\[next-line]	Next line.
-\\[previous-line]	Previous line.
-\\[forward-char]	Forward char.
-\\[backward-char]	Backward char.
-
-\\[goto-line]	Go to the line, specifying the line number (beginning with 1).
-\\[w3m-history-store-position]	Mark the current position.
-\\[w3m-history-restore-position]	Go to the last marked position.
-
-\\[w3m-history]	Display the history of pages you have visited in the\
- session.
-	If it is called with the prefix arg, it displays the arrived URLs.
-\\[w3m-antenna]	Display the report of changes in web pages.
-	If it is called with the prefix arg, it updates the report.
-\\[w3m-antenna-add-current-url]	Add the current url to the antenna database.
-\\[w3m-search]	Query to the search engine a word.
-	To change the server, give any prefix argument to the command.
-\\[w3m-search-new-session] Query to the search engine a word in a new session.
-	To change the server, give any prefix argument to the command.
-\\[w3m-weather]	Display a weather report.
-	To change the local area, give any prefix argument to the command.
-\\[w3m-dtree]	Display a directory tree.
-	If the prefix arg is given, display files in addition to directories.
-\\[w3m-namazu]	Search files with Namazu.
-	To change the index, give any prefix argument to the command.
-
-\\[w3m-bookmark-view]	Display the bookmark.
-\\[w3m-bookmark-view-new-session]	Display the bookmark on a new session.
-\\[w3m-bookmark-add-current-url]	Add a url of the current page to\
- the bookmark.
-	If the prefix arg is given, the user will be prompted for the url.
-\\[w3m-bookmark-add-all-urls]	Add urls of all pages being visited to\
- the bookmark.
-\\[w3m-bookmark-add-this-url]	Add the url under point to the bookmark.
-
-\\[w3m-copy-buffer]	Create a copy of the current page as a new session.
-\\[w3m-next-buffer]	Turn the page of emacs-w3m buffers ahead.
-\\[w3m-previous-buffer]	Turn the page of emacs-w3m buffers behind.
-\\[w3m-select-buffer]	Pop to the emacs-w3m buffers selection window up.
-\\[w3m-switch-buffer]	Select one of emacs-w3m buffers at the current window.
-\\[w3m-delete-buffer]	Delete the current emacs-w3m buffer.
-\\[w3m-delete-other-buffers]	Delete emacs-w3m buffers except for the\
- current buffer.
-
-\\[w3m]	Start browsing web with emacs-w3m.
-\\[w3m-close-window]	Close all emacs-w3m windows, without deleteing\
- buffers.
-\\[w3m-quit]	Exit browsing web.  All emacs-w3m buffers will be deleted.
-
-\\[describe-mode]	describe-mode.
-
-\\[report-emacs-w3m-bug]	Send a bug report to the emacs-w3m team.
-"
-  (kill-all-local-variables)
-  (buffer-disable-undo)
-  (setq major-mode 'w3m-mode)
-  (setq mode-name "w3m")
-  (use-local-map w3m-mode-map)
-  (setq truncate-lines t
-	w3m-display-inline-images w3m-default-display-inline-images)
-  (when w3m-auto-show
-    (when (boundp 'auto-hscroll-mode)
-      (set (make-local-variable 'auto-hscroll-mode) nil))
-    (when (boundp 'automatic-hscrolling)
-      (set (make-local-variable 'automatic-hscrolling) nil))
-    (when (boundp 'auto-show-mode)
-      (set (make-local-variable 'auto-show-mode) nil))
-    (when (boundp 'hscroll-mode)
-      (set (make-local-variable 'hscroll-mode) nil)))
-  (make-local-variable 'list-buffers-directory)
-  (w3m-static-unless (featurep 'xemacs)
-    (setq show-trailing-whitespace nil))
-  (w3m-setup-toolbar)
-  (w3m-setup-menu)
-  (run-hooks 'w3m-mode-setup-functions)
-  (w3m-run-mode-hooks 'w3m-mode-hook))
-
-(defun w3m-scroll-up-1 (&optional arg)
-  "Scroll the current window up ARG line.
-ARG will be fixed into 1 when this function is called interactively.
-This function avoids the bug that Emacs 21.x hangs up when scrolling
-up for too many number of lines if `scroll-margin' is set as two or
-greater."
-  (interactive '(1))
-  (w3m-static-unless (featurep 'xemacs)
-    (when (and (numberp arg)
-	       (> arg 0)
-	       (numberp scroll-margin)
-	       (> scroll-margin 0))
-      (setq arg (min arg
-		     (max 0 (- (count-lines (window-start) (point-max))
-			       scroll-margin))))))
-  (scroll-up arg))
-
-(defun w3m-scroll-up-or-next-url (arg)
-  "Scroll the current window up ARG lines, or go to the next page."
-  (interactive "P")
-  (if (w3m-image-page-displayed-p)
-      (image-scroll-up arg)
-    (w3m-keep-region-active)
-    (if (pos-visible-in-window-p (point-max))
-	(if w3m-next-url
-	    (let ((w3m-prefer-cache t))
-	      (w3m-goto-url w3m-next-url))
-	  (signal 'end-of-buffer nil))
-      (w3m-scroll-up-1 arg))))
-
-(defun w3m-scroll-down-or-previous-url (arg)
-  "Scroll the current window down ARG lines, or go to the previous page."
-  (interactive "P")
-  (if (w3m-image-page-displayed-p)
-      (image-scroll-down arg)
-    (w3m-keep-region-active)
-    (if (pos-visible-in-window-p (point-min))
-	(if w3m-previous-url
-	    (let ((w3m-prefer-cache t))
-	      (w3m-goto-url w3m-previous-url))
-	  (signal 'beginning-of-buffer nil))
-      (scroll-down arg))))
-
-(defvar w3m-current-longest-line nil
-  "The length of the longest line in the window.")
-
-(defun w3m-set-current-longest-line ()
-  "Set the value of `w3m-current-longest-line'."
-  (save-excursion
-    (goto-char (window-start))
-    (end-of-line)
-    (setq w3m-current-longest-line 0)
-    ;; The XEmacs version of `window-end' returns the point beyond
-    ;; `point-max' if it is visible in the window.
-    (let ((end (min (window-end) (point-max))))
-      (while (progn
-	       (skip-chars-backward " ")
-	       (setq w3m-current-longest-line
-		     (max w3m-current-longest-line (current-column)))
-	       (end-of-line 2)
-	       (< (point) end))))))
-
-(defun w3m-scroll-left (arg)
-  "Scroll to the left.
-If ARG (the prefix) is a number, scroll the window ARG columns.
-Otherwise, it defaults to `w3m-horizontal-scroll-columns'."
-  (interactive "P")
-  (when (if (memq last-command '(w3m-scroll-left w3m-shift-left))
-	    (or (< (window-hscroll) w3m-current-longest-line)
-		(progn (ding) nil))
-	  (w3m-set-current-longest-line)
-	  (< (window-hscroll) w3m-current-longest-line))
-    (w3m-horizontal-scroll 'left (if arg
-				     (prefix-numeric-value arg)
-				   w3m-horizontal-scroll-columns))))
-
-(defun w3m-scroll-right (arg)
-  "Scroll to the right.
-If ARG (the prefix) is a number, scroll the window ARG columns.
-Otherwise, it defaults to `w3m-horizontal-scroll-columns'."
-  (interactive "P")
-  (if (zerop (window-hscroll))
-      (when (memq last-command '(w3m-scroll-right w3m-shift-right))
-	(ding))
-    (w3m-horizontal-scroll 'right (if arg
-				      (prefix-numeric-value arg)
-				    w3m-horizontal-scroll-columns))))
-
-(defun w3m-shift-left (arg)
-  "Shift to the left.  Shift means a fine level horizontal scrolling.
-If ARG (the prefix) is a number, scroll the window ARG columns.
-Otherwise, it defaults to `w3m-horizontal-shift-columns'."
-  (interactive "P")
-  (if (w3m-image-page-displayed-p)
-      (image-forward-hscroll (or arg 1))
-    (when (if (memq last-command '(w3m-scroll-left w3m-shift-left))
-	      (or (< (window-hscroll) w3m-current-longest-line)
-		  (progn (ding) nil))
-	    (w3m-set-current-longest-line)
-	    (< (window-hscroll) w3m-current-longest-line))
-      (w3m-horizontal-scroll 'left (if arg
-				       (prefix-numeric-value arg)
-				     w3m-horizontal-shift-columns)))))
-
-(defun w3m-shift-right (arg)
-  "Shift to the right.  Shift means a fine level horizontal scrolling.
-If ARG (the prefix) is a number, scroll the window ARG columns.
-Otherwise, it defaults to `w3m-horizontal-shift-columns'."
-  (interactive "P")
-  (if (w3m-image-page-displayed-p)
-      (image-backward-hscroll (or arg 1))
-    (if (zerop (window-hscroll))
-	(when (memq last-command '(w3m-scroll-right w3m-shift-right))
-	  (ding))
-      (w3m-horizontal-scroll 'right (if arg
-					(prefix-numeric-value arg)
-				      w3m-horizontal-shift-columns)))))
-
-(defvar w3m-horizontal-scroll-done nil)
-(make-variable-buffer-local 'w3m-horizontal-scroll-done)
-(defvar w3m-current-position '(-1 0 0))
-(make-variable-buffer-local 'w3m-current-position)
-
-(defun w3m-auto-show ()
-  "Scroll horizontally so that the point is visible."
-  (when (and truncate-lines
-	     w3m-auto-show
-	     (not w3m-horizontal-scroll-done)
-	     (not (and (eq last-command this-command)
-		       (or (eq (point) (point-min))
-			   (eq (point) (point-max)))))
-	     (or (memq this-command '(beginning-of-buffer end-of-buffer))
-		 (and (symbolp this-command)
-		      (string-match "\\`i?search-" (symbol-name this-command)))
-		 (and (markerp (nth 1 w3m-current-position))
-		      (markerp (nth 2 w3m-current-position))
-		      (>= (point)
-			  (marker-position (nth 1 w3m-current-position)))
-		      (<= (point)
-			  (marker-position (nth 2 w3m-current-position))))))
-    (w3m-horizontal-on-screen))
-  (setq w3m-horizontal-scroll-done nil))
-
-;; Ailiases to meet XEmacs bugs?
-(eval-and-compile
-  (unless (fboundp 'w3m-window-hscroll)
-    (defalias 'w3m-window-hscroll 'window-hscroll))
-  (unless (fboundp 'w3m-current-column)
-    (defalias 'w3m-current-column 'current-column))
-  (unless (fboundp 'w3m-set-window-hscroll)
-    (defalias 'w3m-set-window-hscroll 'set-window-hscroll)))
-
-(defun w3m-horizontal-scroll (direction ncol)
-  "Scroll the window NCOL columns horizontally to DIRECTION.
-DIRECTON should be the symbol `left' which specifies to scroll to the
-left, or any other Lisp object meaning to scroll to the right.  NCOL
-should be a number.  This function is a subroutine called by the
-commands `w3m-scroll-left', `w3m-scroll-right', `w3m-shift-left' and
-`w3m-shift-right'."
-  (setq w3m-horizontal-scroll-done t)
-  (let ((inhibit-point-motion-hooks t))
-    (w3m-set-window-hscroll (selected-window)
-			    (max 0
-				 (+ (w3m-window-hscroll)
-				    (if (eq direction 'left) ncol (- ncol)))))
-    (let ((hs (w3m-window-hscroll)))
-      (unless (and (>= (- (current-column) hs) 0)
-		   (< (- (current-column) hs) (window-width)))
-	(move-to-column (if (eq direction 'left) hs
-			  (+ hs (window-width)
-			     (w3m-static-if (featurep 'xemacs) -3 -2))))))))
-
-(defun w3m-horizontal-on-screen ()
-  "Scroll the window horizontally so that the current position is visible.
-See the documentation for the `w3m-horizontal-scroll-division' variable
-for details."
-  (when w3m-auto-show
-    (setq w3m-horizontal-scroll-done t)
-    (let ((cc (w3m-current-column))
-	  (hs (w3m-window-hscroll))
-	  (ww (window-width))
-	  (inhibit-point-motion-hooks t))
-      (unless (and (>= (- cc hs) 0)
-		   (< (+ (- cc hs) (if (eolp)
-				       0
-				     (w3m-static-if (featurep 'xemacs)
-					 3 2)))	;; '$$'
-		      ww))
-	(w3m-set-window-hscroll
-	 (selected-window)
-	 (max 0 (- cc (if (> hs cc)
-			  (/ ww w3m-horizontal-scroll-division)
-			(* (/ ww w3m-horizontal-scroll-division)
-			   (1- w3m-horizontal-scroll-division))))))))))
-
-(defun w3m-horizontal-recenter (&optional arg)
-  "Recenter horizontally.  With ARG, put the point on the column ARG.
-If `truncate-lines' is nil, it does nothing besides resetting the
-window's hscroll."
-  (interactive "P")
-  (if truncate-lines
-      (progn
-	(cond ((< (w3m-current-column) (window-hscroll))
-	       (move-to-column (w3m-window-hscroll))
-	       (setq arg 0))
-	      ((>= (w3m-current-column) (+ (window-hscroll) (window-width)))
-	       (move-to-column (+ (w3m-window-hscroll) (window-width) -2))
-	       (setq arg -1))
-	      ((listp arg)
-	       (setq arg (car arg))))
-	(w3m-set-window-hscroll
-	 (selected-window)
-	 (if (numberp arg)
-	     (if (>= arg 0)
-		 (max (- (current-column) arg) 0)
-	       (let* ((home (point))
-		      (inhibit-point-motion-hooks t)
-		      (maxcolumn (prog2
-				     (end-of-line)
-				     (1- (current-column))
-				   (goto-char home))))
-		 (max (min (- (current-column)
-			      (window-width)
-			      arg
-			      -2)
-			   maxcolumn)
-		      0)))
-	   (max (- (current-column) (/ (window-width) 2) -1)
-		0))))
-    (set-window-hscroll (selected-window) 0)))
-
-(defun w3m-recenter ()
-  "Recenter according to `w3m-view-recenter'."
-  (when (and w3m-view-recenter
-             (eq (window-buffer) (current-buffer)))
-    (recenter (if (eq t w3m-view-recenter)
-                  '(4)  ;; per "C-u C-l" to recenter in middle
-                w3m-view-recenter)))) ;; otherwise an integer
-
-(defun w3m-beginning-of-line (&optional arg)
-  "Make the beginning of the line visible and move the point to there."
-  (interactive "P")
-  (if (w3m-image-page-displayed-p)
-      (image-bol (or arg 1))
-    (w3m-keep-region-active)
-    (when (listp arg)
-      (setq arg (car arg)))
-    (set-window-hscroll (selected-window) 0)
-    (beginning-of-line arg)))
-
-(defun w3m-end-of-line (&optional arg)
-  "Move the point to the end of the line and scroll the window left.
-It makes the ends of upper and lower three lines visible.  If
-`truncate-lines' is nil, it works identically as `end-of-line'."
-  (interactive "P")
-  (if (w3m-image-page-displayed-p)
-      (image-eol (or arg 1))
-    (w3m-keep-region-active)
-    (if truncate-lines
-	(progn
-	  (when (listp arg)
-	    (setq arg (car arg)))
-	  (forward-line (1- (or arg 1)))
-	  (let ((inhibit-point-motion-hooks t)
-		home)
-	    (end-of-line)
-	    (setq home (point)
-		  arg (current-column))
-	    (dolist (n '(-3 -2 -1 1 2 3))
-	      (forward-line n)
-	      (end-of-line)
-	      (setq arg (max (current-column) arg))
-	      (goto-char home)))
-	  (setq temporary-goal-column arg
-		this-command 'next-line)
-	  (w3m-set-window-hscroll (selected-window)
-				  (max (- arg (window-width) -2) 0)))
-      (set-window-hscroll (selected-window) 0)
-      (end-of-line arg))))
-
-(defun w3m-pattern-uri-replace (uri format)
-  "Create a new uri from URI matched by last search according to FORMAT."
-  (replace-match format nil nil uri))
-
-(defun w3m-uri-replace (uri)
-  "Return the converted URI according to `w3m-uri-replace-alist'."
-  (catch 'found-replacement
-    (dolist (elem w3m-uri-replace-alist uri)
-      (when (string-match (car elem) uri)
-	(if (setq uri
-		  (cond
-		   ((consp (cdr elem))
-		    (apply (cadr elem) uri (cddr elem)))
-		   ;; Rest conditions are inserted in order to keep
-		   ;; backward compatibility.
-		   ((functionp (cdr elem))
-		    (funcall (cdr elem) uri))
-		   ((stringp (cdr elem))
-		    (w3m-pattern-uri-replace uri (cdr elem)))))
-	    (throw 'found-replacement uri)
-	  (error "Invalid replacement: %s" elem))))))
-
-(defun w3m-goto-mailto-url (url &optional post-data)
-  (let ((before (nreverse (buffer-list)))
-	comp info buffers buffer function)
-    (save-window-excursion
-      (if (and (symbolp w3m-mailto-url-function)
-	       (fboundp w3m-mailto-url-function))
-	  (funcall w3m-mailto-url-function url)
-	;; Require `mail-user-agent' setting
-	(unless (and (boundp 'mail-user-agent)
-		     (symbol-value 'mail-user-agent))
-	  (error "You must specify the valid value to `mail-user-agent'"))
-	(unless (and (setq comp (get (symbol-value 'mail-user-agent)
-				     'composefunc))
-		     (fboundp comp))
-	  (error "No function to compose a mail in `%s'"
-		 (symbol-value 'mail-user-agent)))
-	;; Use rfc2368.el if exist.
-	;; rfc2368.el is written by Sen Nagata.
-	;; You can find it in "contrib" directory of Mew package
-	;; or in "utils" directory of Wanderlust package.
-	(if (or (featurep 'rfc2368)
-		(condition-case nil (require 'rfc2368) (error nil)))
-	    (progn
-	      (setq info (rfc2368-parse-mailto-url url))
-	      (apply comp
-		     (append (mapcar (lambda (x)
-				       (cdr (assoc x info)))
-				     '("To" "Subject"))
-			     (if post-data
-				 (list
-				  (list (cons
-					 "body"
-					 (or (and
-					      (consp post-data)
-					      (concat (car post-data) "\n"))
-					     (concat post-data "\n")))))))))
-	  ;; without rfc2368.el.
-	  (string-match ":\\([^?]+\\)" url)
-	  (funcall comp (match-string 1 url)))))
-    (setq buffers (nreverse (buffer-list)))
-    (save-current-buffer
-      (while buffers
-	(setq buffer (car buffers)
-	      buffers (cdr buffers))
-	(unless (memq buffer before)
-	  (set-buffer buffer)
-	  (when (setq function
-		      (cdr (assq major-mode
-				 w3m-mailto-url-popup-function-alist)))
-	    (setq buffers nil)))))
-    (when function
-      (let (special-display-buffer-names
-	    special-display-regexps
-	    same-window-buffer-names
-	    same-window-regexps)
-	(funcall function buffer)))))
-
-(defun w3m-convert-ftp-url-for-emacsen (url)
-  (or (and (string-match "^ftp://?\\([^/@]+@\\)?\\([^/]+\\)\\(?:/~/\\)?" url)
-	   (concat "/"
-		   (if (match-beginning 1)
-		       (substring url (match-beginning 1) (match-end 1))
-		     "anonymous@")
-		   (substring url (match-beginning 2) (match-end 2))
-		   ":"
-		   (substring url (match-end 2))))
-      (error "URL is strange")))
-
-(defun w3m-file-directory-p (file)
-  "Emulate the `file-directory-p' function for the remote file FILE."
-  (when (file-exists-p file)
-    (let (dirp (i 10))
-      (catch 'loop
-	(while (> i 0)
-	  (setq dirp (car (file-attributes file)))
-	  (if (stringp dirp)
-	      (setq file (expand-file-name
-			  dirp
-			  (file-name-directory (directory-file-name file)))
-		    i (1- i))
-	    (throw 'loop dirp)))))))
-
-(defun w3m-goto-ftp-url (url &optional filename)
-  "Copy a remote file to the local system or run dired for ftp URLs.
-If URL looks like a file, it will perform the copy.  Otherwise, it
-will run `dired-other-window' using `ange-ftp' or `efs'.  Optional
-FILENAME specifies the name of a local file.  If FILENAME is omitted,
-this function will prompt user for it."
-  (let ((ftp (w3m-convert-ftp-url-for-emacsen url))
-	file)
-    (if (or (string-equal "/" (substring ftp -1))
-	    ;; `file-directory-p' takes a long time for remote files.
-	    ;; `file-directory-p' returns t in Emacsen, anytime.
-	    (w3m-file-directory-p ftp))
-	(dired-other-window ftp)
-      (setq file (file-name-nondirectory ftp))
-      (unless filename
-	(setq filename (w3m-read-file-name nil nil file)))
-      (unless (file-writable-p (file-name-directory filename))
-	(error "Permission denied, %s" (file-name-directory filename)))
-      (when (or (not (file-exists-p filename))
-		(if (file-writable-p filename)
-		    (and (prog1
-			     (y-or-n-p
-			      (format "File(%s) already exists. Overwrite? "
-				      filename))
-			   (message nil))
-			 (progn
-			   (delete-file filename)
-			   t))
-		  (error "Permission denied, %s" filename)))
-	(copy-file ftp filename)
-	(message "Wrote %s" filename)))))
-
-(unless w3m-doc-view-map
-  (setq w3m-doc-view-map (make-sparse-keymap))
-  (define-key w3m-doc-view-map "q" 'w3m-doc-view-quit))
-
-(defun w3m-doc-view (url)
-  "View PDF/PostScript/DVI files using `doc-view-mode'.
-`w3m-pop-up-windows' and `w3m-pop-up-frames' control how the document
-window turns up."
-  (let* ((basename (file-name-nondirectory (w3m-url-strip-query url)))
-	 (regexp (concat "\\`" (regexp-quote basename) "\\(?:<[0-9]+>\\)?\\'"))
-	 (buffers (buffer-list))
-	 buffer data case-fold-search)
-    (save-current-buffer
-      (while buffers
-	(setq buffer (pop buffers))
-	(if (and (string-match regexp (buffer-name buffer))
-		 (progn
-		   (set-buffer buffer)
-		   (eq major-mode 'doc-view-mode))
-		 (equal buffer-file-name url))
-	    (setq buffers nil)
-	  (setq buffer nil))))
-    (unless (prog1
-		buffer
-	      (unless buffer
-		(setq buffer (generate-new-buffer basename)
-		      data (buffer-string)))
-	      (let ((pop-up-windows w3m-pop-up-windows)
-		    (pop-up-frames w3m-pop-up-frames))
-		(pop-to-buffer buffer)))
-      (set-buffer-multibyte nil)
-      (insert data)
-      (set-buffer-modified-p nil)
-      (setq buffer-file-name url)
-      (doc-view-mode)
-      (use-local-map w3m-doc-view-map)
-      (set-keymap-parent w3m-doc-view-map doc-view-mode-map)
-      'internal-view)))
-
-(defun w3m-doc-view-quit (&optional kill)
-  "Quit the `doc-view-mode' window that emacs-w3m launches.
-With the prefix argument KILL, kill the buffer."
-  (interactive "P")
-  (cond (w3m-pop-up-frames
-	 (when (prog1 (one-window-p t) (quit-window kill))
-	   (delete-frame (selected-frame))))
-	(w3m-pop-up-windows
-	 (if (fboundp 'quit-window)
-	     (quit-window kill)
-	   (if kill
-	       (progn
-		 (set-buffer-modified-p nil)
-		 (kill-buffer (current-buffer)))
-	     (bury-buffer)))
-	 (unless (eq (next-window nil 'no-mini) (selected-window))
-	   (delete-window)))))
-
-(eval-and-compile
-  (unless (fboundp 'w3m-add-local-hook)
-    ;; Silence the byte compiler; `w3m-add-local-hook' will be defined
-    ;; in w3m-ems.el for GNU Emacs.
-    (eval-when-compile
-      (when (eq 'byte-compile-obsolete (get 'make-local-hook 'byte-compile))
-	(put 'make-local-hook 'byte-compile nil)
-	(put 'make-local-hook 'byte-obsolete-info nil)))
-    (defun w3m-add-local-hook (hook function &optional append)
-      "Add to the buffer-local value of HOOK the function FUNCTION.
-This function is designed for XEmacs."
-      (make-local-hook hook)
-      (add-hook hook function append t))
-    (defun w3m-remove-local-hook (hook function)
-      "Remove to the buffer-local value of HOOK the function FUNCTION.
-This function is designed for XEmacs."
-      (remove-hook hook function t))))
-
-(defun w3m-store-current-position ()
-  "Memorize the current positions whenever every command starts.
-The value will be held in the `w3m-current-position' variable.  This
-function is designed as the hook function which is registered to
-`pre-command-hook' by `w3m-buffer-setup'."
-  (setq w3m-current-position (list (point)
-				   (copy-marker (point-at-bol))
-				   (copy-marker (point-at-eol)))))
-
-(defun w3m-check-current-position ()
-  "Run `w3m-after-cursor-move-hook' if the point gets away from the window.
-This function is designed as the hook function which is registered to
-`post-command-hook' by `w3m-buffer-setup'."
-  (when (/= (point) (car w3m-current-position))
-    ;; To bind `deactivate-mark' to nil protects the mark from being
-    ;; deactivated.  `deactivate-mark' is set when any function modifies
-    ;; a buffer, and it causes the deactivation of the mark.
-    (let ((deactivate-mark nil))
-      (run-hooks 'w3m-after-cursor-move-hook))))
-
-(defun w3m-buffer-setup ()
-  "Generate a new buffer, select it and set it up for emacs-w3m.
-When the current buffer has already been prepared, it won't bother to
-generate a new buffer."
-  (unless (eq major-mode 'w3m-mode)
-    (let ((buffer (w3m-alive-p t)))
-      (if buffer
-	  (set-buffer buffer)
-	(set-buffer (w3m-generate-new-buffer "*w3m*"))
-	(w3m-mode))))
-  ;; It may have been set to nil for viewing a page source or a header.
-  (setq truncate-lines t)
-  (w3m-add-local-hook 'pre-command-hook 'w3m-store-current-position)
-  (w3m-add-local-hook 'post-command-hook 'w3m-check-current-position)
-  (w3m-initialize-graphic-icons)
-  (setq mode-line-buffer-identification
-	`(,@(w3m-static-if (featurep 'xemacs)
-		(list (cons modeline-buffer-id-right-extent "%b") " ")
-	      (nconc (propertized-buffer-identification "%b") '(" ")))
-	  (w3m-current-process
-	   w3m-modeline-process-status-on
-	   (w3m-current-ssl
-	    (w3m-display-inline-images
-	     w3m-modeline-ssl-image-status-on
-	     w3m-modeline-ssl-status-off)
-	    (w3m-display-inline-images
-	     w3m-modeline-image-status-on
-	     w3m-modeline-status-off)))
-	  (w3m-show-graphic-icons-in-mode-line
-	   (w3m-use-favicon
-	    (w3m-favicon-image
-	     w3m-modeline-favicon
-	     w3m-modeline-separator)
-	    w3m-modeline-separator)
-	   w3m-modeline-separator)
-	  (w3m-current-process
-	   "Loading..." ,(if (fboundp 'format-mode-line)
-			     '(:eval (w3m-modeline-title))
-			   (if w3m-use-title-buffer-name
-			       ""
-			     'w3m-current-title)))))
-  (unless (assq 'w3m-current-process mode-line-process)
-    (setq mode-line-process
-	  (cons (list 'w3m-current-process 'w3m-process-modeline-string)
-		mode-line-process))))
-
-(defvar w3m-modeline-title-string nil
-  "Internal variable used to keep contents to be shown in the mode line.
-This is a buffer-local variable.")
-(make-variable-buffer-local 'w3m-modeline-title-string)
-
-(defvar w3m-modeline-title-timer nil
-  "Say time has not gone by after the mode line was updated last time.
-It is used to control the `w3m-modeline-title' function running too
-frequently, set by the function itself and cleared by a timer.")
-(make-variable-buffer-local 'w3m-modeline-title-timer)
-
-(eval-when-compile
-  (unless (fboundp 'format-mode-line)
-    (defalias 'format-mode-line 'ignore)))
-
-(defun w3m-modeline-title ()
-  "Return a truncated title not to cut the right end of the mode line.
-It currently works only with Emacs 22 and newer."
-  (if w3m-use-title-buffer-name
-      ""
-    (when w3m-current-title
-      (or (and w3m-modeline-title-timer w3m-modeline-title-string)
-	  (prog2
-	      (setq w3m-modeline-title-string w3m-current-title
-		    w3m-modeline-title-timer t)
-	      (let ((excess (- (string-width
-				(condition-case nil
-				    (format-mode-line mode-line-format 1)
-				  (error "")))
-			       (window-width)))
-		    (tlen (string-width w3m-current-title)))
-		(when (and (> excess 0)
-			   (> tlen 3))
-		  (setq w3m-modeline-title-string
-			(concat (w3m-replace-in-string
-				 (w3m-truncate-string
-				  w3m-current-title (max (- tlen excess 3) 2))
-				 "[\t ]+\\'" "")
-				"...")))
-		w3m-modeline-title-string)
-	    (run-at-time 0.5 nil
-			 (lambda (buffer)
-			   (when (buffer-live-p buffer)
-			     (with-current-buffer buffer
-			       (setq w3m-modeline-title-timer nil))))
-			 (current-buffer)))))))
-
-(defconst w3m-buffer-local-url "buffer://")
-(defun w3m-buffer-local-url-p (url)
-  (save-match-data
-    (string-match (concat "^" w3m-buffer-local-url) url)))
-
-;;;###autoload
-(defun w3m-goto-url (url &optional reload charset post-data referer handler
-			 element no-popup)
-  "Visit World Wide Web pages.  This is the primitive function of `w3m'.
-If the second argument RELOAD is non-nil, reload a content of URL.
-Except that if it is 'redisplay, re-display the page without reloading.
-The third argument CHARSET specifies a charset to be used for decoding
-a content.
-The fourth argument POST-DATA should be a string or a cons cell.  If
-it is a string, it makes this function request a body as if the
-content-type is \"x-www-form-urlencoded\".  If it is a cons cell, the
-car of a cell is used as the content-type and the cdr of a cell is
-used as the body.
-If the fifth argument REFERER is specified, it is used for a Referer:
-field for this request.
-The remaining HANDLER, ELEMENT[1], and NO-POPUP are for the
-internal operations of emacs-w3m.
-You can also use \"quicksearch\" url schemes such as \"gg:emacs\" which
-would search for the term \"emacs\" with the Google search engine.  See
-the `w3m-search' function and the variable `w3m-uri-replace-alist'.
-
-\[1] A note for the developers: ELEMENT is a history element which has
-already been registered in the `w3m-history-flat' variable.  It is
-corresponding to URL to be retrieved at this time, not for the url of
-the current page."
-  (interactive
-   (list (w3m-input-url nil nil nil nil 'feeling-lucky)
-	 current-prefix-arg
-	 (w3m-static-if (fboundp 'universal-coding-system-argument)
-	     coding-system-for-read)))
-  (when (and (stringp url)
-	     (not (interactive-p)))
-    (setq url (w3m-canonicalize-url url)))
-  (set-text-properties 0 (length url) nil url)
-  (setq url (w3m-uri-replace url))
-  (unless (or (w3m-url-local-p url)
-	      (string-match "\\`about:" url))
-    (w3m-string-match-url-components url)
-    (setq url (concat (w3m-url-transfer-encode-string
-		       (substring url 0 (match-beginning 8))
-		       (or w3m-current-coding-system
-			   w3m-default-coding-system))
-		      (if (match-beginning 8)
-			  (concat "#" (match-string 9 url))
-			""))))
-  (cond
-   ;; process mailto: protocol
-   ((string-match "\\`mailto:" url)
-    (w3m-goto-mailto-url url post-data))
-   ;; process ftp: protocol
-   ((and w3m-use-ange-ftp
-	 (string-match "\\`ftps?://" url)
-	 (not (string= "text/html" (w3m-local-content-type url))))
-    (w3m-goto-ftp-url url))
-   ;; find-file directly
-   ((condition-case nil
-	(and (w3m-url-local-p url)
-	     w3m-local-find-file-function
-	     (let ((base-url (w3m-url-strip-fragment url))
-		   (match (car w3m-local-find-file-regexps))
-		   nomatch file)
-	       (and (or (not match)
-			(string-match match base-url))
-		    (not (and (setq nomatch (cdr w3m-local-find-file-regexps))
-			      (string-match nomatch base-url)))
-		    (setq file (w3m-url-to-file-name base-url))
-		    (file-exists-p file)
-		    (not (file-directory-p file))
-		    (prog1
-			t
-		      (funcall (if (functionp w3m-local-find-file-function)
-				   w3m-local-find-file-function
-				 (eval w3m-local-find-file-function))
-			       file)))))
-      (error nil)))
-   ;; process buffer-local url
-   ((w3m-buffer-local-url-p url)
-    (let (file-part fragment-part)
-      (w3m-string-match-url-components url)
-      (setq file-part (concat (match-string 4 url)
-			      (match-string 5 url))
-	    fragment-part (match-string 9 url))
-      (cond
-       ((and (string= file-part "")
-	     fragment-part)
-	(w3m-search-name-anchor fragment-part))
-       ((not (string= file-part ""))
-	(w3m-goto-url (w3m-expand-url (substring url (match-beginning 4))
-				      (concat "file://" default-directory))
-		      reload charset post-data referer handler element))
-       (t (w3m-message "No URL at point")))))
-   ((w3m-url-valid url)
-    (w3m-buffer-setup)			; Setup buffer.
-    (w3m-arrived-setup)			; Setup arrived database.
-    (unless no-popup
-      (w3m-popup-buffer (current-buffer)))
-    (w3m-cancel-refresh-timer (current-buffer))
-    (when w3m-current-process
-      (error "%s"
-	     (substitute-command-keys "
-Cannot run two w3m processes simultaneously \
-\(Type `\\<w3m-mode-map>\\[w3m-process-stop]' to stop asynchronous process)")))
-    (w3m-process-stop (current-buffer))	; Stop all processes retrieving images.
-    (w3m-idle-images-show-unqueue (current-buffer))
-    ;; Store the current position in the history structure if and only
-    ;; if this command is called interactively.  The other user commands
-    ;; that calls this function want to store the position by themselves.
-    (when (interactive-p)
-      (w3m-history-store-position))
-    ;; Access url group
-    (if (string-match "\\`group:" url)
-	(let ((urls (mapcar 'w3m-url-decode-string
-			    (split-string (substring url (match-end 0)) "&")))
-	      (w3m-async-exec (and w3m-async-exec-with-many-urls
-				   w3m-async-exec)))
-	  (w3m-process-do
-	      (type (prog1
-			(w3m-goto-url (car urls))
-		      (dolist (url (cdr urls))
-			(save-window-excursion
-			  (with-current-buffer (w3m-copy-buffer nil nil nil
-								'empty)
-			    (w3m-goto-url url))))))
-	    type))
-      ;; Retrieve the page.
-      (lexical-let ((orig url)
-		    (url (w3m-url-strip-authinfo url))
-		    (reload (and (not (eq reload 'redisplay)) reload))
-		    (redisplay (eq reload 'redisplay))
-		    (charset charset)
-		    (post-data post-data)
-		    (referer referer)
-		    (name)
-		    (history-position (get-text-property (point)
-							 'history-position))
-		    (reuse-history w3m-history-reuse-history-elements))
-	(when w3m-current-forms
-	  ;; Store the current forms in the history structure.
-	  (w3m-history-plist-put :forms w3m-current-forms))
-	(let ((w3m-current-buffer (current-buffer)))
-	  (unless element
-	    (setq element
-		  (if (and (equal referer "about://history/")
-			   history-position)
-		      (w3m-history-element history-position t)
-		    (if w3m-history-reuse-history-elements
-			(w3m-history-assoc url)))))
-	  ;; Set current forms using the history structure.
-	  (when (setq w3m-current-forms
-		      (when (and (not reload) ; If reloading, ignore history.
-				 (null post-data) ; If post, ignore history.
-				 (or (w3m-cache-available-p url)
-				     (w3m-url-local-p url)))
-			;; Don't use `w3m-history-plist-get' here.
-			(plist-get (nthcdr 3 element) :forms)))
-	    ;; Mark that the form is from history structure.
-	    (setq w3m-current-forms (cons t w3m-current-forms)))
-	  (when (and post-data element)
-	    ;; Remove processing url's forms from the history structure.
-	    (w3m-history-set-plist (cadr element) :forms nil))
-	  ;; local directory URL check
-	  (when (and (w3m-url-local-p url)
-		     (file-directory-p (w3m-url-to-file-name url))
-		     (setq url (file-name-as-directory url))
-		     (eq w3m-local-directory-view-method 'w3m-dtree)
-		     (string-match "\\`file:///" url))
-	    (setq url (replace-match "about://dtree/" nil nil url)
-		  orig url))
-	  ;; Split body and fragments.
-	  (w3m-string-match-url-components url)
-	  (and (match-beginning 8)
-	       (setq name (match-string 9 url)
-		     url (substring url 0 (match-beginning 8))))
-	  (when (w3m-url-local-p url)
-	    (unless (string-match "[^\000-\177]" url)
-	      (setq url (w3m-url-decode-string url))))
-	  (w3m-process-do
-	      (action
-	       (if (and (not reload)
-			(not redisplay)
-			(stringp w3m-current-url)
-			(string= url w3m-current-url))
-		   (progn
-		     (w3m-refontify-anchor)
-		     'cursor-moved)
-		 (when w3m-name-anchor-from-hist
-		   (w3m-history-plist-put
-		    :name-anchor-hist
-		    (append (list 1 nil)
-			    (and (integerp (car w3m-name-anchor-from-hist))
-				 (nthcdr (1+ (car w3m-name-anchor-from-hist))
-					 w3m-name-anchor-from-hist)))))
-		 (setq w3m-name-anchor-from-hist
-		       (plist-get (nthcdr 3 element) :name-anchor-hist))
-		 (setq w3m-current-process
-		       (w3m-retrieve-and-render orig reload charset
-						post-data referer handler))))
-	    (with-current-buffer w3m-current-buffer
-	      (setq w3m-current-process nil)
-	      (if (not action)
-		  (progn
-		    (w3m-history-push w3m-current-url
-				      (list :title (or w3m-current-title
-						       "<no-title>")))
-		    (goto-char (point-min)))
-		(when (and name
-			   (progn
-			     ;; Redisplay to search an anchor sure.
-			     (sit-for 0)
-			     (w3m-search-name-anchor
-			      (w3m-url-transfer-encode-string
-			       name
-			       (or w3m-current-coding-system
-				   w3m-default-coding-system))
-			      nil (not (eq action 'cursor-moved)))))
-		  (setf (w3m-arrived-time (w3m-url-strip-authinfo orig))
-			(w3m-arrived-time url)))
-		(unless (eq action 'cursor-moved)
-		  (if (equal referer "about://history/")
-		      ;; Don't sprout a new branch for the existing history
-		      ;; element.
-		      (let ((w3m-history-reuse-history-elements t))
-			(w3m-history-push w3m-current-url
-					  (list :title w3m-current-title))
-			;; Fix the history position pointers.
-			(when history-position
-			  (setcar w3m-history
-				  (w3m-history-regenerate-pointers
-				   history-position))))
-		    (let ((w3m-history-reuse-history-elements reuse-history)
-			  (position (when (eq 'reload reuse-history)
-				      (cadar w3m-history))))
-		      (w3m-history-push w3m-current-url
-					(list :title w3m-current-title))
-		      (when position
-			(w3m-history-set-current position))))
-		  (w3m-history-add-properties (list :referer referer
-						    :post-data post-data))
-		  (unless w3m-toggle-inline-images-permanently
-		    (setq w3m-display-inline-images
-			  w3m-default-display-inline-images))
-		  (when (and w3m-use-form reload)
-		    (w3m-form-textarea-files-remove))
-		  (cond ((w3m-display-inline-images-p)
-			 (and w3m-force-redisplay (sit-for 0))
-			 (w3m-toggle-inline-images 'force reload))
-			((and (w3m-display-graphic-p)
-			      (eq action 'image-page))
-			 (and w3m-force-redisplay (sit-for 0))
-			 (w3m-toggle-inline-image 'force reload)))))
-	      (setq buffer-read-only t)
-	      (set-buffer-modified-p nil)
-	      (setq list-buffers-directory w3m-current-title)
-	      ;; must be `w3m-current-url'
-	      (setq default-directory (w3m-current-directory w3m-current-url))
-	      (w3m-buffer-name-add-title)
-	      (w3m-update-toolbar)
-	      (w3m-select-buffer-update)
-	      (let ((real-url (if (w3m-arrived-p url)
-				  (or (w3m-real-url url) url)
-				url)))
-		(run-hook-with-args 'w3m-display-functions real-url)
-		(run-hook-with-args 'w3m-display-hook real-url))
-	      (w3m-session-crash-recovery-save)
-	      (when (and w3m-current-url
-			 (stringp w3m-current-url)
-			 (or (string-match
-			      "\\`about://\\(?:header\\|source\\)/"
-			      w3m-current-url)
-			     (equal (w3m-content-type w3m-current-url)
-				    "text/plain")))
-		(setq truncate-lines nil))
-	      ;; restore position must call after hooks for localcgi.
-	      (when (or reload redisplay)
-		(w3m-history-restore-position))
-	      (w3m-set-buffer-unseen)
-	      (w3m-refresh-at-time)))))))
-   (t (w3m-message "Invalid URL: %s" url))))
-
-(defun w3m-current-directory (url)
-  "Return a directory used as the current directory in a page visiting URL.
-See `w3m-default-directory'."
-  (or (and url
-	   (stringp url)
-	   (let (file)
-	     (if (string-match "\\`ftp://" url)
-		 (progn
-		   (setq file (w3m-convert-ftp-url-for-emacsen url))
-		   (file-name-as-directory
-		    (if (string-match "/\\`" file)
-			file
-		      (file-name-directory file))))
-	       (and (setq file (w3m-url-to-file-name url))
-		    (file-exists-p file)
-		    (file-name-as-directory
-		     (if (file-directory-p file)
-			 file
-		       (file-name-directory file)))))))
-      (let (directory)
-	(file-name-as-directory
-	 (or (and (stringp w3m-default-directory)
-		  (file-directory-p w3m-default-directory)
-		  (expand-file-name w3m-default-directory))
-	     (and (symbolp w3m-default-directory)
-		  (boundp w3m-default-directory)
-		  (setq directory (symbol-value w3m-default-directory))
-		  (stringp directory)
-		  (file-directory-p directory)
-		  (expand-file-name directory))
-	     (and (functionp w3m-default-directory)
-		  (stringp (setq directory
-				 (condition-case nil
-				     (funcall w3m-default-directory url)
-				   (error nil))))
-		  (file-directory-p directory)
-		  (expand-file-name directory))
-	     w3m-profile-directory)))))
-
-(defun w3m-refresh-at-time ()
-  (when (and w3m-use-refresh w3m-current-refresh)
-    (if (= (car w3m-current-refresh) 0)
-	(w3m-goto-url-with-timer (cdr w3m-current-refresh) (current-buffer))
-      (setq w3m-refresh-timer
-	    (run-at-time (car w3m-current-refresh)
-			 nil
-			 'w3m-goto-url-with-timer
-			 (cdr w3m-current-refresh)
-			 (current-buffer))))))
-
-(defun w3m-goto-url-with-timer (url buffer)
-  "Run the `w3m-goto-url' function by the refresh timer."
-  (when (and (w3m-url-valid url) buffer (get-buffer buffer))
-    (cond
-     ((get-buffer-window buffer)
-      (save-selected-window
-	(pop-to-buffer buffer)
-	(with-current-buffer buffer
-	  (w3m-cancel-refresh-timer buffer)
-	  (if (and w3m-current-url
-		   (string= url w3m-current-url))
-	      (w3m-reload-this-page t)
-	    (w3m-goto-url url)))))
-     ((buffer-live-p buffer)
-      (let* ((cwin (selected-window))
-	     (cbuf (window-buffer cwin)))
-	(with-current-buffer buffer
-	  (w3m-cancel-refresh-timer buffer)
-	  (if (and w3m-current-url
-		   (string= url w3m-current-url))
-	      (w3m-reload-this-page t t)
-	    (w3m-goto-url url nil
-			  nil nil nil nil nil t)))
-	(set-window-buffer cwin cbuf)))
-     (t
-      (with-current-buffer buffer
-	(w3m-cancel-refresh-timer buffer))))))
-
-(defun w3m-goto-new-session-url (&optional reload)
-  "Open `w3m-new-session-url' in a new session."
-  (interactive "P")
-  (if (not (eq major-mode 'w3m-mode))
-      (message "This command can be used in w3m mode only")
-    (w3m-view-this-url-1 w3m-new-session-url reload 'new-session)))
-
-;;;###autoload
-(defun w3m-goto-url-new-session (url &optional reload charset post-data
-				     referer)
-  "Visit World Wide Web pages in a new session.
-If you invoke this command in the emacs-w3m buffer, the new session
-will be created by copying the current session.  Otherwise, the new
-session will start afresh."
-  (interactive
-   (list (w3m-input-url nil nil	nil nil 'feeling-lucky)
-	 current-prefix-arg
-	 (w3m-static-if (fboundp 'universal-coding-system-argument)
-	     coding-system-for-read)
-	 nil ;; post-data
-	 nil)) ;; referer
-  (let (buffer)
-    (if (or (eq 'w3m-mode major-mode)
-	    (and (setq buffer (w3m-alive-p))
-		 (progn
-		   (w3m-popup-buffer buffer)
-		   t)))
-	(progn
-	  ;; Store the current position in the history structure.
-	  (w3m-history-store-position)
-	  (switch-to-buffer (setq buffer
-				  (w3m-copy-buffer nil nil
-						   w3m-new-session-in-background
-						   'empty)))
-	  (w3m-display-progress-message url)
-	  (w3m-goto-url url
-			(or reload
-			    ;; When new URL has `name' portion, we have to
-			    ;; goto the base url because generated buffer
-			    ;; has no content at this moment.
-			    (and (progn
-				   (w3m-string-match-url-components url)
-				   (match-beginning 8))
-				 'redisplay))
-			charset post-data referer)
-	  ;; Delete useless newly created buffer if it is empty.
-	  (w3m-delete-buffer-if-empty buffer))
-      (w3m-goto-url url))))
-
-(defun w3m-move-point-for-localcgi (url)
-  (when (and (w3m-url-local-p url)
-	     (file-directory-p (w3m-url-to-file-name url))
-	     (not (eq w3m-local-directory-view-method 'w3m-dtree))
-	     (= (point-min) (point))
-	     (w3m-search-name-anchor "current" 'quiet))
-    (recenter (/ (window-height) 5))))
-
-;;;###autoload
-(defun w3m-gohome ()
-  "Go to the Home page."
-  (interactive)
-  (unless w3m-home-page
-    (error "You have to specify the value of `w3m-home-page'"))
-  (w3m-goto-url w3m-home-page))
-
-(defun w3m-reload-this-page (&optional arg no-popup)
-  "Reload the current page, disregarding the cached contents.
-If the prefix arg ARG is given, it also clears forms and post data."
-  (interactive "P")
-  (if w3m-current-url
-      (let ((w3m-history-reuse-history-elements
-	     ;; Don't move the history position.
-	     'reload)
-	    post-data)
-	(if arg
-	    (progn
-	      (w3m-history-remove-properties '(:forms nil :post-data nil))
-	      (setq w3m-current-forms nil))
-	  (when (and (setq post-data (w3m-history-plist-get :post-data))
-		     (not (y-or-n-p "Repost form data? ")))
-	    (setq post-data nil)))
-	(w3m-history-store-position)
-	(w3m-goto-url w3m-current-url 'reload nil post-data
-		      (w3m-history-plist-get :referer)
-		      nil
-		      (w3m-history-element (cadar w3m-history) t)
-		      no-popup)
-	(w3m-history-restore-position))
-    (w3m-message "Can't reload this page")))
-
-(defun w3m-reload-all-pages (&optional arg)
-  "Reload all pages, disregarding the cached contents.
-If the prefix arg ARG is given, it also clears forms and post data."
-  (interactive "P")
-  (if arg
-      (save-window-excursion
-	(dolist (buffer (w3m-list-buffers))
-	  (switch-to-buffer buffer)
-	  (w3m-reload-this-page)))
-    (dolist (buffer (w3m-list-buffers))
-      (save-window-excursion
-	(switch-to-buffer buffer)
-	(w3m-reload-this-page)))))
-
-(defun w3m-redisplay-this-page (&optional arg)
-  "Redisplay the current page.
-If the prefix arg ARG is given, it toggles the visibility of images."
-  (interactive "P")
-  (if (null w3m-current-url)
-      (w3m-message "Can't redisplay this page")
-    (when arg
-      (setq w3m-display-inline-images (not w3m-display-inline-images)))
-    (let ((w3m-prefer-cache t)
-	  (w3m-history-reuse-history-elements
-	   ;; Don't move the history position.
-	   'reload))
-      (w3m-history-store-position)
-      (w3m-goto-url w3m-current-url 'redisplay)
-      (w3m-history-restore-position))))
-
-(defun w3m-redisplay-and-reset (&optional arg)
-  "Redisplay the current page and reset the user-specified values.
-This function clears the charset and the content type which the user
-specified for overriding the values of what the page requires.  The
-prefix argument ARG is passed to the `w3m-redisplay-this-page'
-function (which see)."
-  (interactive "P")
-  (if (null w3m-current-url)
-      (w3m-message "Can't execute this page")
-    (setf (w3m-arrived-content-type w3m-current-url) nil)
-    (setf (w3m-arrived-content-charset
-	   (if (string-match "\\`about://source/" w3m-current-url)
-	       (substring w3m-current-url (match-end 0))
-	     w3m-current-url))
-	  nil)
-    (w3m-redisplay-this-page arg)))
-
-(defun w3m-redisplay-with-charset (&optional arg)
-  "Redisplay the current page, specifying a charset.
-If the user enters the empty string, the value which once was used for
-decoding the page is used.  The prefix argument ARG is passed to the
-`w3m-redisplay-this-page' function (which see)."
-  (interactive "P")
-  (if (null w3m-current-url)
-      (w3m-message "Can't execute the command")
-    (setf (w3m-arrived-content-charset
-	   (if (string-match "\\`about://source/" w3m-current-url)
-	       (substring w3m-current-url (match-end 0))
-	     w3m-current-url))
-	  (w3m-read-content-charset
-	   (format "Content-charset (current %s, default reset): "
-		   w3m-current-coding-system)))
-    (w3m-redisplay-this-page arg)))
-
-(defun w3m-redisplay-with-content-type (&optional arg)
-  "Redisplay the current page, specifying a content type.
-If the user enters the empty string, it uses the value which was
-specified by the page's contents itself.  The prefix argument ARG is
-passed to the `w3m-redisplay-this-page' function (which see)."
-  (interactive "P")
-  (if (null w3m-current-url)
-      (w3m-message "Can't execute this page")
-    (setf (w3m-arrived-content-type w3m-current-url)
-	  (let ((type (completing-read
-		       (format "Content-type (current %s, default reset): "
-			       (or (w3m-arrived-content-type w3m-current-url)
-				   (w3m-content-type w3m-current-url)))
-		       w3m-content-type-alist nil t)))
-	    (unless (string= type "") type)))
-    (w3m-redisplay-this-page arg)))
-
-(defun w3m-examine-command-line-args ()
-  "Return a url when the `w3m' command is invoked from the command line.
-The `w3m' Lisp command can be invoked even in the batch mode, e.g.,
-``emacs -f w3m'' or ``emacs -f w3m url''.  This function is used in
-the very case, it extracts a url string from the command line
-arguments and passes it to the `w3m' command.  If a url is omitted, it
-defaults to the value of `w3m-home-page' or \"about:\"."
-  (let ((url (car command-line-args-left))
-	(directives '("-f" "-funcall" "--funcall" "-e"))
-	args)
-    (if (and url (not (string-match "\\`-" url)))
-	(progn
-	  (setq command-line-args-left (cdr command-line-args-left))
-	  (when (string-match "\\`[\t ]*\\'" url)
-	    ;; emacs -f w3m '' ...
-	    (setq url (or w3m-home-page "about:"))))
-      (setq args (nthcdr (max (- (length command-line-args)
-				 (length command-line-args-left)
-				 2)
-			      1)
-			 command-line-args))
-      (when (and (equal (cadr args) "w3m")
-		 (member (car args) directives))
-	(setq url (or w3m-home-page "about:"))))
-    (unless
-	(and command-line-args-left
-	     (progn
-	       (setq args (reverse command-line-args-left))
-	       (while (and args
-			   (not (and (setq args (cdr (member "w3m" args)))
-				     (member (car args) directives)))))
-	       args))
-      (defalias 'w3m-examine-command-line-args (lambda nil)))
-    ;; Inhibit the startup screen.
-    (when (and url
-	       ;; Since XEmacs provides `inhibit-startup-message' as
-	       ;; a constant, we don't modify the value.
-	       (not (featurep 'xemacs)))
-      (let ((var (cond ((boundp 'inhibit-startup-screen)
-			'inhibit-startup-screen)
-		       ((boundp 'inhibit-startup-message)
-			'inhibit-startup-message)))
-	    fn)
-	(when (and var
-		   (not (symbol-value var)))
-	  (set var t)
-	  (setq fn (make-symbol "w3m-inhibit-startup-screen"))
-	  (fset fn `(lambda nil
-		      (set ',var nil)
-		      (remove-hook 'window-setup-hook ',fn)
-		      (fmakunbound ',fn)))
-	  (add-hook 'window-setup-hook fn))))
-    url))
-
-;;;###autoload
-(defun w3m (&optional url new-session interactive-p)
-  "Visit World Wide Web pages using the external w3m command.
-
-When you invoke this command interactively for the first time, it will
-visit a page which is pointed to by a string like url around the
-cursor position or the home page specified by the `w3m-home-page'
-variable, but you will be prompted for a URL if `w3m-quick-start' is
-nil (default t) or `w3m-home-page' is nil.
-
-The variables `w3m-pop-up-windows' and `w3m-pop-up-frames' control
-whether this command should pop to a window or a frame up for the
-session.
-
-When emacs-w3m sessions have already been opened, this command will
-pop to the existing window or frame up, but if `w3m-quick-start' is
-nil, \(default t), you will be prompted for a URL (which defaults to
-`popup' meaning to pop to an existing emacs-w3m buffer up).
-
-In addition, if the prefix argument is given or you enter the empty
-string for the prompt, it will visit the home page specified by the
-`w3m-home-page' variable or the \"about:\" page.
-
-You can also run this command in the batch mode as follows:
-
-  emacs -f w3m http://emacs-w3m.namazu.org/ &
-
-In that case, or if this command is called non-interactively, the
-variables `w3m-pop-up-windows' and `w3m-pop-up-frames' will be ignored
-\(treated as nil) and it will run emacs-w3m at the current (or the
-initial) window.
-
-If the optional NEW-SESSION is non-nil, this function makes a new
-emacs-w3m buffer.  Besides that, it also makes a new emacs-w3m buffer
-if `w3m-make-new-session' is non-nil and a user specifies a url string.
-
-The optional INTERACTIVE-P is for the internal use; it is mainly used
-to check whether Emacs 22 or later calls this function as an
-interactive command in the batch mode."
-  (interactive
-   (let ((url
-	  ;; Emacs 22 or later calls a Lisp command interactively even
-	  ;; if it is in the batch mode.  If the following function
-	  ;; returns non-nil value, it means this function is called in
-	  ;; the batch mode, and we don't treat it as what it is called
-	  ;; to interactively.
-	  (w3m-examine-command-line-args))
-	 new)
-     (list
-      ;; url
-      (or url
-	  (let ((default (if (w3m-alive-p) 'popup w3m-home-page)))
-	    (setq new (if current-prefix-arg
-			  default
-			(w3m-input-url nil nil default w3m-quick-start
-				       'feeling-lucky)))))
-      ;; new-session
-      (and w3m-make-new-session
-	   (w3m-alive-p)
-	   (not (eq new 'popup)))
-      ;; interactive-p
-      (not url))))
-  (let ((nofetch (eq url 'popup))
-	(alived (w3m-alive-p))
-	(buffer (unless new-session (w3m-alive-p t)))
-	(w3m-pop-up-frames (and interactive-p w3m-pop-up-frames))
-	(w3m-pop-up-windows (and interactive-p w3m-pop-up-windows)))
-    (unless (and (stringp url)
-		 (> (length url) 0))
-      (if buffer
-	  (setq nofetch t)
-	;; This command was possibly be called non-interactively or as
-	;; the batch mode.
-	(setq url (or (w3m-examine-command-line-args)
-		      ;; Unlikely but this function was called with no url.
-		      "about:")
-	      nofetch nil)))
-    (unless buffer
-      ;; It means `new-session' is non-nil or there's no emacs-w3m buffer.
-      ;; At any rate, we create a new emacs-w3m buffer in this case.
-      (with-current-buffer (setq buffer (w3m-generate-new-buffer "*w3m*"))
-	(w3m-mode)))
-    (w3m-popup-buffer buffer)
-    (unless nofetch
-      ;; `unwind-protect' is needed since a process may be terminated by C-g.
-      (unwind-protect
-	  (let* ((crash (and (not alived)
-			     (w3m-session-last-crashed-session)))
-		 (last (and (not alived)
-			    (not crash)
-			    (w3m-session-last-autosave-session))))
-	    (w3m-goto-url url)
-	    (when (or crash last)
-	      (w3m-session-goto-session (or crash last))))
-	;; Delete useless newly created buffer if it is empty.
-	(w3m-delete-buffer-if-empty buffer)))))
-
-(eval-when-compile
-  (autoload 'browse-url-interactive-arg "browse-url"))
-
-;;;###autoload
-(defun w3m-browse-url (url &optional new-session)
-  "Ask emacs-w3m to browse URL.
-NEW-SESSION specifies whether to create a new emacs-w3m session.  URL
-defaults to the string looking like a url around the cursor position.
-Pop to a window or a frame up according to `w3m-pop-up-windows' and
-`w3m-pop-up-frames'."
-  (interactive (progn
-		 (require 'browse-url)
-		 (browse-url-interactive-arg "Emacs-w3m URL: ")))
-  (when (stringp url)
-    (setq url (w3m-canonicalize-url url))
-    (if new-session
-	(w3m-goto-url-new-session url)
-      (w3m-goto-url url))))
-
-;;;###autoload
-(defun w3m-find-file (file)
-  "Function used to open FILE whose name is expressed in ordinary format.
-The file name will be converted into the file: scheme."
-  (interactive "fFilename: ")
-  (w3m-goto-url (w3m-expand-file-name-as-url file)
-		nil
-		(w3m-static-if (fboundp 'universal-coding-system-argument)
-		    coding-system-for-read)))
-
-(defun w3m-cygwin-path (path)
-  "Convert PATH in the win32 style into the cygwin format.
-ex. c:/dir/file => //c/dir/file"
-  (if (string-match "^\\([A-Za-z]\\):" path)
-      (replace-match "//\\1" nil nil path)
-    path))
-
-;;;###autoload
-(defun w3m-region (start end &optional url charset)
-  "Render the region of the current buffer between START and END.
-URL specifies the address where the contents come from.  It can be
-omitted or nil when the address is not identified.  CHARSET is used
-for decoding the contents.  If it is nil, this function attempts to
-parse the meta tag to extract the charset."
-  (interactive
-   (list (region-beginning)
-	 (region-end)
-	 (w3m-expand-file-name-as-url
-	  (or (buffer-file-name) default-directory))))
-  (save-restriction
-    (w3m-process-stop (current-buffer))
-    (narrow-to-region start end)
-    (w3m-clear-local-variables)
-    (let ((w3m-current-buffer (current-buffer)))
-      (unless charset
-	(setq charset (w3m-correct-charset (w3m-detect-meta-charset))))
-      (setq url (or url
-		    w3m-buffer-local-url)
-	    w3m-current-url url
-	    w3m-current-base-url url
-	    w3m-current-coding-system
-	    (if charset
-		(w3m-charset-to-coding-system charset)
-	      w3m-coding-system)
-	    w3m-current-title
-	    (let (w3m-use-refresh)
-	      (w3m-rendering-buffer charset)))
-      (w3m-fontify)
-      (when (w3m-display-inline-images-p)
-	(and w3m-force-redisplay (sit-for 0))
-	(w3m-toggle-inline-images 'force)))))
-
-;;;###autoload
-(defun w3m-buffer (&optional url charset)
-  "Render the current buffer.
-See `w3m-region' for the optional arguments."
-  (interactive (list (w3m-expand-file-name-as-url (or (buffer-file-name)
-						      default-directory))))
-  (w3m-region (point-min) (point-max) url charset))
-
-;;; About:
-(defun w3m-about (url &rest args)
-  (insert "<!doctype html public \"-//W3C//DTD HTML 3.2//EN\">
-<html>
-<head><title>About emacs-w3m</title></head>
-<body>
-<center>
-Welcome to <a href=\"http://emacs-w3m.namazu.org/\">\
-<img src=\"about://emacs-w3m.gif\" alt=\"emacs-w3m\" width=\"83\"
-height=\"14\"></a>!<br><br>
-emacs-w3m is an interface program of
-<a href=\"http://w3m.sourceforge.net/\">w3m</a>,
-works on Emacs.
-</center>
-</body>
-</html>")
-  "text/html")
-
-(defun w3m-view-source (&optional arg)
-  "Display an html source of a page visited in the current buffer.
-ARG should be a number (a non-numeric value is treated as `1') which
-controls how much to decode a source.  A number larger than or equal
-to 4 (which the `C-u' prefix produces) means don't decode.  The number
-2 or 3 means decode normal text.  The number 1 means decodes `&#nnn;'
-entities in 128..159 and 160 in addition to normal text (the default).
-A number less than or equal to zero means also encode urls containing
-non-ASCII characters."
-  (interactive "p")
-  (if w3m-current-url
-      (let ((w3m-prefer-cache t)
-	    (w3m-view-source-decode-level (if (numberp arg) arg 0))
-	    (w3m-history-reuse-history-elements t))
-	(w3m-history-store-position)
-	(cond
-	 ((string-match "\\`about://source/" w3m-current-url)
-	  (w3m-goto-url (substring w3m-current-url (match-end 0))))
-	 ((string-match "\\`about://header/" w3m-current-url)
-	  (w3m-goto-url (concat "about://source/"
-				(substring w3m-current-url (match-end 0)))))
-	 (t
-	  (w3m-goto-url  (concat "about://source/" w3m-current-url))))
-	(w3m-history-restore-position))
-    (w3m-message "Can't view page source")))
-
-(defun w3m-make-separator ()
-  (if (string= w3m-language "Japanese")
-      (make-string (/ (w3m-display-width) 2)
-		   (make-char 'japanese-jisx0208 40 44))
-    (make-string (w3m-display-width) ?-)))
-
-(defun w3m-about-header (url &optional no-uncompress no-cache &rest args)
-  (when (string-match "\\`about://header/" url)
-    (setq url (substring url (match-end 0)))
-    (insert "Page Information\n"
-	    "\nTitle:          " (or (w3m-arrived-title
-				      (w3m-url-strip-authinfo url))
-				     "")
-	    "\nURL:            " url
-	    "\nDocument Type:  " (or (w3m-content-type url) "")
-	    "\nLast Modified:  "
-	    (let ((time (w3m-last-modified url)))
-	      (if time (current-time-string time) ""))
-	    (let ((anchor (with-current-buffer w3m-current-buffer
-			    (and (equal url w3m-current-url) (w3m-anchor)))))
-	      (if anchor
-		  (concat "\nCurrent Anchor: " anchor)
-		"")))
-    (let ((ct (w3m-arrived-content-type url))
-	  (charset (w3m-arrived-content-charset url))
-	  (separator (w3m-make-separator))
-	  (case-fold-search t)
-	  header ssl beg)
-      (when (or ct charset)
-	(insert "\n\n" separator "\n\nModifier Information\n")
-	(insert "\nDocument Content-Type:  " (or ct ""))
-	(insert "\nDocument Charset:       " (or charset "")))
-      (when (and (not (w3m-url-local-p url))
-		 (setq header (condition-case nil
-				  (or (unless no-cache
-					(w3m-cache-request-header url))
-				      (w3m-process-with-wait-handler
-					(w3m-w3m-dump-head url handler)))
-				(w3m-process-timeout nil))))
-	(insert "\n\n" separator "\n\nHeader Information\n\n" header)
-	(goto-char (point-min))
-	(when (re-search-forward "^w3m-ssl-certificate: " nil t)
-	  (setq beg (match-end 0))
-	  (forward-line)
-	  (while (and (not (eobp)) (looking-at "^[ \t]"))
-	    (forward-line))
-	  (setq ssl (buffer-substring beg (point)))
-	  (delete-region beg (point))
-	  (goto-char beg)
-	  (insert "SSL\n")
-	  (goto-char (point-max))
-	  (insert separator "\n\nSSL Information\n\n")
-	  (setq beg (point))
-	  (insert ssl)
-	  (goto-char beg)
-	  (while (re-search-forward "^\t" nil t)
-	    (delete-char -1)
-	    (when (looking-at "Certificate:")
-	      (insert "\n"))))))
-    "text/plain"))
-
-(defun w3m-view-header ()
-  "Display the header of the current page."
-  (interactive)
-  (if w3m-current-url
-      (let ((w3m-prefer-cache t)
-	    (w3m-history-reuse-history-elements t)
-	    (url (cond
-		  ((string-match "\\`about://header/" w3m-current-url)
-		   (substring w3m-current-url (match-end 0)))
-		  ((string-match "\\`about://source/" w3m-current-url)
-		   (let ((real-url (substring w3m-current-url (match-end 0))))
-		     (unless (string-match "\\`about:" real-url)
-		       (concat "about://header/" real-url))))
-		  ((string-match "\\`about:" w3m-current-url)
-		   nil)
-		  (t
-		   (concat "about://header/" w3m-current-url)))))
-	(if url
-	    (progn
-	      (w3m-history-store-position)
-	      (w3m-goto-url url)
-	      (w3m-history-restore-position))
-	  (w3m-message "Can't load a header for %s" w3m-current-url)))
-    (w3m-message "Can't view page header")))
-
-(defvar w3m-about-history-max-indentation '(/ (* (window-width) 2) 3)
-  "*Number used to limit the identation level when showing a history.
-This value is evaluated whenever a history page is displayed by the
-`w3m-about-history' command.  So, it can be any s-expression returning
-a number.")
-
-(defvar w3m-about-history-indent-level 4
-  "*Number used to specify the indentation level when showing a history.
-A history page is invoked by the `w3m-about-history' command.")
-
-(defun w3m-about-history (&rest args)
-  "Show a tree-structured history."
-  (let (start history current)
-    (with-current-buffer w3m-current-buffer
-      (setq history w3m-history-flat
-	    current (cadar w3m-history)))
-    (insert "\
-<head><title>URL history</title></head><body>
-<h1>List of all the links you have visited in this session.</h1><pre>\n")
-    (setq start (point))
-    (when history
-      (let ((form
-	     (format
-	      "%%0%dd"
-	      (length
-	       (number-to-string
-		(apply 'max
-		       (apply 'append
-			      (mapcar
-			       ;; Don't use `caddr' here, since it won't
-			       ;; be substituted by the compiler macro.
-			       (lambda (e)
-				 (car (cdr (cdr e))))
-			       history)))))))
-	    (cur (current-buffer))
-	    (margin (if (> w3m-about-history-indent-level 1)
-			1
-		      0))
-	    (max-indent (condition-case nil
-			    ;; Force the value to be a number or nil.
-			    (+ 0 (eval w3m-about-history-max-indentation))
-			  (error nil)))
-	    (last-indent -1)
-	    (sub-indent 0)
-	    element url about title position bol indent)
-	(while history
-	  (setq element (pop history)
-		url (car element)
-		;; FIXME: an ad-hoc workaround to avoid illegal-type errors.
-		about (or (not (stringp url))
-			  (string-match w3m-history-ignored-regexp url))
-		title (plist-get (cadr element) :title)
-		position (caddr element))
-	  (when url
-	    (insert (format "h%s %d %d <a href=\"%s\">%s%s%s %s</a>\n"
-			    (mapconcat (lambda (d) (format form d))
-				       position
-				       "-")
-			    (/ (1- (length position)) 2)
-			    (if (equal current position) 1 0)
-			    url
-			    (if about "&lt;" "")
-			    (if (or (not title)
-				    (string-equal "<no-title>" title)
-				    (string-match "^[\t $B!!(B]*$" title))
-				url
-			      (w3m-encode-specials-string title))
-			    (if about "&gt;" "")
-			    position))))
-	(sort-fields 0 start (point-max))
-	(goto-char start)
-	(while (not (eobp))
-	  (setq bol (point))
-	  (skip-chars-forward "^ ")
-	  (setq indent (read cur)
-		sub-indent (if (= indent last-indent)
-			       (1+ sub-indent)
-			     0)
-		last-indent indent
-		indent (+ (* w3m-about-history-indent-level indent)
-			  sub-indent))
-	  (when (prog1
-		    (= (read cur) 1)
-		  (delete-region bol (point))
-		  (insert-char ?\  (+ margin (if max-indent
-						 (min max-indent indent)
-					       indent))))
-	    (beginning-of-line)
-	    (delete-char 1)
-	    (insert "&gt;"))
-	  (forward-line 1))))
-    (insert "</pre></body>")
-    "text/html"))
-
-(defun w3m-about-db-history (url &rest args)
-  (let ((start 0)
-	(size nil)
-	(width (- (w3m-display-width) 18))
-	(now (current-time))
-	title time alist prev next page total)
-    (when (string-match "\\`about://db-history/\\?" url)
-      (dolist (s (split-string (substring url (match-end 0)) "&"))
-	(when (string-match "\\`\\(?:start\\|\\(size\\)\\)=" s)
-	  (set (if (match-beginning 1) 'size 'start)
-	       (string-to-number (substring s (match-end 0)))))))
-    (when w3m-arrived-db
-      (mapatoms
-       (lambda (sym)
-	 (and sym
-	      (setq url (symbol-name sym))
-	      (not (string-match "#" url))
-	      (not (string-match w3m-history-ignored-regexp url))
-	      (push (cons url (w3m-arrived-time url)) alist)))
-       w3m-arrived-db)
-      (setq alist (sort alist
-			(lambda (a b)
-			  (w3m-time-newer-p (cdr a) (cdr b))))))
-    (setq total (length alist))
-    (setq alist (nthcdr start alist))
-    (when size
-      (when (> start 0)
-	(setq prev
-	      (format "about://db-history/?start=%d&size=%d"
-		      (max 0 (- start size)) size)))
-      (when (> (length alist) size)
-	(setq next
-	      (format "about://db-history/?start=%d&size=%d"
-		      (+ start size) size)))
-      (when (> total 0)
-	(setq total (+ (/ total size) (if (> (% total size) 0) 1 0)))
-	(setq page (1+ (/ start size)))))
-    (insert "<html><head><title>URL history in DataBase</title>"
-	    (if prev (format "<link rel=\"prev\" href=\"%s\">\n" prev) "")
-	    (if next (format "<link rel=\"next\" href=\"%s\">\n" next) "")
-	    (format
-	     "</head>\n<body>\n<h1>Arrived URL history in DataBase%s</h1>\n"
-	     (if (and page total)
-		 (format " (%d/%d)" page total) "")))
-    (setq prev
-	  (if (or prev next)
-	      (setq next
-		    (concat
-		     "<p align=\"left\">"
-		     (if prev
-			 (format "[<a href=\"%s\">Prev History</a>]" prev)
-		       "")
-		     (if next
-			 (format "[<a href=\"%s\">Next History</a>]" next)
-		       "")
-		     "</p>\n"))
-	    ""))
-    (if (null alist)
-	(insert "<em>Nothing in DataBase.</em>\n")
-      (insert prev "<table cellpadding=0>
-<tr><td><h2> Title/URL </h2></td><td><h2>Time/Date</h2></td></tr>\n")
-      (while (and alist
-		  (or (not size)
-		      (>= (decf size) 0)))
-	(setq url (car (car alist))
-	      time (cdr (car alist))
-	      alist (cdr alist)
-	      title (w3m-arrived-title url))
-	(if (or (null title)
-		(string= "<no-title>" title))
-	    (setq title (concat "<" (w3m-truncate-string url width) ">"))
-	  (when (>= (string-width title) width)
-	    (setq title (concat (w3m-truncate-string title width) "..."))))
-	(insert (format "<tr><td><a href=\"%s\">%s</a></td>"
-			url
-			(w3m-encode-specials-string title)))
-	(when time
-	  (insert "<td>"
-		  (if (<= (w3m-time-lapse-seconds time now)
-			  64800) ;; = (* 60 60 18) 18hours.
-		      (format-time-string "%H:%M:%S" time)
-		    (format-time-string "%Y-%m-%d" time))
-		  "</td>"))
-	(insert "</tr>\n"))
-      (insert "</table>"
-	      (if next "\n<br>\n<hr>\n" "")
-	      prev))
-    (insert "</body></html>\n"))
-  "text/html")
-
-(defun w3m-history-highlight-current-url (url)
-  "Highlight the current url if it is a page for the history.
-It does manage history position data as well."
-  (when (string-equal "about://history/" url)
-    (let ((inhibit-read-only t)
-	  (buffer (current-buffer))
-	  start)
-      ;; Make history position data invisible.
-      (goto-char (point-min))
-      (w3m-next-anchor)
-      (while (progn
-	       (setq start (point))
-	       (re-search-forward " (\\(?:[0-9]+ \\)*[0-9]+)$" nil t))
-	(goto-char (match-beginning 0))
-	(put-text-property start (match-beginning 0)
-			   'history-position (read buffer))
-	(add-text-properties (match-beginning 0) (match-end 0)
-			     '(invisible t intangible t))
-	(forward-char 2)
-	(skip-chars-forward "\t "))
-      ;; Highlight the current url.
-      (goto-char (point-min))
-      (when (search-forward "\n>" nil t)
-	(w3m-next-anchor)
-	(setq start (point))
-	(end-of-line)
-	(w3m-add-face-property start (point) 'w3m-history-current-url)
-	(goto-char start)))
-    (set-buffer-modified-p nil)))
-
-(defcustom w3m-db-history-display-size
-  (and (> w3m-keep-arrived-urls 500) 500)
-  "*Maximum number of arrived URLs which are displayed per page."
-  :group 'w3m
-  :type '(radio (const :tag "All entries are displayed in single page." nil)
-		(integer :format "%t: %v\n" :size 0)))
-
-(defun w3m-db-history (&optional start size)
-  "Display arrived URLs."
-  (interactive
-   (list nil w3m-db-history-display-size))
-  (w3m-goto-url (concat
-		 (format "about://db-history/?start=%d" (or start 0))
-		 (if size (format "&size=%d" size) ""))))
-
-(defun w3m-history (&optional arg)
-  "Display the history of all the links you have visited in the session.
-If it is called with the prefix argument, display the arrived URLs."
-  (interactive "P")
-  (if (null arg)
-      (w3m-goto-url "about://history/")
-    (w3m-db-history nil w3m-db-history-display-size)))
-
-(defun w3m-w32-browser-with-fiber (url)
-  (let ((proc (start-process "w3m-w32-browser-with-fiber"
-			     (current-buffer)
-			     "fiber.exe" "-s"
-			     (if (w3m-url-local-p url)
-				 (w3m-url-to-file-name url)
-			       url))))
-    (set-process-filter proc 'ignore)
-    (set-process-sentinel proc 'ignore)))
-
-(defun w3m-pipe-source (&optional url command)
-  "Pipe the page source of url URL in binary to a shell command COMMAND.
-For the interactive use, URL defaults to that of a link at the point;
-if there are both a link to a page and a link to an image at the point,
-the link to a page is preferred unless the prefix argument is given."
-  (interactive
-   (let ((url (or (if current-prefix-arg
-		      (or (w3m-image) (w3m-anchor))
-		    (or (w3m-anchor) (w3m-image)))
-		  (and w3m-current-url
-		       (prog1
-			   (y-or-n-p (format "Pipe <%s> ? " w3m-current-url))
-			 (message nil))
-		       w3m-current-url)))
-	 command)
-     (if (and (w3m-url-valid url)
-	      (progn
-		(setq command (read-string "Command: "))
-		(not (string-match "\\`[\000-\040]*\\'" command))))
-	 (list url command)
-       (list 'none nil))))
-  (cond ((eq url 'none) nil)
-	((and (stringp url)
-	      (w3m-url-valid url)
-	      (stringp command)
-	      (not (string-match "\\`[\000-\040]*\\'" command)))
-	 (w3m-message "Pipe <%s> to \"| %s\"..." url command)
-	 (with-temp-buffer
-	   (set-buffer-multibyte nil)
-	   (w3m-process-with-wait-handler
-	     (w3m-retrieve (cond ((string-match "\\`about://source/" url)
-				  url)
-				 ((string-match "\\`about://header/" url)
-				  (concat "about://source/"
-					  (substring url (match-end 0))))
-				 (t
-				  (concat "about://source/" url)))))
-	   (shell-command-on-region (point-min) (point-max) command nil)
-	   (w3m-message "Pipe <%s> to \"| %s\"...done" url command)
-	   (let ((buffer (get-buffer "*Shell Command Output*")))
-	     (when (and buffer
-			(not (zerop (buffer-size buffer))))
-	       (display-buffer buffer)))))
-	(t (error "Can't pipe page source"))))
-
-;;; Interactive select buffer.
-(defcustom w3m-select-buffer-horizontal-window t
-  "*Non-nil means split windows horizontally to open the selection window."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-select-buffer-window-ratio '(18 . 12)
-  "*The percentage of the selection window to the whole frame.
-The car is used when splitting windows horizontally and the cdr is for
-splitting windows vertically."
-  :group 'w3m
-  :type '(cons (integer :format "H: %v[%%]  " :size 0)
-	       (integer :format "V: %v[%%]\n" :size 0)))
-
-(defvar w3m-select-buffer-window nil)
-(defconst w3m-select-buffer-message
-  "n: next buffer, p: previous buffer, q: quit."
-  "Help message used when the emacs-w3m buffers selection window is open.")
-
-;; Why this function is here abruptly is because of `w-s-b-horizontal-window'.
-(defun w3m-display-width ()
-  "Return the maximum width which should display lines within the value."
-  (if (< 0 w3m-fill-column)
-      w3m-fill-column
-    (+ (if (and w3m-select-buffer-horizontal-window
-		(get-buffer-window w3m-select-buffer-name))
-	   ;; Show pages as if there is no buffers selection window.
-	   (frame-width)
-	 (window-width))
-       (or w3m-fill-column -1))))
-
-(defun w3m-select-buffer (&optional toggle nomsg)
-  "Pop to the emacs-w3m buffers selection window up.
-It provides the feature for switching emacs-w3m buffers using the
-buffer list.  The following command keys are available:
-
-\\{w3m-select-buffer-mode-map}"
-  (interactive "P")
-  (when toggle
-    (setq w3m-select-buffer-horizontal-window
-	  (not w3m-select-buffer-horizontal-window))
-    (when (get-buffer-window w3m-select-buffer-name)
-      (delete-windows-on w3m-select-buffer-name)))
-  (unless (or (eq major-mode 'w3m-mode)
-	      (eq major-mode 'w3m-select-buffer-mode))
-    (let ((buffer (w3m-alive-p t)))
-      (if buffer
-	  (w3m-popup-buffer buffer)
-	(w3m-goto-url (or w3m-home-page "about:")))))
-  (let ((selected-window (selected-window))
-	(current-buffer (current-buffer)))
-    (set-buffer (w3m-get-buffer-create w3m-select-buffer-name))
-    (unless (eq nomsg 'update)
-      (setq w3m-select-buffer-window selected-window))
-    (let ((w (or (get-buffer-window w3m-select-buffer-name)
-		 (split-window selected-window
-			       (w3m-select-buffer-window-size)
-			       w3m-select-buffer-horizontal-window))))
-      (set-window-buffer w (current-buffer))
-      (select-window w))
-    (w3m-select-buffer-generate-contents current-buffer))
-  (w3m-select-buffer-mode)
-  (or nomsg (w3m-message w3m-select-buffer-message)))
-
-(defun w3m-select-buffer-update (&rest args)
-  (when (get-buffer-window w3m-select-buffer-name)
-    (save-selected-window
-      (w3m-select-buffer nil 'update)))
-  (when w3m-use-tab
-    (w3m-force-window-update)))
-
-(defun w3m-select-buffer-generate-contents (current-buffer)
-  (let ((i 0)
-	(inhibit-read-only t))
-    (delete-region (point-min) (point-max))
-    (dolist (buffer (w3m-list-buffers))
-      (put-text-property (point)
-			 (progn
-			   (insert (format "%d:%s %s\n" (incf i)
-					   (if (w3m-unseen-buffer-p buffer)
-					       "(u)" "   ")
-					   (w3m-buffer-title buffer)))
-			   (point))
-			 'w3m-select-buffer buffer))
-    (skip-chars-backward " \t\r\f\n")
-    (delete-region (point) (point-max))
-    (set-buffer-modified-p nil)
-    (goto-char (or (text-property-any (point-min) (point-max)
-				      'w3m-select-buffer current-buffer)
-		   (point-min)))))
-
-(defvar w3m-select-buffer-mode-map nil)
-(unless w3m-select-buffer-mode-map
-  (let ((map (make-keymap)))
-    (suppress-keymap map)
-    (substitute-key-definition
-     'next-line 'w3m-select-buffer-next-line map global-map)
-    (substitute-key-definition
-     'previous-line 'w3m-select-buffer-previous-line map global-map)
-    (substitute-key-definition
-     'w3m-copy-buffer 'w3m-select-buffer-copy-buffer map w3m-mode-map)
-    (substitute-key-definition
-     'w3m-next-buffer 'w3m-select-buffer-next-line map w3m-mode-map)
-    (substitute-key-definition
-     'w3m-previous-buffer 'w3m-select-buffer-previous-line map w3m-mode-map)
-    (substitute-key-definition
-     'w3m-delete-buffer 'w3m-select-buffer-delete-buffer map w3m-mode-map)
-    (substitute-key-definition
-     'w3m-delete-other-buffers
-     'w3m-select-buffer-delete-other-buffers map w3m-mode-map)
-    (substitute-key-definition
-     'w3m-scroll-up-or-next-url
-     'w3m-select-buffer-show-this-line map w3m-mode-map)
-    (substitute-key-definition
-     'w3m-scroll-down-or-previous-url
-     'w3m-select-buffer-show-this-line-and-down map w3m-mode-map)
-    (substitute-key-definition
-     'w3m-select-buffer 'w3m-select-buffer-toggle-style map w3m-mode-map)
-    (define-key map " " 'w3m-select-buffer-show-this-line)
-    (define-key map "g" 'w3m-select-buffer-recheck)
-    (define-key map "j" 'w3m-select-buffer-next-line)
-    (define-key map "k" 'w3m-select-buffer-previous-line)
-    (define-key map "n" 'w3m-select-buffer-next-line)
-    (define-key map "p" 'w3m-select-buffer-previous-line)
-    (define-key map "q" 'w3m-select-buffer-quit)
-    (define-key map "h" 'w3m-select-buffer-show-this-line-and-switch)
-    (define-key map "w" 'w3m-select-buffer-show-this-line-and-switch)
-    (define-key map "\C-m" 'w3m-select-buffer-show-this-line-and-quit)
-    (define-key map "\C-c\C-c" 'w3m-select-buffer-show-this-line-and-quit)
-    (define-key map "\C-c\C-k" 'w3m-select-buffer-quit)
-    (define-key map "\C-c\C-q" 'w3m-select-buffer-quit)
-    (define-key map "\C-g" 'w3m-select-buffer-quit)
-    (define-key map "?" 'describe-mode)
-    (setq w3m-select-buffer-mode-map map)))
-
-(defun w3m-select-buffer-mode ()
-  "Major mode for switching emacs-w3m buffers using the buffer list.
-
-\\<w3m-select-buffer-mode-map>\
-\\[w3m-select-buffer-next-line]\
-	Next buffer.
-\\[w3m-select-buffer-previous-line]\
-	Previous buffer.
-
-\\[w3m-select-buffer-show-this-line]\
-	Show the buffer on the current menu line or scroll it up.
-\\[w3m-select-buffer-show-this-line-and-down]\
-	Show the buffer on the current menu line or scroll it down.
-\\[w3m-select-buffer-show-this-line-and-switch]\
-	Show the buffer on the menu and switch to the buffer.
-\\[w3m-select-buffer-show-this-line-and-quit]\
-	Show the buffer on the menu and quit the buffers selection.
-
-\\[w3m-select-buffer-copy-buffer]\
-	Create a copy of the buffer on the menu, and show it.
-\\[w3m-select-buffer-delete-buffer]\
-	Delete the buffer on the current menu line.
-\\[w3m-select-buffer-delete-other-buffers]\
-	Delete emacs-w3m buffers except for the buffer on the menu.
-
-\\[w3m-select-buffer-toggle-style]\
-	Toggle the style of the selection between horizontal and vertical.
-\\[w3m-select-buffer-recheck]\
-	Do the roll call to all emacs-w3m buffers.
-\\[w3m-select-buffer-quit]\
-	Quit the buffers selection.
-"
-  (setq major-mode 'w3m-select-buffer-mode
-	mode-name "w3m buffers"
-	truncate-lines t
-	buffer-read-only t)
-  (use-local-map w3m-select-buffer-mode-map)
-  (w3m-run-mode-hooks 'w3m-select-buffer-mode-hook))
-
-(defun w3m-select-buffer-recheck ()
-  "Do the roll call to all emacs-w3m buffers and regenerate the menu."
-  (interactive)
-  (let ((inhibit-read-only t))
-    (erase-buffer))
-  (w3m-select-buffer-generate-contents
-   (window-buffer w3m-select-buffer-window))
-  (w3m-select-buffer-show-this-line))
-
-(defmacro w3m-select-buffer-current-buffer ()
-  '(get-text-property (point-at-bol) 'w3m-select-buffer))
-
-(defun w3m-select-buffer-show-this-line (&optional interactive-p)
-  "Show the buffer on the current menu line or scroll it up."
-  (interactive (list t))
-  (forward-line 0)
-  (let ((obuffer (and (window-live-p w3m-select-buffer-window)
-		      (window-buffer w3m-select-buffer-window)))
-	(buffer (w3m-select-buffer-current-buffer)))
-    (unless buffer
-      (error "No buffer at point"))
-    (cond
-     ((get-buffer-window buffer)
-      (setq w3m-select-buffer-window (get-buffer-window buffer)))
-     ((window-live-p w3m-select-buffer-window)
-      ())
-     ((one-window-p t)
-      (setq w3m-select-buffer-window (selected-window))
-      (select-window
-       (split-window nil
-		     (w3m-select-buffer-window-size)
-		     w3m-select-buffer-horizontal-window)))
-     (t (setq w3m-select-buffer-window (get-largest-window))))
-    (set-window-buffer w3m-select-buffer-window buffer)
-    (when (and interactive-p (eq obuffer buffer))
-      (save-selected-window
-	(pop-to-buffer buffer)
-	(w3m-scroll-up-or-next-url nil)))
-    (w3m-force-window-update w3m-select-buffer-window)
-    (w3m-message w3m-select-buffer-message)
-    buffer))
-
-(defun w3m-select-buffer-show-this-line-and-down ()
-  "Show the buffer on the current menu line or scroll it down."
-  (interactive)
-  (let ((obuffer (and (window-live-p w3m-select-buffer-window)
-		      (window-buffer w3m-select-buffer-window)))
-	(buffer (w3m-select-buffer-show-this-line)))
-    (when (eq obuffer buffer)
-      (save-selected-window
-	(pop-to-buffer buffer)
-	(w3m-scroll-down-or-previous-url nil)))))
-
-(defun w3m-select-buffer-next-line (&optional n)
-  "Move cursor vertically down N lines and show the buffer on the menu."
-  (interactive "p")
-  (forward-line n)
-  (prog1
-      (w3m-select-buffer-show-this-line)
-    (w3m-static-when (featurep 'xemacs)
-      (save-window-excursion
-	;; Update gutter tabs.
-	(select-window w3m-select-buffer-window)))))
-
-(defun w3m-select-buffer-previous-line (&optional n)
-  "Move cursor vertically up N lines and show the buffer on the menu."
-  (interactive "p")
-  (w3m-select-buffer-next-line (- n)))
-
-(defun w3m-select-buffer-copy-buffer ()
-  "Create a copy of the buffer on the current menu line, and show it."
-  (interactive)
-  (w3m-select-buffer-show-this-line)
-  (let ((window (selected-window)))
-    (select-window (get-buffer-window (w3m-select-buffer-current-buffer)))
-    ;; The selection buffer will be updated automatically because
-    ;; `w3m-copy-buffer' calls `w3m-select-buffer-update' by way of
-    ;; `w3m-goto-url'.
-    (w3m-copy-buffer)
-    (select-window window)))
-
-(defun w3m-select-buffer-delete-buffer (&optional force)
-  "Delete the buffer on the current menu line.
-If there is the sole emacs-w3m buffer, it is assumed to be called for
-terminating the emacs-w3m session; the prefix argument FORCE will be
-passed to the `w3m-quit' function (which see)."
-  (interactive "P")
-  (w3m-select-buffer-show-this-line)
-  (if (= 1 (count-lines (point-min) (point-max)))
-      (w3m-quit force)
-    (let ((buffer (w3m-select-buffer-current-buffer)))
-      (forward-line -1)
-      (w3m-process-stop buffer)
-      (w3m-idle-images-show-unqueue buffer)
-      (kill-buffer buffer)
-      (when w3m-use-form
-	(w3m-form-kill-buffer buffer))
-      (run-hooks 'w3m-delete-buffer-hook)
-      (w3m-select-buffer-generate-contents (w3m-select-buffer-current-buffer))
-      (w3m-select-buffer-show-this-line))))
-
-(defun w3m-select-buffer-delete-other-buffers ()
-  "Delete emacs-w3m buffers except for the buffer on the current menu."
-  (interactive)
-  (w3m-select-buffer-show-this-line)
-  (w3m-delete-other-buffers (w3m-select-buffer-current-buffer)))
-
-(defun w3m-select-buffer-quit ()
-  "Quit the buffers selection."
-  (interactive)
-  (if (one-window-p t)
-      (set-window-buffer (selected-window)
-			 (or (w3m-select-buffer-current-buffer)
-			     (w3m-alive-p)))
-    (let ((buf (or (w3m-select-buffer-current-buffer)
-		   (w3m-alive-p)))
-	  pop-up-frames)
-      (pop-to-buffer buf)
-      (and (get-buffer-window w3m-select-buffer-name)
-	   (delete-windows-on w3m-select-buffer-name)))))
-
-(defun w3m-select-buffer-show-this-line-and-switch ()
-  "Show the buffer on the menu and switch to the buffer."
-  (interactive)
-  (pop-to-buffer (w3m-select-buffer-show-this-line))
-  (message nil))
-
-(defun w3m-select-buffer-show-this-line-and-quit ()
-  "Show the buffer on the menu and quit the buffers selection."
-  (interactive)
-  (w3m-select-buffer-show-this-line-and-switch)
-  (and (get-buffer-window w3m-select-buffer-name)
-       (delete-windows-on w3m-select-buffer-name)))
-
-(defun w3m-select-buffer-close-window ()
-  "Close the window which displays the buffers selection."
-  (let ((window (get-buffer-window w3m-select-buffer-name)))
-    (when window
-      (if (one-window-p t)
-	  (set-window-buffer window (other-buffer))
-	(delete-window window)))))
-
-(defun w3m-select-buffer-toggle-style()
-  "Toggle the style of the selection between horizontal and vertical."
-  (interactive)
-  (w3m-select-buffer t))
-
-(defun w3m-select-buffer-window-size ()
-  (if w3m-select-buffer-horizontal-window
-      (- (window-width)
-	 (/ (* (frame-width) (car w3m-select-buffer-window-ratio)) 100))
-    (- (window-height)
-       (/ (* (frame-height) (cdr w3m-select-buffer-window-ratio)) 100))))
-
-
-;;; Header line
-(defcustom w3m-use-header-line t
-  "*Non-nil means display the header line."
-  :group 'w3m
-  :type 'boolean)
-
-(defcustom w3m-use-header-line-title nil
-  "Non-nil means display the current title at the header line.
-This variable is effective only when `w3m-use-tab' is nil."
-  :group 'w3m
-  :type 'boolean)
-
-(defface w3m-header-line-location-title
-  '((((class color) (background light))
-     (:foreground "Blue" :background "Gray90"))
-    (((class color) (background dark))
-     (:foreground "Cyan" :background "Gray20")))
-  "Face used to highlight title when displaying location in the header line."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-header-line-location-title-face
-     'face-alias 'w3m-header-line-location-title)
-
-(defface w3m-header-line-location-content
-  '((((class color) (background light))
-     (:foreground "DarkGoldenrod" :background "Gray90"))
-    (((class color) (background dark))
-     (:foreground "LightGoldenrod" :background "Gray20")))
-  "Face used to highlight url when displaying location in the header line."
-  :group 'w3m-face)
-;; backward-compatibility alias
-(put 'w3m-header-line-location-content-face
-     'face-alias 'w3m-header-line-location-content)
-
-(defvar w3m-header-line-map nil)
-(unless w3m-header-line-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map w3m-mode-map)
-    (define-key map [mouse-2] 'w3m-goto-url)
-    ;; Prevent tool-bar from being doubled under GNU Emacs.
-    (define-key map [tool-bar] 'undefined)
-    (setq w3m-header-line-map map)))
-
-(defun w3m-header-line-insert ()
-  "Put the header line into the current buffer."
-  (when (and (or (featurep 'xemacs)
-		 (w3m-use-tab-p))
-	     w3m-use-header-line
-	     w3m-current-url
-	     (eq 'w3m-mode major-mode))
-    (goto-char (point-min))
-    (let ((ct (w3m-arrived-content-type w3m-current-url))
-	  (charset (w3m-arrived-content-charset w3m-current-url)))
-      (insert (format "Location%s: " (cond ((and ct charset) " [TC]")
-					   (ct " [T]")
-					   (charset " [C]")
-					   (t "")))))
-    (w3m-add-face-property (point-min) (point) 'w3m-header-line-location-title)
-    (let ((start (point)))
-      (insert (w3m-puny-decode-url
-	       (if (string-match "[^\000-\177]" w3m-current-url)
-		   w3m-current-url
-		 (w3m-url-decode-string w3m-current-url w3m-current-coding-system))))
-      (w3m-add-face-property start (point) 'w3m-header-line-location-content)
-      (w3m-add-text-properties start (point)
-			       `(mouse-face highlight
-				 keymap ,w3m-header-line-map
-				 ,@(if (featurep 'xemacs)
-				       '(help-echo
-					 "button2 prompts to input URL"
-					 balloon-help
-					 "button2 prompts to input URL")
-				     '(help-echo
-				       "mouse-2 prompts to input URL"))))
-      (setq start (point))
-      (insert-char ?\  (max
-			0
-			(- (if (and w3m-select-buffer-horizontal-window
-				    (get-buffer-window w3m-select-buffer-name))
-			       (frame-width)
-			     (window-width))
-			   (current-column) 1)))
-      (w3m-add-face-property start (point) 'w3m-header-line-location-content)
-      (unless (eolp)
-	(insert "\n")))))
-
-;;; w3m-minor-mode
-(defcustom w3m-goto-article-function nil
-  "Function used to visit an article pointed to by a given URL
-in `w3m-minor-mode' buffer.  Normally, this option is used only
-when you follow a link in an html article.  A function set to
-this variable must take one argument URL, and should display the
-specified page.  It may return the symbol `w3m-goto-url' when it
-fails displaying the page.  In this case, either `w3m-goto-url'
-or `w3m-goto-url-new-session' is employed to display the page."
-  :group 'w3m
-  :type '(radio (const :tag "Use emacs-w3m" nil)
-		(function :value browse-url)))
-
-(defun w3m-safe-view-this-url (&optional force)
-  "View the URL of the link under point.
-This command is quite similar to `w3m-view-this-url' except for the
-four differences: [1]don't handle forms, [2]don't consider URL-like
-string under the cursor, [3]compare URL with `w3m-safe-url-regexp'
-first to check whether it is safe, and [4]the arguments list differs;
-the optional FORCE, if it is non-nil, specifies URL is safe.  You
-should use this command rather than `w3m-view-this-url' when viewing
-doubtful pages that might contain vicious forms.
-
-This command makes a new emacs-w3m buffer if `w3m-make-new-session' is
-non-nil and a user invokes this command in a buffer not being running
-the `w3m-mode', otherwise use an existing emacs-w3m buffer."
-  (interactive "P")
-  (let ((w3m-pop-up-windows nil)
-	(url (w3m-url-valid (w3m-anchor)))
-	safe-regexp)
-    (cond
-     (url
-      (setq safe-regexp (get-text-property (point) 'w3m-safe-url-regexp))
-      (if (or (not safe-regexp)
-	      (w3m-buffer-local-url-p url)
-	      (string-match safe-regexp url)
-	      force)
-	  (unless (and (functionp w3m-goto-article-function)
-		       (not (eq 'w3m-goto-url
-				(funcall w3m-goto-article-function url))))
-	    (if (and w3m-make-new-session
-		     (not (eq major-mode 'w3m-mode)))
-		(w3m-goto-url-new-session url)
-	      (w3m-goto-url url)))
-	(when (interactive-p)
-	  (w3m-message "\
-This link is considered to be unsafe; use the prefix arg to view anyway"))))
-     ((w3m-url-valid (w3m-image))
-      (if (w3m-display-graphic-p)
-	  (if (interactive-p)
-	      (call-interactively 'w3m-toggle-inline-image)
-	    (w3m-toggle-inline-image force))
-	(w3m-view-image)))
-     (t (w3m-message "No URL at point")))))
-
-(defun w3m-mouse-safe-view-this-url (event)
-  "Perform the command `w3m-safe-view-this-url' by the mouse event."
-  ;; Note: a command invoked by [mouse-N] cannot accept the prefix
-  ;; argument since [down-mouse-N] eats it.
-  (interactive "e")
-  (mouse-set-point event)
-  (let ((url (w3m-url-valid (or (w3m-anchor) (w3m-image)))))
-    (if url
-	(let ((safe-regexp (get-text-property (point) 'w3m-safe-url-regexp))
-	      (use-dialog-box t))
-	  (when (or (not safe-regexp)
-		    (w3m-buffer-local-url-p url)
-		    (string-match safe-regexp url)
-		    (y-or-n-p "\
-This link is considered to be unsafe; continue? "))
-	    (w3m-safe-view-this-url t)))
-      (w3m-message "No URL at point"))))
-
-(defconst w3m-minor-mode-command-alist
-  '((w3m-next-anchor)
-    (w3m-previous-anchor)
-    (w3m-next-image)
-    (w3m-previous-image)
-    (w3m-toggle-inline-image)
-    (w3m-toggle-inline-images)
-    (w3m-view-this-url . w3m-safe-view-this-url)
-    (w3m-mouse-view-this-url . w3m-mouse-safe-view-this-url)
-    (w3m-print-this-url))
-  "Alist of commands and commands to be defined in `w3m-minor-mode-map'.
-Each element looks like (FROM-COMMAND . TO-COMMAND); those keys which
-are defined as FROM-COMMAND in `w3m-mode-map' are redefined as
-TO-COMMAND in `w3m-minor-mode-map'.  When TO-COMMAND is nil,
-FROM-COMMAND is defined in `w3m-minor-mode-map' with the same key in
-`w3m-mode-map'.")
-
-(defun w3m-make-minor-mode-keymap ()
-  "Return a keymap used for `w3m-minor-mode'."
-  (let ((keymap (make-sparse-keymap)))
-    (dolist (pair w3m-minor-mode-command-alist)
-      (substitute-key-definition (car pair)
-				 (or (cdr pair) (car pair))
-				 keymap w3m-mode-map))
-    (unless (featurep 'xemacs)
-      ;; Inhibit the `widget-button-click' command when
-      ;; `w3m-imitate-widget-button' is activated.
-      (define-key keymap [down-mouse-2] 'undefined))
-    keymap))
-
-(defvar w3m-minor-mode-map (w3m-make-minor-mode-keymap)
-  "*Keymap used when `w3m-minor-mode' is active.")
-
-(defcustom w3m-minor-mode-hook nil
-  "*Hook run after `w3m-minor-mode' initialization."
-  :group 'w3m
-  :type 'hook)
-
-(defvar w3m-minor-mode nil "Non-nil if w3m minor mode is enabled.")
-(make-variable-buffer-local 'w3m-minor-mode)
-(unless (assq 'w3m-minor-mode minor-mode-alist)
-  (push (list 'w3m-minor-mode " w3m") minor-mode-alist))
-(unless (assq 'w3m-minor-mode minor-mode-map-alist)
-  (push (cons 'w3m-minor-mode w3m-minor-mode-map) minor-mode-map-alist))
-
-(defun w3m-minor-mode (&optional arg)
-  "Minor mode to view text/html parts in articles."
-  (interactive "P")
-  (when (setq w3m-minor-mode
-	      (if arg
-		  (> (prefix-numeric-value arg) 0)
-		(not w3m-minor-mode)))
-    (run-hooks 'w3m-minor-mode-hook)))
-
-(defcustom w3m-do-cleanup-temp-files nil
-  "*Whether to clean up temporary files when emacs-w3m shutdown."
-  :group 'w3m
-  :type 'boolean)
-  
-(defun w3m-cleanup-temp-files ()
-  (when w3m-do-cleanup-temp-files
-    (dolist (f (directory-files w3m-profile-directory))
-      (when (string-match "^w3m\\(el\\|src\\)" f)
-	(delete-file (expand-file-name f w3m-profile-directory))))))
-
-(provide 'w3m)
-
-(unless noninteractive
-  (if (string-match "\\.el\\'" w3m-init-file)
-      (or (load (concat w3m-init-file "c") t t t)
-	  (load w3m-init-file t t t))
-    (load w3m-init-file t t))
-  (run-hooks 'w3m-load-hook))
-
-;;; w3m.el ends here

=== removed directory 'share/info'
=== removed file 'share/info/emacs-w3m-ja.info'
--- share/info/emacs-w3m-ja.info	2010-09-13 10:14:52 +0000
+++ share/info/emacs-w3m-ja.info	1970-01-01 00:00:00 +0000
@@ -1,7024 +0,0 @@
-Info file: emacs-w3m-ja.info,    -*-Text-*-
-produced by `texinfo-format-buffer'
-from file `emacs-w3m-ja.texi'
-using `texinfmt.el' version 2.42 of  7 Jul 2006.
-
-
-
-INFO-DIR-SECTION GNU Emacs Lisp
-START-INFO-DIR-ENTRY
-* Emacs-w3m-ja: (emacs-w3m-ja).  An Emacs interface to w3m (Japanese)
-END-INFO-DIR-ENTRY
-
-
-This file documents emacs-w3m, an Emacs interface to w3m.
-
-$B$3$N%U%!%$%k$O(B Emacs $B$GF0$/(B w3m $B$N%$%s%?%U%'!<%9$G$"$k(B emacs-w3m $B$K4X$9(B
-$B$k@bL@=q$G$9!#(B
-
-This edition is for emacs-w3m version 1.4.413.
-
-$B$3$NHG$O(B emacs-w3m $B%P!<%8%g%s(B 1.4.413 $B$KBP1~$7$^$9!#(B
-
-
-
-
-
-File: emacs-w3m-ja.info, Node: Top, Next: Introduction, Prev: (dir), Up: (dir)
-
-Emacs-w3m $A%f$B!<$A%6%^%K%e%"%k(B
-**************************
-
-                                                  Emacs-w3m $B3+H/%A!<%`(B
-
-$B$3$NJ8=q$O(B emacs-w3m $B%P!<%8%g%s(B 1.4.413 $B$KBP1~$7$^$9!#(B
-
-
-
-Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-2008, 2009 TSUCHIYA Masatoshi
-
-     Permission is granted to copy, distribute and/or modify this
-     document under the terms of the GNU General Public License,
-     Version 2 or any later version published by the Free Software
-     Foundation.
-
-     $A$3$NND$(GUs$A$r!"%U%j$B!<$A%=%U%H%&%'%"$(GXB$(I#>$A$K$h$C$F$BH/$APP$5$l$?(B GNU $AR;0c9+$(I>j(B
-     $A@{SC$(G]Br?$AFu$(GR|Us$A5Z(B 2 $A0f$^$?$O$=$lRT=5$N0f$N$&$A$I$l$+$N6($a$kLu<~$N(B
-     $AOB$G$(Gnoj{$A!"Ed2<!"$"$k$$$O$(I+y$A8|$9$k$3$H$r$(G]B$A?I$7$^$9!#(B
-
-     This document is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     $A$3$NND$(GUs$A$OSPSC$G$"$k$3$H$r$(GyL$A$C$F$(Ggc$A2<$5$l$^$9$,!"(B*$AH+$/$N$(G`R$A1#$(Gb%(B* $A$G(B
-     $A$9!#(B*$AIL$(GdF$A?ID\PT(B* $A$N1#$(Gb%$A$d(B *$ALX6($ND?5D$X$N$(GoK$A:OPT(B* $A$O!"QTMb$KJ>$5$l(B
-     $A$?$b$N$b:,$aH+$/4fTZ$7$^$;$s!#$(Gf[$A$7$/$O(B GNU $AR;0c9+$(I>j$A@{SC$(G]Br?$AFu$(GR|Us(B
-     $A$r$4$(IRf$A$/$@$5$$!#(B
-
-     You should have received a copy of the GNU General Public License
-     along with this document; see the file COPYING.  If not, write to
-     the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-     Floor, Boston, MA 02110-1301, USA.
-
-     $A$"$J$?$O$3$NND$(GUs$A$H92$K!"(BGNU $AR;0c9+$(I>j$A@{SC$(G]Br?$AFu$(GR|Us$A$N$(Gnoj{$ANo$rR;2?J\(B
-     $A$1H!$C$?$O$:$G$9!#(BCOPYING $A%U%!%$%k$r2NUU$7$F$/$@$5$$!#$b$7J\$1H!$C(B
-     $A$F$$$J$1$l$P!"%U%j$B!<$A%=%U%H%&%'%"$(GXB$(I#>$A$^$G$(Gny$AGs$7$F$/$@$5$$(B ($AMpOH$O(B
-     the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-     Boston, MA 02111-1307 USA)$A!#(B
-
-
-
-* Menu:
-
-* Introduction::                $B$O$8$a$K(B
-* Getting Started::             Emacs-w3m $B$r;H$$;O$a$k$N$O$H$C$F$b4JC1(B
-* Basic Usage::                 $B4pK\E*$J;H$$J}(B
-* Pretty Good Features::        $B$?$/$5$s$N$9$0$l$b$N(B
-* Customizable Variables::      $B%G%U%)%k%H$N$^$^$G$b7k9=NI$$$H;W$&$1$l$I(B
-* Hooking into MUAs::           $B%a!<%k(B/$B%K%e!<%9%j!<%@!<$G;H$&(B
-* Frequently Asked Questions::  $BI,$:Ez$,$"$k$H$O8B$i$J$$(B
-* Known Problems::              $B$"$J$?$J$i$-$C$H2r7h$G$-$k(B
-* Shimbun Library::             $B%&%'%V>e$N?7J9$rFI$`$?$a$NF;6q(B
-* Tips::                        Emacs-w3m $B$r;H$&^/Mn$?>.J*$?$A(B
-* Mailing List::                $B%a!<%j%s%0%j%9%H!"%P%0%j%]!<%H(B
-* Emacs-w3m Functions::         Emacs-w3m $B$N4X?t$N>\$7$$@bL@(B
-* External Packages::           $B$*Cg4V$N%Q%C%1!<%8$?$A(B
-* Authors::                     $B$3$N%^%K%e%"%k$r=q$$$??M$?$A(B
-* Index::                       $B:w0z(B
-
- -- $B9`L\$N>\:Y$J%j%9%H(B ---
-
-Getting Started
-
-* Required Emacs Version::      $B$I$s$J%P!<%8%g%s$N(B Emacs $B$G;H$($k$N(B?
-* You Need w3m::                w3m $B$r;H$$$^$9(B: emacs-w3m $B$,B.$$$o$1(B
-* Other Requirements::          Emacs-w3m $B$rF0:n$5$;$k$N$KI,MW$J$b$N(B
-* Installing Emacs-w3m::        Emacs-w3m $B$r%$%s%9%H!<%k$9$k(B
-* Non-UNIX-like systems::       $BHs(B UNIX $B7O4D6-$G$N%$%s%9%H!<%k(B
-* Minimal Settings::            $B@_Dj$7$J$1$l$P$J$i$J$$:GDc8B$N$b$N(B
-
-Basic Usage
-
-* Browsing Web Pages::          $B%M%C%H%5!<%U%#%s$7$h$&(B!
-* Inline Images::               $B2hA|I=<($r(B ON/OFF $B$9$k(B
-* Tracing History::             $B;~6u$rAL$k(B
-* Managing Bookmarks::          $B$\$/$N(B/$B$o$?$7$N$*5$$KF~$j(B
-* Using Tabs::                  $B$_$s$J%?%V$,9%$-$@$h$M(B
-* Working with buffers::        $B%P%C%U%!$r:n$k(B/$B>C$9(B/$B0\F0$9$k(B
-* Downloading::                 $B%U%!%$%k$r%@%&%s%m!<%I$9$k(B
-* Submitting Forms::            HTML $B%U%)!<%`$K5-F~$9$k(B
-* HTML File Information::       $B%&%'%V%Z!<%8:n$j$H%O%C%/$N$*<jEA$$(B
-
-Pretty Good Features
-
-* Using Search Engines::        $B;H$$$d$9$$%&%'%V8!:w(B
-* Grouping URLs::               $B0l$D$N(B URL $B$GJ#?t$N%&%'%V%Z!<%8$r8+$k(B
-* Weather Information::         $BL@F|$NE75$$O@2$l$G$7$g$&(B
-* Using Antenna::               $B%"%s%F%J$rD%$j=d$i$=$&(B
-* Showing Directory Tree::      $B%G%#%l%/%H%j$NLZ9=B$$rI=<($9$k(B
-* Viewing Perl Documents::      Perl $B$N%I%-%e%a%s%H$r8+$k(B
-* Using Namazu::                Namazu $B$G%U%!%$%k$r8!:w$9$k(B
-* Octet::                       application/octet-stream $B%G!<%?$r8+$k(B
-* Frame Local Buffers::         $BB??t$N%;%C%7%g%s$r%U%l!<%`$G%0%k!<%WJ,$1$9$k(B
-* Session Manager::             $B%;%C%7%g%s$NJ]B8$HFI$_$3$_(B
-
-Customizable Variables
-
-* General Variables::           $B0lHLE*$JJQ?t(B
-* Image Variables::             $B2hA|$K4XO"$7$?JQ?t(B
-* Form Variables::              $B%U%)!<%`$K4XO"$7$?JQ?t(B
-* Cookie Variables::            $B%/%C%-!<$K4XO"$7$?JQ?t(B
-* Bookmark Variables::          $B%V%C%/%^!<%/$K4XO"$7$?JQ?t(B
-* Search Variables::            $B%&%'%V8!:w$K4XO"$7$?JQ?t(B
-* Weather Variables::           $BE75$M=Js$K4XO"$7$?JQ?t(B
-* Dtree Variables::             dtree $B$K4XO"$7$?JQ?t(B
-* Antenna Variables::           $B%"%s%F%J$K4XO"$7$?JQ?t(B
-* Perldoc Variables::           Perldoc $B$K4XO"$7$?JQ?t(B
-* Namazu Variables::            Namazu $B$K4XO"$7$?JQ?t(B
-* Octet Variables::             Octet $B$K4XO"$7$?JQ?t(B
-* Session Manager Variables::   $B%;%C%7%g%s%^%M!<%8%c$K4XO"$7$?JQ?t(B
-* Hooks::                       $B%U%C%/(B
-* Other Variables::             $B$=$NB>$NJQ?t(B
-
-Hooking into MUAs
-
-* Gnus::                        Gnus $B$G(B HTML $B%a!<%k$rFI$`(B
-* Mew::                         Mew $B$G(B HTML $B%a!<%k$rFI$`(B
-* SEMI MUAs::                   SEMI MUA $B$G(B HTML $B%a!<%k$rFI$`(B
-* VM::                          VM (vieW maiL) $B$O(B Wanderlust $B$K$"$i$:(B
-
-Frequently Asked Questions
-
-* General FAQ::                 $B0lHLE*$J<ALd(B
-* Trouble FAQ::                 $B%H%i%V%k(B
-* Shimbun FAQ::                 Shimbun $B$K4X$9$k<ALd(B
-
-Known Problems
-
-Shimbun Library
-
-* Nnshimbun::                   Gnus $B$r%&%'%V%V%i%&%6$K$9$k(B!
-* Mew Shimbun::                 Mew $B$G?7J9$rFI$`(B
-* Shimbun with Wanderlust::     Wanderlust $B$G?7J9$rFI$`(B
-* Shimbun local mode::          $B?7J9$N<hF@$K%7%'%k%9%/%j%W%H$r;H$&(B
-* Shimbun Sites::               $B?7J9$,FI$a$k%5%$%H(B
-* Shimbun Basics::              $B?7J9%b%8%e!<%k$N:n$jJ}(B
-
-Tips
-
-Mailing List
-
-Emacs-w3m Functions
-
-
-
-
-File: emacs-w3m-ja.info, Node: Introduction, Next: Getting Started, Prev: Top, Up: Top
-
-$A$O$8$a$K(B
-********
-
-Emacs/W3 (http://www.cs.indiana.edu/elisp/w3/docs.html) $B$O!"$+$D$F$O(B
-Emacs $B>e$GF0:n$9$k:G$b%]%T%e%i!<$J(B web $B%V%i%&%6!<$G$7$?!#$7$+$7F0:n$,Hs(B
-$B>o$KCY$+$C$?$N$G!";d$?$A$O$=$l$KBe$o$kB.$$$b$N$rM_$7$^$7$?!#0lJ}!"(Bw3m
-(http://w3m.sourceforge.net/) $B$H$$$&%Z!<%8%c!<$,$"$j$^$7$?!#$=$l$O%Z!<(B
-$B%8%c!<$G$7$?$,!"%F%-%9%H%b!<%I(B WWW $B%V%i%&%6!<$H$7$F;H$&$3$H$,$G$-$?$N$G!"(B
-$B;d$?$A$O(B w3m $B$X$N(B Emacs $B%$%s%?!<%U%'!<%9$N3+H/$r;O$a$^$7$?!#(B
-
-$B$9$P$i$7$$(B w3m $B%W%m%0%i%`$r3+H/$7$F$/$l$?0KF#>4B'$5$s$H(B w3m $B%A!<%`$N$_(B
-$B$J$5$s$K!"3JCJ$N46<U$rJ{$2$^$9!#$5$i$K%3%a%s%H!"Ds0F$*$h$S%P%0$N=$@5$r(B
-$B$7$F$/$l$?$9$Y$F$N?M!9$K46<U$7$^$9!#$?$H$(LdBj$,$"$C$F$b!"@UG$$O$9$Y$F(B
-$B;d$?$A(B (emacs-w3m $B3+H/%A!<%`(B) $B$K$"$j$^$9!#$b$C$H$b!"J]>Z$O$^$C$?$/$"$j(B
-$B$^$;$s$,!#(BEmacs-w3m $B$O(B 2000$BG/(B6$B7n$KEZ202mL-$K$h$C$FAO;O$5$l$^$7$?!#(B
-
-Emacs-w3m $A$N9+J=%Z$B!<$A%8(B (http://emacs-w3m.namazu.org/) $B$bJ;$;$F$4Mw$/$@(B
-$B$5$$!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Getting Started, Next: Basic Usage, Prev: Introduction, Up: Top
-
-Emacs-w3m $A$rJ9$$J<$a$k$N$O$H$C$F$b$(Gv|$(I+J(B
-**************************************
-
-$B$R$g$C$H$9$k$H!"$"$J$?$N%7%9%F%`$K$O(B emacs-w3m $B$,$9$G$K%$%s%9%H!<%k$5$l(B
-$B$F$$$k$+$b$7$l$^$;$s!#$=$N>l9g!"$"$J$?$O$3$N9`$rFI$_Ht$P$7$F!"D>$A$K;H(B
-$B$$;O$a$k$3$H$,$G$-$^$9!#$=$s$J9,1?$K7C$^$l$J$+$C$?$J$i$P!"(Bemacs-w3m $B$N(B
-$B%$%s%9%H!<%k$N;EJ}$r2qF@$9$k$?$a$K!"FI$_B3$1$F$/$@$5$$!#(B
-
-* Menu:
-
-* Required Emacs Version::      $B$I$s$J%P!<%8%g%s$N(B Emacs $B$G;H$($k$N(B?
-* You Need w3m::                w3m $B$r;H$$$^$9(B: emacs-w3m $B$,B.$$$o$1(B
-* Other Requirements::          Emacs-w3m $B$rF0:n$5$;$k$N$KI,MW$J$b$N(B
-* Installing Emacs-w3m::        Emacs-w3m $B$r%$%s%9%H!<%k$9$k(B
-* Non-UNIX-like systems::       $BHs(B UNIX $B7O4D6-$G$N%$%s%9%H!<%k(B
-* Minimal Settings::            $B@_Dj$7$J$1$l$P$J$i$J$$:GDc8B$N$b$N(B
-
-
-
-File: emacs-w3m-ja.info, Node: Required Emacs Version, Next: You Need w3m, Prev: Getting Started, Up: Getting Started
-
-$A$I$s$J%P$B!<$A%8%g%s$N(B Emacs $A$GJ9$($k$N(B?
-====================================
-
-$B0J2<$K5s$2$?$$$m$$$m$J%P!<%8%g%s$N(B Emacsen $B$G(B emacs-w3m $B$rF0:n$5$;$k$3(B
-$B$H$,$G$-$^$9!#(B
-
-`Emacs 21.1 $ARTIO(B'
-     $BDI2C$N%Q%C%1!<%8$OITMW$G$9!#(B
-
-`XEmacs 21.x'
-     $BBh0l$K!"(Bemacs-w3m $B$O(B XEmacs 21.4.17 $B0J>e!"$*$h$S(B XEmacs 21.5-b19
-     $B0J>e$@$1$r%5%]!<%H$9$k$3$H$KCm0U$7$F$/$@$5$$!#2C$($F!"(B
-     `timer-funcs.el' $B$r4^$`:G?7$N(B xemacs-base $B%Q%C%1!<%8$r%$%s%9%H!<%k(B
-     $B$7$F$*$/I,MW$,$"$j$^$9!#(B
-
-     APEL $B%Q%C%1!<%8$H(B `gifsicle' $B%W%m%0%i%`$,I,MW$G$9!#$5$i$K!"(B
-     `mailto' url $B$r2r@O$9$k$?$a$N(B `rfc2368.el' $B%b%8%e!<%k$r%$%s%9%H!<(B
-     $B%k$7$F$*$$$?J}$,NI$$$G$7$g$&(B (*Note Other Requirements::)$B!#(B
-
-`Emacs 20.x, Emacs 19.34 ($A:,(B Mule 2.3)'
-     $B$3$l$i$N(B Emacs $B$r(B emacs-w3m $B$O%5%]!<%H$7$^$;$s!#(B
-
-GNU Emacs $B$N3+H/HG$r;H$C$F$$$k$N$G$"$l$P!"$*$=$i$/(B CVS $BHG$N(B emacs-w3m
-$B$r;H$o$J$1$l$P$J$i$J$$$G$7$g$&!#$=$N>l9g$K$O!"%a!<%j%s%0%j%9%H$K;22C$9(B
-$B$k$3$H$r6/$/4+$a$^$9(B (*Note Mailing List::)$B!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: You Need w3m, Next: Other Requirements, Prev: Required Emacs Version, Up: Getting Started
-
-w3m $A$rJ9$$$^$9(B: emacs-w3m $A$,KY$$$o$1(B
-====================================
-
-Emacs-w3m $B$O30It%3%^%s%I(B w3m $B$r!"%&%'%V%3%s%F%s%D$r<hF@$9$k$?$a$N%P%C%/(B
-$B%(%s%I$H$7$F!"$^$?$O(B HTML $B$NIA2h%(%s%8%s$H$7$F;HMQ$7$^$9!#HsF14|F0:n$K(B
-$B$h$C$F9bB.$J(B Emacs $B%&%'%V%V%i%&%6$r<B8=$9$k$3$H$,$G$-$?$N$O(B w3m $B$N$*$+(B
-$B$2$G$9!#(B
-
-$B$"$J$?$O:G?7$N(B w3m $B$r%$%s%9%H!<%k$7$J$1$l$P$J$j$^$;$s!#$=$l$O0J2<$N>l=j(B
-$B$G<hF@$G$-$^$9(B:
-
-`http://prdownloads.sourceforge.net/w3m/'
-
-
-
-File: emacs-w3m-ja.info, Node: Other Requirements, Next: Installing Emacs-w3m, Prev: You Need w3m, Up: Getting Started
-
-Emacs-w3m $A$r$(GY/$AWw$5$;$k$N$K1XR*$J$b$N(B
-====================================
-
-$B;HMQ$7$F$$$k(B Emacs $B$N%P!<%8%g%s$K$h$C$F$O!"%5!<%I%Q!<%F%#$N%Q%C%1!<%8$,(B
-$BI,MW$K$J$k$3$H$,$"$j$^$9!#$3$N9`$G$O!"$=$l$i$r8+$D$1$F%$%s%9%H!<%k$9$k(B
-$B$?$a$N;qNA$rDs6!$7$^$9!#(B
-
-`APEL'
-     XEmacs $B$KIT2D7g$G$9!#(BEmacs-w3m $B$r9=C[$9$kA0$K(B APEL $B$r%$%s%9%H!<%k(B
-     $B$7$J$1$l$P$J$j$^$;$s!#(BAPEL $B$O0J2<$N>l=j$K$"$j$^$9(B:
-
-     `http://kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/apel/'
-
-     APEL XEmacs $B%Q%C%1!<%8(B (SUMO $B$K4^$^$l$F$$$^$9(B) $B$N%P!<%8%g%s(B 1.32
-     $B$h$j8E$$$b$N$O;H$($J$$$3$H$KCm0U$7$F$/$@$5$$!#$b$7$9$G$K$=$N$h$&$J(B
-     $BHG$N%Q%C%1!<%8$,%$%s%9%H!<%k$5$l$F$$$k$J$i$P!"$=$l$r99?7$9$k$+!"$^(B
-     $B$?$O>e5-$N%j%s%/$G<($7$?(B APEL $B$GCV$-49$($k$?$a$K!"0J2<$NL?Na$r;H$C(B
-     $B$F$/$@$5$$(B ($B?75,$K(B APEL $B$r%$%s%9%H!<%k$9$k>l9g$bF1$8L?Na$r;H$&$3$H(B
-     $B$,$G$-$^$9(B):
-
-          % rm -fr /usr/local/lib/xemacs/xemacs-packages/lisp/apel
-          % cd apel-10.7
-          % make install-package XEMACS=xemacs-21.4.x\
-            PACKAGEDIR=/usr/local/lib/xemacs/xemacs-packages
-
-`gifsicle'
-     XEmacs $B$KIT2D7g$G$9!#$9$Y$F$N(B XEmacs 21.x $B$K$O!"%*%W%F%#%^%$%:$5$l(B
-     $B$?%"%K%a!<%7%g%s(B gif $B$,@5>o$KI=<($5$l$J$+$C$?$j!"$"$k<o$N%$%s%?!<(B
-     $B%l!<%9(B gif $B$rI=<($7$h$&$H$9$k$H%/%i%C%7%e$7$F$7$^$&4{CN$N%P%0$,$"(B
-     $B$j$^$9!#(BEmacs-w3m $B$O(B gif $B%G!<%?$r(B XEmacs 21.x $B$G07$($k7A<0$KJQ49$9(B
-     $B$k$?$a$K!"(B`gifsicle' $B%W%m%0%i%`$r;H$$$^$9!#$3$l$O<!$N>l=j$+$iF~<j(B
-     $B$9$k$3$H$,$G$-$^$9(B:
-
-     `http://www.lcdf.org/gifsicle/'
-
-`ImageMagick'
-     ImageMagick $B%Q%C%1!<%8$K4^$^$l$F$$$k(B `convert' $B%W%m%0%i%`$,$"$l$P!"(B
-     emacs-w3m $B$O2hA|%5%$%:$NJQ99$d(B `favicon' $B2hA|$r(B Emacs $B$,07$($k%U%)!<(B
-     $B%^%C%H$KJQ49$9$k$?$a$K$=$l$r;H$$$^$9!#(BEmacs-w3m $B$O(B ImageMagick $B$,(B
-     $BL5$/$F$bF0:n$9$k$G$7$g$&$,!"%$%s%9%H!<%k$9$k$3$H$K$h$C$F$"$J$?$N%M%C(B
-     $B%H%5!<%U%#%s$,K-$+$J$b$N$K$J$k$G$7$g$&!#(BImageMagick $B%Q%C%1!<%8$O!"(B
-     $B0J2<$N>l=j$+$i<j$KF~$l$k$3$H$,$G$-$^$9(B:
-
-     `ftp://ftp.imagemagick.org/pub/ImageMagick/'
-
-     `favicon' $B2hA|$rA`:n$9$k$?$a$K!"%P!<%8%g%s(B 5.4.0-5 $B0J9_$N$b$N$r;H(B
-     $B$&$3$H$r?d>)$7$^$9!#0JA0$N%P!<%8%g%s$bF0$/$+$b$7$l$^$;$s$,!"$=$l$i(B
-     $B$O40A4$K%A%'%C%/$5$l$F$$$^$;$s!#(B
-
-`FLIM'
-     `Shimbun' $B%i%$%V%i%j$r;H$&$?$a$K$O(B FLIM $B%Q%C%1!<%8$,I,MW$G$9!#(B
-     `Shimbun' $B%i%$%V%i%j$O%&%'%V>e$N?7J9$rFI$`$?$a$NF;6qN`$N%3%l%/%7%g(B
-     $B%s$G!"(BGnus$B!"(BMew $B$^$?$O(B Wanderlust $B$H$H$b$K;H$&$3$H$,$G$-$^$9!#(B
-     *Note Shimbun Library::.
-
-     $B;H$C$F$$$k(B Emacs $B$N%P!<%8%g%s$K$+$+$o$i$:!"(BFLIM $B%Q%C%1!<%8$K$O(B
-     APEL $B%Q%C%1!<%8$,I,MW$G$"$k$3$H$KCm0U$7$F$/$@$5$$!#$7$?$,$C$F(B
-     `shimbun' $B%i%$%V%i%j$r;H$&$K$O!"(BAPEL $B$H(B FLIM $B$NN>J}$r%$%s%9%H!<%k(B
-     $B$7$J$1$l$P$J$j$^$;$s!#(BFLIM $B%Q%C%1!<%8$O0J2<$N>l=j$K$"$j$^$9(B:
-
-     `http://kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/flim/flim-1.14/'
-
-`Mule-UCS'
-     XEmacs 21.4 $B$r;H$&$+!"$^$?$O(B Emacs 21 $B$r;H$C$FCf9q8l!"F|K\8l!"4Z9q(B
-     $B8l$J$I$N%F%-%9%H$rFI$`I,MW$,$"$k$J$i$P!"(Bemacs-w3m $B$,(B (Unicode $B%7%9(B
-     $B%F%`$NBeI=E*$J(B coding system $B$G$"$k(B) UTF-8 $B$G%(%s%3!<%I$5$l$?%Z!<(B
-     $B%8$rI=<($G$-$k$h$&$K$9$k$?$a$K!"(BMule-UCS Emacs Lisp $B%Q%C%1!<%8$r%$(B
-     $B%s%9%H!<%k$9$k$3$H$r4+$a$^$9!#(BEmacs 21 $B$,(B Unicode $B%7%9%F%`$rItJ,E*(B
-     $B$K(B ($BNc$($P%i%F%s!&%F%-%9%H$N$?$a$K(B) $B%5%]!<%H$7!"(BEmacs 22 $B0J>e$,$=(B
-     $B$l$r40A4$K%5%]!<%H$9$k$3$H$KCm0U$7$F$/$@$5$$!#(BMule-UCS Emacs Lisp
-     $B%Q%C%1!<%8$O0J2<$N>l=j$+$i<hF@$7$F$/$@$5$$(B:
-
-     `http://unit.aist.go.jp/itri/itri-gist/ftp.m17n.org/pub/mule/Mule-UCS/test/Mule-UCS-current.tar.gz'
-
-     (Mule-UCS $B$N8x<0%Z!<%8$O6a$$>-Mh(B `http://www.meadowy.org/' $B$G%*!<(B
-     $B%W%s$7$^$9!#(B)
-
-     Emacs-21.2 $B$GMxMQ$9$k>l9g$O!"(BMule-UCS $B$K(B $A$3$N%Q%C%A(B
-     (http://www.m17n.org/mlarchive/mule/200203/msg00000.html) $B$rE,MQ$7(B
-     $B$?$[$&$,$$$$$G$7$g$&!#(B
-
-     XEmacs 21.4 $B%f!<%68~$1$K$O!"$3$3$K%3%s%Q%$%k:Q$_$N%Q%C%1!<%8$,$"$j(B
-     $B$^$9(B:
-
-     `ftp://ftp.xemacs.org/xemacs/packages/mule-ucs-1.14-pkg.tar.gz'
-
-     (Mule SUMO $B$K4^$^$l$F$$$k$N$G!"2C$($F$5$i$K$3$l$r%$%s%9%H!<%k$9$k(B
-     $BI,MW$O$"$j$^$;$s!#(B)
-
-`codepage-ex'
-     $B%h!<%m%C%Q$N$$$/$D$+$N(B web $B%5%$%H$O!"(B`charset=ISO-8859-1' $B$r%F%-%9(B
-     $B%H$N%(%s%3!<%I$K;XDj$7$F$$$k$N$K$b$+$+$o$i$:!"<B:]$K$O(B
-     `windows-1252' $B$r;H$$$^$9!#$=$l$i$r%G%3!<%I$9$k$N$K(B `iso-8859-1'
-     $B$OIT==J,$J$N$G!"(Bemacs-w3m $B$OMxMQ2DG=$J$i(B `windows-1252' $B$r(B
-     `iso-8859-1' $B$N%9!<%Q!<%;%C%H$H$7$F;HMQ$7$^$9!#(BEmacs 22 $B$+$i(B
-     `windows-1252' coding system $B$OAH$_9~$^$l$F$$$^$9$,!"(B
-     `codepage-ex' $B$H$$$&%b%8%e!<%k$r;H$&$3$H$K$h$C$F!"(BEmacs 21 $B$G$b$=(B
-     $B$l$r;H$($k$h$&$K$9$k$3$H$,$G$-$^$9!#0J2<$N%Z!<%8$r;2>H$7$F$/$@$5$$!#(B
-
-     `http://nijino.homelinux.net/emacs/codepage-ex.html'
-
-`rfc2368.el'
-     XEmacs $B>e$GF0:n$5$;$k(B emacs-w3m $B$,!"E,@Z$K(B `mailto' url $B$r2r@O$G$-(B
-     $B$k$h$&$K$7$?$$>l9g$K%$%s%9%H!<%k$7$F$/$@$5$$!#(BXEmacs $B$G;H$&$3$H$,(B
-     $B$G$-$k(B `rfc2368.el' $B%b%8%e!<%k$O!"(Bemacs-w3m $B$NG[I[$N(B `attic' $B%G%#(B
-     $B%l%/%H%j$K$"$j$^$9!#%$%s%9%H!<%k$9$k$K$O(B `rfc2368.el' $B%U%!%$%k$r(B
-     `load-path' $B$,DL$C$F$$$k%G%#%l%/%H%j$K%3%T!<$7$F!"0J2<$N%3%^%s%I$r(B
-     $B<B9T$7$F$/$@$5$$(B:
-
-          % xemacs -batch -vanilla -f batch-byte-compile rfc2368.el
-
-
-
-File: emacs-w3m-ja.info, Node: Installing Emacs-w3m, Next: Non-UNIX-like systems, Prev: Other Requirements, Up: Getting Started
-
-Emacs-w3m $A$r%$%s%9%H$B!<$A%k$9$k(B
-============================
-
-Emacs-w3m $B$N<hF@$K4X$7$F$O8x<0%Z!<%8(B `http://emacs-w3m.namazu.org/' $B$r(B
-$B;2>H$7$F$/$@$5$$!#$9$Y$F=`Hw$G$-$^$7$?$+(B?  $B$G$O;O$a$^$7$g$&!#(B
-
-$BHs(B UNIX $B7O$N%7%9%F%`(B (`configure' $B$r<B9T$G$-$J$$$+(B `make' $B%3%^%s%I$,L5(B
-$B$$!"2?$i$+$N%7%9%F%`(B) $B$K(B emacs-w3m $B$r%$%s%9%H!<%k$9$k$K$O!"$3$N9`$rHt$P(B
-$B$7$F<!$N9`(B *Note Non-UNIX-like systems:: $B$K9T$C$F$/$@$5$$!#(B
-
-  1. $B:G=i$K!"G[I[$5$l$?(B emacs-w3m $B$N(B tarball $B$r0J2<$N$h$&$KE,Ev$J>l=j$G(B
-     $BE83+$7$F!"@hF,$N%G%#%l%/%H%j$KF~$C$F$/$@$5$$(B:
-
-          % tar zxf emacs-w3m-1.4.413.tar.gz
-          % cd emacs-w3m-1.4.413
-
-     Emacs-w3m $B$r(B CVS $B$G<hF@$7$?$N$J$i$P!"(B`configure' $B%9%/%j%W%H$r@8@.(B
-     $B$9$k$?$a$K(B ($B0z?tL5$7$G(B) `autoconf' $B$r<B9T$7$J$1$l$P$J$j$^$;$s!#(B
-
-  2. `configure' $B%9%/%j%W%H$r<B9T$7$^$9!#(B
-
-          % ./configure
-
-     *Gnus $A%f$B!<$A%6$X$NVXR*$J$*V*$i$;(B*:
-
-     $BJ#?t$N%P!<%8%g%s$N(B Gnus $B$,%$%s%9%H!<%k$5$l$F$$$k>l9g(B ($B%j%j!<%9HG$H(B
-     $B3+H/HG$N(B Gnus $B$,$"$k$+$b$7$l$^$;$s(B) $B$O!"(B`load-path' $B$K$"$J$?$,;H$&(B
-     $B%P!<%8%g%s$,%$%s%9%H!<%k$5$l$F$$$k%G%#%l%/%H%j(B (`gnus.elc' $B%U%!%$(B
-     $B%k$rD4$Y$^$7$g$&(B) $B$r4^$`$h$&$K$7$F$/$@$5$$!#0J2<$N$h$&$K(B
-     `--with-addpath' $B%*%W%7%g%s$r;H$&$3$H$K$h$C$F!"$3$l$r3N<B$K9T$J$&(B
-     $B$3$H$,$G$-$^$9(B:
-
-          % ./configure --with-addpath=/usr/local/share/emacs/site-lisp/gnus
-
-     APEL$B!"(BFLIM $B$^$?$OB>$N2?$+$r!"%G%U%)%k%H$N(B `load-path' $B0J30$NI8=`$G(B
-     $B$O$J$$%G%#%l%/%H%j$K%$%s%9%H!<%k$7$F$"$k>l9g$O!"0J2<$N$h$&$K(B
-     `--with-addpath' $B%*%W%7%g%s$r;H$C$F$=$l$i$r;XDj$7$J$1$l$P$J$j$^$;(B
-     $B$s(B ($B$5$i$K!"$=$l$K(B `:' $B$GJ,$1$i$l$?(B Gnus $B$N%G%#%l%/%H%j$r4^$a$F$b(B
-     $B9=$$$^$;$s(B):
-
-          % ./configure --with-addpath=/opt/share/apel:/opt/share/flim
-
-  3. $BC1$K(B `make' $B$H(B `make install' $B$r<B9T$7$^$9!#(BXEmacs $B$r;H$C$F$$$k>l(B
-     $B9g$O!"$5$i$K<!$NCJMn$b8+$F$/$@$5$$!#(B
-
-          % make
-          % make install
-
-     $B$9$Y$F$N(B Lisp $B%U%!%$%k$H(B info $B%U%!%$%k$,E,@Z$J%G%#%l%/%H%j$K%$%s%9(B
-     $B%H!<%k$5$l$k$G$7$g$&!#(B
-
-     $B$5$F!"$"$J$?$O$I$s$J%U%!%$%k$,$I$3$K9T$/$+J,$+$j$^$9$+(B?  $B$=$l$rA0(B
-     $B$b$C$FCN$k$?$a$K$O!"$3$l$r;H$C$F$/$@$5$$(B:
-
-          % make what-where
-
-     $B2hA|$rI=<($9$k$3$H$,$G$-$k(B Emacs $B$^$?$O(B XEmacs $B$r;H$C$F$$$k$J$i$P!"(B
-     $B%"%$%3%s2hA|$N%U%!%$%k$r%$%s%9%H!<%k$7$?J}$,NI$$$G$7$g$&!#$=$l$r9T(B
-     $B$J$&$K$O(B:
-
-          % make install-icons
-
-     $B$^$?$O(B
-
-          % make install-icons30
-
-     $B8e<T$O$A$g$C$HBg$-$J%"%$%3%s2hA|$r;H$&$?$a$N$b$N$G$9!#(B
-
-  4. $B0J2<$N$h$&$K(B `make install' $B$NBe$o$j$K(B `make install-package' $B$r;H(B
-     $B$&$3$H$K$h$C$F!"(Bemacs-w3m $B$r(B XEmacs $B%Q%C%1!<%8$H$7$F%$%s%9%H!<%k$9(B
-     $B$k$3$H$b$G$-$^$9(B:
-
-          % make
-          % make install-package
-
-     $B$3$N>l9g(B `make install-icons' $B$^$?$O(B `make install-icons30' $B$r<B9T(B
-     $B$9$kI,MW$O$"$j$^$;$s!#(B
-
-     $B%Q%C%1!<%8!&%G%#%l%/%H%j$r;XDj$9$k$K$OFs$D$NJ}K!$,$"$j$^$9(B:
-
-        * `configure' $B%*%W%7%g%s$N(B `--with-packagedir=' $B$r;H$$$^$9!#Nc(B
-          $B$G$9(B:
-
-               % ./configure --with-packagedir=/opt/xemacs/xemacs-packages
-               % make what-where
-               % make
-               % make install-package
-
-        * $BJQ?t(B `PACKAGEDIR' $B$r;H$$$^$9!#Nc$G$9(B:
-
-               % ./configure
-               % make what-where PACKAGEDIR=/opt/xemacs/xemacs-packages
-               % make
-               % make install-package PACKAGEDIR=/opt/xemacs/xemacs-packages
-
-
-
-File: emacs-w3m-ja.info, Node: Non-UNIX-like systems, Next: Minimal Settings, Prev: Installing Emacs-w3m, Up: Getting Started
-
-$A7G(B UNIX $AO5$(Gt?$A>3$G$N%$%s%9%H$B!<$A%k(B
-==============================
-
-$B$"$J$?$N%7%9%F%`$G(B `configure' $B%9%/%j%W%H$r<B9T$9$k$3$H$,$G$-$J$$$+!"(B
-`make' $B%3%^%s%I$,MxMQ$G$-$J$$>l9g$O!"0J2<$NJ86g$r>'$($F$/$@$5$$!#(B
-
-     % emacs -batch -q -no-site-file -l w3mhack.el NONE -f w3mhack-nonunix-install
-
-APEL$B!"(BFLIM ($B$^$?$OB>$N2?$+(B) $B$,IaDL$N>l=j$K%$%s%9%H!<%k$5$l$F$$$J$$$H!"(B
-$B%$%s%9%H!<%i$O$=$l$i$rL5;k$7$F$7$^$&$G$7$g$&!#$=$s$J>l9g$O!"0J2<$K<($9(B
-$B$h$&$K!"$=$l$i$N>l=j$r%$%s%9%H!<%i$K9p$2$kI,MW$,$"$j$^$9(B:
-
-     % emacs -batch -q -no-site-file -l w3mhack.el //c/share/apel://c/share/flim -f w3mhack-nonunix-install
-
-
-
-File: emacs-w3m-ja.info, Node: Minimal Settings, Prev: Non-UNIX-like systems, Up: Getting Started
-
-$(G]C$A6($7$J$1$l$P$J$i$J$$Wn5MO^$N$b$N(B
-==================================
-
-$B$3$N9`$G$O4pK\E*$J(B emacs-w3m $B$N@_Dj$N$$$/$D$+$r@bL@$7$^$9!#$-$a:Y$+$J@_(B
-$BDj$r$7$?$$$J$i$P!"$?$/$5$s$N%+%9%?%^%$%:2DG=$JJQ?t$r(B *Note
-Customizable Variables:: $B$G8+$D$1$k$3$H$,$G$-$k$G$7$g$&!#(B
-
-`Autoloads'
-     Emacs-w3m $B$r(B XEmacs $B%Q%C%1!<%8$H$7$F%$%s%9%H!<%k(B (*Note
-     Installing Emacs-w3m::) $B$7$F$"$l$P(B `w3m/auto-autoloads.el' $B%U%!%$(B
-     $B%k$,<+F0%m!<%I(B (autoload) $B$NLLE]$r8+$F$/$l$k$N$G!"$3$l$OI,MW$"$j$^(B
-     $B$;$s!#(B
-
-     $B$=$l0J30$N$9$Y$F$N>l9g!"0J2<$N9T$r(B `~/.emacs' $B%U%!%$%k$KF~$l$F$/$@(B
-     $B$5$$(B:
-
-          (require 'w3m-load)
-
-`Startup File'
-     Emacs-w3m $B$N$$$m$s$JJQ?t$r$$$8$kI,MW$,$"$k$H$-$O!"(B`~/.emacs-w3m'
-     $B%U%!%$%k(B ($B$3$l$O(B `w3m-init-file' $B$H$$$&JQ?t$N%G%U%)%k%HCM$G$9(B) $B$N(B
-     $BMxMQ$r?d>)$7$^$9!#$3$N%U%!%$%k$O(B `~/.emacs' $B$H;w$F$$$^$9$,!"$3$A$i(B
-     $B$O(B emacs-w3m $B$,5/F0$9$k$H$-$KFI$_9~$^$l$^$9!#(B`w3m-command' $B$J$I4v(B
-     $B$D$+$N%*%W%7%g%s$O!"$3$N%U%!%$%k$G$OJQ99$G$-$J$$$3$H$KCm0U$7$F$/$@(B
-     $B$5$$!#(B
-
-`Proxy Gateway'
-     $B$"$J$?$,KI2PJI(B (firewall) $B$NCf$+$i(B proxy $B%2!<%H%&%'%$$rDL$7$F%$%s(B
-     $B%?!<%M%C%H$K@\B3$7$F$$$k>l9g$O!"$=$l$r;H$&$h$&$K(B w3m $B$K;X<($9$kI,(B
-     $BMW$,$"$j$^$9!#(B
-
-     $B$3$l$K$O$$$/$D$+$NJ}K!$,$"$j$^$9!#0l$D$O4D6-JQ?t(B `http_proxy' $B$r(B
-     shell $B>e$G!"$3$s$J$U$&$K%0%m!<%P%k$K@_Dj$9$k$3$H$G$9(B:
-
-          setenv http_proxy http://proxy.hogege.com:8000/
-
-     $BB>$K!"JQ?t(B `w3m-command-arguments' $B$r%+%9%?%^%$%:$7$F!"(B`-o' $B$*$h$S(B
-     `http_proxy=http://PROXY_SERVER_NAME:PORT/' $B$rDI2C$9$kJ}K!$,$"$j$^(B
-     $B$9!#$3$l$O(B `~/.emacs-w3m' $B%U%!%$%k$G0J2<$N$h$&$K9T$J$&$3$H$b$G$-$^(B
-     $B$9!#(B
-
-          (setq w3m-command-arguments
-                (nconc w3m-command-arguments
-                       '("-o" "http_proxy=http://proxy.hogege.com:8000/")))
-
-     Proxy $B%2!<%H%&%'%$$rDL$9$Y$-$G$O$J$$%[%9%H(B ($B%$%s%H%i%M%C%H$N%5%$%H(B
-     $B$J$I(B) $B$r;XDj$9$k$K$O!"4D6-JQ?t(B `no_proxy' (`no-proxy' $B$G$O$J$$$3$H(B
-     $B$K$4Cm0U(B) $B$K%3%s%^$G6hJ,$1$5$l$?%[%9%HL>$N%j%9%H$r@_Dj$7$F$/$@$5$$!#(B
-     $B$"$k$$$O0J2<$N$h$&$K!"JQ?t(B `w3m-no-proxy-domains' $B$K%I%a%$%sL>(B ($B%[(B
-     $B%9%HL>$G$O$J$$(B) $B$N%j%9%H$r@_Dj$9$k$3$H$b$G$-$^$9(B:
-
-          (setq w3m-no-proxy-domains '("local.com" "neighbor.com"))
-
-     `no_proxy' $B%[%9%H$N@_Dj$K$I$&$d$C$F@55,I=8=$r;H$&$+$N@bL@$O!"JQ?t(B
-     `w3m-command-arguments-alist' $B$N%I%-%e%a%s%H$r8+$F$/$@$5$$!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Basic Usage, Next: Pretty Good Features, Prev: Getting Started, Up: Top
-
-$A;y1>5D$JJ9$$7=(B
-**************
-
-* Menu:
-
-* Browsing Web Pages::          $B%M%C%H%5!<%U%#%s$7$h$&(B!
-* Inline Images::               $B2hA|I=<($r(B ON/OFF $B$9$k(B
-* Tracing History::             $B;~6u$rAL$k(B
-* Managing Bookmarks::          $B$\$/$N(B/$B$o$?$7$N$*5$$KF~$j(B
-* Using Tabs::                  $B$_$s$J%?%V$,9%$-$@$h$M(B
-* Working with buffers::        $B%P%C%U%!$r:n$k(B/$B>C$9(B/$B0\F0$9$k(B
-* Downloading::                 $B%U%!%$%k$r%@%&%s%m!<%I$9$k(B
-* Submitting Forms::            HTML $B%U%)!<%`$K5-F~$9$k(B
-* HTML File Information::       $B%&%'%V%Z!<%8:n$j$H%O%C%/$N$*<jEA$$(B
-
-
-
-File: emacs-w3m-ja.info, Node: Browsing Web Pages, Next: Inline Images, Prev: Basic Usage, Up: Basic Usage
-
-$A%M%C%H%5$B!<$A%U%#%s$7$h$&(B!
-=======================
-
-$B$9$Y$F$N%&%'%V!&%V%i%&%:$NA`:n$O!"%-!<$G9T$&$3$H$,$G$-$^$9!#(BEmacs-w3m
-$B$O%G%U%)%k%H$G(B `Lynx-like' $B%-!<%^%C%W(B (*Note Key Binding::) $B$H$$$&$b$N(B
-$B$r;H$$$^$9!#$b$A$m$s%^%&%9$r;H$&$3$H$b$G$-$^$9!#(B
-
-* Menu:
-
-* Key Binding::                 $BFs$D$N%-!<%P%$%s%I(B
-* Launching and Jumping::       $B$H$K$+$/F0$+$7$F$_$h$&(B
-* Moving in a page::            $B%Z!<%8Fb$rHt$S$^$o$k(B
-* Moving over pages::           $B%Z!<%84V$rEO$jJb$/(B
-* Browsing With Mouse Operations:: $B%^%&%9$r;H$C$F%5!<%U%#%s(B
-* Going back to daily hacking and/or daily writing:: $BIaCJ$N@83h$KLa$k$K$O(B
-
-
-
-File: emacs-w3m-ja.info, Node: Key Binding, Next: Launching and Jumping, Prev: Browsing Web Pages, Up: Browsing Web Pages
-
-$A6~$D$N%-$B!<$A%P%$%s%I(B
-------------------
-
-Emacs-w3m $B$O(B Emacs $B%&%'%V!&%V%i%&%6$NNr;K$NCf$G$O8eH/$N%V%i%&%6$J$N$G!"(B
-$B%f!<%6$,?7$7$$%&%'%V!&%V%i%&%6$KMF0W$K47$l$k$3$H$,$G$-$k$h$&$K$9$k$?$a(B
-$B$K!"Fs<oN`$N%-!<%P%$%s%I$rMQ0U$7$^$7$?!#0l$D$O(B `Lynx-like' $B%-!<%^%C%W$H(B
-$B8F$P$l!"$b$&0l$D$O(B `Info-like' $B%-!<%^%C%W$G$9!#$3$l$i$NL>A0$+$i!"$=$l$i(B
-$B$,2?$r0UL#$9$k$+$OJ,$+$j$^$9$M(B?  $BA0<T$O%F%-%9%HHG$N%&%'%V!&%V%i%&%6$G$"(B
-$B$k(B `Lynx' $B$N$b$N$K;w$F$$$^$9!#$=$7$F8e<T$O(B GNU $B$N8x<0%I%-%e%a%s%H!&%V%i(B
-$B%&%6$G$"$k(B `Info' $B$N$b$N$K;w$F$$$^$9!#%G%U%)%k%H$G$O(B `Lynx-like' $B%-!<%^%C(B
-$B%W$,;H$o$l$^$9!#(B`Info-like' $B%-!<%^%C%W$r;H$$$?$$$N$J$i$P!"(B
-
-     M-x customize-option <RET> w3m-key-binding <RET>
-
-$B$H%?%$%W$7$F(B `Info-like' $B%-!<%^%C%W$rA*$S!"JQ99$r%;!<%V$7$F$/$@$5$$!#$"(B
-$B$k$$$O0J2<$NCGJR$r(B `~/.emacs' $B%U%!%$%k(B (`~/.emacs-w3m.el' $B%U%!%$%k$G$O(B
-$B$"$j$^$;$s(B) $B$K2C$($F$/$@$5$$(B:
-
-     (setq w3m-key-binding 'info)
-
-$B%-!<%P%$%s%I$r0l$D$:$DJQ99$9$k$K$O!"(B`~/.emacs-w3m.el' $B%U%!%$%k$G0J2<$N(B
-$B$h$&$K(B `w3m-mode-map' $BJQ?t$r$$$8$C$F$/$@$5$$(B:
-
-     (define-key w3m-mode-map [up] 'previous-line)
-     (define-key w3m-mode-map [down] 'next-line)
-     (define-key w3m-mode-map [left] 'backward-char)
-     (define-key w3m-mode-map [right] 'forward-char)
-
-
-
-File: emacs-w3m-ja.info, Node: Launching and Jumping, Next: Moving in a page, Prev: Key Binding, Up: Browsing Web Pages
-
-$A$H$K$+$/$(GY/$A$+$7$F$_$h$&(B
-----------------------
-
-$B0J2<$K5s$2$k;0$D$N0c$&%3%^%s%I$r;H$C$F(B emacs-w3m $B$r5/F0$9$k$3$H$,$G$-$^(B
-$B$9!#$=$l$i$N%3%^%s%I$N0l$D$r;n$7$F$/$@$5$$!#%&%'%V%Z!<%8$,(B "*w3m*" $B$H$$(B
-$B$&L>A0$N(B Emacs $B$N%P%C%U%!(B (emacs-w3m $B$N%P%C%U%!$N$3$H(B) $B$KI=<($5$l$^$9!#(B
-$B$*$=$i$/5$IU$/$G$7$g$&$1$l$I$b!"(Bemacs-w3m $B$N%P%C%U%!$N%a%8%c!<%b!<%I$O(B
-`w3m-mode' $B$G$9!#B>$K%^%$%J!<%b!<%I(B (*Note Managing Bookmarks::) $B$b$"$j(B
-$B$^$9!#(B
-
-$B$3$3$G$O!"$=$l$i$N%3%^%s%I$N:G$b4pK\E*$J;H$$J}$@$1$r@bL@$7$^$9!#$=$l$i(B
-$B$K$D$$$F$b$C$H>\$7$/CN$j$?$$>l9g$O!"(B*Note Emacs-w3m Functions:: $B$r;2>H(B
-$B$7$F$/$@$5$$!#$^$?!"(Bemacs-w3m $B$NF0:n$r%+%9%?%^%$%:$9$k$?$a$K;H$&$3$H$,(B
-$B$G$-$kJQ?t72$r!"(B*Note Customizable Variables:: $B$G;2>H$7$F$/$@$5$$!#(B
-
-`w3m'
-     Emacs-w3m $B$r5/F0$7$F!"(B`w3m-home-page' $B$H$$$&JQ?t$G;XDj$5$l$?%[!<%`(B
-     $B%Z!<%8$rI=<($7$^$9!#(B`w3m-home-page' $B$N%G%U%)%k%H$NCM$O(B "about:" $B$G(B
-     $B$9!#(BEmacs-w3m $B$r5/F0$7$?$H$-$KKh2s(B URL $B$rF~NO$G$-$k$h$&$K$7$?$$>l(B
-     $B9g$O!"JQ?t(B `w3m-quick-start' $B$NCM$r(B `nil' $B$K$7$F$/$@$5$$(B (*Note
-     Customizable Variables::)$B!#(B
-
-     $B$3$l$O(B Emacs $B$r5/F0$9$k$H$-$K0z?t$H$7$F;H$&$3$H$b$G$-$^$9!#Nc$G$9(B:
-
-          % emacs -f w3m
-
-     URL $B$r;XDj$7$F!"$3$N$h$&$K;H$&$3$H$b$G$-$^$9(B:
-
-          % emacs -f w3m http://emacs-w3m.namazu.org/
-
-`w3m-find-file'
-     $B%m!<%+%k%U%!%$%kL>$r%_%K%P%C%U%!$GF~NO$7$F!"$=$l$r(B emacs-w3m $B$GI=(B
-     $B<($7$^$9!#(B
-
-`w3m-browse-url'
-     URL $B$r%_%K%P%C%U%!$GF~NO$7$F!"$=$l$r(B emacs-w3m $B$GI=<($7$^$9!#$3$N(B
-     $B%3%^%s%I$O!"$I$A$i$+$H8@$($PB>$N%"%W%j%1!<%7%g%s%W%m%0%i%`$+$i(B
-     emacs-w3m $B$r5/F0$9$k$?$a$KMQ0U$5$l$F$$$^$9!#(B
-
-$B$"$J$?$,$9$G$K(B Emacs $B$N%f!<%6$J$i$P!"(Bemacs-w3m $B$N%P%C%U%!$NCf$G0\F0$9$k(B
-$B$N$K6lO+$OL5$$$G$7$g$&!#B?$/$NI8=`$N%-!<$,$=$N$^$^;H$($k$N$G$9$+$i!#Nc(B
-$B$($P(B `C-n'$B!"(B`C-v' $B$=$l$K(B `C-s' $B$O(B emacs-w3m $B%P%C%U%!$GM-8z$J%-!<$G$9(B
-($B$3$l$i$O0l9T2<9_!"0l%Z!<%8Aw$j!"$^$?$O8eJ}C18l8!:w$H$7$F6&DL$K;H$o$l$^(B
-$B$9(B)$B!#(B
-
-$B%j%s%/$r$?$I$k$K$O(B `<RET>' $B%-!<$r;H$C$F$/$@$5$$!#$=$l$K$O%]%$%s%H$r%j%s(B
-$B%/$N>l=j$K0\F0$7$J$1$l$P$J$j$^$;$s!#%j%s%/$OIaDL$N%F%-%9%H$H$O0c$C$FI=(B
-$B<($5$l$F$$$k$N$G!"4JC1$K8+J,$1$k$3$H$,$G$-$^$9!#$=$l$i$O2<@~IU$-!"$^$?(B
-$B$O0c$&?'$K$J$C$F$$$k$O$:$G$9!#$=$l$i$N8+1I$($O(B `w3m-anchor' $B$H$$$&%U%'!<(B
-$B%9$K$h$C$F7h$^$j$^$9(B (*Note Customizable Variables::)$B!#(B
-
-`<RET>'
-`<right>' (Lynx-like $A%-$B!<$A%^%C%W$N$_(B)
-     $B8=:_0LCV$N%j%s%/$,;X$7<($9%Z!<%8$rI=<($7$^$9(B
-     (`w3m-view-this-url')$B!#(B
-
-     $B$3$N%3%^%s%I$N?6$kIq$$$O!"87L)$K$O8=:_0LCV$N%j%s%/$N@-<A$K$h$C$F!"(B
-     $B$^$?$O@\F,0z?t$rM?$($k$+$I$&$+$K0MB8$7$^$9!#>\:Y$O(B *Note
-     Emacs-w3m Functions:: $B$r;2>H$7$F$/$@$5$$!#(B
-
-$BA0=R$N$h$&$K!"JQ?t(B `w3m-quick-start' $B$NCM$r(B `nil' $B$K@_Dj$9$k$3(B
-$B$H$K$h$C$F!"(B`M-x w3m' $B%3%^%s%I$r;H$C$?$H$-$K(B URL $B$r;XDj$9$k$3$H(B
-$B$,2DG=$G$9!#(BEmacs-w3m $B$N%P%C%U%!$G$O!"F~NO$7$??7$7$$(B URL $B$N%Z!<%8$K9T$/(B
-$B$?$a$N0lHLE*$JJ}K!$,!"$5$i$K0J2<$NFs$D$"$j$^$9!#(B
-
-`<RET>'
-     Emacs-w3m $B$N%P%C%U%!$K$*$$$F!"%X%C%@%i%$%s$KI=<($5$l$F$$$k(B URL $B$N(B
-     $B0LCV$K%]%$%s%H$r0\F0$5$;$F$+$i(B `<RET>' $B$rC!$/$3$H$K$h$C$F!"%_%K%P%C(B
-     $B%U%!$+$i(B URL $B$rF~NO$7$F!"$=$N%Z!<%8$rI=<($5$;$k$3$H$,$G$-$^$9!#(B
-     Mozilla $B$J$I$N(B GUI $B%Y!<%9$N%&%'%V%V%i%&%6$K47$l$F$$$k?M$K$H$C$F!"(B
-     $B$3$N5!G=$O$*$J$8$_$G$9$h$M!#$3$l$K4X$9$k>\$7$$@bL@$,(B *Note
-     Emacs-w3m Functions:: $B$G8+$D$+$k$O$:$G$9(B (`w3m-view-this-url')$B!#(B
-
-`g'
-     $B%_%K%P%C%U%!$G(B URL $B$NF~NO$r$&$J$,$7$F!"(Bemacs-w3m $B$K$=$N%Z!<%8$rI=(B
-     $B<($5$;$k$3$H$,$G$-$^$9(B ($B%]%$%s%H$N0LCV$H$OL54X78$G$9(B)$B!#$3$N%-!<$N(B
-     $B3d$jEv$F$O!"$9$G$K(B Gnus $B$d(B Mew $B$rMxMQ$7$F$$$k?M$K$O$*$J$8$_$G$7$g(B
-     $B$&(B (`w3m-goto-url')$B!#(B
-
-`G'
-     $B%_%K%P%C%U%!$G(B URL $B$NF~NO$r$&$J$,$7$F!"$=$l$r?7$7$$%;%C%7%g%s$GI=<($7$^(B
-     $B$9!#$3$l$O$A$g$&$I(B `g' (<M-x w3m-goto-url>) $B$N$h$&$KF0:n$7$^(B
-     $B$9$,!"?7$7$$%;%C%7%g%s$r3+$/$H$3$m$,0c$$$^$9!#J8;zC<Kv$G(B emacs-w3m $B$r;H$C(B
-     $B$F$$$k$N$G$J$$8B$j!"?7$7$$%;%C%7%g%s$r3+$/$H$$$&$3$H$O!"$=$N%Z!<%8$r?7$7(B
-     $B$$%?%V$GI=<($9$k$3$H$r0UL#$7$^$9!#%?%V$K$D$$$F$N$b$C$H>\$7$$$3$H$O!"(B
-     *Note Using Tabs:: $B$r;2>H$7$F$/$@$5$$(B (`w3m-goto-url-new-session')$B!#(B
-
-`c' (Lynx-like $A%-$B!<$A%^%C%W(B)
-`y' (Info-like $A%-$B!<$A%^%C%W(B)
-     $BI=<($7$F$$$k%Z!<%8$N(B URL $B$r%(%3!<%(%j%"$KI=<($9$k$H$H$b$K!"(B
-     `kill-ring' $B$K(B URL $B$rA^F~$7$^$9(B (`w3m-print-current-url')$B!#(B
-
-`u' (Lynx-like $A%-$B!<$A%^%C%W(B)
-`Y' (Info-like $A%-$B!<$A%^%C%W(B)
-     $B8=:_0LCV$N%j%s%/$,;X$7<($9BP>]$N(B URL $B$r%(%3!<%(%j%"$KI=<($9$k$H$H$b$K!"(B
-     `kill-ring' $B$K(B URL $B$rA^F~$7$^$9(B (`w3m-print-this-url')$B!#(B
-
-$B$5$F!"$"$J$?$,FI$s$G$$$k%Z!<%8$,:#F|$N;~;v%K%e!<%9$+$@$l$+$NF|5-$@$C$?(B
-$B$i!"$=$l$r<h$j9~$s$@8e$G?7$7$$FbMF$GCV$-49$($i$l$F$$$k$+$b$7$l$^$;$s!#(B
-$B<!$N%3%^%s%I$r;H$&$H!"F1$8%Z!<%8$N:G?7$NFbMF$K99?7$9$k$3$H$,$G$-$^$9!#(B
-($B$3$N%3%^%s%I$O!"%Z!<%8$,2u$l$F$$$k$h$&$K8+$($k>l9g$K!"A42hLL$N:FIA2h$r(B
-$B6/@)$5$;$k$?$a$K$bLrN)$F$k$3$H$,$G$-$^$9!#(B)
-
-`R'
-`C-S-l' (Info-like $A%-$B!<$A%^%C%W$N$_(B)
-     $B%Z!<%8$rFI$_9~$_D>$7$^$9(B (`w3m-reload-this-page')$B!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Moving in a page, Next: Moving over pages, Prev: Launching and Jumping, Up: Browsing Web Pages
-
-$A%Z$B!<$A%8DZ$r$(GSy$A$S$^$o$k(B
---------------------
-
-Emacs $B$G0\F0MQ$K3d$jEv$F$i$l$F$$$kFk@w$_?<$$%-!<$,%&%'%V%Z!<%8$N1\MwCf(B
-$B$K;H$($k$3$H$O!"$*$=$i$/$9$G$K$"$J$?$rL%N;$7$F$$$k$G$7$g$&!#?.$8$F$b$i(B
-$B$($J$$$+$b$7$l$^$;$s$,!"$b$C$H$"$k$N$G$9(B!  $B;d$?$A$O$"$J$?$N;~4V$rBg@Z$K(B
-$B$7$?$$$N$G!"%]%$%s%H$N0\F0!"%Z!<%8$N%9%/%m!<%k!"$"$k$$$O$H$F$bB.$$$d$j(B
-$BJ}$G%j%s%/$r8+$D$1$k$?$a$N%-!<$rDI2C$7$^$7$?!#$=$l$i$r%^%9%?!<$9$l$P!"(B
-$B$=$l$i$,$I$s$J$KJXMx$+$rJ,$+$C$F$b$i$($k$G$7$g$&!#(B
-
-Emacs $B$NI8=`%-!<%P%$%s%I$KHf$Y$F(B `w3m-mode' $B$G$O!"$h$jC;$$%-!<%9%H%m!<(B
-$B%/$G%9%/%m!<%k%3%^%s%I72$r8F$S=P$;$k$h$&$K%-!<$,3d$jEv$F$i$l$F$$$^$9!#(B
-$B%&%'%V%Z!<%8Fb$G%F%-%9%H$rF~NO$G$-$k8D=j$O$+$J$jFCJL$J$N$G(B (*Note
-Submitting Forms::)$B!"$?$$$F$$$N%-!<$OFCJL$J0UL#$r;}$C$F$$$F!"$=$3$G$O(B
-`self-insert-command' $B$K3d$jEv$F$i$l$F$$$^$;$s!#(B
-
-`<SPC>'
-     $B2<$K8~$+$C$F%9%/%m!<%k$7$^$9!#(B`more' $B$d(B `less' $B%3%^%s%I!"$"$k$$$O(B
-     Emacs $B$N(B `view-mode' $B$r;H$C$?$3$H$,$"$l$P!"3P$($k$^$G$b$J$$%-!<$G(B
-     $B$9$h$M(B (`w3m-scroll-up-or-next-url')$B!#(B
-
-`<DEL>'
-`b'
-`<backspace>'
-`S-<SPC>'
-`C-?'
-     $B>e$K8~$+$C$F%9%/%m!<%k$7$^$9!#(B`less' $B%3%^%s%I$d(B Emacs $B$N(B
-     `view-mode' $B$KFk$l?F$7$s$G$$$k$"$J$?$N<j$O!"<+A3$K$3$N%-!<$rC!$/$G(B
-     $B$7$g$&(B (`w3m-scroll-down-or-previous-url')$B!#(B
-
-`>'
-     $B:8$K%9%/%m!<%k$7$^$9!#%9%/%m!<%k$NNL$O(B
-     `w3m-horizontal-scroll-columns' $B$GM?$(!"%G%U%)%k%HCM$O(B 10 $B$G$9(B
-     (`w3m-scroll-left')$B!#(B
-
-`<'
-     $B1&$K%9%/%m!<%k$7$^$9!#%9%/%m!<%k$NNL$O(B
-     `w3m-horizontal-scroll-columns' $B$GM?$(!"%G%U%)%k%HCM$O(B 10 $B$G$9(B
-     (`w3m-scroll-right')$B!#(B
-
-`.' (Lynx-like $A%-$B!<$A%^%C%W(B)
-`S-<left>' (Info-like $A%-$B!<$A%^%C%W(B)
-     $B:8$K%7%U%H$7$^$9(B ($B>.9o$_$J?eJ?%9%/%m!<%k(B)$B!#%7%U%H$NNL$O(B
-     `w3m-horizontal-shift-columns' $B$GM?$(!"%G%U%)%k%HCM$O(B 2 $B$G$9(B
-     (`w3m-shift-left')$B!#(B
-
-`,' (Lynx-like $A%-$B!<$A%^%C%W(B)
-`S-<right>' (Info-like $A%-$B!<$A%^%C%W(B)
-     $B1&$K%7%U%H$7$^$9(B ($B>.9o$_$K?eJ?%9%/%m!<%k$G$9(B)$B!#%7%U%H$NNL$O(B
-     `w3m-horizontal-shift-columns' $B$GM?$(!"%G%U%)%k%HCM$O(B 2 $B$G$9(B
-     (`w3m-shift-right')$B!#(B
-
-`M-l'
-     $B8=:_%]%$%s%H$,$"$k0LCV$N%F%-%9%H$,!"?eJ?J}8~$K4X$7$FCf?4$K$J$k$h$&(B
-     $B$K%9%/%m!<%k$7$^$9(B (`w3m-horizontal-recenter')$B!#(B
-
-`w3m-mode' $B%a%8%c!<%b!<%I$G$O!"$$$m$$$m$J<oN`$N0\F0%3%^%s%I$,Dj5A$5$l$F(B
-$B$$$^$9!#$9$J$o$A!"%j%s%/!"%U%)!<%`!"$=$l$K2hA|(B ($B$=$l$,I=<($5$l$F$$$F$b(B
-$B$$$J$/$F$b(B) $B$G$9!#(B
-
-$B4JC1$JNc$r5s$2$F$_$^$9!#9-$/CN$i$l$F$$$k(B Google $B8!:w%(%s%8%s$GC18l$rD4(B
-$B$Y$?$$$N$@$H$7$^$7$g$&!#%9%F%C%W#1(B: emacs-w3m $B$G(B
-`http://www.google.com' $B$r3+$-$^$9!#%9%F%C%W#2(B: $B$$$C$?$s%Z!<%8$,FI$_9~(B
-$B$^$l$?$i(B `]' $B$rC!$$$F$/$@$5$$!#$0$o$7$C(B! (1) (*Note Moving in a
-page-Footnotes::) $B%]%$%s%H$,%Z!<%8$N:G=i$NF~NO%U%)!<%`$K0\F0$7$^$7$?$M!#(B
-$B:#$d(B `<RET>' $B$rC!$$$F$=$3$K2?$+$rF~NO$7$F!"(B`C-c C-c' $B$GAw$k(B
-$B$3$H$,$G$-$^$9!#$3$N%3%^%s%IL5$7$G$O!"$=$N%Z!<%8$K(B `C-n' $B$d(B
-`C-f' $B$J$I$rBG$A9~$s$G0\F0$7$J$1$l$P$J$i$J$/$F!"$^$C$?$/9|@^$j$J$3(B
-$B$H$@$C$?$G$7$g$&!#(B
-
-`<TAB>'
-`<down>' (Lynx-like $A%-$B!<$A%^%C%W$N$_(B)
-     $B<!$N%j%s%/(B (emacs-w3m $B$NMQ8l$G$O(B "$B%"%s%+!<(B") $B$X%]%$%s%H$r0\F0$7$^(B
-     $B$9!#$h$j87L)$K$O!"=gJ}8~$G:G$b6a$$%"%s%+!<$X0\F0$7$^$9!#(B
-
-`M-<TAB>'
-`S-<TAB>'
-`<backtab>'
-`<up>' (Lynx-like $A%-$B!<$A%^%C%W$N$_(B)
-     $BA0$N%"%s%+!<$X%]%$%s%H$r0\F0$7$^$9!#$h$j87L)$K$O!"5UJ}8~$G:G$b6a$$(B
-     $B%"%s%+!<$X0\F0$7$^$9(B (`w3m-previous-anchor')$B!#(B
-
-`]'
-     $B<!$N%U%)!<%`$X%]%$%s%H$r0\F0$7$^$9!#$h$j87L)$K$O!"=gJ}8~$G:G$b6a$$(B
-     $B%U%)!<%`$X0\F0$7$^$9(B (`w3m-next-form')$B!#(B
-
-`['
-     $BA0$N%U%)!<%`$X%]%$%s%H$r0\F0$7$^$9!#$h$j87L)$K$O!"5UJ}8~$G:G$b6a$$(B
-     $B%U%)!<%`$X0\F0$7$^$9(B (`w3m-previous-form')$B!#(B
-
-`}'
-     $B<!$N2hA|$X%]%$%s%H$r0\F0$7$^$9!#$h$j87L)$K$O!"=gJ}8~$G:G$b6a$$2hA|(B
-     $B$X0\F0$7$^$9(B (`w3m-next-image')$B!#(B
-
-`{'
-     $BA0$N2hA|$X%]%$%s%H$r0\F0$7$^$9!#$h$j87L)$K$O!"5UJ}8~$G:G$b6a$$2hA|(B
-     $B$X0\F0$7$^$9(B (`w3m-previous-image')$B!#(B
-
-
-File: emacs-w3m-ja.info  Node: Moving in a page-Footnotes, Up: Moving in a page
-
-(1) $AFUM($=$s$JRt$O$7$J$$$1$l$I$M!#S"$(Gk#$A0f$N(B Tadaa! $A$OB~;-$J$I$GJ9$o$l$k(B
-$(Gsi$ARt$G!"$=$NW4$(GNS$A$K$(I%w$A$8$F$$$m$$$m$K$BLu$A$5$l$^$9!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Moving over pages, Next: Browsing With Mouse Operations, Prev: Moving in a page, Up: Browsing Web Pages
-
-$A%Z$B!<$A%8$(Gbf$A$r6I$j$(I)V$A$/(B
-------------------
-
-$B$3$N9`$G$O%Z!<%8$+$i%Z!<%8$K0\F0$9$k$d$jJ}$r@bL@$7$^$9!#%j%s%/$r$?$I$C(B
-$B$?$j(B URL $B$rF~NO$9$kJ}K!$O$3$3$K$O$"$j$^$;$s(B ($B$=$l$iFs$D$NJ}K!$O(B *Note
-Launching and Jumping:: $B$G@bL@$5$l$F$$$^$9(B)$B!#(B
-
-$B$3$3$K$O!"0JA0$KK,Ld$7$?%Z!<%8$NMzNr$r8e$m$K!"$*$h$SA0$K0\F0$9$k(B ($BB>$N(B
-$B%V%i%&%6$G$O!VLa$k!W!V?J$`!W$H$7$F$*$J$8$_$N(B) $B%3%^%s%I$H!"2>$K$b%V%i%&(B
-$B%6$?$k$b$N$,5AL3$H$7$FDs6!$9$Y$-!V%[!<%`%Z!<%8$X0\F0$9$k!W5!G=$,$"$j$^(B
-$B$9!#$"$i$+$8$a(B *Note Tracing History:: $B$N9`$rFI$s$G$*$$$?J}$,!"$?$V$sM}(B
-$B2r$7$d$9$$$G$7$g$&!#(B
-
-`B' (Lynx-like $A%-$B!<$A%^%C%W(B)
-`<left>' (Lynx-like $A%-$B!<$A%^%C%W(B)
-`l' (Info-like $A%-$B!<$A%^%C%W(B)
-`p' (Info-like $A%-$B!<$A%^%C%W(B)
-     $B0JA0$KK,Ld$7$?%Z!<%8$NMzNr$r#1%Z!<%8La$j$^$9(B
-     (`w3m-view-previous-page')$B!#?t$N0z?t(B N $B$,M?$($i$l$k$H(B N $B%Z!<%8La$j(B
-     $B$^$9!#$3$l$O2a5n$KLa$k$?$a$N$*4+$a$NJ}K!$G$9!#(B
-
-`N' (Lynx-like $A%-$B!<$A%^%C%W(B)
-`n' (Info-like $A%-$B!<$A%^%C%W(B)
-     $B0JA0$KK,Ld$7$?%Z!<%8$NMzNr$r#1%Z!<%8?J$_$^$9(B
-     (`w3m-view-next-page')$B!#$b$A$m$s(B `B' (`Info-like' $B%-!<%^%C%W$N>l9g(B
-     $B$O(B `l') $B$GMzNr$rLa$C$?8e$G$J$1$l$PF/$-$^$;$s!#?t$N0z?t(B N $B$,M?$($i(B
-     $B$l$k$H(B N $B%Z!<%8?J$_$^$9!#$3$N%3%^%s%I$O!"$^$5$K(B back to the
-     future $B$r<B8=$7$^$9(B!
-
-`H'
-     $B%[!<%`%Z!<%8$X0\F0$7$^$9(B (`w3m-gohome')$B!#%[!<%`%Z!<%8$N(B URL $B$O(B
-     `w3m-home-page' $B$H$$$&JQ?t$G;XDj$7$^$9(B (*Note Customizable
-     Variables::)$B!#(B`w3m-home-page' $B$N%G%U%)%k%H$NCM$O(B "about:" $B$G$9!#(B
-
-$B0J2<$N%3%^%s%I$O!"B>$K$OL5$$(B emacs-w3m $B$NFCD9$G$9!#;d$?$A$O$=$l$i$NFC5v(B
-$B$rF@$k$3$H$,$G$-$^$7$?!#=>$C$F!"B>$N$$$+$J$k>l=j$G$b8+$D$+$i$J$$$G$7$g(B
-$B$&!#$=$N$?$a!":#F|$=$l$i$r;H$&$3$H$r3X$P$J$1$l$P$J$j$^$;$s(B! ($B??$K<u$1$J(B
-$B$$$G$/$@$5$$$M!#$?$@$N>iCL$G$9$+$i!#(B)
-
-`^'
-`u' (Info-like $A%-$B!<$A%^%C%W$N$_(B)
-     $B8=:_I=<($5$l$F$$$k%Z!<%8$N?F%G%#%l%/%H%j$X$N0\F0$r;n$_$^$9!#Nc$($P!"(B
-     http://foo/bar/baz" $B$,I=<($5$l$F$$$k>l9g$O(B "http://foo/bar/" $B$K0\(B
-     $BF0$7$h$&$H$7$^$9!#$3$N5!G=$O<!$N4Q;!$K4p$E$$$F<BAu$5$l$^$7$?(B: $B%&%'(B
-     $B%V%V%i%&%6$N%f!<%6$O!"$7$P$7$P0lCJ3,>e$N%G%#%l%/%H%j$K0\F0$7$J$1$l(B
-     $B$P$J$j$^$;$s!#H`$i$,A\$7$F$$$k>pJs$,!"8=:_$N%Z!<%8$KI=<($5$l$J$$$+(B
-     $B$i(B ($B$=$l$,:o=|$5$l$?$N$G!"$"$k$$$O8!:w%(%s%8%s$,4V0c$C$F$$$k%Z!<%8(B
-     $B$KO"$l$F9T$C$?$?$a(B) $B$G$9!#(B
-
-     $BB>$N%&%'%V%V%i%&%6$r;H$&>l9g!"0lHL$K$O!"(BURL $B$+$i(B `<DEL>' $B%-!<Ey$r(B
-     $BJ#?t2s;H$C$F!"<j:n6H$GKvHx$N%3%s%]!<%M%s%H$r:o=|$9$k<j4V$,I,MW$G$9!#(B
-     Emacs-w3m $B$G$O!"$3$NA`:n$r(B `^' $B$N$?$C$?0l2!$7(B! $B$G9T$J$&$3$H$,$G$-(B
-     $B$^$9!#(B
-
-     $B$^$?!"(B"2 ^" $B$H?t;z$rIU$1$F%3%^%s%I$r<B9T$9$k$H!"$=$N?t;z$NJ,$@$1?F(B
-     $B$N%G%#%l%/%H%j$K0\F0$7$^$9!#(B"0 ^" $B$H(B "0" $B$rIU$1$F<B9T$9$k$H$=$N%5(B
-     $B%$%H$N:G>e0L$^$G0\F0$7$^$9!#(B
-
-`<SPC>'
-     $B8=:_$N%]%$%s%H0LCV$,%P%C%U%!$NKvHxIU6a$K$"$j!"2<J}8~$K%9%/%m!<%k$G(B
-     $B$-$J$$>l9g$K(B `<SPC>' $B$r2!$9$H!V<!!W$N%Z!<%8$X0\F0$7$^$9(B
-     (`w3m-scroll-up-or-next-url')$B!#$3$3$G!V<!$N%Z!<%8!W$H$O!"8=:_FI$s(B
-     $B$G$$$k%Z!<%8$N%X%C%@Fb$NFCJL$J(B "next" $B%U%#!<%k%I$,;X$7<($7$F$$$k%Z!<(B
-     $B%8$N$3$H$G$9!#$3$N5!G=$OK,Ld$7$?%Z!<%8$NMzNr$H$O4X78$"$j$^$;$s!#(B
-
-     $B0lEY$K5pBg$J%3%s%F%s%D$rE>Aw$9$k$N$rBT$D$3$H$,!"%f!<%6$K$H$C$F2wE,(B
-     $B$G$O$J$$$J$I$NM}M3$G!"$$$/$D$+$N%&%'%V%5%$%H$,$=$l$i$N%3%s%F%s%D$r(B
-     $B>.$5$JJ#?t$N%Z!<%8$KJ,3d$7$F$$$k$3$H$K!"$*$=$i$/5$IU$$$F$$$k$G$7$g(B
-     $B$&!#Nc$($P!"8!:w%(%s%8%s$N8!:w7k2L$O!"$7$P$7$P$=$N$h$&$K8=$o$l$^$9!#(B
-     $B$=$s$J%5%$%H$G$O!"%f!<%6$O$9$Y$F$N>pJs$K%"%/%;%9$9$k$?$a$K!"$7$P$7(B
-     $B$P0l$D$N%Z!<%8$+$i<!$N%Z!<%8$K!"<jF0$G%j%s%/$r$?$I$i$J$1$l$P$J$j$^(B
-     $B$;$s!#(B
-
-     Emacs-w3m $B$O!"2DG=$G$"$l$P$3$N%j%s%/$rL@<(E*$K$?$I$kA`:n$r%9%/%m!<(B
-     $B%kA`:n$HE}9g$7$F!"J#?t$N%Z!<%8$KJ,3d$5$l$FDs6!$5$l$k%3%s%F%s%D$r!"(B
-     $B$G$-$l$P0lKg$N%&%'%V%Z!<%8$H$7$F1\Mw$G$-$k$h$&;n$_$^$9!#(B
-
-     $B$=$l$O$3$&$7$FF/$-$^$9(B: $B$=$N$h$&$J%&%'%V%5%$%H$G$O!"J,3d$7$?%&%'%V(B
-     $B%Z!<%84V$N$D$J$,$j$r%Z!<%8$N%X%C%@Fb$N(B "next"$B!"(B"prev" $B$"$k$$$O(B
-     previous" $B%U%#!<%k%I$K5-:\$7$F$"$k>l9g$,$"$j$^$9!#(BEmacs-w3m $B$O2?$r(B
-     $B$?$I$k$+$rCN$k$?$a$K!"$3$N%U%#!<%k%I$rMxMQ$7$F$$$^$9!#(B
-
-     $BFs$D$NA`:n(B ($B%j%s%/$r$?$I$k(B + $B%9%/%m!<%k(B) $B$,(B Emacs-w3m $B>e$G$I$N$h$&(B
-     $B$KE}9g$5$l$F$$$k$N$+$r!":F$S(B Google $B$rNc$K@bL@$7$^$7$g$&!#(B
-     `http://www.google.com' $B$r3+$-!"$"$kC18l$r8!:w$7$^$9!#$b$7!"$"$^$j(B
-     $B$K$b$"$j$U$l$?C18l(B ($BNc$($P!V5mP'!W(B) $B$r8!:w$9$k$H!"BgNL$N8!:w7k2L$r(B
-     $BF@$k$3$H$K$J$k$G$7$g$&!#(BGoogle $B$O!"$=$N4p=`$r;H$C$F%=!<%H$7$?8!:w(B
-     $B7k2L$rJ#?t$N%&%'%V%Z!<%8$KJ,3d$7$?>e$G!"$^$::G=i$N%Z!<%8$rJV$7$^$9!#(B
-     `<SPC>' $B$r;H$C$F:G=i$N%Z!<%8$r%9%/%m!<%k$5$;$J$,$iD/$a$F$/$@$5$$!#(B
-     $B$=$7$F!"$=$N%Z!<%8$N:G8e$,$=$N%&%#%s%I%&$G8+$($k$^$G!"%9%/%m!<%k$7(B
-     $BB3$1$F$/$@$5$$!#$=$3$G$O!"$"$J$?$r$S$C$/$j$5$;$k$7$+$1$,BT$C$F$$$^(B
-     $B$9!#(BEmacs-w3m $B0J30$N%V%i%&%6$r;H$C$F;D$j$N8!:w7k2L$r8+$?$$$H;W$C$?(B
-     $B$J$i$P!"(B
-
-          Gooooooogle
-
-     $B$N2<$K$J$i$V?t;z$N$I$l$+(B
-
-          1 2 3 4 5 6 7 8...
-
-     $B$r%/%j%C%/$9$kI,MW$,$"$j$^$9!#$7$+$7(B emacs-w3m $B$J$i$P!"C1$K(B
-     `<SPC>' $B$r2!$9$H$$$&%9%/%m!<%k$HF1$8A`:n$G!"%j%s%/$r$?$I$k$3$H$,$G(B
-     $B$-$k$N$G$9!#(B
-
-`<DEL>'
-`b'
-`<backspace>'
-`S-<SPC>'
-`C-?'
-     $B%]%$%s%H0LCV$,%P%C%U%!$N@hF,IU6a$K$"$j!">eJ}8~$K%9%/%m!<%k$G$-$J$$(B
-     $B>l9g$K(B `<DEL>' $B$r2!$9$H!"!VA0!W$N%Z!<%8$X0\F0$7$^$9(B
-     (`w3m-scroll-down-or-previous-url')$B!#$3$3$G!VA0!W$N%Z!<%8$H$O!"8=(B
-     $B:_I=<($5$l$F$$$k%Z!<%8$N%X%C%@Fb$N(B "prev" $B$"$k$$$O(B "previous" $B%U%#!<(B
-     $B%k%I$K;XDj$5$l$F$$$k%Z!<%8$N$3$H$G$9!#$3$N5!G=$OK,Ld$7$?%Z!<%8$NMz(B
-     $BNr$H$O4X78$"$j$^$;$s!#(B`<SPC>' (`w3m-scroll-up-or-next-url') $B$HF1MM!"(B
-     $B$?$@$75U$NF0$-$K$J$j$^$9!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Browsing With Mouse Operations, Next: Going back to daily hacking and/or daily writing, Prev: Moving over pages, Up: Browsing Web Pages
-
-$A%^%&%9$rJ9$C$F%5$B!<$A%U%#%s(B
-------------------------
-
-Emacs-w3m $B$N3+H/<TC#$O!"(BEmacs $B%.!<%/(B (1) (*Note Browsing With Mouse
-Operations-Footnotes::) $B$G$J$$IaDL$N?M$K$b(B emacs-w3m $B$r;H$C$F$b$i$($k$h(B
-$B$&$K!">/$79|$r@^$j$^$7$?!#Nc$($P(B URL $B$d%U%)!<%`$N%F%-%9%H$NF~NO$r=|$/$[(B
-$B$H$s$I$N%&%'%V%V%i%&%:A`:n$r!"%^%&%9$@$1$G9T$J$&$3$H$,$G$-$^$9!#$=$l$G(B
-$B$b$J$*=$>~%-!<$H$7$F%7%U%H%-!<$,I,MW$K$J$k>l9g$,$"$k$3$H$KCm0U$7$F$/$@(B
-$B$5$$!#(BEmacs-w3m $B$N3+H/<T$,$_$s$J(B Emacs $B%.!<%/$J$N$G(B...
-
-$B%&%'%V1\Mw$N:G=i$N4pK\$H$J$k!V%j%s%/$r$?$I$kA`:n!W$K$O(B `mouse-2' $B$r;H$C(B
-$B$F$/$@$5$$!#(BEmacs 22.1 $B0J>e$G$O!"(B`mouse-1' $B$G$b(B
-`mouse-1-click-follows-link' $B$NCM$K1~$8$?!"%j%s%/$r$?$I$kA`:n$r9T$J$&$3(B
-$B$H$,$G$-$^$9!#(B
-
-`mouse-2'
-     $B%^%&%9%+!<%=%k$N2<$K$"$k%j%s%/$r$?$I$j$^$9(B
-     (`w3m-mouse-view-this-url')$B!#(B
-
-`S-<mouse-2>'
-     $B?7$7$$%;%C%7%g%s(B (*Note Tracing History::) $B$N$b$H$G%^%&%9%+!<%=%k(B
-     $B$N2<$K$"$k%j%s%/$r$?$I$j$^$9(B
-     (`w3m-mouse-view-this-url-new-session')$B!#(B
-
-Emacs-w3m $B$N%9%/%m!<%k%P!<!"%a%K%e!<5Z$S%D!<%k%P!<$O!"%^%&%9$r;H$&>l9g(B
-$B$KLrN)$A$^$9!#$?$@$7(B Emacs $B$,$=$l$i$r%5%]!<%H$7$F$$$k$3$H$,I,MW$G!"$+$D(B
-$B$=$l$i$rM-8z$K$7$F$$$J$1$l$P$J$j$^$;$s!#8@$&$^$G$b$J$$$G$9$,!"%9%/%m!<(B
-$B%k%P!<$rF0$+$7$FI=<($r%9%/%m!<%k$5$;$k$3$H$,$G$-$^$9!#(BEmacs $B%U%l!<%`$N(B
-$B0lHV>e$K$"$k!V(Bw3m$B!W%a%K%e!<$+$i!"$3$N(B info $B%I%-%e%a%s%H$G>R2p$7$F$$$k(B
-emacs-w3m $B$NMM!9$J5!G=$r8F$S=P$9$3$H$,$G$-$^$9!#<gMW$J5!G=$K$D$$$F$O%a(B
-$B%K%e!<%"%$%F%`$rA*$V$^$G$b$J$$$3$H$KCm0U$7$F$/$@$5$$!#Be$o$j$K%D!<%k(B
-$B%P!<!&%"%$%3%s$r;H$&$3$H$,$G$-$^$9!#(B
-
-$B%?%V(B (*Note Using Tabs::) $B$r;H$C$F(B emacs-w3m $B$N%P%C%U%!$r@Z$jBX$($k$K$O!"(B
-$B%&%#%s%I%&$N$F$C$Z$s$N9T$r(B `mouse-2' $B$GD>@\%/%j%C%/$9$k$+!"$^$?$O!V(Bw3m$B!W(B
-$B%a%K%e!<$N0l$D$*$$$FNY$K$"$k!V(BTab$B!W%a%K%e!<$+$i0l$D$rA*$s$G$/$@$5$$!#(B
-
-
-File: emacs-w3m-ja.info  Node: Browsing With Mouse Operations-Footnotes, Up: Browsing With Mouse Operations
-
-(1) $AS"$(Gk#$A0f$N(B Info $A$G$O(B Emacs otaku
-
-
-
-File: emacs-w3m-ja.info, Node: Going back to daily hacking and/or daily writing, Prev: Browsing With Mouse Operations, Up: Browsing Web Pages
-
-$AFU6N$NIz;n$K$(I&($A$k$K$O(B
---------------------
-
-$B;W$$=P$7$F$/$@$5$$!#$*$=$i$/$"$J$?$O%&%'%V$r8+$k$?$a$K(B Emacs $B$r;O$a$?$N(B
-$B$G$O$"$j$^$;$s!#%(%G%#%?$NFbB"%$%s%?!<%W%j%?$r(B scheme $B$KCV$-49$($?$j!"(B
-$B%=%U%H%&%'%"$N(B info $B%I%-%e%a%s%H$r:n@.$7$?$j!"%=%U%H%&%'%"$NFC5v$KBP$9(B
-$B$k<+J,$N9M$($r0u:~$7$?$j(B...$B$9$k$?$a$@$C$?$N$G$O$"$j$^$;$s$+(B?  Emacs $B$r(B
-$B;H$C$F$$$?4V$K!";E;v$N$?$a$K%&%'%V$r8+$kI,MW$KGw$i$l!"$7$+$7$?$^$?$^(B
-Emacs $B$+$iN%$l$:$K%&%'%V$r8+$k$3$H$,$G$-$F$7$^$C$?$N$G$9!#(B
-
-$B$5$!!"K\Mh$N:n6H$KLa$k;~$,Mh$^$7$?!#$"$J$?$,$,$s$P$i$J$$$H@$3&$OJQ$j$^(B
-$B$;$s(B!  $B$9$0$K$^$?%&%'%V$r1\Mw$9$kI,MW$,$"$k$+$b$7$l$J$$$J$i(B `q' $B$r!"$7(B
-$B$P$i$/(B emacs-w3m $B$KLa$C$F$/$k$D$b$j$,$J$$$J$i(B `Q' $B$r;H$C$F$/$@$5$$!#(B
-
-`q'
-     Emacs-w3m $B$N%&%#%s%I%&$HJD$8$F!"B>$N%P%C%U%!$rA*Br$7$^$9(B
-     (`w3m-close-window')$B!#(B
-
-`Q'
-     Arrived URLs ($B1\MwMzNr(B, *Note Tracing History:: $B;2>H(B) $B$N%j%9%H$H%/%C(B
-     $B%-!<(B (*Note Cookie Variables::) $B$r%G%#%9%/$KJ]B8$7$F!"K\Ev$K(B
-     emacs-w3m $B$r=*N;$7$^$9(B (`w3m-quit')$B!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Inline Images, Next: Tracing History, Prev: Browsing Web Pages, Up: Basic Usage
-
-$A;-Oq1mJ>$r(B ON/OFF $A$9$k(B
-======================
-
-$B$"$J$?$,;H$C$F$$$k%P!<%8%g%s$N(B Emacs $B$,%P%C%U%!$K2hA|$rI=<($9$k$3$H$,$G(B
-$B$-$k$J$i$P!"$"$?$+$b(B Mozilla $B$N$h$&$J!V%0%i%U%#%+%k!W%V%i%&%6$N$h$&$K!"(B
-emacs-w3m $B$O%&%'%V%Z!<%8$K$=$l$i$rI=<($9$k$3$H$,$G$-$^$9!#2<5-$N%3%^%s(B
-$B%I$N$I$l$+$r;H$*$&$H$9$kA0$K!"$"$J$?$N(B Emacs $B$,@5$7$/2hA|I=<($K;H$($k$3(B
-$B$H$r3N$+$a$F$/$@$5$$(B (*Note Required Emacs Version::)$B!#(B
-
-$B8=:_$N%P%C%U%!$K$*$1$k2hA|$NI=<($r@Z$jBX$($k$K$O(B `T' (`Info-like' $B%-!<(B
-$B%^%C%W$N>l9g$O(B `I') $B$r;H$C$F$/$@$5$$!#$=$l$K$h$C$F(B emacs-w3m $B$O%5!<%P$+(B
-$B$i2hA|$r<h$C$F$-$F!"$7$+$k8e$K$=$l$i$r!V%0%i%U%#%+%k!W%V%i%&%6$H$7$F$=(B
-$B$&$J$k$G$"$m$&%P%C%U%!$N0LCV$KI=<($7$^$9!#$b$&0lEY%-!<$rC!$/$H!"2hA|$O(B
-$B%P%C%U%!$+$i>C$(5n$j$^$9!#(B
-
-$B%G%U%)%k%H$G$O(B emacs-w3m $B$O2hA|$rI=<($7$^$;$s$,!"$=$N?6$kIq$$$rJQ99$7$F(B
-$B>o$K2hA|I=<($9$k$3$H$rA*$V$N$O2DG=$G!"$=$l$K$OJQ(B
-$B?t(B `w3m-default-display-inline-images' $B$r%+%9%?%^%$%:$7$F!"$=$NCM(B
-$B$r(B `nil' $B$+$i(B `t' $B$KJQ99$9$kI,MW$,$"$j$^$9!#(B
-*Note Customizable Variables::.
-
-$B$5$i$K(B emacs-w3m $B$K$O!"2hA|$N3HBg=L>.!"%U%!%$%k$X$N%;!<%V!"$^$?$O30It(B
-$B%S%e!<%o$G8+$k!"$H$$$C$?5$$NMx$$$?5!G=$,IUB0$7$F$$$^$9!#(B
-
-`T' (Lynx-like $A%-$B!<$A%^%C%W(B)
-`I' (Info-like $A%-$B!<$A%^%C%W(B)
-     $B8=:_$N%P%C%U%!$K$"$k$9$Y$F$N%$%s%i%$%s2hA|$NI=<($r%H%0%k$G@Z$jBX$((B
-     $B$^$9(B (`w3m-toggle-inline-images')$B!#(B`transient-mark-mode' $B$,(B on $B$G!"(B
-     $B$+$DNN0h$,@_Dj$5$l$F$$$k>l9g$K8B$C$F!"$=$NNN0hFb$K$"$k2hA|$@$1$,(B
-     on $B$K$J$j$^$9!#(B
-
-     $BCm(B1: $B=i$a$FK,$l$?%Z!<%8$G:G=i$+$i%$%s%i%$%s2hA|$rI=<($9$k$+$I$&$+(B
-     $B$O!"A0=R$NDL$jJQ?t(B `w3m-default-display-inline-images' $B$NCM$G@)8f(B
-     $B$5$l$^$9(B ($B%G%U%)%k%H$O(B off $B$G$9(B)$B!#$7$+$7!"$=$N%P%C%U%!$r5/E@$K$7$F(B
-     $BK,$l$k%P%C%U%!$G2hA|$rI=<($9$k$+$I$&$+$O!"(B
-     `w3m-toggle-inline-images-permanently' $B$,(B `nil' $B$G$O$J$$CM(B ($B%G%U%)(B
-     $B%k%H$O(B `t') $B$@$C$?>l9g$O!"$=$N%P%C%U%!$G2hA|$rI=<($7$F$$$?$+$I$&$+(B
-     $B$N:G8e$N>uBV$r7Q>5$7$^$9!#(B`w3m-toggle-inline-images-permanently'
-     $B$,(B `nil' $B$@$C$?$i!">o$K(B `w3m-default-display-inline-images' $B$,$=$l(B
-     $B$r@)8f$7$^$9!#(B
-
-     $BCm(B2: $B$3$N%3%^%s%I$ONN0h$rIT3h@-$K$7$^$9!#$7$?$,$C$F!":F$SFCDj$NNN(B
-     $B0h$K$"$k2hA|$@$1$rI=<($7$?$$$J$i$P!"$b$&0lEY$=$NNN0h$r@_Dj$7$J$1$l(B
-     $B$P$J$j$^$;$s!#(B
-
-`t' (Lynx-like $A%-$B!<$A%^%C%W(B)
-`i' (Info-like $A%-$B!<$A%^%C%W(B)
-     $B%+!<%=%k$N>l=j$K$"$kC10l$N2hA|$NI=<($r%H%0%k$G@Z$jBX$($^$9(B
-     (`w3m-toggle-inline-image')$B!#(B`transient-mark-mode' $B$,(B on $B$G!"$+$D(B
-     $BNN0h$,@_Dj$5$l$F$$$k>l9g$K8B$C$F!"$=$NNN0hFb$K$"$k2hA|$@$1$,(B on $B$K(B
-     $B$J$j$^$9!#(B`Info-like' $B%-!<%^%C%W$K$D$$$F$O!"$b$7(B Emacs $B$,2hA|I=<((B
-     $B$r%5%]!<%H$7$J$$$J$i$P!"$3$N%-!<$O30It%S%e!<%o$r5/F0$9$k%3%^%s%I(B
-     (`w3m-view-image') $B$K%P%$%s%I$5$l$^$9!#(B
-
-`M-S-t' (Lynx-like $A%-$B!<$A%^%C%W(B)
-`M-S-i' (Info-like $A%-$B!<$A%^%C%W(B)
-     $B8=:_$N%P%C%U%!$K$"$k$9$Y$F$N%$%s%i%$%s2hA|$NI=<($r<h$j;_$a$^$9!#(B
-     (`w3m-turnoff-inline-images')$B!#(B
-
-`I' (Lynx-like $A%-$B!<$A%^%C%W(B)
-     $B%]%$%s%H$N2<$K$"$k2hA|$r30It%S%e!<%o$G8+$^$9(B (`w3m-view-image')$B!#(B
-
-`M-i'
-     $B%]%$%s%H$N2<$K$"$k2hA|$r30It%U%!%$%k$K%;!<%V$7$^$9!#%G%U%)%k%H$NL>A0$O$=(B
-     $B$N2hA|$N85$NL>A0$G$9!#$=$l8N$K!"$[$H$s$I$N>l9g(B
-     $B$K(B `M-i <RET>' $B$O@5$7$$L>A0$G2hA|$r%;!<%V$9$k$G$7$g(B
-     $B$&(B (`w3m-save-image')$B!#(B
-
-`M-['
-     $B%]%$%s%H$N2<$K$"$k2hA|$r=L>.(B (zoom out) $B$7$^$9(B
-     (`w3m-zoom-out-image')$B!#(B
-
-`M-]'
-     $B%]%$%s%H$N2<$K$"$k2hA|$r3HBg(B (zoom in) $B$7$^$9(B
-     (`w3m-zoom-in-image')$B!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Tracing History, Next: Managing Bookmarks, Prev: Inline Images, Up: Basic Usage
-
-$(GUk$A?U$r$(IJ&$A$k(B
-==========
-
-Emacs-w3m $B$K$O!"0JA0$KK,Ld$7$?$9$Y$F$N%Z!<%8$N%j%9%H$rDs<($9$k$?$a$N!"(B
-2$B$D$NJ}K!$,$"$j$^$9!#Bh0l$NJ}K!$O!V(Bemacs-w3m $B$NMzNr!W(B(emacs-w3m
-history) $B$HC1=c$K8F$P$l$k$b$N$G!"$=$N%;%C%7%g%s(B ($BCm(B: $B$=$N%P%C%U%!Fb$G9T(B
-$B$J$&A`:n$H$=$l$KBP$9$kH?1~(B) $B$K$*$$$FK,Ld$7$?%Z!<%8$N%j%9%H$r3,AXE*$KDs(B
-$B<($7$^$9!#$9$J$o$A!"$"$k%j%s%/$r$?$I$k$H!"$=$l$^$G$N%Z!<%8$O9T$-@h$N(B
-$B!V?F!W$K$J$j$^$9!#$=$l$O!"K,$l$?%Z!<%8$N@W$r$?$I$C$?$j!"MzNr$,D9$/$J$C(B
-$B$F$7$^$C$?>l9g$K$I$3$+$iCe$?$+$r;W$$=P$9$?$a$K$O!"$?$$$X$sET9g$NNI$$$b(B
-$B$N$G$9!#(B
-
-$B$3$l$O!"(BGNU $B%W%m%8%'%/%H$N%[!<%`%Z!<%8$r$A$g$C$HK,$M$?8e$K$*$1$k!"$3$N(B
-$B5!G=$NF0:n$NNc$G$9(B:
-
-     GNU's Not Unix! - the GNU Project and the Free Software Foundation (FSF)
-       Philosophy of the GNU Project - Free Software Foundation (FSF)
-         GNU Emacs - GNU Project - Free Software Foundation (FSF)
-          Order from the Free Software Foundation (FSF)
-       Links to Other Free Software Sites - GNU Project - Free Software Fo...
-         EFF: Homepage
-
-($B<B:]$K$O!"$3$NNc$O(B 72 $B7e$K<}$^$k$h$&$K!">/$7$P$+$jJT=8$5$l$F$$$^$9!#8=(B
-$B<B$N(B emacs-w3m $B%P%C%U%!$G$O(B URLs $B$O@Z$j5M$a$i$l$^$;$s!#(B)
-
-$B$I$N(B emacs-w3m $B%P%C%U%!$+$i$G$b(B `s' $B%-!<(B (`Info-like' $B%-!<%^%C%W$N>l9g(B
-$B$O(B `o' $B%-!<(B) $B$r;H$&$3$H$K$h$C$F!"$3$N$h$&$JMzNr$rDs<($5$;$k$3$H$,2DG=$G(B
-$B$9!#(B
-
-$B$3$NMzNr$O%P%C%U%!!&%m!<%+%k!"$9$J$o$A!"$"$k(B emacs-w3m $B$N%P%C%U%!$K8GM-(B
-$B$N$b$N$G$"$k$3$H$KCm0U$7$F$/$@$5$$!#$G$b(B emacs-w3m $B$K$O%f%K!<%/$J5!G=$,(B
-$B$"$j$^$9(B: $B$"$J$?$,?7$7$$%Z!<%8$rK,Ld$9$k>l9g!"MzNr$O?7$7$$%P%C%U%!$K%3(B
-$B%T!<$5$l$^$9!#$=$N7k2L!"$=$l$^$G$KK,$l$?%Z!<%8$K:#$^$GDL$j%"%/%;%9$9$k(B
-$B$3$H$,$G$-$^$9!#$3$l$O!"(BMozilla $B$J$I$N!"?7$7$$%P%C%U%!$G$OMzNr$,>o$K%<(B
-$B%m$+$i%9%?!<%H$9$k%V%i%&%6$H$O0[$J$j$^$9!#(B
-
-Emacs-w3m $B$OC1$K$"$J$?$,K,$l$?%Z!<%8$r5-O?$9$k$@$1$G$J$/!"$"$J$?$,%Z!<%8(B
-$B$N@53N$JF1$8>l=j$XLa$j$?$$>l9g$K!"$=$l$i$N%Z!<%8$NCf$NFCDj$N0LCV$r5-O?$9(B
-$B$k$3$H$b$G$-$^$9!#(B`C-c C-@' $B$r2!$9$H!"%+!<%=%k$N0LCV$,MzNr$KEP(B
-$BO?$5$l$^$9!#0JA0$K5-O?$7$?0LCV$X0\F0$9$k$K$O!"$=$N%Z!<%8$r3+$$(B
-$B$?(B emacs-w3m $B$N%P%C%U%!$G(B `C-c C-v' $B$r2!$7$F$/$@$5$$!#(B
-
-`s' (Lynx-like $A%-$B!<$A%^%C%W(B)
-`C-u s' (Lynx-like $A%-$B!<$A%^%C%W(B)
-`o' (Info-like $A%-$B!<$A%^%C%W(B)
-`C-u o' (Info-like $A%-$B!<$A%^%C%W(B)
-     $B$3$N%;%C%7%g%s$K$*$$$FK,Ld$7$?(B URLs $B$N%j%9%H$rI=<($7$^$9!#@\F,0z?t(B
-     $BIU$-$G8F$P$l$k$H(B ($B8e=R(B)$B!"Be$o$j$K(B arrived URLs $B$rI=<($7$^$9(B
-     (`w3m-history')$B!#(B
-
-`C-c C-@'
-`C-c C-<SPC>'
-     $B$=$N%Z!<%8$NCf$N%+!<%=%k$N0LCV$rMzNr$K5-O?$7$^$9!#(B
-
-`C-c C-v'
-     $B8=:_I=<($7$F$$$k%Z!<%8$K$*$$(B
-     $B$F!"(B`C-c C-@' (`w3m-history-store-position') $B$G5-21$7$?0L(B
-     $BCV$X0\F0$7$^$9!#(B
-
-$B$b$&0l$D$N2a5n$KK,$l$?%Z!<%8$K4X$9$k>pJs$r<j$KF~$l$kJ}K!$O!"!V(Barrived
-URLs$B!W$G$9!#$3$l$O$"$J$?$,(B emacs-w3m $B$GK,Ld$7$?!":G8e$N(B 500$B8D(B! $B$N(B URL
-$B$N%j%9%H$G$9!#%j%9%H$OF|IU=g$G!":G$b:G6a$N$b$N$r@hF,$K!"$=$l$>$l$N%Z!<(B
-$B%8$NK,Ld;~9o$,I=<($5$l$^$9!#$3$l$ONc$G$9(B (info $B$NI=<($,3H$,$j2a$.$J$$$h(B
-$B$&$KJT=8$5$l$F$$$^$9(B):
-
-     Order from the Free Software Foundation (FSF)             22:53:25
-     GNU Emacs - GNU Project - Free Software Foundation (FS    22:53:05
-     Philosophy of the GNU Project - Free Software Foundati... 22:52:46
-     Philosophy of the GNU Project - Free Software Foundati... 22:52:39
-     EFF: Homepage                                             22:52:18
-     Links to Other Free Software Sites - GNU Project - Fre... 22:52:07
-     Links to Other Free Software Sites - GNU Project - Fre... 22:52:07
-     GNU's Not Unix! - the GNU Project and the Free Softwar... 22:51:32
-     Bookmarks                                                 22:51:02
-     The DICT Development Group- upwards                       2003-01-08
-     the monkey puzzle: new debian packages as an rss feed     2003-01-08
-     new-debian-packages.rss                                   2003-01-07
-     it's a miracle                                            2003-01-06
-
-$BA0$N%3%^%s%I$K@\F,0z?t$rEO$9!"$9$J$o$A(B `C-u s'
-(`Info-like' $B%-!<%^%C%W$N>l9g$O(B `C-u o') $B$r;H$&$3$H$K$h$C$F!"(B
-$B$3$NMzNr$rF@$k$3$H$,$G$-$^$9!#$3$N%Z!<%8$KI=<($5$l$k(B URLs $B$N?t$O%+%9%?%^(B
-$B%$%:$G$-$^$9!#JQ?t(B `w3m-keep-arrived-urls' $B$r;2>H$7$F$/$@$5$$!#$=$l(B
-$B$O%G%U%)%k%H$G$O(B 500 $B$r1[$($k$3$H$O$G$-$^$;$s!#(B*Note Customizable Variables::.
-
-$B$b$A$m$s!"$9$Y$F$N>l9g$K!"Nc$K<($5$l$F$$$k$9$Y$F$N9T$O%j%s%/$G$9!#$=$N(B
-$B%j%s%/$r$?$I$k$3$H$K$h$C$F!"DL>o$N%Z!<%8$rK,Ld$7$F$$$?$i$A$g$&$I$=$&$J(B
-$B$k$h$&$K!"0JA0$KK,$M$?$I$N%Z!<%8$K$b9T$/$3$H$,$G$-$^$9!#(B
-
-*Note Moving over pages:: $B$N9`$b8+$F$/$@$5$$!#$=$3$G$O!VLa$k!W!V?J$`!W(B
-$B$J$I$N5!G=$K3d$jEv$F$i$l$?C1=c$J%-!<$G!"MzNr$NCf$r0\F0$9$k$d$jJ}$r@bL@(B
-$B$7$F$$$^$9!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Managing Bookmarks, Next: Using Tabs, Prev: Tracing History, Up: Basic Usage
-
-$A$\$/$N(B/$A$o$?$7$N$*$B5$$A$KHk$j(B
-=========================
-
-$B8=BeE*$J$"$^$?$N%V%i%&%6$NNc$KO3$l$:!"(Bemacs-w3m $B$K$O@h?J$N%V%C%/%^!<%/(B
-$B$N5!G=$,$"$j$^$9!#$=$l$K$h$C$F%+%F%4%j!<Kh$KJ,N`$7!"$=$l$i$rJT=8$7!"$"(B
-$B$"!"$b$A$m$s4JC1$K1\Mw$9$k$3$H$,$G$-$^$9!#(B
-
-$BF|K\8lHGCm<a(B: $B%V%C%/%^!<%/$N8l8;$O!"K\$K64$`[Y(B ($B$7$*$j(B) $B$N$3$H$G$9!#(B
-
-* Menu:
-
-* Adding Bookmarks::            $B$*5$$KF~$j$K(B URL $B$r2C$($k(B
-* Consulting Bookmarks::        $B%V%C%/%^!<%/$r1\Mw$9$k(B
-* Editing Bookmarks::           $B%V%C%/%^!<%/$rJQ99$9$k$K$O(B?
-
-
-
-File: emacs-w3m-ja.info, Node: Adding Bookmarks, Next: Consulting Bookmarks, Prev: Managing Bookmarks, Up: Managing Bookmarks
-
-$A$*$B5$$A$KHk$j$K(B URL $A$r<S$($k(B
--------------------------
-
-$B%V%C%/%^!<%/$K(B URL $B$r2C$($k$K$O!"$$$/$D$+$N$d$jJ}$,$"$j$^$9!#:G=i$N0l$D(B
-$B$O!"(B`a' $B%-!<$r;H$C$F(B ($B$^$?$O(B `w3m-bookmark-add-current-url' $B%3%^%s%I$r(B
-$B8F$s$G(B) $B:#8=:_1\Mw$7$F$$$k%Z!<%8$r2C$($k$3$H$G$9!#$9$k$H!"$=$N%V%C%/%^!<(B
-$B%/$r$I$N9`L\$KF~$l$k$+$r?R$M$i$l(B (`<TAB>' $B%-!<$K$h$kJd40$,8z$-$^$9(B)$B!"%?(B
-$B%$%H%k$N=q$-49$($,B%$5$l$^$9(B ($B%G%U%)%k%H$O!"$=$N%Z!<%8$N%?%$%H%k$K$J$C(B
-$B$F$$$^$9(B)$B!#$3$l$i$NFs$D$r$3$J$7$?$i!"$=$l$i$rM-8z$K$9$k$?$a$K(B `<RET>'
-$B$rC!$$$F$/$@$5$$!#$9$k$H(B "Added" $B$H$$$&%a%C%;!<%8$,%_%K%P%C%U%!$K8=$l$F!"(B
-($B6C$/$J$+$l(B!) $B$=$N%Z!<%8$,%V%C%/%^!<%/$K5-O?$5$l$^$9!#(B
-
-$B%V%C%/%^!<%/$r2C$($k$b$&0l$D$NJ}K!$O!"(B`M-a' $B$r;H$&(B ($B$^$?$O(B
-`w3m-bookmark-add-this-url' $B%3%^%s%I$r8F$V(B) $B$3$H$G$9!#$3$l$O!"8=:_0LCV(B
-$B$N(B URL ($B$b$7$=$N%j%s%/$r$?$I$k$H!"1\Mw$9$k$3$H$,$G$-$k(B URL) $B$r%V%C%/%^!<(B
-$B%/$K2C$($^$9!#$=$N>l9g$G$b:G=i$K@bL@$7$?J}K!$HF1MM$K!"9`L\$NL>A0$H%?%$(B
-$B%H%k$rF~NO$7$J$1$l$P$J$j$^$;$s!#$=$N$H$-!"$=$l$i$N%G%U%)%k%H$O%j%s%/<+(B
-$BBN$NL>A0$K$J$C$F$$$^$9!#(B
-
-$B:G8e$K!";0HVL\$NJ}K!$O(B `C-u a' $B$rC!$/$3$H$G$9!#$3$N$H$-$O!"%V%C(B
-$B%/%^!<%/$K2C$($k(B URL$B!"$=$N9`L\!"$*$h$S%?%$%H%k$NF~NO$,B%$5$l$^$9!#(B
-
-`a'
-     $B8=:_$N%Z!<%8$r%V%C%/%^!<%/$K2C$($^$9!#@\F,0z?tIU$-$G8F$P$l$?>l9g$O!"(B
-     $B2C$($k(B URL $B$NF~NO$,5a$a$i$l$^$9(B (`w3m-bookmark-add-current-url')$B!#(B
-
-`M-a'
-     $B8=:_0LCV$N(B URL $B$r%V%C%/%^!<%/$K2C$($^$9(B
-     (`w3m-bookmark-add-this-url')$B!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Consulting Bookmarks, Next: Editing Bookmarks, Prev: Adding Bookmarks, Up: Managing Bookmarks
-
-$A%V%C%/%^$B!<$A%/$r$(IOURf$A$9$k(B
-----------------------
-
-$B%V%C%/%^!<%/$5$l$?%Z!<%8$r1\Mw$9$k:G$b4JC1$JJ}K!$O!"(Bemacs-w3m $B$N%P%C%U%!(B
-$B$G(B `v' $B%-!<$rC!$/$3$H$G$9!#$G$9$,$b$&0l$D!"FCJL$J(B URL $B$G$"$k(B
-`about://bookmark/' $B$K9T$/$3$H$K$h$C$F$b2DG=$G$9!#$9$k$H0l9T$"$?$j0l$D(B
-$B$:$D$N%V%C%/%^!<%/$,!"9`L\$4$H$K$^$H$a$i$l$FI=<($5$l$k$G$7$g$&!#$=$3$G(B
-$B$O!"B>$N%Z!<%8$r1\Mw$9$k$N$HF1$8$h$&$K!"$=$l$i$r3N<B$K1\Mw$9$k$3$H$,$G(B
-$B$-$^$9!#(B
-
-$B%V%C%/%^!<%/$N%Z!<%8$G$O(B bookmark $B%^%$%J!<%b!<%I$,F/$$$F$$$^$9!#$=$l$O!"(B
-$B%V%C%/%^!<%/$rJT=8$9$k$?$a$N%-!<%P%$%s%I$rDI2C$7$^$9!#(B*Note Editing
-Bookmarks::.
-
-`v'
-     $B%V%C%/%^!<%/$N%Z!<%8$r8F$S=P$7$^$9(B (`w3m-bookmark-view')$B!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Editing Bookmarks, Prev: Consulting Bookmarks, Up: Managing Bookmarks
-
-$A%V%C%/%^$B!<$A%/$r$(I+y$A8|$9$k$K$O(B?
----------------------------
-
-Bookmark $B%^%$%J!<%b!<%I(B (*Note Consulting Bookmarks::) $B$O!"%V%C%/%^!<%/(B
-$B$rJT=8$9$k$?$a$K$$$/$D$+$N%-!<%P%$%s%I$r@_$1$F$$$^$9!#Cf$G$b%V%C%/%^!<(B
-$B%/$r(B kill ($B$9$J$o$A>C5n(B) $B$9$k$?$a$N(B `C-k' $B$H%V%C%/%^!<%/!&%U%!%$%k$rJT(B
-$B=8$9$k$?$a$N(B `E' (`Info-like' $B%-!<%^%C%W$N>l9g$O(B `e') $B$O!":G$bCmL\$KCM(B
-$B$7$^$9!#(B
-
-$B%V%C%/%^!<%/$O(B HTML $B%U%!%$%k$K<}$a$i$l$F$$$^$9!#$7$?$,$C$F$=$N%U%!%$%k(B
-$B$O<j$GJT=8$9$k$3$H$,$G$-$^$9$,!"==J,$KCm0U$7$F$/$@$5$$!#(Bemacs-w3m $B$,9`(B
-$BL\L>$rG'<1$9$k$?$a$KI,MW$J%3%a%s%H$r>C$7$F$7$^$&$3$H$K$h$C$F!"$b$N$4$H(B
-$B$O4JC1$KBfL5$7$K$J$j$^$9!#$"$J$?$,(B HTML $B$N4pK\$rCN$C$F$$$l$P!"$`$7$m$=(B
-$B$N%U%!%$%k$NCf?H$O6K$a$FJ,$+$j0W$$$b$N$G$7$g$&!#(B
-
-`C-k'
-     $B8=:_0LCV$N%V%C%/%^!<%/$r(B kill $B$7$^$9(B (`w3m-bookmark-kill-entry')$B!#(B
-
-`E'
-     $B%V%C%/%^!<%/!&%U%!%$%k$rFI$_9~$s$G!"JT=82DG=$J>uBV$K$7$^$9(B
-     (`w3m-bookmark-edit')$B!#(B
-
-`C-_'
-     $B$d$jD>$7$r$7$^$9(B (`w3m-bookmark-undo')$B!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Using Tabs, Next: Working with buffers, Prev: Managing Bookmarks, Up: Basic Usage
-
-$A$_$s$J%?%V$,:C$-$@$h$M(B
-======================
-
-$B$[$H$s$I$NB>$N%F%-%9%H%Y!<%9$N%V%i%&%6!<$H0[$J$j!"(Bemacs-w3m $B$O%?%V$K$h(B
-$B$k1\Mw$r%5%]!<%H$7$F$$$^$9!#%?%V$K$h$k1\Mw$C$F2?(B? $B$H?R$M$i$l$=$&$G$9$M!#(B
-$B$=$l$O$H$F$bC1=c$G!"%&%#%s%I%&$N$F$C$Z$s$N9T$K$9$Y$F$N%P%C%U%!$rC1=c$+(B
-$B$DJ,$+$j$d$9$$$d$jJ}$GI=<($9$k$3$H$K$h$C$F!"C10l$N%&%#%s%I%%$G$9$Y$F$N(B
-emacs-w3m $B$N%P%C%U%!$rI=8=$9$kJ}K!$G$9!#$=$l$>$l$N%P%C%U%!$O!V%?%V!W$H(B
-$B$7$FI=<($5$l$^$9!#$3$N9T$O!"B>$N%P%C%U%!$K0\F0$7$?$j!"%Z!<%8$N>uBV$rCN(B
-$B$k$3$H$,$G$-$k$h$&$K$9$k$?$a$K>o$K8+$($?$^$^$K$J$C$F$$$F!"%P%C%U%!$K$D(B
-$B$i$l$F%9%/%m!<%k$7$^$;$s!#(B
-
-$B$=$N46?($r$D$+$`:G$b4JC1$JJ}K!$O!"C1$K;n$7$F$_$k$3$H$G$9!#$G$9$+$i!"0z(B
-$B$-B3$$$F(B emacs-w3m $B$N%;%C%7%g%s$r;O$a$F$/$@$5$$!#2?$b@_DjJQ99$r$7$F$$$J(B
-$B$1$l$P!"%G%U%)%k%H$G%?%V$N9T$,8=$l$^$9!#$F$C$Z$s$G!">.$5$J;M3Q$K8=:_$N(B
-$B%Z!<%8$N%?%$%H%k$rI=<($7$F$$$kL@$k$$9T$,$=$l$G$9!#$G$O(B ($BNc$($P(B `G' $B$G(B)
-$BJL$N(B w3m $B%P%C%U%!$r:n$C$F$_$^$7$g$&!#$9$k$H;M3Q$,Fs$D$K$J$C$?$G$7$g$&!#(B
-$B$=$l$i$,%?%V$G$9!#(B
-
-$B$b$C$H$bJ,$+$j$d$9$$%?%V$N;H$$F;$O@Z$jBX$($G$9(B: $B%?%V$N>e$G(B `mouse-1' $B%\(B
-$B%?%s$r%/%j%C%/$9$k$3$H$K$h$C$F!"$=$N%P%C%U%!$rI=<($5$;$k$3$H$,$G$-$^$9!#(B
-$B$5$i$K(B `mouse-2' $B%\%?%s$G$b!"$^$?$O(B GNU Emacs $B$G$O%^%&%9%[%$!<%k$G$bF0(B
-$B:n$7$^$9!#$3$l$O!"J#?t$N(B emacs-w3m $B%P%C%U%!$r;H$&$?$a$N!"Hs>o$KB.$/$F4J(B
-$BC1$JJ}K!$G$9!#C1$K;X$7<($7$F%/%j%C%/$9$k$+!"%^%&%9%[%$!<%k$r%/%k%/%k$9(B
-$B$l$PNI$$$N$G$9$+$i!#(B($B$O$$$O$$!"$"$J$?$rL5;k$7$F$$$^$;$s$h!#$"$J$?$O%-!<(B
-$B%\!<%I$r;H$C$F@Z$jBX$($?$$$N$G$9$M!#$4?4G[L5$/!#$=$l$b2DG=$G$9!#<!$N@a(B
-$B$G@bL@$7$^$9$+$i!"L[$C$FFI$_B3$1$F$/$@$5$$(B!)
-
-$B$b$&0l$D$N5$$,Mx$$$?5!G=$O!"%Z!<%8$N>uBV$rCN$i$;$k$3$H$G$9!#%+%i!<C<Kv(B
-$B$+%&%#%s%I%%%7%9%F%`$r;H$C$F$$$l$P!"%Z!<%8$N>uBV$rCN$i$;$k$?$a$K(B
-emacs-w3m $B$O0c$&?'$G%F%-%9%H$r%?%V$KI=<($7$^$9(B (1) (*Note Using
-Tabs-Footnotes::)$B!#Nc$($P%Y!<%8$r<h$j9~$s$G$$$k:GCf$O%F%-%9%H$O@V$/$J$C(B
-$B$F$$$F!"<h$j9~$_$,40N;$9$k$H%G%U%)%k%H$N?'(B ($BDL>o$O9u(B) $B$KLa$j$^$9!#$3$l(B
-$B$K$h$j!"8+$h$&$H;W$C$FBT$C$F$$$k%Z!<%8$,E~Ce$7$?$+$I$&$+$,!"%?%V9T$r0l(B
-$BL\8+$?$@$1$GJ,$+$j$^$9!#(B
-
-$B:G8e$K!"$b$7%&%'%V%Z!<%8$,(B favicon $B$r;}$C$F$$$l$P!"$=$l$b%?%V$KI=<($5$l(B
-$B$^$9(B (2) (*Note Using Tabs-Footnotes::)$B!#(BEmacs-w3m $B%f!<%6$K$b$C$H;k3P8z(B
-$B2L$r(B!
-
-$B%f!<%6%*%W%7%g%s(B:
-
-`w3m-use-tab'
-     $B%?%V$K$h$k1\Mw$r3h$+$9$+$I$&$+!#(B
-
-$B$"$J$?$,(B GNU Emacs $B$N%f!<%6!<$J$i$P!"%^%&%9%[%$!<%k$r;H$&$H!"NY$N%P%C%U%!(B
-$B$K9T$/$@$1$G$J$/!"%P%C%U%!$rNY$N>l=j$K0\F0$5$;$k$3$H$b$G$-$^$9!#$=$l$K(B
-$B$O%?%V9T$N>e$G%^%&%9%[%$!<%k$r2s$94V!"%3%s%H%m!<%k!&%-!<$r2!$72<$2$F$*(B
-$B$$$F$/$@$5$$!#%^%&%9%[%$!<%k$K$h$C$F(B emacs-w3m $B$,$I$N$h$&$KF0:n$9$k$+$r(B
-$B@)8f$9$kFs$D$NJQ?t$,$"$j$^$9(B:
-
-`w3m-tab-track-mouse'
-     $B$3$NJQ?t$O!"%^%&%9$,A*Br$7$?%?%V$rDI$$$+$1$F0\F0$9$k$+$I$&$+$r@)8f(B
-     $B$7$^$9!#%G%U%)%k%HCM$O(B `t' $B$G$9!#$b$7%W%m%]!<%7%g%J%k$J%U%)%s%H$r(B
-     $B%?%V$N%U%'!<%9$K;H$C$F$$$k$J$i$P!"$3$l$r(B `nil' $B$K@_Dj$9$kI,MW$,$"(B
-     $B$k$+$b$7$l$^$;$s!#(B`w3m-tab-mouse-position-adjuster' $B$b8+$F$/$@$5$$!#(B
-
-`w3m-tab-mouse-position-adjuster'
-     $B$3$NJQ?t$O!"%^%&%9%]%$%s%?!<$,A*Br$7$?%?%V$rDI$$$+$1$F0\F0$9$k$H$-(B
-     $B$N%^%&%9$N0LCV$rD4@0$9$k$?$a$NCM$r4^$s$G$$$^$9!#%G%U%)%k%HCM$O(B
-     `(0.5 . -4)' $B$G$9!#$3$l$OIbF0>/?t(B M $B$H@0?t(B N $B$N%3%s%9!&%;%k$G!"%^(B
-     $B%&%9$N0LCV(B ($B%T%/%;%k?t$GM?$($i$l$^$9(B) $B$N7W;;$K0J2<$N$h$&$KE,MQ$5$l(B
-     $B$^$9(B:
-
-          (TAB_WIDTH + M) * ORDER + N
-
-     $B$3$3$G(B TAB_WIDTH $B$O0l$D$N%?%V$N%T%/%;%kI}!"(BORDER $B$O2?HVL\$N%?%V$+(B
-     $B$rI=$7$^$9!#7k2L$N>/?t0J2<$O@Z$j<N$F$i$l$^$9!#(B
-
-     $B$b$7%?%V$N%U%'!<%9$K%W%m%]!<%7%g%J%k$J%U%)%s%H$r;H$C$F$$$k$H!"$3$N(B
-     $B7W;;$O>o$K<:GT$9$k$G$7$g$&!#(B`w3m-tab-track-mouse' $B$b;2>H$7$F$/$@$5(B
-     $B$$!#(B
-
-
-File: emacs-w3m-ja.info  Node: Using Tabs-Footnotes, Up: Using Tabs
-
-(1) XEmacs $A$O$9$Y$F$N%?%V$r$$$D$bM,$8I+$G1mJ>$7$^$9$,!"$(GrY$(I&1$A$5$l$?%?%V$H(B
-$AK{$N$b$N$rGx$(GI1$A$7$?$j!"%b$B!<$A%I%i%$%s$G$(G\"$ATZ$N%Z$B!<$A%8$NW4$(Ghh$A$rV*$k$3$H$O$(Gv|$(I+J(B
-$A$G$9!#(B
-
-(2) XEmacs $A$G$O=q$N$H$3$m%?%VPP$K(B favicon $A$O1mJ>$5$l$^$;$s!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Working with buffers, Next: Downloading, Prev: Using Tabs, Up: Basic Usage
-
-$A%P%C%U%!$rWw$k(B/$AO{$9(B/$ARF$(GY/$A$9$k(B
-============================
-
-$BCY$+$lAa$+$l$"$J$?$O(B emacs-w3m $BCfFG$K$J$C$F!"$9$Y$F$N%&%'%V$N1\Mw$r$=$l(B
-$B$GOE$o$J$1$l$P$J$i$J$/$J$k$G$7$g$&!#$"$J$?$,$a$2$F$7$^$$$=$&$J$3$NG$L3(B
-$B$r<jEA$&$?$a$K!"(Bemacs-w3m $B$N%P%C%U%!$GF0:n$9$k$?$/$5$s$N0c$&<jCJ$r9M$((B
-$B$^$7$?!#(B
-
-* Menu:
-
-* Creating and killing buffers:: $B%P%C%U%!$r:n$C$?$j>C$7$?$j(B
-* Moving across buffers::        $B%P%C%U%!4V$N0\F0(B
-* Selecting buffers::            $B%j%9%H$+$i%P%C%U%!$rA*$V(B
-
-
-
-File: emacs-w3m-ja.info, Node: Creating and killing buffers, Next: Moving across buffers, Prev: Working with buffers, Up: Working with buffers
-
-$A%P%C%U%!$rWw$C$?$jO{$7$?$j(B
---------------------------
-
-$B;~$K!"%&%'%V%Z!<%8$r3+$+$J$$$GC1$K?7$7$$%P%C%U%!$r:n$k$3$H$,Lr$KN)$D$3(B
-$B$H$,$"$j$^$9!#$3$NA`:n$r(B emacs-w3m $B$NMQ8l$G$O!V$U$?$4$N%3%T!<$r:n$k!W(B
-(creating a twin copy) $B$H8@$$$^$9!#$3$l$OC1$K!"$=$NFbMF$,8=:_$N%P%C%U%!(B
-$B$HF10l$J?7$7$$%P%C%U%!$r:n$j$^$9!#(B
-
-$B$3$NH?BP$O%P%C%U%!$rJD$8$k$3$H$G!":#$O$=$NFbMF$K6=L#$,L5$$0l$D$N%P%C%U%!(B
-$B$r!"C1$KJD$8$k$3$H$,$G$-$^$9!#$"$k$$$O!"8=:_$N%P%C%U%!0J30$N$9$Y$F$rJD(B
-$B$8$k$3$H$r7hCG$7$F$bNI$$$G$9!#0J2<$N%3%^%s%I$G$=$l$r9T$J$C$F$/$@$5$$(B:
-
-`C-c C-t'
-`M-n'
-     $B8=:_$N%P%C%U%!$HF10l$N%3%T!<$r?7$7$$L>A0$G:n$j$^$9!#$3$l$O?7$7$$%P%C(B
-     $B%U%!$K%&%'%V%Z!<%8$r<h$j9~$^$:$K!"?7$7$$%;%C%7%g%s$r;O$a$k$N$K;H$$(B
-     $B$^$9(B (`w3m-copy-buffer')$B!#(B
-
-`C-c C-w'
-     $B8=:_$N(B emacs-w3m $B$N%P%C%U%!$rJD$8$^$9(B (`w3m-delete-buffer')$B!#(B
-
-`C-c M-w'
-     $B8=:_$N$b$N0J30$N$9$Y$F$N(B emacs-w3m $B$N%P%C%U%!$rJD$8$^$9(B
-     (`w3m-delete-other-buffers')$B!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Moving across buffers, Next: Selecting buffers, Prev: Creating and killing buffers, Up: Working with buffers
-
-$A%P%C%U%!$(Gbf$A$NRF$(GY/(B
-----------------
-
-$B:G$bIQHK$K;H$&%3%^%s%I$,$?$V$sNY$N%P%C%U%!$K9T$/$b$N$G$"$m$&$3$H$O!"@$4V(B
-$B$NG'$a$k$H$3$m$G$7$g$&!#$=$l$O!"8=:_$N!V8e!W$+!VA0!W$N%P%C%U%!$G$9!#$3$N(B
-$B0UL#$O%?%V$r;H$C$F$_$l$P$h$/$o$+$j$^$9!#<!$N%P%C%U%!$O8=:_$N1&B&$N0l$D8e!"(B
-$BA0$N%P%C%U%!$O:8B&$G$9!#$7$+$7!";DG0$J$,$i(B XEmacs $B$O%?%V$r=gITF1$KI=<($9(B
-$B$k$N$G!"$I$l$,NY$N%P%C%U%!$+$rCN$k$K$O!"3F%?%V$KI=<($5$l$F$$$k?t;z$KCmL\(B
-$B$9$kI,MW$,$"$j$^$9!#$3$l$i$N%3%^%s%I$K3d$jEv$F$i$l$F$$$k%-!<(B
-$B$O(B `C-c C-p' $B$H(B `C-c C-n' $B$G$9!#(B
-
-$B$3$l$i$N%3%^%s%I$O?t;z@\F,0z?t$N=,47$rM}2r$7$^$9!#$9$J$o$A!"$=$l$i$r?t(B
-N $B$r0z?t$H$7$F8F$V$H!"8=:_$N%P%C%U%!$+$i(B N $B8DN%$l$?%P%C%U%!$K9T$-$^$9!#(B
-$BNc$($P!"8=:_0LCV$+$i1&$K%P%C%U%!$rFs8DJ,(B ($B$9$J$o$A%P%C%U%!Fs8DJ,$@$1<!(B
-$B$K(B) $B0\F0$9$k$K$O!"(B`2 C-c C-n' $B$r;H$C$F$/$@$5$$(B (1) (*Note Moving
-across buffers-Footnotes::)$B!#(B
-
-`C-c C-p'
-     $BA0$N(B emacs-w3m $B%P%C%U%!$K0\F0$7$^$9!#$3$l$ODL>o%?%V9T$K$*$$$F:8J}(B
-     $B8~$K<!$G$9!#?t$N0z?t(B N $B$rIU$1$F;H$&$H!"%P%C%U%!$r(B N $B8DJ,A0$K0\F0$7(B
-     $B$^$9(B (`w3m-previous-buffer')$B!#(B
-
-`C-c C-n'
-     $B<!$N(B emacs-w3m $B%P%C%U%!$K0\F0$7$^$9!#$3$l$ODL>o%?%V9T$K$*$$$F1&J}(B
-     $B8~$K<!$G$9!#?t$N0z?t(B N $B$rIU$1$F;H$&$H!"%P%C%U%!$r(B N $B8DJ,<!$K0\F0$7(B
-     $B$^$9(B (`w3m-next-buffer')$B!#(B
-
-$B$"$J$?$,(B GNU Emacs $B$N%f!<%6!<$J$i$P!"0J2<$N%3%^%s%I$r;H$C$F(B emacs-w3m
-$B%P%C%U%!$r%?%V9T$NNY$N>l=j$K0\F0$5$;$k$3$H$b$G$-$^$9(B:
-
-`C-c C-.'
-`C-c C->'
-     $BA*Br$5$l$F$$$k(B emacs-w3m $B%P%C%U%!$r!"%?%V9T$N1&NY$N>l=j$K0\F0$5$;(B
-     $B$^$9!#?t$N0z?t(B N $B$rIU$1$F;H$&$H!"%?%V$N(B N $B8DJ,1&$K0\F0$5$;$^$9(B
-     (`w3m-tab-move-right')$B!#(B
-
-`C-c C-,'
-`C-c C-<'
-     $BA*Br$5$l$F$$$k(B emacs-w3m $B%P%C%U%!$r!"%?%V9T$N:8NY$N>l=j$K0\F0$5$;(B
-     $B$^$9!#?t$N0z?t(B N $B$rIU$1$F;H$&$H!"%?%V$N(B N $B8DJ,:8$K0\F0$5$;$^$9(B
-     (`w3m-tab-move-left')$B!#(B
-
-$B;d$?$A$,9|$r@^$C$?$K$b$+$+$o$i$:!"$3$l$i$N%3%^%s%I$,$*5$$K>$$5$J$$$J$i(B
-$B$P!"$"$J$?$,M_$7$$$b$N$,(B ibuffer $B$d(B iswitchb $B$N$h$&$JK|G=;V8~$N?M(B
-(generalist) $B8~$1$N%P%C%U%!4IM}%Q%C%1!<%8$NCf$K$"$k$+$I$&$+$rC5$7$F$_$k(B
-$B$N$bNI$$$+$b$7$l$^$;$s!#(Bemacs-w3m $B%P%C%U%!$O(B Emacs $B$N@55,$N%P%C%U%!$G$9(B
-$B$+$i!"$=$l$i$b$^$?NI9%$KF0:n$9$k$G$7$g$&!#(B
-
-
-File: emacs-w3m-ja.info  Node: Moving across buffers-Footnotes, Up: Moving across buffers
-
-(1) $A$$$D$b$N$h$&$K!"(B`2 C-c C-n' $A$N4z$o$j$K(B `C-u 2 C-c
-C-n' $A$rJ9$C$F$bA<$$$N$G$9$,!"(Bemacs-w3m $A$N%P%C%U%!$G$O$9$Y$F$NJ}WV%-$B!<(B
-$A$H%^%$%J%9$(GX4$A:E$,J}$N=S$(Gs$$AR}J}$K8n$j51$F$i$l$F$$$k$3$H$r$(I>t$A$($F$*$$$F$/$@(B
-$A$5$$!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Selecting buffers, Prev: Moving across buffers, Up: Working with buffers
-
-$A%j%9%H$+$i%P%C%U%!$r$(GrY$A$V(B
-------------------------
-
-$B%j%9%H$+$i(B emacs-w3m $B$N%P%C%U%!$rA*$V$?$a$NFs$D$N$d$jJ}$,$"$j$^$9!#0l$D(B
-$BL\$O!"(B`C-c C-a' $B$G8F$S=P$5$l$k%_%K%P%C%U%!!&%Y!<%9$N%$%s%?!<%U%'!<(B
-$B%9$G$9!#I=<($7$?$$%P%C%U%!$r!"(B`M-p' $B$H(B `M-n' $B%-!<(B ($B$^$?(B
-$B$O(B <$A!|(B> $B$H(B <$A!}(B> $B%-!<(B) $B$r;H$C$FA*$V$3$H$,$G$-!"$=$l$i$O%j%9%H$NCf(B
-$B$G=[4D$7$^$9!#$^$?!"%W%m%s%W%H$rJT=8$7$F!"(B`<TAB>' $B$NJd40$r;H$C$F(B
-$B4{B8$N%&%'%V%Z!<%8$N%?%$%H%k$r=q$-9~$`$3$H$b$G$-$^$9!#Nc$($P!"(B"Google
-Search" $B$N%Z!<%8$r3+$$$F$"$k$J$i$P!"(B"Goo" $B$KB3$1$F(B `<TAB>' $B$r(B
-$BC!$/$3$H$K$h$C$F!"$=$N%Z!<%8$N%?%$%H%k$,40@.$7$^$9!#%Z!<%8$NL>A0$N8e$m$K(B
-$B$O!"(B($B803g8L$G64$^$l$?(B) $B%P%C%U%!$NL>A0$,IU$-$^$9!#$=$7(B
-$B$F(B `<RET>' $B$r;H$&$H!"$"$J$?$,A*$s$@%P%C%U%!$K@Z$jBX$o$j$^$9!#(B
-
-$BFs$DL\$N$b$C$H@vN}$5$l$?%$%s%?!<%U%'!<%9$O(B emacs-w3m $B%P%C%U%!%j%9%H$H8@(B
-$B$$!"(B`C-c C-s' $B$G5/F0$5$l$^$9!#$=$l$OJ,3d$5$l$?%&%#%s%I%%$K$9$Y$F(B
-$B$N3+$$$F$$$k%P%C%U%!$rI=<($7(B (`C-c C-s' $B$GI=<(7A<0$,@Z$jBX$o$j$^(B
-$B$9(B)$B!"<B;~4V$G%P%C%U%!$r8+$k$3$H$,$G$-$k$h$&$K$J$j$^$9!#$=$N%P%C%U%!%j%9(B
-$B%H$NCf$G%]%$%s%H$r0\F0$9$k$H!"%]%$%s%H$N$H$3$m$K$"$k%P%C%U%!$,<g%&%#%s%I%%(B
-$B$KI=<($5$l!"%P%C%U%!$N@Z$jBX$($,D>@\L\$K8+$($k7A$GJV$C$F$/$k$N$G$9!#(B
-
-$B%P%C%U%!%j%9%H$NCf$r0\F0$9$k$K$O(B `p' $B$H(B `n' $B%-!<(B ($B$^$?$OLp0u%-!<(B) $B$r;H$C(B
-$B$F$/$@$5$$!#%P%C%U%!%j%9%H$G$O(B `<DEL>' $B$H(B `<SPC>' $B$G!"<g%&%#%s%I%%$KI=(B
-$B<($5$l$F$$$k%P%C%U%!$r%9%/%m!<%k$5$;$k$3$H$,2DG=$G!"$3$l$O@5$7$$%P%C%U%!(B
-$B$r8+$F$$$k$+$I$&$+$r%A%'%C%/$7$?$$$H$-$KJXMx$G$9!#%]%$%s%H$N$H$3$m$K$"(B
-$B$k%P%C%U%!$rA*$S$?$$$H$-$O(B `<RET>' $B%-!<$r;H$C$F$/$@$5$$!#$3$N>l9g$O%P%C(B
-$B%U%!%j%9%H$,1#$5$l$^$9!#$"$k$$$O!"(B`w' $B%-!<$r;H$C$?>l9g$O%P%C%U%!%j%9%H(B
-$B$OI=<($5$l$?$^$^$G!"<g%&%#%s%I%%$K%U%)!<%+%9$7$^$9!#(B
-
-$B$^$?!"$3$N%a%K%e!<$GIaDL$N%P%C%U%!$G;H$o$l$k$N$HF1$8%-!<3d$jEv$F(B
-(*Note Creating and killing buffers::) $B$G!"%P%C%U%!$rJD$8$?$j:n$k$3$H$b(B
-$B$G$-$^$9!#(B
-
-$B:G8e$K!"(B`?' $B$O%X%k%W$NI=<(!"(B`g' $B$O%j%9%H$N:n$jD>$7!"$=$7$F(B `q' $B$O%P%C%U%!(B
-$B%j%9%H$N=*N;$r<g%&%#%s%I%%$N%P%C%U%!$OJQ99$;$:$K!"$=$l$>$l<B9T$7$^$9!#(B
-
-`C-c C-a'
-     $B%_%K%P%C%U%!$G%P%C%U%!L>$NF~NO$r5a$a$^$9!#(B`M-p' $B$H(B `M-n' $B$G4{B8$N(B
-     $B%P%C%U%!$,=[4D$7!"(B`<TAB>' $B$GJd40$G$-$^$9(B (`w3m-switch-buffer')$B!#(B
-
-`C-c C-s'
-     $BJ,3d$5$l$?%&%#%s%I%%$K%P%C%U%!%j%9%H$rI=<($7$^(B
-     $B$9(B (`w3m-select-buffer')$B!#$3$N%&%#%s%I%%$G$O(B `C-c C-s' $B$G?e(B
-     $BJ?$H?bD>%b!<%I$,@Z$jBX$o$j!"(B`<RET>' $B$G%]%$%s%H$N$H$3$m$K$"$k%P%C(B
-     $B%U%!$rA*$s$G%P%C%U%!%j%9%H$O1#JC!"(B`w' $B$G%]%$%s%H$N$H$3$m$K$"$k%P%C%U%!(B
-     $B$rA*$s$G$=$l$K%U%)!<%+%9!"(B`n' $B$H(B `p' $B$=$l$KLp0u%-!<$,>e2<$N0\F0(B
-     $B$K;H$($^$9!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Downloading, Next: Submitting Forms, Prev: Working with buffers, Up: Basic Usage
-
-$A%U%!%$%k$r%@%&%s%m$B!<$A%I$9$k(B
-==========================
-
-$B$I$s$J%&%'%V%Z!<%8$d%U%!%$%k$b(B emacs-w3m $B$G%@%&%s%m!<%I(B ($B$9$J$o$A<hF@!"(B
-$BI=<($G$O$"$j$^$;$s(B) $B$G$-$^$9!#C1$K%@%&%s%m!<%I$7$?$$%j%s%/$K%]%$%s%H$r(B
-$BCV$$$F(B `d' $B$rC!$$$F$/$@$5$$!#%m!<%+%k$K%;!<%V$9$k%U%!%$%kL>$,?R$M$i$l$^(B
-$B$9!#%G%U%)%k%H$G$O1s3V%5!<%P!<$K$*$1$k%U%!%$%k$NL>A0$K$J$j$^$9!#$=$l$G(B
-$BNI$1$l$P(B `<RET>' $B$r2!$7$F$/$@$5$$!#%@%&%s%m!<%I$OHsF14|$K<B9T$5$l!"(B
-Emacs $B$G9T$J$C$F$$$kB>$N;E;v$N<YKb$r$7$J$$$N$G!"$=$&$7$?$1$l$PB>$N%P%C(B
-$B%U%!$G(B emacs-w3m $B$K$h$k1\Mw$rB3$1$k$3$H$,$G$-$^$9!#(B
-
-$B$3$N%@%&%s%m!<%I$N;EAH$_$O(B w3m $B$r;H$&$N$G$9$,!"Be$o$j$K$b$C$H6/NO$J(B
-wget $B$r;H$&$3$H$b9MN8$7$F$_$F$/$@$5$$!#;d$?$A$N$*M'$@$A%W%m%8%'%/%H$G$"(B
-$B$k(B "emacs-wget" $B$rGA$$$F$_$^$7$g$&!#$=$N%[!<%`%Z!<%8$O$3$3(B
-`http://pop-club.hp.infoseek.co.jp/emacs/emacs-wget/' $B$G$9!#(B
-
-`d' (Lynx-like $A%-$B!<$A%^%C%W(B)
-`D' (Info-like $A%-$B!<$A%^%C%W(B)
-     $B%]%$%s%H$N$H$3$m$K$"$k%j%s%/$,;X$7<($9%U%!%$%k$+%Z!<%8$r%@%&%s%m!<(B
-     $B%I$7$^$9(B (`w3m-download-this-url')$B!#(B
-
-`M-d' (Lynx-like $A%-$B!<$A%^%C%W(B)
-`d' (Info-like $A%-$B!<$A%^%C%W(B)
-     URL $B$NFbMF$r%m!<%+%k%U%!%$%k$K%@%&%s%m!<%I$7$^$9(B (`w3m-download')$B!#(B
-     $B$=$N(B URL $B$H%m!<%+%k%U%!%$%k$NL>A0$NF~NO$r5a$a$i$l$^$9!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Submitting Forms, Next: HTML File Information, Prev: Downloading, Up: Basic Usage
-
-HTML $A%U%)$B!<$A%`$K$(GX4$AHk$9$k(B
-=======================
-
-$B$3$l$i$N(B emacs-w3m $B%3%^%s%I$O!"C1=c$J%-!<%P%$%s%I$H@lMQ$N(B Emacs $B$N%&%#(B
-$B%s%I%%$+%_%K%P%C%U%!$r;H$C$F!"%U%)!<%`$+$i%U%)!<%`$X$N0\F0$H%U%#!<%k%I(B
-$B$KF~NO$9$k$?$a$N5!G=$rDs6!$7$^$9!#(B
-
-$B3P$($F$*$$$FM_$7$$Bg;v$J%-!<%P%$%s%I$O(B `<RET>' $B$G$9!#$3$l$O8=:_0LCV$K$"(B
-$B$k$b$N$K$h$C$F0[$J$k0UL#$r;}$A$^$9!#%F%-%9%HNN0h(B (textarea) $B$G$O!"%_%K(B
-$B%P%C%U%!$GCM$rF~NO$9$k$3$H$,B%$5$l$^$9!#A*BrMQ$N%?%0$G$O!"A*Br;h$N%j%9(B
-$B%H$,(B Emacs $B$N%(%l%/%H%j%C%/(B (electric == $B<+8JA^F~(B) $B%&%#%s%I%%$K8=$l$^$9(B
-($B$=$3$G$OLp0u%-!<$G0\F0$7$F!"(B`<RET>' $B%-!<$G0l$D$rA*$V$3$H$,$G$-$^$9(B)$B!#(B
-$B%i%8%*%\%?%s$*$h$S%A%'%C%/%\%C%/%9$G$O(B `<RET>' $B%-!<$G$=$l$i$N$&$A$N0l$D(B
-$B$rA*$S$^$9!#(B
-
-$B%_%K%P%C%U%!$+%(%l%/%H%j%C%/!&%&%#%s%I%%$K$$$k$H$-$O!"(B
-`C-c C-q' $B%-!<$G<h$j>C$9$3$H$,$G$-$^$9!#%U%)!<%`$K5-F~$7$?$b$N$r(B
-$BAw$j=P$9$K$O(B `C-c C-c' $B$r;H$C$F$/$@$5$$!#(B
-
-`]'
-     $B<!$N%U%)!<%`$K%8%c%s%W$7$^$9(B (`w3m-next-form')$B!#(B
-
-`['
-     $BA0$N%U%)!<%`$K%8%c%s%W$7$^$9(B (`w3m-previous-form')$B!#(B
-
-`C-c C-c'
-     $B8=:_0LCV$N%U%)!<%`$K5-F~$7$?$b$N$rAw$j=P$7$^$9(B
-     (`w3m-submit-form')$B!#(B
-
-`<RET>'
-     $B8=:_0LCV$K$"$k$N%U%)!<%`CM$r=q$-49$($^$9!#(B
-
-`<RET>' (w3m-form-*-keymap)
-     $B$=$NCM$rA*Br$7$^$9!#(B
-
-`C-c C-q' (w3m-form-*-keymap)
-     $B%U%)!<%`$NJT=8$rCfCG$7$F!"JQ99$r<h$j;_$a$^$9!#(B
-
-`w3m-form-use-textarea-backup' $B$,(B `nil' $B$K@_Dj$5$l$F$$$J$+$C$?$i!"(B
-textarea $B$GF~NO$7$?%F%-%9%H$r8e$G:FMxMQ$G$-$k$h$&$K!"%P%C%/%"%C%W!&%U%!(B
-$B%$%k$K5-O?$7$^$9!#%U%)!<%`$NJT=8$r;O$a$k$H$-$K%P%C%/%"%C%W$5$l$?%F%-%9(B
-$B%H$,$"$C$?$i!"$=$l$r;H$&$+$I$&$+$r?R$M$i$l$k$G$7$g$&!#%F%-%9%H$rJ]B8$9(B
-$B$k$?$a$N%U%!%$%k$O!"JQ?t(B `w3m-form-textarea-directory' $B$G;XDj$5$l$k%G%#(B
-$B%l%/%H%j$K3JG<$5$l$^$9!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: HTML File Information, Prev: Submitting Forms, Up: Basic Usage
-
-$A%&%'%V%Z$B!<$A%8Ww$j$H%O%C%/$N$*JV$(H!s$A$$(B
-==================================
-
-$B$$$D$b%I%-%e%a%s%H$N<9I.4D6-$H$7$F!"$"$k$$$O%=%U%H%&%'%"$N3+H/4D6-$H$7(B
-$B$F(B Emacs $B$r;H$C$F$$$k?M$K$O!"F1$8$=$N4D6-$NCf$G%&%'%V$r1\Mw$G$-$k$3$H$O(B
-$BK\Ev$KJXMx$G$7$g$&!#Nc$($P(B HTML $B%U%!%$%k$r<9I.$7$F$$$k$N$G$"$l$P!"30It(B
-$B$N%&%'%V%V%i%&%6$r5/F0$9$kI,MW$J$/!"(BEmasc $B$NCf$G:n@.$7$?(B HTML $B%U%!%$%k(B
-$B$r%W%l%S%e!<$G$-$^$9!#%W%m%0%i%_%s%0!&%^%i%=%s$N:GCf$K!"?WB.$K5;=QJ88%(B
-$B$+$i%5%s%W%k%3!<%I$r@Z$jE=$j$9$k$H$$$C$?$3$H$@$C$F(B...
-
-$B5U$O$I$&$G$7$g$&!#(B($B$9$J$o$A%&%'%V1\Mw$N4D6-$G!"$=$N%=!<%9$G$"$k(B HTML $B%U%!(B
-$B%$%k$rJT=8$7$?$j!";2>H$7$?$j$G$-$?$i(B) $B$+$C$3$$$$$H;W$$$^$;$s$+!)(B $B%I%-%e(B
-$B%a%s%H$r<9I.Cf$K(B emacs-w3m $B$G2<8+(B (preview) $B$7$F8m;z$rH/8+$7$?$HA[A|$7(B
-$B$F$_$F$/$@$5$$!#$=$N(B HTML $B%U%!%$%k$r$?$A$I$3$m$K=$@5$7$?$/$J$k$O$:$G$9!#(B
-$B$"$J$?$,%&%'%V%F%/%N%m%8!<$K7H$o$k%W%m%0%i%^$J$i!"1\MwCf$N%&%'%V%Z!<%8(B
-$B$r(B HTML $B7A<0$G1\Mw$7$?$/$J$k$3$H$,$"$k$G$7$g$&!"FC$K!"?7J9%b%8%e!<%k$N(B
-$B:n<T$NJ}(B (*Note Shimbun Basics::)$B!#(B
-
-HTML $B%U%!%$%k$r3+$$$F$$$k(B Emacs $B$N%P%C%U%!$NL>A0$rL@<(E*$K;XDj$7$F%P%C(B
-$B%U%!$r@Z$jBX$($k$3$H$bIaDL$K$G$-$^$9$,!"(Bemacs-w3m $B$G$O$=$&$$$C$?L\E*$N(B
-$B$?$a$K@lMQ$N%-!<$,3dEv$F$i$l$F$$$^$9!#(BEmacs-w3m $B$O<+J,$,8=:_I=<($7$F$$(B
-$B$k%&%'%V%Z!<%8$N(B URL $B$rCN$C$F$k$s$G$9!#$=$N>pJs$r;H$o$J$$<j$O$"$j$^$;$s!#(B
-
-`\'
-     $BI=<(Cf$N%&%'%V%Z!<%8$r(B HTML $B7A<0$G$=$N$^$^I=<($7$^$9(B
-     (`w3m-view-source')$B!#(B
-
-`='
-     $BI=<(Cf$N%&%'%V%Z!<%8$N>pJs$rI=<($7$^$9!#>pJs$K$O!"%?%$%H%k!"(BURL$B!"(B
-     $B%I%-%e%a%s%H%?%$%W!":G=*JQ99F|;~$,4^$^$l$^$9(B (`w3m-view-header')$B!#(B
-
-`E' (Lynx-like $A%-$B!<$A%^%C%W(B)
-`e' (Info-like $A%-$B!<$A%^%C%W(B)
-     $B8=:_1\MwCf$N%m!<%+%k%U%!%$%k$rJT=8$7$^$9(B (`w3m-edit-current-url')$B!#(B
-
-`e' (Lynx-like $A%-$B!<$A%^%C%W(B)
-`E' (Info-like $A%-$B!<$A%^%C%W(B)
-     $B8=:_%]%$%s%H$N2<$K$"$k%j%s%/@h$N%m!<%+%k%U%!%$%k$rJT=8$7$^$9(B
-     (`w3m-edit-this-url')$B!#(B
-
-`M'
-     (Emacs-w3m $B0J30$N(B) $B30It%V%i%&%6$r?7$?$K5/F0$7$F!"8=:_(B emacs-w3m $B$G(B
-     $B1\Mw$7$F$$$k%Z!<%8$rI=<($7$^$9(B
-     (`w3m-view-url-with-external-browser')$B!#$I$N30It%V%i%&%6$r;H$&$+$O!"(B
-     $BJQ?t(B `w3m-content-type-alist' $B$K$h$C$F(B URL $B$N<oN`Kh$KDj5A$5$l$^$9!#(B
-
-`|'
-     $B%&%'%V%Z!<%8$N%=!<%9$r%3%^%s%I$K%Q%$%W$7$^$9!#$I$s$J%3%^%s%I$r;H$&(B
-     $B$+$r?R$M$i$l$^$9(B (`w3m-pipe-source')$B!#(B
-
-$B$3$3$G>R2p$7$?0J30$K$b!"B>$N%3%^%s%I$d(B Emacs $B$N%5%V%7%9%F%`$H(B
-emacs-w3m $B$rO"7H$5$;$kJ}K!$r(B *Note Tips:: $B$K$F>R2p$7$F$$$k$N$G!";29M$K(B
-$B$7$F$/$@$5$$!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Pretty Good Features, Next: Customizable Variables, Prev: Basic Usage, Up: Top
-
-$A$?$/$5$s$N$9$0$l$b$N(B
-********************
-
-* Menu:
-
-* Using Search Engines::        $B;H$$$d$9$$%&%'%V8!:w(B
-* Grouping URLs::               $B0l$D$N(B URL $B$GJ#?t$N%&%'%V%Z!<%8$r8+$k(B
-* Weather Information::         $BL@F|$NE75$$O@2$l$G$7$g$&(B
-* Using Antenna::               $B%"%s%F%J$rD%$j=d$i$=$&(B
-* Showing Directory Tree::      $B%G%#%l%/%H%j$NLZ9=B$$rI=<($9$k(B
-* Viewing Perl Documents::      Perl $B$N%I%-%e%a%s%H$r8+$k(B
-* Using Namazu::                Namazu $B$G%U%!%$%k$r8!:w$9$k(B
-* Octet::                       application/octet-stream $B%G!<%?$r8+$k(B
-* Frame Local Buffers::         $BB??t$N%;%C%7%g%s$r%U%l!<%`$G%0%k!<%WJ,$1$9$k(B
-* Session Manager::             $B%;%C%7%g%s$NJ]B8$HFI$_$3$_(B
-
-
-
-File: emacs-w3m-ja.info, Node: Using Search Engines, Next: Grouping URLs, Prev: Pretty Good Features, Up: Pretty Good Features
-
-$AJ9$$$d$9$$%&%'%V$(I<D$AKw(B
-====================
-
-Emacs-w3m $B$K$O8!:w%(%s%8%s$rMxMQ$9$k$?$a$N@h?J$N5!G=$,$"$j!";0$D$N%$%s(B
-$B%?!<%U%'!<%9$rDL$7$FMxMQ$9$k$3$H$,$G$-$^$9(B:
-
-   * $BI8=`$N8!:w%$%s%?!<%U%'!<%9$G$9!#(B`S' $B%-!<(B (`Info-like' $B%-!<%^%C%W$N(B
-     $B>l9g$O(B `s' $B%-!<(B) $B$G!"$$$:$l$+$N(B emacs-w3m $B%P%C%U%!$+$i5/F0$5$l$^$9!#(B
-     $B$3$l$O8!:w%(%s%8%s$r;XDj$7$F8!:w8l$rF~NO$9$k!"C1=c$JBPOC7?$N$d$jJ}(B
-     $B$G$9!#(B*Note The Search Interface:: $B$r;2>H$7$F$/$@$5$$!#(B
-
-   * $B%/%$%C%/%5!<%A!&%$%s%?!<%U%'!<%9$G$9!#$3$l$O5;9*E*$K:n$i$l$?(B URL
-     $B$K9T$/$3$H$K$h$C$F8!:w%(%s%8%s$rMxMQ$9$k$?$a$N!"$h$jB.$$(B ($B$5$i$K!"(B
-     $B$h$jJ#;($J(B) $BJ}K!$G$9!#$3$N5!G=$K4X$9$k>\:Y$O(B *Note Quick
-     Searching:: $B$r;2>H$7$F$/$@$5$$!#(B
-
-   * "I'm feeling lucky" $B5!G=$,M-8z$K$J$C$F$$$k(B
-     (`w3m-enable-google-feeling-lucky') $B$H!"(BURL $B$rF~NO$9$k$H$-$KDL>o$N(B
-     URL $B$NBe$o$j$K2?$+$N8l6g$r;XDj$9$k$3$H$K$h$C$F!"$=$N8l6g$N(B Google
-     $B8!:w$r<+F0E*$K3+;O$7$F!":G$b4X78$,$"$j$=$&$J7k2L$rI=<($5$;$k$3$H$,(B
-     $B$G$-$^$9!#$3$l$O:G$b4X78$,$"$j$=$&$J%Z!<%8$r$9$0$K8+$?$$>l9g$KJXMx(B
-     $B$G$9$,!"8!:w7k2L$N%j%9%H$OI=<($5$l$^$;$s!#(B
-
-* Menu:
-
-* The Search Interface::        Emacs-w3m $B$K$h$k8!:w$N$d$jJ}(B
-* Quick Searching::             $B$b$&0l$D$N(B ($B$=$7$FB.$$(B) $B%&%'%V8!:w(B
-* Adding New Search Engines::   $B$*5$$KF~$j$N%(%s%8%s$r;H$&$K$O(B?
-
-
-
-File: emacs-w3m-ja.info, Node: The Search Interface, Next: Quick Searching, Prev: Using Search Engines, Up: Using Search Engines
-
-Emacs-w3m $A$K$h$k$(I<D$AKw$N$d$j7=(B
-----------------------------
-
-Emacs-w3m $B$N%P%C%U%!$G(B `S' $B%-!<(B (`Info-like' $B%-!<%^%C%W$N>l9g$O(B `s'
-$B%-!<(B) $B$r;H$&$3$H$K$h$j!"I8=`$N8!:w%$%s%?!<%U%'!<%9$rN)$A>e$2$k$3$H$,$G(B
-$B$-$^$9!#$9$k$H!"%_%K%P%C%U%!$G8!:w8l$NF~NO$r5a$a$k%W%m%s%W%H$,8=$l$k$N(B
-$B$G!"0l$D$^$?$OJ#?t$N8l$rF~$l$F!"(B`<RET>' $B$rC!$$$F$/$@$5$$!#$=$N%(%s%8%s(B
-$B$N8!:w7k2L$N%Z!<%8$,8=$l!"$=$N8e!"$"$?$+$b8!:w%(%s%8%s$KDL>o$N%&%'%V$N(B
-$BN.57$K$h$kF~NO$r9T$J$C$?$H$-$N$h$&$K!"7k2L$r1\Mw$9$k$3$H$,$G$-$^$9!#(B
-
-$B$*$=$i$/!"$"$J$?$O$I$N%(%s%8%s$GC5:w$7$?$$$+$r7h$a$k5!2q$,M?$($i$l$F$$(B
-$B$J$$$3$H$K5$IU$/$G$7$g$&!#(BEmacs-w3m $B$O%G%U%)%k%H$G(B Google $B8!:w%(%s%8%s(B
-$B$r;H$$$^$9$,!"JQ?t(B `w3m-search-default-engine' (*Note Customizable
-Variables:: $B;2>H(B) $B$r%+%9%?%^%$%:$9$k$3$H$K$h$C$F!"$3$N?6$kIq$$$rJQ99$9(B
-$B$k$3$H$,$G$-$^$9!#$"$k$$$O!"$3$N%3%^%s%I$r;H$&$?$S$K8!:w%(%s%8%s$r;XDj(B
-$B$9$k$3$H$,$G$-$^$9!#(B
-
-$B$I$N%(%s%8%s$r;HMQ$9$k$+$rL@<($9$k$?$a$K$O!"%3%^%s%I$K@\F,0z?t$rM?$($J$1(B
-$B$l$P$J$j$^$;$s(B ($BDL>o$3$l$O(B `C-u S' (`Info-like' $B%-!<%^%C%W(B
-$B$N>l9g$O(B `C-u s') $B$N$h$&$K!"%3%^%s%I$NA0$K(B `C-u' $B$rC!$/$3$H(B
-$B$r0UL#$7$^$9(B)$B!#$9$k$H(B emacs-w3m $B$O%(%s%8%s$NF~NO$rB%$9$N$G!"$=$NL>A0$r0l(B
-$B$DA*$V$3$H$,$G$-$^$9(B (<TAB> $B%-!<$GJd40$,$G$-$^$9(B)$B!#$$$C$?$sA*(B
-$BBr$7$?$i(B `<RET>' $B%-!<$rC!$$$F$/$@$5$$!#$=$N8e$G8!:w8l$rF~NO$9$k(B
-$B$3$H$,$G$-!"(B`<RET>' $B$r%?%$%W$9$l$P8!:w7k2L$,8=$l$k$G$7$g$&!#(B
-
-`S' (Lynx-like $A%-$B!<$A%^%C%W(B)
-`s' (Info-like $A%-$B!<$A%^%C%W(B)
-     $B?7$7$$8!:w$r;O$a$^$9!#@\F,0z?tIU$-$G8F$P$l$?>l9g$O!"$I$N%(%s%8%s$r(B
-     $B;H$&$+$r?R$M$^$9(B (`w3m-search')$B!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Quick Searching, Next: Adding New Search Engines, Prev: The Search Interface, Up: Using Search Engines
-
-$A$b$&R;$D$N(B ($A$=$7$FKY$$(B) $A%&%'%V$(I<D$AKw(B
-----------------------------------
-
-$B%&%'%V!&%Q%o!<%f!<%6(B ($B$3$l$rFI$s$G$$$k$"$J$?(B) $B$K$O!"?WB.$G8zN(E*$J8!:w(B
-$B$NJ}K!$,I,MW$G$9!#%/%$%C%/%5!<%A$O$=$N0l$D$G$9!#(B
-
-$B$=$l$O2?$r$9$k$N$+$C$F(B?  $B$=$l$O(B `gg:emacs' $B$N$h$&$JFCJL$N(B URL $B$K9T$/$@(B
-$B$1$G!"%&%'%V8!:w$r;O$a$5$;$k$N$G$9!#$3$N%b!<%I$NF0:n$ND9=j$O!"<!$NDL$j(B
-$B$G$9(B:
-
-   * $BB.$$!#%(%s%8%s$H8!:w8l$rA*$V$N$K!"0l$D$N(B URL $B$r%?%$%W$9$k$@$1$G$9!#(B
-
-   * $BJXMx!#$3$N5!G=$K$h$C$F!"MF0W$K(B emacs-w3m $B$N%?%V$+%&%#%s%I%%$r3+$$(B
-     $B$F!"8!:w$r;O$a$k$3$H$,$G$-$^$9!#Nc$($P!"(B`G' $B%-!<$G?7$7$$%&%#%s%I%&(B
-     $B$r3+$$$F%/%$%C%/%5!<%A(B URL $B$K9T$/$h$&$K!#$=$7$F!"FCJL$N%/%$%C%/%5!<(B
-     $B%A(B URL $B$=$N$b$N$K$b!"%V%C%/%^!<%/$rIU$1$k$3$H$,$G$-$^$9!#(B
-
-   * $B%0%k!<%T%s%05!G=$b;H$($k!#Nc$($P(B `group:gg:emacs&ya:w3m' $B$N$h$&(B
-     $B$J(B URL $B$K$h$C$F!"F1;~$KFs$D$N8!:w$r;O$a$k$3$H$,$G$-$^$9!#Nc$($P$3$N>l9g(B
-     $B$O!"(BGoogle $B$G(B "emacs" $B$N!"(BYahoo! $B$G(B "w3m" $B$N8!:w$r$=$l$>$l;O$a$^$9!#(B
-     *Note Grouping URLs::.
-
-$B$3$l$r;H$&$N$O$H$F$b4JC1$G$9!#(B"gnu" $B$H$$$&C18l$r(B Google $B$GC5$7$F7k2L$N(B
-$B%j%9%H$rF@$?$$$N$G$"$l$P!"(B`g' $B$rC!$$$F$+$i(B "gg:gnu" $B$H$$$&(B URL $B$r(B
-$B%?%$%W$7$F$/$@$5$$!#$3$NI=8=$NBh0l$NItJ,(B "gg" $B$O!"(BGoogle $B8!:w%(%s%8%s$r(B
-$B;HMQ$7$?$$$3$H$r<($7$^$9!#BhFs$NItJ,$O8!:w8l$G$9!#%(%s%8%s$H8!:w8l$O!"%3(B
-$B%m%s$GJ,$1$J$1$l$P$J$j$^$;$s!#$=$7$F(B `<RET>' $B$rC!$1$P8!:w7k2L$r(B
-$B8+$k$3$H$,$G$-$^$9!#%9%Z!<%9$GJ,N%$7$?J#?t$N8l$rF~NO$G$-$k$3$H$r!"?4$KN1(B
-$B$a$F$*$$$F$/$@$5$$!#(B"Feeling Lucky" $B5!G=$,M-8z$K$J$C$F$$$l$P!"%_%K%P%C(B
-$B%U%!$G(B `<SPC>' $B$O(B self-insert $B%-!<$K$J$C$F$$$^$9(B ($B$3$l$,%G%U%)%k(B
-$B%H$G$9!#(B`w3m-enable-google-feeling-lucky' $B$r;2>H$7$F$/$@$5$$!#(B) $BL5(B
-$B8z$K$7$F$"$k>l9g$O!":G=i$K(B `C-q' $B$rC!$$$F$/$@$5$$!#$D$^(B
-$B$j(B `C-q <SPC>' $B$G$9!#(B
-
-Emacs-w3m $B$N%G%U%)%k%H$G$O!"MxMQ2DG=$J$$$/$D$+$N8!:w%(%s%8%s$NC;=L7A$,(B
-$B$"$j!"$=$l$i$OJQ?t(B `w3m-uri-replace-alist' $B$GDj5A$5$l$F$$$^$9!#Nc$($P(B
-Google $B$K$O(B "gg"$B!"(BGoogle Groups $BMQ$K$O(B "ggg"$B!"(BYahoo! $B$N$?$a$N(B "ya"$B!"(B
-Altavista $B$KBP$9$k(B "al" $B$*$h$S(B $B1Q<-O/(B on the WEB $B$N(B "alc" $B$J$I$NC;$$L>(B
-$BA0$G$9!#$5$i$K8!:w%(%s%8%s$NC;=L7A$rDI2C$9$k$K$O(B *Note Adding New
-Search Engines:: $B$r;2>H$7$F$/$@$5$$!#(B
-
-$BC;=L7A$NBe$o$j$K!"(B"google" $B$d(B "yahoo" $B$N$h$&$J40A4$J%(%s%8%s$NL>A0$r!"(B
-$B%/%$%C%/%5!<%A(B URL $B$K;H$&$3$H$b$G$-$^$9!#$=$l$i$NL>A0$O!"JQ?t(B
-`w3m-search-engine-alist' $B$GDj5A$5$l$^$9!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Adding New Search Engines, Prev: Quick Searching, Up: Using Search Engines
-
-$A$*$B5$$A$KHk$j$N%(%s%8%s$rJ9$&$K$O(B?
--------------------------------
-
-Emacs-w3m $B$OMxMQ2DG=$JB?$/$N8!:w%(%s%8%s$r;}$C$F$$$^$9!#$"$J$?$N$*5$$K(B
-$BF~$j$N8!:w%(%s%8%s$r;H$$$?$$$N$K!"K|$,0l$K$b$=$l$,4{CN$N8!:w%(%s%8%s$N(B
-$B%j%9%H$K:\$C$F$$$J$+$C$?$i$I$&$7$^$7$g$&(B?  $B$=$l$r8!:w%(%s%8%s$N%j%9%H$K(B
-$B2C$($l$PNI$$$N$G$9!#$=$7$F$=$l$O6K$a$F4JC1$G$9(B:
-
-  1. $B:G=i$K!"$"$J$?$,2C$($?$$8!:w%(%s%8%s$N%(%s%H%j!<!&%]%$%s%H$,2?$+$r(B
-     $BCN$i$J$1$l$P$J$j$^$;$s!#Nc$($P(B:
-
-     `http://my.searchengine.com/?query=foobar'
-
-     $B$3$3$G(B foobar $B$O$"$J$?$,8!:w$7$?$$8l$G$9!#(B
-
-  2. $B$3$N>pJs$,<j$KF~$C$?$i!"(B`~/.emacs-w3m' $B%U%!%$%k$K2C$($F$/$@$5$$(B:
-
-          (eval-after-load "w3m-search"
-            '(add-to-list 'w3m-search-engine-alist
-                          '("My engine"
-                            "http://my.searchengine.com/?query=%s"
-                            nil)))
-
-     $BBh0l%U%#!<%k%I$N(B "My engine" $B$r$"$J$?$N%(%s%8%s$N@bL@$G!"BhFs%U%#!<(B
-     $B%k%I$r%(%s%H%j!<!&%]%$%s%H$GCV$-49$($F$/$@$5$$(B (`%s' $B$O=EMW$G$9!#(B
-     $B$3$l$O8!:w$r9T$J$&$H$-$K!"8!:w8l$GCV$-49$($i$l$^$9(B)$B!#$=$7$FBh;0(B
-     $B%U%#!<%k%I$O;HMQ$9$k%(%s%3!<%G%#%s%0$r0UL#$7!"(B`nil' $B$^$?$O$=$l$,>J(B
-     $BN,$5$l$?>l9g$OJQ?t(B `w3m-default-coding-system' $B$NCM$,I8=`$N%(%s%3!<(B
-     $B%G%#%s%0$H$7$F;H$o$l$^$9!#(B
-
-     $B1Q8l$N8!:w%(%s%8%s$G$OLGB?$K5$$K$9$kI,MW$,L5$$$3$H$J$N$G$9$,!"$$$/(B
-     $B$D$+$NF|K\$N8!:w%(%s%8%s$G$O!"$=$l$K2?$+(B ($BNc$($P(B `euc-japan') $B$r;X(B
-     $BDj$9$kI,MW$,$"$k$+$b$7$l$^$;$s!#(B
-
-  3. $B:#$d$3$N8!:w%(%s%8%s$O!"(Bemacs-w3m $B$GDL>o$N(B `S' $B%-!<(B (`Info-like'
-     $B%-!<%^%C%W$N>l9g$O(B `s' $B%-!<(B) $B$G;H$&$3$H$,$G$-$^$9!#$3$N%(%s%8%s$r(B
-     $BIQHK$K;H$&$N$J$i$P!"C;$$%(%s%8%s$NL>A0$r%/%$%C%/%5!<%A%(%s%8%s(B
-     (*Note Quick Searching:: $B$r;2>H(B) $B$K2C$($k$3$H$b$G$-$^$9!#$=$l$K$O!"(B
-     $B0J2<$N%3!<%I$r(B `~/.emacs-w3m' $B%U%!%$%k$KDI2C$7$F$/$@$5$$(B:
-
-          (eval-after-load "w3m-search"
-            '(progn
-               (add-to-list 'w3m-search-engine-alist
-                            '("My engine"
-                              "http://my.searchengine.com/?query=%s"
-                              nil))
-               (add-to-list 'w3m-uri-replace-alist
-                            '("\\`my:" w3m-search-uri-replace "My engine"))))
-
-     $B$3$l$K$h$j!"(B`my:foobar' $B$N$h$&$J(B URL $B$r;H$C$F!"$"$J$?$N8!:w%(%s%8(B
-     $B%s$G(B "foobar" $B$H$$$&8l$r8!:w$9$k$3$H$,$G$-$^$9!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Grouping URLs, Next: Weather Information, Prev: Using Search Engines, Up: Pretty Good Features
-
-$AR;$D$N(B URL $A$G$(Gno$AJ}$N%&%'%V%Z$B!<$A%8$r$(GKD$A$k(B
-=====================================
-
-Emacs-w3m $B$O(B "group URLs" $B$H$$$&!"J#?t$N<B:]$N(B URL $B$r0l$D$K$^$H$a$?FCJL(B
-$B$J(B URL $B$r07$&$3$H$,$G$-$^$9!#$=$N$h$&$J%0%k!<%W(B URL $B$r3+$/$H!"(B
-emacs-w3m $B$O0lEY$KJ#?t$N%Z!<%8$r3+$/$?$a$K!"$=$N%0%k!<%W$K4^$^$l$k$=$l(B
-$B$>$l$N(B URL $B$KBP$7$F0l$D$N%P%C%U%!$r3+$-$^$9!#(B
-
-$B%0%k!<%W(B URL $B$r:n$k$K$O!"3+$-$?$$$9$Y$F$N%Z!<%8$N%"%I%l%9$rC1$K%"%s%Q%5(B
-$B%s%I5-9f(B ("&") $B$G0l=o$K$7$F(B ($B$9$J$o$A7k9g$7$F(B)$B!"%0%k!<%W(B URL $B$rI=$9@\F,(B
-$B<-$N(B "group:" $B$rIU$1$l$PNI$$$N$G$9!#Nc$r5s$2$k$H!"(BGNU $B%W%m%8%'%/%H$N%[!<(B
-$B%`%Z!<%8(B `http://www.gnu.org/' $B$H(B Savannah $B%[!<%`%Z!<%8(B
-`http://savannah.nongnu.org/' $B$r8+$?$$$b$N$H$9$l$P!"%0%k!<%W(B URL $B$O<!$N(B
-$B$h$&$J$b$N$K$J$k$G$7$g$&!#(B
-
-`group:http://www.gnu.org/&http://savannah.nongnu.org/'
-
-$B$3$N9=J8$rF|>oE*$K;H$&$N$O$+$J$j?I$$$b$N$,$"$j$^$9$,!"Hs>o$KC;$$(B URL
-($BNc$($P%/%$%C%/%5!<%A(B URL$B!"(B*Note Quick Searching:: $B$r;2>H(B) $B$dHsBPOC7?$G(B
-$B;H$&>u67$G$O!"$3$N5!G=$O$*$*$$$KLrN)$D$G$7$g$&!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Weather Information, Next: Using Antenna, Prev: Grouping URLs, Up: Pretty Good Features
-
-$ACwHU$NLl$B5$$A$OGg$l$G$7$g$&(B
-========================
-
-
-
-
-File: emacs-w3m-ja.info, Node: Using Antenna, Next: Showing Directory Tree, Prev: Weather Information, Up: Pretty Good Features
-
-$A%"%s%F%J$r$(GZ/$A$jQ2$i$=$&(B
-======================
-
-$B%"%s%F%J$O%&%'%V%Z!<%8$NJQ2=$rDI@W$9$k$?$a$NF;6q$G$9!#%"%s%F%J$r;H$&$H!"(B
-$BFCDj$N%Z!<%8$,!"0JA0$K8+$?$H$-$+$i99?7$5$l$?$+$5$l$J$+$C$?$+$r!"<~4|E*(B
-$B$K%A%'%C%/$9$k$3$H$,$G$-$^$9!#(B
-
-$B$$$:$l$+$N(B emacs-w3m $B%P%C%U%!$G(B `A' $B$r;H$&$3$H$K$h$C$F!"%"%s%F%J$r;O$a(B
-$B$k$3$H$,$G$-$^$9!#$"$k$$$O!"FCJL$N(B URL `about://antenna/' $B$K9T$/$3$H$K(B
-$B$h$C$F$bF1$8$3$H$,$G$-$^$9!#(B
-
-* Menu:
-
-* Setting up Antenna::          $B%&%'%V%5%$%H$r%"%s%F%J$K2C$($k$K$O(B?
-* Daily web tracking::          $B%"%s%F%J$GJQ2=$rDI@W$9$k(B
-
-
-
-File: emacs-w3m-ja.info, Node: Setting up Antenna, Next: Daily web tracking, Prev: Using Antenna, Up: Using Antenna
-
-$A%&%'%V%5%$%H$r%"%s%F%J$K<S$($k$K$O(B?
------------------------------------
-
-$B8=$KI=<(Cf$N%&%'%V%Z!<%8$r%"%s%F%J$K2C$($k$K$O!"C1=c$K(B `+' $B%-!<$r2!$7$F(B
-$B$/$@$5$$!#$9$Y$F$N%U%#!<%k%I$,$9$G$K=q$-$3$^$l$F$$$k(B
-`w3m-antenna-sites' $B$r%+%9%?%^%$%:$9$k$?$a$N%P%C%U%!$,8=$l$k$G$7$g$&!#(B
-$B$"$J$?$OC1$K(B "Save for future sessions" $B$H(B "Finish" $B$N%\%?%s$r2!$;$PNI(B
-$B$$$N$G$9!#(B
-
-`+'
-     URL $B$r%"%s%F%J!&%G!<%?%Y!<%9$K2C$($^$9!#@\F,0z?tIU$-$G8F$P$l$?>l9g(B
-     $B$O!"8=:_$N%Z!<%8$rDI2C$9$k$N$G$O$J$/$F!"2C$($k(B URL $B$r?R$M$^$9(B
-     (`w3m-antenna-add-current-url')$B!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Daily web tracking, Prev: Setting up Antenna, Up: Using Antenna
-
-$A%"%s%F%J$G$(I+y$A;/$rW7$(Gfx$A$9$k(B
-------------------------
-
-$B%"%s%F%J!&%Z!<%8$K$OFs$D$N9`L\$,8=$l$^$9!#0l$D$O(B "Updated" $B$H8F$P$l!"$b(B
-$B$&0l$D$O(B "Visited" $B$H8F$P$l$^$9!#(B"Updated" $B$N9`L\$G$O:G8e$K%"%s%F%J$r99(B
-$B?7$7$?8e$GJQ2=$7$?%&%'%V%5%$%H$,!"$=$7$F(B "Visited" $B$N9`L\$G$OJQ2=$7$J$+$C(B
-$B$?%&%'%V%5%$%H$,8+$D$+$j$^$9!#$=$l$>$l$N9`L\$G!"3F9T$O%"%s%F%J!&%G!<%?(B
-$B%Y!<%9$N0l$D$N%&%'%V%5%$%H$rI=$7!"0J2<$N9=B$$K$J$C$F$$$^$9(B:
-
-`  * 2002/12/15 16:43  (T)  My website'
-
-$B:G=i$NItJ,$O!"%"%s%F%J$,:G8e$K$=$N%Z!<%8$NJQ2=$rJs9p$7$?!"$=$N%&%'%V%5(B
-$B%$%H$,99?7$5$l$?:G=*;~9o$G$9!#$^$?$O$=$N>pJs$,F@$i$l$J$$$3$H$b$"$j$^$9!#(B
-
-`(T)' $B$O(B "Time" $B$rI=$7!":G8e$K%"%s%F%J$r99?7$7$?8e$G!"$=$N%Z!<%8$NJQ99(B
-$B;~9o$,JQ2=$7$?$N$G!"JQ2=$,8!=P$5$l$?$3$H$r0UL#$7$^$9!#$b$&0l$D$N2DG=@-(B
-$B$,$"$kCM$O(B `S' ("Size" $B$N$3$H(B) $B$G!"$=$N%Z!<%8$N%5%$%:$,JQ2=$7$?$N$G!"JQ(B
-$B2=$,8!=P$5$l$?$3$H$r0UL#$7$^$9!#(B
-
-$B9T$N:G8e$NItJ,$O!"%G!<%?%Y!<%9$KDI2C$7$?$H$-$KM?$($?!"$3$N%&%'%V%5%$%H(B
-$B$N%?%$%H%k$G$9!#(B
-
-$B$I$&$+!"%"%s%F%J!&%G!<%?%Y!<%9$O<+F0E*$K99?7$5$l$J$$$3$H$KCm0U$7$F$/$@$5(B
-$B$$!#%"%s%F%J!&%Z!<%8$G(B `R' $B$rC!$/$+!"$^$?$O@\F,0z?t$r%3%^%s%I$KEO(B
-$B$9(B ($BNc$($P(B `C-u A' $B$G%"%s%F%J$r;O$a$k(B) $B$3$H$K$h$C$F!"%5%$%H$,JQ(B
-$B2=$7$?$+$I$&$+$r%A%'%C%/$7$?$$Kh$K!"$=$l$r99?7$7$J$1$l$P$J$j$^$;$s!#(B
-
-$B$b$7!"<+F0$G99?7$5$;$?$$$J$i!"JQ?t(B `w3m-antenna-refresh-interval' $B$K99(B
-$B?74V3V$rIC$G@_Dj$7$F$/$@$5$$!#(B
-
-`A'
-     $B%"%s%F%J$N%Z!<%8$K9T$-$^$9!#@\F,0z?tIU$-$G8F$P$l$?>l9g$O!"I=<($9$k(B
-     $BA0$K%"%s%F%J!&%G!<%?%Y!<%9$r99?7$7$^$9(B (`w3m-antenna')$B!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Showing Directory Tree, Next: Viewing Perl Documents, Prev: Using Antenna, Up: Pretty Good Features
-
-$A%G%#%l%/%H%j$ND>$(Gi,$ATl$r1mJ>$9$k(B
-==============================
-
-`w3m-dtree' $B%3%^%s%I$r;H$&$H!"%m!<%+%k%G%#%l%/%H%j$N$9$Y$F$N%5%V%G%#%l(B
-$B%/%H%j$NLZ9=B$$rI=<($7$F!"IaDL$N%&%'%V%Z!<%8$N$h$&$K1\Mw$9$k$3$H$,$G$-(B
-$B$^$9!#$3$N5!G=$r;H$C$?$H$-$K8=$l$k(B emacs-w3m $B$N%P%C%U%!$O!"$=$NL>A0$f$((B
-$B$K30It$N(B "tree" $B%W%m%0%i%`$N=PNO$KHs>o$KN`;w$7$?$b$N$K$J$j$^$9!#$5$i$K(B
-emacs-w3m $B$+$i$N%\!<%J%9(B: $B$3$N%3%^%s%I$r@\F,0z?tIU$-$G8F$V$H%U%!%$%k$b(B
-$BI=<($7!"(Bemacs-w3m $B$O40A4AuHw$N%U%!%$%k1\Mw4o$KJQ?H$7$^$9!#(B
-
-Emacs-w3m dtree $B$,$I$s$J$U$&$KF0:n$9$k$+$NNc$G$9(B:
-
-     /home/romain/.elisp/emacs-w3m/
-      |-CVS/
-      |-attic/
-      |  +-CVS/
-      |-autom4te.cache/
-      |-doc/
-      |  |-CVS/
-      |  +-emacs-w3m/
-      |-icons/
-      |  +-CVS/
-      |-patches/
-      |  +-CVS/
-      +-shimbun/
-         +-CVS/
-
-$B@\F,0z?t$rIU$1$k$H!"Be$o$j$K$3$s$J$U$&$K$J$j$^$9(B:
-
-     /home/romain/.elisp/emacs-w3m/ (allfiles)
-      |-(f).cvsignore
-      |-(f)BUGS.ja
-      |-(f)COPYING
-      |-[d]CVS/
-      |  |-(f)Entries
-      |  |-(f)Repository
-      |  +-(f)Root
-      |-(f)ChangeLog
-      |-(f)ChangeLog.1
-      |-(f)Makefile
-      |-(f)Makefile.in
-      |-(f)README
-      |-(f)README.ja
-
-`D' (Lynx-like $A%-$B!<$A%^%C%W(B)
-`T' (Info-like $A%-$B!<$A%^%C%W(B)
-     $B%_%K%P%C%U%!$G%m!<%+%k%G%#%l%/%H%j$NF~NO$r5a$a!"$=$NLZ9=B$$rI=<($7$^$9!#(B
-     $B@\F,0z?tIU$-$G8F$P$l$k$H(B ($BNc(B: `C-u D'$B!"$?$@(B
-     $B$7(B `Info-like' $B%-!<%^%C%W$N>l9g$O(B `C-u T')$B!"$=$N%G%#%l%/%H(B
-     $B%j$K$"$k%U%!%$%k$bI=<($7$^$9(B (`w3m-dtree')$B!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Viewing Perl Documents, Next: Using Namazu, Prev: Showing Directory Tree, Up: Pretty Good Features
-
-Perl $A$N%I%-%e%a%s%H$r$(GKD$A$k(B
-=========================
-
-
-
-
-File: emacs-w3m-ja.info, Node: Using Namazu, Next: Octet, Prev: Viewing Perl Documents, Up: Pretty Good Features
-
-Namazu $A$G%U%!%$%k$r$(I<D$AKw$9$k(B
-===========================
-
-emacs-w3m $B$O!"A4J88!:w%=%U%H(B Namazu $B$r;H$C$F%U%!%$%k$r8!:w$9$k$3$H$b$G(B
-$B$-$^$9(B (`w3m-namazu')$B!#$3$N5!G=$r;H$&$?$a$K$O!"(BNamazu $B$r0J2<$N>l=j$+$i(B
-$B<hF@$7$F!"%$%s%9%H!<%k$7$F$*$/I,MW$,$"$j$^$9(B:
-
-`http://namazu.org/'
-
-Namazu $B$r;H$&$?$a$K$O!"<B:]$K8!:w$r9T$&A0$K!"8!:wBP>]$H$J$k%U%!%$%k$K4^(B
-$B$^$l$F$$$kC18l$N:w0z(B ($B%$%s%G%C%/%9(B) $B$r:n@.$7$F$*$/I,MW$,$"$j$^$9!#$b$C(B
-$B$H$bE57?E*$J%3%^%s%I$O0J2<$NDL$j$G$9!#(B
-
-     % mknmz -O <$B%$%s%G%C%/%9$rCV$/%G%#%l%/%H%j(B> <$B%I%-%e%a%s%H$N$"$k%G%#%l%/%H%j(B>
-
-`w3m-namazu' $B$rF0$+$9A0$K!"$$$/$D$+$NJQ?t$r@_Dj$7$F$*$/I,MW$,$"$j$^$9!#(B
-$B0J2<$NJQ?t$r!";H$C$F$$$k4D6-$K$"$o$;$F@_Dj$7$F$/$@$5$$!#(B
-
-`w3m-namazu-index-alist'
-     $B%$%s%G%C%/%9$NJ]B8$5$l$F$$$k%G%#%l%/%H%j$NO"A[G[Ns$r@_Dj$7$^$9!#(B
-     `w3m-namazu' $B$G$O!"%$%s%G%C%/%9$NJ]B8$5$l$F$$$k%G%#%l%/%H%j$KBP$7(B
-     $B$F!"%G%#%l%/%H%jL>$h$j$bJ,$+$j$d$9$$JLL>$rDj5A$9$k$3$H$,$G$-$^$9!#(B
-     $B$^$?!"4v$D$+$NJL!9$N%$%s%G%C%/%9$r!"$"$?$+$bC10l$N%$%s%G%C%/%9$G$"(B
-     $B$k$+$N$h$&$K07$&$3$H$b$G$-$^$9!#$=$N$?$a$K$O!"<!$N$h$&$KJLL>$r%-!<(B
-     $B$H$7!"%$%s%G%C%/%9$NJ]B8$5$l$F$$$k%G%#%l%/%H%j(B ($B$N%j%9%H(B) $B$rCM$H$9(B
-     $B$kO"A[G[Ns$r(B `w3m-namazu-index-alist' $B$K@_Dj$7$^$9!#(B
-
-          (setq w3m-namazu-index-alist
-                '(("alias1" "Path/to/the/index/directory1")
-                  ("alias2" "Path/to/the/index/dir2"
-                            "Path/to/the/index/dir3")))
-
-`w3m-namazu-default-index'
-     $B8!:wBP>]$H$9$k%$%s%G%C%/%9$r;XDj$7$^$9!#<B:]$K%$%s%G%C%/%9$,J]B8$5$l$F$$(B
-     $B$k%G%#%l%/%H%j$d!"(B`w3m-namazu-index-alist' $B$r@_Dj$9$k$H$-$K;H$C$?JL(B
-     $BL>$,;H$($^$9!#CM$,(B `nil' $B$N>l9g$O!"(B
-     `M-x w3m-namazu <RET>' $B$H<B9T$9$k$?$S$K!"8!:wBP>]$H$9$k%$%s(B
-     $B%G%C%/%9$rLd$$9g$o$;$^$9!#(B
-
-$B$3$l$G=`Hw$,@0$$$^$7$?$+$i!"(B
-`M-x w3m-namazu <RET> query <RET>' $B$H$9$k$H!"J8;zNs(B query $B$r(B
-$B8!:w$9$k$3$H$,$G$-$^$9!#%G%U%)%k%H0J30$N%$%s%G%C%/%9$rBP>]$H$7$F8!:w$r9T(B
-$B$&>l9g$O!"(B`C-u M-x w3m-namazu' $B$H$$$&$h$&$KA0CV0z?t$r;XDj$7$F<B(B
-$B9T$7$^$9!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Octet, Next: Frame Local Buffers, Prev: Using Namazu, Up: Pretty Good Features
-
-application/octet-stream $A%G$B!<$A%?$r$(GKD$A$k(B
-=====================================
-
-($B:n@.Cf(B)
-
-$B0J2<$N@_Dj$r(B `~/.emacs' $B$K=q$$$F$*$/$H!"(B`octet-find-file' $B$G%U%!%$%k$r(B
-$B3+$$$?$H$-$KJXMx$+$bCN$l$^$;$s!#(B
-
-     (add-hook 'octet-find-file-hook 'view-mode)
-     (add-hook 'octet-find-file-hook 'w3m-minor-mode)
-
-
-
-File: emacs-w3m-ja.info, Node: Frame Local Buffers, Next: Session Manager, Prev: Octet, Up: Pretty Good Features
-
-$A6`J}$N%;%C%7%g%s$r%U%l$B!<$A%`$G%0%k$B!<$A%W7V$1$9$k(B
-============================================
-
-$BB??t$N(B emacs-w3m $B$N%;%C%7%g%s$r%0%k!<%WKh$KJL!9$N%U%l!<%`$KJ,3d$9$k$3$H(B
-$B$,$G$-$^$9!#Nc$($PFs$D$N(B emacs-w3m $B$N%U%l!<%`$rMQ0U$7$F!"0l$D$O8!:w%(%s(B
-$B%8%s72$r07$$!"$b$&0lJ}$G$O%K%e!<%9%5%$%H72$r07$&$h$&$J;H$$J}$G$9!#(B
-
-Emacs-w3m $B$O$?$/$5$s$N%Z!<%8$rF1;~$K8+$k$?$a$N$$$/$D$+$N5!G=$rDs6!$7$^(B
-$B$9!#Nc$($P!"$?$/$5$s$N%Z!<%8$r$=$l$>$l?7$7$$%;%C%7%g%s$H$7$FN)$A>e$2$k(B
-$B$?$a$K%?%V$r;H$C$?$j(B (*Note Using Tabs::)$B!"$^$?$O(B `group:' $B$G;O$^$kFCJL(B
-$B$J(B URL (*Note Grouping URLs::) $B$r;H$&$3$H$,$G$-$^$9!#$7$+$7!"$"$^$j$K$?(B
-$B$/$5$s$N%Z!<%8$,$"$k>l9g$O!"$=$l$i$rJL!9$N%U%l!<%`$G%0%k!<%WJ,$1$r$7$?(B
-$B$$$H;W$&$+$b$7$l$^$;$s!#$=$&$G$"$l$P!"(B`w3m-fb-mode' $B%3%^%s%I$O$"$J$?$N(B
-$B$?$a$N$b$N$G$9!#$?$@$7$=$l$r;H$&$?$a$K$O(B `w3m-use-tab' $BJQ?t$rHs(B-`nil'
-($B%G%U%)%k%H$G(B `t') $B$K!"(B`w3m-pop-up-frames' $BJQ?t$r(B `nil' ($B$=$l$,%G%U%)%k(B
-$B%H(B) $B$K@_Dj$7$F$*$+$J$1$l$P$J$j$^$;$s(B (*Note General Variables::)$B!#(B
-
-`M-x w3m-fb-mode' $B$r%?%$%W$9$k$H%b!<%I$,%H%0%k$K@Z$jBX$o$j$^$9$,!"(B
-$B@\F,0z?t$H$7$F$=$N%3%^%s%I$K@5$N@0?t$rM?$($k$3$H$K$h$C$F!"%b!<%I$r(B on $B$K(B
-$B$9$k$3$H$,$G$-$^$9(B ($B%<%m0J2<$G$O(B off $B$K$J$j$^$9(B)$B!#(B
-
-`w3m-fb-mode' $B$,(B on $B$K$J$C$F$$$k$H!"8=:_$N%U%l!<%`$G3+;O$7$?%;%C%7%g%s(B
-$B$O$=$N%U%l!<%`$@$1$K4XO"IU$1$i$l$^$9!#$=$7$FB>$N%U%l!<%`$G3+$$$?B>$N%;%C(B
-$B%7%g%s$O!"F1MM$K$=$l$i$N%U%l!<%`$@$1$K8=$l$^$9!#8@$$49$($k$H!"$"$k%U%l!<(B
-$B%`$K4XO"IU$1$i$l$?%;%C%7%g%s$OB>$N%U%l!<%`$K$O8=$l$^$;$s!#(B
-`w3m-fb-mode' $B$O?7$7$$%U%l!<%`$r:n$i$J$$$N$G!"$=$l$i$O2?$i$+$NJ}K!$G$"(B
-$B$J$?<+?H$,:n$kI,MW$,$"$j$^$9!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Session Manager, Prev: Frame Local Buffers, Up: Pretty Good Features
-
-$A%;%C%7%g%s$N1#4f$H$BFI$A$_$3$_(B
-==========================
-
-emacs-w3m $B$G$O%;%C%7%g%sAH$rJ]B8$7$?$jFI$_$3$s$@$j$9$k$3$H$,$G$-$^$9!#(B
-
-$B>-Mh;H$&$?$a$K!":#3+$$$F$$$k%;%C%7%g%sAH$rJ]B8$G$-$^$9!#(B`M-S' $B$r2!$7$F!"(B
-$B$=$N%;%C%7%g%s>pJs$KL>A0$r$D$1$F$/$@$5$$!#(B
-
-$B$=$&$9$k$H<!$O!"J]B8$7$?%;%C%7%g%sAH$rI|5"$7$?$/$J$k$H;W$$$^$9!#(B`M-s'
-$B$r2!$9$H%;%C%7%g%sA*Br%a%K%e!<$,3+$-$^$9!#$3$N%a%K%e!<$N%-!<%P%$%s%I$O(B
-$B0J2<$N$h$&$K$J$C$F$$$^$9!#(B
-
-`<RET>'
-     $BA*Br$5$l$F$$$k%;%C%7%g%sAH$K4^$^$l$k$9$Y$F$N%;%C%7%g%s$r3+$-$^$9!#(B
-
-`M-s'
-     $BA*Br$5$l$F$$$k%;%C%7%g%sAH$N>\:Y$J%a%K%e!<$r3+$-$^$9!#$3$l$r;H$C$F(B
-     $B%;%C%7%g%sAH$NCf$N%;%C%7%g%s$r0l$D$:$D3+$/$3$H$,$G$-$^$9!#(B
-
-`d'
-     $BA*Br$5$l$F$$$k%;%C%7%g%sAH!"$^$?$O%;%C%7%g%s$r:o=|$7$^$9!#(B
-
-`r'
-     $BA*Br$5$l$F$$$k%;%C%7%g%sAH$NL>A0$rJQ99$7$^$9!#(B
-
-`s'
-     $B8=:_3+$$$F$$$k$9$Y$F$N%;%C%7%g%s$rJ]B8$7$^$9!#(B`M-S' $B$HF1$8$G$9!#(B
-
-`n'
-     $B%+!<%=%k$r<!$N%;%C%7%g%sAH$KF0$+$7$^$9!#(B
-
-`p'
-     $B%+!<%=%k$rA0$N%;%C%7%g%sAH$KF0$+$7$^$9!#(B
-
-`q'
-     $B%;%C%7%g%sA*Br%a%K%e!<$r=*N;$7$^$9!#(B
-
-emacs-w3m $B$O%;%C%7%g%sAH$r<+F0E*$KJ]B8$9$k$3$H$,$G$-$^$9!#(B
-`w3m-session-deleted-save' $B$,(B non-`nil' $B$N;~!"(Bemacs-w3m $B$OJD$8$i$l$?%;%C(B
-$B%7%g%s$r<+F0E*$KJ]B8$7$^$9!#$3$l$O!"$&$C$+$j%;%C%7%g%s$rJD$8$F$7$^$C$?(B
-$B;~$J$I$KJXMx$G$7$g$&!#(B`w3m-session-automatic-save' $B$,(B non-`nil' $B$J$i$P!"(B
-emacs-w3m $B=*N;;~$K3+$$$F$$$?$9$Y$F$N%;%C%7%g%s$r<+F0E*$KJ]B8$7$^$9!#(B
-
-$B<+F0E*$KJ]B8$5$l$F$$$k%;%C%7%g%sAH$N$3$H$rK:$l$F$7$^$C$F!"$J$K$+$*$b$7(B
-$B$m$$%Z!<%8$N(B URL $B$rK:$l$F$7$^$&$H$$$&$3$H$,;~!9$"$j$^$9!#(Bemacs-w3m $B$O$3(B
-$B$&$$$&$3$H$rKI;_$9$k$3$H$,$G$-$^$9!#(B`w3m-session-load-last-sessions' $B$,(B
-`auto' $B$G$"$l$P!"(Bemacs-w3m $B$O<+F0E*$KA02s3+$$$F$$$?%;%C%7%g%s$?$A$rI|5"(B
-$B$7$^$9!#(B`w3m-session-load-last-sessions' $B$,(B `ask' $B$G$"$l$P!"(Bemacs-w3m
-$B$O$=$l$rI|5"$9$k$+$I$&$+$r$?$:$M$^$9!#(B($B%G%U%)%k%H$O(B `nil' $B$K$J$C$F$$$^(B
-$B$9!#(B)
-
-$B%/%i%C%7%e$G6l$$7P83$r$7$?$3$H$,$"$k$H;W$$$^$9!#(B $B%/%i%C%7%e$K$"$&$H$,$C(B
-$B$+$j$7$^$9$7!"8+$F$$$?%Z!<%8$,$I$3$+$bK:$l$F$7$^$$$^$9!#(B emacs-w3m $B$O$3(B
-$B$s$J>u67$G$b=u$1$F$/$l$^$9!#(B `w3m-session-crash-recovery' $B$,(Bnon-`nil'
-$B$J$i$P!"(B emacs-w3m $B$OI=<($7$F$$$k%;%C%7%g%sAH$r%/%i%C%7%eI|85MQ$K<+F0E*(B
-$B$KJ]B8$7!"%/%i%C%7%e$,5/$3$C$?;~$KJ]B8$7$F$$$?%;%C%7%g%sAH$rI|85$7$^$9!#(B
-($B%G%U%)%k%H$O(B `t' $B$K$J$C$F$$$^$9!#(B)
-`w3m-session-load-crashed-sessions' $B$,(Bnon-`nil' $B$G$"$l$P!"(Bemacs-w3m $B$O(B
-$B$3$NI|85$r<+F0E*$K9T$J$$$^$9!#(B`w3m-session-load-crashed-sessions' $B$,(B
-`ask' $B$G$"$l$P!"(Bemacs-w3m $B$OI|85$9$k$+$I$&$+$r$?$:$M$^$9!#(B ($B%G%U%)%k%H(B
-$B$O(B `ask' $B$K$J$C$F$$$^$9!#(B)
-
-
-
-File: emacs-w3m-ja.info, Node: Customizable Variables, Next: Hooking into MUAs, Prev: Pretty Good Features, Up: Top
-
-$A%G%U%)%k%H$N$^$^$G$b$(Ga8i,$AA<$$$HK<$&$1$l$I(B
-****************************************
-
-$B$?$/$5$s$N(B emacs-w3m $B$NJQ?t$,!"(BCustom $B$N;E3]$1$K$h$C$F%+%9%?%^%$%:$9$k$3(B
-$B$H$,$G$-$^$9!#(BCustom $B$OJQ?t$rDj5A$9$k$?$a$N!"(BEmacs $B$N%0%i%U%#%C%/!&%$%s(B
-$B%?!<%U%'!<%9$G$9!#(BCustom $B$K$O$$$/$D$+$N%+%9%?%^%$%:$N$?$a$N<jCJ$,$"$j!"(B
-$BNc$($PC10l$N%*%W%7%g%s(B ($B$9$J$o$A!"(BEmacs Lisp $BJQ?t(B) $B$N$?$a(B
-$B$N(B `M-x customize-option'$B!"$^$?$O$"$k(B "group" ($B$3$N>l9g$N%0%k!<(B
-$B%W$O(B `w3m') $B$KB0$9$k$9$Y$F$N%*%W%7%g%s(B ($BJQ?t$H%U%'!<%9(B) $B$r8+$F!"$+(B
-$B$DJQ99$9$k$?$a$N(B `M-x customize-group' $B$,;H$($^$9!#(B
-
-$B$"$k$$$O(B ($B$b$7(B Custom $B$r;H$$$?$/$J$$$N$G$"$l$P(B)$B!"G$0U$N(B Emacs Lisp $B<0$r(B
-emacs-w3m $B=i4|@_Dj%U%!%$%k$K=q$-9~$`$3$H$,$G$-$^$9!#%G%U%)%k%H$N%U%!%$(B
-$B%k$O(B `~/.emacs-w3m' $B$G$9!#Nc$($P!"(B
-
-     (setq w3m-home-page "http://emacs-w3m.namazu.org/")
-
-$B$3$l$O%G%U%)%k%H$N%[!<%`%Z!<%8$r(B `http://emacs-w3m.namazu.org/' $B$K@_Dj(B
-$B$7$^$9!#%7%s%?%C%/%9$O(B `.emacs' $B%U%!%$%k$HF1$8$G$9(B (*Note Init File:
-(emacs)Init File.)$B!#(B
-
-$B5$$rIU$1$J$1$l$P$$$1$J$$$N$O!"30It%b%8%e!<%k$GDj5A$5$l$F$$$k$$$/$D$+$N(B
-$BJQ?t$,(B `~/.emacs-w3m' $B%U%!%$%k$,FI$_9~$^$l$k$H$-$K$OL$Dj5A$G!"$=$l$i$r(B
-$BJQ99$G$-$J$$$+$b$7$l$J$$$3$H$G$9(B ($B$b$A$m$s!"%G%U%)%k%H$NCM$r5$$K$7$J$$(B
-$B$N$G$"$l$P!"(B`~/.emacs-w3m' $B%U%!%$%k$G40`z$K>e=q$-$7$F$7$^$&$3$H$O2DG=$J(B
-$B$N$G$9$1$l$I$M(B)$B!#JQ?t(B `w3m-search-engine-alist' $B$OE57?E*$JNc$G$9(B
-(*Note Search Variables::)$B!#(B
-
-`w3m-init-file'
-     Emacs-w3m $B$,5/F0$9$k$H!"(B`w3m-init-file' $B%U%!%$%k$rFI$_9~$_$^$9!#%G(B
-     $B%U%)%k%HCM$O(B `~/.emacs-w3m' $B$G$9!#$?$V$s!"$"$J$?$O$3$l$rJQ99$9$kI,(B
-     $BMW$OL5$$$G$7$g$&!#$3$l$OIaDL$N(B Emacs Lisp $B%U%!%$%k$G!"(B`~/.emacs'
-     $B$d(B `site-init' $B%U%!%$%k$r(B emacs-w3m $B4X78$N$b$N$GMp;($K$7$J$$$h$&$K(B
-     $B$9$k$?$a$K;H$&$3$H$,$G$-$^$9!#(BEmacs-w3m $B$O$3$l$HF1$8L>A0$K!"3HD%;R(B
-     `.elc' $B$H(B `.el' $B$,IU$$$F$$$k$b$N$b(B ($B8@$$49$($l$P!"(B
-     `~/.emacs-w3m.elc'$B!"(B`~/.emacs-w3m.el' $B$*$h$S(B `~/.emacs-w3m' $B$N=g$K(B)
-     $BD4$Y$^$9!#(B
-
-* Menu:
-
-* General Variables::           $B0lHLE*$JJQ?t(B
-* Image Variables::             $B2hA|$K4XO"$7$?JQ?t(B
-* Form Variables::              $B%U%)!<%`$K4XO"$7$?JQ?t(B
-* Cookie Variables::            $B%/%C%-!<$K4XO"$7$?JQ?t(B
-* Bookmark Variables::          $B%V%C%/%^!<%/$K4XO"$7$?JQ?t(B
-* Search Variables::            $B%&%'%V8!:w$K4XO"$7$?JQ?t(B
-* Weather Variables::           $BE75$M=Js$K4XO"$7$?JQ?t(B
-* Dtree Variables::             dtree $B$K4XO"$7$?JQ?t(B
-* Antenna Variables::           $B%"%s%F%J$K4XO"$7$?JQ?t(B
-* Perldoc Variables::           Perldoc $B$K4XO"$7$?JQ?t(B
-* Namazu Variables::            Namazu $B$K4XO"$7$?JQ?t(B
-* Octet Variables::             Octet $B$K4XO"$7$?JQ?t(B
-* Session Manager Variables::   $B%;%C%7%g%s%^%M!<%8%c$K4XO"$7$?JQ?t(B
-* Hooks::                       $B%U%C%/(B
-* Other Variables::             $B$=$NB>$NJQ?t(B
-
-
-
-File: emacs-w3m-ja.info, Node: General Variables, Next: Image Variables, Prev: Customizable Variables, Up: Customizable Variables
-
-$AR;0c5D$J$(I+y$AJ}(B
-============
-
-`w3m-accept-languages'
-     $B<u$1F~$l2DG=$J8@8l$rM%@hEY$K$h$j9_=g$KJB$Y$?$b%j%9%H!#%G%U%)%k%HCM(B
-     $B$O(B `w3m' $B$N@_Dj%U%!%$%k(B ($BDL>o$O(B `~/.w3m/config') $B$N(B
-     `accept_language' $B$N%(%s%H%j$K$h$C$F@_Dj$5$l$k!#(B
-
-`w3m-add-referer'
-
-     $B%j%U%!%i$NAw$j$+$?!#(B5$B$D$NA*Br;R$,$"$k!#(B
-
-       1. `nil': $B7h$7$F%j%U%!%i$rAw$i$J$$!#(B
-
-       2. `t': $B>o$K%j%U%!%i$rAw$k!#(B
-
-       3. `lambda': $B0\F085$N%Z!<%8$H0\F0@h$N%Z!<%8$NN>J}$,F1$8%5!<%P$K(B
-          $B$h$jDs6!$5$l$F$$$k;~$N$_%j%U%!%i$rAw$k!#(B
-
-       4. $BFs$D$N@55,I=8=$N%3%s%9!&%;%k(B: $B0\F085$N%Z!<%8$N(B URL $B$,(B 1$B$D$a$N@55,I=8=$K(B
-          $B%^%C%A$7!"$+$D!"(B2$B$D$a$N@55,I=8=$K%^%C%A$7$J$$>l9g$N$_%j%U%!%i$rAw$k!#(B
-          `nil' $B$,;XDj$5$l$k$H$9$Y$F$N(B URL $B$K%^%C%A$9$k!#(B
-
-       5. $B4X?t(B: URL $B$H%j%U%!%i$N(B 2$B$D$r0z?t$K$H$k4X?t$,(B non-`nil' $B$rJV$;(B
-          $B$P%j%U%!%i$rAw$k!#(B
-
-     $B%V%i%&%8%s%0MzNr$,1L$l$k$N$r?4G[$9$k$N$J$i!"(B`nil' $B$+(B `lambda' $B$K@_(B
-     $BDj$7$F$/$@$5$$!#$"$J$?$N%3%s%T%e!<%?$,HkL)$N%M%C%H%o!<%/$KB0$7$F$$(B
-     $B$k$N$J$i!"0J2<$N$h$&$K(B 2$B$D$N@55,I=8=$r@_Dj$7$F!"8D?M>pJs$,1L$l$k$N(B
-     $B$rKI$0$H$$$$$G$7$g$&(B:
-
-          (setq w3m-add-referer
-                '("\\`http:\"
-                  . "\\`http://\\([^./]+\\.\\)*example\\.net/"))
-
-`w3m-add-user-agent'
-     non-`nil' $B$J$i$P!"%j%/%(%9%H%X%C%@$K(B User-Agent $B$r4^$a$^$9!#(B
-     `w3m-user-agent' $B$NCM$,(B User-Agent $B$H$7$F;H$o$l$^$9!#(B
-
-`w3m-arrived-file'
-     $B1\Mw$7$?(B URL $B$N%G!<%?%Y!<%9$rJ]B8$9$k%U%!%$%kL>!#(B
-
-`w3m-auto-show'
-     non-`nil' $B$J$i$P%&%#%s%I%&$N?eJ?%9%/%m!<%k$rM-8z$K$9$k!#(Bpoint $B$,%&%#(B
-     $B%s%I%&$NN>C<$N30$K=P$?>l9g$K<+F0E*$K?eJ?%9%/%m!<%k$9$k$,!"(B
-     `truncate-lines' $B$,(B `nil' $B$J$i$P2?$b5/$3$i$J$$!#(B
-
-     $B$3$N5!G=$OFCDj$N(B emacs-w3m $B$N%3!<%I$N$_$G;H$o$l$k!#$9$J$o$A!"DL>o(B
-     `auto-hscroll-mode'$B!"(B`automatic-hscrolling'$B!"(B`auto-show-mode' $B$*$h(B
-     $B$S(B `hscroll-mode' $B$O$9$Y$F(B emacs-w3m $B$N%P%C%U%!$G$OL58z$K$J$k$@$m(B
-     $B$&!#(B
-
-`w3m-charset-coding-system-alist'
-     MIME charset $B$H%3!<%G%#%s%0%7%9%F%`$NO"A[G[Ns!#(Bcharset $B$H%3!<%G%#(B
-     $B%s%0%7%9%F%`$NN>J}$,%7%s%\%k$G$J$1$l$P$J$i$J$$!#(B
-
-`w3m-coding-system'
-     `w3m' $B%3%^%s%I$HDL?.$9$k$?$a$K;H$&%3!<%G%#%s%0%7%9%F%`$N%G%U%)%k%H(B
-     $BCM!#(B
-
-`w3m-coding-system-priority-list'
-     emacs-w3m $B$G;H$o$l$k%3!<%G%#%s%0%7%9%F%`$rM%@hEY$K$h$jJB$Y$?%j%9%H!#(B
-
-`w3m-command'
-     `w3m' $B%3%^%s%I$N<B9T%U%!%$%kL>!#$3$NCM$,(B nil $B$J$i$P:G=i$K(B
-     emacs-w3m $B$,B8:_$9$k(B `w3m'$B!"(B`w3mmee' $B$^$?$O(B `w3m-m17n' $B$r(B ($B$3$N=g(B
-     $BHV$K(B) `exec-path' $B%G%#%l%/%H%j$+$iC5:w$7$F$/$l$k$N$G!"DL>o$O$3$NCM(B
-     $B$r@_Dj$9$kI,MW$O$J$$!#(B
-
-     $BB>$N(B `w3m' $B%3%^%s%I$r;H$$$?$1$l$P!"(B.emacs $B$G$3$NCM$rL@<(E*$K@_Dj$9(B
-     $B$k$+!"%+%9%?%^%$%:$7$FJ]B8$7$F$/$@$5$$!#$3$N>l9g!"(BEmacs $B$H(B
-     emacs-w3m $B$r:F5/F0$7$J$1$l$P$$$1$^$;$s!#:#$N$H$3$m!"(B`w3m.elc' $B$rFI(B
-     $B$_$3$s$@8e$K(B `w3m' $B%3%^%s%I$NJQ99$r0BA4$K$9$Y$F$N(B emacs-w3m $B%W%m%0(B
-     $B%i%`$K9T$J$&$3$H$O$G$-$J$$$+$i$G$9!#(B
-
-`w3m-command-arguments'
-     `w3m' $B%3%^%s%I$N0z?t$N%G%U%)%k%HCM!#(B
-     `w3m-command-arguments-alist' $B$b;2>H$9$k$H$h$$!#(B
-
-`w3m-command-arguments-alist'
-     URL $B$K%^%C%A$9$k@55,I=8=$H(B `w3m' $B$KDI2C$GEO$5$l$k0z?t$H$NO"A[G[Ns!#(B
-     $B$3$NJQ?t$OFCDj$N%[%9%H$X$N@\B3$K%W%m%-%7$rMQ$$$k$J$I$N$3$H$K;H$o$l(B
-     $B$^$9!#:G=i$K%^%C%A$7$?MWAG$,E,MQ$5$l$^$9!#0J2<$K$I$N$h$&$K$3$NJQ?t(B
-     $B$r@_Dj$9$k$+$NNc$r<($7$^$9!#(B
-
-          (setq w3m-command-arguments-alist
-                '(;; Don't use the proxy server to visit local web pages.
-                  ("^http://\\([^/]*\\.\\)*your-company\\.com\\(/\\|$\\)"
-                   "-no-proxy")
-                  ;; Use the proxy server to visit any foreign urls.
-                  (""
-                   "-o" "http_proxy=http://proxy.your-company.com:8080/")))
-
-     $B$3$N(B 1$B$D$a$NMWAG$O!"%9%-!<%`$,(B `http' $B$G$"$j!"%[%9%HL>(B
-     $B$,(B `your-company.com' $B$G$"$k$+!"(B`.your-company.com' $B$G=*$o$k(B
-     $B$9$Y$F$N(B URL $B$K%^%C%A$7$^$9!#$3$l$i$N%[%9%H$K@\B3$9$k$N$K%W%m%-%7$OMQ$$$i(B
-     $B$l$^$;$s!#$"$J$?$,@55,I=8=$N=i?4<T$G$"$k$N$J$i!"(B
-     `w3m-no-proxy-domains' $B$rBe$o$j$K;H$C$F$/$@$5$$!#(B
-
-`w3m-command-environment'
-     $B%5%V%W%m%;%9$,7Q>5$9$k4D6-JQ?t$NO"A[G[Ns!#(B
-
-`w3m-confirm-leaving-secure-page'
-     non-`nil' $B$J$i$P!"%;%-%e%"$J%Z!<%8$r5n$k;~$K(B emacs-w3m $B$O3NG'$r5a(B
-     $B$a$^$9!#$3$NJQ?t$K$O(B non-nil $B$NCM$r(B *$(GZ0$A$/(B* $B$*$9$9$a$7$^$9!#$3$N%*(B
-     $B%W%7%g%s$r@Z$kA0$K(B *$A1X$:(B* $B$I$&$$$&$3$H$r$7$?$$$N$+$r40A4$KM}2r$7$F(B
-     $B$/$@$5$$!#%G%U%)%k%H$G$O!"(B`t' $B$K$J$C$F$$$^$9!#(B
-
-`w3m-content-type-alist'
-     $B%3%s%F%s%H%?%$%W$H@55,I=8=$HI=<($9$k$?$a$N%3%^%s%I$H%U%#%k%?$H$NO"(B
-     $BA[G[Ns!#$=$l$>$l$NMWAG$O!"0J2<$N%G!<%?$,9=@.$9$k%j%9%H$G$"$k!#(B
-
-       1. $B%3%s%F%s%H%?%$%W!#(B
-
-       2. URL $B$^$?$O%U%!%$%kL>$K%^%C%A$9$k@55,I=8=!#(B
-
-       3. $B%U%!%$%k$r1\Mw$9$k$?$a$NJ}K!!#0J2<$N;0$D$N<oN`$,;H$o$l$k$G$7$g(B
-          $B$&!#(B
-
-            a. $B1\Mw$9$k(B URL $B$r0z?t$K$H$k(B lisp $B$N4X?t!#(B
-            b. ("COMMAND" [ARG...]) -- "COMMAND" $B$O30It%3%^%s%I$G$"$j!"(B
-               ARG $B$O(B ($B$"$k$J$i$P(B) $B%3%^%s%I$KEO$90z?t$G$"$k!#(B`file' $B$H(B
-               `url' $B$N%7%s%\%k$r(B ARG $B$H$7$F;XDj$9$k$H!"$=$l$>$l1\Mw$9(B
-               $B$k%U%!%$%k$NFbMF$r4^$s$@%F%s%]%i%j%U%!%$%k$N%U%!%$%kL>$H!"(B
-               $B1\Mw$9$k(B URL $B$H$KCV49$($i$l$k!#(B
-            c. `nil' $B$J$i$P!"(BURL $B$r%m!<%+%k$N%U%!%$%k$K%@%&%s%m!<%I$7$^$9!#(B
-
-       4. `1. $A%3%s%F%s%H%?%$%W(B' $B$G;XDj$5$l$?$b$N$r>e=q$-$9$k%3%s%F%s%H(B
-          $B%?%$%W!#0J2<$NCM$bM-8z$G$9!#(B
-
-            a. URL $B$H(B CONTENT-TYPE $B$H(B CHARSET $B$N(B 3$B$D$N0z?t$r$H$j!"%3%s(B
-               $B%F%s%H%?%$%W$rJV$9(B Lisp $B4X?t!#(B
-            b. $B%3%s%F%s%H%?%$%W$r<($9J8;zNs!#(B
-            c. `nil' $B$J$i$P!"%3%s%F%s%H%?%$%W$r>e=q$-$7$J$$!#(B
-
-`w3m-correct-charset-alist'
-     $BFC<l$J(B MIME $BJ8;z%;%C%H$HI8=`$N(B MIME $BJ8;z%;%C%H$H$NO"A[G[Ns!#(B
-
-`w3m-db-history-display-size'
-     about://arived-db/ $B$G0lEY$KI=<($9$k(B URL $B$N:GBg?t!#(B
-
-`w3m-decoder-alist'
-     $B%(%s%3!<%I$N<oN`$H%G%3!<%@$H0z?t$H$NO"A[G[Ns!#(B
-
-`w3m-default-coding-system'
-     URL $BJ8;zNs$H(B POST $B$5$l$k%G!<%?$H$r%(%s%3!<%I$9$k$N$K%G%U%)%k%H$G;H(B
-     $B$o$l$k%3!<%G%#%s%0%7%9%F%`!#(B
-
-`w3m-default-content-type'
-     $B%m!<%+%k$N%U%!%$%k$r;2>H$9$k;~$K%G%U%)%k%H$G;H$o$l$k%3%s%F%s%H%?%$(B
-     $B%W!#(B
-
-`w3m-default-directory'
-     emacs-w3m $B$N%P%C%U%!$K$*$$$F!"8=:_$N%G%#%l%/%H%j$H$7$F;H$o$l$k%G%#(B
-     $B%l%/%H%j!#B8:_$9$k%G%#%l%/%H%j$r<($9J8;zNs!"$=$NCM$,B8:_$9$k%G%#%l(B
-     $B%/%H%j$r<($9%7%s%\%k!"(Burl $B$r0z?t$K$H$j%G%#%l%/%H%j$rJV$94X?t!"$b$7(B
-     $B$/$O(B `nil' ($B%G%U%)%k%HCM(B)$B$,M-8z$JCM$H$J$j$^$9!#;XDj$5$l$?%G%#%l%/(B
-     $B%H%j$,B8:_$7$J$$>l9g$d!"(B`nil' $B$,;XDj$5$l$?>l9g$O(B
-     `w3m-profile-directory' $B$NCM$,;H$o$l$^$9!#(B
-
-     $BNc30(B: $B%m!<%+%k$N%U%!%$%k$d!"%j%b!<%H$N%U%!%$%k$r(B ftp $B$G%"%/%;%9$7(B
-     $B$F$$$k>l9g$O$=$N%U%!%$%k$N%G%#%l%/%H%j$,8=:_$N%G%#%l%/%H%j$H$7$F;H(B
-     $B$o$l$^$9!#(B
-
-`w3m-default-save-directory'
-     $B%@%&%s%m!<%I$7$?%U%!%$%k$,%G%U%)%k%H$GJ]B8$5$l$k%G%#%l%/%H%j!#(B
-
-`w3m-delete-duplicated-empty-lines'
-     non-`nil' $B$J$i$PFs9T0J>e$NO"B3$7$?6uGr9T$r0l9T$K$^$H$a$k!#(B
-
-`w3m-dirlist-cgi-program'
-     $B%m!<%+%k$N%G%#%l%/%H%jNs5s$9$k$N$K;H$o$l$k(B CGI $B%W%m%0%i%`$NL>A0!#(B
-     `nil' $B$J$i$P!"(B`w3m' $B%3%^%s%I$N(B dirlist.cgi $B$N%b%8%e!<%k$,;H$o$l$k!#(B
-
-`w3m-doc-view-content-types'
-     $B%U%!%$%k$r1\Mw$9$k$N$K(B `doc-view-mode' $B$r;H$&%3%s%F%s%H%?%$%W$N%j(B
-     $B%9%H!#$3$NJQ?t$O(B `w3m-content-type-alist' $B$NCM$r>e=q$-$9$k!#(B
-
-`w3m-edit-function'
-     $B%m!<%+%k$N%U%!%$%k$rJT=8$9$k$?$a$N4X?t!#(B`w3m-edit-current-url' $B$^(B
-     $B$?$O(B `w3m-edit-this-url' $B$N%3%^%s%I$,8F$P$l$?;~$K;H$o$l$^$9!#(B
-
-`w3m-edit-function-alist'
-     $B%Z!<%8$rJT=8$9$k$?$a$K;H$&4X?t$NO"A[G[Ns!#$3$N%*%W%7%g%s$O!"(B
-     `w3m-edit-current-url' $B$d(B `w3m-edit-this-url' $B$N%3%^%s%I$,8F$P$l$?(B
-     $B;~$K$I$N4X?t$G$=$N%Z!<%8$rJT=8$9$k$+$r7h$a$k$N$K;H$o$l$^$9!#$3$NO"(B
-     $BA[G[Ns$+$iE,Ev$J4X?t$,8+$D$+$i$J$1$l$P!"(B`w3m-edit-function' $B$,;H$o(B
-     $B$l$^$9!#(B
-
-`w3m-enable-google-feeling-lucky'
-     non-`nil' $B$J$i$P!"(Burl $B$H$7$F$I$s$JC18l$bF~NO$9$k$3$H$,$G$-$k$h$&$K(B
-     $B$J$j$^$9!#$=$N>l9g!"(Bemacs-w3m $B$O(B Google $B$r;H$C$F$=$N8@MU$r8!:w$7$^(B
-     $B$9!#%G%U%)%k%H$G$O(B `t' $B$G$9!#(B
-
-`w3m-encoding-type-alist'
-     $B%U%!%$%k$N3HD%;R$H%U%!%$%k$N%(%s%3!<%I$N<oN`$H$NO"A[G[Ns!#(B
-
-`w3m-file-coding-system'
-     $B@_Dj%U%!%$%k$r=q$/$?$a$K;H$o$l$k%3!<%G%#%s%0%7%9%F%`!#$3$NJQ?t$O(B
-     `w3m-save-list' $B4X?t$G;H$o$l$^$9!#(B
-
-`w3m-file-name-coding-system'
-     emacs-w3m $B$,%U%!%$%k$K%"%/%;%9$9$k;~$K!"%Q%9L>$rJQ49$9$k@h$N%3!<%G%#(B
-     $B%s%0%7%9%F%`!#(B
-
-`w3m-fill-column'
-     emacs-w3m $B$N%P%C%U%!$G(B `fill-column' $B$H$7$F;H$o$l$k?t;z!#@5$NCM$J(B
-     $B$i$P!"%Z!<%8$,$=$N7e?t$GI=<($5$l$k!#(B0 $B$+Ii$NCM$J$i$P!"%&%#%s%I%&$N(B
-     $BI}$+$i$=$N?t;z$r$,%Z!<%8$N:GBgI}$H$7$F;H$o$l$k!#(BXEmacs $B$G$O$3$N@_(B
-     $BDj$,>o$KF/$/$o$1$G$O$J$$$H$$$&$3$H$KCm0U$7$F$/$@$5$$!#(B
-
-`w3m-follow-redirection'
-     emacs-w3m $B$,%j%@%$%l%/%H$rB:=E$7%j%@%$%l%/%H@h$rDI$$$+$1$k:GBg?t!#(B
-     `nil' $B$J$i$P!"(B`w3m' $B%3%^%s%I$,%j%@%$%l%/%H$r=hM}$7$^$9!#%/%C%-!<$,(B
-     $B%j%@%$%l%/%H$5$l$k%Z!<%84V$G6&M-$5$l$k$3$H$,$"$j$&$k$N$G!"%/%C%-!<(B
-     $B$r5v2D$9$k$J$i$P(B ($B$D$^$j!"(B`w3m-use-cookies' $B$r(B non-`nil' $B$K$7$F$$(B
-     $B$k$J$i$P(B)$B!"$3$NJQ?t$r(B `nil' $B$K$7$J$$$G$/$@$5$$!#(B
-
-`w3m-home-page'
-     emacs-w3m $B$,5/F0$7$?;~$K3+$/(B URL $B$NJ8;zNs$r;XDj$7$^$9!#K?2q<R$NN,(B
-     $B>N$K$J$C$A$c$$$^$9$+$i(B HP $B$H$O8@$o$J$$$G$/$@$5$$$M!#(B
-
-`w3m-horizontal-scroll-columns'
-     $B%&%#%s%I%&$r?eJ?%9%/%m!<%k$9$k;~$K!"%9%/%m!<%k$9$kJ8;z?t!#(B
-
-`w3m-horizontal-scroll-division'
-     $B%+!<%=%k0LCV$,$-$A$s$HI=<($5$l$k$h$&$K$9$k$N$K;H$o$l$k?t;z!#(B
-     emacs-w3m $B$N%P%C%U%!$G%"%s%+!<$d%U%)!<%`$r0\F0$7$F$$$F%+!<%=%k$,%&%#(B
-     $B%s%I%&$N30$K=P$F$7$^$C$F$b%+!<%=%k$,8+$D$+$i$J$/$J$k$3$H$O7h$7$F$"(B
-     $B$j$^$;$s!#(B
-
-     $B$3$NJQ?t$NCM$r(B N $B$H$7$^$9!#%+!<%=%k$,%&%#%s%I%&$N:8$K=P$F$7$^$&$H(B
-     emacs-w3m $B$O%&%#%s%I%&$r%9%/%m!<%k$7!"%+!<%=%k$,%&%#%s%I%&$N:8$+$i(B
-     $B%&%#%s%I%&$NI}$N(B 1/N $B$N=j$KCV$+$l$k$h$&$K$7$^$9!#F1MM$K%+!<%=%k$,(B
-     $B%&%#%s%I%&$N1&$+$i=P$F$7$^$&$H!"(Bemacs-w3m $B$O%&%#%s%I%&$r%9%/%m!<%k(B
-     $B$7!"%+!<%=%k$,%&%#%s%I%&$N1&$+$i%&%#%s%I%&$NI}$N(B 1/N $B$N=j$KCV$+$l(B
-     $B$k$h$&$K$7$^$9!#(B
-
-     `w3m-auto-show' $B$,(B `nil' $B$J$i$P$3$N5!G=$OF0$-$^$;$s!#CM$O(B 1 $B$h$j$b(B
-     $BBg$-$$@0?t$G$J$1$l$P$$$1$^$;$s!#(B
-
-`w3m-horizontal-shift-columns'
-     $B%&%#%s%I%&$r(B shifting $B$9$k;~$K!"%9%/%m!<%k$9$kJ8;z?t!#(B`shifting'
-     $B$H$$$&$N$O!"%9%`!<%:$J%9%/%m!<%k$r0UL#$7$^$9!#(B
-
-`w3m-imitate-widget-button'
-     non-`nil' $B$J$i$P!"%j%s%/(B ($B%"%s%+!<(B) $B%\%?%s$G%&%#%8%'%C%H$N%\%?%s$N(B
-     $BF0:n$r$7$^$9!#$3$l$O(B `<TAB>' $B$r;H$C$F(B Gnus $B$N5-;v%P%C%U%!$NCf$r0\(B
-     $BF0$9$k$N$KJXMx$G$9!#??56CM$rJV$9(B Lisp $B4X?t$r@_Dj$9$k$3$H$b$G$-$^$9!#(B
-
-`w3m-init-file'
-     Your emacs-w3m startup file name.  If a file with the `.el' or
-     `.elc' suffixes exists, it will be read instead.
-
-     Note: This file is used as the startup configuration *NOT* for
-     the `w3m' command but for emacs-w3m.  In order to modify
-     configurations for the `w3m' command, edit the file named
-     `~/.w3m/config' normally.
-
-`w3m-input-coding-system'
-     Coding system used when writing to `w3m' processes.  It overrides
-     `coding-system-for-write' if it is not `binary'.  Otherwise, the
-     value of the `w3m-current-coding-system' variable is used
-     instead.
-
-`w3m-keep-arrived-urls'
-     Maximum number of URLs which the arrived URLs database keeps.
-
-`w3m-keep-cache-size'
-     Maximum number of pages to be cached in emacs-w3m.
-
-`w3m-key-binding'
-     Type of key binding set used in emacs-w3m sessions.  The valid
-     values include `info' which provides `Info-like' keys, and `nil'
-     which provides `Lynx-like' keys.
-
-`w3m-language'
-     Your preferred language used in emacs-w3m sessions.
-
-`w3m-local-directory-view-method'
-     Symbol of the method to view a local directory tree.  The valid values
-     include `w3m-cgi' using the CGI program specified by the
-     `w3m-dirlist-cgi-program' variable (which see), and
-     `w3m-dtree' using the w3m-dtree Lisp module.
-
-`w3m-local-find-file-function'
-     Function used to open local files.  If a url of the `file:'
-     scheme in which you entered agrees with the rule of the
-     `w3m-local-find-file-regexps' variable (which see), it is used to
-     open the file.
-
-     Function should take one argument, the string naming the local
-     file.  It can also be any Lisp form returning a function.  Set
-     this to `nil' if you want to always use emacs-w3m to see local
-     files.
-
-`w3m-local-find-file-regexps'
-     `Cons' of two regexps matching and not matching with local file
-     names.  If a url of the `file:' scheme in which you entered
-     matches the first form and does not match the latter form, it
-     will be opened by the function specified by the
-     `w3m-local-find-file-function' variable.  `Nil' for the regexp
-     matches any file names.
-
-     For instance, the value `(nil . "\\.html?\\'")' allows
-     `file:///some/where/w3m.el', not `file:///any/where/index.html',
-     to open by the function specified by
-     `w3m-local-find-file-function'.  The latter will be opened as a
-     normal web page.  Furthermore, if you would like to view some
-     types of contents in the local system using the viewers specified
-     by the `w3m-content-type-alist' variable, you can add regexps
-     matching those file names to the second element of this variable.
-     For example:
-
-          (setq w3m-local-find-file-regexps
-                '(nil . "\\.\\(?:[sx]?html?\\|dvi\\|ps\\|pdf\\)\\'"))
-
-     It is effective only when the `w3m-local-find-file-function'
-     variable is set properly.
-
-`w3m-mailto-url-function'
-     Function used to handle the `mailto' urls.  Function is called
-     with one argument, just a url.  If it is `nil', a function
-     specified by the `mail-user-agent' variable will be used for
-     composing mail messages.
-
-`w3m-mailto-url-popup-function-alist'
-     Alist of `(MAJOR-MODE . FUNCTION)' pairs used to pop a mail
-     buffer up.  If a user clicks on a `mailto' url and a mail buffer
-     is composed by `mail-user-agent' with the `MAJOR-MODE',
-     `FUNCTION' will be called with a mail buffer as an argument.
-     Note that the variables `special-display-buffer-names',
-     `special-display-regexps', `same-window-buffer-names' and
-     `same-window-regexps' will be bound to `nil' while popping to a
-     buffer up.
-
-`w3m-make-new-session'
-     Non-`nil' means making new emacs-w3m buffers when visiting new
-     pages.  If it is non-`nil' and there are already emacs-w3m
-     buffers, the `w3m' command makes a new emacs-w3m buffer if a user
-     specifies a url string in the minibuffer, and the
-     `w3m-safe-view-this-url' command also makes a new buffer if a
-     user invokes it in a buffer not being running the `w3m-mode'.
-     The default value is `nil'.
-
-`w3m-mbconv-command'
-     Name of the `mbconv' command provided by the `libmoe' package.
-     The `libmoe' package is used when you use the `w3mmee' command
-     instead of the `w3m' command.  See also `w3m-command'.
-
-`w3m-no-proxy-domains'
-     List of domain names for which emacs-w3m will not use a proxy
-     server.  Each element should be exactly a domain name which means
-     the latter common part of the host names, not a regexp.
-
-`w3m-output-coding-system'
-     Coding system used when reading from `w3m' processes.
-
-`w3m-pop-up-frames'
-     Non-`nil' means pop to a new frame up for an emacs-w3m session.
-     This variable is similar to `pop-up-frames' and does override
-     `w3m-pop-up-windows'.  If `w3m-use-tab' is non-`nil' or there is
-     the buffers selection window (for the `w3m-select-buffer'
-     feature), this variable is ignored when creating the second or
-     more emacs-w3m session.
-
-`w3m-pop-up-windows'
-     Non-`nil' means split the windows when a new emacs-w3m session is
-     created.  This variable is similar to `pop-up-windows' and quite
-     overridden by `w3m-pop-up-frames' as if `pop-up-frames'
-     influences.  Furthermore, if `w3m-use-tab' is non-`nil' or there
-     is the buffers selection window (for the `w3m-select-buffer'
-     feature), this variable is ignored when creating the second or
-     more emacs-w3m session.
-
-`w3m-popup-frame-parameters'
-     Alist of frame parameters used when creating a new emacs-w3m
-     frame.  It allows not only the alist form but also XEmacs' plist
-     form.
-
-`w3m-prefer-cache'
-     Non-`nil' means that cached contents are used without checking
-     headers.
-
-`w3m-profile-directory'
-     Directory where emacs-w3m config files are loaded from or saved
-     to.
-
-`w3m-quick-start'
-     Non-`nil' means let emacs-w3m start quickly w/o requiring
-     confirmation.  When you invoke the `w3m' command, it attempts to
-     visit the page of a string like url around the cursor or the
-     value of `w3m-home-page'.  You won't be asked for the
-     confirmation then if this value is non-`nil'.  Otherwise, you
-     will be prompted for that url with the editing form.
-
-`w3m-redirect-with-get'
-     If non-`nil', use the GET method after redirection.  It controls
-     how emacs-w3m works when a server responds the code 301 or 302.
-     Here is an extract from RFC2616:
-
-     Note: RFC 1945 and RFC 2068 specify that the client is not
-     allowed to change the method on the redirected request.  However,
-     most existing user agent implementations treat 302 as if it were
-     a 303 response, performing a GET on the Location field-value
-     regardless of the original request method.
-
-`w3m-relationship-estimate-rules'
-     Rules to estimate relationships between a retrieved page and
-     others.
-
-`w3m-select-buffer-horizontal-window'
-     Non-`nil' means split windows horizontally to open the selection
-     window.
-
-`w3m-select-buffer-window-ratio'
-     The percentage of the selection window to the whole frame.  The
-     car is used when splitting windows horizontally and the cdr is
-     for splitting windows vertically.
-
-`w3m-show-decoded-url'
-     Non-`nil' means show decoded URIs in the echo area, the balloon,
-     etc.  This variable can take one of the following five kinds of
-     forms:
-
-       1. t
-
-          Decode URIs using the encoding guessed from the value of
-          `w3m-coding-system-priority-list'.
-
-       2. Coding system
-
-          Decode URIs using this value.
-
-       3. List of coding systems
-
-          Decode URIs using the encoding assumed based on this list.
-
-       4. Alist of predicates and forms described below:
-
-          Each element looks like the `(PREDICATE . ENCODING)' form.
-          `PREDICATE' should be a regexp, a function or a Lisp form,
-          and `ENCODING' should be one of the forms described here
-          excluding this form.  If `PREDICATE' is a regexp, it will be
-          tested whether it matches to the target url.  If it is a
-          function, it will be called with the target url.  If it is a
-          Lisp form, it will be simply evaluated.  Elements are tested
-          in turn until the result of the test of the predicate is
-          true and the encoding which is associated to the predicate
-          is used for decoding URIs.
-
-       5. nil
-
-          Don't decode URIs.
-
-`w3m-use-title-buffer-name'
-     Non-`nil' means use name of buffer included current title.
-
-`w3m-show-error-information'
-     Non-`nil' means show an error information as a web page.  Page is
-     made when the foreign server doesn't respond to a request to
-     retrieve data.
-
-`w3m-space-before-favicon'
-     String of space char(s) to be put in front of favicon in the
-     mode-line.  It may be better to use two or more spaces if you are
-     using oblique or italic font in the modeline.
-
-`w3m-space-before-modeline-icon'
-     String of space character(s) to be put in front of the modeline
-     icon.  It may be better to use one or more spaces if you are
-     using oblique or italic font in the modeline.
-
-`w3m-terminal-coding-system'
-     Default coding system used when writing to `w3m' processes.  It
-     is just a default value to set process' coding system initially.
-     (This variable name is analogically derived from the behavior of
-     the `w3m' command which accepts data from Emacs just like reads
-     from the terminal.)
-
-`w3m-touch-command'
-     Name of the executable file of the touch command.  Note that the
-     command is required to be able to modify file's timestamp with
-     the `-t' option.
-
-`w3m-track-mouse'
-     Whether to track the mouse and message the url under the mouse.
-     See also `show-help-function' if you are using GNU Emacs.
-
-     A tip for XEmacs users:
-
-     You can also use the `balloon-help' feature by the
-     `M-x balloon-help-mode' command with arg 1.  If the window
-     manager decorates the balloon-help frame, and that is not to your taste,
-     you may strip it off with the following directives:
-
-          For ol[v]wm use this in .Xdefaults:
-             olvwm.NoDecor: balloon-help
-               or
-             olwm.MinimalDecor: balloon-help
-
-          For fvwm version 1 use this in your .fvwmrc:
-             NoTitle balloon-help
-          or
-             Style "balloon-help" NoTitle, NoHandles, BorderWidth 0
-
-          For twm use this in your .twmrc:
-             NoTitle { "balloon-help" }
-
-     See the `balloon-help.el' file for more information.
-
-`w3m-uri-replace-alist'
-     Alist of regexps matching URIs, and some types of replacements.
-     It can be used universally to replace URI strings in the local
-     rule to the valid forms in the Internet.
-
-     Each element looks like the `(REGEXP FUNCTION OPTIONS...)' form.
-     `FUNCTION' takes one or more arguments, a uri and `OPTIONS'.  You
-     can use the grouping constructs `\\(...\\)' in `REGEXP', and they
-     can be referred by the `\N' forms in a replacement (which is one
-     of `OPTIONS').
-
-     Here are some predefined functions which can be used for those
-     ways:
-
-     `w3m-pattern-uri-replace'
-          Replace a URI using PATTERN (which is just an `OPTION').  It
-          is allowed that PATTERN contains the `\N' forms in the same
-          manner of `replace-match'.
-
-     `w3m-search-uri-replace'
-          Generate valid URLs to query words on some specified search
-          engines.  For example, the element
-
-               ("\\`gg:" w3m-search-uri-replace "google")
-
-          makes it possible to replace the URI `gg:emacs' to a query
-          for the word `emacs' on the Google search engine.
-
-`w3m-url-local-directory-alist'
-     Alist of URLs and local directories.  If directory names of a
-     given URL and the car of an element are the same, emacs-w3m
-     assumes that the file exists in the local directory where the cdr
-     of an element points to.  The default value will be set to a
-     value of the `yahtml-path-url-alist' variable which exchanged the
-     car and the cdr in each element if it is available.
-
-`w3m-use-ange-ftp'
-     Non-`nil' means that `ange-ftp' or `efs' is used to access FTP
-     servers.
-
-`w3m-use-cygdrive'
-     If non-`nil', use the `/cygdrive/' rule when performing
-     `expand-file-name'.
-
-`w3m-use-filter'
-     Non-`nil' means use filter programs to convert web contents.  See
-     also `w3m-filter-rules' (the `w3m-filter.elc' module provides
-     it but might have never been loaded.  In that case, to see the default
-     value and the documentation of `w3m-filter-rules', type
-     `M-x load-library <RET> w3m-filter <RET>').
-
-`w3m-use-form'
-     Non-`nil' means make it possible to use form
-     extensions. *(EXPERIMENTAL)*
-
-`w3m-submit-form-safety-check'
-     Non-`nil' means ask you for confirmation when submitting a form.
-     The default value is `nil'.
-
-`w3m-use-header-line'
-     Non-`nil' means display the header line.
-
-`w3m-use-header-line-title'
-     Non-`nil' means display the current title at the header
-     line. This variable is effective only when `w3m-use-tab' is
-     `nil'.
-
-`w3m-use-mule-ucs'
-     Non-`nil' means use the multi-script support with Mule-UCS.
-
-`w3m-use-refresh'
-     Non-`nil' means honor the REFRESH attribute in META tags.
-     Emacs-w3m arbitrarily takes you to a url specified by that
-     attribute.  Note that they may be malicious traps.
-
-`w3m-refresh-minimum-interval'
-     history-back, history-next $B$G%Z!<%8$r8+$?;~$K:GDc8B(B refresh $B$rBT$D(B
-     $BIC?t!#(B
-
-`w3m-use-symbol'
-     Non-`nil' means replace symbols that the `<_SYMBOL>' tags lead
-     into.  It is meaningful only when the `w3m-m17n' command is used
-     and (X)Emacs handles unicode charsets.
-
-`w3m-menu-on-forefront'
-     Non-`nil' means place the emacs-w3m menus on the forefront of the
-     menu bar.  The default value is `nil'.
-
-`w3m-use-tab'
-     Non-`nil' means make emacs-w3m a tab browser.  It makes it possible
-     to show all emacs-w3m buffers in a single window with the tabs line, and
-     you can choose one by clicking a mouse on it.  See also
-     `w3m-use-tab-menubar'.
-
-`w3m-use-tab-menubar'
-     Non-`nil' means use the TAB pull-down menu in the menubar.  It
-     makes it possible to show all emacs-w3m buffers in a single
-     window, and you can choose one by clicking a mouse on it.  This
-     feature requires that Emacs has been built to be able to display
-     multilingual text in the menubar if you often visit web sites
-     written in non-ascii text.  See also `w3m-use-tab'.
-
-`w3m-use-toolbar'
-     Non-`nil' activates toolbar of `w3m'.
-
-`w3m-user-agent'
-     String used for the User-Agent field.  See also
-     `w3m-add-user-agent'.
-
-`w3m-new-session-in-background'
-     Say whether not to focus on a new tab or a new session in target.
-     It influences only when a new emacs-w3m buffer is created.
-
-`w3m-do-cleanup-temp-files'
-     $BHs(B`nil' $B$J$i$P!"(B emacs-w3m $B$O<+F0E*$K:o=|$7$=$3$J$C$?0l;~%U%!%$%k(B
-     $B$r:o=|$7$^$9!#(B $B%G%U%)%k%H$O(B `nil' $B$G$9!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Image Variables, Next: Form Variables, Prev: General Variables, Up: Customizable Variables
-
-$A;-Oq$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B
-==================
-
-`w3m-default-display-inline-images'
-     $BHs(B`nil' $B$J$i$P!"%$%s%i%$%s2hA|$r(B emacs-w3m $B$N%P%C%U%!$KI=<($7$^$9!#(B
-     $B2hA|I=<($N(B ON/OFF $B$O(B `w3m-toggle-inline-images' $B$G@Z$jBX$($i$l$^$9!#(B
-     `w3m-toggle-inline-images-permanently' $B$b;2>H$7$F$/$@$5$$!#(B
-
-`w3m-favicon-cache-expire-wait'
-     $B<hF@$+$i$3$NJQ?t$G;XDj$5$l$?IC?t0J>e7P2a$7$?%-%c%C%7%e$O:o=|$5$l$^(B
-     $B$9!#$3$NJQ?t$,(B `nil' $B$J$i$P!":o=|$5$l$k$3$H$O$"$j$^$;$s!#(B
-
-`w3m-favicon-cache-file'
-     favicon $B$N%-%c%C%7%e$rJ]B8$9$k%U%!%$%kL>!#%G%U%)%k%H$O!"JQ?t(B
-     `w3m-profile-directory' $B$G;XDj$5$l$?%G%#%l%/%H%j2<$N(B `.favicon' $B$H(B
-     $B$$$&L>A0$N%U%!%$%k$G$9!#(B
-
-`w3m-favicon-size'
-     favicon $B$N%5%$%:!#$3$NCM$O!"(B`convert' $B$X$N(B geometry $B0z?t$H$7$F;H$o(B
-     $B$l$^$9!#(B
-
-`w3m-favicon-type'
-     favicon $B$rI=<($9$k$N$K;H$o$l$k2hA|$N<oN`!#(B
-
-`w3m-favicon-use-cache-file'
-     $BHs(B`nil' $B$J$i$P!"(Bfavicon $B$N%-%c%C%7%e%U%!%$%k$r;H$$$^$9!#(B
-
-`w3m-favicon-default-background'
-     favicon $B2hA|$NF)2a?'$H$7$F;H$o$l$k?'$NL>A0!#(B`nil' $B$G$"$l$P!"(BEmacs
-     $B$N%U%l!<%`$NGX7J?'$r;H$&!#6uJ8;z$OFCJL$G!"%X%C%@%i%$%s$+%b!<%I%i%$(B
-     $B%s$+$N(B favicon $B$,I=<($5$l$F$$$k$[$&$NGX7J?'$KCV49$($i$l$k!#$3$NJQ(B
-     $B?t$O!"(BEmacs 22 $B0J>e$G$7$+8zNO$r;}$?$J$$$3$H$KCm0U!#(B
-
-`w3m-icon-directory'
-     emacs-w3m $B$,%"%$%3%s$rC5$9%G%#%l%/%H%j!#(B
-
-`w3m-imagick-convert-program'
-     ImageMagick $B$N(B `convert' $B$N%W%m%0%i%`L>!#(B
-
-`w3m-treat-image-size'
-     $BHs(B`nil' $B$J$i$P!"(B`w3m' $B$,2hA|$H%F%-%9%H$NHfN($r9MN8$7$^$9!#%G%U%)%k(B
-     $B%H$O(B `t' $B$G$9!#(B
-
-     $BHs(B-`nil' $B$J$i$P!"(B`w3m' $B2hA|$,CV$+$l$k>l=j$r3NJ]$7$?(B `halfdump' $B$r(B
-     $B@8@.$7!"(B`alt' $B%F%-%9%H$O2hA|$NI=<(I}$KEy$7$/$J$k$h$&$K@Z$j5M$a$i$l(B
-     $B$k!"$"$k$$$O%9$Z!<%9$r5M$a$i$l$^$9!#(B
-
-     `w3m-pixels-per-character' $B$H(B `w3m-pixels-per-line' $B$b;2>H$7$F$/$@(B
-     $B$5$$!#$3$l$i$NCM$,2hA|$,@j$a$k7e$H9T$H$r7W;;$9$k$?$a$K(B `w3m' $B%3%^(B
-     $B%s%I$KEO$5$l$^$9!#(B
-
-`w3m-pixels-per-character'
-     Integer used for the `-ppc' argument of the `w3m' command.  If
-     `nil', the width of the default face is used.  It is valid only
-     when `w3m-treat-image-size' is non-`nil'.  The default value is
-     `nil'.  If you want to use emacs-w3m in a character terminal and
-     make `w3m-treat-image-size' effective, you need to set this
-     variable properly.
-
-`w3m-pixels-per-line'
-     Integer used for the `-ppl' argument of the `w3m' command.  If
-     `nil', the height of the default face is used.  It is valid only
-     when `w3m-treat-image-size' is non-`nil'.  Note that a small
-     value may not induce a good result.  The default value is `64'.
-     If you want to use emacs-w3m in a character terminal and make
-     `w3m-treat-image-size' effective, you need to set this variable
-     properly.
-
-`w3m-resize-image-scale'
-     Number of steps in percent used when resizing images.
-
-`w3m-resize-images'
-     If non-`nil', resize images to the specified width and height.
-
-`w3m-show-graphic-icons-in-header-line'
-     Non-`nil' means show graphic status indicators in the
-     header-line.  If it is `nil', also the favicon won't be shown in
-     the header-line even if `w3m-use-favicon' is non-`nil'.  This
-     variable is currently meaningless under XEmacs.
-
-`w3m-show-graphic-icons-in-mode-line'
-     Non-`nil' means show graphic status indicators in the mode-line.
-     If it is `nil', also the favicon won't be shown in the mode-line
-     even if `w3m-use-favicon' is non-`nil'.
-
-`w3m-toggle-inline-images-permanently'
-     Non-`nil' means let the visibility of images continue
-     permanently.  The visibility of images is initialized according
-     to `w3m-default-display-inline-images' at the first time, and
-     except that it may be toggled by the `w3m-toggle-inline-images'
-     command, it does not change hereafter, if it is non-`nil'.
-     Otherwise, whether images are visible is initialized according to
-     `w3m-default-display-inline-images' whenever you visit a new page
-     or reload the current page in an emacs-w3m buffer.
-
-`w3m-use-favicon'
-     Non-`nil' means show favicon images if they are available.  It
-     will be set to `nil' automatically if ImageMagick's `convert'
-     program does not support the ico format.
-
-`w3m-image-default-background'
-     $B2hA|$NF)2a?'$H$7$F;H$o$l$k?'$NL>A0!#(B`nil' $B$J$i$P!"(BEmacs $B$N%U%l!<%`(B
-     $B$NGX7J?'$,;H$o$l$k!#6uJ8;z(B ("") $B$OFCJL$K!"%P%C%U%!$NGX7J?'$KCV$-49(B
-     $B$($i$l$k!#$3$NJQ?t$O(B Emacs 22 $B0J9_$G$N$_M-8z$G$"$k!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Form Variables, Next: Cookie Variables, Prev: Image Variables, Up: Customizable Variables
-
-$A%U%)$B!<$A%`$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B
-======================
-
-`w3m-form-input-map-buffer-lines'
-     Buffer lines for form select map buffer.
-
-`w3m-form-input-select-buffer-lines'
-     Buffer lines for form select buffer.
-
-`w3m-form-input-textarea-buffer-lines'
-     Buffer lines for form textarea buffer.
-
-`w3m-form-mouse-face'
-     Mouse face to highlight selected value.
-
-`w3m-form-treat-textarea-size'
-     Non-`nil' means to process textarea size (treat textarea rows).
-
-`w3m-form-use-fancy-faces'
-     Use fancy faces to fontify `<form>' tags.
-
-`w3m-form-use-textarea-backup'
-     Non-`nil' means save and restore backup text saved when you last
-     edited this textarea.  Files to save text are stored in the
-     directory specified by the `w3m-form-textarea-directory'
-     variable.
-
-
-
-File: emacs-w3m-ja.info, Node: Cookie Variables, Next: Bookmark Variables, Prev: Form Variables, Up: Customizable Variables
-
-$A%/%C%-$B!<$A$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B
-======================
-
-`w3m-cookie-accept-bad-cookies'
-     If `nil', don't accept bad cookies.  If `t', accept bad cookies.
-     If ask, ask user whether accept bad cookies or not.
-
-`w3m-cookie-accept-domains'
-     A list of trusted domain name string.
-
-`w3m-cookie-file'
-     File in which cookies are kept.
-
-`w3m-cookie-reject-domains'
-     A list of untrusted domain name string.
-
-`w3m-use-cookies'
-     Non-`nil' means enable emacs-w3m to use cookies.
-     *(EXPERIMENTAL)*
-
-
-
-File: emacs-w3m-ja.info, Node: Bookmark Variables, Next: Search Variables, Prev: Cookie Variables, Up: Customizable Variables
-
-$A%V%C%/%^$B!<$A%/$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B
-==========================
-
-`w3m-bookmark-file'
-     Bookmark file of w3m.
-
-`w3m-bookmark-file-coding-system'
-     Coding system for a created bookmark file.  This option is used
-     when a new bookmark file is created, or when an existing bookmark
-     file includes ASCII characters only.  If the coding system which
-     is used to encode your using bookmark file is different from the
-     value of this option, emacs-w3m does not change the encoding of
-     your bookmark file.
-
-`w3m-bookmark-default-section'
-     Default section to add new entry.
-
-`w3m-bookmark-menu-open-new-session'
-     If non-`nil', "Bookmark" menu item open new session.
-
-
-
-File: emacs-w3m-ja.info, Node: Search Variables, Next: Weather Variables, Prev: Bookmark Variables, Up: Customizable Variables
-
-$A%&%'%V$(I<D$AKw$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B
-========================
-
-`w3m-search-default-engine'
-     Name of the default search engine.  The default is `google'.
-
-`w3m-search-engine-alist'
-     An alist of search engines.  Each element looks like `(ENGINE
-     ACTION CODING POST-DATA)'.  ENGINE is a string, the name of the
-     search engine.  ACTION is a string, the URL that performs a
-     search.  ACTION must contain a `"%s"', which is substituted by a
-     query string.  CODING is optional value which is coding system
-     for query string.  POST-DATA is optional value which is a string
-     for POST method search engine.  If CODING is omitted, it defaults
-     to `w3m-default-coding-system'.
-
-`w3m-search-word-at-point'
-     Non-`nil' means that the word at point is used as an initial
-     string.  If `transient-mark-mode', this option is ignored and the
-     region is used as an initial string.  The default is `t'.
-
-`w3m-search-thing-at-point-arg'
-     `w3m-search-read-query' $B$G;H$o$l$k(B `thing-at-point' $B$X$N0z?t!#%G%U%)(B
-     $B%k%H$O(B `word'.
-
-
-
-File: emacs-w3m-ja.info, Node: Weather Variables, Next: Dtree Variables, Prev: Search Variables, Up: Customizable Variables
-
-$ALl$B5$$ASh$(G^^$A$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B
-======================
-
-`w3m-weather-default-area'
-     Default region to check weather.  The default is the southern
-     part of Kyoto city.
-
-`w3m-weather-filter-functions'
-     Filter functions to remove useless tags.  The default value is a
-     list that contains the following function symbols in this order:
-
-     `w3m-weather-extract-contents' `w3m-weather-adjust-contents'
-     `w3m-weather-expand-anchors' `w3m-weather-insert-title'
-
-
-
-File: emacs-w3m-ja.info, Node: Dtree Variables, Next: Antenna Variables, Prev: Weather Variables, Up: Customizable Variables
-
-dtree $A$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B
-====================
-
-`w3m-dtree-default-allfiles'
-     If non-`nil', invert the meaning of the prefix argument given to
-     the `w3m-dtree' command, i.e., the command shows not only
-     directories but also files even if you don't give a prefix
-     argument.  The default is `nil'.
-
-`w3m-dtree-directory-depth'
-     Integer that controls how deep `w3m-dtree' shows subdirectories.
-     If it is `nil', files in all subdirectories are shown.  The
-     default is `8'.
-
-`w3m-dtree-indent-strings'
-     Vector containing strings used for the indentation.  The default is
-     `["|-" "+-" "|  " "   "]'.
-
-`w3m-dtree-stop-strings'
-     Vector containing strings used to indent directories under which
-     there are subdirectories hidden because of
-     `w3m-dtree-directory-depth'.  The default is `["|=" "+="]'.
-
-
-
-File: emacs-w3m-ja.info, Node: Antenna Variables, Next: Perldoc Variables, Prev: Dtree Variables, Up: Customizable Variables
-
-$A%"%s%F%J$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B
-======================
-
-`w3m-antenna-file'
-     Name of the file containing antenna URLs.  The default value is
-     `~/.w3m/.antenna', where `~/.w3m' is the default value of
-     `w3m-profile-directory' (*Note General Variables::).
-
-`w3m-antenna-html-skelton'
-     Skeleton used for making the html contents of antenna pages.
-
-`w3m-antenna-make-summary-function'
-     Function used to make the summary of the site information.  The
-     default is `w3m-antenna-make-summary-like-natsumican'.  The other
-     ready-made function is `w3m-antenna-make-summary'.
-
-`w3m-antenna-sites'
-     List of web sites that `w3m-antenna' watches.  The default is
-     `nil'.
-
-`w3m-antenna-sort-changed-sites-function'
-     Function used to sort a list of sites having been changed.  The
-     default is `w3m-antenna-sort-sites-by-time'.  The other
-     ready-made function is `w3m-antenna-sort-sites-by-title'.
-
-`w3m-antenna-sort-unchanged-sites-function'
-     Function used to sort a list of sites having not been changed.
-     The default is `w3m-antenna-sort-sites-by-time'.  The other
-     ready-made function is `w3m-antenna-sort-sites-by-title'.
-
-
-
-File: emacs-w3m-ja.info, Node: Perldoc Variables, Next: Namazu Variables, Prev: Antenna Variables, Up: Customizable Variables
-
-Perldoc $A$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B
-======================
-
-`w3m-perldoc-command'
-     Name of the executable file of `perldoc'.  The default is
-     `"perldoc"'.
-
-`w3m-perldoc-input-coding-system'
-     Coding system used when writing to the `perldoc' command.  The
-     default value is `euc-japan' if you are in the Japanese language
-     environment.  Otherwise it is `utf-8' if it is available, or
-     `iso-latin-1'.
-
-`w3m-perldoc-output-coding-system'
-     Coding system used when reading from the `perldoc' command.  The
-     default is `undecided'.
-
-`w3m-perldoc-pod2html-command'
-     Name of the executable file of `pod2html'.  The default is
-     `"pod2html"'.
-
-`w3m-perldoc-pod2html-arguments'
-     Lisp of arguments passed to the `pod2html' command.  The default is
-     `("--noindex")'.
-
-
-
-File: emacs-w3m-ja.info, Node: Namazu Variables, Next: Octet Variables, Prev: Perldoc Variables, Up: Customizable Variables
-
-Namazu $A$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B
-=====================
-
-`w3m-namazu-command'
-     Name of the executable file of Namazu.  The default is `namazu'.
-
-`w3m-namazu-arguments'
-     List of arguments passed to Namazu.  The default value is `("-h"
-     -H" "-n" w3m-namazu-page-max "-w" whence)'.  The symbols
-     `w3m-namazu-page-max' and `whence' will be replaced respectively
-     with the value of that variable and a proper value that the
-     program determines properly.
-
-`w3m-namazu-default-index'
-     An alias for the default index, or the directory name of it.  If this is
-     `nil', you will be prompted for the directory name whenever you
-     invoke the `w3m-namazu' command with no prefix argument.  The
-     default is the value of `namazu-default-dir' if it exists and
-     `namazu-always-query-index-directory' is `nil'.  Otherwise
-     `nil'.
-
-`w3m-namazu-index-alist'
-     Alist of aliases and index directories.  The default value is
-     determined due to `namazu-dir-alist' if any or `nil'.
-
-`w3m-namazu-input-coding-system'
-     Coding system used when reading from the namazu process.  The
-     default is the value of `namazu-cs-read' if it exists, or
-     `undecided'.
-
-`w3m-namazu-output-coding-system'
-     Coding system used when writing to the namazu process.  The default is
-     the value of `namazu-cs-write' if it exists, or is determined to
-     `shift_jis-dos' or `euc-japan-unix' due to the system type.
-
-`w3m-namazu-page-max'
-     The maximum number of documents retrieved in one search.  The
-     default is the value of `namazu-search-num' if any, or `30'.
-
-
-
-File: emacs-w3m-ja.info, Node: Octet Variables, Next: Session Manager Variables, Prev: Namazu Variables, Up: Customizable Variables
-
-Octet $A$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B
-====================
-
-There is no user option for the moment.
-
-* Session Manager Variables::
-
-
-File: emacs-w3m-ja.info, Node: Session Manager Variables, Next: Hooks, Prev: Octet Variables, Up: Customizable Variables
-
-$A%;%C%7%g%s%^%M$B!<$A%8%c$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B
-==================================
-
-`w3m-session-file'
-     $B%;%C%7%g%s$rJ]B8$9$k%U%!%$%kL>!#(B
-
-`w3m-session-time-format'
-     $BJ]B8;~4V$N7A<0!#(B
-
-`w3m-session-automatic-title'
-     emacs-w3m $B=*N;;~$N<+F0J]B8%;%C%7%g%s$N%?%$%H%k!#(B
-
-`w3m-session-crash-recovery-title'
-     $B%/%i%C%7%eI|85MQ%;%C%7%g%s$N%?%$%H%k!#(B
-
-`w3m-session-deleted-title'
-     $B%P%C%U%!$rJD$8$?;~$N<+F0J]B8%;%C%7%g%s$N%?%$%H%k!#(B
-
-`w3m-session-deleted-keep-number'
-     $B%P%C%U%!$rJD$8$?;~$N<+F0J]B8%;%C%7%g%s$r$$$/$DJ]B8$7$F$*$/$+!#(B
-
-`w3m-session-automatic-keep-number'
-     emacs-w3m $B=*N;;~$N<+F0J]B8%;%C%7%g%s$r$$$/$DJ]B8$7$F$*$/$+!#(B
-
-`w3m-session-unknown-title'
-     $B%?%$%H%k$,;XDj$5$l$J$+$C$?;~$K;H$o$l$kJ8;zNs!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Hooks, Next: Other Variables, Prev: Session Manager Variables, Up: Customizable Variables
-
-$A%U%C%/(B
-======
-
-`w3m-after-cursor-move-hook'
-     Hook run each time after the cursor moves in emacs-w3m buffers.
-     This hook is called by the `w3m-check-current-position' function
-     by way of `post-command-hook'.
-
-`w3m-delete-buffer-hook'
-     Hook run when every emacs-w3m buffer is deleted.
-
-`w3m-display-hook'
-     Hook run after displaying pages in emacs-w3m buffers.  Each function is
-     called with a url string as the argument.  This hook is evaluated by the
-     `w3m-goto-url' function.
-
-`w3m-fontify-after-hook'
-     Hook run after fontifying emacs-w3m buffers.  This hook is
-     evaluated by the `w3m-fontify' function.
-
-`w3m-fontify-before-hook'
-     Hook run when starting to fontify emacs-w3m buffers.  This hook
-     is evaluated by the `w3m-fontify' function.
-
-`w3m-form-input-map-mode-hook'
-     A hook called after w3m-form-input-map-mode.
-
-`w3m-form-input-map-set-hook'
-     A Hook called before w3m-form-input-map-set.
-
-`w3m-form-input-select-mode-hook'
-     A hook called after w3m-form-input-select-mode.
-
-`w3m-form-input-select-set-hook'
-     A Hook called before w3m-form-input-select-set.
-
-`w3m-form-input-textarea-mode-hook'
-     A hook called after w3m-form-input-textarea-mode.
-
-`w3m-form-input-textarea-set-hook'
-     A Hook called before w3m-form-input-textarea-set.
-
-`w3m-minor-mode-hook'
-     Hook run after `w3m-minor-mode' initialization.
-
-`w3m-mode-hook'
-     Hook run after `w3m-mode' initialization.  This hook is evaluated
-     by the `w3m-mode' function.
-
-`w3m-select-buffer-hook'
-     Hook run when a different emacs-w3m buffer is selected.
-
-`w3m-bookmark-mode-hook'
-     Hook run at the end of function `w3m-bookmark-mode'.
-
-
-
-File: emacs-w3m-ja.info, Node: Other Variables, Prev: Hooks, Up: Customizable Variables
-
-$A$=$NK{$N$(I+y$AJ}(B
-============
-
-`w3m-async-exec'
-     Non-`nil' means execute the `w3m' command asynchronously in Emacs
-     process.
-
-`w3m-broken-proxy-cache'
-     Set it to `t' if the proxy server seems not to work properly in
-     caching.  Note that this may be the double-edged sword; setting
-     it to `t' will likely be harmful if the proxy server sends bad
-     requests (e.g., not including the Host header, see RFC2616
-     section 14.23) to foreign servers when the `w3m' command
-     specifies the `no-cache' directive.  Also note that it may not be
-     effective if you are using old `w3m' command.
-
-`w3m-history-minimize-in-new-session'
-     Non-`nil' means minimize copied history so that there's only
-     current page.  This variable is effective when creating of the new
-     session by copying (i.e., `w3m-copy-buffer').  The default value is
-     `nil'.
-
-`w3m-history-reuse-history-elements'
-     Non-`nil' means reuse the history element when re-visiting the
-     page.  Otherwise, a new history element will be created even if
-     there are elements for the same url in the history.
-
-     Emacs-w3m used to operate as the case in which it is non-`nil',
-     however it sometimes brought about users' dissatisfaction.  For
-     example, if a user visited the pages A -> B -> C -> B in order,
-     performing BACK on the second B would let a user visit A.  The
-     reason why a user was taken to A rather than C is that the
-     `w3m-history' variable only had the list `(A B C)' as a history
-     and B was the current position at that time.
-
-     The default value for this variable is `nil' which allows the
-     `w3m-history' variable to have the list `(A B C B)'.  Where
-     contents of two B's are the identical Lisp objects.  So, too much
-     wasting the Lisp resources will be avoided.
-
-     See the documentation for the variables `w3m-history' and
-     `w3m-history-flat' for more information.
-
-`w3m-process-connection-type'
-     Value for `process-connection-type' used when communicating with
-     `w3m'.
-
-`w3m-process-modeline-format'
-     Format used when displaying the progress of the external `w3m'
-     process.  It shows a percentage of the data loaded from the web
-     server.
-
-`w3m-show-current-title-in-buffer-tab'
-     If non-`nil', show the title strings in the buffers tab.  It has
-     no effect if your XEmacs does not support the gutter items.
-
-
-
-File: emacs-w3m-ja.info, Node: Hooking into MUAs, Next: Frequently Asked Questions, Prev: Customizable Variables, Up: Top
-
-$A%a$B!<$A%k(B/$A%K%e$B!<$A%9%j$B!<$A%@$B!<$A$GJ9$&(B
-*****************************
-
-$B$3$3$G$O;0<oN`$N(B MUA (Message User Agent) $B$r>R2p$7$^$9!#$=$l$i$N(B MUA $B$O(B
-$B$9$Y$F(B emacs-w3m $B$r;H$&$3$H$K$h$C$F(B HTML $B%a!<%k$rE,@Z$KI=<($9$k$3$H$,$G(B
-$B$-$^$9!#$=$l$>$l$N(B MUA $B$H(B emacs-w3m $B$r@_Dj$7$F;H$&$?$a$N(B HowTo $B$H$$$/$D(B
-$B$+$NCm0U$r!"$3$3$G8+$D$1$k$3$H$,$G$-$k$G$7$g$&!#(B
-
-$B0[$J$k=,47$K4X$9$kB(@J$NCm<a(B: `message' $B$C$F2?(B? $B!](B Gnus $B%f!<%6$,(B
-`message' $B$H8@$&$H$-!"$=$l$O$7$P$7$P%a!<%k$^$?$O%K%e!<%9$H$7$FAw?.$9$k(B
-$B%a%C%;!<%8$NAp9F$r0UL#$7$^$9!#$7$+$7!"$=$l$O(B Mew $B$d(B Wanderlust $B$N%f!<%6(B
-$B$,!"<u?.$7$?%a%C%;!<%8$KBP$7$F;H$&MQ8l$G$9!#H`$i$OAw?.$9$k%a%C%;!<%8$K(B
-`draft' $B$r;H$C$F$$$^$9!#0lJ}(B Gnus $B%f!<%6$O!"<u?.$7$?%a%C%;!<%8$r(B
-`article' $B$H8F$S$^$9!#(B
-
-* Menu:
-
-* Gnus::                        Gnus $B$G(B HTML $B%a!<%k$rFI$`(B
-* Mew::                         Mew $B$G(B HTML $B%a!<%k$rFI$`(B
-* SEMI MUAs::                   SEMI MUA $B$G(B HTML $B%a!<%k$rFI$`(B
-* VM::                          VM (vieW maiL) $B$O(B Wanderlust $B$K$"$i$:(B
-
-
-
-File: emacs-w3m-ja.info, Node: Gnus, Next: Mew, Prev: Hooking into MUAs, Up: Hooking into MUAs
-
-Gnus $A$G(B HTML $A%a$B!<$A%k$r$BFI$A$`(B
-=========================
-
-Gnus (Emacs $B$N%K%e!<%:%j!<%@!<(B) $B$,(B emacs-w3m $B$r%5%]!<%H$7$F$$$k$C$F!"CN$C(B
-$B$F$$$^$7$?$+(B?  $B<B$O!"%P!<%8%g%s(B 22.1 $B0J>e$N(B Emacs $B$KF1:-$5$l$F$$$k(B
-Gnus $B$O(B emacs-w3m $B$r%5%]!<%H$9$k$s$G$9!#$b$7$"$J$?$N(B Emacs $B$,$$$/$i$+8E(B
-$B$$$N$J$i$P!":G?7HG$N(B Gnus $B$r;H$&$N$,NI$$$G$7$g$&!#$=$l$O0J2<$N>l=j$G<j(B
-$B$KF~$j$^$9(B:
-
-`ftp://ftp.gnus.org/pub/gnus/gnus.tar.gz'
-
-   * Emacs-w3m $B$G2?$,$G$-$k$N(B?
-
-     HTML $B$N(B spam $B%a!<%k$r!"(Bemacs-w3m $B$r;H$C$F?M4V$,FI$a$k$h$&$KJQ49$9(B
-     $B$k$3$H$,$G$-$^$9!#$b$A$m$s(B HTML $B$N(B ham $B%a!<%k(B (spam $B$G$O$J$$%a!<%k(B)
-     $B$KBP$7$F$bF/$-!"$I$A$i$N>l9g$G$b(B emacs-w3m $B$O%G%U%)%k%H$NJQ494o$h(B
-     $B$j$b$?$V$sB.$$$G$7$g$&!#DI2C$NA`:n$OI,MW$"$j$^$;$s!#$=$l$OC1$KI=<((B
-     $B$5$l$^$9!#(B
-
-     $B5-;v%P%C%U%!$N(B HTML $B$NItJ,$G$O(B `w3m-minor-mode' $B$,(B on $B$K$J$C$F!"(B
-     emacs-w3m $B$N$HF1$8<gMW$J%-!<$r;H$&$3$H$,$G$-$^$9!#Nc$($P(B `<RET>'
-     $B$O!"8=:_0LCV$N%j%s%/$,;X$7<($9%Z!<%8$K9T$-$^$9!#$=$l$i$N%-!<$OJQ?t(B
-     `w3m-minor-mode-command-alist' $B$GDj5A$5$l$F$$$^$9!#J]0B>e$NM}M3$+(B
-     $B$i!"$$$/$D$+$N%3%^%s%I$O$=$l$K;w$?JL$N%3%^%s%I$GCV$-49$($i$l$F$$$k(B
-     $B$3$H$r?4$KN1$a$F$*$$$F$/$@$5$$(B ($B2<5-;2>H(B)$B!#(B
-
-   * $B2?$r$7$J$1$l$P$$$1$J$$$N(B?
-
-     Gnus $B$N%^%K%e%"%k$rFI$s$G$/$@$5$$(B (*Note Display Customization:
-     (emacs-mime)Display Customization.)$B!#:G$b4JC1$JJ}K!$O!"0J2<$N9T$r(B
-     `~/.gnus.el' $B%U%!%$%k$KF~$l$k$3$H$G$9(B:
-
-          (setq mm-text-html-renderer 'w3m)
-
-     $B$5$i$K!"5-;v%P%C%U%!$G2hA|$rI=<($7$?$$>l9g$O!"0J2<$N9T$rF~$l$F$/$@(B
-     $B$5$$!#(B
-
-          (setq mm-inline-text-html-with-images t)
-
-     $B5-;v%P%C%U%!$G(B emacs-w3m $B$N%-!<$r;H$&I,MW$,L5$$$J$i$P!"0J2<$N9T$b(B
-     $BDI2C$7$F$/$@$5$$(B:
-
-          (setq mm-inline-text-html-with-w3m-keymap nil)
-
-   * $B$4Cm0U(B
-
-     $BA0$K(B spam $B$H(B ham $B$N$3$H$r=q$$$?$N$O$U$6$1$F$$$k$o$1$G$O$J$/$F!"$"(B
-     $B$J$?$NCm0U$r4-5/$9$k$?$a$K$^$5$K$3$3$K$"$k$N$G$9!#(BHTML $B%a!<%k$K$O(B
-     `<img>' $B%?%0$r;H$C$?(B spammers (spam $B$r$P$i$^$/$d$+$i(B) $B$NH\Nt$J0-9*(B
-     $B$_$,4^$^$l$F$$$k$+$b$7$l$^$;$s!#$=$l$O(B `Click Here!' $B%\%?%s$h$j$O(B
-     $B$k$+$KM-32$G$9!#:G$b$"$j$=$&$J$N$O!"$=$s$J$?$A$N0-$$(B spam $B$,$"$J$?(B
-     $B$NL\$K;_$^$C$?$+$I$&$+$r8!::$9$k!"$9$J$o$A$3$N>l9g!"$"$J$?$N%a!<%k(B
-     $B%"%I%l%9$,M-8z$G$"$k$3$H$r3NG'$9$k$?$a$N(B spammer $B$N0U?^$,$"$k$3$H(B
-     $B$G$9!#$=$l$O!"2hA|$rI=<($9$k$H$-$K<+F0E*$K<hF@$7$K9T$/$G$"$m$&(B
-     URL $B$K!"<1JLJ8;zNs$rKd$a9~$`$3$H$K$h$C$F9T$J$o$l$^$9!#JQ?t(B
-     `mm-w3m-safe-url-regexp' $B$,%G%U%)%k%HCM$+$iJQ99$5$l$F$$$J$1$l$P!"(B
-     Gnus $B$,>!<j$K(B spammer $B$N%5%$%H$K@\B3$9$k$3$H$O$"$j$^$;$s!#(B
-
-     `mm-inline-text-html-with-images' $B$r(B `t' $B$K$9$l$P!"5-;v%P%C%U%!$K(B
-     $B%$%s%i%$%s2hA|$rI=<($9$k$3$H$,$G$-$^$9$h$M(B?  $B$$$$$(!"CG$8$F0c$$$^(B
-     $B$9!#$"$J$?$O$^$@<i$i$l$F$$$k$N$G$9!#$"$J$?$N%a!<%k%"%I%l%9$,E~C#2D(B
-     $BG=$@$H$$$&;v<B$,O3$l$k$3$H$r5$$K$7$J$$$N$G$"$l$P!"JQ?t(B
-     `mm-w3m-safe-url-regexp' $B$r(B `nil' $B$K$7$F$/$@$5$$!#(B
-     `mm-w3m-safe-url-regexp' $B$N%G%U%)%k%HCM$O(B `"\\`cid:"' $B$G!"$3$l$O;d(B
-     $B$?$A$,(B `cid:' URL $B$K$h$C$F%a!<%k$K4^$^$l$F$$$k2hA|$,0BA4$@$H9M$($F(B
-     $B$$$k$3$H$r0UL#$7$^$9(B ($B$9$J$o$A!"(B`mm-w3m-safe-url-regexp' $B$rJQ99$7(B
-     $B$J$/$F$b!"$=$N$h$&$J2hA|$OI=<($9$k$3$H$,$G$-$^$9(B)$B!#(B
-
-   * $B$*$^$1(B
-
-     $B35N,%P%C%U%!$K$$$k$H$-$G$b!"5-;v%P%C%U%!$N2hA|I=<($r%H%0%k$K@Z$j49(B
-     $B$($k$3$H$,$G$-$^$9!#$=$l$i$N2hA|$,(B emacs-w3m $B$K$h$C$FI=<($5$l$k>l(B
-     $B9g$@$1$G$9$1$l$I$M!#Nc$G$9(B:
-
-          (defun gnus-summary-w3m-safe-toggle-inline-images (&optional arg)
-            "Toggle displaying of all images in the article buffer.
-          If the prefix arg is given, force displaying of images."
-            (interactive "P")
-            (with-current-buffer gnus-article-buffer
-              (let ((st (point-min))
-                    (nd (point-max))
-                    (w3m-async-exec w3m-async-exec))
-                (save-restriction
-                  (widen)
-                  (if (or (> st (point-min)) (< nd (point-max)))
-                      (setq w3m-async-exec nil))
-                  (article-goto-body)
-                  (goto-char (or (text-property-not-all (point) (point-max)
-                                                        'w3m-safe-url-regexp nil)
-                                 (point)))
-                  (if (interactive-p)
-                      (call-interactively 'w3m-toggle-inline-images)
-                    (w3m-toggle-inline-images arg))))))
-
-          (eval-after-load "gnus-sum"
-            '(define-key gnus-summary-mode-map
-               "\C-i" 'gnus-summary-w3m-safe-toggle-inline-images))
-
-*Note Nnshimbun:: $B$b;2>H$7$F$/$@$5$$!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Mew, Next: SEMI MUAs, Prev: Gnus, Up: Hooking into MUAs
-
-Mew $A$G(B HTML $A%a$B!<$A%k$r$BFI$A$`(B
-========================
-
-Emacs-w3m $B$r;H$&$3$H$K$h$C$F!"(BText/Html $B$r(B Message $B%b!<%I$KI=<($G$-$k$h(B
-$B$&$K$J$j$^$9!#0J2<$N@_Dj$r(B `~/.mew.el' $B%U%!%$%k$K2C$($F$/$@$5$$(B:
-
-     (require 'mew-w3m)
-
-$B$3$l$G!"$"$?$+$b(B Text/Plain $B$G$"$k$+$N$h$&$K!"(BText/Html $B$r(B Message $B%b!<(B
-$B%I$KI=<($G$-$k$h$&$K$J$j$^$9!#$3$N:]$b!"(B`C-c C-e' $B$NA`:n$OM-8z$G(B
-$B$9!#(B
-
-$B$3$N$4$m!"F1$8>pJs$rFs$D4^$s$G$$$k%a!<%k$rHs>o$K$h$/8+$+$1$^$9!#$=$l$i(B
-$B$O(B `text/plain' $B%Q!<%H$H(B `text/html' $B%Q!<%H$NN>J}$+$i@.$k(B ($B2?$A$e$&%P%s(B
-$B%II}$NL5BL;H$$$@(B) `multipart/alternative' $B%U%)!<%^%C%H$r;H$C$F$$$^$9!#(B
-Mew $B$O%G%U%)%k%H$G$O(B `text/plain' $B%Q!<%H$@$1$rI=<($7$^$9!#$"$J$?$O(B
-emacs-w3m $B$r;H$C$F$$$k$N$G$9$+$i!"(B`text/html' $B%Q!<%H$NJ}$rM%@h$7$?$/$J(B
-$B$k$+$b$7$l$^$;$s!#$=$l$J$i$P!"0J2<$N@_Dj$r(B `~/.mew.el' $B%U%!%$%k$K2C$($F(B
-$B$/$@$5$$(B:
-
-     (setq mew-mime-multipart-alternative-list
-           '("Text/Html" "Text/Plain" ".*"))
-
-Mew $B$K4XO"$9$k$$$/$D$+$N%+%9%?%^%$%:2DG=$JJQ?t$,$"$j$^$9(B:
-
-`mew-use-w3m-minor-mode'
-     $BHs(B-`nil' $B$K$9$k$H!"(Btext/html $B%Q!<%H$,I=<($5$l$F$$$k%a%C%;!<%8%P%C(B
-     $B%U%!$K$*$$$F(B `w3m-minor-mode' $B$,(B on $B$K$J$j!"(Bemacs-w3m $B$N$HF1$8<gMW(B
-     $B$J%-!<$r;H$&$3$H$,$G$-$^$9!#Nc$($P(B `<RET>' $B$O!"8=:_0LCV$N%j%s%/$,(B
-     $B;X$7<($9%Z!<%8$K9T$-$^$9!#$=$l$i$N%-!<$OJQ?t(B
-     `w3m-minor-mode-command-alist' $B$GDj5A$5$l$F$$$^$9!#J]0B>e$NM}M3$+(B
-     $B$i!"$$$/$D$+$N%3%^%s%I$O$=$l$K;w$?JL$N%3%^%s%I$GCV$-49$($i$l$F$$$k(B
-     $B$3$H$r?4$KN1$a$F$*$$$F$/$@$5$$!#%G%U%)%k%HCM$O(B `nil' $B$G$9!#(B
-
-`mew-w3m-auto-insert-image'
-     $BHs(B-`nil' $B$K$9$k$H!"(Bmultipart/related $B$J%a%C%;!<%8$rFI$s$G$$$k$H$-(B
-     $B$K!"%a%C%;!<%8%P%C%U%!$G2hA|$r%$%s%i%$%sI=<($5$;$k$3$H$,$G$-$^$9!#(B
-     mew-w3m $B$O!"I=<($9$k$?$a$K(B `cid:' URL $B$K$h$C$F%a!<%k$NK\J8$K4^$^$l(B
-     $B$F$$$k2hA|$@$1(B ($B;d$?$A$O$=$l$i$r0BA4$@$H9M$($F$$$^$9(B) $B$r5v2D$9$k$3(B
-     $B$H$KCm0U$7$F$/$@$5$$!#%G%U%)%k%HCM$O(B `nil' $B$G$9!#(B
-
-     $B$3$3$G!"(B`~/.mew.el' $B$K(B
-
-          (define-key mew-summary-mode-map "T" 'mew-w3m-view-inline-image)
-
-     $B$H=q$/$H!"(B"T" $B$r2!$9$3$H$K$h$C$F!"2hA|I=<($N>uBV$r%H%0%k$9$k$3$H$,(B
-     $B$G$-$^$9!#$^$?!"(B"C-uT" $B$H(B prefix $B$r$D$1$k$H!"%a!<%kK\J8$K4^$^$l$F(B
-     $B$$$J$$2hA|$bI=<($7$^$9!#(B
-
-`mew-w3m-cid-retrieve-hook'
-     `cid:' URL $B$r<h$j=P$7$?8e$G<B9T$5$l$k%U%C%/$G$9!#%G%U%)%k%HCM$O(B
-     `nil' $B$G$9!#(B
-
-*Note Mew Shimbun:: $B$b;2>H$7$F$/$@$5$$!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: SEMI MUAs, Next: VM, Prev: Mew, Up: Hooking into MUAs
-
-SEMI MUA $A$G(B HTML $A%a$B!<$A%k$r$BFI$A$`(B
-=============================
-
-Emacs-w3m $B$H(B SEMI MUA$B!"Nc$($P(B Wanderlust $B$r;H$&$3$H$K$h$C$F!"(BHTML $B%a!<(B
-$B%k$r?M4V$,FI$a$k$h$&$KI=<($9$k$3$H$,$G$-$^$9!#$=$&$$$&(B MUA $B$O(B MIME $B$N5!(B
-$BG=$r(B SEMI ($B$=$7$F$5$i$K(B FLIM) $B$KMj$C$F$$$k$N$G!"0lHL$K$=$l$r(B SEMI MUA
-$B$H8F$s$G$$$^$9!#(BSEMI $B$O(B HTML $B%a!<%k$NIA2h$K%G%U%)%k%H$G(B Emacs/W3 $B$r;H$$(B
-$B$^$9$,!"MF0W$K(B emacs-w3m $B$GCV$-49$($k$3$H$,2DG=$G$9!#$=$l$K$h$C$F$"$J$?(B
-$B$NEEG>@83h$O$h$j2wE,$K$J$k$G$7$g$&!#(B
-
-$BC1$K0J2<$N9T$r(B `~/.emacs' $B%U%!%$%k$KF~$l$l$PNI$$$N$G$9(B:
-
-     (require 'mime-w3m)
-
-`mime-w3m' $B%b%8%e!<%k$H(B `mime-w3' $B%b%8%e!<%k$O!"$4A[A|$NDL$j5!G=E*$K$[(B
-$B$\F1$8$b$N$G$9(B ($BL>A0$b;w$F$$$k$G$7$g$&(B?)$B!#8e<T$O(B SEMI $B%Q%C%1!<%8$K4^$^(B
-$B$l$F$$$^$9!#(B
-
-$B5-;v%P%C%U%!$N(B HTML $B$NItJ,$G$O(B `w3m-minor-mode' $B$,(B on $B$K$J$C$F!"(B
-emacs-w3m $B$N$HF1$8<gMW$J%-!<$r;H$&$3$H$,$G$-$^$9!#Nc$($P(B `<RET>' $B$O!"8=(B
-$B:_0LCV$N%j%s%/$,;X$7<($9%Z!<%8$K9T$-$^$9!#$=$l$i$N%-!<$OJQ?t(B
-`w3m-minor-mode-command-alist' $B$GDj5A$5$l$F$$$^$9!#J]0B>e$NM}M3$+$i!"$$(B
-$B$/$D$+$N%3%^%s%I$O$=$l$K;w$?JL$N%3%^%s%I$GCV$-49$($i$l$F$$$k$3$H$r?4$K(B
-$BN1$a$F$*$$$F$/$@$5$$!#(B
-
-`mime-w3m' $B%b%8%e!<%k$K4XO"$9$k$$$/$D$+$N%+%9%?%^%$%:2DG=$JJQ?t$,$"$j$^(B
-$B$9(B:
-
-`mime-w3m-display-inline-images'
-     $BHs(B-`nil' $B$@$C$?$i!"2hA|$,(B HTML $B%a!<%k$K%$%s%i%$%sI=<($5$l$^$9!#:G(B
-     $B=i$K(B `default' $B$H$$$&%7%s%\%k$@$C$?$i(B ($B$=$l$,%G%U%)%k%H$G$9(B)$B!"$3$N(B
-     $BJQ?t$NCM$O!"JQ?t(B `w3m-default-display-inline-images' $B$NCM$GCV$-49(B
-     $B$($i$l$^$9!#$?$V$s!"$"$J$?$O$3$l$rJQ99$9$kI,MW$OL5$$$G$7$g$&!#(B
-
-`mime-w3m-safe-url-regexp'
-     $B0BA4$G$"$k$H9M$($i$l$k(B URL $B$K%^%C%A$9$k@55,I=8=$G$9!#%G%U%)%k%HCM(B
-     $B$O(B `"\\`cid:"' $B$G!";d$?$A$O(B `cid:' URL $B$K$h$C$F%a!<%k$K4^$^$l$?2h(B
-     $BA|$,0BA4$@$H9M$($F$$$k$3$H$r0UL#$7$^$9!#0-4A$K$h$k967b$K$D$$$F$O(B
-     *Note Gnus:: $B$r;2>H$7$F$/$@$5$$!#(B
-
-`mime-w3m-setup-hook'
-     `mime-w3m' $B%b%8%e!<%k$H(B SEMI $B$N6(D4F0:n$r@_Dj$7$?D>8e$K<B9T$5$l$k(B
-     $B%U%C%/$G$9!#%G%U%)%k%HCM$O(B `nil' $B$G$9!#(B
-
-$B$H$3$m$G!"(Bsummary $B%P%C%U%!$K$$$k$H$-$G$b!"(Barticle $B%P%C%U%!(B (Wanderlust
-$B$N%3%_%e%K%F%#$G$O(B message $B%P%C%U%!$H8F$P$l$F$$$k(B) $B$N2hA|I=<($r%H%0%k$K(B
-$B@Z$j49$($k$3$H$,$G$-$^$9!#$=$l$i$N2hA|$,(B emacs-w3m $B$K$h$C$FI=<($5$l$k>l(B
-$B9g$@$1$G$9$1$l$I$M!#(BWanderlust $BMQ$NNc$G$9(B:
-
-     (defun wl-summary-w3m-safe-toggle-inline-images (&optional arg)
-       "Toggle displaying of all images in the message buffer.
-     If the prefix arg is given, all images are considered to be safe."
-       (interactive "P")
-       (with-current-buffer wl-message-buffer
-         (w3m-toggle-inline-images arg)))
-
-     (eval-after-load "wl-summary"
-       '(define-key wl-summary-mode-map
-          "\M-i" 'wl-summary-w3m-safe-toggle-inline-images))
-
-
-
-File: emacs-w3m-ja.info, Node: VM, Prev: SEMI MUAs, Up: Hooking into MUAs
-
-VM (vieW maiL) $A$O(B Wanderlust $A$K$"$i$:(B
-=====================================
-
-VM $B$G(B html $B%a!<%k$rI=<($9$k5!G=$rDs6!$9$k(B vm-w3m.el $B%b%8%e!<%k$H%Q%C%A(B
-$B$O(B VM $B$N?7$7$$%a%$%s%F%$%J!<$K0z$-7Q$,$l$^$7$?$,!"$^$@(B VM $B$N0BDjHG$K8=(B
-$B$l$F$$$^$;$s!#(BVM $A%[$B!<$A%`%Z$B!<$A%8(B (http://www.nongnu.org/viewmail/) $B$rK,$M(B
-$B$F$_$F$/$@$5$$!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Frequently Asked Questions, Next: Known Problems, Prev: Hooking into MUAs, Up: Top
-
-$A1X$:4p$,$"$k$H$OO^$i$J$$(B
-************************
-
-* Menu:
-
-* General FAQ::                 $B0lHLE*$J<ALd(B
-* Trouble FAQ::                 $B%H%i%V%k(B
-* Shimbun FAQ::                 Shimbun $B$K4X$9$k<ALd(B
-
-
-
-File: emacs-w3m-ja.info, Node: General FAQ, Next: Trouble FAQ, Prev: Frequently Asked Questions, Up: Frequently Asked Questions
-
-$AR;0c5D$J$(Go3YB(B
-============
-
-   * Q. emacs-w3m $B$C$F2?$G$9$+(B?
-
-     w3m $B$r(B Emacs $B>e$GF0$+$9%$%s%?!<%U%'!<%9%W%m%0%i%`$G$9!#(BEmacs $B>e$G(B
-     $BF0$/%&%'%V%V%i%&%6$H$7$F;H$&$3$H$b$G$-$^$9!#$5$i$J$k>pJs$O(B *Note
-     Introduction:: $B$b;2>H$7$F$/$@$5$$!#(B
-
-   * Q. $BF0:n$9$k(B Emacs $B$O(B?
-
-     $B0J2<$N(B Emacsen $B$GF0:n$9$k$3$H$,3NG'$5$l$F$$$^$9!#(B
-
-        * Emacs 21
-        * Emacs 22
-        * XEmacs 21.4.17 $B0J>e!"(BMule $BM-$j(B/$BL5$7(B
-        * XEmacs 21.5-b19 $B0J>e!"(BMule $BM-$j(B/$BL5$7(B
-        * Meadow
-
-     $B$J$*!"(BXEmacs $B$G$O(B APEL $B$,I,MW$H$J$j$^$9!#>\$7$/$O(B *Note Other
-     Requirements:: $B$r3NG'$7$F$/$@$5$$!#(B
-
-   * Q. $BF0:n$9$k(B w3m $B$O(B?
-
-     $B0J2<$N(B w3m $B$GF0:n$9$k$3$H$,3NG'$5$l$F$$$^$9!#(B
-
-        * w3m-0.3
-        * w3mmee-p24-18 + moe-1.5.4
-
-          $BNc$K>e$2$?(B w3mmee $B$O(B `lang=many' $B$G(B configure $B$5$l$F$$$k(B ($B$=(B
-          $B$l$O(B `configure' $B%9%/%j%W%H$,(B `Which language do you
-          prefer?' $B$H?R$M$?$H$-$K(B 3 $B$rF~NO$9$k$3$H$K$h$C$F$G$-$^$9(B) $B$3(B
-          $B$H$KCm0U$7$F$/$@$5$$!#$5$i$K$=$l$O(B `libmoe' $B%Q%C%1!<%8$rI,MW(B
-          $B$H$7$^$9!#(B
-
-   * Q. XEmacs $B$N(B SUMO $B%Q%C%1!<%8$K4^$^$l$F$$$k(B APEL $B$r%$%s%9%H!<%k$7$F(B
-     $B$"$k$N$G$9$,(B?
-
-     XEmacs $B$N(B APEL $B%Q%C%1!<%8(B ($B$9$Y$F$N%b%8%e!<%k$,(B Mule $BIU$-$N(B
-     XEmacs $BMQ$K%3%s%Q%$%k$5$l$F$$$k(B) $B$K$O$$$m$$$mLdBj$,$"$j$^$9!#Nc$((B
-     $B$P(B `std11' $B%b%8%e!<%k$,(B FLIM $B$N$b$N$H$+$A9g$&!"$J$I!#$=$l$G$b(B
-     `apel-1.23-pkg.tar.gz' $B0J>e$N$b$N$@$C$?$i!"$=$7$F(B `shimbun' $B$N5!G=(B
-     $B$N$?$a$K(B FLIM $B$r;H$o$J$$$J$i$P!"(BMule $BIU$-$HL5$7N>J}$N(B XEmacs $B$G;H(B
-     $B$($k$N$G$9$,!"%*%j%8%J%k$N(B APEL $B$GCV$-49$($k$+?75,$K%$%s%9%H!<%k$9(B
-     $B$k$3$H$r4+$a$^$9!#<hF@>l=j$O(B *Note Other Requirements:: $B$r8+$F$/$@(B
-     $B$5$$!#(B
-
-   * Q. CVS $B$G:G?7HG$r<hF@$7$?$N$G$9$,!"(B`configure' $B%9%/%j%W%H$,8+$D$+(B
-     $B$j$^$;$s!#(B
-
-     `autoconf' $B$r<B9T$7$F$/$@$5$$!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Trouble FAQ, Next: Shimbun FAQ, Prev: General FAQ, Up: Frequently Asked Questions
-
-$A%H%i%V%k(B
-========
-
-   * Q. $BG'>Z$NI,MW$J%Z!<%8$N%Q%9%o!<%I$,F~NO$G$-$^$;$s!#(B
-
-     $BJQ?t(B `w3m-async-exec' $B$K(B `nil' $B0J30$NCM$,@_Dj$5$l$F$$$k$3$H$r3NG'(B
-     $B$7$F$/$@$5$$!#(B
-
-   * Q. $BG'>Z$NI,MW$J(B proxy $B%5!<%P!<$N%Q%9%o!<%I$,F~NO$G$-$^$;$s!#(B
-
-     $BJQ?t(B `w3m-async-exec' $B$K(B `nil' $B0J30$NCM$,@_Dj$5$l$F$$$k$3$H$r3NG'(B
-     $B$7$F$/$@$5$$!#(B
-
-   * Q. $B%j%s%/$,$?$I$l$^$;$s!#(B
-
-     `-header' $B%*%W%7%g%s$r<u$1IU$1$k(B w3m $B%3%^%s%I$,I,MW$G$9!#(Bw3m $B$N%P!<(B
-     $B%8%g%s$r3NG'$7$F$/$@$5$$!#(B
-
-   * Q. $BJ8;z2=$1$7$^$9!#(B
-
-     $B$$$/$D$+$N860x$,$"$j$^$9!#(B
-
-       1. HTML $B%U%!%$%k$NLdBj(B
-
-          HTML $B%U%!%$%kCf$G(B `<meta>' $B%?%0$K$h$C$F;XDj$5$l$F$$$kJ8;z%3!<%I$H!"(B
-          $B<B:]$NJ8;z%3!<%I$,0[$J$k$H!"@5>o$KI=<($5$l$^$;$s!#(B
-          `M-x w3m-redisplay-with-charset <RET>' $B$^$?(B
-          $B$O(B `C c' $B%3%^%s%I$r;H$C$F!"@5$7$$J8;z%3!<%I$r;XDj$7$F:FIA2h$7$F(B
-          $B$/$@$5$$!#(B
-
-       2. $BJ8;z%3!<%I(B
-
-          ISO-2022-JP(jis), EUC-JP $B$^$?$O(B SHIFT_JIS $B0J30$NJ8;z%3!<%I$G(B
-          $B5-=R$5$l$?%Z!<%8$K$D$$$F$O!"I=<($G$-$J$$>l9g$,$"$j$^$9!#<!$N(B
-          $B$$$:$l$+$NJ}K!$GBP=h$7$F$/$@$5$$!#(B
-
-            a. Mule-UCS (*Note Other Requirements::) $B$r%$%s%9%H!<%k$9$k(B
-               $B$H!"(BUnicode $B$GDj5A$5$l$F$$$kHO0O$NJ8;z$OI=<($G$-$k$h$&$K(B
-               $B$J$j$^$9!#%$%s%9%H!<%k8e!"JQ?t(B `w3m-use-mule-ucs' $B$,(B
-               `nil' $B0J30$NCM$K@_Dj$5$l$F$$$k$3$H$r3NG'$7$F$/$@$5$$!#$J(B
-               $B$*!"(BEmacs ($B$=$l$K(B emacs-w3m $B$b(B) $B$,(B EUC-JISX0213 $B$*$h$S(B
-               ISO-2022-JP-3 $B$NJ8;z%3!<%I$r07$($k$h$&$K$9$k$K$O!"(B
-               Mule-UCS $B$KImB0$7$F$$$k(B `jisx0213' $B%b%8%e!<%k$r%$%s%9%H!<(B
-               $B%k$9$kI,MW$,$"$j$^$9(B ($B;DG0$J$,$i(B XEmacs $B$G$O;H$($^$;$s(B
-               $B$,(B)$B!#(B
-
-            b. w3mmee $B$d(B w3m-m17n $B$r%$%s%9%H!<%k$7$F!"JQ?t(B
-               `w3m-command' $B$KE,@Z$JCM$r@_Dj$7$F$/$@$5$$!#$3$N$h$&$K@_(B
-               $BDj$9$k$H!"(Bemacs-w3m $B$O$3$l$i$N%W%m%0%i%`$,Ds6!$9$kB?8@8l(B
-               $B5!G=$rMxMQ$9$k$h$&$K$J$j$^$9!#$?$@$7!"(BEmacs $B$,07$($kJ8;z(B
-               $B%3!<%I$K8B$i$l$^$9$N$G!"I,MW$K1~$8$F(B Mule-UCS $B$b%$%s%9%H!<(B
-               $B%k$7$F$/$@$5$$!#(B
-
-       3. Emacsen $B$NLdBj(B
-
-          XEmacs 21.1 $B$G$O(B SHIFT_JIS $B$N%Z!<%8$,2=$1$k$3$H$,$"$j$^$9!#$^(B
-          $B$?!"(BXEmacs 21.2 $B$G$b(B beta36 $B0JA0$G$OLdBj$,$"$j$^$9!#$=$&$$$&(B
-          $B$b$N$r;H$C$F$$$k>l9g$O(B XEmacs $B$r%"%C%W%0%l!<%I$7$F$/$@$5$$!#(B
-
-          XEmacs 21.1 $B$H(B 21.2 $B$O!"$9$G$K8x<0$K$*Lr8fLH$K$J$C$?$3$H$rG'(B
-          $B<1$7$F$/$@$5$$!#(B
-
-       4. `standard-display-european' $B$r;H$o$J$$$G$/$@$5$$(B
-
-          $B$=$l$O$7$P$7$P(B Latin $BJ8;z$r@5$7$/I=<($5$;$J$$$N$G!"35$7$FM-32(B
-          $B$G$9!#Nc$($P!"(B`&#8217' $B$H$7$F%(%s%3!<%I$5$l$?%"%]%9%H%m%U%#J8(B
-          $B;z(B (`'') $B$O!"$=$l$,$"$?$+$b(B `&#249' $B$H$7$F%(%s%3!<%I$5$l$?$+(B
-          $B$N$h$&$K!"Dc%"%/%;%s%H(B (a grave accent) $B$,IU$$$?J8;z(B `u' $B$H$7(B
-          $B$FI=<($5$l$k$G$7$g$&!#$"$J$?$N(B `~/.emacs' $B%U%!%$%k$+!"(BEmacs
-          $B$,5/F0;~$KFI$_9~$`(B site $B%U%!%$%k$K!"2?$+0J2<$N$h$&$J9T$,$"$k(B
-          $B$J$i$P!"$=$l$r<h$j=|$/$3$H$r6/$/4+$a$^$9!#(B
-
-               (standard-display-european 1)
-
-          $B$=$3$G$O!"0z?t$O(B `1' $B$G$O$J$/$F(B `t' $B$+$b$7$l$^$;$s!#(B
-
-   * Q. $B2hA|I=<($G$-$^$;$s!#(B
-
-     $B$$$/$D$+$N860x$,$"$j$^$9!#(B
-
-     $B8E$$%P!<%8%g%s$N(B `libungif' $B%i%$%V%i%j$K$O%P%0$,$"$j$^$9!#(B
-     `libungif-4.1.0b1' $B0J9_$N$b$N$r%$%s%9%H!<%k$7$J$1$l$P$J$j$^$;$s!#(B
-
-     XEmacs $B$G$OI,$:(B `gifsicle' $B%W%m%0%i%`$r%$%s%9%H!<%k$7$F$/$@$5$$!#(B
-     $B8=:_MxMQ$G$-$k$9$Y$F$N(B XEmacs 21.x $B$K$O%P%0$,$"$j!"(Bemacs-w3m $B$G$O(B
-     $B$3$l$r;H$C$FBP:v$7$F$$$^$9(B (*Note Other Requirements::)$B!#(B
-
-     $B8E$$(B w3m $B%3%^%s%I$G$O@5>o$KI=<($G$-$^$;$s!#(Bw3m $B$N%P!<%8%g%s$r3NG'(B
-     $B$7$F$/$@$5$$!#(B
-
-   * Q. Cookie $B$,I,MW$J%Z!<%8$r1\Mw$G$-$^$;$s!#(B
-
-     ($B$^$@<B83E*$J5!G=$G$9!#(B)
-
-     $BJQ?t(B `w3m-use-cookies' $B$K(B `nil' $B0J30$NCM$,@_Dj$5$l$F$$$k$3$H$r3NG'(B
-     $B$7$F$/$@$5$$!#(B
-
-   * Q. $B%U%)!<%`$KF~NO$G$-$^$;$s!#(B
-
-     ($B$^$@<B83E*$J5!G=$G$9!#(B)
-
-     $BJQ?t(B `w3m-use-form' $B$K(B `nil' $B0J30$NCM$,@_Dj$5$l$F$$$k$3$H$r3NG'$7(B
-     $B$F$/$@$5$$!#(B
-
-   * Q. $B%U%)!<%`$rAw?.$G$-$^$;$s!#(B
-
-     ($B$^$@<B83E*$J5!G=$G$9!#(B)
-
-     $BJQ?t(B `w3m-use-form' $B$K(B `nil' $B0J30$NCM$,@_Dj$5$l$F$$$k$3$H$r3NG'$7(B
-     $B$F$/$@$5$$!#$3$N5!G=$r;H$&$K$O!"(B`-post' $B%*%W%7%g%s$rG'<1$9$k(B w3m
-     $B%3%^%s%I$,I,MW$G$9!#(Bw3m $B$N%P!<%8%g%s$r3NG'$7$F$/$@$5$$!#(B
-
-   * Q. $B%U%l!<%`$,%l%s%@%j%s%0$5$l$^$;$s!#(B
-
-     w3mmee $B$r%$%s%9%H!<%k$7$F!"0J2<$N@_Dj$r(B `~/.emacs' $B%U%!%$%k$KF~$l(B
-     $B$F$/$@$5$$(B:
-
-          (setq w3m-command "w3mmee")
-
-   * Q. GNU Emacs $B$N(B tab $B9T$K(B favicon $B$,I=<($5$l$J$$$N$G$9$,!#(B
-
-     Image Magick $B$K4^$^$l$F$$$k(B `convert' $B%W%m%0%i%`$r%$%s%9%H!<%k$7$F(B
-     $B$/$@$5$$!#(B`http://www.imagemagick.org/' $B$+$iF~<j$G$-$^$9!#(B
-
-   * Q. GNU Emacs $B$G(B favicon $B$rI=<($7$h$&$H$7$?$N$G$9$,!"(BEmacs $B$,%m%C%/(B
-     $B$7$^$7$?!#(B
-   * Q. Emacs-w3m $B$rN)$A>e$2$h$&$H$7$?$i!"7c$7$/%G%#%9%/%"%/%;%9$7$?8e!"(B
-     `process convert exited abnormally with code 10' $B$J$I$HI=<($5$l$^(B
-     $B$7$?!#$I$&$J$C$F$$$k$s$G$7$g$&(B?
-
-     $B8E$$%P!<%8%g%s$N(B Image Magick $B$r;H$C$F$$$^$;$s$+(B?
-     ImageMagick-5.2.1 $B$KIUB0$7$F$$$k(B `convert' $B$r;H$C$F$$$k$H!"$=$&$J(B
-     $B$k$3$H$,CN$i$l$F$$$^$9!#(BImageMagick-5.4.0-5 ($B0J>e(B) $B$KIUB0$7$F$$$k(B
-     `convert' $B$G$O!"@5>oF0:n$,3NG'$5$l$F$$$^$9!#(B
-
-     $B$b$7(B ImageMagick $B$,;H$($J$$!"$^$?$O;H$$$?$/$J$$>l9g$O(B
-     `~/.emacs-w3m' $B%U%!%$%k$K(B
-
-          (setq w3m-use-favicon nil)
-
-     $B$N@_Dj$rDI2C$7$F$/$@$5$$!#(B
-
-   * Q. $B$J$<(B emacs-w3m $B$,(B w3mmee $B$GF0:n$7$J$$$N$G$9$+(B?
-
-     $B$b$7(B `lang=en' $B$^$?$O(B `lang=ja' $B$G(B configure $B$5$l$?(B w3mmee $B$r;H$C(B
-     $B$F$$$k$N$J$i$P!"(B`lang=many' $B$G(B configure $B$7D>$7$F(B ($B$=$l$O(B
-     `configure' $B%9%/%j%W%H$,(B `Which language do you prefer?' $B$H?R$M$?(B
-     $B$H$-$K(B 3 $B$rF~NO$9$k$3$H$K$h$C$F$G$-$^$9(B)$B!"(Bw3mmee $B$r:F9=C[$7$F$/$@(B
-     $B$5$$!#(B
-
-   * Q. $B$J$<(B emacs-w3m $B$G(B web $B%Z!<%8$,8+$($J$$$N$G$7$g$&$+(B?  $B%m!<%+%k$J(B
-     html $B%U%!%$%k$r8+$?$j!"AG$N(B w3m $B$r;H$&>l9g$OLdBjL5$$$N$G$9$,!#(B
-
-     $B$"$k(B Linux $B$NG[I[(B ($BNc$($P(B Gentoo Linux) $B$,4^$s$G$$$k(B w3m $B%3%^%s%I(B
-     $B$K$O!"(Basync $B%Q%C%A(B (1) (*Note Trouble FAQ-Footnotes::) $B$H$$$&$b$N(B
-     $B$,Ev$?$C$F$$$^$9!#$=$l$OAG$N(B w3m $B%3%^%s%I$r;H$&$H$-$KM-MQ$J$N$G$9(B
-     $B$,!"(Bemacs-w3m $B$r%O%s%0$5$;$k$+$b$7$l$^$;$s!#$=$l$,5?$o$l$k$J$i$P!"(B
-     w3m $B%3%^%s%I$r%=!<%9$+$i:F%$%s%9%H!<%k$9$k$3$H$r4+$a$^$9!#(B
-
-   * Q. $B$J$<(B emacs-w3m $B$N%U%l!<%`$,%]%C%W%"%C%W$7$J$$$N$G$9$+(B?
-
-     Emacs-w3m $B$N%U%l!<%`$,B>$N%U%l!<%`$N2<$K1#$l$F$$$F$b!"$=$l(B
-     $B$,(B `M-x w3m <RET>' $B%3%^%s%I$G%]%C%W%"%C%W$9$k$N$O!"$+$J$jJX(B
-     $BMx$G$9!#$7$+$7!"(B`metacity' $B%&%#%s%I%&!&%^%M!<%8%c!<$,;H$o$l$k$$$/$D(B
-     $B$+$N%W%i%C%H%U%)!<%`(B ($BNc$($P(B Fedora Linux) $B>e$G:n$i$l$?(B Emacs $B$rAv$i$;$k(B
-     $B>l9g$K!"$=$l$,F/$+$J$$$H$$$&Js9p$,$"$j$^$7$?!#$=$l$i$N%7%9%F%`$G$O!"(B
-     Emacs $B$N%U%l!<%`$r%]%C%W%"%C%W$5$;$kB>$N5!G=$bF0$+$J$$$G$7$g$&!#$b$7$"$J(B
-     $B$?$,$=$s$J;4$a$J6-6x$K$"$k$J$i$P!"0J2<$N(B advice $B$r;n$92ACM$,$"$k$+$b$7$l(B
-     $B$^$;$s!#(B
-
-          (if (or (not window-system) (featurep 'xemacs))
-              nil
-            (defadvice raise-frame
-              (after make-it-work (&optional frame) activate)
-              "Make it work with the aid of wmctrl."
-              (call-process
-               "wmctrl" nil nil nil "-i" "-R"
-               (frame-parameter (or frame (selected-frame))
-                                'outer-window-id))))
-
-     $B$3$3$G(B `wmctrl' $B$O!"0J2<$N>l=j$G<hF@$G$-$k30It%3%^%s%I$G$9!#(B
-
-     `http://sweb.cz/tripie/utils/wmctrl/'
-
-     Advice $B$r(B `~/.emacs' $B%U%!%$%k$K=q$-9~$`A0$K!"(B`wmctrl' $B%3%^%s%I$r%$(B
-     $B%s%9%H!<%k$7$J$1$l$P$J$i$J$$$3$H$K!"Cm0U$7$F$/$@$5$$!#(B
-
-     $B<!$N$b$N$O:#$N$H$3$m(B emacs-w3m $B$G$OITMW$G$9$,!"$"$k<o$N%"%W%j%1!<(B
-     $B%7%g%s$,F0:n$9$k$?$a$KI,MW$G$9!#(B($BA0$N$b$N$,I,MW$J4D6-$G$O!"$3$l$r(B
-     $B2C$($F$b<:$&$b$N$O$"$j$^$;$s!#(B)
-
-          (if (or (not window-system) (featurep 'xemacs))
-              nil
-            (defadvice pop-to-buffer (after enable-it-to-forcus-frame
-                                            activate)
-              "Enable it to focus frame if `pop-up-frames' is non-nil."
-              (when pop-up-frames
-                (let ((id (condition-case nil
-                              (frame-parameter
-                               (window-frame
-                                (get-buffer-window (ad-get-arg 0)))
-                               'outer-window-id)
-                            (error nil))))
-                  (when id
-                    (call-process
-                     "wmctrl" nil nil nil "-i" "-R" id))))))
-
-     $B:G8e$N$b$N$O$?$V$sMW$i$J$$$G$7$g$&!#$7$+$7!"$$$/$D$+$N%W%i%C%H%U%)!<(B
-     $B%`$G$O;n$7$F$_$k2ACM$,$"$k$+$b$7$l$^$;$s!#(B
-
-          (if (or (not window-system) (featurep 'xemacs))
-              nil
-            (defadvice select-frame (around set-input-focus
-                                            (frame) activate)
-              "Run `select-frame-set-input-focus'."
-              (setq ad-return-value (and (framep frame)
-                                         (frame-live-p frame)
-                                         frame))
-              (ad-deactivate 'select-frame)
-              (unwind-protect
-                  (select-frame-set-input-focus frame)
-                (ad-activate 'select-frame))))
-
-     $B$3$l$i$NBP:v$O!"<!$N(B Emacs $B$N%j%j!<%9(B (22.2 $B$^$?$O(B 23.1) $B$G$OITMW(B
-     $B$K$J$k$G$7$g$&!#(B
-
-
-File: emacs-w3m-ja.info  Node: Trouble FAQ-Footnotes, Up: Trouble FAQ
-
-(1) w3m on cygwin (http://www.page.sannet.ne.jp/knabe/w3m/w3m.html)
-
-
-
-File: emacs-w3m-ja.info, Node: Shimbun FAQ, Prev: Trouble FAQ, Up: Frequently Asked Questions
-
-Shimbun $A$K$(IJ=$A$9$k$(Go3YB(B
-====================
-
-   * Q. $B$J$<(B `shimbun' $B%b%8%e!<%k$,%$%s%9%H!<%k$5$l$J$$$N$G$9$+(B?
-
-     FLIM $B%Q%C%1!<%8$,%$%s%9%H!<%k$5$l$F$$$J$$$H!"(B`shimbun' $B%b%8%e!<%k(B
-     (`shimbun/' $B%G%#%l%/%H%j$K$"$k%U%!%$%k72(B) $B$O%$%s%9%H!<%k$5$l$J$$$3(B
-     $B$H$KCm0U$7$F$/$@$5$$!#(B
-
-     `configure' $B%9%/%j%W%H$O<+F0E*$K(B FLIM $B$NM-L5$rH=Dj$9$k$h$&@_7W$5$l(B
-     $B$F$$$^$9$,!"I8=`E*$G$O$J$$%G%#%l%/%H%j$K(B FLIM $B$,%$%s%9%H!<%k$5$l$F(B
-     $B$$$k$H!"H=Dj$K<:GT$7$^$9!#$=$N>l9g$O(B `--with-addpath' $B%*%W%7%g%s$r(B
-     $B;H$C$F!"(BFLIM $B$,%$%s%9%H!<%k$5$l$F$$$k%G%#%l%/%H%j$rL@<(E*$K;XDj$7(B
-     $B$F$/$@$5$$!#Nc$G$9(B:
-
-          % ./configure --with-addpath=$HOME/share/emacs/site-lisp/flim
-
-
-
-File: emacs-w3m-ja.info, Node: Known Problems, Next: Shimbun Library, Prev: Frequently Asked Questions, Up: Top
-
-$A$"$J$?$J$i$-$C$H=b$(GJn$A$G$-$k(B
-**************************
-
-
-
-
-File: emacs-w3m-ja.info, Node: Shimbun Library, Next: Tips, Prev: Known Problems, Up: Top
-
-$A%&%'%VIO$NPB$(GjL$A$r$BFI$A$`$?$a$N5@>_(B
-******************************
-
-$B%&%'%V$G$O!"$^$9$^$9B?$/$N?7J9!"%a!<%j%s%0%j%9%H$N%"!<%+%$%V!"7G<(HD!"(B
-$B$"$k$$$O8D?M$NF|5-(B (hyper nikki system$B!"(Bweblogs $B$^$?$O(B blogs) $B$,8x3+$5(B
-$B$l$F$$$^$9!#(B`Shimbun' $B%i%$%V%i%j$O!"$=$l$i$N%3%s%F%s%D$r5.J}$N9%$_$N%a!<(B
-$B%i!<$GFI$`$3$H$,$G$-$k$h$&$K$7$^$9!#6qBNE*$K$O!"$=$l$i$N%3%s%F%s%D$r!"(B
-$B%a!<%k$N$h$&$K@07A!&@0M}$9$k5!G=$rDs6!$7$^$9!#(B
-
-$B$9$Y$F$N(B `shimbun' $B%b%8%e!<%k$O!"IaDL$N%a!<%k$d%K%e!<%9$N$h$&$KFI$`$3$H(B
-$B$,$G$-$k5-;v$r@8@.$9$k$3$H$rL\I8$K$7$F$$$^$9!#$7$+$7$J$,$i!"%&%'%V%5%$(B
-$B%H$,$=$l$i$N5-;v$N(B html $B$r$7$P$7$PJQ99$9$k$N$G!"$=$NEY$K;d$?$A$O:$Fq$K(B
-$B$V$D$+$j$^$9!#(B
-
-$B$b$7!"L50UL#$J2hA|$d!"5-;v$H$O4X78$NL5$$%F%-%9%H$,8=$l$k$N$K5$$,$D$$$?(B
-$B$i!"(B($B$?$H$(:3:Y$J$b$N$G$b(B) `report-emacs-w3m-bug' (*Note Mailing
-List::) $B$r;H$C$FJs9p$7$F$/$@$5$$!#(B
-
-`Shimbun' $B%i%$%V%i%j$O!"8=:_!"D+F|?7J9!"FIGd%*%s%i%$%s!"(BEmacs Devel$B!"(B
-XEmacs Beta$B!"(BGnus/Mew/Wanderlust $B$J$I$N%a!<%j%s%0%j%9%H!"(BSlashdot$B!"(B
-Slashdot Japan$B!"$*$h$SB>$N$?$/$5$s$N$b$N$KBP1~$7$F$$$^$9!#6qBNE*$K$O!"(B
-*Note Shimbun Sites:: $B$r;2>H$7$F$/$@$5$$!#(B
-
-$B$H$3$m$G!"(B`Shimbun' $B%i%$%V%i%j$rMxMQ$9$k;~$O!"Cx:n8"$K$D$$$FCm0U$,I,MW(B
-$B$G$9!#(B`Shimbun' $B%i%$%V%i%j$K$h$C$F2C9)!&@8@.$5$l$?5-;v$NCx:n8"$O!"$=$N(B
-$B5-;v$r@8@.$9$k85$K$J$C$?%G!<%?$NCx:n<T$K5"B0$7$^$9!#$7$?$,$C$F!"F@$i$l(B
-$B$?5-;v$rMxMQ$9$k>l9g$O!"85$N%G!<%?$NCx:n<T$N8"Mx$r?/32$7$J$$HO0O$r<i$k(B
-$BK!N'>e$N5AL3$,$"$j$^$9!#$D$^$j!"Cx:n8"K!$KDj$a$i$l$?!V;dE*MxMQ!W$NHO0O(B
-$B$r<i$i$J$1$l$P$J$i$J$$!"$H$$$&$3$H$G$9!#(B
-
-`Shimbun' $B%i%$%V%i%j$rMxMQ$7$?$3$H$K$h$C$F!"K|$,0l$"$J$?$,ITMx1W$rHo$C(B
-$B$?$j!"$"$J$?$,B><T$N8"Mx$r?/32$7$?$3$H$K$h$C$F$"$J$?$,AJ$($i$l$?$H$7$F(B
-$B$b!"(Bemacs-w3m $B3+H/%A!<%`$O0l@Z$N@UG$$rIi$$$^$;$s!#(B
-
-`Shimbun' $B%i%$%V%i%j$O$?$/$5$s$N%b%8%e!<%k$N%3%l%/%7%g%s$G!"$=$l$i$N3F!9(B
-$B$OC1FH$G$O2?$NLr$K$bN)$A$^$;$s!#$3$3$G$OBeI=E*$J;0$D$N(B `Shimbun' $B$N%"%W(B
-$B%j%1!<%7%g%s%W%m%0%i%`(B ($B$=$l$i$N$&$A$NFs$D$O(B `Shimbun' $B%i%$%V%i%j$K4^$^(B
-$B$l$F$$$^$9(B) $B$H!"$"$J$?$,<+J,$G(B `Shimbun' $B%b%8%e!<%k$r:n$kJ}K!$K$D$$$F@b(B
-$BL@$7$^$9(B (Emacs Lisp $B%W%m%0%i%`$r=q$/$3$H$,$G$-$kI,MW$,$"$j$^$9(B)$B!#(B
-
-* Menu:
-
-* Nnshimbun::                   Gnus $B$r%&%'%V%V%i%&%6$K$9$k(B!
-* Mew Shimbun::                 Mew $B$G?7J9$rFI$`(B
-* Shimbun with Wanderlust::     Wanderlust $B$G?7J9$rFI$`(B
-* Shimbun local mode::          $B?7J9$N<hF@$K%7%'%k%9%/%j%W%H$r;H$&(B
-* Shimbun Sites::               $B?7J9$,FI$a$k%5%$%H(B
-* Shimbun Basics::              $B?7J9%b%8%e!<%k$N:n$jJ}(B
-
-`Shimbun' $B%i%$%V%i%j$rMxMQ$9$k$?$a$K$O!"(Bemacs-w3m $B$r9=C[$7$F%$%s%9%H!<(B
-$B%k$9$kA0$K(B FLIM $B%Q%C%1!<%8(B ($B2C$($F(B `nnshimbun' $B$r;H$$$?$1$l$P(B Gnus) $B$r(B
-$B%$%s%9%H!<%k$9$kI,MW$,$"$k$3$H$KCm0U$7$F$/$@$5$$!#(BFLIM $B%Q%C%1!<%8$K$O(B
-APEL $B%Q%C%1!<%8$,I,MW$G$9!#$"$J$?$O(B *Note Other Requirements:: $B$b8+$k$Y(B
-$B$-$+$b$7$l$^$;$s!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Nnshimbun, Next: Mew Shimbun, Prev: Shimbun Library, Up: Shimbun Library
-
-Gnus $A$r%&%'%V%V%i%&%6$K$9$k(B!
-============================
-
-`Nnshimbun' $B$O(B Gnus $B$N%P%C%/%(%s%I$G$9!#$7$+$7$J$,$i!"Nc30E*$K(B Gnus $B$G(B
-$B$O$J$/$F(B emacs-w3m $B$H$H$b$KG[I[$5$l$F$$$^$9!#(B`Nnshimbun' $B$O(B Gnus $B$rJB30(B
-$B$l$FJXMx$J%&%'%V%V%i%&%6$K$9$k$3$H$,$G$-$^$9!#$9$Y$F$N9-9p$KHQ$o$5$l$:(B
-$B$K?7J9<R$N%&%'%V%5!<%P$G5-;v$r=&$$FI$_$9$k$3$H$,$G$-$^$9!#%a!<%j%s%0%j(B
-$B%9%H$N5-;v%"!<%+%$%V$r!"$=$N%j%9%H$K9VFIEPO?$7$F$$$k$h$&$KFI$`$3$H$,$G(B
-$B$-$^$9!#7G<(HD$N=q$-9~$_$bFI$`$3$H$,$G$-$^$9!#Ey!9(B... $B$G$b(B Gnus $B$O(B
-`nnshimbun' $B$G%&%'%V$r2p$7$?Ej9F$,$G$-$J$$$N$G!"%U%)%m!<$7$?$$$H$-$O(B
-emacs-w3m $B$r;H$o$J$1$l$P$$$1$J$$$3$H$KCm0U$7$F$/$@$5$$!#(B
-
-$B$5$i$K(B emacs-w3m $B$G(B HTML $B%a%C%;!<%8$r@07A$9$k$K$O(B *Note Gnus:: $B$b;2>H$7(B
-$B$F$/$@$5$$!#(B
-
-`Nnshimbun' $B$r;O$a$k$?$a$N0lHV4JC1$JJ}K!$O!"%0%k!<%W%P%C%U%!$G0J2<$N$h(B
-$B$&$J$3$H$r$9$k$3$H$G$9(B:
-
-`M-x gnus-group-make-shimbun-group <RET> asahi <RET> national <RET>'
-
-`asahi' $B$H(B `national' $B$O!"@\B3$7$?$$%5!<%P!<$KBP1~$7$?%-!<%o!<%I$H6=L#(B
-$B$N$"$k%0%k!<%W$K!"$=$l$>$lCV$-49$($F$/$@$5$$!#(B`<TAB>' $B$+(B `<SPC>' $B$r%?%$(B
-$B%W$9$k$3$H$K$h$C$F!"$=$l$i$NL>A0$rN>J}$H$bJd40$9$k$3$H$,$G$-$^$9!#(B
-
-$B$b$7(B `gnus-group-mode-map' $B$K==J,$J6u$-$,$"$k$J$i$P!"0J2<$N$h$&$J$b$N$r(B
-`~/.gnus.el' $B%U%!%$%k$K2C$($F$/$@$5$$(B:
-
-     (eval-after-load "gnus-group"
-       '(define-key gnus-group-mode-map "Gn"
-          'gnus-group-make-shimbun-group))
-
-$B$9$k$H!"(B`M-x gnus-group-make-shimbun-group' $B$NBe$o$j(B
-$B$K(B `G n' $B$r;H$&$3$H$,$G$-$^$9!#(B
-
-*$(Go!$A$+$3$N%-$B!<$A$r(B Gnus $A%?%o$B!<$A$KSh$(GR|$A$7$F$/$l$^$;$s$+(B?*
-
-
-$B$3$NB>$K!"(B`gnus-group-make-shimbun-groups' $B%3%^%s%I$r;H$C$F!";XDj$7$?%5!<(B
-$B%P!<$N$9$Y$F$N%0%k!<%W$r:n$k$3$H$,$G$-$^$9!#(B
-
-`Nnshimbun' $B$OC1$K%&%'%V%5!<%P$+$i(B HTML $B%3%s%F%s%D$r<h$j4s$;$F!"$=$l$r(B
-$B5-;v$H$7$FI=<($7$^$9$,!"1JB35-;v(B (*Note Persistent Articles:
-(gnus)Persistent Articles.) $B$r:n$k>l9g$r=|$$$F!"%m!<%+%k%U%!%$%k$K5-;v(B
-$B$r%;!<%V$9$k$3$H$O$"$j$^$;$s!#(B`Nnshimbun' $B$O(B NOV $B%U%!%$%k$r!"$=$l$>$l$N(B
-`nnshimbun' $B%0%k!<%W$G;H$$$^$9!#$=$N%P%C%/%(%s%I$O(B `nnml' $B$H$[$\F1$8$G(B
-$B$9!#(B
-
-$B0J2<$N(B `nnshimbun' $B$K4X$9$kJQ?t$r%+%9%?%^%$%:$9$k$3$H$,2DG=$G$9(B:
-
-`nnshimbun-keep-backlog'
-     $B$3$NJQ?t$O(B `nnshimbun' $B%0%k!<%W$G(B `gnus-keep-backlog' $BJQ?t(B (*Note
-     Article Backlog: (gnus)Article Backlog.) $B$r>e=q$-$7$^$9!#$b$7(B
-     `nnshimbun-keep-backlog' $B$r?t;z(B N $B$K@_Dj$9$k$H!"(B`nnshimbun' $B$O:GBg(B
-     $B$G(B N $B$N8E$$5-;v$r8e$N:F<hF@$N$?$a$K%P%C%U%!$KN/$a$F$*$-$^$9!#$3$N(B
-     $BJQ?t$,(B `nil' $B$G$O$J$/!"?t;z$G$b$J$$>l9g!"(B`nnshimbun' $B$O(B *$A$9$Y$F(B*
-     $B$N4{FI5-;v$rC_$($^$9(B ($B$3$l$ONI$$9M$($G$O$"$j$^$;$s(B)$B!#%G%U%)%k%HCM(B
-     $B$O(B 300 $B$G$9!#(B
-
-     `Nnshimbun' $B$O$"$i$+$8$a<hF@$7$?(B (prefetched) $B5-;v$NJ]B8$K(B
-     backlog $B$r;H$&$N$G!">.$5$9$.$kCM$O(B `prefetch-articles' $B5!G=(B ($B2<5-(B
-     $B;2>H(B) $B$rB;$J$&$+$b$7$l$J$$$3$H$KCm0U$7$F$/$@$5$$!#(B
-
-`nnshimbun-directory'
-     `Nnshimbun' $B$,(B NOV $B%U%!%$%k$H0u%U%!%$%k$rJ]B8$9$k%G%#%l%/%H%j$G$9!#(B
-     $B%G%U%)%k%HCM$O(B `~/News/shimbun/' $B$G$9!#$3$l$O%5!<%P!<JQ?t(B (*Note
-     Server Variables: (gnus)Server Variables.) $B$G$9!#(B
-
-`nnshimbun-default-group-level'
-     `gnus-level-default-subscribed' $B$r>e=q$-$9$k!"%G%U%)%k%H$N%0%k!<%W(B
-     $B%l%Y%k$G$9!#?7$?$K:n$i$l$?(B `nnshimbun' $B%0%k!<%W$KE,MQ$5$l$^$9!#%G(B
-     $B%U%)%k%HCM$O(B `nil' $B$G$9!#$3$l$O%5!<%P!<JQ?t(B (*Note Server
-     Variables: (gnus)Server Variables.) $B$G$9!#(B
-
-`nnshimbun-marks-is-evil'
-     $B$b$7(B `nil' $B$G$J$1$l$P!"(BGnus $B$O(B `shimbun' $B%9%W!<%k$N$?$a$K0u(B
-     (marks) $B%U%!%$%k$r:n$j$b;H$$$b$7$^$;$s!#0u%U%!%$%k$r;H$&$3$H$K$h$C(B
-     $B$F!"(B`shimbun' $B%0%k!<%W$r(B `.newsrc.eld' $B$+$i@Z$jJ|$7$F%P%C%/%"%C%W(B
-     $B$7!"I|85$9$k$3$H$,2DG=$K$J$j$^$9!#2?$i$+$NM}M3$G$3$l$r(B `t' $B$K@_Dj(B
-     $B$7$?8e$G!":F$S(B `nil' $B$K$9$k>l9g$O$$$D$b!"%0%k!<%W$N0u%U%!%$%k$r>C(B
-     $B$5$J$1$l$P$J$j$^$;$s(B ($BIaDL$=$l$O(B `shimbun' $B%0%k!<%W$N%G%#%l%/%H%j(B
-     $B$K$"$k(B `.marks' $B$H$$$&L>A0$N%U%!%$%k$G$9$,!"@53N$K$O(B
-     `nnshimbun-marks-file-name' $B$NCM$r;2>H$7$F$/$@$5$$(B)$B!#$=$&$9$l$P(B
-     Gnus $B$K$h$C$F0u%U%!%$%k$,:F@8@.$5$l$k$G$7$g$&!#%G%U%)%k%HCM$O(B
-     `nil' $B$G$9!#$3$l$O%5!<%P!<JQ?t(B (*Note Server Variables:
-     (gnus)Server Variables.) $B$G$9!#(B
-
-`Nnshimbun' $B$O(B Gnus $B$,Ds6!$9$kI8=`$N%0%k!<%W%Q%i%a!<%?(B (1) (*Note
-Nnshimbun-Footnotes::) $B$K2C$($F!"(B`nnshimbun' $B@lMQ$K@_$1$i$l$?%0%k!<(B
-$B%W%Q%i%a!<%?$rMxMQ$9$k$3$H$,$G$-$^$9!#J#?t$N(B `nnshimbun' $BMQ$N%Q%i(B
-$B%a!<%?$,(B `nnshimbun-group-parameters' $B$H$$$&C10l$N%0%k!<%W%Q%i%a!<(B
-$B%?(B ($B$9$Y$F$N%0%k!<%W$G0c$&CM$r;}$D$3$H$,$G$-$k(B) $B$K$^$H$a$i$l$F$$$^$9!#(B
-$B$=$l$O%W%m%Q%F%#%j%9%H$G!"Nc$($P<!$N$h$&$JCM$G$9(B:
-
-     '(index-range all prefetch-articles off encapsulate-images on
-                   expiry-wait 6)
-
-$B0J9_$O$3$l$i$N%0%k!<%W%Q%i%a!<%?$H!"4XO"$9$kJQ?t$N@bL@$G$9!#(B
-
-`prefetch-articles'
-     $B$3$N%0%k!<%W%Q%i%a!<%?$,(B `off' $B$^$?$O(B `nil' $B0J30$N2?$+$K@_Dj$5$l$F(B
-     $B$$$k%0%k!<%W$G$O!"(B`nnshimbun' $B$O?7$7$$5-;v$rC5$9$@$1$G$O$J$/!"$=$l(B
-     $B$i$N5-;v$N%@%&%s%m!<%I$b9T$$$^$9!#$3$l$O?7$7$$5-;v$N8!:w$rCY$/$7$^(B
-     $B$9$,!"5-;v$r1\Mw$9$k$H$-$KBT$?$5$l$^$;$s!#$3$N%0%k!<%W%Q%i%a!<%?$,(B
-     $B@_Dj$5$l$F$$$J$$$+!"$=$NCM$,(B `nil' $B$K$J$C$F$$$k%0%k!<%W$G$O!"Be$o(B
-     $B$j$KJQ?t(B `nnshimbun-pre-fetch-article' $B$NCM(B ($B%G%U%)%k%H$O(B `off')
-     $B$,;H$o$l$^$9!#(B
-
-`encapsulate-images'
-     $B$3$N%0%k!<%W%Q%i%a!<%?$,(B `off' $B$^$?$O(B `nil' $B0J30$N2?$+$K@_Dj$5$l$F(B
-     $B$$$k%0%k!<%W$G$O!"(B`nnshimbun' $B$O85$N5-;v$KKd$a9~$^$l$F$$$k2hA|%G!<(B
-     $B%?$r(B MIME $B$N(B `multipart/related' $B%Q!<%H$H$7$F5-;v$K$O$a9~$_$^$9!#(B
-     $B$3$N%0%k!<%W%Q%i%a!<%?$,@_Dj$5$l$F$$$J$$$+!"$=$NCM$,(B `nil' $B$K$J$C(B
-     $B$F$$$k%0%k!<%W$G$O!"Be$o$j$KJQ?t(B `nnshimbun-encapsulate-images' $B$N(B
-     $BCM$,;H$o$l$^$9!#$3$NJQ?t(B `nnshimbun-encapsulate-images' $B$N%G%U%)%k(B
-     $B%HCM$O!"(B`shimbun' $B%i%$%V%i%j$K$h$C$FDs6!$5$l$kJQ?t(B
-     `shimbun-encapsulate-images' $B$NCM$G$9(B ($B$?$V$s%G%U%)%k%HCM$O(B `t' $B$G(B
-     $B$9(B)$B!#(B
-
-`index-range'
-     $B%0%k!<%W%Q%i%a!<%?(B `index-range' $B$G!"%&%'%V%5!<%P!<$+$i<hF@$5$l$k(B
-     $B5-;v$NHO0O$r;XDj$9$k$3$H$,$G$-$^$9!#HO0O$N;XDj$K$O0J2<$NCM$r;H$C$F(B
-     $B$/$@$5$$(B:
-
-     `nil'
-     `all'
-          $B$9$Y$F$N%Z!<%8(B
-
-     `last'
-          $B:G?7$N%Z!<%8$@$1(B
-
-     `integer N'
-          $B:G?7$N(B N $B%Z!<%8(B
-
-     `Nnshimbun' $B$O%5!<%P!<>e$KB8:_$9$kL\<!%Z!<%8$r2r@O$7$F?7$7$$5-;v$N(B
-     $BM-L5$rD4$Y$^$9!#%5!<%P!<$K$h$C$F$O$=$N$h$&$JL\<!%Z!<%8$,J#?tB8:_$9(B
-     $B$k>l9g$,$"$j$^$9!#Nc$($P!"%a!<%j%s%0%j%9%H$N5-;v$rDs6!$7$F$$$k%5!<(B
-     $B%P!<$N>l9g$O!"$=$N5-;v$,Ej9F$5$l$?F|IU$K$h$C$FJ,N`$5$l$?L\<!$K$J$C(B
-     $B$F$$$k$3$H$,0lHLE*$G$9!#FC$KCY$$2s@~$rMxMQ$7$F$$$k;~$K!"$=$l$i$9$Y(B
-     $B$F$N5pBg$JL\<!$rD4$Y$k$K$O!"AjEv$J;~4V$,$+$+$k$G$7$g$&!#(B
-
-     `Nnshimbun' $B$OA02s$N@\B3;~$KD4$Y$?L\<!$K$D$$$F$O!"$J$k$Y$/D4$Y$:$K(B
-     $B:Q$^$;$k$h$&$K$J$C$F$$$^$9!#99$K;~4V$r@aLs$7$?$$>l9g$O(B `last' $B$r;H$C(B
-     $B$F$/$@$5$$!#$3$l$O(B `nnshimbun' $B$K!":G?7$NL\<!$@$1$r;2>H$7$F?7$7$$(B
-     $B5-;v$N8!::$r9T$J$o$;$^$9!#(B
-
-     $B%0%k!<%W%Q%i%a!<%?(B `index-range' $B$,@_Dj$5$l$F$$$J$$$+!"CM$,(B `nil'
-     $B$K$J$C$F$$$k%0%k!<%W$G$O!"JQ?t(B `nnshimbun-index-range' $B$NCM(B ($B%G%U%)(B
-     $B%k%H$O(B `2') $B$,;H$o$l$^$9!#(B
-
-`nnshimbun-group-parameters-alist'
-     $B$3$l$O(B Emacs Lisp $BJQ?t$G!"%0%k!<%WL>$N@55,I=8=$H(B `nnshimbun' $BMQ%0(B
-     $B%k!<%W%Q%i%a!<%?$NO"A[%j%9%H$G$9!#%G%U%)%k%HCM$O(B `nil' $B$G$9!#3F!9(B
-     $B$NMWAG$O(B `(REGEXP KEYWORD VALUE KEYWORD VALUE...)' $B$N7A<0$r;}$A$^(B
-     $B$9!#Nc$($P(B:
-
-          '("^nnshimbun\\+asahi:" index-range all prefetch-articles off
-            encapsulate-images on expiry-wait 6)
-
-     $B;w$?L>A0$r;}$D(B ($B$9$J$o$A!"8_$$$K;w$?@-3J$r;}$C$F$$$=$&$J(B) $BJ#?t$N%0(B
-     $B%k!<%W$KBP$7$FF1$8(B `nnshimbun' $B%0%k!<%W%Q%i%a!<%?$r;XDj$9$k$3$H$,(B
-     $B$G$-$k$N$G!"8D!9$N%0%k!<%W$KBP$7$F$=$l$>$l%0%k!<%W%Q%i%a!<%?$r@_Dj(B
-     $B$9$kBe$o$j$K;H$&$3$H$,$G$-$FJXMx$G$9!#$b$7%0%k!<%W$G$9$G$K%0%k!<%W(B
-     $B%Q%i%a!<%?$N@_Dj$,9T$J$o$l$F$$$?>l9g$O!"$3$NJQ?t$h$j$b$=$A$i$,M%@h(B
-     $B$5$l$^$9!#(B
-
-`Nnshimbun' $B$K$O5-;v$N4|8B@Z$l>C5n$r9T$J$o$;$k$3$H$,$G$-$^$9(B (2)
-(*Note Nnshimbun-Footnotes::)$B!#5-;v$,4|8B@Z$l>C5n$5$l$k$H8@$C$F$b!"$=$l(B
-$B$,1s3V%5!<%P!<$+$i:o=|$5$l$k$o$1$G$O$J$/!"$=$l$O$:$C$H$=$3$+$i<hF@2DG=(B
-$B$G$"$k$3$H$r3P$($F$*$$$F$/$@$5$$!#>C$($k$N$O$"$J$?<+?H$N(B `nnshimbun' $BMQ(B
-$B$N(B NOV $B%U%!%$%k(B (3) (*Note Nnshimbun-Footnotes::) $B$N!">C5n$5$l$k5-;v$K(B
-$B3:Ev$9$k9T$G$9!#$=$l$K$h$C$F$=$N5-;v$OFsEY$H35N,%P%C%U%!$K8=$l$J$/$J$j(B
-$B$^$9!#(B
-
-`Nnshimbun' $B%0%k!<%W$G5-;v$N4|8B@Z$l>C5n$r9T$J$o$J$$$H(B NOV $B%U%!%$%k$,:](B
-$B8BL5$/B@$jB3$1!"Hs>o$K8E$$5-;v$,$"$?$+$bB8:_$7$F$$$k$h$&$K8+$($k$+$b$7(B
-$B$l$^$;$s(B ($B<B:]$K$O!"$=$l$i$O?7J9<R$N%5!<%P!<$G;0G/A0$K4|8B@Z$l>C5n$5$l(B
-$B$F$7$^$C$F$$$k$+$b$7$l$J$$(B!)$B!#$=$l$rFI$b$&$H$7$F$b5-;v%P%C%U%!$K$O2?$b(B
-$B8=$l$J$$$G$7$g$&!#0lJ}!"%a!<%j%s%0%j%9%H$N5-;v$rDs6!$7$F$$$k$?$$$F$$$N(B
-$B%5!<%P!<$O!"0lHLE*$K2a5n$NA45-;v$rDs6!$7$F$$$^$9!#M+=%$NH`J}$K5n$j$78E(B
-$B$-NI$-;~Be$K!"$"$J$?$,6=$8$?5-;v$r2{$+$7$/$&$k$&$k$7$FFI$_JV$9$3$H$,$G(B
-$B$-$k$h$&$K!"$=$&$$$&%0%k!<%W$G$O4|8B@Z$l>C5n$O$5$;$?$/$J$$$H;W$&$+$b$7(B
-$B$l$^$;$s!#(B
-
-$BB>$N%a!<%k%P%C%/%(%s%I$HF1MM$K!"(B`nnshimbun' $B$N%0%k!<%WKh$K5-;v$K<+F04|(B
-$B8B@Z$l>C5n$N0u$rIU$1$F!";D$7$F$*$/4|4V$r@_Dj$9$k$3$H$,$G$-$^$9!#$?$@$7(B
-`nnshimbun' $B%P%C%/%(%s%I$HB>$N%a!<%k%P%C%/%(%s%I$K$O!">/$70c$$$,$"$j$^(B
-$B$9(B:
-
-   * $BBh0l$K!";D$7$F$*$/4|4V$N%G%U%)%k%HCM$O0J2<$NM%@hEY$G7hDj$5$l$^$9!#(B
-     $B%0%k!<%W$K$h$C$F%G%U%)%k%HCM$,0[$J$k$+$b$7$l$J$$$3$H$KCm0U$7$F$/$@(B
-     $B$5$$!#(B
-
-       1. $B%0%k!<%W$K$*$1$k(B `expiry-wait' $B%0%k!<%W%Q%i%a!<%?$NCM!#(B
-
-       2. $B$=$N%0%k!<%W$rBP>]$H$7$F!"JQ?t(B `nnmail-expiry-wait-function'
-          $B$rI>2A$9$k$3$H$K$h$C$FF@$i$l$?CM!#(B
-
-       3. $B%0%k!<%W$KBP1~$9$k(B `shimbun' $B%b%8%e!<%k$,Ds6!$9$k%G%U%)%k%HCM!#(B
-
-       4. $BJQ?t(B `nnmail-expiry-wait' $B$NCM!#(B
-
-     $BBhFs$K!"JQ?t(B `nnmail-expiry-wait-function' $B$K$h$C$F@_Dj$5$l$k4X?t(B
-     $B$KM?$($i$l$k0z?t$K!"(B"nnshimbun+asahi:national" $B$N$h$&$K%P%C%/%(%s(B
-     $B%I$H%5!<%P!<$NL>A0$,4^$^$l$k$3$H$G$9!#B>$N%a!<%k%P%C%/%(%s%I$N>l9g(B
-     $B$K$O%0%k!<%WL>$@$1$,M?$($i$l$k$N$K!"$G$9!#Nc$r5s$2$^$7$g$&(B:
-
-          (setq nnmail-expiry-wait-function
-                (lambda (group)
-                  (cond ((string-equal group "ding") 7)
-                        ((string-equal group "nnshimbun+ding:ding") 'never))))
-
-     $B$3$l$O!"F1$8(B ding $B%a!<%j%s%0%j%9%HMQ$KFs$D$N%0%k!<%W$,$"$k$3$H$r0U(B
-     $BL#$7$^$9(B: $B0l$D$O%j%9%H$N%a%s%P!<$H$7$F9VFIEPO?$7$F$$$^$9!#$b$&0l$D(B
-     $B$O(B Gnus $B%?%o!<$N%a!<%j%s%0%j%9%H%"!<%+%$%V$+$iFI$`$?$a$N$b$N$G$9!#(B
-     $B$I$&$G$9!"$J$+$J$+8-$$$G$7$g(B?  "ding" $B%0%k!<%W$N%m!<%+%k$J%a!<%k%U%!(B
-     $B%$%k$O<7F|$G4|8B@Z$l>C5n$5$l!"%m!<%+%k%G%#%9%/$NMFNL$,@aLs$5$l$^$9!#(B
-     $B$7$+$7Fs$DL\$N%0%k!<%W$G$O!"A0@$5*$N5-;v$G$5$(FI$`$3$H$,$G$-$^$9(B
-     ($B$=$l$,K\Ev$KI,MW$J$i$P!"$G$9$,(B)$B!#(B
-
-     $BBh;0$K!"$3$l$O$"$J$?$K5?G0$,J($$$?$H$-$K;W$$=P$9$3$H$,$G$-$k$h$&$K(B
-     $B=q$-N1$a$i$l$F$$$^$9(B: `nnshimbun' $B%0%k!<%W$N$9$Y$F$N5-;v$,4|8B@Z$l(B
-     $B>C5n$5$l$k$Y$-$H$-$G$b!":G?7$N0lDL$@$1$O>C$5$:$K;D$7$F$*$-$^$9!#$3(B
-     $B$l$O$"$J$?$NL$N}?4$rK~B-$5$;$k$?$a$G$O$J$/!"<!2s$K$3$N%0%k!<%W$N?7(B
-     $B$7$$5-;v$r<hF@$7$h$&$H$7$?$H$-$K!"(B`nnshimbun' $B$,$I$3$+$i;O$a$k$+$r(B
-     $BCN$C$F!"$9$Y$F$N5-;v$r<hF@$7D>$5$J$$$h$&$K$9$k$?$a$G$9!#(B
-
-`Nnshimbun' $B$N4|8B@Z$l>C5n$K4X78$9$k%0%k!<%W%Q%i%a!<%?$HJQ?t$O0J2<$NDL(B
-$B$j$G$9(B:
-
-`expiry-wait'
-     $B$I$&$+:.Mp$J$5$i$J$$$h$&$K!#(B`expiry-wait' $B%0%k!<%W%Q%i%a!<%?$,(B
-     `nnshimbun' $B@lMQ$K:n$i$l$?%0%k!<%W%Q%i%a!<%?(B
-     `nnshimbun-group-parameters' $B$NMWAG$N0l$D$H$7$FDs6!$5$l$^$9!#$=$l(B
-     $B$OI8=`$N%0%k!<%W%Q%i%a!<%?$HF1$8L>A0$r;}$A!"0UL#$bF1$8$G$9!#$"$J$?(B
-     $B$O$I$A$i$r;H$C$F$b9=$$$^$;$s!#$b$7(B `nnshimbun' $B@lMQ$N$b$N$,(B `nil'
-     $B0J30$NCM$K@_Dj$5$l$k$H!"I8=`$N$b$N$h$j$bM%@h$5$l$^$9!#$3$l$O(B
-     `nnshimbun' $B$K4X78$9$k$b$N$r(B "Gnus Customize" $B%P%C%U%!(B ($B%0%k!<%W%P%C(B
-     $B%U%!$G(B `G c' $B$r%?%$%W$9$k$H8=$l$k(B) $B$N0l2U=j$K=8$a$k$?$a$H!"JQ?t(B
-     `nnshimbun-group-parameters-alist' $B$G0l3g$7$F4IM}$G$-$k$h$&$K$9$k(B
-     $B$3$H$rL\E*$KMQ0U$7$?$b$N$G$9(B (4) (*Note Nnshimbun-Footnotes::)$B!#@_(B
-     $BDj$G$-$kCM$OI8=`$N%0%k!<%W%Q%i%a!<%?$HF1MM$K!";~8B>C5n$NF|?t!"(B
-     `never' $B$^$?$O(B `immediate' $B$G$9!#(B
-
-`nnshimbun-keep-unparsable-dated-articles'
-     $B$3$NJQ?t$NCM$,(B `nil' $B$G$J$$>l9g$O!":n@.$5$l$?(B ($B$^$?$OE~Ce$7$?(B) $B;~(B
-     $B9o$,$o$+$i$J$$5-;v$O4|8B@Z$l>C5n$5$l$^$;$s!#$J$K$7$m$I$N$/$i$$8E$$(B
-     $B$N$+$o$+$i$J$$$s$G$9$+$i!#%G%U%)%k%HCM$O(B `t' $B$G$9!#(B`nil' $B$K@_Dj$9(B
-     $B$k$H!"4|8B@Z$l>C5n$N=hM}$,9T$J$o$l$k$H$-$K!"4|8B$,$o$+$i$J$$5-;v$G(B
-     $B$bL5>r7o$G>C$5$l$F$7$^$$$^$9!#$^$"!"G/$NJk$l$NBgA]=|$NLr$K$ON)$D$3(B
-     $B$H$,H=L@$9$k$+$b$7$l$^$;$s!#(B
-
-
-File: emacs-w3m-ja.info  Node: Nnshimbun-Footnotes, Up: Nnshimbun
-
-(1) $A%0%k$B!<$A%W%Q%i%a$B!<$A%?$r$(G]C$A6($9$k$?$a$NWn$bJV$(I?I$A$J7=7($O!"%0%k$B!<$A%W%P%C%U%!(B
-$A$G!"$(G]C$A6($7$?$$%0%k$B!<$A%W$N$(G^[$AKy$KRF$(GY/$A$7$F$+$i(B `G c' $A$r%?%$%W$9$k$3(B
-$A$H$G$9(B (*Note Group Parameters: (gnus)Group Parameters.)$A!#(B
-
-(2) `Nnshimbun' $A%0%k$B!<$A%W$GWT$(GY/$AFZO^GP$lO{H%$rPP$J$&7=7($OVw$K6~$D$"(B
-$A$j$^$9!#R;$D$O%0%k$B!<$A%WC{$NU}$(G]=$A1m$(G\"(B ("^nnshimbun\\+" $A$GJ<$^$i$J$1$l$P$J(B
-$A$j$^$;$s(B) $A$r$(I+y$AJ}(B `gnus-auto-expirable-newsgroups' $A$KW7<S$7$F!"O{H%(B
-$A$9$k$^$G$NHUJ}$r8w%0%k$B!<$A%W$(I#z$A$K(B `nnmail-expiry-wait-function' $A$GV8(B
-$A6($9$k$3$H$G$9!#$b$&R;$D$O!"WT$(GY/$AFZO^GP$lO{H%$rPP$J$o$;$?$$$?$$$9$Y$F$N(B
-`nnshimbun' $A%0%k$B!<$A%W$G!"%0%k$B!<$A%W%Q%i%a$B!<$A%?(B `auto-expire' $A$r(B
-`t' $A$K$(G]C$A6($7$F!"%0%k$B!<$A%W%Q%i%a$B!<$A%?(B `expiry-wait' $A$GO{H%$9$k$^(B
-$A$G$NFZO^$rV86($9$k$d$j7=$G$9!#$(Gf[$A$7$$$3$H$O(B *Note $A%a$B!<$A%k(B $A$NFZO^GP$lO{H%(B: (gnus-ja)Expiring Mail, $A$r2NUU$7$F$/$@$5$$!#(B
-`expiry-wait' $A%0%k$B!<$A%W%Q%i%a$B!<$A%?$,$(G]C$A6($5$l$F$$$J$$%0%k$B!<$A%W$G$O!"%G(B
-$A%U%)%k%H$N$(I/N$A$,$(GoK$ASC$5$l$^$9!#(B
-
-(3) `Nnshimbun'$ASC$N(B NOV $A%U%!%$%k(B
-$A$O(B~/News/shimbun/asahi/national/.overview" $A$N$h$&$JC{G0$G$9!#(B
-
-(4) $A$J$<(B `auto-expire' $A$J$I$,(B `nnshimbun' $B@l$ASC$N%0%k$B!<$A%W(B
-$A%Q%i%a$B!<$A%?$K:,$^$l$J$$$N(B? $A$H$$$&$(GYB$A$$$K$(I%\$A$9$k4p$($r$9$G$KSCRb$7$F$$(B
-$A$^$9!#$=$N4p$($H$O!"(B`expiry-wait' $A$,(B `nnshimbun' $A%P%C%/(B
-$A%(%s%I$K$h$C$FH!$j$(H$/$A$o$l$k$N$K$(I%\$A$7$F!"(B`auto-expire' $A$O(B Gnus
-$A$NVPJ`$,H!$j$(H$/$A$$$^$9!#$7$?$,$C$F!"(BGnus $A$,R;$D$NLX6($N%P%C%/%(%s%I(B
-$A$N$?$a$K$(I@>$A$/(B ($A$9$J$o$A!"(B`nnshimbun' $B@l$ASC$N%0%k$B!<$A%W%Q%i%a$B!<$A%?(B
-$A$+$i$(I/N$A$r$BFI$A$`(B) $A$h$&$K(B Gnus $A$NVPJ`$(Gq"$AD\$r$(I)/$(GZ/$A$9$k$3$H$O!"(BGnus $A$N$(G]CSS(B
-$A%]%j%7$B!<$A$K74$9$k$N$G$9!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Mew Shimbun, Next: Shimbun with Wanderlust, Prev: Nnshimbun, Up: Shimbun Library
-
-Mew $A$GPB$(GjL$A$r$BFI$A$`(B
-================
-
-Mew Shimbun $B$O(B `shimbun' $B$H(B Mew (version 2.1 $B0J9_(B) $B$H$H$b$K;H$&$3$H$r0U(B
-$B?^$7$?(B Emacs Lisp $B%W%m%0%i%`$G$9!#(BMew, APEL $B$*$h$S(B FLIM $B$b%$%s%9%H!<%k(B
-$B$5$l$F$$$l$P!"(Bemacs-w3m $B$r%$%s%9%H!<%k$9$k$H$-$K0l=o$K%$%s%9%H!<%k$5$l(B
-$B$^$9!#(B
-
-*Note Mew:: $B$b;2>H$9$k$3$H$r$*4+$a$7$^$9!#(B
-
-  1. $B=t@_Dj(B
-
-     $B0J2<$N3F9T$r(B `~/.mew.el' $B%U%!%$%k$N:G8e$K=q$$$F$/$@$5$$(B:
-
-     ;;; mew-shimbun $B$N%m!<%I!"%-!<Dj5A(B
-
-     ;; (setq mew-shimbun-use-unseen t) ;; (1) (*Note Mew
-     Shimbun-Footnotes::)
-     (require 'mew-shimbun)
-     (define-key mew-summary-mode-map "G"  (make-sparse-keymap))
-     (define-key mew-summary-mode-map "Gg" 'mew-shimbun-goto-folder)
-     (define-key mew-summary-mode-map "GG" 'mew-shimbun-goto-unseen-folder)
-     (define-key mew-summary-mode-map "Gi" 'mew-shimbun-retrieve)
-     (define-key mew-summary-mode-map "GI" 'mew-shimbun-retrieve-all)
-     (define-key mew-summary-mode-map "Gr" 'mew-shimbun-re-retrieve)
-     (define-key mew-summary-mode-map "GR" 'mew-shimbun-re-retrieve-all)
-     (define-key mew-summary-mode-map "Ge" 'mew-shimbun-expire)
-     (define-key mew-summary-mode-map "GE" 'mew-shimbun-expire-all)
-
-     ;; `mew-shimbun-folder-groups' $B$K(B Mew $B$G9XFI$9$k(B `shimbun' servers $B5Z$S(B
-     ;; group $B$r@_Dj$7$^$9!#$=$l$>$l$NMWAG$O(B
-     ;; `("folder" ("server.group" . range) ...)' $B$N7A<0$G$9!#(B`range' $B$K$O(B
-     ;; `all', `last', $B$*$h$S?t;z$,;XDj$G$-$^$9!#(B
-
-     (setq mew-shimbun-folder-groups
-           '(;; `+shimbun/yomiuri' $B$H$$$&(B folder $B$K(B `yomiuri.national',
-             ;; `yomiuri.sports' $B$J$I$r0l3g$7$F<hF@$7$^$9!#(B
-             ("yomiuri"
-              ("yomiuri.national" . 2)
-              ("yomiuri.sports". 2)
-              ("yomiuri.world". 2))
-             ;; `+shimbun/security-memo' $B$K(B `security-memo.memo' $B$r<hF@$7$^$9!#(B
-             ("security-memo"
-              ("security-memo.memo" . 2))
-             ("slashdot-jp"
-              ("slashdot-jp.story" . last))
-             ;; $B$3$N$h$&$K!"0[$J$k(B server $B$N(B group $B$b0l$D$N(B folder
-             ;; (`+shimbun/emacs') $B$GFI$`$3$H$,$G$-$^$9!#(B
-             ("emacs"
-              ("airs.wl" . last)
-              ("emacs-w3m.emacs-w3m" . last))
-             ;; `+shimbun/hns/arisawa', `+shimbun/hns/miyoshi' $B$K$=$l$>$l$N(B
-             ;; $BF|5-$r<hF@$7$^$9!#(B
-             ("hns/arisawa"
-              ("hns.arisawa" . last))
-             ("hns/miyoshi"
-              ("hns.miyoshi" . last))))
-
-     $B0J>e$G4pK\E*$J@_Dj$O=*N;$G$9!#B>$N%f!<%6Dj5AJQ?t$O(B `mew-shimbun' $B%0(B
-     $B%k!<%W$r(B `M-x customize-group' $B$9$k$+!"%=!<%9$r8+$F$/$@$5$$!#(B
-
-  2. $B5-;v$N9XFI(B
-
-       a. $B:G=i$N9XFI(B
-
-          $B>e5-$N@_Dj$r$7$?$"$H!"$^$:(B `G I' $B$7$^$7$g(B
-          $B$&(B (`mew-shimbun-retrieve-all')$B!#(B
-          `mew-shimbun-folder-groups' $B$G<o!9$N@_Dj$r9T$J$C$?(B `shimbun'
-          folder $B$,(B `+shimbun' $B0J2<$K=PMh$^$9!#$^$?!"?7$?$K(B group $B$rDI2C$7$?(B
-          $B$H$-$b(B `G I' $B$9$k$HJXMx$G$9!#$J$*!"(B
-          `+shimbun' $B$O(B `mew-shimbun-folder' $B$H$$$&JQ?t$G9%$_$N$b$N$KJQ(B
-          $B99$G$-$^$9!#(B
-
-       b. `shimbun' folder $B$X$N0\F0(B
-
-          $BDL>o$N(B `g' (`mew-summary-goto-folder') $B$G$b(B `shimbun'
-          folder $B$X$N0\F0$O$G$-$^$9$,!"(B
-          `G g' (`mew-shimbun-goto-folder') $B$r;H$&$H(B `shimbun'
-          folder $B8BDj$G0\F0$G$-$^$9!#$^$?(B `C-u G g' $B$H(B prefix $B$r$D$1$?$H$-(B
-          $B$O!"?75,5-;v$N$"$k(B folder ($B$^$@(B scan $B$r$7$F$$$J$$(B folder) $B$N$_I=<($7$^$9!#(B
-          `G G' $B$G$bF1MM$G$9!#(B
-
-       c. folder $BC10L$G$N5-;v$N<hF@(B
-
-          `shimbun' folder $B$G(B `G i' (`mew-shimbun-retrieve') $B$9(B
-          $B$k$H!"8=:_$N(B `shimbun' folder $B$G?75,5-;v$r<hF@$7$^$9!#(B
-
-       d. $B99?7$5$l$?5-;v$N<hF@(B
-
-          $BFCDj$N5-;v$rI=<($7$?>uBV(B
-          $B$G(B `G r' (`mew-shimbun-re-retrieve') $B$9$k$H!"$=$N5-;v$,99?7(B
-          $B$5$l$F$$$?$i99?7$7!"F1;~$K?75,5-;v$b<hF@$7$^$9!#(B`C-u G r' $B$H$9$k(B
-          $B$H!"(B`mew-shimbun-mark-re-retrieve' $B$K;XDj$7$?%^!<%/(B ($B%G%U%)%k%HCM(B
-          $B$O(B `@') $B$N5-;v$N99?7$r;n$_$^$9!#(BCNET $B$J$I$G;H$&$HJXMx$G$7$g$&!#(B
-
-          `G R' (`mew-shimbun-re-retrieve-all') $B$G$O!"$9$Y$F$N5-;v$N(B
-          $B?75,@-$rD4$Y<hF@$7$J$*$7$^$9!#(B`C-u G R' $B$G$O%j!<%8%g%s$G;XDj$7$?(B
-          $BHO0O$N5-;v$rBP>]$H$7$^$9!#$*$=$i$/%O%$%Q!<F|5-%7%9%F%`$,2TF/$7$F$$$kF|5-(B
-          $B%5%$%H$G$OM-0U5A$J%3%^%s%I$G$7$g$&!#(B
-
-  3. $BL$FI4IM}(B
-
-     `~/.mew.el' $B%U%!%$%k$G0J2<$N@_Dj$r9T$J$C$F$$$k$H!"(B
-
-          (setq mew-shimbun-use-unseen t)
-
-     $B?75,$K<hF@$7$?5-;v$K(B `mew-shimbun-mark-unseen' $B$G@_Dj$7$?%^!<%/(B
-     ($B%G%U%)%k%H$O(B `*') $B$,$D$/$h$&$K$J$j!"FI$`$H<+F0E*$K>C$($^$9!#(B
-
-     $BDL>o!"(BMew $B$N(B summary $B%b!<%I$G%^!<%/$r$D$1$k!"$"$k$$$O>C$7$?8e!"(B
-     scan $B$r$7$J$$$H(B `.mew-cache' $B%U%!%$%k$KH?1G$5$l$^$;$s$,!"(B
-     `~/.mew.el' $B%U%!%$%k$G0J2<$N@_Dj$r9T$J$&$3$H$K$h$j!"(B
-
-          (setq mew-shimbun-use-unseen-cache-save t)
-
-     Mew $B$N=*N;;~$d(B folder $B$N(B kill $B;~(B (`C-c C-q' $B$r;H$C$?$H$-(B) $B$K(B
-     `shimbun' folder $B$O<+F0E*$K(B `.mew-cache' $B%U%!%$%k$rJ]B8$9$k$h$&$K(B
-     $B$J$j$^$9!#$?$@$7!"3N<B(B (2) (*Note Mew Shimbun-Footnotes::)$B$KJ]B8$9(B
-     $B$k$o$1$G$O$"$j$^$;$s!#4{FI$K$J$C$?>pJs$r3N<B$K(B cache $B$KJ]B8$9$k$K(B
-     $B$O!"$=$N(B folder $B$rFI$_=*$o$C$?$H$-$K(B `scan update' $B$r$9$k=,47(B
-     $B$r$D$1$k$HNI$$$G$7$g$&!#(B
-
-     $BL$FI$K;H$&%^!<%/$,(B `*' $B$8$c%@%a!"$H$$$&J}$O!"JQ(B
-     $B?t(B `mew-shimbun-mark-unseen' $B$r%+%9%?%^%$%:$7$F$/$@$5$$(B ($B>e=R(B)$B!#(B
-     `C-u N' $B$G$=$N%^!<%/$r;XDj$9$k$H3Z$7$$L$FI%i%$%U$r$*$/$k$3$H$,$G(B
-     $B$-$k$H;W$$$^$9!#(B
-
-  4. $B4|8B@Z$l5-;v$N>C5n(B
-
-     $B;vA0$K(B `mew-shimbun-expires' $B$r@_Dj$7$F$*$/$H!"4|8B@Z$l5-;v$N>C5n(B
-     $B$r9T$J$&$3$H$,$G$-$^$9!#Nc$($P(B:
-
-          (setq mew-shimbun-expires
-                '(("yomiuri" . 7)
-                  ("asahi" . 1)
-                  ("slashdot-jp" . 7)
-                  ("emacs" . 7)))
-
-     $B>e5-$N$h$&$K@_Dj$7$F$*$/$H!"(B`+shimbun/yomiuri' $B$O(B 7$BF|!"(B
-     `+shimbun/asahi' $B$O(B 1$BF|$H4|8B$r@_Dj$9$k$3$H$,$G$-$^$9!#;XDj$5$l$F$$(B
-     $B$J$$(B `shimbun' folder $B$O>C5n$7$^$;$s!#(B`G e'
-     (`mew-shimbun-expire') $B$G$=$N(B folder $B$N4|8B@Z$l5-;v$r>C5n$7$^$9!#(B
-     `G e' (`mew-shimbun-expire') $B$G@_Dj$7$?$9$Y$F$N(B folder $B$G5-(B
-     $B;v$N>C5n$r<B9T$7$^$9!#$J$*!"0lEY>C5n$7$?5-;v$OI|5l=PMh$^$;$s$N$GCm0U$7$F(B
-     $B$/$@$5$$!#(B
-
-  5. $BL$FI%^!<%/$H$7$F(B `$' $B$rDI2C$9$kJ}K!(B
-
-     `$' $B%^!<%/$r?7$?$K:n@.$7!"(B`$' $B%^!<%/$rL$FI%^!<%/$H$7$F;H$&$K$O!"<!(B
-     $B$N5-=R$r(B `~/.mew.el' $B%U%!%$%k$K5-=R$7$F$/$@$5$$!#$J$*!"(B`$' $B0J30$N(B
-     $B5-9f$K$7$?$1$l$P!"(B
-     `http://www.mew.org/ml/mew-dist-2.0/msg01251.html' $B$r;2>H$7$F5-=R(B
-     $B$r@8@.$7$F$/$@$5$$!#(B
-
-     ;;----------------------------------------------------------------------
-     ;;; `$' $B$rL$FI%^!<%/$H$7$F;H$&$?$a$N5-=R(B
-     (setq mew-mark-unseen ?$)
-     (setq mew-shimbun-mark-unseen mew-mark-unseen)
-     (setq mew-mark-show-list (cons mew-mark-unseen mew-mark-show-list))
-     (setq mew-mark-afterstep-spec
-           (cons (cons mew-mark-unseen '(1 0 1 0 0 0 0))
-                 mew-mark-afterstep-spec))
-     (setq mew-mark-spec
-           (cons (list mew-mark-unseen "unseen" 0 nil nil nil nil nil)
-                 mew-mark-spec))
-     (setq mew-highlight-mark-keywords
-           (cons
-            (cons mew-mark-unseen 'mew-face-mark-unseen)
-            mew-highlight-mark-keywords))
-     (defface mew-face-mark-unseen
-       '((((class color) (type tty))
-          (:foreground "green"))
-         (((class color) (background light))
-          (:foreground "deep pink" :bold t :italic t))
-         (((class color) (background dark))
-          (:foreground "thistle"))
-         (t (:bold t)))
-       "*Face to highlight the unseen mark"
-       :group 'mew-highlight)
-     (defun mew-summary-unseen (&optional count)
-       "Put the unseen mark(default is '$') in COUNT times."
-       (interactive "P")
-       (mew-mark-put-mark-loop (function mew-summary-unseen-one) count nil))
-     (defun mew-summary-unseen-one (&optional no-msg)
-       "Put the unseen mark(default is '$') on this message."
-       (mew-mark-put-mark mew-mark-unseen no-msg))
-     (defun mew-summary-mark-unseen ()
-       "Change the '*' mark into the '$' mark."
-       (interactive)
-       (mew-summary-exchange-mark mew-mark-review mew-mark-unseen))
-     (defun mew-thread-mark-unseen ()
-       "Put the '$' mark on all messages of the current sub-thread."
-       (interactive)
-       (mew-thread-mark mew-mark-unseen))
-
-     (define-key mew-summary-mode-map "$"  'mew-summary-unseen)
-     (define-key mew-summary-mode-map "m$" 'mew-summary-mark-unseen)
-     (define-key mew-summary-mode-map "t$" 'mew-thread-mark-unseen)
-     ;;----------------------------------------------------------------------
-
-
-File: emacs-w3m-ja.info  Node: Mew Shimbun-Footnotes, Up: Mew Shimbun
-
-(1) $AN4$BFI$A9\@m$r$9$k$H$-$O%3%a%s%H$rMb$7$F$/$@$5$$!#$3$N$(I+y$AJ}$O1X$:(B
-`(require 'mew-shimbun)' $A$NG0$G$(G]C$A6($7$J$$$H$$$1$^$;$s!#(B
-
-(2) `mew-touch-folder-p' $A$,(B `t' $A$NHK$O$[$\(B 100% $A1#4f$G$-(B
-$A$^$9$,!"(B`nil' $A$NHK$,1#4f$G$-$k?ID\PT$O$[$H$s$I(B 0% $A$@$HK<$o$l(B
-$A$^$9!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Shimbun with Wanderlust, Next: Shimbun local mode, Prev: Mew Shimbun, Up: Shimbun Library
-
-Wanderlust $A$GPB$(GjL$A$r$BFI$A$`(B
-=======================
-
-Wanderlust $B$K$O(B ELMO $B%b%8%e!<%k$N0l$D$H$7$F(B `elmo-shimbun' $B$,4^$^$l$F$$(B
-$B$k$N$G!"L>A0$,(B `@' $B$G;O$^$k%U%)%k%@$K%"%/%;%9$9$k$@$1$G(B `shimbun' $B$rFI(B
-$B$`$3$H$,$G$-$^$9(B (*Note Shimbun Folder: (wl-ja)Shimbun Folder.)$B!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Shimbun local mode, Next: Shimbun Sites, Prev: Shimbun with Wanderlust, Up: Shimbun Library
-
-$APB$(GjL$A$NH!5C$K%7%'%k%9%/%j%W%H$rJ9$&(B
-==================================
-
-$B$?$/$5$s$N?7J9$rFI$s$G$$$k$H!"?7$7$$5-;v$r%A%'%C%/$9$k$N$K$$$/$i$+;~4V(B
-$B$,$+$+$k$G$7$g$&!#$=$l$O(B emacs-w3m $B$,:w0z$r0l$D$:$D<hF@$9$k$+$i$G$9!#$3(B
-$B$l$r9bB.$K9T$J$$$?$$$J$i!":w0z$N<hF@$K%7%'%k%9%/%j%W%H$r;H$&$3$H$,$G$-(B
-$B$^$9!#%9%/%j%W%H$O<jF0$G(B ($BNc$($P(B Emacs $B$NCf$+$i(B) $B:nF0$5$;$F$bNI$$$7!"(B
-cron $B$N$h$&$J%9%1%8%e!<%i$r2p$7$F<+F0$GAv$i$;$k$3$H$b$G$-$^$9!#:w0z$OFC(B
-$BJL$JL>A0$N%U%!%$%k$K%;!<%V$5$l!"$=$N8e(B emacs-w3m $B$O(B w3m $B$r8F$VBe$o$j$K(B
-$B$=$l$i$N%U%!%$%k$r;H$&$h$&$K$J$j$^$9!#(B
-
-$B0J2<$NJQ?t$G!"$=$N!V%m!<%+%k%b!<%I!W$r@)8f$7$^$9(B:
-
-`shimbun-use-local'
-     $B$3$l$r(B `t' $B$K@_Dj$9$k$3$H$K$h$C$F%m!<%+%k%b!<%I$rM-8z$K$7$^$9!#$=(B
-     $B$&$9$k$H!"$b$7%m!<%+%k%U%!%$%k$H$7$F:w0z$,MQ0U$G$-$F$$$l$P!"(B
-     emacs-w3m $B$O:G=i$K$=$l$r%A%'%C%/$7$^$9!#$b$7$=$l$,8+$D$+$i$J$+$C$?(B
-     $B$i!"DL>oDL$j(B w3m $B$rDL$7$F<hF@$7$^$9!#(B
-
-`shimbun-local-path'
-     $B?7J9$N(B ($B:w0z$N(B) $B%U%!%$%k$r3JG<$9$k%G%#%l%/%H%j$G$9!#%G%U%)%k%H$O(B
-     `w3m-default-save-directory' $B$G$9!#(B
-
-$B:w0z$N$?$a$N%U%!%$%k$NL>A0$O!"(BURL $B$N(B MD5 $B$r:G=i$N(B 10 $BJ8;z$K@Z$j5M$a$?$b(B
-$B$N$N8e$m$K(B `_shimbun' $B$H$$$&J8;zNs$r$/$C$D$1$?$b$N$K$J$j$^$9!#<!$N$h$&(B
-$B$K(B Emacs $B$G4JC1$K:w0z$N$?$a$N%U%!%$%k$r@8@.$9$k$3$H$,$G$-$^$9(B:
-
-     (concat (substring (md5 "http://example/feed") 0 10) "_shimbun")
-
-Gnus $B$H(B `nnshimbun' $B$r;H$C$F$$$k?M$?$A$N$?$a$K!"%7%'%k%9%/%j%W%H$r@8@.(B
-$B$9$k4X?t$,$9$G$K$"$j$^$9!#$=$l$r;H$C$F!"8=:_9VFI$7$F$$$k$9$Y$F$N(B
-shimbun $B%0%k!<%W$N:w0z$r%@%&%s%m!<%I$9$k$3$H$,$G$-$^$9!#C1$K(B
-`nnshimbun-generate-download-script' $B$r8F$s$G$/$@$5$$!#$9$k$H?7$7$$%P%C(B
-$B%U%!$K%7%'%k%9%/%j%W%H$,@8@.$5$l$k$N$G!"8e$G%;!<%V$7$F$/$@$5$$!#@\F,0z(B
-$B?t$rIU$1$F$=$N4X?t$r8F$V$H!":w0z$N<hF@$rJB9T$7$F9T$J$&$?$a$K!"$9$Y$F$N(B
-w3m $B8F$S=P$7$K(B `&' $B$rIU$1$^$9!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Shimbun Sites, Next: Shimbun Basics, Prev: Shimbun local mode, Up: Shimbun Library
-
-$APB$(GjL$A$,$BFI$A$a$k%5%$%H(B
-==================
-
-`Shimbun' $B%i%$%V%i%j$,BP1~$7$F$$$k%5%$%H$N0lMwI=$G$9!#(B
-
-* Menu:
-
-* Newspapers Supported by Shimbun::     $B?7J9<R(B
-* News Sites Supported by Shimbun::     $B%K%e!<%9%5%$%H(B
-* Mailing Lists Supported by Shimbun::  $B%a!<%j%s%0%j%9%H(B
-* Sport Sites Supported by Shimbun::    $B%9%]!<%D(B
-* Misc Sites Supported by Shimbun::     $B$=$NB>(B
-
-
-
-File: emacs-w3m-ja.info, Node: Newspapers Supported by Shimbun, Next: News Sites Supported by Shimbun, Prev: Shimbun Sites, Up: Shimbun Sites
-
-$APB$(GjL$AIg(B
-------
-
-`Shimbun' $B%i%$%V%i%j$,BP1~$7$F$$$k?7J9<R$G$9!#(B
-
-$A3/HUPB$(GjL(B (http://www.asahi.com/)
-     asahi.book asahi.book.column asahi.book.news asahi.book.paperback
-     asahi.book.review asahi.book.special asahi.business asahi.car
-     asahi.culture asahi.digital asahi.editorial asahi.edu
-     asahi.english asahi.food asahi.health asahi.housing asahi.igo
-     asahi.international asahi.international.asia
-     asahi.international.column asahi.international.special
-     asahi.international.world asahi.job asahi.kansai
-     asahi.kansai.entertainment asahi.kansai.kokoro asahi.kansai.sumai
-     asahi.kansai.taberu asahi.komimi asahi.life asahi.life.column
-     asahi.national asahi.politics asahi.rss asahi.science
-     asahi.shopping asahi.shopping.column asahi.shopping.yakimono
-     asahi.shougi asahi.sports asahi.sports.baseball
-     asahi.sports.battle asahi.sports.etc asahi.sports.football
-     asahi.sports.golf asahi.sports.rugby asahi.sports.usa
-     asahi.sports.winter asahi.tenjin asahi.travel asahi.wakata
-
-     $B$3$l$i$N%0%k!<%W$O!"%G%U%)%k%H$G%F%-%9%H$@$1$N5-;v$r:n$j$^$9!#$=$l(B
-     $B$i$K!"%F%-%9%H$@$1$G$J$/<L??$r$b4^$`(B HTML $B$N5-;v$r@8@.$5$;$?$$$J$i(B
-     $B$P!"0J2<$N9T$r(B `~/.emacs' $B%U%!%$%k$K2C$($F$/$@$5$$!#(B
-
-          (setq shimbun-asahi-prefer-text-plain nil)
-
-     $B0lJ}!"(BHTML $B$N5-;v$r:n$k$?$a$K(B `asahi-html' $B%P%C%/%(%s%I$r;H$&$3$H(B
-     $B$b$G$-$^$9!#$=$l$r;H$&$K$O!"Nc$($P%0%k!<%WL>$H$7$F(B
-     `asahi.business' $B$NBe$o$j$K(B `asahi-html.business' $B$r;XDj$7$F$/$@$5(B
-     $B$$!#(B
-
-$A3/HUPB$(GjL(B (http://mytown.asahi.com/)
-     asahi-mytown.(hokkaido...okinawa)
-
-     $BF|K\$NA4ETF;I\8)$rLVMe$9$kD+F|?7J9$NCOJ}HG$G$9!#(B
-
-BBC (http://www.bbc.co.uk/)
-     bbc.news
-
-$A%G%#$B!<$A!$%t%'%k%H(B (http://www.welt.de/)
-     welt-de.news
-
-$A%G%#$B!<$A!$%D%!%$%H(B (http://www.zeit.de/)
-     zeit-de.auto zeit-de.computer zeit-de.deutschland
-     zeit-de.feuilleton zeit-de.gesundheit zeit-de.international
-     zeit-de.leben zeit-de.literatur zeit-de.musik zeit-de.news
-     zeit-de.reisen zeit-de.schule zeit-de.sport zeit-de.studium
-     zeit-de.wirtschaft zeit-de.wissen zeit-de.zuender
-
-$A%2%s%@%$%M%C%H(B (http://gendai.net/)
-     gendai-net.today gendai-net.syakai gendai-net.sports
-     gendai-net.geino gendai-net.wadai gendai-net.kenko
-     gendai-net.syoku gendai-net.book
-
-$(I#z$AHU(Bjp (http://mainichi.jp/)
-(2007$ADj(B10$ATB$K(B MSN $A$+$iWTIg%5%$%H$KRFPP(B)
-     mainichi.flash mainichi.sports mainichi.entertainment
-     mainichi.entertainment.art mainichi.mantan mainichi.electronics
-     mainichi.weekly mainichi.opinion.editorial
-     mainichi.opinion.yoroku mainichi.opinion.hasshinbako
-     mainichi.opinion.eye mainichi.opinion.hito mainichi.opinion.kinji
-     mainichi.opinion.yuraku mainichi.opinion.closeup
-     mainichi.opinion.kaisetsu mainichi.opinion.newsup
-
-     $B$3$l$i$N%0%k!<%W$O!"%G%U%)%k%H$G<L??$r$b4^$`(B HTML $B$N5-;v$r:n$j$^$9!#(B
-     $B$=$l$i$K!"%F%-%9%H$@$1$N5-;v$r@8@.$5$;$?$$$J$i$P!"0J2<$N9T$r(B
-     `~/.emacs' $B%U%!%$%k$K2C$($F$/$@$5$$!#(B
-
-          (setq shimbun-mainichi-prefer-text-plain t)
-
-$A%K%e$B!<$A%h$B!<$A%/%?%$%`%:(B (http://www.nytimes.com/)
-     nytimes.homepage nytimes.news.business
-     nytimes.news.business.media&advertising
-     nytimes.news.business.worldbusiness
-     nytimes.news.business.smallbusiness
-     nytimes.news.business.yourmoney nytimes.news.business.dealbook
-     nytimes.news.education nytimes.news.health
-     nytimes.news.health.policy nytimes.news.health.psychology
-     nytimes.news.world nytimes.news.world.africa
-     nytimes.news.world.americas nytimes.news.world.asia
-     nytimes.news.world.europe nytimes.news.world.middleeast
-     nytimes.news.us nytimes.news.newyork nytimes.news.newyork.thecity
-     nytimes.news.newyork.metro nytimes.news.obituaries
-     nytimes.news.science nytimes.news.science.earth
-     nytimes.news.science.nutrition nytimes.news.science.space
-     nytimes.news.sports nytimes.news.sports.basketball.college
-     nytimes.news.sports.football.college nytimes.news.sports.golf
-     nytimes.news.sports.hockey nytimes.news.sports.other
-     nytimes.news.sports.baseball.pro
-     nytimes.news.sports.basketball.pro
-     nytimes.news.sports.football.pro nytimes.news.sports.soccer
-     nytimes.news.technology nytimes.news.technology.bits
-     nytimes.news.technology.circuits nytimes.news.technology.pogue
-     nytimes.news.washington nytimes.features.arts
-     nytimes.features.arts.design nytimes.features.arts.music
-     nytimes.features.arts.television nytimes.features.automobiles
-     nytimes.features.books nytimes.features.books.review
-     nytimes.features.dining&wine nytimes.features.fashion
-     nytimes.features.fashion.thursdaystyles
-     nytimes.features.fashion.weddings nytimes.features.home&garden
-     nytimes.features.jobs nytimes.features.magazine
-     nytimes.features.movie.news nytimes.features.movie.reviews
-     nytimes.features.realestate nytimes.features.theater
-     nytimes.features.travel nytimes.features.travel.escapes
-     nytimes.features.week_in_review nytimes.additional.pop_top
-     nytimes.opinion.editorial
-
-     2007$BG/(B9$B7n(B19$BF|!"%K%e!<%h!<%/%?%$%`%:$OL5NA$G%K%e!<%95-;v$rDs6!$7;O(B
-     $B$a$^$7$?!#(B`charset=iso-8859-1' $B$H8@$C$?$N$K$b$+$+$o$i$:!"$3$N%5%$(B
-     $B%H$O$7$P$7$P(B `iso-8859-1' $B$N>e0L8_49J8;z%;%C%H$G$"$k(B
-     `windows-1252' $B$r;H$$$^$9!#;HMQ$7$F$$$k(B (X)Emacs $B$K(B
-     `windows-1252' coding system $B$,$"$l$P!"(B`shimbun' $B$O(B ($B$=$7$F(B
-     emacs-w3m $B$b(B) $B$=$N$h$&$J>l9g$G$bF0:n$7$^$9!#(B
-
-$AHU?/%9%]$B!<$A%D(B (http://www.nikkansports.com/)
-     nikkansports.flash nikkansports.baseball
-     nikkansports.baseball.highschool nikkansports.baseball.amateur
-     nikkansports.baseball.mlb nikkansports.soccer
-     nikkansports.soccer.japan nikkansports.soccer.world
-     nikkansports.sports nikkansports.sumo nikkansports.nba
-     nikkansports.nfl nikkansports.nhl nikkansports.rugby
-     nikkansports.golf nikkansports.motor nikkansports.battle
-     nikkansports.race nikkansports.race.kka
-     nikkansports.entertainment nikkansports.cinema
-     nikkansports.general
-
-$AHU1>$(I8+6v$APB$(GjL(B (http://www.nikkei.co.jp/)
-     nikkei.top nikkei.main nikkei.keizai nikkei.sangyo nikkei.tento
-     nikkei.kansai nikkei.it.business nikkei.it.busi_gyoukai
-     nikkei.it.biz-system nikkei.it.sox nikkei.it.data
-     nikkei.it.taidan nikkei.it.internet nikkei.it.broad
-     nikkei.it.net_gyoukai nikkei.it.iptel nikkei.it.tele
-     nikkei.it.broadcast nikkei.it.internet-column nikkei.it.contents
-     nikkei.it.ec nikkei.it.policy nikkei.it.e-gov nikkei.it.mobile
-     nikkei.it.mob_gyoukai nikkei.it.mobsoft nikkei.it.mobcon
-     nikkei.it.money nikkei.it.one nikkei.it.security
-     nikkei.it.net_crime nikkei.it.digital nikkei.it.pc nikkei.kokunai
-     nikkei.markets nikkei.kawase nikkei.kinri nikkei.ft nikkei.dj
-     nikkei.ngyoseki nikkei.gyosuuchi nikkei.gyoseki nikkei.china
-     nikkei.market nikkei.kaigai nikkei.seiji nikkei.shakai
-     nikkei.retto nikkei.sports nikkei.newpro nikkei.release
-     nikkei.release.it.comp nikkei.release.it.peri
-     nikkei.release.it.sys nikkei.release.it.cont
-     nikkei.release.it.net nikkei.release.it.lsi
-     nikkei.release.it.game nikkei.release.it.etc
-     nikkei.release.dist.depart nikkei.release.dist.ryohan
-     nikkei.release.dist.zakka nikkei.release.dist.cosme
-     nikkei.release.dist.car nikkei.release.dist.book
-     nikkei.release.dist.record nikkei.release.dist.food
-     nikkei.release.dist.mercha nikkei.release.dist.mail
-     nikkei.release.dist.netshop nikkei.release.dist.etc
-     nikkei.release.money.bank nikkei.release.money.sec
-     nikkei.release.money.am nikkei.release.money.insu
-     nikkei.release.money.etc nikkei.release.maker.chemi
-     nikkei.release.maker.mecha nikkei.release.maker.car
-     nikkei.release.maker.elec nikkei.release.maker.food
-     nikkei.release.maker.sports nikkei.release.maker.apparel
-     nikkei.release.maker.commu nikkei.release.maker.etc
-     nikkei.release.service.medic nikkei.release.service.rest
-     nikkei.release.service.trans nikkei.release.service.energy
-     nikkei.release.service.enter nikkei.release.service.env
-     nikkei.release.service.consul nikkei.release.service.edu
-     nikkei.release.service.haken nikkei.release.service.life
-     nikkei.release.service.media nikkei.release.service.lease
-     nikkei.release.service.travel nikkei.release.service.etc
-     nikkei.release.const.const nikkei.release.const.house
-     nikkei.release.const.etc nikkei.shasetsu
-
-MSN $(I7E8+$A%K%e$B!<$A%9(B (http://sankei.jp.msn.com/)
-(2007$ADj(B10$ATB$+$i(B MSN $A$KRFPP(B)
-     sankei.points sankei.affairs sankei.politics sankei.economy
-     sankei.world sankei.sports sankei.entertainments sankei.life
-     sankei.culture sankei.release sankei.region sankei.usatoday
-     sankei.usatoday.ja sankei.column.sankeisho sankei.column.shucho
-     sankei.column.seiron
-
-Spiegel Online (http://www.spiegel.de/)
-     spiegel.news
-
-$A%9%]%K%A(B (http://www.sponichi.co.jp/)
-     sponichi.baseball sponichi.soccer sponichi.usa sponichi.others
-     sponichi.society sponichi.entertainment sponichi.horseracing
-
-$ADO%I%$%DPB$(GjL(B (http://www.sueddeutsche.de/)
-     sueddeutsche-de.alles sueddeutsche-de.nachrichten
-     sueddeutsche-de.politik sueddeutsche-de.wirtschaft
-     sueddeutsche-de.finanzen sueddeutsche-de.kino
-     sueddeutsche-de.kultur sueddeutsche-de.sport
-     sueddeutsche-de.muenchen sueddeutsche-de.panorama
-     sueddeutsche-de.leben sueddeutsche-de.gesundheit
-     sueddeutsche-de.computer
-
-$(G{t$(I%D$APB$(GjL(B (http://www.yomiuri.co.jp/)
-     yomiuri.atmoney yomiuri.editorial yomiuri.entertainment
-     yomiuri.iryou yomiuri.kyoiku yomiuri.kyoiku.children
-     yomiuri.kyoiku.english yomiuri.kyoiku.qanda
-     yomiuri.kyoiku.renaissance yomiuri.kyoiku.special
-     yomiuri.national yomiuri.politics yomiuri.science yomiuri.sports
-     yomiuri.world
-
-     $B$3$l$i$N%0%k!<%W$O!"%G%U%)%k%H$G%F%-%9%H$@$1$N5-;v$r:n$j$^$9!#$=$l(B
-     $B$i$K!"%F%-%9%H$@$1$G$J$/<L??$r$b4^$`(B HTML $B$N5-;v$r@8@.$5$;$?$$$J$i(B
-     $B$P!"0J2<$N9T$r(B `~/.emacs' $B%U%!%$%k$K2C$($F$/$@$5$$!#(B
-
-          (setq shimbun-yomiuri-prefer-text-plain nil)
-
-     $B0lJ}!"(BHTML $B$N5-;v$r:n$k$?$a$K(B `yomiuri-html' $B%P%C%/%(%s%I$r;H$&$3(B
-     $B$H$b$G$-$^$9!#$=$l$r;H$&$K$O!"Nc$($P%0%k!<%WL>$H$7$F(B
-     `yomiuri.atmoney' $B$NBe$o$j$K(B `yomiuri-html.atmoney' $B$r;XDj$7$F$/$@(B
-     $B$5$$!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: News Sites Supported by Shimbun, Next: Mailing Lists Supported by Shimbun, Prev: Newspapers Supported by Shimbun, Up: Shimbun Sites
-
-$A%K%e$B!<$A%9%5%$%H(B
---------------
-
-`Shimbun' $B%i%$%V%i%j$,BP1~$7$F$$$k%K%e!<%9%5%$%H$G$9!#(B
-
-Al Jazeera (http://english.aljazeera.net/)
-     aljazeera.news aljazeera.africa aljazeera.america
-     aljazeera.asia-pacific aljazeera.central-asia aljazeera.europe
-     aljazeera.middle-east aljazeera.focus aljazeera.business
-     aljazeera.sport aljazeera.programmes
-
-CNET (http://news.com.com/)
-     cnet.news cnet.enterprise.software cnet.enterprise.hardware
-     cnet.security cnet.networking cnet.personal.technology
-     cnet.newsmakers cnet.perspectives
-
-CNET Japan (http://japan.cnet.com/)
-     cnet-jp.general cnet-jp.news cnet-jp.special cnet-jp.opinion
-     cnet-jp.blog.geetstate cnet-jp.blog.kenn cnet-jp.blog.lessig
-     cnet-jp.blog.matsumura cnet-jp.blog.nakajima cnet-jp.blog.saeki
-     cnet-jp.blog.sakamoto cnet-jp.blog.sasaki cnet-jp.blog.sentan
-     cnet-jp.blog.staff cnet-jp.blog.takawata cnet-jp.blog.watanabe
-
-CNN Japan (http://www.cnn.co.jp/)
-     cnn-jp.business cnn-jp.fringe cnn-jp.science cnn-jp.showbiz
-     cnn-jp.sports cnn-jp.top cnn-jp.usa cnn-jp.world
-
-De-Bug Magazine (http://www.de-bug.de/)
-     debugmagazin-de.frontpage debugmagazin-de.musik
-     debugmagazin-de.reviews debugmagazin-de.magazin
-     debugmagazin-de.medien debugmagazin-de.podcast
-     debugmagazin-de.musiktechnik debugmagazin-de.screen
-     debugmagazin-de.gadgets debugmagazin-de.games
-     debugmagazin-de.mode
-
-Engadget Japanese (http://japanese.engadget.com/)
-     engadget-ja.top
-
-$A%(%-%5%$%H(B $A%K%e$B!<$A%9(B (http://www.excite.co.jp/)
-     excite.bit-koneta excite.world-odd
-
-$AWTSI$(I$b@>$AU_M,CK%I%$%D(B (http://www.fau.org/)
-     fau.news
-
-$A%O%$%<!$%*%s%i%$%s(B (http://www.heise.de/)
-     heise.news heise.telepolis
-
-Infoshop News (http://news.infoshop.org/)
-     infoshop.news
-
-$A%$%s%W%l%9(B (http://www.watch.impress.co.jp/)
-     impress.enterprise impress.pc impress.dc impress.akiba impress.av
-     impress.game impress.k-tai impress.internet impress.bb
-     impress.forest impress.robot impress.kaden impress.car
-
-ITmedia (http://www.itmedia.co.jp/)
-     itmedia.news.bursts itmedia.news.domestic itmedia.news.foreign
-     itmedia.news.products itmedia.news.technology itmedia.news.web20
-     itmedia.news.nettopics itmedia.news.society itmedia.news.security
-     itmedia.news.industry itmedia.news.research itmedia.news.sp_amd
-     itmedia.anchordesk itmedia.bizid itmedia.enterprise
-     itmedia.+D.plusd itmedia.+D.mobile itmedia.+D.pcupdate
-     itmedia.+D.lifestyle itmedia.+D.games itmedia.+D.docomo
-     itmedia.+D.au_kddi itmedia.+D.vodafone itmedia.+D.shopping
-     itmedia.+D.lifestyle.column.asakura
-     itmedia.+D.lifestyle.column.honda
-     itmedia.+D.lifestyle.column.kobayashi
-     itmedia.+D.lifestyle.column.kodera
-     itmedia.+D.lifestyle.column.nishi
-     itmedia.+D.lifestyle.column.ogikubo
-     itmedia.+D.lifestyle.column.tachibana
-     itmedia.+D.lifestyle.column.takemura
-     itmedia.+D.lifestyle.column.unakami
-
-Japan Times (http://www.japantimes.co.jp/)
-     japantimes.general japantimes.business
-
-LAUT AG (http://www.laut.de/)
-     laut-de.news laut-de.platten laut-de.platten_alternative
-     laut-de.platten_dance laut-de.platten_hiphop platten_jazz
-     laut-de.platten_metal laut-de.platten_pop laut-de.platten_rnb
-     laut-de.platten_rock
-
-N24 (http://www.n24.de/)
-     n24-de.boerse n24-de.boulevard n24-de.nachrichten n24-de.netnews
-     n24-de.politik n24-de.sport n24-de.wirtschaft
-
-Open Tech Press (http://opentechpress.jp/)
-     opentechpress-jp.general opentechpress-jp.enterprise
-     opentechpress-jp.opensource opentechpress-jp.security
-     opentechpress-jp.news opentechpress-jp.pr
-
-Perlentaucher ($AUfVi$(GZh$A$j(B) (http://www.perlentaucher.de/)
-     perlentaucher-de.aktuell
-
-Rediff.com (http://www.rediff.com/)
-     rediff.news
-
-Slashdot (http://www.slashdot.org/)
-     slashdot.frontpage slashdot.apple slashdot.askslashdot
-     slashdot.books slashdot.developers slashdot.games
-     slashdot.hardware slashdot.interviews slashdot.IT slashdot.linux
-     slashdot.mobile slashdot.politics slashdot.science
-
-     Slashdot shimbun $B$N%3%a%s%H$NItJ,$r@_Dj$9$k$?$a$N0J2<$NJQ?t$,$"$j(B
-     $B$^$9(B:
-
-     `shimbun-slashdot-get-comments'
-          $B$b$7(B `t' $B$K@_Dj$5$l$F$$$k$H(B ($B$=$l$,%G%U%)%k%H$G$9(B)$B!"$9$Y$F$N(B
-          $B5-;v$N%3%a%s%H$r<hF@$7$^$9!#$=$l$i$O%U%)!<%`%U%#!<%IJ8;z(B
-          ("^L" $B$N$3$H(B) $B$G%$%s%H%m!&%F%-%9%H$+$iJ,N%$5$l$^$9!#$=$l$i$r(B
-          $B8+$k$K$O!"$$$D$b$N$h$&$K5-;v%P%C%U%!$r%9%/%m!<%k$7$F$/$@$5$$(B
-          (Gnus $B$G$O(B "Next page" $B%\%?%s$H(B "Previous page" $B%\%?%s$r;H$&(B
-          $B$3$H$,$G$-$^$9(B)$B!#$3$NJQ?t$r(B `nil' $B$K@_Dj$9$k$H!"5-;v$N%3%a%s(B
-          $B%H$r<hF@$7$J$/$J$j$^$9!#(B
-
-     `shimbun-slashdot-comment-threshold'
-          $BI=<($5$l$k%3%a%s%H$NogCM$G$9(B ($B%G%U%)%k%H$O(B 3)$B!#(B-1 ($B$9$Y$F$N%3(B
-          $B%a%s%H(B) $B$+$i(B 5 ($B:G9b%l!<%H(B) $B$^$G$N4V$N?t$K$7$F$/$@$5$$!#(B
-
-     `shimbun-slashdot-comment-display'
-          $B%3%a%s%H$rI=<($9$k7A<0$G$9(B ($B%G%U%)%k%H$O(B "flat")$B!#(B"flat"$B!"(B
-          thread" $B$^$?$O(B "nested" $B$N$I$l$+$K$7$F$/$@$5$$!#$3$l$O%7%s%\(B
-          $B%k$G$O$J$/J8;zNs$G$J$1$l$P$J$j$^$;$s!#(B
-
-Slashdot Japan (http://slashdot.jp/)
-     slashdot-jp.story slashdot-jp.askslashdot slashdot-jp.bookreview
-     slashdot-jp.bsd slashdot-jp.developers slashdot-jp.interview
-     slashdot-jp.linux slashdot-jp.mac slashdot-jp.mobile
-     slashdot-jp.science slashdot-jp.security slashdot-jp.slash
-     slashdot-jp.it slashdot-jp.hardware slashdot-jp.diary.oliver
-
-     $BJQ?t(B `shimbun-slashdot-jp-group-alist' $B$KE,@Z$J@_Dj$r2C$($k$H!"$=(B
-     $B$NB>$N%f!<%6!<$NF|5-$b1\Mw$G$-$^$9!#(B
-
-Tech-On! $AHU$(I8+(BBP$AIg(B (http://techon.nikkeibp.co.jp/)
-     tech-on.latestnews tech-on.mobile tech-on.bbint tech-on.d-ce
-     tech-on.AT tech-on.edaonline tech-on.device tech-on.lsi
-     tech-on.silicon tech-on.observer tech-on.fpd tech-on.mono
-     tech-on.embedded tech-on.mecha tech-on.MEMS tech-on.nano
-     tech-on.carele tech-on.board tech-on.mcu tech-on.PLM
-     tech-on.memory tech-on.measurement tech-on.column.mot
-
-     Tech-On! $B$OF|7P(BBP$B<R$,Ds6!$9$k5;=Q%K%e!<%9%5%$%H$G$9!#0JA0$O5-;v$N(B
-     $BFbMF$rA4ItFI$`$?$a$K%m%0%$%s!&%"%+%&%s%H(B ($BL5NA(B) $B$,I,MW$G$7$?$,!">/(B
-     $B$J$/$H$b(B 2007$BG/$N=)$K$*$$$F$OMW$i$J$$$h$&$K8+$($^$9!#>-Mh$b$7:F$S(B
-     $BI,MW$K$J$C$?$i(B $A5G$(IS:$A%Z$B!<$A%8(B
-     (http://techon.nikkeibp.co.jp/guide/inf_regi.html) $B$K9T$C$F<hF@$7(B
-     $B$F$/$@$5$$!#<!$NFs$D$NJQ?t$G!"$I$&$d$C$F%m%0%$%s$9$k$+$r@)8f$7$^$9(B:
-
-     `shimbun-tech-on-user-name'
-          Tech-On! $B$K%m%0%$%s$9$k$?$a$N%f!<%6!<L>$G$9!#(B`nil' $B$@$H(B
-          Tech-On! $B$K%m%0%$%s$9$k$H$-$K!"%f!<%6!<L>$NF~NO$rMW5a$5$l$^$9!#(B
-          $BJ8;zNs$@$C$?$i$=$l$,%f!<%6!<L>$H$7$F;H$o$l!"F~NO$rMW5a$5$l$k(B
-          $B$3$H$O$"$j$^$;$s!#(B`nil' $B$G$bJ8;zNs$G$b$J$$>l9g(B ($B$3$l$,%G%U%)(B
-          $B%k%H$G$9(B)$B!"%m%0%$%s$r9T$J$$$^$;$s!#(B
-
-     `shimbun-tech-on-password'
-          Tech-On! $B$K%m%0%$%s$9$k$?$a$N%Q%9%o!<%I$G$9!#(B`nil' $B$@$H(B
-          Tech-On! $B$K%m%0%$%s$9$k$H$-$K!"%Q%9%o!<%I$NF~NO$rMW5a$5$l$^$9!#(B
-          $BJ8;zNs$@$C$?$i$=$l$,%Q%9%o!<%I$H$7$F;H$o$l!"F~NO$rMW5a$5$l$k(B
-          $B$3$H$O$"$j$^$;$s!#(B`nil' $B$G$bJ8;zNs$G$b$J$$>l9g(B ($B$3$l$,%G%U%)(B
-          $B%k%H$G$9(B)$B!"%m%0%$%s$r9T$J$$$^$;$s!#(B
-
-     $B$3$l$i$NF~NO$O!"$=$N(B Emacs $B%;%C%7%g%s$G:G=i$K(B Tech-On! $B$N5-;v$rFI(B
-     $B$_;O$a$k$H$-$K0l2s$@$1MW5a$5$l$^$9!#(B
-
-HotWired Japan (http://hotwired.goo.ne.jp/)
-     wired-jp.news wired-jp.business wired-jp.culture
-     wired-jp.technology wired-jp.blog.ogura wired-jp.blog.sasaki
-     wired-jp.blog.takahashi
-
-Yahoo! Japan (http://headlines.yahoo.co.jp/)
-     yahoo.topnews yahoo.news yahoo.politics yahoo.society
-     yahoo.people yahoo.business-all yahoo.market yahoo.stock
-     yahoo.industry yahoo.international yahoo.entertainment
-     yahoo.sports yahoo.computer yahoo.zenkoku yahoo.hokkaido
-     yahoo.aomori yahoo.iwate yahoo.miyagi yahoo.akita yahoo.yamagata
-     yahoo.fukushima yahoo.tokyo yahoo.kanagawa yahoo.chiba
-     yahoo.saitama yahoo.ibaraki yahoo.tochigi yahoo.gunma
-     yahoo.yamanashi yahoo.nagano yahoo.niigata yahoo.toyama
-     yahoo.ishikawa yahoo.fukui yahoo.aichi yahoo.gifu yahoo.shizuoka
-     yahoo.mie yahoo.osaka yahoo.hyogo yahoo.kyoto yahoo.shiga
-     yahoo.nara yahoo.wakayama yahoo.tottori yahoo.shimane
-     yahoo.okayama yahoo.hiroshima yahoo.yamaguchi yahoo.tokushima
-     yahoo.kagawa yahoo.ehime yahoo.kochi yahoo.fukuoka yahoo.saga
-     yahoo.nagasaki yahoo.kumamoto yahoo.oita yahoo.miyazaki
-     yahoo.kagoshima yahoo.okinawa
-
-     yahoo.news $B%0%k!<%W$O<gMW$J5-;v$H!"$5$i$KB.Js5-;v$r8!:w$7$^$9!#$3(B
-     $B$l$i$N%0%k!<%W$O!"%G%U%)%k%H$G(B HTML $B$N5-;v$r:n$j$^$9!#$=$l$i$K%F%-(B
-     $B%9%H$@$1$N5-;v$r@8@.$5$;$?$$$J$i$P!"0J2<$N9T$r(B `~/.emacs' $B%U%!%$%k(B
-     $B$K2C$($F$/$@$5$$!#(B
-
-          (setq shimbun-yahoo-prefer-text-plain t)
-
-ZDNet Japan (http://japan.zdnet.com/)
-     zdnet-jp.news zdnet-jp.news.network zdnet-jp.news.hardware
-     zdnet-jp.news.software zdnet-jp.news.manage
-     zdnet-jp.news.security zdnet-jp.news.internet zdnet-jp.news.os
-     zdnet-jp.news.db zdnet-jp.news.system zdnet-jp.column
-     zdnet-jp.column.sp1 zdnet-jp.column.netsecurity1
-     zdnet-jp.column.ea1 zdnet-jp.column.btl
-     zdnet-jp.column.solutionIT zdnet-jp.channel.security
-     zdnet-jp.channel.ilm zdnet-jp.blog.iida zdnet-jp.blog.mhatta
-     zdnet-jp.blog.kurei zdnet-jp.blog.opensource zdnet-jp.blog.soa
-     zdnet-jp.blog.dp
-
-The Onion (http://www.theonion.com/)
-     the-onion.news
-
-
-
-File: emacs-w3m-ja.info, Node: Mailing Lists Supported by Shimbun, Next: Sport Sites Supported by Shimbun, Prev: News Sites Supported by Shimbun, Up: Shimbun Sites
-
-$A%a$B!<$A%j%s%0%j%9%H(B
-----------------
-
-$B:G6a$G$O!"%a!<%j%s%0%j%9%H$KEj9F$5$l$?2a5n5-;v$N%"!<%+%$%V$,(B WEB $B>e$K4v(B
-$B$D$b8x3+$5$l$F$$$^$9!#(B`Shimbun' $B%i%$%V%i%j$O!"0J2<$N%"!<%+%$%V$r07$&$3(B
-$B$H$,$G$-$^$9!#(B
-
-Semi-gnus Mailing List in Japan (http://lists.airs.net/semi-gnus/archive/)
-     airs.semi-gnus-ja
-
-Wanderlust Mailing List (http://lists.airs.net/)
-     airs.wl airs.wl-en
-
-Big Brother DataBase Mailing List (http://www.rc.tutrp.tut.ac.jp/bbdb-ml/)
-     bbdb-ml.bbdb-ml
-
-GNOME Mailing List (http://mail.gnome.org/archives/)
-     gnome.balsa-list gnome.calendar-list gnome.cvs-commits-list
-     gnome.foundation-announce gnome.foundation-list gnome.fplan-list
-     gnome.gconf-list gnome.gdome gnome.gnome-1.4-list
-     gnome.gnome-announce-list gnome.gnome-components-list
-     gnome.gnome-db-list gnome.gnome-de gnome.gnome-debugger-list
-     gnome.gnome-devel-list gnome.gnome-doc-list gnome.gnome-gui-list
-     gnome.gnome-hackers gnome.gnome-hackers-readonly
-     gnome.gnome-hackers-test gnome.gnome-i18n gnome.gnome-i18n-tools
-     gnome.gnome-kde-list gnome.gnome-list gnome.gnome-office-list
-     gnome.gnome-pilot-list gnome.gnome-sound-list
-     gnome.gnome-themes-list gnome.gnome-ui-hackers
-     gnome.gnome-web-list gnome.gnome-webmaster-list
-     gnome.gnome-workshop-list gnome.gnomecc-list gnome.gnumeric-list
-     gnome.gtk-app-devel-list gnome.gtk-devel-list gnome.gtk-doc-list
-     gnome.gtk-i18n-list gnome.gtk-list gnome.gtk-perl-list
-     gnome.guppi-list gnome.libart gnome.libart-hackers
-     gnome.orbit-list gnome.vote gnome.wm-spec-list gnome.xml
-     gnome.xslt
-
-Java $A%+%s%U%!%l%s%9(B Mailing List (http://www.java-conf.gr.jp/archives/)
-     javaconf.servlet-ml javaconf.business-ml
-     javaconf.duke-in-the-box-ml javaconf.jfriends-ml javaconf.JGT-ml
-     javaconf.jini-ml javaconf.ejb-ml javaconf.cm-ml javaconf.horb-ml
-     javaconf.talk-ml
-
-LinuxCE JP Mailing List (http://www.peanuts.gr.jp/~kei/ml-archive/)
-     linuxce-jp.users
-
-Mule Mailing List (http://www.m17n.org/)
-     m17n.mule-ja m17n.mule
-
-Meadow Mailing List (http://www.ysnb.net/meadow/)
-     meadow.meadow-develop meadow.meadow-users-jp
-
-Mew Mailing List (http://www.mew.org/ml/)
-     mew.mew-dist mew.mew-win32 mew.mew-int
-
-MagicPoint Mailing List (http://www.mew.org/ml/)
-     mew.mgp-users mew.mgp-users-jp
-
-www.namazu.org Mailing Lists (http://www.namazu.org/cgi-bin/mailman/listinfo)
-     namazu.kakasi-commits namazu.kakasi-dev namazu.migemo
-     namazu.namazu-users-en namazu.namazu-users-ja
-     namazu.namazu-devel-ja namazu.namazu-devel-en
-     namazu.namazu-win32-users-ja namazu.sary
-
-emacs-w3m Mailing List (http://emacs-w3m.namazu.org/ml/)
-     emacs-w3m.emacs-w3m
-
-NetBSD JP Mailing List (http://www.jp.netbsd.org/ja/JP/ml/)
-     netbsd.announce-ja netbsd.junk-ja netbsd.tech-misc-ja
-     netbsd.tech-pkg-ja netbsd.port-arm32-ja netbsd.port-hpcmips-ja
-     netbsd.port-mac68k-ja netbsd.port-mips-ja netbsd.port-powerpc-ja
-     netbsd.hpcmips-changes-ja netbsd.members-ja netbsd.admin-ja
-     netbsd.www-changes-ja
-
-Ruby Mailing List (http://blade.nagaokaut.ac.jp/)
-     ruby.comp.lang.ruby ruby.fj.comp.lang.ruby ruby.ruby-dev
-     ruby.ruby-ext ruby.ruby-list ruby.ruby-math ruby.ruby-talk
-
-Toshiba Linux Users JP Mailing List (http://linux.toshiba-dme.co.jp/ML/tlinux-users-j/)
-     toshiba.linux-users-j
-
-w3m-dev Mailing List (http://mi.med.tohoku.ac.jp/~satodai/w3m-dev/)
-     w3m-dev.w3m-dev w3m-dev.w3m-dev-en
-
-digiko Mailing List (http://yar-3.net/digiko/)
-     digiko.digiko
-
-XEmacs Mailing List (http://list-archive.xemacs.org/)
-     xemacs.xemacs-announce xemacs.xemacs-beta-ja xemacs.xemacs-beta
-     xemacs.xemacs-build-reports xemacs.xemacs-cvs
-     xemacs.xemacs-design xemacs.xemacs-mule xemacs.xemacs-nt
-     xemacs.xemacs-patches xemacs.xemacs-users-ja xemacs.xemacs
-
-$A%;%-%e%j%F%#$B!<(BMEMO Mailing List (http://memo.st.ryukoku.ac.jp/archive/)
-     security-memo.memo security-memo.free-memo
-     security-memo.social-memo
-
-     $B$J$*!"(B`security-memo.*' $B$O%"%I%l%92s<}%m%\%C%HBP:v$G(B userid $B$H(B
-     passowrd $B$r5a$a$i$l$k$N$G(B `~/.w3m/passwd' $B$K(B
-
-          machine memo.st.ryukoku.ac.jp
-          realm input username/password = archives/archives
-          login archives
-          passwd archives
-
-          machine memo.st.ryukoku.ac.jp
-          realm input user: archives / password: archives
-          login archives
-          passwd archives
-
-     $B$H=q$-!">e5-%U%!%$%k$+$i(B group, others $B$N%"%/%;%98"$r<h$j=|$$$F$*(B
-     $B$/I,MW$,$"$j$^$9!#(B
-
-Debian JP Mailing List (http://lists.debian.or.jp/)
-     debian-jp.debian-announce debian-jp.debian-devel
-     debian-jp.debian-www debian-jp.debian-users
-     debian-jp.debian-policy debian-jp.jp-qa
-
-Debian Mailing List (http://lists.debian.org/)
-     debian.debian-announce debian.debian-commercial
-     debian.debian-firewall debian.debian-french debian.debian-isp
-     debian.debian-italian debian.debian-kde debian.debian-laptop
-     debian.debian-news debian.debian-news-german
-     debian.debian-news-portuguese debian.debian-security-announce
-     debian.debian-testing debian.debian-user
-     debian.debian-user-catalan debian.debian-user-french
-     debian.debian-user-polish debian.debian-user-portuguese
-     debian.debian-user-spanish debian.debian-user-swedish
-     debian.debian-admintool debian.debian-apache
-     debian.debian-autobuild debian.debian-beowulf debian.debian-boot
-     debian.debian-cd debian.debian-ctte debian.debian-debbugs
-     debian.debian-devel debian.debian-devel-announce
-     debian.debian-devel-french debian.debian-devel-games
-     debian.debian-devel-spanish debian.debian-doc debian.debian-dpkg
-     debian.debian-emacsen debian.debian-events-eu
-     debian.debian-events-na debian.debian-faq debian.debian-gcc
-     debian.debian-glibc debian.debian-gtk-gnome debian.debian-hams
-     debian.debian-ipv6 debian.debian-java debian.debian-jr
-     debian.debian-med debian.debian-mentors debian.debian-newmaint
-     debian.debian-newmaint-admin debian.debian-ocaml-maint
-     debian.debian-openoffice debian.debian-perl debian.debian-pilot
-     debian.debian-policy debian.debian-pool debian.debian-python
-     debian.debian-qa debian.debian-qa-private debian.debian-release
-     debian.debian-security debian.debian-snapshots
-     debian.debian-tetex-maint debian.debian-toolchain
-     debian.debian-vote debian.debian-wnpp debian.debian-www
-     debian.debian-x debian.deity debian.debian-chinese
-     debian.debian-chinese-big5 debian.debian-chinese-gb
-     debian.debian-esperanto debian.debian-i18n debian.debian-japanese
-     debian.debian-l10n-catalan debian.debian-l10n-dutch
-     debian.debian-l10n-english debian.debian-l10n-french
-     debian.debian-l10n-italian debian.debian-l10n-portuguese
-     debian.debian-l10n-spanish debian.debian-laespiral
-     debian.debian-russian debian.debian-simplified-chinese
-     debian.debian-68k debian.debian-alpha debian.debian-arm
-     debian.debian-bsd debian.debian-hppa debian.debian-hurd
-     debian.debian-ia64 debian.debian-mips debian.debian-parisc
-     debian.debian-powerpc debian.debian-s390 debian.debian-sparc
-     debian.debian-superh debian.debian-ultralinux debian.debian-win32
-     debian.debian-all-changes debian.debian-alpha-changes
-     debian.debian-arm-changes debian.debian-books
-     debian.debian-cd-vendors debian.debian-changes
-     debian.debian-consultants debian.debian-curiosa
-     debian.debian-devel-all-changes debian.debian-devel-alpha-changes
-     debian.debian-devel-arm-changes debian.debian-devel-changes
-     debian.debian-devel-hurd-i386-changes
-     debian.debian-devel-i386-changes debian.debian-devel-m68k-changes
-     debian.debian-devel-powerpc-changes
-     debian.debian-devel-sparc-changes debian.debian-hurd-i386-changes
-     debian.debian-i386-changes debian.debian-legal
-     debian.debian-m68k-changes debian.debian-mirrors
-     debian.debian-powerpc-changes debian.debian-project
-     debian.debian-publicity debian.debian-sgml
-     debian.debian-sparc-changes debian.lcs-eng debian.lsb-confcall
-     debian.lsb-discuss debian.lsb-impl debian.lsb-spec
-     debian.lsb-test debian.spi-announce debian.spi-general
-     debian.vgui-discuss
-
-KDE Mailing List in Japan (http://www.kde.gr.jp/ml/)
-     kde.Kuser kde.Kdeveloper
-
-Geocrawler (http://www.geocrawler.com/)
-     Geocrawler $B$KJ]B8$5$l$F$$$k$9$Y$F$N%a!<%j%s%0%j%9%H$r1\Mw$G$-$^$9!#(B
-     `M-x shimbun-geocrawler-add-group <RET>' $B$H$$$&%3%^%s%I$r;H$C(B
-     $B$F!"1\Mw$7$?$$%0%k!<%W$rJQ?t(B `shimbun-geocrawler-group-alist' $B$KEP(B
-     $BO?$7$F$/$@$5$$!#(B
-
-Mailing list ARChives (http://marc.theaimsgroup.com/)
-     Mailing list ARChives (MARC) $B$KJ]B8$5$l$F$$$k$9$Y$F$N%a!<%j%s%0%j(B
-     $B%9%H$r1\Mw$G$-$^$9!#1\Mw$7$?$$%0%k!<%W$N%0%k!<%WL>$H(B URL $B$r!"JQ?t(B
-     `shimbun-marc-aims-group-alist' $B$KEPO?$7$F$/$@$5$$!#(B
-
-RedHat Mailing List (http://sources.redhat.com/ml/)
-     redhat.automake redhat.bug-automake redhat.automake-prs
-     redhat.automake-cvs redhat.binutils redhat.binutils-cvs
-     redhat.c++-embedded redhat.crossgcc redhat.cgen redhat.cgen-prs
-     redhat.cgen-cvs redhat.cygwin redhat.cygwin-xfree
-     redhat.cygwin-announce redhat.cygwin-xfree-announce
-     redhat.cygwin-apps redhat.cygwin-patches redhat.cygwin-developers
-     redhat.cygwin-cvs redhat.cygwin-apps-cvs
-     redhat.docbook-tools-discuss redhat.docbook-tools-announce
-     redhat.docbook-tools-cvs redhat.docbook redhat.dssslist
-     redhat.sgml-tools redhat.docbook-apps redhat.ecos-announce
-     redhat.ecos-devel redhat.ecos-discuss redhat.ecos-maintainers
-     redhat.ecos-patches redhat.elix redhat.elix-announce redhat.gdb
-     redhat.gdb-announce redhat.gdb-testers redhat.gdb-testresults
-     redhat.gdb-patches redhat.gdb-cvs redhat.bug-gdb redhat.gdb-prs
-     redhat.libc-alpha redhat.libc-hacker redhat.bug-glibc
-     redhat.glibc-cvs redhat.glibc-linux redhat.bug-gnats
-     redhat.gnats-devel redhat.gnats-announce redhat.gnats-cvs
-     redhat.gsl-discuss redhat.gsl-announce redhat.gsl-cvs
-     redhat.guile redhat.guile-emacs redhat.guile-prs redhat.guile-gtk
-     redhat.bug-guile redhat.guile-cvs redhat.guile-emacs-cvs
-     redhat.insight redhat.insight-announce redhat.insight-prs
-     redhat.installshell redhat.inti redhat.kawa redhat.libffi-discuss
-     redhat.libffi-announce redhat.libstdc++ redhat.libstdc++-cvs
-     redhat.libstdc++-prs redhat.mauve-discuss redhat.mauve-announce
-     redhat.newlib redhat.pthreads-win32 redhat.rhdb
-     redhat.rhdb-announce redhat.rhug-rhats redhat.rpm2html-cvs
-     redhat.rpm2html-prs redhat.rpm2html redhat.sid
-     redhat.sid-announce redhat.sid-cvs redhat.sourcenav
-     redhat.sourcenav-announce redhat.sourcenav-prs redhat.win32-x11
-     redhat.xconq7 redhat.xconq-announce redhat.xconq-cvs
-
-MacOSX JP Mailing List (http://www.tech-arts.co.jp/macosx/)
-     macosx-jp.macosx-jp macosx-jp.macosx-dev-jp
-     macosx-jp.macosx-ws-jp macosx-jp.webobjects-jp
-
-SourceForge JP (http://sourceforge.jp)
-     SourceForge JP $B$KJ]B8$5$l$F$$$k%a!<%j%s%0%j%9%H$N$9$Y$F$N8x3+=q8K(B
-     $B$r1\Mw$G$-$^$9!#1\Mw$7$?$$%0%k!<%W$rJQ?t(B
-     `shimbun-sourceforge-jp-mailing-lists' $B$KEPO?$7$F$/$@$5$$!#(B
-
-Elips Mailing List (http://heimat.jp/~nakaji/elips/)
-     elips.elips
-
-Squeak-ja Mailing List (http://lists.squeakfoundation.org/pipermail/squeak-ja/)
-     squeak-ja.main
-
-Smalltalkers' Salon Mailing List (http://www.sra.co.jp/smalltalk/SML/archives/)
-     sml.main
-
-Squeak-dev Mailing List (http://lists.squeakfoundation.org/pipermail/squeak-dev/)
-     squeak-dev.main
-
-Plucker Mailing List (http://www.mail-archive.com/plucker-*@rubberchicken.org/maillist.html)
-     plucker.announce plucker.list plucker.dev
-
-pilot-link Mailing List (http://www.pilot-link.org/pipermail/)
-     pilot-link.announce pilot-link.devel pilot-link.general
-     pilot-link.unix-ng
-
-Coldsync Mailing List (http://www.thedotin.net/maillists/coldsync-hackers/maillist.html)
-     coldsync.main
-
-J-Pilot Mailing List (http://www.jpilot.org/pipermail/jpilot/)
-     jpilot.main
-
-pilot-mailsync Mailing List (http://lists.gnu-designs.com/pipermail/pilot-mailsync/)
-     pilot-mailsync.main
-
-Mozilla Users Mailing List in Japan (http://www.mozilla.gr.jp/ml/logs/moz-users/)
-     mozilla-jp.users
-
-     $B$J$*!"(B`mozilla-jp.users' $B$O%"%I%l%92s<}%m%\%C%HBP:v$G(B userid $B$H(B
-     passowrd $B$r5a$a$i$l$k$N$G(B `~/.w3m/passwd' $B$K(B
-
-          machine www.mozilla.gr.jp
-          realm Please Enter mozilla mozilla
-          login mozilla
-          passwd mozilla
-
-     $B$H=q$-!">e5-%U%!%$%k$+$i(B group, others $B$N%"%/%;%98"$r<h$j=|$$$F$*(B
-     $B$/I,MW$,$"$j$^$9!#(B
-
-tDiary Developers Mailing List in Japan (http://www.tdiary.org/)
-     tdiary-ml.devel tdiary-ml.theme
-
-arch.bluegate.org Mailing Lists (http://arch.bluegate.org/mailman/listinfo)
-     arch-bluegate.subversion-jp arch-bluegate.arch-jp
-     arch-bluegate.mailman arch-bluegate.viewarch
-
-Tigris.org:Open Source Software Engineering (http://www.tigris.org/)
-     Tigris.org $B$KJ]B8$5$l$F$$$k$9$Y$F$N%a!<%j%s%0%j%9%H$r1\Mw$G$-$^$9!#(B
-     $B1\Mw$7$?$$%0%k!<%W$rJQ?t(B `shimbun-tigris-group-alist' $B$KEPO?$7$F$/(B
-     $B$@$5$$!#%0%k!<%WL>$O(B tigris.<project>.<mailinglist> $B$K$J$j$^$9!#(B
-
-www.SciPy.net Mailing Lists (http://www.scipy.net/mailman/listinfo)
-     scipy.astropy scipy.ipython-user scipy.ipython-dev
-     scipy.scipy-user scipy.scipy-dev scipy.scipy-testlog
-     scipy.scipy-chaco scipy.scipy-cvs
-
-
-
-
-File: emacs-w3m-ja.info, Node: Sport Sites Supported by Shimbun, Next: Misc Sites Supported by Shimbun, Prev: Mailing Lists Supported by Shimbun, Up: Shimbun Sites
-
-$A%9%]$B!<$A%D(B
---------
-
-`Shimbun' $B%i%$%V%i%j$,BP1~$7$F$$$k%9%]!<%D4X78$N%5%$%H$G$9!#(B
-
-makanai (http://www.makanai.com/)
-     makanai.f1news
-
-F1 $A%U%!%s(B (http://www.ksky.ne.jp/~tahara/f1/)
-     f1fan.news
-
-@nifty:$A%b$B!<$A%?$B!<$A%9%]$B!<$A%D(B (http://forum.nifty.com/fmotor/)
-     msports-nifty.F1 msports-nifty.IRL msports-nifty.WRC
-     msports-nifty.Europe msports-nifty.USA
-
-Yahoo!$A%9%]$B!<$A%D(B (http://sports.yahoo.co.jp/)
-     yahoo-sports.F1 yahoo-sports.baseball yahoo-sports.keiba
-     yahoo-sports.NBA yahoo-sports.NFL yahoo-sports.rugby
-
-$B$?$@$7!"(BEmacs-21.4 $B$^$?$O$=$l0JA0$NHG$G(B @nifty: $B%b!<%?!<%9%]!<%D$r1\Mw(B
-$B$9$k$K$O!"(BMule-UCS (*Note Other Requirements::) $B$,I,MW$G$9!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Misc Sites Supported by Shimbun, Prev: Sport Sites Supported by Shimbun, Up: Shimbun Sites
-
-$A$=$NK{(B
-------
-
-`Shimbun' $B%i%$%V%i%j$NBP1~$7$F$$$k$=$NB>$N%5%$%H$G$9!#7G<(HD$d!"O":\5-(B
-$B;v$r<gBN$H$9$k$h$&$J%5%$%H$,4^$^$l$F$$$^$9!#(B
-
-Tea Cup $(I6-$AJ>0e(B (http://www.tcup.com/)
-     Tea Cup Communication $B$K$h$C$FDs6!$5$l$k!"MM!9$J7G<(HD$r9VFI$9$k$3(B
-     $B$H$,$G$-$^$9!#%G%U%)%k%H$G$O!"0J2<$N;0$D$N7G<(HD$,MQ0U$5$l$F$$$^$9!#(B
-
-     tcup.meadow
-          Meadow $(I6-$AJ>0e(B (http://www66.tcup.com/6629/yutopia.html)
-
-     tcup.skk
-          SKK $(I6-$AJ>0e(B (http://www67.tcup.com/6718/yutopia.html)
-
-     tcup.yutopia
-          $A$f$&,Ftopia$(I6-$AJ>0e(B (http://www61.tcup.com/6116/yutopia.html)
-
-     $B?7$?$K7G<(HD$r%j%9%H$KDI2C$9$k$K$O!"$=$l$i$NL>A0$H(B URL $B$rD4$Y$F!"(B
-     `shimbun-tcup-group-alist' $B$rJQ99$7$F$/$@$5$$!#Fs$D$N7G<(HD(B `foo'
-     $B$H(B `bar' $B$rDI2C$9$kNc$G$9!#(B
-
-          (eval-after-load "sb-tcup"
-            '(setq shimbun-tcup-group-alist
-                   (append
-                    '(("foo" "http://MMMM.teacup.com/foo/bbs2")
-                      ("bar" "http://NNNN.teacup.com/bar/bbs2"))
-                    shimbun-tcup-group-alist)))
-
-2ch
-     $B%0%k!<%WL>$H(B URL $B$rD4$Y$F!"0J2<$N$h$&$K@_Dj$7$F;H$$$^$9!#(B
-
-          (setq shimbun-2ch-group-alist
-                '(("Meadow" .
-                   "http://pc.2ch.net/test/read.cgi/software/1005469775")
-                  ("emacs-w3m" .
-                   "http://pc.2ch.net/test/read.cgi/unix/1013710106")))
-
-CGI_Board $A$rJ9$C$F$$$k$(I6-$AJ>0e(B (http://www.math.tohoku.ac.jp/~kuroki/support/)
-
-     CGI_Board $B$r;H$C$F$$$k7G<(HD$N(B URL $B$rD4$Y$F!"(B
-     `shimbun-cgi-board-group-alist' $B$KE,@Z$J@_Dj$r2C$($F;H$$$^$9!#(B
-
-HNS $A$K$h$kHU$(GX4(B
-     $B1\Mw$7$?$$F|5-$N(B URL $B$rD4$Y$F!"0J2<$N$h$&$K@_Dj$7$F;H$$$^$9!#(B
-
-          (setq shimbun-hns-group-alist
-                '(("arisawa"                            ;; $B%0%k!<%WL>(B
-                   "http://nijino.homelinux.net/diary/" ;; URL
-                   "ari@mbf.sphere.ne.jp")              ;; $B%a!<%k%"%I%l%9(B
-                  ("miyoshi"
-                   "http://www.be.wakwak.com/cgi-bin/sbox/~miyoshi/hns/"
-                   "miyoshi@meadowy.org")))
-
-tDiary $A$K$h$kHU$(GX4(B
-     $B1\Mw$7$?$$F|5-$N(B URL $B$rD4$Y$F!"0J2<$N$h$&$K@_Dj$7$F;H$$$^$9!#(B
-
-          (setq shimbun-tdiary-group-alist
-                '(("henahena"                          ;; $B%0%k!<%WL>(B
-                   "http://www.fan.gr.jp/~ring/d/")    ;; URL
-                  ("yoichi"
-                   "http://yoichi.geiin.org/d/")))
-
-$(IA{$ALl$(I"H$(G^[(B (http://plaza.rakuten.co.jp/) $A$NHU$(GX4(B
-     $B1\Mw$7$?$$F|5-$r3+@_$7$F$$$k?M$N3ZE7(B ID $B$H%a!<%k%"%I%l%9$rD4$Y$F!"(B
-     $B0J2<$N$h$&$K@_Dj$7$F;H$$$^$9!#(B
-
-          (setq shimbun-rakuten-group-alist
-                '(("rakuten-id" . "email-address")))
-
-EmacsWiKi (http://www.emacswiki.org/)
-     emacswiki.changes emacswiki.diff
-
-$A%3%s%F%s%D$r:,$`(B RSS $A%U%#$B!<$A%I(B
-     $B1\Mw$7$?$$7G:\%3%s%F%s%D$,4^$^$l$k$h$&$J(B RSS $B%U%#!<%I$rD4$Y$F!"(B
-     `shimbun-rss-hash-group-path-alist' $BJQ?t$r0J2<$N$h$&$K@_Dj$7$F;H$$(B
-     $B$^$9!#%P%C%/%(%s%IL>$O(B `rss-hash' $B$G$9!#<g$K8D?M$N%V%m%0$J$I$,BP>](B
-     $B$K$J$k$G$7$g$&!#(B
-
-     $B%Q%i%a!<%?$O%0%k!<%WL>!"(BRSS $B%"%I%l%9!"%a!<%k%?%$%W(B (`t' $B$G(B html)$B!"(B
-     $B@07A;~$N3+;O@55,I=8=!"@07A;~$N=*N;@55,I=8=$H$J$j$^$9!#%0%k!<%WL>!"(B
-     RSS $B%"%I%l%90J30$O%*%W%7%g%s$G$9!#(B
-
-     $B0J2<$O%5%s%W%k$G$9!#$3$N>l9g$O(B `rss-hash.sampleblog1' $B$*$h$S(B
-     `rss-hash.sampleblog2' $B$H$7$F1\Mw$G$-$^$9!#(B
-
-          (setq shimbun-rss-hash-group-path-alist
-                '(;; text mail
-                  ("sampleblog1" "http://www.example.com/index1.rss")
-                  ;; html mail
-                  ("sampleblog2" "http://www.example.com/index2.rss"
-                   t "</title>" "<!-- start ads")))
-
-$A%3%s%F%s%D$r:,$`(B Atom $A%U%#$B!<$A%I(B
-     $BA09`(B ($B%3%s%F%s%D$r4^$`(B RSS $B%U%#!<%I(B) $B$HF1MM$K!"7G:\$5$l$?%3%s%F%s(B
-     $B%D$r4^$`(B Atom $B%U%#!<%I$b1\Mw$9$k$3$H$,$G$-$^$9!#$=$l$r9T$J$&$K$O!"(B
-     shimbun-rss-hash-* $B$HF1MM$N$d$jJ}$GJQ?t(B
-     `shimbun-atom-hash-group-path-alist' ($B$R$g$C$H$9$k$H(B
-     `shimbun-atom-hash-x-face-alist' $B$J$I$b(B) $B$r@_Dj$7$F$/$@$5$$!#%P%C(B
-     $B%/%(%s%IL>$O(B `atom-hash' $B$G$9!#(B
-
-$A%3%s%F%s%D$N$J$$(B RSS $A%U%#$B!<$A%I(B
-     $BB?$/$N%U%#!<%I$K$O5-;v$N40A4$J%3%s%F%s%D$,L5$$$+!"$^$?$O$$$B$o$k$K(B
-     $B>.=P$7$K$7$^$9!#%5%$%H$,$A$c$s$H5-;v$r=q$+$:$K!"$=$N$h$&$J%U%#!<%I(B
-     $B$7$+Ds6!$7$J$$>l9g$G$b!"B?$/$N>l9g(B `rss-blogs' $B$r;H$C$F@Z$jH4$1$k(B
-     $B$3$H$,$G$-$^$9!#@_Dj$O(B `rss-hash' $B$N$b$N$H;w$F$$$^$9!#Nc$r<($7$^$7$g(B
-     $B$&(B:
-
-          (setq shimbun-rss-blogs-group-url-regexp
-            '(("first-feed" "http://example/wordpressfeed")
-              ("second-feed" "http://example/somefeed"
-               "<div name=\"content\">" "<div name=\"comments\">")
-              ("third-feed" "http://example/someotherfeed" 'none)))
-
-     $B:G=i$NFs$D$N%"%$%F%`$O%U%#!<%I$NL>A0$H(B URL $B$G$9!#$=$N%U%#!<%I$,;X(B
-     $B$7<($9(B HTML $B%Z!<%8$K$*$$$F!"<B:]$N%3%s%F%s%D$N;O$a$H=*$j$rC5$9$?$a(B
-     $B$NFs$D$N@55,I=8=$r!"G$0U$GM?$($k$3$H$,$G$-$^$9!#$=$3$GC1$K(B `none'
-     $B$H$$$&%7%s%\%k$r;H$&$H!"$$$+$J$k_I2a$b9T$J$o$l$^$;$s!#(B
-
-     $B2C$($F!"(B`rss-blogs' $B$O$$$/$D$+$N%]%T%e%i!<$J%V%m%0!&%(%s%8%s$r<+F0(B
-     $BE*$K07$&$3$H$,$G$-$^$9!#$9$J$o$A(B Google $B$N(B Blogger/Blogspot ($B%3%a(B
-     $B%s%H!&%U%#!<%I$r4^$_$^$9(B)$B!"(BWordPress$B!"$*$h$S(B TypePad $B$G$9!#%U%#!<(B
-     $B%I$r<h$j4s$;$k%5%$%H$,$=$l$i$N0l$D$r;H$C$F$$$k$J$i(B (`generator' $B%?(B
-     $B%0$rD/$a$l$P$o$+$j$^$9(B)$B!"C1$KG$0U$N%Q%i%a!<%?$r>JN,$9$k$@$1$G!"<+(B
-     $BF0E*$K%3%s%F%s%D$r@Z$j=P$=$&$H$9$k$G$7$g$&!#(B
-
-Wiki $A%3%s%F%s%D(B
-     $B1\Mw$7$?$$(B Wiki $B$N(B URL $B$rD4$Y$F!"0J2<$N$h$&$K@_Dj$7$F;H$$$^$9!#(B
-     PukiWiki $B$H(B Hiki $B$KBP1~$7$F$$$^$9!#$b$7!"3FFbB&$N%j%9%H$N(B 4 $BHVL\!"(B
-     5 $BHVL\$NMWAG$N@55,I=8=$K2?$r;XDj$7$FNI$$$+J,$+$i$J$$$H$-$O!"(B`nil'
-     $B$r;XDj$9$l$PNI$$$G$7$g$&!#5-;v$N<hF@;~$K@07A$,9T$o$l$:!"$?$@%Z!<%8(B
-     $BA4BN$,8+$($k$@$1$G$9!#(B
-
-          (setq shimbun-wiki-group-alist
-                '(("pukiwiki" ;; $B%0%k!<%WL>(B
-                   "http://pukiwiki.org/index.php?cmd=rss10" ;; URL
-                   "webmaster@pukiwiki.org" ;; $B%a!<%k%"%I%l%9(B
-                   nil ;; X-Face
-                   "\n<h3 id=\"" ;; contents $B$N(B start $B$r<($9(B regexp
-                   "</address>") ;; contents $B$N(B end $B$r<($9(B regexp
-                  ("hiki"
-                   "http://www.namaraii.com/hiki/?c=rss"
-                   "webmaster@fdiary.net"
-                   nil
-                   "<div class=\"section\">"
-                   "<div class=\"sidebar\">")
-                  ("apollo"
-                   "http://wiki.fdiary.net/apollo/?c=rss"
-                   "moriq@moriq.com"
-                   nil
-                   "<div class=\"section\">"
-                   "<div class=\"sidebar\">")
-                  ))
-
-Yahoo!$A%*$B!<$A%/%7%g%s(B (http://auctions.yahoo.co.jp/)
-     $B1\Mw$7$?$$%+%F%4%j$d8!:w7k2L$N(B URL $B$rD4$Y$F!"0J2<$N$h$&$K@_Dj$7$F(B
-     $B;H$$$^$9!#(B
-
-          (setq shimbun-yahoo-auctions-group-alist
-                '(("mp3player" . "http://list3.auctions.yahoo.co.jp/jp/show/catleaf_rss?category=2084039708&alocale=0jp")
-                  ("iPod" . "http://search3.auctions.yahoo.co.jp/search_rss?p=iPod&auccat=2084039708&alocale=0jp&acc=jp")))
-
-VineLinux Errata (http://www.vinelinux.org/)
-     vinelinux.errata.4x.i386 vinelinux.errata.4x.ppc
-     vinelinux.errata.3x.i386 vinelinux.errata.3x.ppc
-     vinelinux.errata.3x.alpha vinelinux.errata.2x.i386
-     vinelinux.errata.2x.ppc vinelinux.errata.2x.sparc
-     vinelinux.errata.2x.alpha vinelinux.errata.1x
-
-$ADZ$(Gk^$A%a$B!<$A%k%^%,%8%s(B (http://www.mmz.kantei.go.jp/)
-     kantei.m-magazine-en kantei.m-magazine-ja
-     kantei.m-magazine-cn.hatoyama kantei.m-magazine-kr.hatoyama
-     kantei.m-magazine-en.hatoyama kantei.m-magazine-ja.hatoyama
-     kantei.m-magazine-en.aso kantei.m-magazine-ja.aso
-     kantei.m-magazine-en.fukuda kantei.m-magazine-ja.fukuda
-     kantei.m-magazine-en.abe kantei.m-magazine-ja.abe
-     kantei.m-magazine-en.koizumi kantei.m-magazine-ja.koizumi
-
-     $B8eJ}8_49@-$N$?$a(B `kantei.m-magazine'$B!"(B`kantei.m-magazine-cn' $B$*$h(B
-     $B$S(B `kantei.m-magazine-kr' $B$bMxMQ2DG=$K$J$C$F$$$^$9!#(B
-
-$ALX$(G]B$(I"G(B (http://www.jpo.go.jp/)
-     jpo.news jpo.revision jpo.lawguide jpo.details
-
-IBM developerWorks (http://www-6.ibm.com/jp/developerworks/)
-     ibm-dev.autonomic ibm-dev.java ibm-dev.linux ibm-dev.opensource
-     ibm-dev.webservices ibm-dev.xml
-
-Pocketgames (http://www.pocketgames.jp/)
-     pocketgames.news
-
-Wincefan (http://www.wince.ne.jp/)
-     wincefan.news
-
-PalmFan (http://www.palmfan.com/)
-     palmfan.news
-
-$(GgY$BG>$A=V$N$(G\"^[$A%l%]$B!<$A%H(B (http://homepage1.nifty.com/akiba/plat.html)
-     dennou.report
-
-PCWEB COLUMN Square (http://pcweb.mycom.co.jp/column/)
-     pcweb-column.jsr pcweb-column.yume pcweb-column.hreceipe
-     pcweb-column.kita pcweb-column.shonanlife pcweb-column.kaden
-     pcweb-column.nemurenai pcweb-column.komono pcweb-column.js
-     pcweb-column.en pcweb-column.motherboard pcweb-column.svalley
-     pcweb-column.architecture pcweb-column.motorlife
-     pcweb-column.nihongoprog pcweb-column.objc pcweb-column.ide
-     pcweb-column.music pcweb-column.itsecurity
-     pcweb-column.soundvisual pcweb-column.osx pcweb-column.sopinion
-     pcweb-column.ebook pcweb-column.orerobo pcweb-column.zsh
-     pcweb-column.rikei pcweb-column.lifehack pcweb-column.world
-     pcweb-column.guutara pcweb-column.volt pcweb-column.textclean
-     pcweb-column.person pcweb-column.web20 pcweb-column.system
-
-     $B8eJ}8_49@-$N$?$a!"0J2<$N%"%$%F%`$bMxMQ2DG=$K$J$C$F$$$^$9!#(B
-     pcweb-column.itshihonron pcweb-column.yetanother
-     pcweb-column.asia pcweb-column.benri pcweb-column.bytes
-     pcweb-column.game pcweb-column.hitech pcweb-column.java
-     pcweb-column.jisakuparts pcweb-column.scramble
-     pcweb-column.toolexp pcweb-column.winvista pcweb-column.winxp
-     pcweb-column.interview pcweb-column.ityougo pcweb-column.kimeuchi
-     pcweb-column.stratesys pcweb-column.toyagain
-
-$A%N$B!<$A%D$(G]s$AAP$(Gs((B (http://tsuruo.dominohosting.biz/members/tsuruo/)
-     lotusex.news lotusex.library lotusex.operation lotusex.primer
-     lotusex.tips lotusex.practical lotusex.qanda lotusex.lounge
-     lotusex.bbs
-
-$A#@(BIT$A%U%)$B!<$A%i%`(B (http://www.atmarkit.co.jp)
-     atmarkit.news atmarkit.fwin2k atmarkit.fdotnet atmarkit.fsys
-     atmarkit.fxml atmarkit.fdb atmarkit.flinux atmarkit.fnetwork
-     atmarkit.fjava atmarkit.fsecurity atmarkit.farc atmarkit.fbiz
-     atmarkit.fwcr atmarkit.jibun
-
-TeX Q&A $(I6-$AJ>0e(B (http://www.matsusaka-u.ac.jp/~okumura/texfaq/qa/)
-     texfaq.qanda
-
-X51.org (http://x51.org/)
-     x51.anima x51.art x51.auction x51.blow x51.cabal x51.crime
-     x51.disaster x51.edge x51.enema x51.ghost x51.homme x51.info
-     x51.life x51.love x51.media x51.medical x51.military
-     x51.northkorea x51.oparts x51.phallic x51.psychics x51.religion
-     x51.science x51.top x51.ufo x51.uma x51.xfiles
-
-eXperts Connection (eXConn) (http://www.exconn.net/)
-     exconn.news
-
-MSDN (http://msdn.microsoft.com/)
-     msdn.all msdn.netframework msdn.architecture msdn.asp.net
-     msdn.data msdn.longhorn msdn.mobility msdn.subscriptions
-     msdn.msdntv msdn.office msdn.security msdn.sql msdn.theshow
-     msdn.vbasic msdn.vcsharp msdn.visualc msdn.vfoxpro msdn.vjsharp
-     msdn.vstudio msdn.vs2005 msdn.webservices msdn.embedded msdn.xml
-     msdn.japan.msdn msdn.japan.msdn-us
-
-Haiku OS (http://haiku-os.org/)
-     haiku-os.news haiku-os.forums haiku-os.newsletters
-
-Foundation for a Free Information Infrastructure (http://www.ffii.org/)
-     ffii.en.software-patents ffii.en.software-patents.ffii
-     ffii.en.information-infrastructure ffii.en.project
-     ffii.de.software-patente ffii.de.software-patente.ffii
-     ffii.de.informations-infrastruktur ffii.fr.brevets-logiciels
-     ffii.fr.brevets-logiciels.ffii ffii.nl.softwarepatenten
-     ffii.nl.softwarepatenten.ffii
-
-
-
-File: emacs-w3m-ja.info, Node: Shimbun Basics, Prev: Shimbun Sites, Up: Shimbun Library
-
-$APB$(GjL$A%b%8%e$B!<$A%k$NWw$j7=(B
-======================
-
-`Shimbun' $B$O(B emacs-w3m $B$NIUB0%i%$%V%i%j$G!"(BGnus $B$d(B Wanderlust$B!"(BMew $B$J$I(B
-$B$N(B MUA $B$rMxMQ$7!"%&%'%V%3%s%F%s%D$r%a!<%k$HF1$8%f!<%6%$%s%?!<%U%'!<%9$G(B
-$BFI$`$3$H$r2DG=$K$9$k$b$N$G$9!#$3$3$G$O(B `shimbun' $B%b%8%e!<%k$r:n@.$9$kE5(B
-$B7?E*$JJ}K!$r@bL@$7$^$9!#(B
-
-* Menu:
-
-* Overview::                    $B35N,(B
-* Getting web page and header information::  $B%&%'%V%Z!<%8$N%=!<%95Z$S%X%C%@>pJs$r<hF@$9$k(B
-* Displaying an article::       $B5-;v$NI=<((B
-* Inheriting shimbun module::   shimbun $B%b%8%e!<%k$N7Q>5(B
-* Making text/plain articles::  text/plain $B$N5-;v$r:n$k$K$O(B
-* Zenkaku to hankaku conversion:: $BA43QJ8;z$rH>3QJ8;z$KJQ49$9$k(B
-* Coding convention of Shimbun:: $B%3!<%G%#%s%05,Ls(B
-
-
-
-File: emacs-w3m-ja.info, Node: Overview, Next: Getting web page and header information, Prev: Shimbun Basics, Up: Shimbun Basics
-
-$A8EBT(B
-----
-
-`http://www.foobar.net' $B$N%3%s%F%s%D$r1\Mw$9$k?7$?$J(B `shimbun' $B%b%8%e!<(B
-$B%k(B `foobar' $B$r:n@.$9$k$H$7$F!"$^$::G=i$K5.J}$,$7$J$l$P$J$i$J$$$3$H$O!"(B
-`sb-foobar.el' $B$NKAF,$K(B
-
-     (require 'shimbun)
-     (luna-define-class shimbun-foobar (shimbun) ())
-
-$B$N$h$&$J@k8@$rF~$l$F$*$/$3$H$G$9!#=y!9$KJ,$+$k$H;W$$$^$9$N$G!":#$O$*$^(B
-$B$8$J$$$H;W$C$F$*$$$F$/$@$5$$!#Cm0U$9$Y$-$3$H$O!"(B`shimbun' $B%b%8%e!<%k$r(B
-$BF~$l$k%U%!%$%kL>$N(B `sb-foobar.el' $B$N(B `foobar' $B$NL>A0$H!"(B
-`luna-define-class' $B$NBh0l0z?t$N(B `shimbun-foobar' $B$N(B `foobar' $B$NL>A0$O(B
-$B9g$o$;$F$*$/I,MW$,$"$k$3$H$G$9!#(B
-
-`Shimbun' $B%b%8%e!<%k(B `shimbun-foobar' $B$,$3$J$9$Y$-;E;v$OBg$-$/;M$D$"$j(B
-$B$^$9(B ($B$"$J$?$,(B Gnus $B$N%f!<%6$J$i$P!"!V%U%)%k%@!W$r!V%0%k!<%W!W$KFI$_49(B
-$B$($F$/$@$5$$(B):
-
-  1. MUA $B$,(B `foobar' $B%U%)%k%@$r3+$$$?$i!"5-;v$NI8Bj$J$I$r%j%9%H%"%C%W$9(B
-     $B$k$?$a$K(B `http://www.foobar.net' $B$+$i%&%'%V%Z!<%8$N%=!<%9$r<hF@$9(B
-     $B$k$3$H!#(B
-
-  2. $B<hF@$7$?%&%'%V%Z!<%8$N%=!<%9$KBP$7!"5-;v$N8+=P$7$KI,MW$J$$$/$D$+$N(B
-     $B>pJs$H$H$b$K<hF@$7$F!"(B`headers' $B$H$$$&%j%9%H$KBeF~$7$FJV$9$3$H!#(B
-
-  3. MUA $B$,(B `foobar' $B%U%)%k%@$N5-;v$N1\Mw$rMW5a$7$?$i!"<B:]$N5-;vFbMF$r(B
-     $B5-:\$7$?%&%'%V%Z!<%8$N%=!<%9$r(B ($BNc$($P(B
-     `http://www.foobar.net/030530.html' $B$+$i(B) $B<hF@$9$k$3$H!#(B
-
-  4. `http://www.foobar.net/030530.html' $B$+$i<hF@$7$?%&%'%V%Z!<%8$N%=!<(B
-     $B%9$r!"I,MW$K1~$81\Mw$7$d$9$$$h$&$K@07A$9$k$3$H!#(B
-
-$B:G=i$N:n6H$O(B `shimbun.el' $B$N(B `shimbun-headers' $B$,!"FsHVL\$N:n6H$O(B
-`shimbun-get-headers' $B$,C4Ev$7$^$9!#$=$7$F;0HVL\$N:n6H$O(B
-`shimbun-article' $B$,!":G8e$N:n6H$O(B `shimbun-make-contents' $B$,C4Ev$7$^$9!#(B
-
-`shimbun.el' $B$NCf$r$4Mw$/$@$5$$!#(B`defun' $B$K$h$k4X?tDj5A$NB>$K!"(B
-$B8+47$l$J$$(B `luna-define-generic', `luna-define-method' $B$J$I$N(B
-$B@k8@$,$"$j$^$9$h$M!#$I$&$b;HMQJ}K!$O(B `defun' $B$N$=$l$H;w$F$$$k$h$&$G(B
-$B$9!#$=$7$F!"A0<T$O2?$@$+(B doc-string $B$@$1$r=q$$$F$"$k$h$&$G!"F1L>$N%7%s%\(B
-$B%k$K$D$$$F8e<T$K$h$C$F:FEY@k8@$7$F$$$k$h$&$K8+$($^$9!#99$K!"$"$k%7%s%\%k(B
-$B$K$D$$$F!"(B`luna-define-generic' $B$N@k8@$@$1$,$"$C$F!"(B
-`luna-define-method' $B$N@k8@$,$J$$$b$N$b$"$j$^$9!#(B
-
-$B<B$O!"(B`shimbun.el' $B5Z$S3F(B `shimbun' $B%b%8%e!<%k$O!"(BEmacs Lisp $B$K$F%*%V%8%'(B
-$B%/%H;X8~%W%m%0%i%_%s%0$r2DG=$H$9$k(B `luna.el' (1) (*Note
-Overview-Footnotes::) $B$rMxMQ$7$F=q$+$l$F$$$^$9!#(B
-
-`shimbun.el' $B$NCf$G$O!"(B`shimbun-headers' $B$,$"$k(B URL $B$N%&%'%V%Z!<%8$N%=!<(B
-$B%9$r<hF@$7!"(B`shimbun-get-headers' $B$,$=$N%&%'%V%Z!<%8$N%=!<%9$+$iI8Bj$J(B
-$B$I$rH4$-=P$7(B... $B$H$$$&A0=R$N<j=g$,%O!<%I%3!<%G%#%s%0$5$l$F$$$^$9!#$7$+(B
-$B$7!"7h$aBG$A$9$k$@$1$G$O!"@i:9K|JL$N%&%'%V%Z!<%8$N%=!<%9$r!"$=$N9=B$$K(B
-$B9g$o$;$FJQ2=$5$;$k$3$H$,$G$-$^$;$s!#(B
-
-$B$=$3$G(B `luna' $B$K$h$j!"%a%=%C%I$,%3!<%k$5$l$k<j=g$@$17h$a$F$*$$$F!"(B
-`shimbun' $B$K$h$jJQ2=$5$;$k$Y$-%a%=%C%I$N<BBNDj5A$r3F(B `shimbun' $B%b%8%e!<(B
-$B%k$KG$$;$F$$$k$N$G$9!#3F(B `shimbun' $B%b%8%e!<%k$G6&DL$G;H$($=$&$J%a%=%C%I(B
-$B$O(B `shimbun.el' $B$NCf$K%a%=%C%I$N<BBN$bDj5A$7$F$"$j$^$9$,!"$=$l$9$i3F(B
-`shimbun' $B%b%8%e!<%k$K$*$$$F:FDj5A$r$9$k$3$H$,2DG=$G$9!#(B
-
-$B$b$&$*J,$+$j$N$h$&$K!"(B`luna-define-generic' $B$O!"8@$o$P]W$@$1$N@k8@!"(B
-`luna-define-method' $B$O(B `shimbun' $B%b%8%e!<%kKh$K:n@.$G$-$k<BBN$N@k8@!#(B
-$B$=$7$F(B `sb-foobar.el' $B$NKAF,$KF~$l$?(B `luna-define-class' $B$G$N@k8@$O!"(B
-`luna' $B>e$G$N?7$?$J%/%i%9$N@k8@$@$C$?$o$1$G$9!#(B
-
-
-File: emacs-w3m-ja.info  Node: Overview-Footnotes, Up: Overview
-
-(1) FLIM $A$K:,$^$l$F$$$^$9!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Getting web page and header information, Next: Displaying an article, Prev: Overview, Up: Shimbun Basics
-
-$A%&%'%V%Z$B!<$A%8$N%=$B!<$A%9<0$S%X%C%@Gi$(G^^$A$rH!5C$9$k(B
---------------------------------------------
-
-$B$^$:5-;v8+=P$7$r<hF@$9$kBP>]$H$J$k%&%'%V%Z!<%8$r7h$a$k$3$H$+$i;O$a$^$9!#(B
-$B%U%l!<%`I=<($5$l$F$$$k>l9g$O!"%U%l!<%`$NCf$GI,MW$J%Z!<%8$@$1$rC1FH$G;X(B
-$B$7<($9(B URL $B$rFCDj$9$k$Y$-$G$9!#FCDj$G$-$?$i!"?7$?$K:n@.$9$k(B `shimbun'
-$B%b%8%e!<%k$NCf$G(B `luna-define-method' $B$r;H$$!"(B`shimbun-index-url' $B$NDj(B
-$B5A$r:n@.$7$^$7$g$&!#C1=c$K(B URL $B$rJV$9$h$&$K$9$l$PNI$$$G$9$h!#8e$G@bL@$7(B
-$B$^$9$N$G!"JQ?t(B `shimbun-foobar-groups' $B$bMQ0U$7$F$*$-$^$7$g$&(B (1)
-(*Note Getting web page and header information-Footnotes::)$B!#(B
-
-     (defvar shimbun-foobar-url "http://www.foobar.net")
-
-     (luna-define-method shimbun-index-url ((shimbun shimbun-foobar))
-       shimbun-foobar-url)
-
-     (defvar shimbun-foobar-groups '("news"))
-
-`shimbun-headers' $B%a%=%C%I$O(B `shimbun.el' $B$NCf$K4{$KDj5A$5$l$F$$$^$9$+(B
-$B$i!"(B`sb-foobar.el' $B$G(B `shimbun-index-url' $B%a%=%C%I$NDj5A$r:n@.$9$l$P%&%'(B
-$B%V%Z!<%8$N%=!<%9$N<hF@$,$G$-$k$h$&$K$J$j$^$9!#(B`shimbun-headers' $B$O%&%'(B
-$B%V%Z!<%8$N%=!<%9$r<hF@$7$?8e!"(B`shimbun-get-headers' $B%a%=%C%I$r8F$S!"%X%C(B
-$B%@>pJs$N<}=8$KF~$j$^$9!#(B`shimbun.el' $B$NCf$K$O(B `shimbun-get-headers' $B$N(B
-$B%a%=%C%I@k8@$,$"$j$;$s$+$i!"(B`sb-foobar.el' $B$NCf$GFH<+$K%a%=%C%I$r:n@.$7(B
-$B$J$1$l$P$J$j$^$;$s!#(B
-
-`sb-foobar.el' $B$K(B `shimbun-get-headers' $B$N%a%=%C%I$r:n@.$9$k$?$a$K!"<h(B
-$BF@$7$?%Z!<%8$N%=!<%9$rJ,@O$7$^$7$g$&!#$I$N$h$&$J@55,I=8=$G5-;v$N%X%C%@(B
-$B>pJs$r<}=8$9$k$+$r8!F$$7$^$9!#5-;v$N8+=P$7$H$7$FFC$KI,MW$J>pJs$O!"I8Bj!"(B
-$BF|IU!":n@.<T!"$=$N5-;v$N(B URL$B!"$=$7$F(B `message-id' $B$G$9!#$3$l$i$N>pJs$O!"(B
-$B$=$l$>$l$N(B MUA $B$K$*$$$F!"(BSubject, Date, From, Xref, Message-ID $B$H$7$FI=(B
-$B<($5$l$^$9!#Nc$($P!"2<5-$N(B
-
-     <a href="030530.html">5$B7n(B30$BF|$NOCBj(B($BEj9F<T(B-$B$_$-$*(B &lt;foo@bar.net&gt;)</a>
-
-$B$N$h$&$J9T$r=8$a$F5-;v$K$7$?$$$N$G$7$?$i!"(B
-
-     "<a href=\"\\(\\([0-9][0-9][0-9][0-9]\\)[0-9][0-9]\\.html\\)\">\\([^<(]+\\)($BEj9F<T(B-\\([^<]+\\))<\/a>"
-
-$B$N$h$&$J@55,I=8=$K$J$k$G$7$g$&!#$=$7$F5-;v$N(B Xref $B$NCM$O(B
-`(match-string 1)' $B$G<hF@$G$-$^$9!"(BDate $B$O(B
-`(match-string 2)' $B$NCM$r2C9)$9$l$PNI$$$G$7$g$&!#(BSubject $B$O(B
-`(match-string 3)' $B$G<hF@$G$-$^$9$M!#(BFrom $B$O(B
-`(match-string 4)' $B$r2C9)$9$l$PNI$$$G$7$g$&!#$3$l$i$NCM(B
-$B$O(B MUA $B$G8+0W$$$h$&$K99$K2C9)$7$F$b9=$$$^$;$s!#(B
-
-$B>e5-$N$h$&$K5-;v$N(B URL $B$,AjBP%Q%9I=<($5$l$F$$$k>l9g$O!"(B
-`shimbun-expand-url' $B$r;HMQ$7!"@dBP%Q%9I=<($KJQ99$7$F$+$i%X%C%@$K<}$a$^(B
-$B$7$g$&!#5-;v$N(B URL $B$,%X%C%@$N(B URL $B$HF1$8!"$D$^$j5-;vKh$K8DJL$K(B URL $B$r;}(B
-$B$?$J$$9=B$$N%&%'%V%Z!<%8$b$"$j$^$9!#$3$N>l9g$O>/$7$d$C$+$$$G!"%X%C%@>p(B
-$BJs<hF@$NCJ3,$G!"5-;v$NFbMF$b<hF@$7$F$*$-!"(BEmacs $B$N%a%b%j$K<}$a$F$*$/I,(B
-$BMW$,$"$j$^$9!#6qBNE*$K$O(B `sb-palmfan.el', `sb-dennou.el', `sb-tcup.el'
-$B$N(B `shimbun-headers' $B%a%=%C%I$NDj5A$r;2>H$7$F$/$@$5$$!#(B
-
-$B%&%'%V%Z!<%8$K$h$C$F$O(B Date $B$,FCDj$G$-$J$$$b$N$,$"$j$^$9!#$=$&$$$&>l9g(B
-$B$OL5M}$KFCDj$;$:$H$b(B `""' $B$rF~$l$F$*$1$P(B OK $B$G$9!#5-;v$NFbMF$r8+$F=i$a(B
-$B$F(B Date $B$,FCDj$G$-$k$J$i!"(B`shimbun-make-contents' $B%a%=%C%I$NCf$G2~$a$F(B
-$B%X%C%@$K(B Date $B$N>pJs$rF~$l$F$b(B OK $B$G$9!#$=$l$+$i!"(BFrom $B$r7h$aBG$A$7$F$b(B
-$BNI$$>l9g$b$"$j$^$9!#(B
-
-`message-id' $B$N:n@.$K$OCm0U$rMW$7$^$9!#0lIt$N5-;v$,FI$a$J$+$C$?$j$7$^$9(B
-$B$N$G(B (2) (*Note Getting web page and header information-Footnotes::)$B!"(B
-$BI,$:C10l@-(B (uniqueness) $B$rJ]>Z$7$J$1$l$P$J$j$^$;$s!#F|IU$d%I%a%$%s!"$=(B
-$B$N%Z!<%8$N(B URL $B$N0lIt$r;H$C$FJ8;zNs$r@8@.$9$k$3$H$GC10l@-$r3NJ]$7$^$7$g(B
-$B$&!#$=$NB>!"(B`message-id' $B$N0lIt$KI,$:(B `@' $B$r4^$a$k$h$&$K$7!"5U$K(B `:' $B$O(B
-$B4^$^$J$$$h$&$K$7$^$7$g$&!#$3$N%k!<%k$r<i$i$J$$$H%$%s%i%$%s2hA|$,$-$A$s(B
-$B$H=PNO$5$l$^$;$s$h!#>\$7$/$O(B RFC2387, RFC822 $B$r;2>H$7$F$/$@$5$$!#(B
-
-$B6lO+$7$F<hF@$7$?$3$l$i$N>pJs$O(B `shimbun-create-header' $B$H$$$&4X?t$rMxMQ(B
-$B$7$F%X%C%@$K<}$a$^$9!#(B
-
-$B7k6I(B `sb-foobar.el' $B$NCf$G$N(B `shimbun-get-headers' $B$NDj5A$N9|AH$_$O$3$s(B
-$B$JIw$K$J$j$^$9$M!#(B
-
-     (luna-define-method shimbun-get-headers ((shimbun shimbun-foobar)
-                                              &optional range)
-       (let ((regexp "....")
-             subject from date id url headers)
-         ...
-         (catch 'stop
-           (while (re-search-forward regexp nil t nil)
-             ...
-             (when (shimbun-search-id shimbun id)
-               (throw 'stop nil))
-             (push (shimbun-create-header
-                    0 subject from date id "" 0 0 url)
-                   headers)))
-         headers))
-
-$B$J$*!"$3$N%a%=%C%I$NCf$G$O(B `shimbun' $B$H$$$&0l;~JQ?t$G!"(B`shimbun' $B%b%8%e!<(B
-$B%k(B `shimbun-foobar' $B$N%$%s%9%?%s%9$K%"%/%;%9$G$-$^$9!#(B
-
-$B$H$3$m$G!"@hDxJ]N1$K$7$?JQ?t(B `shimbun-foobar-groups' $B$K$D$$$F@bL@$7$^$7$g(B
-$B$&!#(B
-
-$B2>$K(B `http://www.foobar.net' $B$NCf$KFI$_$?$$5-;v%0%k!<%W$,Fs$D$"$C(B
-$B$F!"$=$l$>$l$N5-;v$N%X%C%@>pJs$rF@$k%&%'%V%Z!<%8$,JL!9$N>l=j$K$"$C$?$H$7(B
-$B$^$7$g$&!#(B`http://www.foobar.net/whatsnew/index.hmtl' $B$K%5%$%H(B
-$B$N99?7>pJs$,!"(B`http://www.foobar.net/ml/index.html' $B$K(B ML $B$N5-(B
-$B;v%"!<%+%$%V$N0lMw$,$"$k$H$-$J$I$G$9!#$3$&$$$&>l9g$O!"(B`shimbun' $B%b(B
-$B%8%e!<%k(B `foobar' $B$N%0%k!<%W$H$7$F!"(B`foobar.whatsnew',
-`foobar.ml' $B$H$7$F%"%/%;%9$G$-$k$HJXMx$G$9$h$M!#$=$&$$$&>l9g$O2<5-(B
-$B$N$h$&$K$7$F$_$^$7$g$&!#(B
-
-     (defvar shimbun-foobar-url "http://www.foobar.net")
-
-     (defvar shimbun-foobar-group-path-alist
-       '(("whatsnew" . "/whatsnew/index.html")
-         ("ml" . "/ml/index.html")))
-
-     (defvar shimbun-foobar-groups
-       (mapcar 'car shimbun-foobar-group-path-alist))
-
-     (luna-define-method shimbun-index-url ((shimbun shimbun-foobar))
-       (concat shimbun-foobar-url
-               (cdr (assoc (shimbun-current-group-internal shimbun)
-                           shimbun-foobar-group-path-alist))))
-
-$B8=:_%f!<%6$,%"%/%;%9$7$F$$$k%0%k!<%W$K$O(B
-`shimbun-current-group-internal' $B$r;H$($PJ,$+$j$^$9!#(B
-`shimbun-get-headers' $B$J$I$G$b%0%k!<%W$,0c$($P:n6HFbMF$,0c$C$F$/$k2DG=(B
-$B@-$b$"$j$^$9$M!#(B
-
-$B$J$*!"(B`shimbun' $B%b%8%e!<%k0l$D$K$D$-!":GDc$G$b0l$D$N%0%k!<%W$,I,MW$G$9!#(B
-$B%0%k!<%W$NL>A0$N7h$aJ}$KFC$K7h$^$j$O$"$j$^$;$s$,!"%0%k!<%WL>$KG:$s$@$i!"(B
-`news' $B$H$+(B `main' $B$J$I$HIU$1$F$*$-$^$7$g$&!#(B
-
-
-File: emacs-w3m-ja.info  Node: Getting web page and header information-Footnotes, Up: Getting web page and header information
-
-(1) `Shimbun' $A%b%8%e$B!<$A%kR;$D$K$D$-!"Wn5M$G$bR;$D$N%0%k$B!<$A%W$,1XR*$G(B
-$A$9!#(B
-
-(2) shimbun $A$NR;2?$N$(GX4$AJB$,$BFI$A$a$J$$$@$1$J$i$^$@$7$b!"OBJV$K(B
-`message-id' $A$rWw3I$9$k$H!"$(Gb8$A7=$,J\$(Gkk$A$9$k4sJB$J%a$B!<$A%k$N$=$l$H$+$A(B
-$A:O$C$F$7$^$$!"$=$N%a$B!<$A%k$,$BFI$A$a$J$/$J$k?ID\PT$9$i$"$j$^$9!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Displaying an article, Next: Inheriting shimbun module, Prev: Getting web page and header information, Up: Shimbun Basics
-
-$(GX4$AJB$N1mJ>(B
-----------
-
-`shimbun.el' $B$KDj5A$5$l$?(B `shimbun-article' $B%a%=%C%I$O!"%X%C%@>pJs$+$i(B
-Xref $B$r<h$j=P$7!"$=$N(B URL $B$N%&%'%V%Z!<%8$N%=!<%9$r<hF@$7$?8e$K!"$=$N%=!<(B
-$B%9$rF~$l$?%o!<%-%s%0%P%C%U%!$NCf$G(B `shimbun-make-contents' $B$r8F$S$^$9!#(B
-$B6qBNE*$J5-;v$N2C9)$O(B `shimbun-make-contents' $B$N;E;v$G$9!#(B
-
-$B5-;v$H$J$k%&%'%V%Z!<%8$N%=!<%9$,!"$I$P$C$H%o!<%-%s%0%P%C%U%!$K$V$A$^$1(B
-$B$i$l$F$$$k$HA[A|$7$F$/$@$5$$!#(B`shimbun.el' $B$NI8=`$N(B
-`shimbun-make-contents' $B$O!"$=$N%P%C%U%!$N@hF,$K$^$:%X%C%@>pJs$rA^F~$7!"(B
-$B$=$ND>8e$K(B `<html>' $B$d(B `<body>' $B$J$I$r!"$^$?!"%P%C%U%!$NKvHx$K(B
-`</body>', `</html>' $B$rA^F~$7$F$/$l$^$9!#$=$&$d$C$F(B HTML $B%a!<%k$H$7$FI=(B
-$B<($5$;$k$N$G$9!#(B
-
-     HTML $B$N5-;v$@$1$G$J$/!"(B`text/plain' $B7A<0$N5-;v$,@8@.$5$l$k$h$&$K$9(B
-     $B$k$3$H$b$G$-$^$9!#(B*Note Making text/plain articles::.
-
-$B5-;v$r2?$b2C9)$9$kI,MW$,$J$1$l$P(B `sb-foobar.el' $B$NCf$G$O(B
-`shimbun-make-contents' $B$K$D$$$F?7$?$KDj5A$9$kI,MW$O$"$j$^$;$s!#(B
-
-$BC1=c$K5-;v$NA08e$K<N$F$?$$ItJ,$,$"$k$@$1$J$i$P!"(B
-`shimbun-foobar-content-start', `shimbun-foobar-content-end' $B$K<N$F$?$$(B
-$BItJ,$r8!:w2DG=$J@55,I=8=$r;XDj$7$F$*$-$^$7$g$&!#(B
-
-     (defvar shimbun-foobar-content-start "^<body>$")
-     (defvar shimbun-foobar-content-end "^<\/body>$")
-
-$BI8=`$N(B `shimbun-make-contents' $B$+$i8F$S=P$5$l$?(B
-`shimbun-clear-contents' $B$O!"$3$l$i$N@55,I=8=$rMxMQ$7$F!"(B`point-min' $B$+(B
-$B$i(B `shimbun-foobar-content-start' $B$^$G!"(B`shimbun-foobar-content-end' $B$+(B
-$B$i(B `point-max' $B$^$G$r@Z$j<N$F$F$/$l$^$9$h!#C"$7!"$3$l$iFs$D$N%^%C%A$O$$(B
-$B$:$l$+$,@.8y$7$J$$$H@Z$j<N$F$O9T$o$l$^$;$s$N$GCm0U$,I,MW$G$9!#(B
-
-$B9-9p$J$I$NITMW$J>pJs$,$"$C$F!"$=$l$r:Y$+$/8!:w$7$F<N$F$?$$>l9g$O!"(B
-`sb-foobar.el' $B$NCf$GFH<+$N(B `shimbun-clear-contents' $B$rDj5A$7$F$*$-$^$9!#(B
-
-     (luna-define-method shimbun-clear-contents :around ((shimbun shimbun-foobar)
-                                                         header)
-       ;; cleaning up
-       (while (re-search-forward "..." nil t nil)
-         (delete-region (match-beginning 0) (match-end 0)))
-       (luna-call-next-method))
-
-$B$h$j6qBNE*$JJ}K!$O!"(B`sb-ibm-dev.el' $B$,;29M$K$J$k$+$b$7$l$^$;$s!#(B
-
-$B@hDx!"(B*Note Getting web page and header information:: $B$N@a$G!"5-;vKh$K(B
-$B8DJL$K(B URL $B$r;}$?$J$$9=B$$N%&%'%V%Z!<%8$N>l9g!"%X%C%@>pJs<hF@$NCJ3,$G!"(B
-$B5-;v$NFbMF$b<hF@$7$F$*$-!"(BEmacs $B$N%a%b%j$K<}$a$F$*$/I,MW$,$"$k$H?=$7>e(B
-$B$2$^$7$?!#$3$N>l9g!"(B`shimbun-article' $B$G$O>e5-$N$h$&$J(B Xref $B>pJs$+$i$N(B
-web page $B$N<hF@$OI,MW$K$J$j$^$;$s$N$G!"$?$@(B Emacs $B$N%a%b%j$+$i<h$j=P$7(B
-$B$F!"%P%C%U%!$K@07A$7$FA^F~$9$l$PB-$j$^$9!#6qBNE*$K$O(B `sb-palmfan.el',
-`sb-dennou.el', `sb-tcup.el' $B$N(B `shimbun-article' $B%a%=%C%I$NDj5A$r;2>H(B
-$B$7$F$/$@$5$$!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Inheriting shimbun module, Next: Making text/plain articles, Prev: Displaying an article, Up: Shimbun Basics
-
-Shimbun $A%b%8%e$B!<$A%k$N$(ICc$A3P(B
-------------------------
-
-$B%a!<%j%s%0%j%9%H%^%M!<%8%c(B ($B%"!<%+%$%P(B) $B$H$7$FM-L>$J$b$N$,$$$/$D$+$"$j(B
-$B$^$9!#(B
-
-   * Mailman The GNU Mailing List Manager. $B0JA0$O(B `pipermail' $B$H8F$P$l(B
-     $B$F$$$^$7$?!#>\:Y$O(B
-     `http://www.gnu.org/software/mailman/index.html' $B$r$4Mw$/$@$5$$!#(B
-
-   * MHonArc$B>\:Y$O(B `http://www.oac.uci.edu/indiv/ehood/mhonarc.html' $B$r(B
-     $B$4Mw$/$@$5$$!#(B
-
-   * fml fml mailing list server/manager.  $B>\:Y$O(B
-     `http://www.fml.org/software/fml/' $B$r$4Mw$/$@$5$$!#(B
-
-   * mailarc$B>\:Y$O(B `http://cvs.namazu.org/mailarc/' $B$r$4Mw$/$@$5$$!#(B
-
-$B5.J}$,(B *Note Getting web page and header information:: $B$N%9%F%C%W$G<hF@(B
-$B$7$?%&%'%V%Z!<%8$N%=!<%9$rJ,@O$7$F$$$k$H$-$K!"$=$N%=!<%9$NCf$K$3$l$i%a!<(B
-$B%j%s%0%j%9%H%^%M!<%8%c$NL>A0$r8+$D$1$?$i(B (1) (*Note Inheriting shimbun
-module-Footnotes::)$B!"$=$l$O$9$4$/%i%C%-!<$J$3$H$G$9!#(B`sb-mailman.el',
-`sb-mhonarc.el', `sb-fml.el', `sb-mailarc.el' $B$K4{$K(B
-`shimbun-get-headers' $B$J$I$NI,MW$J%a%=%C%I$,Dj5A$5$l$F$$$^$9!#$3$l$i$r(B
-$BMxMQ$7$F$J$*B-$j$J$$ItJ,$@$1$N:9J,%W%m%0%i%_%s%0$r$9$l$P!"5.J}$N(B
-`sb-foobar.el' $B$OAaB.F0$-$^$9!#(B
-
-$BNc$($P(B `sb-mailman.el' $B$rMxMQ$9$k$J$i(B `sb-foobar.el' $B$NKAF,$O!"(B
-
-     (require 'sb-mailman)
-     (luna-define-class shimbun-foobar (shimbun-mailman) ())
-
-$B$3$s$JIw$K$J$j$^$9!#$3$l$G(B `shimbun' $B%b%8%e!<%k(B `shimbun-foobar' $B$O(B
-`shimbun-mailman' $B%/%i%9$r7Q>5$7(B (2) (*Note Inheriting shimbun
-module-Footnotes::)$B!"(B`shimbun-foobar' $B$NCf$G$O!"(B`sb-mailman.el' $B$NCf$G(B
-$BDj5A$5$l$F$$$k%a%=%C%I$,I8=`$G;HMQ$5$l$k$3$H$H$J$j$^$9(B ($B99$K%a%=%C%I$N(B
-$B0lIt$r>e=q$-$9$k$3$H$b2DG=$G$9(B)$B!#(B
-
-`sb-mailman.el' $B$r<B:]$KMxMQ$7$?%5%s%W%k$H$7$F!"(B`sb-pilot-mailsync.el'
-$B$J$I$r$4Mw$/$@$5$$!#G!2?$K3Z$,$G$-$k$+$,$*J,$+$j$K$J$k$G$7$g$&!#(B
-
-$B5$$rIU$1$k$3$H$,0l$D$"$k$H$9$l$P!"$3$l$i$N%a!<%j%s%0%j%9%H%^%M!<%8%c$N(B
-$BCf$K$OCO0h2=(B (localize) $B$5$l$F!"Nc$($PF|IUI=<($rF|K\8l$G9T$&$h$&$K2~B$(B
-$B$5$l$F$$$k$b$N$,$"$k$3$H$G$9!#(B`sb-mailman.el', `sb-mhonarc.el',
-`sb-fml.el', `sb-mailarc.el' $B$O$$$:$l$bI8=`$N!"1Q8lHG$N$b$N$KBP1~$7$F$$(B
-$B$^$9!#$3$l$iCO0h2=$5$l$?%a!<%j%s%0%j%9%H%^%M!<%8%c$rMxMQ$7$F$$$k%&%'%V(B
-$B%5%$%H$r(B `shimbun' $B$GFI$_$?$$$H$-$O!"$$$/$D$+$N%a%=%C%I$r>e=q$-$7$J$1$l(B
-$B$P$J$i$J$$$+$b$7$l$^$;$s!#(B
-
-
-File: emacs-w3m-ja.info  Node: Inheriting shimbun module-Footnotes, Up: Inheriting shimbun module
-
-(1) $A%&%'%V%Z$B!<$A%8$N%=$B!<$A%9$NVP$K$3$l$i%a$B!<$A%j%s%0%j%9%H%^%M$B!<$A%8%c$NC{G0$,(B
-$A1mJ>$5$l$F$$$k$3$H$,6`$$$G$9!#(B
-
-(2) $A$D$^$j(B `shimbun-mailman' $A%/%i%9$,$(Gr5$A%/%i%9$K$J$j$^$9!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Making text/plain articles, Next: Zenkaku to hankaku conversion, Prev: Inheriting shimbun module, Up: Shimbun Basics
-
-text/plain $A$N$(GX4$AJB$rWw$k$K$O(B
----------------------------
-
-$B$?$H$((B MUA $B$,(B HTML $B$N5-;v$rFI$`$3$H$,$G$-$k$h$&$K(B emacs-w3m $B$K$h$C$F6/(B
-$B2=$5$l$F$$$F$b!"$$$/$D$+$N>l9g$K$O(B `text/plain' $B$N5-;v$,JXMx$J$3$H$b$"(B
-$B$k$+$b$7$l$^$;$s!#(B`sb-foobar' $B%b%8%e!<%k$K(B `text/html' $B$G$O$J$/$F(B
-`text/plain' $B$N5-;v$r:n$i$;$k$K$O!"Fs$D$NJ}K!$,$"$j$^$9!#(B
-
-   * $B0l$D$O(B `sb-foobar' $B%b%8%e!<%k$K(B `sb-text' $B%b%8%e!<%k$r7Q>5$5$;$k(B
-     (*Note Inheriting shimbun module::) $B$3$H$G$9!#0J2<$O(B `sb-foobar'
-     $B%b%8%e!<%k$NKAF,$KCV$/$3$H$,$G$-$kNc$G$9!#(B
-
-          (require 'sb-text)
-          (luna-define-class shimbun-foobar (shimbun-text) ())
-
-     `sb-text' $B%b%8%e!<%k$O!"(B`text/plain' $B7A<0$G5-;v$r@8@.$9$k(B
-     `shimbun-make-contents' $B%a%=%C%I$rDs6!$7$^$9!#%F%-%9%H$@$1$N5-;v$r(B
-     $B7G<($9$k%5%$%H$r07$&(B `shimbun' $B%b%8%e!<%k$K$O!"Lr$KN)$D$G$7$g$&!#(B
-
-   * $B$b$&0l$D$O!"JQ?t(B `shimbun-foobar-prefer-text-plain' $B$rHs(B-`nil' $B$K(B
-     $B@_Dj$9$k$3$H$G$9!#$3$l$O(B `shimbun-make-contents' $B%a%=%C%I$K!"(B
-     `text/plain' $B7A<0$G5-;v$r@8@.$5$;$^$9(B ($B<B:]$K$O!"$=$l$O(B `sb-text'
-     $B%b%8%e!<%k$,Ds6!$9$k4X?t$r;H$$$^$9(B)$B!#$3$l$O!"%G%U%)%k%H$N(B
-     `shimbun-make-contents' $B$r7Q>5$9$k%b%8%e!<%k$@$1$K8z2L$,$"$k$3$H$K(B
-     $BCm0U$7$F$/$@$5$$(B ($BFC$K(B `sb-text' $B%b%8%e!<%k$r7Q>5$9$k%b%8%e!<%k$O!"(B
-     $B1F6A$5$l$^$;$s(B)$B!#$3$NJ}<0$NMxE@$O!"%f!<%6$,4JC1$K(B `text/plain' $B$N(B
-     $B5-;v$H(B `text/html' $B$N5-;v$r@Z$jBX$($k$3$H$,$G$-$k$3$H$G$9!#(B
-
-     $B$=$l$,L$Dj5A$G$"$k>l9g!"JQ?t(B `shimbun-foobar-prefer-text-plain' $B$N(B
-     $B%G%U%)%k%HCM$O(B `nil' $B$G$9!#$7$?$,$C$F!"(B`sb-asahi.el' $B$*$h$S(B
-     `sb-yomiuri.el' $B0J30$N$"$i$f$k(B `shimbun' $B%b%8%e!<%k$K$*$$$F!"$=$N(B
-     $B%G%U%)%k%HCM$O(B `nil' $B$G$9!#(B
-
-     $B2C$($F!"(Bweb $B%Z!<%8$+$i0UL#$N$"$k%F%-%9%H$r@Z$j=P$9$?$a$K!"JQ?t(B
-     `shimbun-foobar-content-start' $B$*$h$S(B
-     `shimbun-foobar-content-end' $B$NBe$o$j$K!"(B
-     `shimbun-foobar-text-content-start' $B$*$h$S(B
-     `shimbun-foobar-text-content-end' $B$r;H$&$3$H$,$G$-$^$9(B (*Note
-     Displaying an article::)$B!#A0<T$,L$Dj5A$@$C$?$i!"$=$l$i$NCM$O%G%U%)(B
-     $B%k%H$G8e<T$NCM$K$J$j$^$9!#(B
-
-$B$I$A$i$NJ}<0$r;H$&$K$7$F$b!"(B`text/plain' $B$N5-;v$O!"2hA|$d%j%s%/$J$I$r4^(B
-$B$`$3$H$,$G$-$J$$$3$H$KCm0U$7$F$/$@$5$$!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Zenkaku to hankaku conversion, Next: Coding convention of Shimbun, Prev: Making text/plain articles, Up: Shimbun Basics
-
-$AH+=GNDWV$r0k=GNDWV$K$(I+y$(G_P$A$9$k(B
-----------------------------
-
-$B!VA43Q!W$^$?$O!VA43QJ8;z!W$O!"I}$,9-$$F|K\8l$NJ8;z$r8F$V$?$a$NB/>N$G$9!#(B
-$B$^$?!VH>3Q!W$O!"DL>o$N(B ASCII $BJ8;z$N$?$a$NBP8l$G$9!#>/$J$/$H$b(B ASCII $BJ8(B
-$B;z%;%C%H$KBP1~$9$k!"A43QJ8;z$N40A4$J%;%C%H$,$"$j$^$9!#(B
-
-$B$$$/$D$+$NF|K\$N%&%'%V%5%$%H$OA43QJ8;z$rB?MQ$9$k798~$,$"$j!"$=$l$i$N5-(B
-$B;v$OI,$:$7$bFI$_0W$/$J$$$+$b$7$l$^$;$s!#$b$7$=$&46$8$?$i!"$=$l$iA43Q$N(B
-$B1Q?t;z$rH>3Q$KJQ49$9$k$3$N5!G=$r;H$&$3$H$,$G$-$^$9!#$=$l$K$O(B
-`shimbun-foobar-japanese-hankaku' $BJQ?t$r(B `t' $B$K@_Dj$7$F$/$@$5$$!#$3$3$G(B
-`foobar' $B$O!"?7J9$N5-;v$r9VFI$9$k%5!<%P!<L>$G$9!#$D$^$j!"%5!<%P!<Kh$K$=(B
-$B$&$7$J$1$l$P$J$i$J$$$H$$$&$3$H$G$9!#(B
-
-$BA43Q$+$iH>3Q$X$NJQ49$r5-;v$N%\%G%#$@$1$G9T$J$o$;$?$$$J$i$P!"(B`t' $B$NBe$o(B
-$B$j$KCM(B `body' $B$r;H$C$F$/$@$5$$!#5U$KCM(B `header' $B$^$?$O(B `subject' $B$O!"%5(B
-$B%V%8%'%/%H$@$1$G$=$l$r9T$J$&$3$H$r;XDj$7$^$9!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Coding convention of Shimbun, Prev: Zenkaku to hankaku conversion, Up: Shimbun Basics
-
-Shimbun $A%i%$%V%i%j$N%3$B!<$A%G%#%s%0$(G]=R|(B
-------------------------------------
-
-   * `shimbun.el' $B$G$O!"(Bemacs-w3m $B$N4X?t$r(B*$AWTSI$K(B*$B;H$C$FNI$$!#(B
-
-   * `sb-*.el' $B$G$O!"$3$l$^$G$HF1MM$K(B emacs-w3m $B$N4X?t$rD>@\8F$S=P$9$3(B
-     $B$H$O$7$J$$!#(B`sb-*.el' $B$GI,MW$K$J$k(B emacs-w3m $B$N4X?t$K$D$$$F$O(B
-     `shimbun.el' $B$K%9%?%V$rMQ0U$9$k!#(B
-
-   * SpeedBar $B$GMxMQ$5$l$F$$$k%U%!%$%kL>$OHr$1$J$1$l$P$J$i$J$$!#(B
-     `speedbar-0.14beta4' $B$GMQ$$$i$l$F$$$k%U%!%$%kL>$r0J2<$K<($9!#(B
-
-     sb-ant.el     sb-html.el    sb-info.el    sb-texinfo.el
-     sb-gud.el     sb-image.el   sb-rmail.el   sb-w3.el
-
-   * $B;2>H$7$F$$$k(B WEB $B%5!<%P$N(B URI $B$rO"A[$5$;$k$h$&$J%U%!%$%kL>$rA*$V$Y(B
-     $B$-$G$"$k!#$?$@$7!"[#Kf$K$J$i$J$$HO0O$G!"9qJL%3!<%I(B
-     (Ex. jp,de,uk,etc) $B$d!"AH?%%3!<%I(B (Ex. edu,com,org,net,etc)$B!"M>J,(B
-     $B$JItJ,(B (Ex. www) $B$r<h$j=|$$$F$bNI$$!#(B
-
-   * $B%0%k!<%WL>$K$O(B USENET $B$K;w$?7A<0$N$b$N$rA*$V$Y$-$G$"$k!#$9$J$o$A!"(B
-     $B%0%k!<%WL>$K$O>.J8;z$,9%$^$l$k!#$^$?!"%0%k!<%W$N3,AX9=B$$rI=$9$?$a(B
-     $B$N6h@Z$jJ8;z$H$7$F$O!"%T%j%*%I(B (.) $B$,9%$^$l$k!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Tips, Next: Mailing List, Prev: Shimbun Library, Up: Top
-
-Emacs-w3m $A$rJ9$&HwBd$?P!No$?$A(B
-******************************
-
-$BB>$N(B Emacs $B$N1~MQ5!G=$H$H$b$K(B emacs-w3m $B$rJXMx$K;H$&$?$a$N%R%s%H=8$G$9!#(B
-
-   * browse-url
-
-     `browse-url' $B$N5!G=$H$H$b$K(B emacs-w3m $B$r;H$&$3$H$,$G$-$^$9!#Nc$($P!"(B
-     $B0J2<$N9T$r(B `~/.emacs' $B%U%!%$%k$KF~$l$F$/$@$5$$(B:
-
-          (setq browse-url-browser-function 'w3m-browse-url)
-          (global-set-key "\C-xm" 'browse-url-at-point)
-
-     $B$3$&$9$k$3$H$K$h$C$F!"(BEmacs $B$N$I$N%P%C%U%!$G$b!"(BURL $B$N$h$&$JJ8;zNs$N>e(B
-     $B$G(B `C-x m' $B%-!<$r%?%$%W$9$k$H!"(Bemacs-w3m $B$,5/F0$5$l$^$9!#2C$($F!"(B
-     `C-c C-v' $B%-!<$r%?%$%W$9$k$3$H$K$h$C$F!"$^$5$KJT=8Cf$N(B HTML $B%U%!(B
-     $B%$%k$r(B emacs-w3m $B$G2<8+(B (preview) $B$9$k$3$H$,$G$-$^$9(B (HTML $B%U%!%$%k$NJT(B
-     $B=8$K!"(BEmacs $B$H(B `html-mode' $B%a%8%c!<%b!<%I$r;H$&I,MW$,$"$j$^$9(B)$B!#(B
-
-     Emacs-w3m $B$N%P%C%U%!$K$$$k$H$-$K!"(B`C-x m' $B%-!<$r%?%$%W$9$k$3$H$K(B
-     $B$h$C$F!"(Bemacs-w3m $B$NBe$o$j$KB>$N%&%'%V%V%i%&%6$r;H$$$?$$>l9g$O(B ($B$=$s$J$3(B
-     $B$H$r$7$?$$?M$,$$$k$N$+$J(B?)$B!"0J2<$N%"%I%P%$%9$r(B `~/.emacs' $B%U%!%$%k(B
-     $B$K2C$($F$/$@$5$$(B:
-
-          (defadvice browse-url-at-point
-            (around change-browse-url-browser-function activate)
-            "Use Netscape only when it is invoked in an emacs-w3m buffer."
-            (let ((browse-url-browser-function
-                   (if (eq major-mode 'w3m-mode)
-                       'browse-url-netscape
-                     'w3m-browse-url)))
-              ad-do-it))
-
-   * dired
-
-     `dired' $B$N%P%C%U%!$G(B `C-x m' $B%-!<$r%?%$%W$9$k$3$H$K$h$C$F!"(B
-     emacs-w3m $B$r;H$C$F(B HTML $B%U%!%$%k$r1\Mw$9$k$3$H$,$G$-$^$9!#(B
-     `~/.emacs' $B%U%!%$%k$G!"0J2<$N@_Dj$r;H$C$F$/$@$5$$(B:
-
-          (eval-after-load "dired"
-            '(define-key dired-mode-map "\C-xm" 'dired-w3m-find-file))
-
-          (defun dired-w3m-find-file ()
-            (interactive)
-            (require 'w3m)
-            (let ((file (dired-get-filename)))
-              (if (y-or-n-p (format "Use emacs-w3m to browse %s? "
-                                    (file-name-nondirectory file)))
-                  (w3m-find-file file))))
-
-   * hnf-mode
-
-     $B%O%$%Q!<F|5-%7%9%F%`$H(B emacs-w3m $B$r;H$C$F!":G?7$NF|5-$r8+$k$3$H$,$G$-$^(B
-     $B$9!#0J2<$N9T$r(B `~/.emacs' $B%U%!%$%k$KF~$l$F!"(B`hnf-mode' $B$N%P%C(B
-     $B%U%!$G(B `C-c C-b' $B%-!<$r%?%$%W$7$F$/$@$5$$(B:
-
-          (defun w3m-hnf-browse-url-w3m (url &optional new-window)
-            (interactive (browse-url-interactive-arg "URL: "))
-            (save-selected-window
-              (pop-to-buffer (get-buffer-create "*w3m*"))
-              (w3m-browse-url url new-window)))
-          (setq hnf-browse-url-browser-function #'w3m-hnf-browse-url-w3m)
-
-   * Gnus
-
-     $B$"$J$?$,(B Gnus $B$N%f!<%6$G!"$3$N9`$,$3$N(B Info $B$G=i$a$FFI$`%Y!<%8$G$"(B
-     $B$k$N$J$i$P!"$"$J$?$OF~$j8}$r4V0c$($^$7$?$M!#:G=i$K(B *Note Hooking
-     into MUAs:: $B$r8+$F$/$@$5$$!#(B
-
-     $B%G%U%)%k%H$G$O!"(BGnus $B$ONc$($P(B `gnus-treat-strip-banner' $B$N$h$&$J(B
-     treatment $BJQ?t$r(B `text/html' $B%Q!<%H$KE,MQ$7$^$;$s!#<+F0E*$K9T$J$o(B
-     $B$;$k$K$OFs$D$NJ}K!$,$"$j$^$9(B:
-
-          ;; $B$9$Y$F$N(B treatment $B$r(B text/html $B%Q!<%H$KE,MQ$9$k!#(B
-          (eval-after-load "gnus-art"
-            '(add-to-list 'gnus-article-treat-types "text/html"))
-
-          ;; $BFCDj$N(B treatment $B$r(B text/html $B%Q!<%H$KE,MQ$9$k!#(B
-          (setq gnus-treat-strip-banner '(or t (typep "text/html")))
-
-     $B>\$7$$$3$H$O(B *Note Customizing Articles: (gnus)Customizing
-     Articles, $B$r8+$F$/$@$5$$!#(B
-
-     $B2C$($F!"0J2<$N<B83E*$J%3!<%I$O(B `multipart/related' $B$J3($r8+$k$?$a(B
-     $B$N$b$N$G$9!#I=<($5$l$k>l=j$KFq$,$"$j$^$9!#(B
-
-          (eval-after-load "gnus-art"
-            '(or (assoc "multipart/related" gnus-mime-multipart-functions)
-                 (setq gnus-mime-multipart-functions
-                       (cons
-                        (cons
-                         "multipart/related"
-                         (byte-compile
-                          (lambda (handle)
-                            (gnus-mime-display-mixed (cdr handle)))))
-                        gnus-mime-multipart-functions))))
-
-   * yahtml-mode
-
-     Emacs-w3m $B$r;H$C$F!"(B`yahtml-mode' $B$G$^$5$KJT=8Cf$N(B HTML $B%U%!%$%k$r(B
-     $B2<8+(B (preview) $B$9$k$3$H$,$G$-$^$9!#Nc$G$9(B:
-
-          (defadvice yahtml-browse-html
-            (around w3m-yahtml-browse-html activate compile)
-            (w3m-goto-url (ad-get-arg 0) t))
-
-   * jisx0213
-
-     Emacs $B$G$O(B Mule-UCS $B%Q%C%1!<%8$K4^$^$l$F$$$k(B `jis0213' $B%b%8%e!<%k(B
-     $B$r;H$&$3$H$K$h$C$F!"(BJIS X 0213 $BJ8;z%;%C%H$r;H$&$3$H$,$G$-$^$9!#(B
-     `decode-char' $B4X?t$,(B `mucs' $B$K$h$C$F>e=q$-$5$l$F$7$^$&(B (`jis0213'
-     $B$,(B `mucs' $B$rFI$_9~$`(B) $B$?$a$K!"(B`ucs' CCS $B$KBP$7$F@5$7$/F0:n$7$J$/$J$C(B
-     $B$F$7$^$$$^$9$,!"$5$i$K(B `unicode' $B%b%8%e!<%k$rFI$_9~$`$3$H$K$h$C$F!"(B
-     $B$=$NLdBj$,2r7h$5$l$k$h$&$K8+$($k$H$$$&Js9p$,$"$j$^$7$?!#M}M3$O$^$@(B
-     $B2rL@$5$l$F$$$^$;$s!#(B`~/.emacs' $B%U%!%$%kMQ$NNc$G$9(B:
-
-          (require 'unicode)
-          (require 'un-define)
-          (require 'jisx0213)
-
-
-
-File: emacs-w3m-ja.info, Node: Mailing List, Next: Emacs-w3m Functions, Prev: Tips, Up: Top
-
-$A%a$B!<$A%j%s%0%j%9%H!"%P%0%j%]$B!<$A%H(B
-******************************
-
-Emacs-w3m $B$K4X$9$k$9$Y$F$N$3$H$,$i$rOC$79g$&$?$a$N%a!<%j%s%0%j%9%H$,MQ(B
-$B0U$5$l$F$$$^$9!#9VFI$7$F$$$J$$?M$bEj9F$G$-$^$9!#%P%0$r8+$D$1$?$j!"$3$s(B
-$B$J5!G=$,M_$7$$$J$H;W$C$?$j!"$"$k$$$O%3!<%I$r=q$-$^$7$?$H$$$&?M$O$I$&$>(B
-$BEj9F$7$F$/$@$5$$!#C1$J$k%f!<%6$@$1$l$I$b%W%m%0%i%`$K6=L#$,$"$k$H$$$&?M(B
-$B$b!"$<$R;22C$7$F$/$@$5$$!#%"%I%l%9$O0J2<$NDL$j$G$9(B:
-
-     Emacs-w3m $B%a!<%j%s%0%j%9%H(B <emacs-w3m@namazu.org>
-
-$B$b$7(B `mail-user-agent' $B$r@5$7$/F0:n$9$k$h$&$K@_Dj$7$F$"$l$P!"(B
-`report-emacs-w3m-bug' $B%3%^%s%I(B ($B$^$?$O(B `C-c C-b' $B%-!<(B) $B$r(B
-$B;H$C$F%P%0%j%]!<%H$rAw$k$3$H$b$G$-$^$9!#(B
-
-$B$3$N%j%9%H$KEj9F$9$k$H$-$O!"F|K\8l$+1Q8l$r;H$C$F$/$@$5$$!#B?$/$N%a%s%P!<(B
-$B$OF|K\?M$G$9!#Ej9F$5$l$?5-;v$O8x3+$5$l$F$$$F!"%&%'%V(B
-(`http://emacs-w3m.namazu.org/ml/') $B$d(B NetNews ($B%5!<%P(B
-`news.gmane.org' $B>e$N(B `gmane.emacs.w3m' $B$H$$$&%0%k!<%W(B) $B$G$bFI$`$3$H$,(B
-$B$G$-$^$9!#(B
-
-$B$3$N%j%9%H$N%a%C%;!<%8$r%a!<%k$G<u$1<h$j$?$$?M$O!"K\J8$K(B
-
-     subscribe ANATANO Namae
-
-$B$N$h$&$K=q$$$F(B ($B%a!<%k%"%I%l%9$G$O$J$/$F$"$J$?$NL>A0$r=q$-$^$9(B)$B!"(B
-`emacs-w3m-ctl@namazu.org' $B08$K%a!<%k$rAw$k$H%a!<%j%s%0%j%9%H$KEPO?$5$l(B
-$B$^$9!#$^$?!"%a!<%k$r<u$1<h$k$N$r$d$a$k$K$O!"K\J8$K(B
-
-     # bye
-
-$B$H=q$$$?%a!<%k$r(B `emacs-w3m-ctl@namazu.org' $B08$KAw$C$F$/$@$5$$!#(B
-
-
-
-File: emacs-w3m-ja.info, Node: Emacs-w3m Functions, Next: External Packages, Prev: Mailing List, Up: Top
-
-Emacs-w3m $A$N$(IJ=$AJ}$N$(Gf[$A$7$$$(IIf$ACw(B
-****************************
-
-
-
-
-File: emacs-w3m-ja.info, Node: External Packages, Next: Authors, Prev: Emacs-w3m Functions, Up: Top
-
-$A$*VY$(Gbf$A$N%Q%C%1$B!<$A%8$?$A(B
-**********************
-
-Emacs-w3m $B$O=aBt$J5!G=$rDs6!$7$^$9$,!"$5$i$KJXMx$K$9$k$?$a$K0J2<$N30It(B
-$B%Q%C%1!<%8$r;H$&$N$bNI$$$+$b$7$l$^$;$s!#(B
-
-   * w3m-type-ahead.el
-
-     w3m-type-ahead.el $B%Q%C%1!<%8$O(B "type ahead" $B8!:w5!G=(B (Mozilla $B%V%i(B
-     $B%&%6$KF1$8L>A0$N;w$?5!G=$,$"$j$^$9(B) $B$rDs6!$7$^$9!#$=$l$O(B isearch
-     $B$K;w$?A`:n$G%"%s%+!<$rC5$9$3$H(B ($B$?$@$77k2L$O%P%C%U%!Fb$N%"%s%+!<$K(B
-     $B8BDj$5$l$^$9(B) $B$r2DG=$K$7$^$9!#(B
-
-     w3m-type-ahead.el $B$N%@%&%s%m!<%I(B:
-     `http://alioth.debian.org/project/showfiles.php?group_id=30594'
-
-   * newsticker.el
-
-     Emacs 22 $B0J>e$GAH$_9~$^$l$F$$$k(B newsticker.el $B$O(B rss $B%U%#!<%I$d$5(B
-     $B$i$K(B atom $B%U%#!<%I$rD/$a$k$?$a$NF;6q$G$9!#0J2<$O(B emacs-w3m $B$H$H$b(B
-     $B$K(B newsticker.el $B$r;H$&$?$a$N@_DjNc$G$9(B (`~/.emacs' $B%U%!%$%k$KCV$$(B
-     $B$F$/$@$5$$(B):
-
-          (require 'w3m-load)
-          (setq newsticker-html-renderer 'w3m-region
-                browse-url-browser-function 'w3m-browse-url)
-
-     $B>\$7$/$O(B: *Note Top: (Newsticker)Top.
-
-
-
-File: emacs-w3m-ja.info, Node: Authors, Next: Index, Prev: External Packages, Up: Top
-
-$A$3$N%^%K%e%"%k$r$(GUs$A$$$?HK$?$A(B
-****************************
-
-   * $BGr0f(B $B=(9T(B
-   * $BEZ20(B $B2mL-(B
-   * $BCfEg(B $B44IW(B
-   * $BCf;3(B $BMN0l(B
-   * Romain Francoise
-   * $B;32,(B $B9nH~(B
-   * $BBgOB(B $B@5Ip(B
-   * $B@DED(B $BD>Bg(B
-
-
-
-File: emacs-w3m-ja.info, Node: Index, Prev: Authors, Up: Top
-
-$AKwR}(B
-****
-
-* Menu:
-
-* Concept Index::               $B35G0:w0z(B
-* Key Index::                   $B%-!<%P%$%s%I:w0z(B
-* Variable Index::              $BJQ?t:w0z(B
-* Function Index::              $B4X?t:w0z(B
-
-
-
-File: emacs-w3m-ja.info, Node: Concept Index, Next: Key Index, Prev: Index, Up: Index
-
-$A8EDnKwR}(B
-========
-
-* Menu:
-
-* about://antenna/:             Using Antenna.          (line   5)
-* $A%/%C%-$B!<$A$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B:       Cookie Variables.       (line   5)
-* Adding a bookmark:            Adding Bookmarks.       (line   5)
-* Adding autoload settings:     Minimal Settings.       (line  12)
-* Adding new search engines:    Adding New Search Engines.  (line   5)
-* $A$=$NK{$N$(I+y$AJ}(B:                 Other Variables.        (line   5)
-* Antenna:                      Using Antenna.          (line   5)
-* $A;-Oq$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B:           Image Variables.        (line   5)
-* APEL package:                 Other Requirements.     (line   5)
-* $AR;0c5D$J$(I+y$AJ}(B:                 General Variables.      (line   5)
-* Arrived URLs:                 Tracing History.        (line   5)
-* article expiry:               Nnshimbun.              (line 168)
-* $A%U%)$B!<$A%`$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B:       Form Variables.         (line   5)
-* $A%U%C%/(B:                       Hooks.                  (line   5)
-* auto-expire:                  Nnshimbun.              (line 168)
-* $A%V%C%/%^$B!<$A%/$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B:   Bookmark Variables.     (line   5)
-* Bookmarks:                    Managing Bookmarks.     (line   5)
-* Browsing history:             Tracing History.        (line   5)
-* codepage-ex:                  Other Requirements.     (line   5)
-* Consulting bookmarks:         Consulting Bookmarks.   (line   5)
-* Creating new buffers:         Creating and killing buffers.  (line   5)
-* Customizing user options:     Customizable Variables.  (line   5)
-* Displaying images:            Inline Images.          (line   5)
-* Downloading files:            Downloading.            (line   5)
-* Editing bookmarks:            Editing Bookmarks.      (line   5)
-* expiry-wait:                  Nnshimbun.              (line 168)
-* expiry-wait:                  Nnshimbun.              (line 234)
-* Firewall:                     Minimal Settings.       (line  33)
-* FLIM package:                 Other Requirements.     (line   5)
-* Functions details:            Emacs-w3m Functions.    (line   5)
-* Getting started:              Getting Started.        (line   5)
-* Gifsicle program:             Other Requirements.     (line   5)
-* group parameters:             Nnshimbun.              (line  89)
-* Grouping URLs:                Grouping URLs.          (line   5)
-* ImageMagick package:          Other Requirements.     (line   5)
-* Info-like keymap:             Key Binding.            (line   5)
-* Installing emacs-w3m:         Installing Emacs-w3m.   (line   5)
-* Installing on non-UNIX-like systems: Non-UNIX-like systems.  (line   5)
-* Introduction:                 Introduction.           (line   5)
-* Key binding:                  Key Binding.            (line   5)
-* Killing buffers:              Creating and killing buffers.  (line   5)
-* Lynx-like keymap:             Key Binding.            (line   5)
-* Moving in a page:             Moving in a page.       (line   5)
-* Mule-UCS package:             Other Requirements.     (line   5)
-* nnshimbun:                    Nnshimbun.              (line   5)
-* Possible Emacs versions:      Required Emacs Version.  (line   5)
-* Proxy gateways:               Minimal Settings.       (line  33)
-* Proxy servers:                Minimal Settings.       (line  33)
-* Quick Searching:              Quick Searching.        (line   5)
-* Reading HTML mails in Gnus:   Gnus.                   (line   5)
-* Reporting bugs:               Mailing List.           (line   5)
-* rfc2368.el:                   Other Requirements.     (line   5)
-* Saving images:                Inline Images.          (line  74)
-* Search engines:               Using Search Engines.   (line   5)
-* Searching:                    The Search Interface.   (line   5)
-* Shimbun library:              Shimbun Library.        (line   5)
-* `shimbun.el':                 Shimbun Basics.         (line   5)
-* Showing the tree structure of local directories: Showing Directory Tree.  (line   5)
-* Special URLs:                 Quick Searching.        (line   5)
-* Starting up:                  Getting Started.        (line   5)
-* Startup file:                 Minimal Settings.       (line  24)
-* Subscribing to the emacs-w3m mailing list: Mailing List.  (line   5)
-* Switching buffers using the buffer list: Selecting buffers.  (line  46)
-* Switching buffers using the minibuffer: Selecting buffers.  (line  41)
-* The Antenna interface:        Daily web tracking.     (line   5)
-* Tips:                         Tips.                   (line   5)
-* Tracking changes in web pages: Using Antenna.         (line   5)
-* Using emacs-w3m as a batch command: Launching and Jumping.  (line  20)
-* Variables related to antenna: Antenna Variables.      (line   5)
-* Variables related to namazu:  Namazu Variables.       (line   5)
-* Variables related to perldoc: Perldoc Variables.      (line   5)
-* Variables related to searching the web: Search Variables.  (line   5)
-* Variables related to session manager: Session Manager Variables.  (line   5)
-* Variables related to the dtree feature: Dtree Variables.  (line   5)
-* Variables related to the octet feature: Octet Variables.  (line   5)
-* Variables related to weather information: Weather Variables.  (line   5)
-* Viewing images:               Inline Images.          (line  70)
-* w3m:                          You Need w3m.           (line   5)
-* Web Newspaper:                Nnshimbun.              (line   5)
-* Zooming images:               Inline Images.          (line  79)
-
-
-
-File: emacs-w3m-ja.info, Node: Key Index, Next: Variable Index, Prev: Concept Index, Up: Index
-
-$A%-$B!<$A%P%$%s%IKwR}(B
-================
-
-* Menu:
-
-* \:                            HTML File Information.  (line  28)
-* =:                            HTML File Information.  (line  33)
-* |:                            HTML File Information.  (line  58)
-* >:                            Moving in a page.       (line  41)
-* <:                            Moving in a page.       (line  47)
-* ]:                            Moving in a page.       (line  93)
-* [:                            Moving in a page.       (line  98)
-* }:                            Moving in a page.       (line 103)
-* {:                            Moving in a page.       (line 108)
-* ^:                            Moving over pages.      (line  46)
-* +:                            Setting up Antenna.     (line  14)
-* . (Lynx-like $A%-$B!<$A%^%C%W(B):     Moving in a page.       (line  55)
-* , (Lynx-like $A%-$B!<$A%^%C%W(B):     Moving in a page.       (line  63)
-* a:                            Adding Bookmarks.       (line   5)
-* A:                            Daily web tracking.     (line  35)
-* b:                            Moving in a page.       (line  35)
-* b:                            Moving over pages.      (line 118)
-* B (Lynx-like $A%-$B!<$A%^%C%W(B):     Moving over pages.      (line  24)
-* <backspace>:                  Moving in a page.       (line  35)
-* <backspace>:                  Moving over pages.      (line 118)
-* <backtab>:                    Moving in a page.       (line  88)
-* C-?:                          Moving in a page.       (line  35)
-* C-?:                          Moving over pages.      (line 118)
-* c (Lynx-like $A%-$B!<$A%^%C%W(B):     Launching and Jumping.  (line  97)
-* C-c C-@:                      Tracing History.        (line  61)
-* C-c C-a:                      Selecting buffers.      (line  41)
-* C-c C-n:                      Moving across buffers.  (line  28)
-* C-c C-p:                      Moving across buffers.  (line  22)
-* C-c C-s:                      Selecting buffers.      (line  46)
-* C-c C-<SPC>:                  Tracing History.        (line  61)
-* C-c C-t:                      Creating and killing buffers.  (line  19)
-* C-c C-v:                      Tracing History.        (line  65)
-* C-c C-w:                      Creating and killing buffers.  (line  25)
-* C-c M-w:                      Creating and killing buffers.  (line  29)
-* C-S-l (Info-like $A%-$B!<$A%^%C%W(B): Launching and Jumping.  (line 110)
-* C-u a:                        Adding Bookmarks.       (line   5)
-* C-u o (Info-like $A%-$B!<$A%^%C%W(B): Tracing History.        (line  53)
-* C-u s (Lynx-like $A%-$B!<$A%^%C%W(B): Tracing History.        (line  53)
-* D (Info-like $A%-$B!<$A%^%C%W(B):     Downloading.            (line  23)
-* d (Info-like $A%-$B!<$A%^%C%W(B):     Downloading.            (line  30)
-* d (Lynx-like $A%-$B!<$A%^%C%W(B):     Downloading.            (line  23)
-* D (Lynx-like $A%-$B!<$A%^%C%W(B):     Showing Directory Tree.  (line  51)
-* <DEL>:                        Moving in a page.       (line  35)
-* <DEL>:                        Moving over pages.      (line 118)
-* <down> (Lynx-like $A%-$B!<$A%^%C%W(B): Moving in a page.      (line  77)
-* e (Info-like $A%-$B!<$A%^%C%W(B):     HTML File Information.  (line  40)
-* E (Info-like $A%-$B!<$A%^%C%W(B):     HTML File Information.  (line  46)
-* E (Lynx-like $A%-$B!<$A%^%C%W(B):     HTML File Information.  (line  40)
-* e (Lynx-like $A%-$B!<$A%^%C%W(B):     HTML File Information.  (line  46)
-* g:                            Launching and Jumping.  (line  79)
-* G:                            Launching and Jumping.  (line  86)
-* H:                            Moving over pages.      (line  40)
-* I (Info-like $A%-$B!<$A%^%C%W(B):     Inline Images.          (line  31)
-* i (Info-like $A%-$B!<$A%^%C%W(B):     Inline Images.          (line  54)
-* I (Lynx-like $A%-$B!<$A%^%C%W(B):     Inline Images.          (line  70)
-* l (Info-like $A%-$B!<$A%^%C%W(B):     Moving over pages.      (line  24)
-* <left> (Lynx-like $A%-$B!<$A%^%C%W(B): Moving over pages.     (line  24)
-* M:                            HTML File Information.  (line  51)
-* M-[:                          Inline Images.          (line  81)
-* M-]:                          Inline Images.          (line  86)
-* M-a:                          Adding Bookmarks.       (line   5)
-* M-d (Lynx-like $A%-$B!<$A%^%C%W(B):   Downloading.            (line  30)
-* M-i:                          Inline Images.          (line  74)
-* M-I (Info-like $A%-$B!<$A%^%C%W(B):   Inline Images.          (line  65)
-* M-l:                          Moving in a page.       (line  69)
-* M-n:                          Creating and killing buffers.  (line  19)
-* mouse-2:                      Browsing With Mouse Operations.  (line  20)
-* `M-S':                        Session Manager.        (line   8)
-* `M-s':                        Session Manager.        (line  11)
-* M-T (Lynx-like $A%-$B!<$A%^%C%W(B):   Inline Images.          (line  65)
-* M-<TAB>:                      Moving in a page.       (line  88)
-* n (Info-like $A%-$B!<$A%^%C%W(B):     Moving over pages.      (line  32)
-* N (Lynx-like $A%-$B!<$A%^%C%W(B):     Moving over pages.      (line  32)
-* o (Info-like $A%-$B!<$A%^%C%W(B):     Tracing History.        (line  53)
-* p (Info-like $A%-$B!<$A%^%C%W(B):     Moving over pages.      (line  24)
-* q:                            Going back to daily hacking and/or daily writing.  (line  19)
-* Q:                            Going back to daily hacking and/or daily writing.  (line  24)
-* R:                            Launching and Jumping.  (line 110)
-* <RET>:                        Launching and Jumping.  (line  58)
-* <RET>:                        Launching and Jumping.  (line  70)
-* <right> (Lynx-like $A%-$B!<$A%^%C%W(B): Launching and Jumping.  (line  58)
-* s (Info-like $A%-$B!<$A%^%C%W(B):     The Search Interface.   (line  32)
-* S (Lynx-like $A%-$B!<$A%^%C%W(B):     The Search Interface.   (line  32)
-* s (Lynx-like $A%-$B!<$A%^%C%W(B):     Tracing History.        (line  53)
-* S-<left> (Info-like $A%-$B!<$A%^%C%W(B): Moving in a page.    (line  55)
-* S-<mouse-2>:                  Browsing With Mouse Operations.  (line  25)
-* <SPC>:                        Moving in a page.       (line  21)
-* <SPC>:                        Moving over pages.      (line  63)
-* S-<right> (Info-like $A%-$B!<$A%^%C%W(B): Moving in a page.   (line  63)
-* S-<SPC>:                      Moving in a page.       (line  35)
-* S-<SPC>:                      Moving over pages.      (line 118)
-* S-<TAB>:                      Moving in a page.       (line  88)
-* T (Info-like $A%-$B!<$A%^%C%W(B):     Showing Directory Tree.  (line  51)
-* T (Lynx-like $A%-$B!<$A%^%C%W(B):     Inline Images.          (line  31)
-* t (Lynx-like $A%-$B!<$A%^%C%W(B):     Inline Images.          (line  54)
-* <TAB>:                        Moving in a page.       (line  77)
-* u (Info-like $A%-$B!<$A%^%C%W(B):     Moving over pages.      (line  46)
-* u (Lynx-like $A%-$B!<$A%^%C%W(B):     Launching and Jumping.  (line 104)
-* <up> (Lynx-like $A%-$B!<$A%^%C%W(B):  Moving in a page.       (line  88)
-* v:                            Consulting Bookmarks.   (line   5)
-* y (Info-like $A%-$B!<$A%^%C%W(B):     Launching and Jumping.  (line  97)
-* Y (Info-like $A%-$B!<$A%^%C%W(B):     Launching and Jumping.  (line 104)
-
-
-
-File: emacs-w3m-ja.info, Node: Variable Index, Next: Function Index, Prev: Key Index, Up: Index
-
-$(I+y$AJ}KwR}(B
-========
-
-* Menu:
-
-* gnus-keep-backlog:            Nnshimbun.              (line  54)
-* mm-inline-text-html-with-images: Gnus.                (line   5)
-* mm-inline-text-html-with-w3m-keymap: Gnus.            (line   5)
-* mm-text-html-renderer:        Gnus.                   (line   5)
-* nnmail-expiry-wait:           Nnshimbun.              (line 168)
-* nnmail-expiry-wait-function:  Nnshimbun.              (line 168)
-* nnshimbun-default-group-level: Nnshimbun.             (line  74)
-* nnshimbun-directory:          Nnshimbun.              (line  68)
-* nnshimbun-encapsulate-images: Nnshimbun.              (line 113)
-* nnshimbun-group-parameters-alist: Nnshimbun.          (line 157)
-* nnshimbun-index-range:        Nnshimbun.              (line 125)
-* nnshimbun-keep-backlog:       Nnshimbun.              (line  54)
-* nnshimbun-keep-unparsable-dated-articles: Nnshimbun.  (line 249)
-* nnshimbun-marks-is-evil:      Nnshimbun.              (line  81)
-* nnshimbun-pre-fetch-article:  Nnshimbun.              (line 103)
-* shimbun-local-path:           Shimbun local mode.     (line  25)
-* shimbun-slashdot-comment-display: News Sites Supported by Shimbun.  (line 146)
-* shimbun-slashdot-comment-threshold: News Sites Supported by Shimbun.  (line 141)
-* shimbun-slashdot-get-comments: News Sites Supported by Shimbun.  (line 131)
-* shimbun-tech-on-password:     News Sites Supported by Shimbun.  (line 184)
-* shimbun-tech-on-user-name:    News Sites Supported by Shimbun.  (line 176)
-* shimbun-use-local:            Shimbun local mode.     (line  18)
-* w3m-accept-languages:         General Variables.      (line   8)
-* w3m-add-referer:              General Variables.      (line  14)
-* w3m-add-user-agent:           General Variables.      (line  42)
-* w3m-after-cursor-move-hook:   Hooks.                  (line   8)
-* w3m-antenna-file:             Antenna Variables.      (line   8)
-* w3m-antenna-html-skelton:     Antenna Variables.      (line  14)
-* w3m-antenna-refresh-interval: Antenna Variables.      (line  18)
-* w3m-antenna-refresh-interval: Daily web tracking.     (line  30)
-* w3m-antenna-sites:            Setting up Antenna.     (line   5)
-* w3m-antenna-sort-changed-sites-function: Antenna Variables.  (line  29)
-* w3m-antenna-sort-unchanged-sites-function: Antenna Variables.  (line  35)
-* w3m-arrived-file:             General Variables.      (line  47)
-* w3m-async-exec:               Other Variables.        (line   8)
-* w3m-auto-show:                General Variables.      (line  51)
-* w3m-bookmark-default-section: Bookmark Variables.     (line  21)
-* w3m-bookmark-file:            Bookmark Variables.     (line   8)
-* w3m-bookmark-file-coding-system: Bookmark Variables.  (line  12)
-* w3m-bookmark-menu-open-new-session: Bookmark Variables.  (line  25)
-* w3m-bookmark-mode-hook:       Hooks.                  (line  71)
-* w3m-broken-proxy-cache:       Other Variables.        (line  13)
-* w3m-charset-coding-system-alist: General Variables.   (line  62)
-* w3m-coding-system:            General Variables.      (line  67)
-* w3m-coding-system-priority-list: General Variables.   (line  72)
-* w3m-command:                  General Variables.      (line  76)
-* w3m-command-arguments:        Minimal Settings.       (line  33)
-* w3m-command-arguments-alist:  General Variables.      (line  94)
-* w3m-command-environment:      General Variables.      (line 115)
-* w3m-confirm-leaving-secure-page: General Variables.   (line 119)
-* w3m-content-type-alist:       General Variables.      (line 126)
-* w3m-cookie-accept-bad-cookies: Cookie Variables.      (line   8)
-* w3m-cookie-accept-domains:    Cookie Variables.       (line  13)
-* w3m-cookie-file:              Cookie Variables.       (line  17)
-* w3m-cookie-reject-domains:    Cookie Variables.       (line  21)
-* w3m-correct-charset-alist:    General Variables.      (line 154)
-* w3m-db-history-display-size:  General Variables.      (line 158)
-* w3m-decoder-alist:            General Variables.      (line 162)
-* w3m-default-coding-system:    Quick Searching.        (line   5)
-* w3m-default-content-type:     General Variables.      (line 171)
-* w3m-default-directory:        General Variables.      (line 176)
-* w3m-default-display-inline-images: Image Variables.   (line   8)
-* w3m-default-save-directory:   General Variables.      (line 189)
-* w3m-delete-buffer-hook:       Hooks.                  (line  14)
-* w3m-delete-duplicated-empty-lines: General Variables.  (line 193)
-* w3m-dirlist-cgi-program:      General Variables.      (line 197)
-* w3m-display-hook:             Hooks.                  (line  18)
-* w3m-do-cleanup-temp-files:    General Variables.      (line 718)
-* w3m-doc-view-content-types:   General Variables.      (line 202)
-* w3m-dtree-default-allfiles:   Dtree Variables.        (line   8)
-* w3m-dtree-directory-depth:    Dtree Variables.        (line  15)
-* w3m-dtree-indent-strings:     Dtree Variables.        (line  21)
-* w3m-dtree-stop-strings:       Dtree Variables.        (line  26)
-* w3m-edit-function:            General Variables.      (line 207)
-* w3m-edit-function-alist:      General Variables.      (line 212)
-* w3m-enable-google-feeling-lucky: General Variables.   (line 220)
-* w3m-encoding-type-alist:      General Variables.      (line 226)
-* w3m-favicon-cache-expire-wait: Image Variables.       (line  14)
-* w3m-favicon-cache-file:       Image Variables.        (line  19)
-* w3m-favicon-default-background: Image Variables.      (line  38)
-* w3m-favicon-size:             Image Variables.        (line  25)
-* w3m-favicon-type:             Image Variables.        (line  30)
-* w3m-favicon-use-cache-file:   Image Variables.        (line  34)
-* w3m-file-coding-system:       General Variables.      (line 230)
-* w3m-file-name-coding-system:  General Variables.      (line 235)
-* w3m-fill-column:              General Variables.      (line 240)
-* w3m-follow-redirection:       General Variables.      (line 247)
-* w3m-fontify-after-hook:       Hooks.                  (line  24)
-* w3m-fontify-before-hook:      Hooks.                  (line  29)
-* w3m-form-input-map-buffer-lines: Form Variables.      (line   8)
-* w3m-form-input-map-mode-hook: Hooks.                  (line  34)
-* w3m-form-input-map-set-hook:  Hooks.                  (line  38)
-* w3m-form-input-select-buffer-lines: Form Variables.   (line  12)
-* w3m-form-input-select-mode-hook: Hooks.               (line  42)
-* w3m-form-input-select-set-hook: Hooks.                (line  46)
-* w3m-form-input-textarea-buffer-lines: Form Variables.  (line  16)
-* w3m-form-input-textarea-mode-hook: Hooks.             (line  50)
-* w3m-form-input-textarea-set-hook: Hooks.              (line  54)
-* w3m-form-mouse-face:          Form Variables.         (line  20)
-* w3m-form-textarea-directory:  Form Variables.         (line  32)
-* w3m-form-treat-textarea-size: Form Variables.         (line  24)
-* w3m-form-use-fancy-faces:     Form Variables.         (line  28)
-* w3m-form-use-textarea-backup: Form Variables.         (line  32)
-* w3m-history-minimize-in-new-session: Other Variables.  (line  23)
-* w3m-history-reuse-history-elements: Other Variables.  (line  30)
-* w3m-home-page:                Launching and Jumping.  (line  20)
-* w3m-horizontal-scroll-columns: Moving in a page.      (line  41)
-* w3m-horizontal-scroll-columns: Moving in a page.      (line  47)
-* w3m-horizontal-scroll-division: General Variables.    (line 264)
-* w3m-horizontal-shift-columns: Moving in a page.       (line  55)
-* w3m-horizontal-shift-columns: Moving in a page.       (line  63)
-* w3m-icon-directory:           Image Variables.        (line  45)
-* w3m-image-default-background: Image Variables.        (line 123)
-* w3m-imagick-convert-program:  Image Variables.        (line  49)
-* w3m-imitate-widget-button:    General Variables.      (line 286)
-* w3m-init-file:                Customizable Variables.  (line   5)
-* w3m-init-file:                Minimal Settings.       (line  24)
-* w3m-input-coding-system:      General Variables.      (line 302)
-* w3m-keep-arrived-urls:        General Variables.      (line 309)
-* w3m-keep-cache-size:          General Variables.      (line 313)
-* w3m-key-binding:              Key Binding.            (line   5)
-* w3m-language:                 General Variables.      (line 323)
-* w3m-local-directory-view-method: General Variables.   (line 327)
-* w3m-local-find-file-function: General Variables.      (line 334)
-* w3m-local-find-file-regexps:  General Variables.      (line 346)
-* w3m-mailto-url-function:      General Variables.      (line 371)
-* w3m-mailto-url-popup-function-alist: General Variables.  (line 378)
-* w3m-make-new-session:         General Variables.      (line 389)
-* w3m-mbconv-command:           General Variables.      (line 399)
-* w3m-menu-on-forefront:        General Variables.      (line 683)
-* w3m-minor-mode:               Gnus.                   (line   5)
-* w3m-minor-mode-command-alist: Gnus.                   (line   5)
-* w3m-minor-mode-hook:          Hooks.                  (line  58)
-* w3m-mode-hook:                Hooks.                  (line  62)
-* w3m-namazu-arguments:         Namazu Variables.       (line  12)
-* w3m-namazu-command:           Namazu Variables.       (line   8)
-* w3m-namazu-default-index:     Namazu Variables.       (line  20)
-* w3m-namazu-default-index:     Using Namazu.           (line  38)
-* w3m-namazu-index-alist:       Namazu Variables.       (line  29)
-* w3m-namazu-index-alist:       Using Namazu.           (line  23)
-* w3m-namazu-input-coding-system: Namazu Variables.     (line  34)
-* w3m-namazu-output-coding-system: Namazu Variables.    (line  40)
-* w3m-namazu-page-max:          Namazu Variables.       (line  46)
-* w3m-new-session-in-background: General Variables.     (line 713)
-* w3m-no-proxy-domains:         Minimal Settings.       (line  33)
-* w3m-output-coding-system:     General Variables.      (line 411)
-* w3m-perldoc-command:          Perldoc Variables.      (line   8)
-* w3m-perldoc-input-coding-system: Perldoc Variables.   (line  13)
-* w3m-perldoc-output-coding-system: Perldoc Variables.  (line  20)
-* w3m-perldoc-pod2html-arguments: Perldoc Variables.    (line  30)
-* w3m-perldoc-pod2html-command: Perldoc Variables.      (line  25)
-* w3m-pixels-per-character:     Image Variables.        (line  66)
-* w3m-pixels-per-line:          Image Variables.        (line  75)
-* w3m-popup-frame-parameters:   General Variables.      (line 434)
-* w3m-pop-up-frames:            General Variables.      (line 415)
-* w3m-pop-up-windows:           General Variables.      (line 424)
-* w3m-prefer-cache:             General Variables.      (line 440)
-* w3m-process-connection-type:  Other Variables.        (line  52)
-* w3m-process-modeline-format:  Other Variables.        (line  57)
-* w3m-profile-directory:        General Variables.      (line 445)
-* w3m-quick-start:              Launching and Jumping.  (line  20)
-* w3m-quick-start:              Moving over pages.      (line  40)
-* w3m-redirect-with-get:        General Variables.      (line 459)
-* w3m-refresh-minimum-interval: General Variables.      (line 672)
-* w3m-relationship-estimate-rules: General Variables.   (line 471)
-* w3m-resize-images:            Image Variables.        (line  89)
-* w3m-resize-image-scale:       Image Variables.        (line  85)
-* w3m-search-default-engine:    The Search Interface.   (line  32)
-* w3m-search-engine-alist:      Quick Searching.        (line   5)
-* w3m-search-thing-at-point-arg: Search Variables.      (line  29)
-* w3m-search-word-at-point:     Search Variables.       (line  23)
-* w3m-select-buffer-hook:       Hooks.                  (line  67)
-* w3m-select-buffer-horizontal-window: General Variables.  (line 476)
-* w3m-select-buffer-window-ratio: General Variables.    (line 481)
-* w3m-session-automatic-keep-number: Session Manager Variables.  (line  32)
-* w3m-session-automatic-save:   Session Manager.        (line  40)
-* w3m-session-automatic-title:  Session Manager Variables.  (line  16)
-* w3m-session-crash-recovery:   Session Manager.        (line  54)
-* w3m-session-crash-recovery-title: Session Manager Variables.  (line  20)
-* w3m-session-deleted-keep-number: Session Manager Variables.  (line  28)
-* w3m-session-deleted-save:     Session Manager.        (line  40)
-* w3m-session-deleted-title:    Session Manager Variables.  (line  24)
-* w3m-session-file:             Session Manager Variables.  (line   8)
-* w3m-session-load-crashed-sessions: Session Manager.   (line  54)
-* w3m-session-load-last-sessions: Session Manager.      (line  46)
-* w3m-session-time-format:      Session Manager Variables.  (line  12)
-* w3m-session-unknown-title:    Session Manager Variables.  (line  36)
-* w3m-show-current-title-in-buffer-tab: Other Variables.  (line  63)
-* w3m-show-decoded-url:         General Variables.      (line 487)
-* w3m-show-error-information:   General Variables.      (line 527)
-* w3m-show-graphic-icons-in-header-line: Image Variables.  (line  93)
-* w3m-show-graphic-icons-in-mode-line: Image Variables.  (line 100)
-* w3m-space-before-favicon:     General Variables.      (line 533)
-* w3m-space-before-modeline-icon: General Variables.    (line 539)
-* w3m-submit-form-safety-check: General Variables.      (line 647)
-* w3m-tab-mouse-position-adjuster: Using Tabs.          (line  63)
-* w3m-tab-track-mouse:          Using Tabs.             (line  56)
-* w3m-terminal-coding-system:   General Variables.      (line 545)
-* w3m-toggle-inline-images-permanently: Image Variables.  (line 106)
-* w3m-touch-command:            General Variables.      (line 553)
-* w3m-track-mouse:              General Variables.      (line 559)
-* w3m-treat-image-size:         Image Variables.        (line  53)
-* w3m-uri-replace-alist:        Quick Searching.        (line   5)
-* w3m-url-local-directory-alist: General Variables.     (line 615)
-* w3m-use-ange-ftp:             General Variables.      (line 624)
-* w3m-use-cookies:              Cookie Variables.       (line  25)
-* w3m-use-cygdrive:             General Variables.      (line 629)
-* w3m-use-favicon:              Image Variables.        (line 117)
-* w3m-use-filter:               General Variables.      (line 634)
-* w3m-use-form:                 General Variables.      (line 642)
-* w3m-use-header-line:          General Variables.      (line 652)
-* w3m-use-header-line-title:    General Variables.      (line 656)
-* w3m-use-mule-ucs:             General Variables.      (line 662)
-* w3m-user-agent:               General Variables.      (line 708)
-* w3m-use-refresh:              General Variables.      (line 666)
-* w3m-use-symbol:               General Variables.      (line 677)
-* w3m-use-tab:                  Using Tabs.             (line  47)
-* w3m-use-tab-menubar:          General Variables.      (line 695)
-* w3m-use-title-buffer-name:    General Variables.      (line 523)
-* w3m-use-toolbar:              General Variables.      (line 704)
-* w3m-weather-default-area:     Weather Variables.      (line   8)
-* w3m-weather-filter-functions: Weather Variables.      (line  13)
-
-
-
-File: emacs-w3m-ja.info, Node: Function Index, Prev: Variable Index, Up: Index
-
-$(IJ=$AJ}KwR}(B
-========
-
-* Menu:
-
-* gnus-group-make-shimbun-group: Nnshimbun.             (line  18)
-* gnus-group-make-shimbun-groups: Nnshimbun.            (line  40)
-* nnshimbun-generate-download-script: Shimbun local mode.  (line  32)
-* octet-find-file:              Octet.                  (line   5)
-* w3m:                          Launching and Jumping.  (line  20)
-* w3m-antenna:                  Daily web tracking.     (line  35)
-* w3m-antenna-add-current-url:  Setting up Antenna.     (line  14)
-* w3m-bookmark-add-current-url: Adding Bookmarks.       (line   5)
-* w3m-bookmark-add-this-url:    Adding Bookmarks.       (line   5)
-* w3m-bookmark-edit:            Editing Bookmarks.      (line  24)
-* w3m-bookmark-kill-entry:      Editing Bookmarks.      (line  20)
-* w3m-bookmark-undo:            Editing Bookmarks.      (line  29)
-* w3m-bookmark-view:            Consulting Bookmarks.   (line   5)
-* w3m-browse-url:               Launching and Jumping.  (line  41)
-* w3m-close-window:             Going back to daily hacking and/or daily writing.  (line  19)
-* w3m-copy-buffer:              Creating and killing buffers.  (line  19)
-* w3m-delete-buffer:            Creating and killing buffers.  (line  25)
-* w3m-delete-other-buffers:     Creating and killing buffers.  (line  29)
-* w3m-download:                 Downloading.            (line  30)
-* w3m-download-this-url:        Downloading.            (line  23)
-* w3m-dtree:                    Showing Directory Tree.  (line  51)
-* w3m-edit-current-url:         HTML File Information.  (line  40)
-* w3m-edit-this-url:            HTML File Information.  (line  46)
-* w3m-fb-mode:                  Frame Local Buffers.    (line  10)
-* w3m-find-file:                Launching and Jumping.  (line  36)
-* w3m-gohome:                   Moving over pages.      (line  40)
-* w3m-goto-url:                 Launching and Jumping.  (line  79)
-* w3m-goto-url-new-session:     Launching and Jumping.  (line  86)
-* w3m-history:                  Tracing History.        (line  53)
-* w3m-history-restore-position: Tracing History.        (line  65)
-* w3m-history-store-position:   Tracing History.        (line  61)
-* w3m-horizontal-recenter:      Moving in a page.       (line  69)
-* w3m-mouse-view-this-url:      Browsing With Mouse Operations.  (line  20)
-* w3m-mouse-view-this-url-new-session: Browsing With Mouse Operations.  (line  25)
-* w3m-next-anchor:              Moving in a page.       (line  77)
-* w3m-next-buffer:              Moving across buffers.  (line  28)
-* w3m-next-form:                Moving in a page.       (line  93)
-* w3m-next-image:               Moving in a page.       (line 103)
-* w3m-pattern-uri-replace:      General Variables.      (line 601)
-* w3m-pipe-source:              HTML File Information.  (line  58)
-* w3m-previous-anchor:          Moving in a page.       (line  88)
-* w3m-previous-buffer:          Moving across buffers.  (line  22)
-* w3m-previous-form:            Moving in a page.       (line  98)
-* w3m-previous-image:           Moving in a page.       (line 108)
-* w3m-print-current-url:        Launching and Jumping.  (line  97)
-* w3m-print-this-url:           Launching and Jumping.  (line 104)
-* w3m-quit:                     Going back to daily hacking and/or daily writing.  (line  24)
-* w3m-reload-this-page:         Launching and Jumping.  (line 110)
-* w3m-save-image:               Inline Images.          (line  74)
-* w3m-scroll-down-or-previous-url: Moving in a page.    (line  35)
-* w3m-scroll-down-or-previous-url: Moving over pages.   (line 118)
-* w3m-scroll-left:              Moving in a page.       (line  41)
-* w3m-scroll-right:             Moving in a page.       (line  47)
-* w3m-scroll-up-or-next-url:    Moving in a page.       (line  21)
-* w3m-scroll-up-or-next-url:    Moving over pages.      (line  63)
-* w3m-search:                   The Search Interface.   (line  32)
-* w3m-search-uri-replace:       General Variables.      (line 607)
-* w3m-select-buffer:            Selecting buffers.      (line  46)
-* w3m-session-select:           Session Manager.        (line  11)
-* w3m-session-select-delete:    Session Manager.        (line  26)
-* w3m-session-select-next:      Session Manager.        (line  38)
-* w3m-session-select-open-session-group: Session Manager.  (line  21)
-* w3m-session-select-previous:  Session Manager.        (line  42)
-* w3m-session-select-quit:      Session Manager.        (line  46)
-* w3m-session-select-rename:    Session Manager.        (line  30)
-* w3m-session-select-save:      Session Manager.        (line  34)
-* w3m-session-select-select:    Session Manager.        (line  17)
-* w3m-shift-left:               Moving in a page.       (line  55)
-* w3m-shift-right:              Moving in a page.       (line  63)
-* w3m-switch-buffer:            Selecting buffers.      (line  41)
-* w3m-tab-move-left:            Moving across buffers.  (line  45)
-* w3m-tab-move-right:           Moving across buffers.  (line  37)
-* w3m-toggle-inline-image:      Inline Images.          (line  54)
-* w3m-toggle-inline-images:     Inline Images.          (line  31)
-* w3m-turnoff-inline-images:    Inline Images.          (line  65)
-* w3m-view-header:              HTML File Information.  (line  33)
-* w3m-view-image:               Inline Images.          (line  70)
-* w3m-view-next-page:           Moving over pages.      (line  32)
-* w3m-view-parent-page:         Moving over pages.      (line  46)
-* w3m-view-previous-page:       Moving over pages.      (line  24)
-* w3m-view-source:              HTML File Information.  (line  28)
-* w3m-view-this-url:            Launching and Jumping.  (line  58)
-* w3m-view-this-url:            Launching and Jumping.  (line  70)
-* w3m-view-url-with-external-browser: HTML File Information.  (line  51)
-* w3m-zoom-in-image:            Inline Images.          (line  86)
-* w3m-zoom-out-image:           Inline Images.          (line  81)
-
-Tag table:
-Node: Top514
-Node: Introduction5491
-Node: Getting Started6129
-Node: Required Emacs Version6775
-Node: You Need w3m7575
-Node: Other Requirements7988
-Node: Installing Emacs-w3m11664
-Node: Non-UNIX-like systems14254
-Node: Minimal Settings14817
-Node: Basic Usage16589
-Node: Browsing Web Pages17142
-Node: Key Binding17704
-Node: Launching and Jumping18681
-Node: Moving in a page21862
-Node: Moving over pages24555
-Node: Browsing With Mouse Operations28005
-Node: Going back to daily hacking and/or daily writing29388
-Node: Inline Images30140
-Node: Tracing History32421
-Node: Managing Bookmarks35729
-Node: Adding Bookmarks36170
-Node: Consulting Bookmarks37129
-Node: Editing Bookmarks37644
-Node: Using Tabs38340
-Node: Working with buffers40675
-Node: Creating and killing buffers41101
-Node: Moving across buffers41818
-Node: Selecting buffers43436
-Node: Downloading44976
-Node: Submitting Forms45826
-Node: HTML File Information46965
-Node: Pretty Good Features48506
-Node: Using Search Engines49160
-Node: The Search Interface50133
-Node: Quick Searching51166
-Node: Adding New Search Engines52715
-Node: Grouping URLs54492
-Node: Weather Information55252
-Node: Using Antenna55415
-Node: Setting up Antenna55887
-Node: Daily web tracking56360
-Node: Showing Directory Tree57303
-Node: Viewing Perl Documents58556
-Node: Using Namazu58734
-Node: Octet60152
-Node: Frame Local Buffers60517
-Node: Session Manager61553
-Node: Customizable Variables63162
-Node: General Variables65218
-Node: Image Variables87455
-Node: Form Variables91362
-Node: Cookie Variables92256
-Node: Bookmark Variables92877
-Node: Search Variables93673
-Node: Weather Variables94821
-Node: Dtree Variables95405
-Node: Antenna Variables96362
-Node: Perldoc Variables97641
-Node: Namazu Variables98553
-Node: Octet Variables100257
-Node: Session Manager Variables100500
-Node: Hooks101157
-Node: Other Variables102954
-Node: Hooking into MUAs105435
-Node: Gnus106233
-Node: Mew109701
-Node: SEMI MUAs111348
-Node: VM113295
-Node: Frequently Asked Questions113596
-Node: General FAQ113886
-Node: Trouble FAQ115287
-Node: Shimbun FAQ122292
-Node: Known Problems122850
-Node: Shimbun Library123009
-Node: Nnshimbun124779
-Node: Mew Shimbun133784
-Node: Shimbun with Wanderlust141257
-Node: Shimbun local mode141580
-Node: Shimbun Sites142771
-Node: Newspapers Supported by Shimbun143193
-Node: News Sites Supported by Shimbun152877
-Node: Mailing Lists Supported by Shimbun161380
-Node: Sport Sites Supported by Shimbun174370
-Node: Misc Sites Supported by Shimbun175115
-Node: Shimbun Basics185379
-Node: Overview186002
-Node: Getting web page and header information188280
-Node: Displaying an article192952
-Node: Inheriting shimbun module194967
-Node: Making text/plain articles196855
-Node: Zenkaku to hankaku conversion198522
-Node: Coding convention of Shimbun199165
-Node: Tips200009
-Node: Mailing List204115
-Node: Emacs-w3m Functions205005
-Node: External Packages205165
-Node: Authors206032
-Node: Index206267
-Node: Concept Index206503
-Node: Key Index212227
-Node: Variable Index219805
-Node: Function Index234946
-
-End tag table

=== removed file 'share/info/emacs-w3m.info'
--- share/info/emacs-w3m.info	2010-09-13 10:14:52 +0000
+++ share/info/emacs-w3m.info	1970-01-01 00:00:00 +0000
@@ -1,7014 +0,0 @@
-This is emacs-w3m.info, produced by makeinfo version 4.13 from
-emacs-w3m.texi.
-
-Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-2009 TSUCHIYA Masatoshi
-
-     Permission is granted to copy, distribute and/or modify this
-     document under the terms of the GNU General Public License,
-     Version 2 or any later version published by the Free Software
-     Foundation.
-
-     This document is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with this document; see the file COPYING.  If not, write to
-     the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-     Floor, Boston, MA 02110-1301, USA.
-
-INFO-DIR-SECTION GNU Emacs Lisp
-START-INFO-DIR-ENTRY
-* Emacs-w3m: (emacs-w3m).  An Emacs interface to w3m
-END-INFO-DIR-ENTRY
-
-   This file documents emacs-w3m, an Emacs interface to w3m.
-
-   This edition is for emacs-w3m version 1.4.413.
-
-
-File: emacs-w3m.info,  Node: Top,  Next: Introduction,  Up: (dir)
-
-Emacs-w3m User's Manual
-***********************
-
-                                         The emacs-w3m development team
-
-   This manual corresponds to emacs-w3m version 1.4.413.
-
-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-2009 TSUCHIYA Masatoshi
-
-     Permission is granted to copy, distribute and/or modify this
-     document under the terms of the GNU General Public License,
-     Version 2 or any later version published by the Free Software
-     Foundation.
-
-     This document is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with this document; see the file COPYING.  If not, write to
-     the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-     Floor, Boston, MA 02110-1301, USA.
-
-* Menu:
-
-* Introduction::                Preliminary remarks
-* Getting Started::             It's so easy to begin to use emacs-w3m
-* Basic Usage::                 Basic usage
-* Pretty Good Features::        Pretty good features
-* Customizable Variables::      Customizable variables
-* Hooking into MUAs::           Hooking emacs-w3m into mail/newsreaders
-* Frequently Asked Questions::  There isn't always an answer
-* Known Problems::              You can surely solve it
-* Shimbun Library::             A tool for reading a web newspaper
-* Tips::                        Some knick-knacks using emacs-w3m
-* Mailing List::                Mailing list and submitting bug reports
-* Emacs-w3m Functions::         Details of some emacs-w3m functions
-* External Packages::           Companion packages you might need
-* Authors::                     People who wrote this manual
-* Index::                       Index
-
- --- The Detailed Node Listing ---
-
-Getting Started
-
-* Required Emacs Version::      What version of Emacs can be used?
-* You Need w3m::                Using w3m: the reason why emacs-w3m is fast
-* Other Requirements::          Things required to run emacs-w3m
-* Installing Emacs-w3m::        Installing emacs-w3m
-* Non-UNIX-like systems::       Installing on non-UNIX-like systems
-* Minimal Settings::            Minimal settings to run emacs-w3m
-
-Basic Usage
-
-* Browsing Web Pages::          Let's go netsurfing!
-* Inline Images::               Toggle displaying inline images
-* Tracing History::             Going back through time and space
-* Managing Bookmarks::          That's a favorite with me!
-* Using Tabs::                  Everybody likes tabs
-* Working with buffers::        Creating, killing and moving across buffers
-* Downloading::                 Downloading a file
-* Submitting Forms::            Filling in HTML forms
-* HTML File Information::       Support for web page editing and hacking
-
-Pretty Good Features
-
-* Using Search Engines::        A convenient way to search the web
-* Grouping URLs::               Visiting several web pages in one URL
-* Weather Information::         It will be fine tomorrow
-* Using Antenna::               Raise your antenna
-* Showing Directory Tree::      Showing the tree structure of local directories
-* Viewing Perl Documents::      Viewing Perl Documents
-* Using Namazu::                Searching files with Namazu
-* Octet::                       Viewing data in various octal form
-* Frame Local Buffers::         Grouping sessions into separate frames
-* Session Manager::             Saving and loading sessions
-
-Customizable Variables
-
-* General Variables::           General variables
-* Image Variables::             Variables related to images
-* Form Variables::              Variables related to forms
-* Cookie Variables::            Variables related to cookies
-* Bookmark Variables::          Variables related to bookmarks
-* Search Variables::            Variables related to searching the web
-* Weather Variables::           Variables related to weather information
-* Dtree Variables::             Variables related to the dtree feature
-* Antenna Variables::           Variables related to antenna
-* Perldoc Variables::           Variables related to perldoc
-* Namazu Variables::            Variables related to namazu
-* Octet Variables::             Variables related to the octet feature
-* Session Manager Variables::   Variables related to session manager
-* Hooks::                       Hooks
-* Other Variables::             Other variables
-
-Hooking into MUAs
-
-* Gnus::                        Reading HTML mails in Gnus
-* Mew::                         Reading HTML mails in Mew
-* SEMI MUAs::                   Reading HTML mails in SEMI MUAs
-* VM::                          VM (vieW maiL) is not Wanderlust
-
-Frequently Asked Questions
-
-* General FAQ::                 General Questions
-* Trouble FAQ::                 Troubleshooting
-* Shimbun FAQ::                 Questions of Shimbun Library
-
-Known Problems
-
-Shimbun Library
-
-* Nnshimbun::                   Turning Gnus into a web browser!
-* Mew Shimbun::                 Reading web newspapers with Mew
-* Shimbun with Wanderlust::     Reading web newspapers with Wanderlust
-* Shimbun local mode::          Use a shell script to fetch shimbun feeds
-* Shimbun Sites::               Sites supported by Shimbun
-* Shimbun Basics::              How to make a new shimbun module
-
-Tips
-
-Mailing List
-
-Emacs-w3m Functions
-
-
-File: emacs-w3m.info,  Node: Introduction,  Next: Getting Started,  Prev: Top,  Up: Top
-
-1 Preliminary remarks
-*********************
-
-Emacs/W3 (http://www.cs.indiana.edu/elisp/w3/docs.html) once was the
-most popular web browser on Emacs.  However, it worked so slowly that
-we wanted a speedy alternative.  On the other hand, w3m
-(http://w3m.sourceforge.net/) was a pager with WWW capability,
-developed by Akinori ITO.  Although it was a pager, it was possible to
-use it as a text-mode WWW browser, so we started developing an Emacs
-interface to w3m.
-
-   Our special thanks go to Akinori ITO and the w3m team for the
-excellent w3m program.  We would also like to thank everybody who has
-submitted comments, suggestions, and bug fixes.  Even though we're not
-aware of any problems, all responsibility for this program is ours (the
-emacs-w3m development team), but there is absolutely no warranty.  The
-emacs-w3m program was first created by TSUCHIYA Masatoshi in June 2000.
-
-   See also the emacs-w3m official page (http://emacs-w3m.namazu.org/).
-
-
-File: emacs-w3m.info,  Node: Getting Started,  Next: Basic Usage,  Prev: Introduction,  Up: Top
-
-2 It's so easy to begin to use emacs-w3m
-****************************************
-
-Emacs-w3m may have already been installed on your system, in which case
-you can skip this section and begin to use the program at once.  If
-you're not that lucky, read on to learn how to install emacs-w3m.
-
-* Menu:
-
-* Required Emacs Version::      What version of Emacs can be used?
-* You Need w3m::                Using w3m: the reason why emacs-w3m is fast
-* Other Requirements::          Things required to run emacs-w3m
-* Installing Emacs-w3m::        Installing emacs-w3m
-* Non-UNIX-like systems::       Installing on non-UNIX-like systems
-* Minimal Settings::            Minimal settings to run emacs-w3m
-
-
-File: emacs-w3m.info,  Node: Required Emacs Version,  Next: You Need w3m,  Up: Getting Started
-
-2.1 What version of Emacs can be used?
-======================================
-
-You can run emacs-w3m in various versions of Emacsen listed below:
-
-`Emacs 21.1 or greater'
-     No additional packages are required.
-
-`XEmacs 21.x'
-     First of all, you should note that emacs-w3m supports only XEmacs
-     21.4.17 and later and XEmacs 21.5-b19 and later.  In addition, you
-     need to have installed the latest xemacs-base package including the
-     `timer-funcs.el' module.
-
-     The APEL package and the `gifsicle' program are required.  In
-     addition, it would be better to have installed the `rfc2368.el'
-     module which parses `mailto' urls (*note Other Requirements::).
-
-`Emacs 20.x, Emacs 19.34 (including Mule 2.3)'
-     Emacs-w3m no longer supports those Emacs versions.
-
-
-   If you use the development version of GNU Emacs, perhaps you should
-run the CVS version of emacs-w3m on it.  In that case, it is strongly
-recommended that you join the *note Mailing List::.
-
-
-File: emacs-w3m.info,  Node: You Need w3m,  Next: Other Requirements,  Prev: Required Emacs Version,  Up: Getting Started
-
-2.2 Using w3m: the reason why emacs-w3m is fast
-===============================================
-
-Emacs-w3m uses the external w3m program as a back-end to retrieve web
-contents and as an HTML rendering engine; that's how we could create an
-accelerated Emacs web browser with asynchronous operation.
-
-   You must install the latest w3m, it is available at:
-
-   `http://prdownloads.sourceforge.net/w3m/'
-
-
-File: emacs-w3m.info,  Node: Other Requirements,  Next: Installing Emacs-w3m,  Prev: You Need w3m,  Up: Getting Started
-
-2.3 Things required to run emacs-w3m
-====================================
-
-Depending on the Emacs version you're using, third party packages may be
-required.  This section provides resources to help you find and install
-them.
-
-`APEL'
-     Indispensable to XEmacs.  You should install APEL before building
-     emacs-w3m.  APEL is available at:
-
-     `http://kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/apel/'
-
-     Note that you must not use the APEL XEmacs package (which is
-     contained in SUMO) of the versions older than 1.32.  If you have
-     already installed such a version, you should upgrade it or use the
-     following directives to replace it with APEL which is linked above
-     (you can also use the same directives in order to newly install
-     APEL):
-
-          % rm -fr /usr/local/lib/xemacs/xemacs-packages/lisp/apel
-          % cd apel-10.7
-          % make install-package XEMACS=xemacs-21.4.x\
-            PACKAGEDIR=/usr/local/lib/xemacs/xemacs-packages
-
-`gifsicle'
-     Indispensable to XEmacs.  There is a known bug in all XEmacs 21.x
-     series that won't let it display optimized animated gifs correctly
-     or may make it crash when some kind of an interlaced gif image is
-     displayed.  Emacs-w3m uses the `gifsicle' program to convert gif
-     data in order to make it possible to be handled by XEmacs 21.x.
-     It is available at:
-
-     `http://www.lcdf.org/gifsicle/'
-
-`ImageMagick'
-     If the `convert' program bundled with the ImageMagick package is
-     available on your system, emacs-w3m will use it to resize images
-     or to convert `favicon' images into a format Emacs can handle.
-     Emacs-w3m will work without ImageMagick, but installing it will
-     improve your surfing experience.  You can get the ImageMagick
-     package from:
-
-     `ftp://ftp.imagemagick.org/pub/ImageMagick/'
-
-     To manipulate `favicon' images, we recommend version 5.4.0-5 and
-     later, previous versions may work but we didn't check them
-     thoroughly.
-
-`FLIM'
-     The FLIM package is required to use the `shimbun' library.  The
-     `shimbun' library is a collection of tools for reading web
-     newspapers, you can use it with Gnus, Mew or Wanderlust.  *Note
-     Shimbun Library::.
-
-     Note that the FLIM package requires the APEL package regardless of
-     the version of Emacs you are using.  Therefore, you must install
-     both APEL and FLIM if you would like to use the `shimbun' library.
-     The FLIM package is available at:
-
-     `http://kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/flim/flim-1.14/'
-
-`Mule-UCS'
-     If you use XEmacs 21.4, or need to read Chinese text, Japanese
-     text, Korean text, etc. using Emacs 21, we recommend you install
-     the Mule-UCS Emacs Lisp package so as to enable emacs-w3m to
-     display pages encoded by UTF-8, which is the typical coding system
-     of the Unicode system.  Note that Emacs 21 supports the Unicode
-     system partially (e.g., for Latin text) and Emacs 22 or greater
-     fully supports it.  The Mule-UCS Emacs Lisp package is available
-     at:
-
-     `http://unit.aist.go.jp/itri/itri-gist/ftp.m17n.org/pub/mule/Mule-UCS/test/Mule-UCS-current.tar.gz'
-
-     (The official page for Mule-UCS will open in the near future in
-     `http://www.meadowy.org/'.)
-
-     If you use it with Emacs 21.2, it is necessary to apply this patch
-     (http://www.m17n.org/mlarchive/mule/200203/msg00000.html) before
-     installation.
-
-     If you are an XEmacs 21.4 user, the compiled package is here:
-
-     `ftp://ftp.xemacs.org/xemacs/packages/mule-ucs-1.14-pkg.tar.gz'
-
-     (You don't need to install it in addition to Mule SUMO, that
-     contains it.)
-
-`codepage-ex'
-     Some web sites in Europe specify a `charset=ISO-8859-1' encoding,
-     but really use `windows-1252'.  Since `iso-8859-1' is insufficient
-     to decode that, emacs-w3m uses `windows-1252' as a superset of
-     `iso-8859-1' if it is available.  The `windows-1252' coding system
-     is built-in since Emacs 22.  Even in Emacs 21, you can enable to
-     use it using the module called `codepage-ex'.  See the following
-     page:
-
-     `http://nijino.homelinux.net/emacs/codepage-ex.html'
-
-`rfc2368.el'
-     Install it if you'd like to enable emacs-w3m running with XEmacs to
-     parse `mailto' urls properly.  You can find the `rfc2368.el'
-     module which can be used with XEmacs in the `attic' directory in
-     the emacs-w3m distribution.  To install it, copy the `rfc2368.el'
-     file to the directory belonging to the `load-path', and perform the
-     following command:
-
-          % xemacs -batch -vanilla -f batch-byte-compile rfc2368.el
-
-
-File: emacs-w3m.info,  Node: Installing Emacs-w3m,  Next: Non-UNIX-like systems,  Prev: Other Requirements,  Up: Getting Started
-
-2.4 Installing emacs-w3m
-========================
-
-See the official page `http://emacs-w3m.namazu.org/' for instructions
-on how to get the latest emacs-w3m.  Is everything ready?  Now, let's
-begin.
-
-   In order to install emacs-w3m on non-UNIX-like systems (or any system
-lacking the ability to execute the `configure' script or has no `make'
-command), skip this section and go to the next section *Note
-Non-UNIX-like systems::.
-
-  1. First, extract a tarball of the emacs-w3m distribution and enter
-     the top directory as follows:
-
-          % tar zxf emacs-w3m-1.4.413.tar.gz
-          % cd emacs-w3m-1.4.413
-
-     If you've checked out emacs-w3m from CVS, you have to run
-     `autoconf' with no argument to generate the `configure' script.
-
-  2. Run the `configure' script.
-
-          % ./configure
-
-     _Important notice to Gnus users_:
-
-     If multiple versions of Gnus are installed on your system (it is
-     likely that there are the released version and the development
-     version of Gnus), make sure that the `load-path' contains the
-     directory where the version you use is installed (check for the
-     `gnus.elc' file).  You can ensure that with the `--with-addpath'
-     option as follows:
-
-          % ./configure --with-addpath=/usr/local/share/emacs/site-lisp/gnus
-
-     If you've installed APEL, FLIM or something in
-
-     non-standard directories other than the default `load-path', you
-     must specify them using the `--with-addpath' option as follows (you
-     may also include the Gnus directory in it separated with `:'):
-
-          % ./configure --with-addpath=/opt/share/apel:/opt/share/flim
-
-  3. Just run `make' and `make install'.  See also the next step if you
-     are using XEmacs.
-
-          % make
-          % make install
-
-     All Lisp and info files will be installed in the appropriate
-     directories.  Now, how do you know what files will go where?  To
-     know it beforehand, use this:
-
-          % make what-where
-
-     If you are using Emacs or XEmacs capable of displaying images, you
-     had better install icon image files.  To do this:
-
-          % make install-icons
-
-     or
-
-          % make install-icons30
-
-     The later is for using the slightly larger icon images.
-
-  4. You can also install emacs-w3m as an XEmacs package using `make
-     install-package' instead of `make install' as follows:
-
-          % make
-          % make install-package
-
-     In this case, you don't have to execute `make install-icons' nor
-     `make install-icons30'.
-
-     If you need to specify the package directory, there are two ways
-     to do that:
-
-        * Use the `configure' option `--with-packagedir='.  For example:
-
-               % ./configure --with-packagedir=/opt/xemacs/xemacs-packages
-               % make what-where
-               % make
-               % make install-package
-
-        * Use the `PACKAGEDIR' variable.  For example:
-
-               % ./configure
-               % make what-where PACKAGEDIR=/opt/xemacs/xemacs-packages
-               % make
-               % make install-package PACKAGEDIR=/opt/xemacs/xemacs-packages
-
-
-
-
-File: emacs-w3m.info,  Node: Non-UNIX-like systems,  Next: Minimal Settings,  Prev: Installing Emacs-w3m,  Up: Getting Started
-
-2.5 Installing on non-UNIX-like systems
-=======================================
-
-If you cannot execute the `configure' script on your system, or if no
-`make' command is available, cast the following spell:
-
-     % emacs -batch -q -no-site-file -l w3mhack.el NONE -f w3mhack-nonunix-install
-
-   If APEL, FLIM (or any other library) aren't installed in the
-ordinary places, the installer will leave them out.  In such a case, it
-is necessary to tell those places to the installer as shown below:
-
-     % emacs -batch -q -no-site-file -l w3mhack.el //c/share/apel://c/share/flim -f w3mhack-nonunix-install
-
-
-File: emacs-w3m.info,  Node: Minimal Settings,  Prev: Non-UNIX-like systems,  Up: Getting Started
-
-2.6 Minimal settings to run emacs-w3m
-=====================================
-
-This section mentions some fundamental settings for emacs-w3m.  If you
-want to fine-tune your installation, you'll find many customizable
-variables in *note Customizable Variables::.
-
-`Autoloads'
-     You don't need this if you've installed emacs-w3m as an XEmacs
-     package (*note Installing Emacs-w3m::) because the
-     `w3m/auto-autoloads.el' takes care of setting up autoloads.
-
-     In all other cases, put the following line in your `~/.emacs' file:
-
-          (require 'w3m-load)
-
-`Startup File'
-     We recommend using the `~/.emacs-w3m' file (which is the default
-     value of `w3m-init-file') if you need to twiddle some emacs-w3m
-     variables.  This file is similar to `~/.emacs', but is read when
-     emacs-w3m starts.  Note that some options shouldn't be modified
-     there, for example, `w3m-command'.
-
-`Proxy Gateway'
-     If you are behind a firewall and access the Internet through a
-     proxy gateway, you need to instruct w3m to use it.
-
-     There are several ways to do this, one is to set the `http_proxy'
-     environment variable globally in the shell something like:
-
-          setenv http_proxy http://proxy.hogege.com:8000/
-
-     Another way is to customize the `w3m-command-arguments' variable to
-     add the options `-o' and
-     `http_proxy=http://PROXY_SERVER_NAME:PORT/'.
-
-     This can also be done in your `~/.emacs-w3m' file as shown below:
-
-          (setq w3m-command-arguments
-                (nconc w3m-command-arguments
-                       '("-o" "http_proxy=http://proxy.hogege.com:8000/")))
-
-     To specify hosts for which the proxy shouldn't be used (Intranet
-     sites and the like), set the `no_proxy' (note that it is not
-     `no-proxy') environment variable to a comma-separated list of
-     hostnames.  Alternatively, you can set the `w3m-no-proxy-domains'
-     variable to a list of domain names (not host names) as follows:
-
-          (setq w3m-no-proxy-domains '("local.com" "neighbor.com"))
-
-     See also the documentation of the `w3m-command-arguments-alist'
-     variable for instructions on how to use regexps to specify
-     `no_proxy' hosts.
-
-
-
-File: emacs-w3m.info,  Node: Basic Usage,  Next: Pretty Good Features,  Prev: Getting Started,  Up: Top
-
-3 Basic usage
-*************
-
-* Menu:
-
-* Browsing Web Pages::          Let's go netsurfing!
-* Inline Images::               Toggle displaying inline images
-* Tracing History::             Going back through time and space
-* Managing Bookmarks::          That's a favorite with me!
-* Using Tabs::                  Everybody likes tabs
-* Working with buffers::        Creating, killing and moving across buffers
-* Downloading::                 Downloading a file
-* Submitting Forms::            Filling in HTML forms
-* HTML File Information::       Support for web page editing and hacking
-
-
-File: emacs-w3m.info,  Node: Browsing Web Pages,  Next: Inline Images,  Up: Basic Usage
-
-3.1 Let's go netsurfing!
-========================
-
-You can, by the keys, let emacs-w3m do all the web browsing operations.
-Emacs-w3m uses the `Lynx-like' keymap (*note Key Binding::) by default.
-Of course, you can use the mouse buttons, too.
-
-* Menu:
-
-* Key Binding::                 There are two types of the key bindings
-* Launching and Jumping::       Go ahead, just try it
-* Moving in a page::            Moving from place to place in a page
-* Moving over pages::           Moving from page to page
-* Browsing with Mouse Operations:: Surfing using the mouse
-* Going Back to Daily Hacking and/or Daily Writing:: Return to an Ordinary Life
-
-
-File: emacs-w3m.info,  Node: Key Binding,  Next: Launching and Jumping,  Up: Browsing Web Pages
-
-3.1.1 There are two types of the key bindings
----------------------------------------------
-
-Since emacs-w3m is a late-coming web browser in the history of Emacs web
-browsers, we offer two types of the key bindings in order that users can
-get used to the new web browser easily.  One is called the `Lynx-like'
-keymap, the other is the `Info-like' keymap.  You can see what they
-mean from those names, can't you?  The former is similar to that of
-`Lynx' which is the text-based web browser, and the later is similar to
-that of `Info' which is GNU's official document browser.  By default,
-the `Lynx-like' keymap is used.  If you would like to use the
-`Info-like' keymap, type
-
-     M-x customize-option <RET> w3m-key-binding <RET>
-
-choose the `Info-like' keymap, and save the changed state.  Otherwise,
-add the following snippet to your `~/.emacs' file, not
-`~/.emacs-w3m.el' file:
-
-     (setq w3m-key-binding 'info)
-
-   To change the key binding one by one, modify the `w3m-mode-map'
-variable in your `~/.emacs-w3m.el' file like the following:
-
-     (define-key w3m-mode-map [up] 'previous-line)
-     (define-key w3m-mode-map [down] 'next-line)
-     (define-key w3m-mode-map [left] 'backward-char)
-     (define-key w3m-mode-map [right] 'forward-char)
-
-
-File: emacs-w3m.info,  Node: Launching and Jumping,  Next: Moving in a page,  Prev: Key Binding,  Up: Browsing Web Pages
-
-3.1.2 Go ahead, just try it
----------------------------
-
-You can invoke emacs-w3m using three different commands, listed below.
-Try one of these commands: a web page is displayed in an Emacs buffer
-named "*w3m*", meaning that it is an emacs-w3m buffer.  As you will
-probably notice, the major mode for an emacs-w3m buffer is `w3m-mode',
-there are also minor modes (*note Managing Bookmarks::).
-
-   This section explains the most fundamental usage of these commands,
-see *note Emacs-w3m Functions:: for more information on them.  See also
-*note Customizable Variables:: for variables you can use to customize
-emacs-w3m's behavior.
-
-`w3m'
-     Start emacs-w3m, displaying the homepage specified in the
-     `w3m-home-page' variable.  The default value for `w3m-home-page'
-     is "about:".  Set the `w3m-quick-start' variable to `nil' if you
-     want to input a target URL every time you start emacs-w3m.
-
-     You can also use this as an argument when starting emacs.
-     Examples:
-
-          % emacs -f w3m
-
-     To specify a URL, you could also use:
-
-          % emacs -f w3m http://emacs-w3m.namazu.org/
-
-`w3m-find-file'
-     Prompt for a local file name in the minibuffer, and display it in
-     emacs-w3m.
-
-`w3m-browse-url'
-     Prompt for a URL in the minibuffer, and display it in emacs-w3m.
-     This command is provided, if anything, in order to start emacs-w3m
-     from other application programs.
-
-   Moving in an emacs-w3m buffer won't be painful if you're an Emacs
-user already, since many of the standard keys work as intended.  For
-instance, `C-n', `C-v' and `C-s' (which are commonly used to move down
-one line, one page, or search downwards for a word) are valid keys in
-an emacs-w3m buffer.
-
-   To follow a link, use the `<RET>' key.  You have to move the point
-to a link to do this; links are easily recognizable in a buffer because
-they are not displayed like ordinary text: they can be underlined, or
-have a different color.  The face `w3m-anchor' controls how they are to
-be displayed (*note Customizable Variables::).
-
-`<RET>'
-`<right>' (Lynx-like keymap only)
-     Display the page pointed by the link under point
-     (`w3m-view-this-url').
-
-     The exact behavior of this command depends on the properties of
-     the link under point, and on whether you give it a prefix argument
-     or not.  See *note Emacs-w3m Functions:: for details.
-
-   As mentioned above, you can be prompted for a URL when you use the
-command `M-x w3m', by setting the `w3m-quick-start' variable to `nil'.
-In an emacs-w3m buffer, there are also two popular ways to go to new
-pages by entering their URLs, see below.
-
-`<RET>'
-     In an emacs-w3m buffer, you can be prompted for a URL in the
-     minibuffer and make emacs-w3m display the corresponding page by
-     hitting `<RET>' after moving the point to the URL displayed in the
-     `header-line'.  This feature will feel familiar to you if you are
-     used to GUI-based web browsers like Mozilla.  Detailed explanations
-     about this can be found in *note Emacs-w3m Functions::
-     (`w3m-view-this-url').
-
-`g'
-     Prompt for a URL in the minibuffer and make emacs-w3m display the
-     corresponding page (independently of the position of the point) in
-     an emacs-w3m buffer.  This binding will be familiar to you if you
-     already use Gnus or Mew (`w3m-goto-url').
-
-`G'
-     Prompt for a URL in the minibuffer, and display it in a new
-     session.  This function works just like `g' (`M-x w3m-goto-url')),
-     except that it opens a new session.  Unless you are using
-     emacs-w3m on the character terminal, opening a new session means
-     displaying the page in a new tab.  For more information about
-     tabs, please refer to *note Using Tabs::
-     (`w3m-goto-url-new-session').
-
-`c' (Lynx-like keymap)
-`y' (Info-like keymap)
-     Display the URL of the page being displayed in the echo area and
-     put it in the `kill-ring' (`w3m-print-current-url').
-
-`u' (Lynx-like keymap)
-`Y' (Info-like keymap)
-     Display the target URL of the link under point in the echo area
-     and put it in the `kill-ring' (`w3m-print-this-url').
-
-   If the page you're reading is today's news or someone's diary, it may
-have been updated since you loaded it.  You can refresh the page using
-the following command.  (This command can also be useful to force a full
-redisplay of the page if it looks broken.)
-
-`R'
-`C-S-l' (Info-like keymap only)
-     Reload the page (`w3m-reload-this-page').
-
-
-File: emacs-w3m.info,  Node: Moving in a page,  Next: Moving over pages,  Prev: Launching and Jumping,  Up: Browsing Web Pages
-
-3.1.3 Moving from place to place in a page
-------------------------------------------
-
-Being able to use familiar Emacs movement bindings while browsing a web
-page probably fascinates you already.  Believe it or not, there is
-more!  Since we value your time, we have added keys to move the point,
-scroll the page or find links in a very fast way.  When you master
-them, you will understand how handy they are.
-
-   The keys are assigned so that scroll commands can be called using
-shorter keystrokes than standard Emacs key bindings.  And since places
-where you can input text are pretty specific in web pages (*note
-Submitting Forms::), most keys have special meanings and aren't
-assigned to `self-insert-command' anymore.
-
-`<SPC>'
-     Scroll downwards.  You may be used to this binding if you use the
-     `more' or `less' commands, or Emacs's `view-mode'
-     (`w3m-scroll-up-or-next-url').
-
-`<DEL>'
-`b'
-`<backspace>'
-`S-<SPC>'
-`C-?'
-     Scroll upwards.  You may be used to this binding if you use the
-     `less' command or Emacs's `view-mode'
-     (`w3m-scroll-down-or-previous-url').
-
-`>'
-     Scroll to the left.  The scroll step is given by the
-     `w3m-horizontal-scroll-columns' variable, default 10
-     (`w3m-scroll-left').
-
-`<'
-     Scroll to the right.  The scroll step is given by the
-     `w3m-horizontal-scroll-columns' variable, default 10
-     (`w3m-scroll-right').
-
-`.' (Lynx-like keymap)
-`S-<left>' (Info-like keymap)
-     Shift to the left (a fine level horizontal scrolling).  The shift
-     step is given by the `w3m-horizontal-shift-columns' variable,
-     default 2 (`w3m-shift-left').
-
-`,' (Lynx-like keymap)
-`S-<right>' (Info-like keymap)
-     Shift to the right (a fine level horizontal scrolling).  The shift
-     step is given by the `w3m-horizontal-shift-columns' variable,
-     default 2 (`w3m-shift-right').
-
-`M-l'
-     Scroll horizontally so that the current position is centered
-     (`w3m-horizontal-recenter').
-
-   The `w3m-mode' major mode defines commands to move to various kinds
-of things; namely links, forms, and images (whether they are displayed
-or not).
-
-   Let's consider this simple example: suppose we want to search for a
-word on the widely-known Google search engine.  Step one: open
-`http://www.google.com' in emacs-w3m.  Step two: once the page is
-loaded, hit `]'.  Tadaa!  The point has moved to the first form input
-in the page, you can now hit `<RET>' to enter something in it, and then
-`C-c C-c' to submit.  Without this command, you would have had to move
-into the page using `C-n', `C-f' and so forth, it would have been a
-real pain.
-
-`<TAB>'
-`<down>' (Lynx-like keymap only)
-     Move the point to the next link (an "anchor" in emacs-w3m lingo).
-     More strictly speaking, move the point forwards to the nearest
-     anchor.
-
-`M-<TAB>'
-`S-<TAB>'
-`<backtab>'
-`<up>' (Lynx-like keymap only)
-     Move the point to the previous anchor.  More strictly speaking,
-     move the point backwards to the nearest anchor
-     (`w3m-previous-anchor').
-
-`]'
-     Move the point to the next form.  More strictly speaking, move the
-     point forwards to the nearest form (`w3m-next-form').
-
-`['
-     Move the point to the previous form.  More strictly speaking, move
-     the point backwards to the nearest form (`w3m-previous-form').
-
-`}'
-     Move the point to the next image.  More strictly speaking, move the
-     point forwards to the nearest image (`w3m-next-image').
-
-`{'
-     Move the point to the previous image.  More strictly speaking,
-     move the point backwards to the nearest image
-     (`w3m-previous-image').
-
-
-File: emacs-w3m.info,  Node: Moving over pages,  Next: Browsing with Mouse Operations,  Prev: Moving in a page,  Up: Browsing Web Pages
-
-3.1.4 Moving from page to page
-------------------------------
-
-This section explains how to move from page to page, but not by
-following links or inputing URLs (these ways of moving are explained in
-*note Launching and Jumping::).
-
-   This includes commands to move backwards and forwards in history (the
-familiar "Back" and "Forward" from other browsers), and the obligatory
-"Go to the home page" feature.  You will probably understand this
-better after reading the *note Tracing History:: section.
-
-`B' (Lynx-like keymap)
-`<left>' (Lynx-like keymap)
-`l' (Info-like keymap)
-`p' (Info-like keymap)
-     Move back one page in history (`w3m-view-previous-page').  With a
-     numeric argument ARG, move back ARG pages.  This is the preferred
-     way to go back in time.
-
-`N' (Lynx-like keymap)
-`n' (Info-like keymap)
-     Move forward one page in history (`w3m-view-next-page').  Of
-     course, this will work only if you've used `B' (`l' for the
-     `Info-like' keymap) to move back in history.  If called with a
-     numeric argument ARG, move forward ARG pages. This command actually
-     allows you to go back to the future!
-
-`H'
-     Move to the home page (`w3m-gohome').  You can specify the URL of
-     the home page by customizing the `w3m-home-page' variable
-     ("about:" by default).
-
-   These commands are exclusive features of emacs-w3m, we were able to
-obtain patents on them, so you won't find them anywhere else.  That's
-why you must learn to use them today!  (Just kidding.)
-
-`^'
-`u' (Info-like keymap only)
-     Attempt to move to the parent directory of the page currently
-     displayed.  For instance, it will attempt to move to
-     "http://foo/bar/" when "http://foo/bar/baz" is displayed.  This
-     function has been implemented because of the following
-     observation: users of web browsers often have to move up one level
-     of directories because the information they're looking for isn't
-     displayed on the current page (either because it has been deleted,
-     or because a search engine took them to the wrong page).
-
-     When you use another web browser, you usually need to remove the
-     last component from the URL by using the `<DEL>' key, etc. several
-     times manually.  In emacs-w3m, this operation can be performed in
-     only one keystroke, by typing `^'!
-
-     Also, you type this command with prefix as "2 ^", you visit the
-     upper directory according to input number. you type "0 ^", you
-     visit the top of this site.
-
-`<SPC>'
-     When the current point is located at the end of the buffer and you
-     cannot scroll down further, hit the `<SPC>' key to go on to the
-     "next page" (`w3m-scroll-up-or-next-url').  Here, "next page"
-     means the page referred to in the special "next" header of the
-     current page (read on).  This feature has nothing to do with the
-     history.
-
-     You probably noticed that some websites split their contents over
-     several small pages, partly because it's not comfortable for users
-     to wait for huge contents to transfer in one go.  For example,
-     search results of search engines often appear like that.  On such
-     sites, users often need to follow links manually from one page to
-     the next in order the access all the information.
-
-     Hopefully emacs-w3m attempts to enable you to browse a series of
-     contents over pages as if you were viewing them as a single page,
-     by combining two operations: explicitly following links and
-     scrolling.
-
-     That's how it works: these kinds of websites often have fields
-     such as "next", "prev" or "previous" in the headers of their web
-     pages.  These fields contain information about links between
-     divided pages.  Emacs-w3m uses these fields to know what to follow.
-
-     Let's take an example with Google again to explain how the two
-     operations (following links and scrolling) are combined.  Open
-     `http://www.google.com' and search for a word.  If you search for a
-     very common word (e.g. "hamburger"), you will get tons of search
-     results.  Google returns the first page of search results, after
-     having sorted them using its own algorithm and divided them into
-     several pages.  Use `<SPC>' to scroll through this first page.
-     Keep scrolling until you see the end of the web page in the
-     window.  Here, a surprise is waiting for you.  If you use a web
-     browser other than emacs-w3m and want to see the rest of the
-     search results, you would have to click on any of the numbers
-     listed under
-
-          Gooooooogle
-
-          1 2 3 4 5 6 7 8...
-
-     to follow the link.  But with emacs-w3m, you can follow the link
-     by just typing `<SPC>', just as if you were scrolling!
-
-`<DEL>'
-`b'
-`<backspace>'
-`S-<SPC>'
-`C-?'
-     When the point is located at the beginning of the buffer and you
-     cannot scroll upward, hit the `<DEL>' to go to the "previous" page
-     (`w3m-scroll-down-or-previous-url').  Here, the "previous" page
-     means the page which is assigned to the "prev" or "previous" fields
-     in the header of the current page.  This function has nothing to
-     do with the history, and works like `<SPC>'
-     (w3m-scroll-up-or-next-url).
-
-
-File: emacs-w3m.info,  Node: Browsing with Mouse Operations,  Next: Going Back to Daily Hacking and/or Daily Writing,  Prev: Moving over pages,  Up: Browsing Web Pages
-
-3.1.5 Surfing using the mouse
------------------------------
-
-The emacs-w3m developers went to some trouble to ensure that normal
-people who aren't Emacs otaku can also use emacs-w3m.  You can perform
-most web browsing operations using only the mouse except for entering
-text, e.g. URL, forms, etc.  Note that sometimes you might still need to
-use modifier keys since the emacs-w3m developers are all Emacs otaku...
-
-   Use `mouse-2' to "follow links" (the first basic of web browsing).
-Under Emacs 22.1 and newer, you can also follow links using `mouse-1',
-depending of the value of `mouse-1-click-follows-link'.
-
-`mouse-2'
-     Follow the link under the mouse pointer
-     (`w3m-mouse-view-this-url').
-
-`S-<mouse-2>'
-     Follow the link under the mouse pointer in a new session
-     (`w3m-mouse-view-this-url-new-session').
-
-   Scrollbar, menubar and toolbar are helpful in emacs-w3m when you use
-a mouse (your Emacs must support them, and you must have enabled them).
-You can scroll an emacs-w3m window using the scrollbar.  You can invoke
-many emacs-w3m commands described in this manual from the "w3m" menu
-which appears at the top of the Emacs frame.  Note: it's not necessary
-to use the menubar for most emacs-w3m commands, you can use the toolbar
-icons instead.
-
-   To switch between buffers in an emacs-w3m window using "Tabs" (*note
-Using Tabs::), click on the topmost line in an emacs-w3m window
-directory using `mouse-2' or choose one from the "Tab" menu which
-appears next but one to the "w3m" menu.
-
-
-File: emacs-w3m.info,  Node: Going Back to Daily Hacking and/or Daily Writing,  Prev: Browsing with Mouse Operations,  Up: Browsing Web Pages
-
-3.1.6 Return to an Ordinary Life
---------------------------------
-
-Think back.  You probably didn't start Emacs to browse the web, but to,
-say, replace some editor's built-in interpreter with scheme, write Info
-documentation or put into print your opinion on software patents...
-who knows?  While you were using Emacs, you ran into the need to browse
-the web for your work.  But you happened to be able to see the web page
-without leaving Emacs at all.  Wow.
-
-   Now the time has come to return to work.  Keep it up or the world
-won't change!  Type `q' if you think you might need to browse the web
-again.  Type `Q' if you don't have any intention to go back to
-emacs-w3m for a while.
-
-`q'
-     Close an emacs-w3m window and select the other buffer
-     (`w3m-close-window').
-
-`Q'
-     Save the "arrived URLs" list to disk (*note Tracing History::),
-     save cookies (*note Cookie Variables::) and really quit emacs-w3m
-     (`w3m-quit').
-
-
-File: emacs-w3m.info,  Node: Inline Images,  Next: Tracing History,  Prev: Browsing Web Pages,  Up: Basic Usage
-
-3.2 Toggle displaying inline images
-===================================
-
-If the Emacs version you're using is capable of displaying images in
-buffers, then emacs-w3m can display them in web pages, just like
-"graphical" browsers like Mozilla do.  You should make sure your Emacs
-is correctly setup for images before trying to use any of the following
-commands (*note Required Emacs Version::).
-
-   To toggle displaying of images in the current buffer, use `T' (`I'
-for the `Info-like' keymap).  It makes emacs-w3m fetch the images from
-the server, then display them in the buffer, at the position they would
-have in a "graphical" browser. If you hit the key again, images will
-disappear from the buffer.
-
-   By default, emacs-w3m won't display images, but you can change its
-behavior and choose to always display images, for this you need to
-customize the `w3m-default-display-inline-images' variable and change
-its value from `nil' to `t'.  *Note Customizable Variables::.
-
-   Emacs-w3m also comes with nifty features that let you zoom an image
-in or out, save it to a file, or view it in a external viewer.  See also
-*note Moving in a page:: for instructions on how to move from image to
-image in an emacs-w3m buffer.
-
-`T' (Lynx-like keymap)
-`I' (Info-like keymap)
-     Toggle displaying of all the inline images in this buffer
-     (`w3m-toggle-inline-images').  If and only if
-     `transient-mark-mode' is turned on and the region is active, only
-     the images within the region will be turned on.
-
-     Note1: whether to display inline images in a page from the start
-     when you first visit the page is controlled by the value of the
-     variable `w3m-default-display-inline-images' (the default is off)
-     as mentioned above.  But the visibility of images in pages that
-     you visit from this buffer inherits the last status of the
-     visibility in this buffer if
-     `w3m-toggle-inline-images-permanently' is non-`nil' (default=`t').
-     If `w3m-toggle-inline-images-permanently' is `nil',
-     `w3m-default-display-inline-images' always controls it.
-
-     Note2: this command deactivates the region, so you have to set it
-     again if you want to turn on only the images in a certain area
-     again.
-
-`t' (Lynx-like keymap)
-`i' (Info-like keymap)
-     Toggle displaying of the single inline image under the cursor
-     (`w3m-toggle-inline-image').  If and only if `transient-mark-mode'
-     is turned on and the region is active, only the images within the
-     region will be turned on.  For the `Info-like keymap', this key is
-     bound to the command (`w3m-view-image') that launches the external
-     viewer if Emacs does not support displaying images.
-
-`M-S-t' (Lynx-like keymap)
-`M-S-i' (Info-like keymap)
-     Turn off displaying of all the inline images in this buffer.
-     (`w3m-turnoff-inline-images').
-
-`I' (Lynx-like keymap)
-     View the image under point in an external viewer
-     (`w3m-view-image').
-
-`M-i'
-     Save the image under point to an external file.  The default name
-     will be the original name of the image, so most of the time
-     `M-i <RET>' will save the image with the right name
-     (`w3m-save-image').
-
-`M-['
-     Zoom out the image under point (`w3m-zoom-out-image').
-
-`M-]'
-     Zoom in the image under point (`w3m-zoom-in-image').
-
-
-File: emacs-w3m.info,  Node: Tracing History,  Next: Managing Bookmarks,  Prev: Inline Images,  Up: Basic Usage
-
-3.3 Going back through time and space
-=====================================
-
-Emacs-w3m has several ways to present you with a list of all the pages
-you visited before.  The first way is simply called the "emacs-w3m
-history", it is a list of the pages you visited in this session,
-presented hierarchically, that is: when you follow a link, the page
-you're leaving becomes the "parent" of the page you're going to.  It is
-a very nice to keep track of the pages you visited, and remember from
-where you came if the history gets too long.
-
-   Here is an example of this feature in action, after a short visit to
-the GNU Project's homepage:
-
-     GNU's Not Unix! - the GNU Project and the Free Software Foundation (FSF)
-       Philosophy of the GNU Project - Free Software Foundation (FSF)
-         GNU Emacs - GNU Project - Free Software Foundation (FSF)
-          Order from the Free Software Foundation (FSF)
-       Links to Other Free Software Sites - GNU Project - Free Software Fo...
-         EFF: Homepage
-
-   (In fact, this example is slightly edited to fit in 72 columns; the
-URLs won't be cut in the actual emacs-w3m buffer.)
-
-   You can get this kind of history using the `s' key (the `o' key for
-the `Info-like' keymap) in any emacs-w3m buffer.
-
-   Please note that this history is buffer-local, i.e. specific to an
-emacs-w3m buffer.  But emacs-w3m has a unique feature: when you visit a
-new page, the history is copied over to the new buffer, so that you can
-still access the pages you visited so far.  This is different from the
-way Mozilla and others work; in these browsers the history always starts
-from scratch in new buffers.
-
-   Emacs-w3m can do more than just record which pages you visited, it
-can also save specific locations in those pages, in case you want to go
-back to the exact same place in the page.  Press `C-c C-@', and the
-location of the cursor will be stored in history.  In order to go back
-to that particular location within the page, press `C-c C-v' in the
-emacs-w3m buffer visiting the page.
-
-`s' (Lynx-like keymap)
-`C-u s' (Lynx-like keymap)
-`o' (Info-like keymap)
-`C-u o' (Info-like keymap)
-     Display the list of URLs visited in this session.  If called with a
-     prefix argument (see below), show the list of arrived URLs instead
-     (`w3m-history').
-
-`C-c C-@'
-`C-c C-<SPC>'
-     Record the position of the cursor in the page in history.
-
-`C-c C-v'
-     Move to the position which has been marked with `C-c C-@'
-     (`w3m-history-store-position') in the currently displayed page.
-
-   The other way to have information about past pages is the "arrived
-URLs" list: it is a list of the last 500 URLs you have visited in
-emacs-w3m.  The list is ordered by date, the most recent coming first,
-and for each page the time of visit is displayed.  Here's an example
-(edited):
-
-     Order from the Free Software Foundation (FSF)             22:53:25
-     GNU Emacs - GNU Project - Free Software Foundation (FS    22:53:05
-     Philosophy of the GNU Project - Free Software Foundati... 22:52:46
-     Philosophy of the GNU Project - Free Software Foundati... 22:52:39
-     EFF: Homepage                                             22:52:18
-     Links to Other Free Software Sites - GNU Project - Fre... 22:52:07
-     Links to Other Free Software Sites - GNU Project - Fre... 22:52:07
-     GNU's Not Unix! - the GNU Project and the Free Softwar... 22:51:32
-     Bookmarks                                                 22:51:02
-     The DICT Development Group- upwards                       2003-01-08
-     the monkey puzzle: new debian packages as an rss feed     2003-01-08
-     new-debian-packages.rss                                   2003-01-07
-     it's a miracle                                            2003-01-06
-
-   You can get this history by passing a prefix argument to the previous
-command, i.e. using `C-u s' (`C-u o' for the `Info-like' keymap).  The
-number of URLs showed in this page is customizable, see the
-`w3m-keep-arrived-urls' variable.  It cannot exceed 500 by default.
-*Note Customizable Variables::.
-
-   Of course, in all cases all the lines showed in the examples are
-links, you can go to any of the pages you visited previously just like
-if you were visiting a regular page, by following the link.
-
-   Also see the *note Moving over pages:: section, it explains how to
-move in the history with simple keybindings, i.e. the "Back" and "Next"
-features.
-
-
-File: emacs-w3m.info,  Node: Managing Bookmarks,  Next: Using Tabs,  Prev: Tracing History,  Up: Basic Usage
-
-3.4 That's a favorite with me!
-==============================
-
-Like all modern browsers, emacs-w3m has advanced features related to
-bookmarks: it lets you classify them in categories, edit them and of
-course, browse them easily.
-
-* Menu:
-
-* Adding Bookmarks::            Adding a URL to your favorites
-* Consulting Bookmarks::        Browse your bookmarks
-* Editing Bookmarks::           How to change your bookmarks
-
-
-File: emacs-w3m.info,  Node: Adding Bookmarks,  Next: Consulting Bookmarks,  Up: Managing Bookmarks
-
-3.4.1 Adding a URL to your favorites
-------------------------------------
-
-There are several ways to add a URL to your bookmarks.  The first one is
-to use the `a' key (or call the `w3m-bookmark-add-current-url' command)
-to add the page you're currently browsing: it will prompt you for a
-section to where the bookmark should go (completion is available with
-the `<TAB>' key) and will let you edit the title of the bookmark (the
-default being the title of the current page).  Complete these two
-steps, validating each with `<RET>', and you will see the message
-"Added" in the minibuffer, which means (surprise!) that the page has
-been added to your bookmarks.
-
-   Another way to add a bookmark is to use the `M-a' key (or call the
-`w3m-bookmark-add-this-url' command): it adds the URL under point (that
-means, the URL you would be taken to if you followed the link) to the
-bookmarks.  As before, you will have to input the section for this
-bookmark and its title, the default being this time the name of the
-link itself.
-
-   The third and final way to do this is to use `C-u a', this time you
-will be prompted for the URL to add, its section, and the title to use
-for it in the bookmarks.
-
-`a'
-     Add the current page to the bookmarks, or if called with a prefix
-     argument, prompt for a URL and add it
-     (`w3m-bookmark-add-current-url').
-
-`M-a'
-     Add the URL under point to the bookmarks
-     (`w3m-bookmark-add-this-url').
-
-
-File: emacs-w3m.info,  Node: Consulting Bookmarks,  Next: Editing Bookmarks,  Prev: Adding Bookmarks,  Up: Managing Bookmarks
-
-3.4.2 Browse your bookmarks
----------------------------
-
-The easiest way to see the bookmarks is to use the `v' key in an
-emacs-w3m buffer; another possibility is to go to the special URL
-`about://bookmark/'.  You will see your bookmarks, organized by
-section, each line being one bookmark.  You can browse them exactly
-like you would browse any other page.
-
-   On the bookmarks page a w3m minor mode is activated, the bookmark
-mode.  It adds key bindings to edit the bookmarks.  *Note Editing
-Bookmarks::.
-
-`v'
-     Visit the bookmarks page (`w3m-bookmark-view').
-
-
-File: emacs-w3m.info,  Node: Editing Bookmarks,  Prev: Consulting Bookmarks,  Up: Managing Bookmarks
-
-3.4.3 How to change your bookmarks
-----------------------------------
-
-The bookmark minor mode (*note Consulting Bookmarks::) offers several
-key bindings related to bookmark edition, most noticeably `C-k' to kill
-(i.e. delete) a bookmark, and `E' (`e' for the `Info-like' keymap) to
-edit the bookmark file.
-
-   Bookmarks are kept in an HTML file, so you can edit the file by hand,
-but be very careful: if you erase the comments emacs-w3m needs to
-recognize section names, things can break easily.  If you know the
-basics of HTML, the file should otherwise be quite self-explanatory.
-
-`C-k'
-     Kill the bookmark under point (`w3m-bookmark-kill-entry').
-
-`E'
-     Visit the bookmarks file (`w3m-bookmark-edit').
-
-`C-_'
-     Undo the last changes (`w3m-bookmark-undo').
-
-
-File: emacs-w3m.info,  Node: Using Tabs,  Next: Working with buffers,  Prev: Managing Bookmarks,  Up: Basic Usage
-
-3.5 Everybody likes tabs
-========================
-
-Unlike most other text-based browsers, emacs-w3m has support for tabbed
-browsing.  What is tabbed browsing, you might ask?  It's very simple: it
-is a way to represent all active emacs-w3m buffers in a single window,
-by showing a line at the top which shows all the buffers in a simple and
-self-explaining way, each buffer being shown as a "tab".  This line
-stays visible all the time and does not scroll with the rest of the
-buffer, so that you can switch to another buffer, or use the feedback it
-provides at any moment.
-
-   The easiest way to get the feeling of it is to just try, so go on and
-open an emacs-w3m session.  If you didn't change anything to the
-configuration, the tabs line is active by default, it is this bright
-line at the top with a smaller rectangle that shows the title of the
-current page.  Now create another w3m buffer (with `G', for example):
-now you have two of these rectangles.  These are tabs.
-
-   The most obvious use of tabs is switching: by clicking with the
-`mouse-1' button on a tab, you make the buffer it represents active.
-It also works with the `mouse-2' button, or with rolling the mouse
-wheel if you are using GNU Emacs.  It's a very quick and easy way to
-work with several emacs-w3m buffers, you just have to point and click,
-or to roll the mouse wheel.  (Yeah yeah, I hear you.  You want to switch
-using the keyboard.  Don't worry, it's also possible.  It's explained in
-the next section.  Now keep quiet and read on!)
-
-   Another nifty feature is the feedback it provides.  If you are on a
-color terminal or window system, emacs-w3m shows the text in the tab in
-different colors to show the status of the page(1).  For example, when
-the page is being loaded, the text is in red, and goes back to its
-default color (usually black) when the loading is complete.  This way
-you can tell with a single glance at the tabs line if the page you're
-waiting for has arrived or not.
-
-   Finally, if the web page provides a favicon, it will be shown in the
-tab as well(2).  More eye-candy for the emacs-w3m user!
-
-   User options:
-
-`w3m-use-tab'
-     Whether to activate tabbed browsing or not.
-
-   If you are a GNU Emacs user, the mouse wheel allows you not only to
-go to an adjacent buffer but also to move a buffer to the adjacent
-place.  To do that, press and hold down the control key while you roll
-the mouse wheel on the tabs line.  There are two variables that control
-how emacs-w3m behaves by the mouse wheel:
-
-`w3m-tab-track-mouse'
-     This variable controls whether to make the mouse track the
-     selected tab.  The default value is `t'.  You may want to set this
-     to `nil' if you use a proportional font for the tab faces.  See
-     also `w3m-tab-mouse-position-adjuster'.
-
-`w3m-tab-mouse-position-adjuster'
-     This variable contains the values used to adjust the mouse
-     position on tabs when the mouse pointer tracks the selected tab.
-     The default value is `(0.5 . -4)'.  It consists of the cons of a
-     floating point number M and an integer N that are applied to
-     calculating of the mouse position, which is given in pixel units,
-     as follows:
-
-          (TAB_WIDTH + M) * ORDER + N
-
-     Where TAB_WIDTH is the pixel width of a tab and ORDER is the order
-     number in tabs.  The result is rounded towards zero.
-
-     Note that the calculation will always fail if you use a
-     proportional font for the tab faces.  See also
-     `w3m-tab-track-mouse'.
-
-   ---------- Footnotes ----------
-
-   (1) Although XEmacs shows all tabs in the same colors at every
-moment, you can easily distinguish the selected tab and others and see
-the status of the current page in the modeline.
-
-   (2) Under XEmacs, favicons will currently not be shown in the tabs
-line.
-
-
-File: emacs-w3m.info,  Node: Working with buffers,  Next: Downloading,  Prev: Using Tabs,  Up: Basic Usage
-
-3.6 Creating, killing and moving across buffers
-===============================================
-
-Sooner or later, you will be addicted to emacs-w3m, and you'll have to
-manage all your browsing needs with it.  To help you with this daunting
-task, we have imagined many different ways to work with emacs-w3m
-buffers.
-
-* Menu:
-
-* Creating and killing buffers:: Creating and killing buffers
-* Moving across buffers::        Moving across buffers
-* Selecting buffers::            Selecting buffers from a list
-
-
-File: emacs-w3m.info,  Node: Creating and killing buffers,  Next: Moving across buffers,  Up: Working with buffers
-
-3.6.1 Creating and killing buffers
-----------------------------------
-
-It is sometimes useful to just create a new buffer without opening a web
-page in it.  This operation is called "creating a twin copy" of a
-buffer, in emacs-w3m lingo.  It will simply create a new buffer whose
-contents are identical to the currently active buffer.
-
-   The opposite of this is closing buffers: you can just close one
-buffer (because you're not interested in its contents anymore) or you
-can decide to close all buffers but the current one.  Emacs-w3m lets
-you do this with the following commands:
-
-`C-c C-t'
-`M-n'
-     Create an identical copy of the currently active buffer, under a
-     new name.  This is used to start a new session without loading a
-     web page in the new buffer (`w3m-copy-buffer').
-
-`C-c C-w'
-     Close the current emacs-w3m buffer (`w3m-delete-buffer').
-
-`C-c M-w'
-     Close all emacs-w3m buffers, but the active one
-     (`w3m-delete-other-buffers').
-
-
-File: emacs-w3m.info,  Node: Moving across buffers,  Next: Selecting buffers,  Prev: Creating and killing buffers,  Up: Working with buffers
-
-3.6.2 Moving across buffers
----------------------------
-
-The commands you will probably use most often are those who allow you
-to go to an adjacent buffer; that is a buffer just "after" or "before"
-the current one.  The meaning of this will be obvious if you use tabs:
-the next buffer is the one just after the active one, on the right, and
-the previous buffer is the one on the left.  However, XEmacs displays
-tabs in random order unfortunately, so you need to pay attention to the
-number which is displayed in each tab in order to know what is the
-adjacent buffer if you are using XEmacs.  The key bindings for these
-commands are `C-c C-p' and `C-c C-n'.
-
-   These commands understand the numeric argument convention, i.e. if
-you call them with a number N as argument, you will be taken N buffers
-away from the current one.  For example, to go two buffers on the right
-from the current position, use `2 C-c C-n'(1).
-
-`C-c C-p'
-     Move to the previous emacs-w3m buffer.  This is usually the next
-     buffer to the left in the tabs line.  If called with a numeric
-     argument N, move N buffers to the previous (`w3m-previous-buffer').
-
-`C-c C-n'
-     Move to the next emacs-w3m buffer.  This is usually the next
-     buffer to the right in the tabs line.  If called with a numeric
-     argument N, move N buffers to the next (`w3m-next-buffer').
-
-   If you are a GNU Emacs user, you can also move an emacs-w3m buffer to
-the adjacent place on the tabs line using the following commands:
-
-`C-c C-.'
-`C-c C->'
-     Move the selected emacs-w3m buffer to the right hand adjacent
-     place on the tabs line.  If called with a numeric argument N, move
-     N tabs to the right (`w3m-tab-move-right').
-
-`C-c C-,'
-`C-c C-<'
-     Move the selected emacs-w3m buffer to the left hand adjacent place
-     on the tabs line.  If called with a numeric argument N, move N
-     tabs to the left (`w3m-tab-move-left').
-
-   Also note that if these commands don't fit you well despite our
-efforts, you might find what you need in "generalist" buffer management
-packages such as ibuffer or iswitchb--since emacs-w3m buffers are
-regular Emacs buffers, they will work fine too.
-
-   ---------- Footnotes ----------
-
-   (1) You can use `C-u 2 C-c C-n' instead of `2 C-c C-n' as usual.  But
-keep in mind all numeric keys and minus-sign are assigned to the numeric
-prefix arguments in emacs-w3m buffers.
-
-
-File: emacs-w3m.info,  Node: Selecting buffers,  Prev: Moving across buffers,  Up: Working with buffers
-
-3.6.3 Selecting buffers from a list
------------------------------------
-
-There are two ways to select emacs-w3m buffers from a list.  The first
-one is a minibuffer-based interface, called with `C-c C-a'.  You can
-choose the buffer you want to display using the `M-p' and `M-n' keys
-(or the <up> and <down> arrow keys), they will make you cycle through
-the list.  You can also edit the prompt and type the title of an
-existing web page, using `<TAB>' for completion.  For example, if you
-have a "Google Search" page opened, you can type "Goo" then hit `<TAB>'
-and the page title will be completed.  After the page name, the buffer
-name is given (between brackets).  Then use `<RET>' to switch to the
-buffer you have chosen.
-
-   The second and more sophisticated interface is called the emacs-w3m
-buffer list, it is invoked with `C-c C-s'.  It shows you the list of
-all opened buffers in a separate window (either a vertical or a
-horizontal window--`C-c C-s' toggles between the two modes) and allows
-you to view the buffers in real-time: when you move the point in the
-buffer list, the buffer under point is displayed in the main window,
-which allows you to have direct visual feedback of the buffer you're
-switching to.
-
-   To move in the buffer list, you can use the `p' and `n' keys (or the
-arrow keys).  In the buffer list, `<DEL>' and `<SPC>' allow you to
-scroll the buffer displayed in the main window, which is handy if you
-want to check that you're seeing the right buffer.  To select the
-buffer under point, you can use the `<RET>' key, in which case the
-buffer list will be buried, or the `w' key, in which case the buffer
-list will remain visible and the focus given to the main window.
-
-   You can also close and create buffers from this menu, using the same
-bindings as the one used in regular buffers (*note Creating and killing
-buffers::).
-
-   Finally, the `?' key shows a short help, `g' refreshes the list and
-the `q' key exits the buffer list, not changing the active buffer.
-
-`C-c C-a'
-     Prompt for a buffer name in the minibuffer.  `M-p' and `M-n' cycle
-     through the list of existing buffers and `<TAB>' completes
-     (`w3m-switch-buffer').
-
-`C-c C-s'
-     Show the buffer list in a separate window (`w3m-select-buffer').
-     In this window, `C-c C-s' toggles between horizontal and vertical
-     modes, `<RET>' selects the buffer under point and buries the
-     buffer list, `w' selects the buffer under point and gives it the
-     focus, `n', `p' and the arrow keys can be used to move down or up.
-
-
-File: emacs-w3m.info,  Node: Downloading,  Next: Submitting Forms,  Prev: Working with buffers,  Up: Basic Usage
-
-3.7 Downloading a file
-======================
-
-It is possible to download (i.e. fetch, but not display) any web page or
-file with emacs-w3m: just put the point on the link you want to
-download and hit `d'.  You will be prompted for a filename under which
-to save the file locally, by default it will be the name of the file on
-the remote server.  Confirm with `<RET>'.  The download will be
-asynchronous and not block your Emacs session, you can continue your
-emacs-w3m browsing in another buffer if you want.
-
-   Please note that this download mechanism uses w3m to download things,
-you might want to use the more powerful wget downloader instead.  Have a
-look at our friend project "emacs-wget", its homepage is at
-`http://pop-club.hp.infoseek.co.jp/emacs/emacs-wget/'.
-
-`d' (Lynx-like keymap)
-`D' (Info-like keymap)
-     Download the file or the page pointed to by the link under point
-     (`w3m-download-this-url').
-
-`M-d' (Lynx-like keymap)
-`d' (Info-like keymap)
-     Download the contents of URL to a local file (`w3m-download').  You
-     will be prompted for the URL and the name of a local file.
-
-
-File: emacs-w3m.info,  Node: Submitting Forms,  Next: HTML File Information,  Prev: Downloading,  Up: Basic Usage
-
-3.8 Filling in HTML forms
-=========================
-
-These emacs-w3m commands let you move between forms and fill in fields,
-using simple key bindings and optionally prompting you for values in
-Emacs windows or in the minibuffer.
-
-   The main key binding to remember is `<RET>'.  It has different
-meanings, depending on the thing under point: for textareas, you will be
-prompted for a value in the minibuffer.  For select tags, you will be
-given a list of choices in an electric Emacs window (you can move using
-the arrow keys, and pick one with the `<RET>' key).  For radio and
-checkbox buttons, the `<RET>' key selects one of the elements.
-
-   When in the minibuffer or in the electric window, you can cancel with
-the `C-c C-q' sequence.  To submit the form, use `C-c C-c'.
-
-`]'
-     Jump to the next form (`w3m-next-form').
-
-`['
-     Jump to the previous form (`w3m-previous-form').
-
-`C-c C-c'
-     Submit form at point (`w3m-submit-form').
-
-`<RET>'
-     Edit the value of the form item under point.
-
-`<RET>' (w3m-form-*-keymap)
-     Accept the value.
-
-`C-c C-q' (w3m-form-*-keymap)
-     Quit editing the form item, leaving changes.
-
-   Unless `w3m-form-use-textarea-backup' is set to `nil', emacs-w3m
-stores the text you input in textareas in backup files for later reuse.
-When you start editing a form and there is backup text available, you
-will be asked whether you want to use it or not.  Files to save text
-are stored in the directory specified by the
-`w3m-form-textarea-directory' variable.
-
-
-File: emacs-w3m.info,  Node: HTML File Information,  Prev: Submitting Forms,  Up: Basic Usage
-
-3.9 Support for web page editing and hacking
-============================================
-
-For those who usually use Emacs to write documentation or programs, it's
-very convenient to be able to browse the web in the same Emacs session.
-For example, if you are editing a HTML file in Emacs, you can preview it
-without launching an external browser.  You can also quickly copy sample
-code from technical documentation during a programming marathon...
-
-   How about the opposite?  (That is, being able to edit the source of a
-web page in a web browser.)  Wouldn't that be cool?  Imagine you found
-an error in your document after previewing it in emacs-w3m; you probably
-want to fix it right away.  Or if you are a programmer specialized in
-web technology, sometimes you might want to see the raw HTML file for
-the current web page... especially if you are the author of a Shimbun
-module (*note Shimbun Basics::).
-
-   It is usually possible to switch to an Emacs buffer visiting an HTML
-file by using the buffer name, but emacs-w3m adds a specific keybinding
-for this.  Emacs-w3m knows the URL of the web page it is visiting, so
-why not take advantage of this?
-
-`\'
-     Display the current web page in the raw HTML
-     format(`w3m-view-source').
-
-`='
-     Show the information about currently displayed web page. It
-     includes title, URL, document type, last modified
-     date(`w3m-view-header').
-
-`E' (Lynx-like keymap)
-`e' (Info-like keymap)
-     Edit the local file pointed by URL of current
-     page(`w3m-edit-current-url').
-
-`e' (Lynx-like keymap)
-`E' (Info-like keymap)
-     Edit the local file pointed by URL under
-     point(`w3m-edit-this-url').
-
-`M'
-     Launch an external browser (other than emacs-w3m) and display the
-     same web page as currently displayed in
-     emacs-w3m(`w3m-view-url-with-external-browser').  The external
-     browser to be used is defined by the variable
-     `w3m-content-type-alist', depending on the kind of URL.
-
-`|'
-     Pipe the source of the web page to a command.  You will be
-     prompted for the command (`w3m-pipe-source').
-
-   The (*note Tips::) section gives more examples on how to integrate
-emacs-w3m with other commands and Emacs subsystems.
-
-
-File: emacs-w3m.info,  Node: Pretty Good Features,  Next: Customizable Variables,  Prev: Basic Usage,  Up: Top
-
-4 Pretty good features
-**********************
-
-* Menu:
-
-* Using Search Engines::        Convenient ways to search the web
-* Grouping URLs::               Visiting several web pages in one URL
-* Weather Information::         It will be fine tomorrow
-* Using Antenna::               Raise your antenna
-* Showing Directory Tree::      Showing the tree structure of local directories
-* Viewing Perl Documents::      Viewing Perl Documents
-* Using Namazu::                Searching files with Namazu
-* Octet::                       Viewing data in various octal form
-* Frame Local Buffers::         Grouping sessions into separate frames
-* Session Manager::             Saving and loading sessions
-
-
-File: emacs-w3m.info,  Node: Using Search Engines,  Next: Grouping URLs,  Up: Pretty Good Features
-
-4.1 Convenient ways to search the web
-=====================================
-
-Emacs-w3m comes with advanced features related to search engines, they
-are accessible through three interfaces:
-
-   * The regular search interface, invoked by the `S' key (the `s' key
-     for the `Info-like' keymap) in any emacs-w3m buffer.  It is a
-     simple interactive way to choose which search engine to use and
-     input a search term; see *note The Search Interface::.
-
-   * The Quicksearch interface: it is a faster (yet more complicated)
-     way to use search engines, by going to specially crafted URLs.
-     For more information about this feature, see *note Quick
-     Searching::.
-
-   * The "I'm feeling lucky" feature: if it's enabled
-     (`w3m-enable-google-feeling-lucky'), entering words instead of a
-     regular URL at the URL prompt will begin a Google search for the
-     words automatically, and display the most relevant result.  This
-     is useful if you actually want to fetch the most relevant page, it
-     does not display a list of search results.
-
-* Menu:
-
-* The Search Interface::        How to search with emacs-w3m
-* Quick Searching::             An alternative (and fast) way to search the web
-* Adding New Search Engines::   Using your favorite engines
-
-
-File: emacs-w3m.info,  Node: The Search Interface,  Next: Quick Searching,  Up: Using Search Engines
-
-4.1.1 How to search with emacs-w3m
-----------------------------------
-
-You can fire up the regular search interface by using the `S' key (the
-`s' key for the `Info-like' keymap) in an emacs-w3m buffer.  You will
-see a prompt in the minibuffer, asking for a search term.  Type one or
-several words at the prompt, then hit `<RET>'.  The result page of your
-search in the engine appears, you can then browse the results, just as
-if you had used the normal web based entry point to the engine.
-
-   You probably noticed that you have not been given a chance to choose
-which engine you want to search with.  By default, emacs-w3m will use
-the Google search engine, you can change this behavior by customizing
-the `w3m-search-default-engine' variable (see *note Customizable
-Variables::), or you can specify the search engine each time you use the
-command.
-
-   To specify which engine to use, you have to give the command a prefix
-argument (usually, this means hitting `C-u' before the command, e.g.
-`C-u S' (`C-u s' for the `Info-like' keymap).  Emacs-w3m will prompt
-you for an engine, you can choose one by typing its name (completion is
-also available with the `<TAB>' key).  Once you have made your choice,
-hit the `<RET>' key.  You can then type your search term, hit `<RET>',
-and you will see the search results.
-
-`S' (Lynx-like keymap)
-`s' (Info-like keymap)
-     Begin a new search.  If called with a prefix argument, prompt for
-     the engine to use (`w3m-search').
-
-
-File: emacs-w3m.info,  Node: Quick Searching,  Next: Adding New Search Engines,  Prev: The Search Interface,  Up: Using Search Engines
-
-4.1.2 An alternative (and fast) way to search the web
------------------------------------------------------
-
-If you're a "Web Power User" (and since you're reading this, you
-probably are), you need a quick and efficient way to perform searches.
-The Quick Searching feature is one.
-
-   What does it do?  It lets you launch web searches by simply going to
-a special URL such as `gg:emacs'.  The advantages of this mode of
-operation are:
-
-   * It's fast.  You just have to type a URL to choose the engine and
-     the search word(s), in one go.
-
-   * It's convenient.  With this feature, you can easily open a new
-     emacs-w3m tab or window, and launch a search in it, using for
-     example, the `G' key to open a URL in a new window, and going to a
-     Quicksearch URL.  You can also bookmark searches just by
-     bookmarking the special Quicksearch URL.
-
-   * It works with the grouping feature.  You can launch two searches
-     at the same time, with a URL like `group:gg:emacs&ya:w3m'.  This
-     would for instance launch a search for "emacs" on Google and for
-     "w3m" on Yahoo!.  *Note Grouping URLs::.
-
-   Using it is very simple: suppose you want to search for the word
-"gnu" on Google and get a list of results.  Hit `g' to go to a new URL,
-and type "gg:gnu".  The first part of this expression, "gg" indicates
-that we want to use the Google search engine.  The second term is the
-word we will be searching for.  The prefix and the search term must be
-separated by a colon.  Hit `<RET>', and you will see the results of
-your search.  Note that you can input several words by separating them
-with spaces.  `<SPC>' is a self-inserting key in the minibuffer if the
-"Feeling Lucky" feature is enabled (it is by default; see
-`w3m-enable-google-feeling-lucky').  If it's disabled, then hit `C-q'
-first, i.e. `C-q <SPC>'.
-
-   The default configuration of emacs-w3m includes several prefixes you
-can use, they are defined in the `w3m-uri-replace-alist' variable.
-There's for example "gg" for Google, "ggg" for Google Groups, "ya" for
-Yahoo!, "al" for Altavista, "alc" for Eijirou on the web to name a few.
-You can also add prefixes for the search engines you define, *Note
-Adding New Search Engines::.
-
-   Instead of prefixes, you can also use full engine names in
-Quicksearch URLs, such as "google" or "yahoo".  These names are defined
-in the `w3m-search-engine-alist' variable.
-
-
-File: emacs-w3m.info,  Node: Adding New Search Engines,  Prev: Quick Searching,  Up: Using Search Engines
-
-4.1.3 Using your favorite engines
----------------------------------
-
-Emacs-w3m has a number of built-in search engines you can use.  What if
-you want to use your favorite search engine and it's not listed in the
-known search engines?  You have to add it to the list of search
-engines, and it's quite easy:
-
-  1. First, you have to find what's the entry point of the search
-     engine you want to add, for example:
-
-     `http://my.searchengine.com/?query=foobar'
-
-     where foobar is the term you want to search for.
-
-  2. Once you have this information, add this to your `~/.emacs-w3m'
-     file:
-
-          (eval-after-load "w3m-search"
-            '(add-to-list 'w3m-search-engine-alist
-                          '("My engine"
-                            "http://my.searchengine.com/?query=%s"
-                            nil)))
-
-     Replace the first field "My engine" with the description of your
-     engine, the second field with the entry point (the `%s' is
-     important, it will be replaced by the search term when you issue
-     the search), and the third field is the encoding to use, `nil' or
-     omitting this field means to use the value of
-     `w3m-default-coding-system' as a regular encoding.
-
-     For English search engines, you rarely have to worry about this.
-     However, for some Japanese search engines, you may need to specify
-     something (e.g. `euc-japan') there.
-
-  3. You can now use this engine to search, using the normal `S' key
-     (the `s' key for the `Info-like' keymap) in emacs-w3m.  If you use
-     this engine often, you can also add it to the Quicksearch (see
-     *note Quick Searching::) engines and give it a small prefix, by
-     adding this to your `~/.emacs-w3m' file instead:
-
-          (eval-after-load "w3m-search"
-            '(progn
-               (add-to-list 'w3m-search-engine-alist
-                            '("My engine"
-                              "http://my.searchengine.com/?query=%s"
-                              nil))
-               (add-to-list 'w3m-uri-replace-alist
-                            '("\\`my:" w3m-search-uri-replace "My engine"))))
-
-     This way you can also use a URL like `my:foobar' to search for the
-     term "foobar" with your engine.
-
-
-File: emacs-w3m.info,  Node: Grouping URLs,  Next: Weather Information,  Prev: Using Search Engines,  Up: Pretty Good Features
-
-4.2 Visiting several web pages in one URL
-=========================================
-
-Emacs-w3m can manipulate "group URLs": special URLs that contain
-several real URLs.  When you open these group URLs, emacs-w3m will open
-one buffer for each URL in the group, allowing you to open several pages
-in one go.
-
-   To build group URLs, you just have to put together (i.e. concatenate)
-all the addresses you want to open, separating them with the ampersand
-symbol (that's "&"), and prefixing the grouped URLs with "group:".  For
-example, suppose you want to visit the GNU Project's homepage,
-`http://www.gnu.org/', and the Savannah homepage,
-`http://savannah.nongnu.org/': the group URL would be
-
-   `group:http://www.gnu.org/&http://savannah.nongnu.org/'
-
-   Since this syntax can be quite hard to use on a daily basis, this
-feature will be most useful when used with very short URLs (Quicksearch
-URLs for example, see *note Quick Searching::); or in non-interactive
-contexts.
-
-
-File: emacs-w3m.info,  Node: Weather Information,  Next: Using Antenna,  Prev: Grouping URLs,  Up: Pretty Good Features
-
-4.3 It will be fine tomorrow
-============================
-
-
-File: emacs-w3m.info,  Node: Using Antenna,  Next: Showing Directory Tree,  Prev: Weather Information,  Up: Pretty Good Features
-
-4.4 Raise your antenna
-======================
-
-Antenna is a tool to keep track of changes in web pages.  Using Antenna,
-you can periodically check if particular pages have been updated, and if
-they haven't, know the last time you saw them.
-
-   You can start Antenna using the `A' key in any emacs-w3m buffer.
-Alternatively, you can go to the special URL `about://antenna/'; it
-does the same thing.
-
-* Menu:
-
-* Setting up Antenna::          How to add your web sites to Antenna
-* Daily web tracking::          Tracking changes with Antenna
-
-
-File: emacs-w3m.info,  Node: Setting up Antenna,  Next: Daily web tracking,  Up: Using Antenna
-
-4.4.1 How to add your web sites to Antenna
-------------------------------------------
-
-If you want to add the visiting web site to Antenna, type the `+' key.
-You will be taken to the customization buffer of `w3m-antenna-sites',
-with all fields already set up for you.  You just have to hit the
-buttons "Save for future sessions" and "Finish".
-
-`+'
-     Add a URL to the Antenna database.  If called with a prefix
-     argument, ask for a URL instead of adding the current page
-     (`w3m-antenna-add-current-url').
-
-
-File: emacs-w3m.info,  Node: Daily web tracking,  Prev: Setting up Antenna,  Up: Using Antenna
-
-4.4.2 Tracking changes with Antenna
------------------------------------
-
-On the Antenna page, you will see two sections: one called "Updated"
-and another called "Visited".  In the "Updated" section, you will find
-websites which have changed since the last Antenna update, and in the
-"Visited" section, the websites which haven't.  In each section, each
-line stands for one website of the Antenna database, and has the
-following structure:
-
-   `  * 2002/12/15 16:43  (T)  My website'
-
-   The first part is the last time the website was updated, or if this
-information is not available, the last time Antenna noticed a change in
-this page.
-
-   The `(T)' stands for "Time", it means that the change was detected
-because the last modification time of that page has changed since the
-last Antenna update.  Another possible value here is `S' (for "Size"),
-which means that the change has been detected because the size of the
-page has changed.
-
-   The last part of this line is the title you gave to this website when
-you added it to the database.
-
-   Please note that the Antenna database doesn't get automatically
-updated, you have to update it each time you want to check if the sites
-have changed, either by hitting `R' in the Antenna page, or by passing a
-prefix argument to the command (start Antenna with `C-u A', for
-example).
-
-   If you want to make the Antenna database get updated automatically,
-set the value of the `w3m-antenna-refresh-interval' variable to a
-positive integer which is an interval time in seconds.
-
-`A'
-     Visit the Antenna page.  If called with a prefix argument, update
-     the Antenna database before displaying it (`w3m-antenna').
-
-
-File: emacs-w3m.info,  Node: Showing Directory Tree,  Next: Viewing Perl Documents,  Prev: Using Antenna,  Up: Pretty Good Features
-
-4.5 Showing the tree structure of local directories
-===================================================
-
-Using the `w3m-dtree' command, you can display a tree of all
-subdirectories of a local directory, and browse it like a regular web
-page.  The emacs-w3m buffer you get when you use this feature is very
-similar to the output of the external "tree" utility, hence the name.
-Emacs-w3m adds a bonus: if you call the command with a prefix argument,
-it will display files as well, turning emacs-w3m into a full-featured
-file browser.
-
-   Here is an example of what an emacs-w3m dtree run looks like:
-
-     /home/romain/.elisp/emacs-w3m/
-      |-CVS/
-      |-attic/
-      |  +-CVS/
-      |-autom4te.cache/
-      |-doc/
-      |  |-CVS/
-      |  +-emacs-w3m/
-      |-icons/
-      |  +-CVS/
-      |-patches/
-      |  +-CVS/
-      +-shimbun/
-         +-CVS/
-
-   And with a prefix argument, you get something like this instead:
-
-     /home/romain/.elisp/emacs-w3m/ (allfiles)
-      |-(f).cvsignore
-      |-(f)BUGS.ja
-      |-(f)COPYING
-      |-[d]CVS/
-      |  |-(f)Entries
-      |  |-(f)Repository
-      |  +-(f)Root
-      |-(f)ChangeLog
-      |-(f)ChangeLog.1
-      |-(f)Makefile
-      |-(f)Makefile.in
-      |-(f)README
-      |-(f)README.ja
-
-`D' (Lynx-like keymap)
-`T' (Info-like keymap)
-     Prompt for a local directory in the minibuffer, then display its
-     tree structure.  If called with a prefix argument (e.g. `C-u D', or
-     `C-u T' for the `Info-like' keymap), show files in the directories
-     as well (`w3m-dtree').
-
-
-File: emacs-w3m.info,  Node: Viewing Perl Documents,  Next: Using Namazu,  Prev: Showing Directory Tree,  Up: Pretty Good Features
-
-4.6 Viewing perl documents
-==========================
-
-
-File: emacs-w3m.info,  Node: Using Namazu,  Next: Octet,  Prev: Viewing Perl Documents,  Up: Pretty Good Features
-
-4.7 Searching files with Namazu
-===============================
-
-(under translation)
-
-
-File: emacs-w3m.info,  Node: Octet,  Next: Frame Local Buffers,  Prev: Using Namazu,  Up: Pretty Good Features
-
-4.8 Viewing data in various octal form
-======================================
-
-(under construction)
-
-   These following lines in your `~/.emacs' may help you to browse
-octet data files which are opened with `octet-find-file'.
-
-     (add-hook 'octet-find-file-hook 'view-mode)
-     (add-hook 'octet-find-file-hook 'w3m-minor-mode)
-
-
-File: emacs-w3m.info,  Node: Frame Local Buffers,  Next: Session Manager,  Prev: Octet,  Up: Pretty Good Features
-
-4.9 Grouping sessions into separate frames
-==========================================
-
-It is possible to manage groups of emacs-w3m sessions in separate
-frames.  One use for this would be to have two emacs-w3m frames, where
-one contains sessions visiting search engines, and the other sessions
-visiting news sites.
-
-   Emacs-w3m offers some convenient features that allow you to visit
-many web pages at the same time.  For instance, you can use tabs (*note
-Using Tabs::) to visit many pages in new sessions, or do so using a
-special URL beginning with `group:' (*note Grouping URLs::).  However,
-you may want to group them into separate frames if there are too many
-pages.  If so, the `w3m-fb-mode' command is for you.  Note that you
-have to set the `w3m-use-tab' variable to non-`nil' (`t' by default)
-and set the `w3m-pop-up-frames' variable to `nil' (the default) in
-order to use it (*note General Variables::).
-
-   Typing `M-x w3m-fb-mode' toggles the mode, but you can turn the mode
-on by giving a positive integer as a prefix argument to the command
-(zero or less turns it off).
-
-   When the `w3m-fb-mode' is turned on, the sessions that you start in
-the current frame will be associated with only that frame.  Other
-sessions that are opened in other frames will similarly only appear in
-those frames.  In other words, sessions associated with one frame don't
-appear in other frames.  `w3m-fb-mode' doesn't create any new frames,
-so you need to make them yourself in some way.
-
-
-File: emacs-w3m.info,  Node: Session Manager,  Prev: Frame Local Buffers,  Up: Pretty Good Features
-
-4.10 Saving and loading sessions
-================================
-
-It is possible to save and load the emacs-w3m sessions sets.
-
-   You can save the set of the currently opened sessions for the future
-use.  Just hit `M-S' and name the set.
-
-   Then you will ask how to take the saved sessions set back, won't you?
-Hit `M-s' to open the sessions selection menu.  The available command
-keys include:
-
-`<RET>'
-     Open all the sessions of the selected sessions set.
-
-`M-s'
-     Open the detail menu for the selected sessions set.  You can open
-     the sessions one by one in that menu.
-
-`d'
-     Delete the selected sessions set or the session.
-
-`r'
-     Rename the selected sessions set.
-
-`s'
-     Save all the opened sessions.  So does `M-S'.
-
-`n'
-     Move the cursor to the next sessions set.
-
-`p'
-     Move the cursor to the previous sessions set.
-
-`q'
-     Quit the sessions selection menu.
-
-   Emacs-w3m saves some sessions automatically.  If
-`w3m-session-deleted-save' is non-`nil', emacs-w3m saves the closed
-sessions automatically.  This would be helpful for recovering a session
-that has been closed inadvertently.  If `w3m-session-automatic-save' is
-non-`nil', emacs-w3m saves the opened sessions automatically when
-quitting emacs-w3m.
-
-   Sometimes you might forget the URLs of the pages you viewed with the
-interest.  Of course emacs-w3m helps you even in such a case.  If
-`w3m-session-load-last-sessions' is non-`nil', emacs-w3m automatically
-opens the sessions set viewed last.  If it is `ask', you will be asked
-whether to take the set back (default `nil').
-
-   You may have had a bad experience with a crash. It makes you
-disappointing, and makes displayed web pages lost. Emacs-w3m helps you
-also in such a case. If `w3m-session-crash-recovery' is non-`nil',
-emacs-w3m saves displayed sessions set to use for crash recovering
-automatically and recovers saved sessions when emacs-w3m (or emacs,
-etc) crashes (default `t'). If `w3m-session-load-crashed-sessions' is
-non-`nil', emacs-w3m automatically recovers the crashed sessions set.
-If it is `ask', you will be asked whether to recover the set (default
-`ask').
-
-
-File: emacs-w3m.info,  Node: Customizable Variables,  Next: Hooking into MUAs,  Prev: Pretty Good Features,  Up: Top
-
-5 Customizable variables
-************************
-
-A lot of emacs-w3m variables are customizable via the Custom mechanism,
-a graphical Emacs interface to define user options.  Custom offers
-several methods to define your customizations, you can use for example
-`M-x customize-option' for a single option (i.e. an Emacs Lisp
-variable) or `M-x customize-group' to see all available options
-(including variables and faces) for a "group" and change them; in which
-case the group to use is `w3m'.
-
-   Alternatively (if you don't want to use Custom), you can put
-arbitrary Emacs Lisp expressions in your emacs-w3m initialization file,
-which is `~/.emacs-w3m' by default.  This example:
-
-     (setq w3m-home-page "http://emacs-w3m.namazu.org/")
-
-would set the default homepage to `http://emacs-w3m.namazu.org/'.  The
-syntax to use is the same as in your `~/.emacs' file.  *Note Init File:
-(emacs)Init File.
-
-   Please note that some variables from external modules could be
-undefined at the time the `~/.emacs-w3m' file is loaded, thus making
-them impossible to modify (of course if you don't care about the default
-value, you can override them completely in your `~/.emacs-w3m') file.
-The `w3m-search-engine-alist' variable is a typical example (*note
-Search Variables::).
-
-`w3m-init-file'
-     When emacs-w3m starts, it will read the `w3m-init-file' file.  The
-     default value is `~/.emacs-w3m'.  You probably don't need to change
-     this.  This is a normal Emacs Lisp file and can be used to avoid
-     cluttering your `~/.emacs' and `site-init' files with emacs-w3m
-     stuff.  Emacs-w3m will also check for files with the same names as
-     this, but with `.elc' and `.el' extensions (in other words,
-     `~/.emacs-w3m.elc', `~/.emacs-w3m.el' and `~/.emacs-w3m', in this
-     order).
-
-* Menu:
-
-* General Variables::           General variables
-* Image Variables::             Variables related to images
-* Form Variables::              Variables related to forms
-* Cookie Variables::            Variables related to cookies
-* Bookmark Variables::          Variables related to bookmarks
-* Search Variables::            Variables related to searching the web
-* Weather Variables::           Variables related to weather information
-* Dtree Variables::             Variables related to the dtree feature
-* Antenna Variables::           Variables related to antenna
-* Perldoc Variables::           Variables related to perldoc
-* Namazu Variables::            Variables related to namazu
-* Octet Variables::             Variables related to the octet feature
-* Session Manager Variables::   Variables related to session manager
-* Hooks::                       Hooks
-* Other Variables::             Other variables
-
-
-File: emacs-w3m.info,  Node: General Variables,  Next: Image Variables,  Up: Customizable Variables
-
-5.1 General variables
-=====================
-
-`w3m-accept-languages'
-     List of acceptable languages in descending order of priority.  The
-     default value is set according to the `accept_language' entry of
-     the `w3m' configuration file (normally `~/.w3m/config').
-
-`w3m-add-referer'
-     Rule of sending referers.  There are five choices as the valid
-     values of this option.
-
-       1. `nil': this means that emacs-w3m never send referers.
-
-       2. `t': this means that emacs-w3m always send referers.
-
-       3. `lambda': this means that emacs-w3m send referers only when
-          both the current page and the target page are provided by the
-          same server.
-
-       4. a cons cell keeping two regular expressions: this means that
-          emacs-w3m send referers when the url of the current page
-          matches the first regular expression and does not match the
-          second regular expression.  `Nil' for the regexp matches any
-          url.
-
-       5. a function: emacs-w3m send referers when this function which
-          has two arguments, URL and REFERER, returns non-`nil'.
-
-     If you're nervous about leaking private WEB browsing history
-     information, set this option to `nil' or `lambda'.  If your
-     computer belongs to a secret network, you may set a pair of
-     regular expressions to inhibit sending referers which will
-     disclose your private information, as follows:
-
-          (setq w3m-add-referer
-                '("\\`http:\"
-                  . "\\`http://\\([^./]+\\.\\)*example\\.net/"))
-
-`w3m-add-user-agent'
-     Non-`nil' means add the User-Agent field to the request header.
-     The value of `w3m-user-agent' is used for the field body.
-
-`w3m-arrived-file'
-     Name of the file to keep the arrived URLs database.
-
-`w3m-auto-show'
-     Non-`nil' means provide the ability to horizontally scroll the
-     window.  Automatic horizontal scrolling happens when the point
-     gets away from both ends of the window, but nothing occurs if
-     `truncate-lines' is set to `nil'.
-
-     This feature works with specific emacs-w3m code; usual
-     `auto-hscroll-mode', `automatic-hscrolling', `auto-show-mode' or
-     `hscroll-mode' will all be invalidated in emacs-w3m buffers.
-
-`w3m-charset-coding-system-alist'
-     Alist of MIME charsets and coding systems.  Both charsets and
-     coding systems must be symbols.
-
-`w3m-coding-system'
-     Default coding system used to communicate with the `w3m' command.
-
-`w3m-coding-system-priority-list'
-     Coding systems in order of priority used for emacs-w3m sessions.
-
-`w3m-command'
-     Name of the executable file of the `w3m' command.  You normally
-     don't have to specify the value, since emacs-w3m looks for the
-     existing commands `w3m', `w3mmee' and `w3m-m17n' (in this order)
-     in the `exec-path' directories in order if it is `nil' in the
-     beginning.
-
-     If you want to use the other `w3m' command, specify the value of
-     this variable explicitly in the .emacs file or customize the value
-     and save it.  In this case, you need to restart Emacs and
-     emacs-w3m: there is currently no way to apply the changing of the
-     `w3m' command to all the emacs-w3m programs safely after loading
-     the `w3m.elc' module.
-
-`w3m-command-arguments'
-     List of the default arguments passed to the `w3m' command.  See
-     also `w3m-command-arguments-alist'.
-
-`w3m-command-arguments-alist'
-     Alist of regexps matching urls and additional arguments passed to
-     `w3m'.  A typical usage of this variable is to specify whether to
-     use a proxy server for particular hosts.  The first match made
-     will be used.  Here is an example of how to set this variable:
-
-          (setq w3m-command-arguments-alist
-                '(;; Don't use the proxy server to visit local web pages.
-                  ("^http://\\([^/]*\\.\\)*your-company\\.com\\(/\\|$\\)"
-                   "-no-proxy")
-                  ;; Use the proxy server to visit any foreign urls.
-                  (""
-                   "-o" "http_proxy=http://proxy.your-company.com:8080/")))
-
-     Here the first element matches any url where the scheme is `http'
-     and the hostname is either `your-company.com' or a name ending with
-     `.your-company.com'; the proxy server is not used for those hosts.
-     If you are a regexp novice, you can use the `w3m-no-proxy-domains'
-     variable instead.
-
-`w3m-command-environment'
-     Alist of environment variables for subprocesses to inherit.
-
-`w3m-confirm-leaving-secure-page'
-     If non-`nil', you'll be asked for confirmation when leaving secure
-     pages.  It is STRONGLY recommended to set a non-nil value to this
-     option.  You MUST understand what you want to do completely before
-     switching off this option.  The default value is `t'.
-
-`w3m-content-type-alist'
-     Alist of content types, regexps, commands to view, and filters.
-     Each element is a list which consists of the following data:
-
-       1. Content type.
-
-       2. Regexp matching a url or a file name.
-
-       3. Method to view contents.  The following three types may be
-          used:
-
-            a. Lisp function which takes the url to view as an argument.
-
-            b. ("COMMAND" [ARG...]) - where "COMMAND" is the external
-               command and ARG's are the arguments passed to the command
-               if any.  The symbols `file' and `url' that appear in
-               ARG's will be replaced respectively with the name of a
-               temporary file which contains the contents and the
-               string of the url to view.
-
-            c. `nil' which means to download the url into the local
-               file.
-
-       4. Content type that overrides the one specified by `1. Content
-          type'.  Valid values include:
-
-            a. Lisp function that takes three arguments URL,
-               CONTENT-TYPE, and CHARSET, and returns a content type.
-
-            b. String that specifies a content type.
-
-            c. `nil' that means not to override the content type.
-
-`w3m-correct-charset-alist'
-     Alist of MIME charsets; strange ones and standard ones.
-
-`w3m-db-history-display-size'
-     Maximum number of arrived URLs which are displayed per page.
-
-`w3m-decoder-alist'
-     Alist of encoding types, decoder commands, and arguments.
-
-`w3m-default-coding-system'
-     Default coding system used to encode url strings and post-data.
-
-`w3m-default-content-type'
-     Default value assumed as the content type of local files.
-
-`w3m-default-directory'
-     Directory used as the current directory in emacs-w3m buffers.  The
-     valid values include a string specifying an existing directory, a
-     symbol of which the value specifies an existing directory, a
-     function which takes a url as an argument and returns a directory,
-     and `nil' (which is the default).  If the specified directory does
-     not exist or it is `nil', the value of `w3m-profile-directory' is
-     used.
-
-     Note that there is an exception: if a page visits a local file or
-     visits a remote file using ftp, the directory in which the file
-     exists is used as the current directory instead.
-
-`w3m-default-save-directory'
-     Default directory where downloaded files will be saved to.
-
-`w3m-delete-duplicated-empty-lines'
-     Non-`nil' means display two or more continuous empty lines into
-     single.
-
-`w3m-dirlist-cgi-program'
-     Name of the CGI program to list a local directory.  If it is
-     `nil', the dirlist.cgi module of the `w3m' command will be used.
-
-`w3m-doc-view-content-types'
-     List of content types for which to use `doc-view-mode' to view
-     contents.  This overrides `w3m-content-type-alist'.
-
-`w3m-edit-function'
-     Function used for editing local files.  It is used when the
-     `w3m-edit-current-url' command or the `w3m-edit-this-url' command
-     is invoked.
-
-`w3m-edit-function-alist'
-     Alist of functions used for editing pages.  This option is
-     referred to decide which function should be used to edit a
-     specified page, when either `w3m-edit-current-url' or
-     `w3m-edit-this-url' is invoked.  When no suitable function is
-     found from this alist, `w3m-edit-function' is used.
-
-`w3m-enable-google-feeling-lucky'
-     Non-`nil' enables you to enter any words as well as a url when
-     prompted.  In that case, emacs-w3m uses Google to search for the
-     words.  The default value is `t'.
-
-`w3m-encoding-type-alist'
-     Alist of file suffixes and content encoding types.
-
-`w3m-file-coding-system'
-     Coding system used when writing configuration files.  This value
-     will be referred to by the `w3m-save-list' function.
-
-`w3m-file-name-coding-system'
-     Coding system used to convert pathnames when emacs-w3m accesses
-     files.
-
-`w3m-fill-column'
-     Integer used as the value for `fill-column' in emacs-w3m buffers.
-     If it is positive, pages will be displayed within the columns of
-     that number.  If it is zero or negative, the number of columns
-     which subtracted that number from the window width is applied to
-     the maximum width of pages.  Note that XEmacs does not always obey
-     this setting.
-
-`w3m-follow-redirection'
-     Maximum number of redirections which emacs-w3m honors and follows.
-     If `nil', redirections are followed by the `w3m' command.  Don't
-     set it to `nil' if you allow to use cookies (i.e., you have set
-     `w3m-use-cookies' to non-`nil') since cookies may be shared among
-     many redirected pages.
-
-`w3m-home-page'
-     This variable specifies the url string to open when emacs-w3m
-     starts.  Don't say HP, it's the abbreviated name of a certain
-     company. ;-)
-
-`w3m-horizontal-scroll-columns'
-     Number of steps in columns used when scrolling a window
-     horizontally.
-
-`w3m-horizontal-scroll-division'
-     Integer used by the program making the point certainly visible.
-     The cursor definitely does not go missing even when it has been
-     driven out of the window while wandering around anchors and forms
-     in an emacs-w3m buffer.
-
-     Suppose that the value of this variable is N.  When the point is
-     outside the left of the window, emacs-w3m scrolls the window so
-     that the point may be displayed on the position within 1/N of the
-     width of the window from the left.  Similarly, when the point is
-     outside the right of the window, emacs-w3m scrolls the window so
-     that the point may be displayed on the position of 1/N of the
-     width of the window from the right.
-
-     This feature doesn't work if `w3m-auto-show' is `nil'.  The value
-     must be a larger integer than 1.
-
-`w3m-horizontal-shift-columns'
-     Number of steps in columns used when shifting a window
-     horizontally.  The term `shifting' means a fine level scrolling.
-
-`w3m-imitate-widget-button'
-     If non-`nil', imitate the widget buttons on link (anchor) buttons.
-     It is useful for moving about in a Gnus article buffer using
-     `<TAB>' key.  It can also be any Lisp form that should return a
-     boolean value.
-
-`w3m-init-file'
-     Your emacs-w3m startup file name.  If a file with the `.el' or
-     `.elc' suffixes exists, it will be read instead.
-
-     Note: This file is used as the startup configuration _NOT_ for the
-     `w3m' command but for emacs-w3m.  In order to modify configurations
-     for the `w3m' command, edit the file named `~/.w3m/config'
-     normally.
-
-`w3m-input-coding-system'
-     Coding system used when writing to `w3m' processes.  It overrides
-     `coding-system-for-write' if it is not `binary'.  Otherwise, the
-     value of the `w3m-current-coding-system' variable is used instead.
-
-`w3m-keep-arrived-urls'
-     Maximum number of URLs which the arrived URLs database keeps.
-
-`w3m-keep-cache-size'
-     Maximum number of pages to be cached in emacs-w3m.
-
-`w3m-key-binding'
-     Type of key binding set used in emacs-w3m sessions.  The valid
-     values include `info' which provides `Info-like' keys, and `nil'
-     which provides `Lynx-like' keys.
-
-`w3m-language'
-     Your preferred language used in emacs-w3m sessions.
-
-`w3m-local-directory-view-method'
-     Symbol of the method to view a local directory tree.  The valid
-     values include `w3m-cgi' using the CGI program specified by the
-     `w3m-dirlist-cgi-program' variable (which see), and `w3m-dtree'
-     using the w3m-dtree Lisp module.
-
-`w3m-local-find-file-function'
-     Function used to open local files.  If a url of the `file:' scheme
-     in which you entered agrees with the rule of the
-     `w3m-local-find-file-regexps' variable (which see), it is used to
-     open the file.
-
-     Function should take one argument, the string naming the local
-     file.  It can also be any Lisp form returning a function.  Set
-     this to `nil' if you want to always use emacs-w3m to see local
-     files.
-
-`w3m-local-find-file-regexps'
-     `Cons' of two regexps matching and not matching with local file
-     names.  If a url of the `file:' scheme in which you entered matches
-     the first form and does not match the latter form, it will be
-     opened by the function specified by the
-     `w3m-local-find-file-function' variable.  `Nil' for the regexp
-     matches any file names.
-
-     For instance, the value `(nil . "\\.html?\\'")' allows
-     `file:///some/where/w3m.el', not `file:///any/where/index.html',
-     to open by the function specified by
-     `w3m-local-find-file-function'.  The latter will be opened as a
-     normal web page.  Furthermore, if you would like to view some
-     types of contents in the local system using the viewers specified
-     by the `w3m-content-type-alist' variable, you can add regexps
-     matching those file names to the second element of this variable.
-     For example:
-
-          (setq w3m-local-find-file-regexps
-                '(nil . "\\.\\(?:[sx]?html?\\|dvi\\|ps\\|pdf\\)\\'"))
-
-     It is effective only when the `w3m-local-find-file-function'
-     variable is set properly.
-
-`w3m-mailto-url-function'
-     Function used to handle the `mailto' urls.  Function is called with
-     one argument, just a url.  If it is `nil', a function specified by
-     the `mail-user-agent' variable will be used for composing mail
-     messages.
-
-`w3m-mailto-url-popup-function-alist'
-     Alist of `(MAJOR-MODE . FUNCTION)' pairs used to pop a mail buffer
-     up.  If a user clicks on a `mailto' url and a mail buffer is
-     composed by `mail-user-agent' with the `MAJOR-MODE', `FUNCTION'
-     will be called with a mail buffer as an argument.  Note that the
-     variables `special-display-buffer-names',
-     `special-display-regexps', `same-window-buffer-names' and
-     `same-window-regexps' will be bound to `nil' while popping to a
-     buffer up.
-
-`w3m-make-new-session'
-     Non-`nil' means making new emacs-w3m buffers when visiting new
-     pages.  If it is non-`nil' and there are already emacs-w3m buffers,
-     the `w3m' command makes a new emacs-w3m buffer if a user specifies
-     a url string in the minibuffer, and the `w3m-safe-view-this-url'
-     command also makes a new buffer if a user invokes it in a buffer
-     not being running the `w3m-mode'.  The default value is `nil'.
-
-`w3m-mbconv-command'
-     Name of the `mbconv' command provided by the `libmoe' package.
-     The `libmoe' package is used when you use the `w3mmee' command
-     instead of the `w3m' command.  See also `w3m-command'.
-
-`w3m-no-proxy-domains'
-     List of domain names for which emacs-w3m will not use a proxy
-     server.  Each element should be exactly a domain name which means
-     the latter common part of the host names, not a regexp.
-
-`w3m-output-coding-system'
-     Coding system used when reading from `w3m' processes.
-
-`w3m-pop-up-frames'
-     Non-`nil' means pop to a new frame up for an emacs-w3m session.
-     This variable is similar to `pop-up-frames' and does override
-     `w3m-pop-up-windows'.  If `w3m-use-tab' is non-`nil' or there is
-     the buffers selection window (for the `w3m-select-buffer'
-     feature), this variable is ignored when creating the second or more
-     emacs-w3m session.
-
-`w3m-pop-up-windows'
-     Non-`nil' means split the windows when a new emacs-w3m session is
-     created.  This variable is similar to `pop-up-windows' and quite
-     overridden by `w3m-pop-up-frames' as if `pop-up-frames'
-     influences.  Furthermore, if `w3m-use-tab' is non-`nil' or there
-     is the buffers selection window (for the `w3m-select-buffer'
-     feature), this variable is ignored when creating the second or more
-     emacs-w3m session.
-
-`w3m-popup-frame-parameters'
-     Alist of frame parameters used when creating a new emacs-w3m
-     frame.  It allows not only the alist form but also XEmacs' plist
-     form.
-
-`w3m-prefer-cache'
-     Non-`nil' means that cached contents are used without checking
-     headers.
-
-`w3m-profile-directory'
-     Directory where emacs-w3m config files are loaded from or saved to.
-
-`w3m-quick-start'
-     Non-`nil' means let emacs-w3m start quickly w/o requiring
-     confirmation.  When you invoke the `w3m' command, it attempts to
-     visit the page of a string like url around the cursor or the value
-     of `w3m-home-page'.  You won't be asked for the confirmation then
-     if this value is non-`nil'.  Otherwise, you will be prompted for
-     that url with the editing form.
-
-`w3m-redirect-with-get'
-     If non-`nil', use the GET method after redirection.  It controls
-     how emacs-w3m works when a server responds the code 301 or 302.
-     Here is an extract from RFC2616:
-
-     Note: RFC 1945 and RFC 2068 specify that the client is not allowed
-     to change the method on the redirected request.  However, most
-     existing user agent implementations treat 302 as if it were a 303
-     response, performing a GET on the Location field-value regardless
-     of the original request method.
-
-`w3m-relationship-estimate-rules'
-     Rules to estimate relationships between a retrieved page and
-     others.
-
-`w3m-select-buffer-horizontal-window'
-     Non-`nil' means split windows horizontally to open the selection
-     window.
-
-`w3m-select-buffer-window-ratio'
-     The percentage of the selection window to the whole frame.  The
-     car is used when splitting windows horizontally and the cdr is for
-     splitting windows vertically.
-
-`w3m-show-decoded-url'
-     Non-`nil' means show decoded URIs in the echo area, the balloon,
-     etc.  This variable can take one of the following five kinds of
-     forms:
-
-       1. t
-
-          Decode URIs using the encoding guessed from the value of
-          `w3m-coding-system-priority-list'.
-
-       2. Coding system
-
-          Decode URIs using this value.
-
-       3. List of coding systems
-
-          Decode URIs using the encoding assumed based on this list.
-
-       4. Alist of predicates and forms described below:
-
-          Each element looks like the `(PREDICATE . ENCODING)' form.
-          `PREDICATE' should be a regexp, a function or a Lisp form, and
-          `ENCODING' should be one of the forms described here
-          excluding this form.  If `PREDICATE' is a regexp, it will be
-          tested whether it matches to the target url.  If it is a
-          function, it will be called with the target url.  If it is a
-          Lisp form, it will be simply evaluated.  Elements are tested
-          in turn until the result of the test of the predicate is true
-          and the encoding which is associated to the predicate is used
-          for decoding URIs.
-
-       5. nil
-
-          Don't decode URIs.
-
-`w3m-use-title-buffer-name'
-     Non-`nil' means use name of buffer included current title.
-
-`w3m-show-error-information'
-     Non-`nil' means show an error information as a web page.  Page is
-     made when the foreign server doesn't respond to a request to
-     retrieve data.
-
-`w3m-space-before-favicon'
-     String of space char(s) to be put in front of favicon in the
-     mode-line.  It may be better to use two or more spaces if you are
-     using oblique or italic font in the modeline.
-
-`w3m-space-before-modeline-icon'
-     String of space character(s) to be put in front of the modeline
-     icon.  It may be better to use one or more spaces if you are using
-     oblique or italic font in the modeline.
-
-`w3m-terminal-coding-system'
-     Default coding system used when writing to `w3m' processes.  It is
-     just a default value to set process' coding system initially.
-     (This variable name is analogically derived from the behavior of
-     the `w3m' command which accepts data from Emacs just like reads
-     from the terminal.)
-
-`w3m-touch-command'
-     Name of the executable file of the touch command.  Note that the
-     command is required to be able to modify file's timestamp with the
-     `-t' option.
-
-`w3m-track-mouse'
-     Whether to track the mouse and message the url under the mouse.
-     See also `show-help-function' if you are using GNU Emacs.
-
-     A tip for XEmacs users:
-
-     You can also use the `balloon-help' feature by the
-     `M-x balloon-help-mode' command with arg 1.  If the window manager
-     decorates the balloon-help frame, and that is not to your taste,
-     you may strip it off with the following directives:
-
-          For ol[v]wm use this in .Xdefaults:
-             olvwm.NoDecor: balloon-help
-               or
-             olwm.MinimalDecor: balloon-help
-
-          For fvwm version 1 use this in your .fvwmrc:
-             NoTitle balloon-help
-          or
-             Style "balloon-help" NoTitle, NoHandles, BorderWidth 0
-
-          For twm use this in your .twmrc:
-             NoTitle { "balloon-help" }
-
-     See the `balloon-help.el' file for more information.
-
-`w3m-uri-replace-alist'
-     Alist of regexps matching URIs, and some types of replacements.
-     It can be used universally to replace URI strings in the local
-     rule to the valid forms in the Internet.
-
-     Each element looks like the `(REGEXP FUNCTION OPTIONS...)' form.
-     `FUNCTION' takes one or more arguments, a uri and `OPTIONS'.  You
-     can use the grouping constructs `\\(...\\)' in `REGEXP', and they
-     can be referred by the `\N' forms in a replacement (which is one
-     of `OPTIONS').
-
-     Here are some predefined functions which can be used for those
-     ways:
-
-    `w3m-pattern-uri-replace'
-          Replace a URI using PATTERN (which is just an `OPTION').  It
-          is allowed that PATTERN contains the `\N' forms in the same
-          manner of `replace-match'.
-
-    `w3m-search-uri-replace'
-          Generate valid URLs to query words on some specified search
-          engines.  For example, the element
-
-               ("\\`gg:" w3m-search-uri-replace "google")
-
-          makes it possible to replace the URI `gg:emacs' to a query
-          for the word `emacs' on the Google search engine.
-
-`w3m-url-local-directory-alist'
-     Alist of URLs and local directories.  If directory names of a
-     given URL and the car of an element are the same, emacs-w3m
-     assumes that the file exists in the local directory where the cdr
-     of an element points to.  The default value will be set to a value
-     of the `yahtml-path-url-alist' variable which exchanged the car
-     and the cdr in each element if it is available.
-
-`w3m-use-ange-ftp'
-     Non-`nil' means that `ange-ftp' or `efs' is used to access FTP
-     servers.
-
-`w3m-use-cygdrive'
-     If non-`nil', use the `/cygdrive/' rule when performing
-     `expand-file-name'.
-
-`w3m-use-filter'
-     Non-`nil' means use filter programs to convert web contents.  See
-     also `w3m-filter-rules' (the `w3m-filter.elc' module provides it
-     but might have never been loaded.  In that case, to see the default
-     value and the documentation of `w3m-filter-rules', type
-     `M-x load-library <RET> w3m-filter <RET>').
-
-`w3m-use-form'
-     Non-`nil' means make it possible to use form extensions.
-     _(EXPERIMENTAL)_
-
-`w3m-submit-form-safety-check'
-     Non-`nil' means ask you for confirmation when submitting a form.
-     The default value is `nil'.
-
-`w3m-use-header-line'
-     Non-`nil' means display the header line.
-
-`w3m-use-header-line-title'
-     Non-`nil' means display the current title at the header line. This
-     variable is effective only when `w3m-use-tab' is `nil'.
-
-`w3m-use-mule-ucs'
-     Non-`nil' means use the multi-script support with Mule-UCS.
-
-`w3m-use-refresh'
-     Non-`nil' means honor the REFRESH attribute in META tags.
-     Emacs-w3m arbitrarily takes you to a url specified by that
-     attribute.  Note that they may be malicious traps.
-
-`w3m-refresh-minimum-interval'
-     Minimum seconds to wait for refresh, when visiting a page by
-     history-back or history-next.
-
-`w3m-use-symbol'
-     Non-`nil' means replace symbols that the `<_SYMBOL>' tags lead
-     into.  It is meaningful only when the `w3m-m17n' command is used
-     and (X)Emacs handles unicode charsets.
-
-`w3m-menu-on-forefront'
-     Non-`nil' means place the emacs-w3m menus on the forefront of the
-     menu bar.  The default value is `nil'.
-
-`w3m-use-tab'
-     Non-`nil' means make emacs-w3m a tab browser.  It makes it possible
-     to show all emacs-w3m buffers in a single window with the tabs
-     line, and you can choose one by clicking a mouse on it.  See also
-     `w3m-use-tab-menubar'.
-
-`w3m-use-tab-menubar'
-     Non-`nil' means use the TAB pull-down menu in the menubar.  It
-     makes it possible to show all emacs-w3m buffers in a single
-     window, and you can choose one by clicking a mouse on it.  This
-     feature requires that Emacs has been built to be able to display
-     multilingual text in the menubar if you often visit web sites
-     written in non-ascii text.  See also `w3m-use-tab'.
-
-`w3m-use-toolbar'
-     Non-`nil' activates toolbar of `w3m'.
-
-`w3m-user-agent'
-     String used for the User-Agent field.  See also
-     `w3m-add-user-agent'.
-
-`w3m-new-session-in-background'
-     Say whether not to focus on a new tab or a new session in target.
-     It influences only when a new emacs-w3m buffer is created.
-
-`w3m-do-cleanup-temp-files'
-     Non-`nil' enables emacs-w3m's auto cleanig forgotten temporary
-     files feature. The default is `nil'.
-
-
-File: emacs-w3m.info,  Node: Image Variables,  Next: Form Variables,  Prev: General Variables,  Up: Customizable Variables
-
-5.2 Variables related to images
-===============================
-
-`w3m-default-display-inline-images'
-     Non-`nil' means display images inline in emacs-w3m buffers.  You
-     can toggle the visibility of images with the
-     `w3m-toggle-inline-images' command.  See also
-     `w3m-toggle-inline-images-permanently'.
-
-`w3m-favicon-cache-expire-wait'
-     The cache will be expired after specified seconds passed since
-     retrieval.  If this variable is `nil', never expired.
-
-`w3m-favicon-cache-file'
-     Filename of saving favicon cache.  It defaults to the file named
-     `.favicon' under the directory specified by the
-     `w3m-profile-directory' variable.
-
-`w3m-favicon-size'
-     Size of favicon. This value is used as geometry argument for
-     `convert'.
-
-`w3m-favicon-type'
-     Image type of display favicon.
-
-`w3m-favicon-use-cache-file'
-     If non-`nil', use favicon cache file.
-
-`w3m-favicon-default-background'
-     Color name used as transparent color of favicon image.  `Nil' means
-     to use the background color of the Emacs frame.  The null string
-     "" is special, that will be replaced with the background color of
-     the header line or the mode line on which the favicon is
-     displayed.  Note that this value is effective only with Emacs 22
-     and greater.
-
-`w3m-icon-directory'
-     Directory where emacs-w3m should find icon files.
-
-`w3m-imagick-convert-program'
-     Program name of ImageMagick's `convert'.
-
-`w3m-treat-image-size'
-     Non-`nil' means let the `w3m' command mind the ratio of the size
-     of images and text.  The default value is `t'.
-
-     If it is non-`nil', the `w3m' command will make a `halfdump' which
-     reserves rectangle spaces in which images will be put, and also
-     `alt' texts will be truncated or padded with spaces so that their
-     display width will be the same as the width of images.
-
-     See also `w3m-pixels-per-character' and `w3m-pixels-per-line'.
-     Those values will be passed to the `w3m' command in order to
-     compute columns and lines which images occupy.
-
-`w3m-pixels-per-character'
-     Integer used for the `-ppc' argument of the `w3m' command.  If
-     `nil', the width of the default face is used.  It is valid only
-     when `w3m-treat-image-size' is non-`nil'.  The default value is
-     `nil'.  If you want to use emacs-w3m in a character terminal and
-     make `w3m-treat-image-size' effective, you need to set this
-     variable properly.
-
-`w3m-pixels-per-line'
-     Integer used for the `-ppl' argument of the `w3m' command.  If
-     `nil', the height of the default face is used.  It is valid only
-     when `w3m-treat-image-size' is non-`nil'.  Note that a small value
-     may not induce a good result.  The default value is `64'.  If you
-     want to use emacs-w3m in a character terminal and make
-     `w3m-treat-image-size' effective, you need to set this variable
-     properly.
-
-`w3m-resize-image-scale'
-     Number of steps in percent used when resizing images.
-
-`w3m-resize-images'
-     If non-`nil', resize images to the specified width and height.
-
-`w3m-show-graphic-icons-in-header-line'
-     Non-`nil' means show graphic status indicators in the header-line.
-     If it is `nil', also the favicon won't be shown in the header-line
-     even if `w3m-use-favicon' is non-`nil'.  This variable is
-     currently meaningless under XEmacs.
-
-`w3m-show-graphic-icons-in-mode-line'
-     Non-`nil' means show graphic status indicators in the mode-line.
-     If it is `nil', also the favicon won't be shown in the mode-line
-     even if `w3m-use-favicon' is non-`nil'.
-
-`w3m-toggle-inline-images-permanently'
-     Non-`nil' means let the visibility of images continue permanently.
-     The visibility of images is initialized according to
-     `w3m-default-display-inline-images' at the first time, and except
-     that it may be toggled by the `w3m-toggle-inline-images' command,
-     it does not change hereafter, if it is non-`nil'.  Otherwise,
-     whether images are visible is initialized according to
-     `w3m-default-display-inline-images' whenever you visit a new page
-     or reload the current page in an emacs-w3m buffer.
-
-`w3m-use-favicon'
-     Non-`nil' means show favicon images if they are available.  It will
-     be set to `nil' automatically if ImageMagick's `convert' program
-     does not support the ico format.
-
-`w3m-image-default-background'
-     Color name used as transparent color of image.  `Nil' means to use
-     the background color of the Emacs frame.  The null string "" is
-     special, that will be replaced with the background color of the
-     buffer. Note that this value is effective only with Emacs 22 and
-     greater.
-
-
-File: emacs-w3m.info,  Node: Form Variables,  Next: Cookie Variables,  Prev: Image Variables,  Up: Customizable Variables
-
-5.3 Variables related to forms
-==============================
-
-`w3m-form-input-map-buffer-lines'
-     Buffer lines for form select map buffer.
-
-`w3m-form-input-select-buffer-lines'
-     Buffer lines for form select buffer.
-
-`w3m-form-input-textarea-buffer-lines'
-     Buffer lines for form textarea buffer.
-
-`w3m-form-mouse-face'
-     Mouse face to highlight selected value.
-
-`w3m-form-treat-textarea-size'
-     Non-`nil' means to process textarea size (treat textarea rows).
-
-`w3m-form-use-fancy-faces'
-     Use fancy faces to fontify `<form>' tags.
-
-`w3m-form-use-textarea-backup'
-     Non-`nil' means save and restore backup text saved when you last
-     edited this textarea.  Files to save text are stored in the
-     directory specified by the `w3m-form-textarea-directory' variable.
-
-
-File: emacs-w3m.info,  Node: Cookie Variables,  Next: Bookmark Variables,  Prev: Form Variables,  Up: Customizable Variables
-
-5.4 Variables related to cookies
-================================
-
-`w3m-cookie-accept-bad-cookies'
-     If `nil', don't accept bad cookies.  If `t', accept bad cookies.
-     If ask, ask user whether accept bad cookies or not.
-
-`w3m-cookie-accept-domains'
-     A list of trusted domain name string.
-
-`w3m-cookie-file'
-     File in which cookies are kept.
-
-`w3m-cookie-reject-domains'
-     A list of untrusted domain name string.
-
-`w3m-use-cookies'
-     Non-`nil' means enable emacs-w3m to use cookies.  _(EXPERIMENTAL)_
-
-
-File: emacs-w3m.info,  Node: Bookmark Variables,  Next: Search Variables,  Prev: Cookie Variables,  Up: Customizable Variables
-
-5.5 Variables related to bookmarks
-==================================
-
-`w3m-bookmark-file'
-     Bookmark file of w3m.
-
-`w3m-bookmark-file-coding-system'
-     Coding system for a created bookmark file.  This option is used
-     when a new bookmark file is created, or when an existing bookmark
-     file includes ASCII characters only.  If the coding system which
-     is used to encode your using bookmark file is different from the
-     value of this option, emacs-w3m does not change the encoding of
-     your bookmark file.
-
-`w3m-bookmark-default-section'
-     Default section to add new entry.
-
-`w3m-bookmark-menu-open-new-session'
-     If non-`nil', "Bookmark" menu item open new session.
-
-
-File: emacs-w3m.info,  Node: Search Variables,  Next: Weather Variables,  Prev: Bookmark Variables,  Up: Customizable Variables
-
-5.6 Variables related to searching the web
-==========================================
-
-`w3m-search-default-engine'
-     Name of the default search engine.  The default is `google'.
-
-`w3m-search-engine-alist'
-     An alist of search engines.  Each element looks like `(ENGINE
-     ACTION CODING POST-DATA)'.  ENGINE is a string, the name of the
-     search engine.  ACTION is a string, the URL that performs a
-     search.  ACTION must contain a `"%s"', which is substituted by a
-     query string.  CODING is optional value which is coding system for
-     query string.  POST-DATA is optional value which is a string for
-     POST method search engine.  If CODING is omitted, it defaults to
-     `w3m-default-coding-system'.
-
-`w3m-search-word-at-point'
-     Non-`nil' means that the word at point is used as an initial
-     string.  If `transient-mark-mode', this option is ignored and the
-     region is used as an initial string.  The default is `t'.
-
-`w3m-search-thing-at-point-arg'
-     Argument for `thing-at-point' used in `w3m-search-read-query'. The
-     default is `word'.
-
-
-File: emacs-w3m.info,  Node: Weather Variables,  Next: Dtree Variables,  Prev: Search Variables,  Up: Customizable Variables
-
-5.7 Variables related to weather information
-============================================
-
-`w3m-weather-default-area'
-     Default region to check weather.  The default is the southern part
-     of Kyoto city.
-
-`w3m-weather-filter-functions'
-     Filter functions to remove useless tags.  The default value is a
-     list that contains the following function symbols in this order:
-
-     `w3m-weather-extract-contents' `w3m-weather-adjust-contents'
-     `w3m-weather-expand-anchors' `w3m-weather-insert-title'
-
-
-File: emacs-w3m.info,  Node: Dtree Variables,  Next: Antenna Variables,  Prev: Weather Variables,  Up: Customizable Variables
-
-5.8 Variables related to the dtree feature
-==========================================
-
-`w3m-dtree-default-allfiles'
-     If non-`nil', invert the meaning of the prefix argument given to
-     the `w3m-dtree' command, i.e., the command shows not only
-     directories but also files even if you don't give a prefix
-     argument.  The default is `nil'.
-
-`w3m-dtree-directory-depth'
-     Integer that controls how deep `w3m-dtree' shows subdirectories.
-     If it is `nil', files in all subdirectories are shown.  The default
-     is `8'.
-
-`w3m-dtree-indent-strings'
-     Vector containing strings used for the indentation.  The default is
-     `["|-" "+-" "|  " "   "]'.
-
-`w3m-dtree-stop-strings'
-     Vector containing strings used to indent directories under which
-     there are subdirectories hidden because of
-     `w3m-dtree-directory-depth'.  The default is `["|=" "+="]'.
-
-
-File: emacs-w3m.info,  Node: Antenna Variables,  Next: Perldoc Variables,  Prev: Dtree Variables,  Up: Customizable Variables
-
-5.9 Variables related to antenna
-================================
-
-`w3m-antenna-file'
-     Name of the file containing antenna URLs.  The default value is
-     `~/.w3m/.antenna', where `~/.w3m' is the default value of
-     `w3m-profile-directory' (*note General Variables::).
-
-`w3m-antenna-html-skelton'
-     Skeleton used for making the html contents of antenna pages.
-
-`w3m-antenna-make-summary-function'
-     Function used to make the summary of the site information.  The
-     default is `w3m-antenna-make-summary-like-natsumican'.  The other
-     ready-made function is `w3m-antenna-make-summary'.
-
-`w3m-antenna-sites'
-     List of web sites that `w3m-antenna' watches.  The default is
-     `nil'.
-
-`w3m-antenna-sort-changed-sites-function'
-     Function used to sort a list of sites having been changed.  The
-     default is `w3m-antenna-sort-sites-by-time'.  The other ready-made
-     function is `w3m-antenna-sort-sites-by-title'.
-
-`w3m-antenna-sort-unchanged-sites-function'
-     Function used to sort a list of sites having not been changed.  The
-     default is `w3m-antenna-sort-sites-by-time'.  The other ready-made
-     function is `w3m-antenna-sort-sites-by-title'.
-
-
-File: emacs-w3m.info,  Node: Perldoc Variables,  Next: Namazu Variables,  Prev: Antenna Variables,  Up: Customizable Variables
-
-5.10 Variables related to perldoc
-=================================
-
-`w3m-perldoc-command'
-     Name of the executable file of `perldoc'.  The default is
-     `"perldoc"'.
-
-`w3m-perldoc-input-coding-system'
-     Coding system used when writing to the `perldoc' command.  The
-     default value is `euc-japan' if you are in the Japanese language
-     environment.  Otherwise it is `utf-8' if it is available, or
-     `iso-latin-1'.
-
-`w3m-perldoc-output-coding-system'
-     Coding system used when reading from the `perldoc' command.  The
-     default is `undecided'.
-
-`w3m-perldoc-pod2html-command'
-     Name of the executable file of `pod2html'.  The default is
-     `"pod2html"'.
-
-`w3m-perldoc-pod2html-arguments'
-     Lisp of arguments passed to the `pod2html' command.  The default is
-     `("--noindex")'.
-
-
-File: emacs-w3m.info,  Node: Namazu Variables,  Next: Octet Variables,  Prev: Perldoc Variables,  Up: Customizable Variables
-
-5.11 Variables related to namazu
-================================
-
-`w3m-namazu-command'
-     Name of the executable file of Namazu.  The default is `namazu'.
-
-`w3m-namazu-arguments'
-     List of arguments passed to Namazu.  The default value is `("-h"
-     "-H" "-n" w3m-namazu-page-max "-w" whence)'.  The symbols
-     `w3m-namazu-page-max' and `whence' will be replaced respectively
-     with the value of that variable and a proper value that the
-     program determines properly.
-
-`w3m-namazu-default-index'
-     An alias for the default index, or the directory name of it.  If
-     this is `nil', you will be prompted for the directory name
-     whenever you invoke the `w3m-namazu' command with no prefix
-     argument.  The default is the value of `namazu-default-dir' if it
-     exists and `namazu-always-query-index-directory' is `nil'.
-     Otherwise `nil'.
-
-`w3m-namazu-index-alist'
-     Alist of aliases and index directories.  The default value is
-     determined due to `namazu-dir-alist' if any or `nil'.
-
-`w3m-namazu-input-coding-system'
-     Coding system used when reading from the namazu process.  The
-     default is the value of `namazu-cs-read' if it exists, or
-     `undecided'.
-
-`w3m-namazu-output-coding-system'
-     Coding system used when writing to the namazu process.  The
-     default is the value of `namazu-cs-write' if it exists, or is
-     determined to `shift_jis-dos' or `euc-japan-unix' due to the
-     system type.
-
-`w3m-namazu-page-max'
-     The maximum number of documents retrieved in one search.  The
-     default is the value of `namazu-search-num' if any, or `30'.
-
-
-File: emacs-w3m.info,  Node: Octet Variables,  Next: Session Manager Variables,  Prev: Namazu Variables,  Up: Customizable Variables
-
-5.12 Variables related to the octet feature
-===========================================
-
-There is no user option for the moment.
-
-
-File: emacs-w3m.info,  Node: Session Manager Variables,  Next: Hooks,  Prev: Octet Variables,  Up: Customizable Variables
-
-5.13 Variables related to session manager
-=========================================
-
-`w3m-session-file'
-     File name to keep sessions.
-
-`w3m-session-time-format'
-     Format of saved time.
-
-`w3m-session-automatic-title'
-     String of title to save session automatically.
-
-`w3m-session-deleted-title'
-     String of title to save session when buffer delete.
-
-`w3m-session-crash-recovery-title'
-     String of title to save session to use for crash recovering.
-
-`w3m-session-deleted-keep-number'
-     Number to keep sessions when buffers delete.
-
-`w3m-session-automatic-keep-number'
-     Number to keep sessions automatically.
-
-`w3m-session-unknown-title'
-     String of title to use when title is not specified.
-
-
-File: emacs-w3m.info,  Node: Hooks,  Next: Other Variables,  Prev: Session Manager Variables,  Up: Customizable Variables
-
-5.14 Hooks
-==========
-
-`w3m-after-cursor-move-hook'
-     Hook run each time after the cursor moves in emacs-w3m buffers.
-     This hook is called by the `w3m-check-current-position' function
-     by way of `post-command-hook'.
-
-`w3m-delete-buffer-hook'
-     Hook run when every emacs-w3m buffer is deleted.
-
-`w3m-display-hook'
-     Hook run after displaying pages in emacs-w3m buffers.  Each
-     function is called with a url string as the argument.  This hook
-     is evaluated by the `w3m-goto-url' function.
-
-`w3m-fontify-after-hook'
-     Hook run after fontifying emacs-w3m buffers.  This hook is
-     evaluated by the `w3m-fontify' function.
-
-`w3m-fontify-before-hook'
-     Hook run when starting to fontify emacs-w3m buffers.  This hook is
-     evaluated by the `w3m-fontify' function.
-
-`w3m-form-input-map-mode-hook'
-     A hook called after w3m-form-input-map-mode.
-
-`w3m-form-input-map-set-hook'
-     A Hook called before w3m-form-input-map-set.
-
-`w3m-form-input-select-mode-hook'
-     A hook called after w3m-form-input-select-mode.
-
-`w3m-form-input-select-set-hook'
-     A Hook called before w3m-form-input-select-set.
-
-`w3m-form-input-textarea-mode-hook'
-     A hook called after w3m-form-input-textarea-mode.
-
-`w3m-form-input-textarea-set-hook'
-     A Hook called before w3m-form-input-textarea-set.
-
-`w3m-minor-mode-hook'
-     Hook run after `w3m-minor-mode' initialization.
-
-`w3m-mode-hook'
-     Hook run after `w3m-mode' initialization.  This hook is evaluated
-     by the `w3m-mode' function.
-
-`w3m-select-buffer-hook'
-     Hook run when a different emacs-w3m buffer is selected.
-
-`w3m-bookmark-mode-hook'
-     Hook run at the end of function `w3m-bookmark-mode'.
-
-
-File: emacs-w3m.info,  Node: Other Variables,  Prev: Hooks,  Up: Customizable Variables
-
-5.15 Other variables
-====================
-
-`w3m-async-exec'
-     Non-`nil' means execute the `w3m' command asynchronously in Emacs
-     process.
-
-`w3m-broken-proxy-cache'
-     Set it to `t' if the proxy server seems not to work properly in
-     caching.  Note that this may be the double-edged sword; setting it
-     to `t' will likely be harmful if the proxy server sends bad
-     requests (e.g., not including the Host header, see RFC2616 section
-     14.23) to foreign servers when the `w3m' command specifies the
-     `no-cache' directive.  Also note that it may not be effective if
-     you are using old `w3m' command.
-
-`w3m-history-minimize-in-new-session'
-     Non-`nil' means minimize copied history so that there's only
-     current page.  This variable is effective when creating of the new
-     session by copying (i.e., `w3m-copy-buffer').  The default value is
-     `nil'.
-
-`w3m-history-reuse-history-elements'
-     Non-`nil' means reuse the history element when re-visiting the
-     page.  Otherwise, a new history element will be created even if
-     there are elements for the same url in the history.
-
-     Emacs-w3m used to operate as the case in which it is non-`nil',
-     however it sometimes brought about users' dissatisfaction.  For
-     example, if a user visited the pages A -> B -> C -> B in order,
-     performing BACK on the second B would let a user visit A.  The
-     reason why a user was taken to A rather than C is that the
-     `w3m-history' variable only had the list `(A B C)' as a history
-     and B was the current position at that time.
-
-     The default value for this variable is `nil' which allows the
-     `w3m-history' variable to have the list `(A B C B)'.  Where
-     contents of two B's are the identical Lisp objects.  So, too much
-     wasting the Lisp resources will be avoided.
-
-     See the documentation for the variables `w3m-history' and
-     `w3m-history-flat' for more information.
-
-`w3m-process-connection-type'
-     Value for `process-connection-type' used when communicating with
-     `w3m'.
-
-`w3m-process-modeline-format'
-     Format used when displaying the progress of the external `w3m'
-     process.  It shows a percentage of the data loaded from the web
-     server.
-
-`w3m-show-current-title-in-buffer-tab'
-     If non-`nil', show the title strings in the buffers tab.  It has no
-     effect if your XEmacs does not support the gutter items.
-
-
-File: emacs-w3m.info,  Node: Hooking into MUAs,  Next: Frequently Asked Questions,  Prev: Customizable Variables,  Up: Top
-
-6 Hooking emacs-w3m into mail/newsreaders
-*****************************************
-
-This section introduces three Message User Agents (MUAs).  All those
-MUAs can display HTML mails properly using emacs-w3m.  You'll find here
-HowTo's and some notes about setting up and using emacs-w3m with each
-of these MUAs.
-
-   Quick note about the conventions we use: what does `message' mean?
-When a Gnus user says `message', it often means a draft of a message to
-be sent as mail or news.  However, it is the term used by Mew or
-Wanderlust users for received mail.  They use `draft' for the draft of
-a message to be sent.  On the other hand, a received message is called
-an `article' by Gnus users.
-
-* Menu:
-
-* Gnus::                        Reading HTML mails in Gnus
-* Mew::                         Reading HTML mails in Mew
-* SEMI MUAs::                   Reading HTML mails in SEMI MUAs
-* VM::                          VM (vieW maiL) is not Wanderlust
-
-
-File: emacs-w3m.info,  Node: Gnus,  Next: Mew,  Up: Hooking into MUAs
-
-6.1 Reading HTML mails in Gnus
-==============================
-
-Did you know that Gnus, the Emacs newsreader, supports emacs-w3m?
-Actually, Gnus bundled with Emacs of which the version is 22.1 or
-greater supports emacs-w3m.  If your Emacs is somewhat old, you'd better
-use the latest version of Gnus.  It is available at:
-
-   `ftp://ftp.gnus.org/pub/gnus/gnus.tar.gz'
-
-   * What can you do with emacs-w3m?
-
-     You can convert HTML spam mails to be human-readable using
-     emacs-w3m.  Of course, it works for HTML ham (non-spam) mails as
-     well, and for both emacs-w3m is probably faster than the default
-     converter.  You don't need to perform any additional operation.
-     It will simply be displayed.
-
-     On HTML parts of an article buffer, the `w3m-minor-mode' is turned
-     on and you can use the same main keys as the keys of emacs-w3m, for
-     instance, `<RET>' is for visiting a page which a link in the
-     current position points to.  Those keys are defined in the
-     `w3m-minor-mode-command-alist' variable.  Keep in mind that some
-     commands are replaced by others similar to them, for security
-     reasons (see below).
-
-   * What do you have to do?
-
-     Read the Gnus manual (*note Display Customization:
-     (emacs-mime)Display Customization.).  The easiest way is to put
-     the following line in your `~/.gnus.el' file:
-
-          (setq mm-text-html-renderer 'w3m)
-
-     Also put the following line if you want to show images inline in
-     article buffers:
-
-          (setq mm-inline-text-html-with-images t)
-
-     If you don't need to use emacs-w3m keys in article buffers, add the
-     following line too:
-
-          (setq mm-inline-text-html-with-w3m-keymap nil)
-
-   * Notes
-
-     The above description about spam and ham is not for kidding, it's
-     just here to get your attention.  Some HTML mails might contain a
-     nasty trick used by spammers, using the `<img>' tag which is far
-     more evil than the `Click Here!' button.  It is most likely
-     intended to check whether the ominous spam mail has reached your
-     eyes or not, in which case the spammer knows for sure that your
-     email address is valid.  It is done by embedding an identifier
-     string into a URL that you might automatically retrieve when
-     displaying the image.  If the `mm-w3m-safe-url-regexp' variable
-     has not been changed from the default value, Gnus will never
-     connect to the spammer's site arbitrarily.
-
-     You can display images inline in an article buffer if you set
-     `mm-inline-text-html-with-images' to `t', can't you?  No, not
-     exactly: you're still being protected.  If you don't care about
-     leaking information (i.e. the fact that your mail address is
-     reachable), set the `mm-w3m-safe-url-regexp' variable to `nil'.
-     The default value for `mm-w3m-safe-url-regexp' is `"\\`cid:"'
-     which means we consider that images included in a mail with the
-     `cid:' URL are safe (that is, you can display such images without
-     modifying the `mm-w3m-safe-url-regexp' variable).
-
-   * Giveaway
-
-     Even when you are in the summary buffer, you can toggle displaying
-     of images in the article buffer.  It is effective only when those
-     images are displayed by emacs-w3m, though.  Here's an example:
-
-          (defun gnus-summary-w3m-safe-toggle-inline-images (&optional arg)
-            "Toggle displaying of all images in the article buffer.
-          If the prefix arg is given, force displaying of images."
-            (interactive "P")
-            (with-current-buffer gnus-article-buffer
-              (let ((st (point-min))
-                    (nd (point-max))
-                    (w3m-async-exec w3m-async-exec))
-                (save-restriction
-                  (widen)
-                  (if (or (> st (point-min)) (< nd (point-max)))
-                      (setq w3m-async-exec nil))
-                  (article-goto-body)
-                  (goto-char (or (text-property-not-all (point) (point-max)
-                                                        'w3m-safe-url-regexp nil)
-                                 (point)))
-                  (if (interactive-p)
-                      (call-interactively 'w3m-toggle-inline-images)
-                    (w3m-toggle-inline-images arg))))))
-
-          (eval-after-load "gnus-sum"
-            '(define-key gnus-summary-mode-map
-               "\C-i" 'gnus-summary-w3m-safe-toggle-inline-images))
-
-See also *note Nnshimbun::.
-
-
-File: emacs-w3m.info,  Node: Mew,  Next: SEMI MUAs,  Prev: Gnus,  Up: Hooking into MUAs
-
-6.2 Reading HTML mails in Mew
-=============================
-
-By using emacs-w3m with Mew, you can see HTML mails as it intended to be
-displayed.  To do so, put the following line in the `~/.mew.el' file:
-
-     (require 'mew-w3m)
-
-With just this, an HTML mail will be displayed in the message window as
-if it were a plain text.  You can still use the `C-c C-e' command
-(`mew-summary-execute-external') there.
-
-   It is also quite common these days to see mails containing the same
-information twice, they use the `multipart/alternative' format which
-consists of both a `text/plain' part and a `text/html' part (what a
-waste of bandwidth it is).  Mew displays only the `text/plain' part of
-such a mail by default.  However, you perhaps want to see the
-`text/html' part since you are using emacs-w3m.  If so, add the
-following lines to the `~/.mew.el' file:
-
-     (setq mew-mime-multipart-alternative-list
-           '("Text/Html" "Text/Plain" ".*"))
-
-There are some customizable variables related to Mew:
-
-`mew-use-w3m-minor-mode'
-     If non-`nil', the `w3m-minor-mode' is turned on in the message
-     buffer where a text/html part is displayed, and you can use the
-     same main keys as the keys of emacs-w3m, for instance, `<RET>' is
-     for visiting a page which a link in the current position points
-     to.  Those keys are defined in the `w3m-minor-mode-command-alist'
-     variable.  Keep in mind that some commands are replaced by others
-     similar to them, for security reasons.  The default value is `nil'.
-
-`mew-w3m-auto-insert-image'
-     If non-`nil', you can see images inline in the message buffer when
-     you read a multipart/related message.  Note that mew-w3m only
-     allows images contained in the message body with a `cid:' URL to be
-     displayed (as we consider them safe).  The default value is `nil'.
-
-     To activate this feature, add following in your `~/.mew.el'.
-
-          (define-key mew-summary-mode-map "T" 'mew-w3m-view-inline-image)
-
-     Press "T", toggle the visibility of the images included its message
-     only.  Press "C-uT", display the all images included its Text/Html
-     part.
-
-`mew-w3m-cid-retrieve-hook'
-     A hook run just after retrieving a `cid:' URL.  The default value
-     is `nil'.
-
-See also *note Mew Shimbun::.
-
-
-File: emacs-w3m.info,  Node: SEMI MUAs,  Next: VM,  Prev: Mew,  Up: Hooking into MUAs
-
-6.3 Reading HTML mails in SEMI MUAs
-===================================
-
-You can display HTML mails as human-readable, using emacs-w3m and SEMI
-MUA, for example, Wanderlust.  Since that MUA depends on SEMI (and also
-FLIM) for MIME functions, we generically call it SEMI MUA.  Although
-SEMI uses Emacs/W3 for rendering HTML mails by default, it can easily
-be altered to emacs-w3m and it will make your cyber life still more
-comfortable.
-
-You simply need to put the following line in `~/.emacs' file:
-
-     (require 'mime-w3m)
-
-   The `mime-w3m' and `mime-w3' modules are functionally alike, as you
-might have guessed (see how the names sound alike?).  The latter is
-included in the SEMI package.
-
-   On HTML parts of an article buffer, the `w3m-minor-mode' is turned
-on and you can use the same main keys as the keys of emacs-w3m, for
-instance, `<RET>' is for visiting a page which a link in the current
-position points to.  Those keys are defined in the
-`w3m-minor-mode-command-alist' variable.  Keep in mind that some
-commands are replaced by others similar to them, for security reasons.
-
-   There are some customizable variables related to the `mime-w3m'
-module:
-
-`mime-w3m-display-inline-images'
-     If it is non-`nil', images will be displayed inline in HTML mails.
-     If it is the symbol `default' (which is the default) at the first
-     time, the value of this variable will be replaced with the value
-     of the `w3m-default-display-inline-images' variable.  You probably
-     don't need to change this.
-
-`mime-w3m-safe-url-regexp'
-     Regexp matching URLs which are considered to be safe.  The default
-     value is `"\\`cid:"' which means we consider that images included
-     in a mail with the `cid:' URLs are safe.  See also *note Gnus::
-     about rogue attacks.
-
-`mime-w3m-setup-hook'
-     A hook run just after setting up the cooperation of the `mime-w3m'
-     module and SEMI.  The default value is `nil'.
-
-   By the way, even when you are in the summary buffer, you can toggle
-displaying of images in the article buffer (which is what is called the
-message buffer in the Wanderlust community).  It is effective only when
-those images are displayed by emacs-w3m, though.  Here's an example for
-Wanderlust:
-
-     (defun wl-summary-w3m-safe-toggle-inline-images (&optional arg)
-       "Toggle displaying of all images in the message buffer.
-     If the prefix arg is given, all images are considered to be safe."
-       (interactive "P")
-       (with-current-buffer wl-message-buffer
-         (w3m-toggle-inline-images arg)))
-
-     (eval-after-load "wl-summary"
-       '(define-key wl-summary-mode-map
-          "\M-i" 'wl-summary-w3m-safe-toggle-inline-images))
-
-
-File: emacs-w3m.info,  Node: VM,  Prev: SEMI MUAs,  Up: Hooking into MUAs
-
-6.4 VM (vieW maiL) is not Wanderlust
-====================================
-
-The module vm-w3m.el that provides the feature for VM to display html
-mails and a patch have been handed over to the new VM maintainer,
-although it has not appeared in the stable version of VM yet.  Try
-visiting the VM home page (http://www.nongnu.org/viewmail/).
-
-
-File: emacs-w3m.info,  Node: Frequently Asked Questions,  Next: Known Problems,  Prev: Hooking into MUAs,  Up: Top
-
-7 There isn't always an answer
-******************************
-
-* Menu:
-
-* General FAQ::                 General Questions
-* Trouble FAQ::                 Troubleshooting
-* Shimbun FAQ::                 Questions of Shimbun Library
-
-
-File: emacs-w3m.info,  Node: General FAQ,  Next: Trouble FAQ,  Up: Frequently Asked Questions
-
-7.1 General Questions
-=====================
-
-   * Q. What's emacs-w3m?
-
-     It is an interface program on Emacs which controls w3m.  For more
-     information, see *note Introduction::.
-
-   * Q. Which emacs versions are supported?
-
-     The following Emacsen have been checked for emacs-w3m support:
-
-        * Emacs 21
-
-        * Emacs 22
-
-        * XEmacs 21.4.17 and later with/without Mule
-
-        * XEmacs 21.5-b19 and later with/without Mule
-
-        * Meadow
-
-     Note that you're required to use APEL if you'd like to run
-     emacs-w3m under XEmacs.  For more information, see *note Other
-     Requirements::.
-
-   * Q. Which w3m versions are supported?
-
-     The following w3m versions have been checked for emacs-w3m support:
-
-        * w3m-0.3 and later
-
-        * w3mmee-p24-18 + moe-1.5.4
-
-          Note that w3mmee mentioned as the example is configured with
-          the `lang=many' option (it can be done by entering 3, when the
-          `configure' script prompts you, "Which language do you
-          prefer?").  It also requires the `libmoe' package.
-
-   * Q. I've already installed APEL in the XEmacs SUMO package, is it
-     ok?
-
-     There are some problems in the XEmacs APEL package (all modules
-     have been compiled for XEmacs with Mule); for instance, the
-     `std11' modules conflict with the FLIM's one, etc.  Even though
-     you can use `apel-1.23-pkg.tar.gz' or later for both XEmacs with
-     Mule and non-Mule XEmacs if you don't use FLIM for the `shimbun'
-     features, we recommend you replace it or newly install the
-     original APEL package.  See *note Other Requirements:: where to
-     get it from.
-
-   * Q. I've gotten the developing version of emacs-w3m with CVS,
-     however I'm missing `configure' script.
-
-     It is necessary to run `autoconf' first, to generate `configure'
-     script.
-
-
-File: emacs-w3m.info,  Node: Trouble FAQ,  Next: Shimbun FAQ,  Prev: General FAQ,  Up: Frequently Asked Questions
-
-7.2 Troubleshooting
-===================
-
-   * Q. Why can't I enter a password on pages which require
-     authentication?
-
-     Make sure the `w3m-async-exec' variable is set to a value other
-     than `nil'.
-
-   * Q. Why can't I enter a password for a proxy server which requires
-     authentication?
-
-     Make sure the `w3m-async-exec' variable is set to a value other
-     than `nil'.
-
-   * Q. Why can't I follow links?
-
-     Emacs-w3m requires a version of w3m which recognizes the `-header'
-     option.  Check what version of w3m you use.
-
-   * Q. Why do garbage characters appear?
-
-     It could be caused by the following reasons:
-
-       1. Bad HTML file
-
-          If the character set specified by the `<meta>' tag differs
-          from the actual contents in an HTML file, it will not be
-          displayed correctly.  Use the command
-          `M-x w3m-redisplay-with-charset <RET>' or `C c' to set the
-          correct character set and to force redisplay of the page.
-
-       2. Limitation of the character sets
-
-          A page written by a character set other than
-          ISO-2022-JP(jis), EUC-JP, or SHIFT_JIS may not be displayed
-          correctly.  Try one of the following ways:
-
-            a. Any characters defined in Unicode will be displayed
-               correctly if you install the Mule-UCS package (*note
-               Other Requirements::).  You need to make sure that the
-               value of the `w3m-use-mule-ucs' variable is set to a
-               value other than `nil' after installing the Mule-UCS
-               package.  In addition, if you want to make Emacs (and
-               also emacs-w3m) handle the character sets EUC-JISX0213
-               and ISO-2022-JP-3, you have to install the `jisx0213'
-               module which is contained in the Mule-UCS package
-               (though it doesn't work under XEmacs unfortunately).
-
-            b. Install w3mmee or w3m-m17n, and set the `w3m-command'
-               variable to the appropriate value.  And emacs-w3m will
-               use the multi-lingual features provided by one of those
-               programs.  However, a page written by a coding system
-               which Emacs doesn't support may not be displayed
-               correctly. So please install Mule-UCS package if
-               necessary.
-
-       3. Emacsen incompatibility
-
-          Under XEmacs 21.1, pages written by the SHIFT_JIS character
-          set may not be displayed correctly.  There is also a problem
-          in XEmacs 21.2 prior to the beta 36 version.  You should
-          upgrade your XEmacs if you use such one.
-
-          You should notice that XEmacs versions 21.1 and 21.2 have
-          already been retired officially.
-
-       4. Don't use `standard-display-european'
-
-          It is generally harmful since it often makes Latin characters
-          get displayed incorrectly.  For instance, the apostrophe
-          character (`'') which was encoded as `&#8217' will be
-          displayed as the character `u' with a grave accent as if it
-          had been encoded as `&#249'.  If the line something like the
-          following is in your `~/.emacs' file or site files which
-          Emacs loads when starting up, we strongly recommend you to
-          remove it.
-
-               (standard-display-european 1)
-
-          There the argument might be `t', not `1'.
-
-   * Q. Why can't images be shown?
-
-     It could be caused by the following reasons:
-
-     There is a bug in the earlier versions of the `libungif' library.
-     You have to install `libungif-4.1.0b1' and later.
-
-     You must install the `gifsicle' program if you want to run
-     emacs-w3m under XEmacs.  *Note Other Requirements::.
-
-     Emacs-w3m doesn't support the old versions of w3m.  Check what
-     version of w3m you use.
-
-   * Q. Why can't I browse pages which require cookies?
-
-     (This is still an experimental feature.)
-
-     Make sure the `w3m-use-cookies' variable is set to a value other
-     than `nil'.
-
-   * Q. Why can't I fill in the form?
-
-     (This is still an experimental feature.)
-
-     Make sure the `w3m-use-form' variable is set to a value other than
-     `nil'.
-
-   * Q. Why can't I submit a form?
-
-     (This is still an experimental feature.)
-
-     Make sure the `w3m-use-form' variable is set to a value other than
-     `nil'.  You also need to use a version of w3m which recognizes the
-     `-post' option in order to use this function.  Check what version
-     of w3m you use.
-
-   * Q. Why are frames not rendered?
-
-     Install w3mmee and put the following line in your `~/.emacs' file:
-
-          (setq w3m-command "w3mmee")
-
-   * Q. Why are favicon images not displayed in the tabs line on GNU
-     Emacs?
-
-     Install the `convert' program which is included in ImageMagick.
-     It is available from: `http://www.imagemagick.org/'
-
-   * Q. Why does GNU Emacs get locked when a favicon image is going to
-     be displayed?
-
-   * Q. My computer accesses the disk drive violently and says `process
-     convert exited abnormally with code 10'.  What's the story?
-
-     Do you use an old version of ImageMagick?  As far as we know, it
-     happens when you use the `convert' program bundled with
-     ImageMagick 5.2.1.  It has been confirmed that the `convert'
-     program bundled with ImageMagick 5.4.0-5 (and later) works fine.
-
-     If you don't want to use ImageMagick, or if you can't use its most
-     recent version, add the following line in your `~/.emacs-w3m' file:
-
-          (setq w3m-use-favicon nil)
-
-   * Q. Why does not emacs-w3m work with w3mmee?
-
-     If you are using w3mmee configured with the option `lang=en' or
-     `lang=ja', reconfigure w3mmee with the option `lang=many' (it can
-     be done by entering 3, when the `configure' script prompts you,
-     "Which language do you prefer?"), and rebuild w3mmee.
-
-   * Q. Why I cannot visit web pages using emacs-w3m?  There is no
-     problem when visiting local html files or using w3m barefoot,
-     though.
-
-     What is called the asynch patch(1) is applied to the w3m command
-     which some Linux distribution (e.g. Gentoo Linux) contains.  It is
-     useful when using w3m barefoot, however it might make emacs-w3m
-     hang.  If it is suspected, we recommend you reinstall the w3m
-     command from the original source.
-
-   * Q. Why doesn't the emacs-w3m frame pop up to the front?
-
-     It is quite convenient that the `M-x w3m <RET>' command makes the
-     emacs-w3m frame pop to the front even if it is hidden under the
-     other frames.  However, it was reported that it does not work when
-     running Emacs which has been built on some platforms (e.g., Fedora
-     Linux) in which the `metacity' window manager is used.  In those
-     systems, other features which raise the Emacs frames will not work,
-     either.  If you are in such a miserable circumstance, it might be
-     worth trying the following advice:
-
-          (if (or (not window-system) (featurep 'xemacs))
-              nil
-            (defadvice raise-frame
-              (after make-it-work (&optional frame) activate)
-              "Make it work with the aid of wmctrl."
-              (call-process
-               "wmctrl" nil nil nil "-i" "-R"
-               (frame-parameter (or frame (selected-frame))
-                                'outer-window-id))))
-
-     Where `wmctrl' is the external command which you can get from:
-
-     `http://sweb.cz/tripie/utils/wmctrl/'
-
-     Note that you have to install the `wmctrl' command before putting
-     the advice into the `~/.emacs' file.
-
-     The following one is currently unnecessary for emacs-w3m, but a
-     certain application needs it to work.  (You will lose nothing by
-     adding it if you are in the platform in which the previous one is
-     needed.)
-
-          (if (or (not window-system) (featurep 'xemacs))
-              nil
-            (defadvice pop-to-buffer (after enable-it-to-forcus-frame
-                                            activate)
-              "Enable it to focus frame if `pop-up-frames' is non-nil."
-              (when pop-up-frames
-                (let ((id (condition-case nil
-                              (frame-parameter
-                               (window-frame
-                                (get-buffer-window (ad-get-arg 0)))
-                               'outer-window-id)
-                            (error nil))))
-                  (when id
-                    (call-process
-                     "wmctrl" nil nil nil "-i" "-R" id))))))
-
-     The last one is perhaps unnecessary but it might be worth trying
-     in some platforms.
-
-          (if (or (not window-system)(featurep 'xemacs))
-              nil
-            (defadvice select-frame (around set-input-focus
-                                            (frame) activate)
-              "Run `select-frame-set-input-focus'."
-              (setq ad-return-value (and (framep frame)
-                                         (frame-live-p frame)
-                                         frame))
-              (ad-deactivate 'select-frame)
-              (unwind-protect
-                  (select-frame-set-input-focus frame)
-                (ad-activate 'select-frame))))
-
-     These workarounds will become unnecessary in subsequent Emacs
-     releases (22.2 or 23.1).
-
-   ---------- Footnotes ----------
-
-   (1) w3m on cygwin (http://www.page.sannet.ne.jp/knabe/w3m/w3m.html)
-
-
-File: emacs-w3m.info,  Node: Shimbun FAQ,  Prev: Trouble FAQ,  Up: Frequently Asked Questions
-
-7.3 Questions of Shimbun Library
-================================
-
-   * Q. Why are the `shimbun' modules not installed?
-
-     Note that the `shimbun' modules (files under the `shimbun/'
-     directory) won't be installed if the FLIM package has not been
-     installed in your system.
-
-     The `configure' script determines automatically whether the FLIM
-     package is installed or not.  If the FLIM package is installed in
-     a non-standard directory, the determination fails.  In this case,
-     you can use the `--with-addpath' configure option to explicitly
-     set the directory name where the FLIM package has been installed.
-     Here's an example:
-
-          % ./configure --with-addpath=$HOME/share/emacs/site-lisp/flim
-
-
-File: emacs-w3m.info,  Node: Known Problems,  Next: Shimbun Library,  Prev: Frequently Asked Questions,  Up: Top
-
-8 You can surely solve it
-*************************
-
-
-File: emacs-w3m.info,  Node: Shimbun Library,  Next: Tips,  Prev: Known Problems,  Up: Top
-
-9 A tool for reading a newspaper
-********************************
-
-More and more newspapers, mailing list archives, bulletin boards, and
-individual diaries (such as hyper nikki system, weblogs and blogs) are
-published on the web.  `Shimbun' library enables you to read those
-contents with your favorite mail/news reader.  Actually, `Shimbun'
-library provides functions to convert those contents into articles like
-common e-mails.
-
-     `Shimbun' is pronounced "she-n-boon" (but actually vowels
-     shouldn't be prolonged), it means "newspaper" in Japanese.
-
-   The `shimbun' module has the goal to generate articles that are as
-readable as normal mail or news posting.  This goal is often difficult
-to achieve as web sites change the html of their articles.
-
-   If you notice (even small) annoyances like nonsense images within the
-text or any other text that is not related to the article please report
-them using `report-emacs-w3m-bug' (*note Mailing List::).
-
-   `Shimbun' library currently supports Asahi Shimbun, Yomiuri On-line,
-many mailing list archives such as Emacs Devel, XEmacs Beta, Gnus, Mew,
-and Wanderlust, Slashdot, Slashdot Japan, and a lot of others.  For
-more detail, see *note Shimbun Sites::.
-
-   By the way, you have to pay attention to copyright when using
-`Shimbun' library.  Copyrights of articles generated with `Shimbun'
-library are reserved by copyright holders of those original contents.
-Therefore, you are obliged not to violate rights of copyright holders,
-when you enjoy generated articles.  It means that you can enjoy
-generated articles on "fair use" that is described in the copyright law.
-
-   We, emacs-w3m development team, give no warranty to you, if
-`Shimbun' library causes a damage to you, or if you face a lawsuit
-about violation of copyrights.
-
-   `Shimbun' library is a collection of many modules, but each of them
-serves no useful purpose alone.  This section explains three typical
-`Shimbun' applications (two of which are included in the `Shimbun'
-library) and how to make `Shimbun' modules by yourself (you need to be
-able to write Emacs Lisp programs).
-
-* Menu:
-
-* Nnshimbun::                   Turning Gnus into a web browser!
-* Mew Shimbun::                 Reading web newspapers with Mew
-* Shimbun with Wanderlust::     Reading web newspapers with Wanderlust
-* Shimbun local mode::          Use a shell script to fetch shimbun feeds
-* Shimbun Sites::               Sites supported by Shimbun
-* Shimbun Basics::              How to make a new shimbun module
-
-   Note that you need to have installed the FLIM package (and Gnus if
-you'd like to use `nnshimbun') before building and installing
-emacs-w3m.  The FLIM package requires the APEL package.  You might also
-want to see *Note Other Requirements::.
-
-
-File: emacs-w3m.info,  Node: Nnshimbun,  Next: Mew Shimbun,  Up: Shimbun Library
-
-9.1 Turning Gnus into a web browser!
-====================================
-
-`Nnshimbun' is a Gnus back end, but it is distributed with emacs-w3m,
-not Gnus, exceptionally.  `Nnshimbun' allows you to turn Gnus into an
-exceptionally useful web browser.  You can skim through the articles on
-a newspaper's web server without having to see all the advertisement.
-You can read articles in mailing list archives as if you were
-subscribed to the list.  You can also read submissions in bulletin
-boards, etc...  Note that if you want to followup, you still need to use
-emacs-w3m as Gnus can't post via the web with `nnshimbun'.
-
-   See also *note Gnus:: for rendering HTML messages with emacs-w3m if
-you use Gnus.
-
-   The easiest way to get started with `nnshimbun' is to use something
-like the following in the Group buffer:
-
-   `M-x gnus-group-make-shimbun-group <RET> asahi <RET> national <RET>'
-
-Replace `asahi' and `national' with the keyword corresponding to the
-server you'd like to connect to and the group you're interested in
-respectively.  You can complete both of those names by using `<TAB>' or
-`<SPC>'.
-
-   You can also bind that to a key if there's enough room in the
-`gnus-group-mode-map' map, you can add something like the following in
-your `~/.gnus.el' file:
-
-     (eval-after-load "gnus-group"
-       '(define-key gnus-group-mode-map "Gn"
-          'gnus-group-make-shimbun-group))
-
-Then, you can use `G n' instead of `M-x gnus-group-make-shimbun-group'.
-
-   _Could someone book this keystroke at the Gnus Tower?_
-
-Besides this, you can use the `gnus-group-make-shimbun-groups' command
-in order to make all groups for the specified server.
-
-   `Nnshimbun' simply fetches HTML contents from the web server and
-displays them as an article, but it will never save articles in the
-local file system, except if you use persistent articles (*note
-Persistent Articles: (gnus)Persistent Articles.).  `Nnshimbun' uses NOV
-files for each `nnshimbun' group, and its back end is almost the same as
-`nnml'.
-
-   The following `nnshimbun' variables can be customized:
-
-`nnshimbun-keep-backlog'
-     This variable overrides the `gnus-keep-backlog' variable (*note
-     Article Backlog: (gnus)Article Backlog.) in `nnshimbun' groups.
-     If you set `nnshimbun-keep-backlog' to a number N, `nnshimbun'
-     will store at most N old articles in a buffer for later
-     re-fetching.  If this variable is non-`nil' and is not a number,
-     `nnshimbun' will store _all_ read articles (this is not a good
-     idea).  The default value is 300.
-
-     Note that smaller values may spoil the `prefetch-articles' feature
-     (see below), since `nnshimbun' uses the backlog to keep the
-     prefetched articles.
-
-`nnshimbun-directory'
-     Directory where `nnshimbun' saves NOV and marks files.  The
-     default value is `~/News/shimbun/'.  This is a server variable
-     (*note Server Variables: (gnus)Server Variables.).
-
-`nnshimbun-default-group-level'
-     The default group level overriding `gnus-level-default-subscribed'.
-     It will be applied to newly created `nnshimbun' groups.  The
-     default value is `nil'.  This is a server variable (*note Server
-     Variables: (gnus)Server Variables.).
-
-`nnshimbun-marks-is-evil'
-     If non-`nil', Gnus will never generate and use marks file for
-     `shimbun' spools.  Using marks files makes it possible to backup
-     and restore `shimbun' groups separately from `.newsrc.eld'.  If
-     you have, for some reason, set this to `t', and want to set it to
-     `nil' again, you should always remove the corresponding marks file
-     (usually named `.marks' in the `shimbun' group directory, but see
-     `nnshimbun-marks-file-name') for the group.  Then the marks file
-     will be regenerated properly by Gnus.  The default value is `nil'.
-     This is a server variable (*note Server Variables: (gnus)Server
-     Variables.).
-
-   You can use the specially made group parameter for `nnshimbun' in
-addition to the standard group parameters provided by Gnus(1).  Several
-parameters for `nnshimbun' are collected into the single group
-parameter `nnshimbun-group-parameters' which is a property list (the
-values can be different for every group).  Here's an example:
-
-     '(index-range all prefetch-articles off encapsulate-images on
-                   expiry-wait 6)
-
-   Below is the documentation for those group parameters and related
-variables.
-
-`prefetch-articles'
-     In a group where this group parameter is set to something else than
-     `off' or `nil', `nnshimbun' not only checks for new articles, but
-     also downloads them.  Though it will slow checking of new articles
-     down, you won't be kept waiting when reading articles.  In the
-     group where this group parameter is not set or its value is `nil',
-     the value of the `nnshimbun-pre-fetch-article' variable (`off' by
-     default) is used instead.
-
-`encapsulate-images'
-     In a group where this group parameter is set to something else than
-     `off' or `nil', `nnshimbun' will put image data embedded in the
-     original contents into an article as `multipart/related' parts of
-     the MIME format.  In the group where this group parameter is not
-     set or its value is `nil', the value of the
-     `nnshimbun-encapsulate-images' variable is used instead.  The
-     default value for the `nnshimbun-encapsulate-images' variable is
-     the value of the `shimbun-encapsulate-images' variable which is
-     provided in the `shimbun' library (the default value is probably
-     `t').
-
-`index-range'
-     You can specify the range of articles to be fetched from the web
-     server using the `index-range' group parameter.  To specify the
-     range, use the following values:
-
-    `nil'
-    `all'
-          all pages
-
-    `last'
-          only the latest page
-
-    `integer N'
-          the latest N pages
-
-     `Nnshimbun' checks whether there are new articles by parsing the
-     index page of the server.  It is possible that there are two or
-     more index pages on the server.  For instance, in the case of the
-     mailing list servers, index pages are generally classified
-     according to the date on which the article was posted.  It would
-     take a considerable amount of time to check all those huge index
-     pages especially if you are connecting via a slow line.
-
-     If it is possible, `nnshimbun' won't check index pages which have
-     already been checked at the last connection.  If you want to save
-     even more time, use `last'.  It makes `nnshimbun' refer to only the
-     latest index page for checking new articles.
-
-     In the group where the `index-range' group parameter is not set or
-     its value is `nil', the value of the `nnshimbun-index-range'
-     variable (`2' by default) is used.
-
-`nnshimbun-group-parameters-alist'
-     This is an Emacs Lisp variable, an alist of regexp of group names
-     and `nnshimbun' group parameters.  The default value is `nil'.
-     Each element may have the form `(REGEXP KEYWORD VALUE KEYWORD
-     VALUE...)', for example:
-
-          '("^nnshimbun\\+asahi:" index-range all prefetch-articles off
-            encapsulate-images on expiry-wait 6)
-
-     Since you can use this variable to specify the same `nnshimbun'
-     group parameters for two or more groups which have similar names
-     (i.e., those groups are likely to have similar characteristics
-     each other), it is useful that it can be used instead of
-     specifying the `nnshimbun' group parameters to several groups
-     respectively.  If the group parameter has already been set in a
-     group, that takes precedence over this variable.
-
-   You can instruct `nnshimbun' to expire articles(2).  Keep in mind
-that when an article is expired, it is not deleted from the remote
-server, it's still available there.  What is deleted is the line in
-your own NOV file for `nnshimbun'(3) corresponding to the article to be
-expired.  Then the article won't appear in the Summary buffer, forever
-and ever.
-
-   If you don't expire articles in `nnshimbun' groups, the NOV files
-will continue to grow fat indefinitely and you may see very old
-articles in the Summary buffer as if they were existing (in fact, they
-might have expired three years ago on the remote server!).  Even if you
-try to read such an article, nothing will appear in the article buffer.
-On the other hand, most mailing list servers generally offer all the
-past articles.  You may not feel like expiring articles in such groups
-in order to look back with nostalgia to the good old days and to be
-able to read, eyes filled with tears, articles which you thought long
-gone.
-
-   You can mark `nnshimbun' articles as expirable and specify the
-expiry period in each `nnshimbun' group as well as the other mail back
-ends.  However, there are a little differences between `nnshimbun' and
-the other mail back ends:
-
-   * First of all, the expiry period is determined with the following
-     priorities.  Note that the default value might be different from
-     group to group.
-
-       1. The value of the `expiry-wait' group parameter in a group.
-
-       2. The value produced by evaluating the
-          `nnmail-expiry-wait-function' variable for a group.
-
-       3. The default value provided by the `shimbun' module
-          corresponding to a group.
-
-       4. The value of the `nnmail-expiry-wait' variable.
-
-   * Second of all, the argument to be passed to the function specified
-     by the `nnmail-expiry-wait-function' variable will contain the
-     names of the back end and the server like
-     "nnshimbun+asahi:national", while only the group name will be
-     given in the case of the other mail back ends.  Here's an example:
-
-          (setq nnmail-expiry-wait-function
-                (lambda (group)
-                  (cond ((string-equal group "ding") 7)
-                        ((string-equal group "nnshimbun+ding:ding") 'never))))
-
-     This means that there are two groups for the same ding mailing
-     list; one is subscribed as a list member, the other is for reading
-     from the mailing list archive at the Gnus Towers.  Ahem, isn't it
-     clever?  The local mail files in the "ding" group will be expired
-     in seven days and your local disk space will be saved, but you can
-     read even the articles of the last century in the second group (if
-     it is really needed, though).
-
-   * Third of all, and this is written down so that you can remember it
-     when you're filled with doubt: even when all articles from a
-     `nnshimbun' group should be expired, the most recent one will be
-     kept.  This is not to satisfy your indecisive heart, it's because
-     the next time you fetch new articles for this group, `nnshimbun'
-     will know where to begin and not fetch all the articles all over
-     again.
-
-   The group parameters and the variables related to expiring
-`nnshimbun' articles are:
-
-`expiry-wait'
-     Don't be confused, please.  The `expiry-wait' group parameter is
-     provided as one of the elements of `nnshimbun-group-parameters',
-     the specially made group parameter for `nnshimbun'.  It has the
-     same name and the same meaning as the standard group parameter.
-     You may use whichever you like.  If nnshimbun's one is set to
-     non-`nil' value, it takes precedence over the standard one.  It is
-     provided in order to concentrate things related to `nnshimbun' at
-     one place of the "Gnus Customize" buffer (which will appear by
-     typing `G c' in the group buffer) and to realize managing
-     collectively by the `nnshimbun-group-parameters-alist' variable(4).
-     The values which can be used are a number of expiry period, `never'
-     or `immediate' as well as the standard group parameter.
-
-`nnshimbun-keep-unparsable-dated-articles'
-     If this variable is non-`nil', the articles of which the time of
-     creation (or the time of arrival) is unknown will never be expired,
-     since their age is unknown.  The default is `t'.  If you set this
-     variable to `nil', the articles of which the time is unknown will
-     also be expired unconditionally when the time to expire has come.
-     Well, it might prove useful for a general cleaning at the end of a
-     year.
-
-   ---------- Footnotes ----------
-
-   (1) The easiest way to specify group parameters is to type `G c' in
-the group buffer after moving the point to the group you'd like to
-customize (*note Group Parameters: (gnus)Group Parameters.).
-
-   (2) There are mainly two ways to expire articles automatically in
-the `nnshimbun' groups.  One is to add a group name regular expression
-(it should begin with "^nnshimbun\\+") to the
-`gnus-auto-expirable-newsgroups' variable and to put the expiry period
-for each group into the `nnmail-expiry-wait-function' variable.
-Another is to set the `auto-expire' group parameter to `t' and to set
-the expiry period with the `expiry-wait' group parameter in every
-`nnshimbun' group which you want to expire automatically.  See *Note
-Expiring Mail: (gnus)Expiring Mail, for more information.  In the group
-to which the `expiry-wait' group parameter is not specified, a default
-expiry period will be applied.
-
-   (3) The NOV file for `nnshimbun' is named something like
-"~/News/shimbun/asahi/national/.overview".
-
-   (4) We've already prepared the answer to the question that why
-`auto-expire' etc. aren't included in the nnshimbun's special group
-parameter?  The answer is, `expiry-wait' is handled by the `nnshimbun'
-back end, but `auto-expire' is handled by the Gnus core.  Therefore, it
-is contrary to the design policy of Gnus to extend the Gnus core
-functions so that it may work for one particular back end (i.e. reading
-a value from the nnshimbun's special group parameter).
-
-
-File: emacs-w3m.info,  Node: Mew Shimbun,  Next: Shimbun with Wanderlust,  Prev: Nnshimbun,  Up: Shimbun Library
-
-9.2 Reading web newspapers with Mew
-===================================
-
-Mew Shimbun is an Emacs Lisp program meant to be used with `shimbun'
-and Mew (version 2.1 and later).  The `mew-shimbun' module will be
-installed together with emacs-w3m if Mew, APEL, and FLIM are also
-installed.
-
-   We recommend you also see *note Mew::.
-
-  1. Setting things up
-
-     Put the following lines in the last of the `~/.mew.el' file:
-
-     ;;; Loading mew-shimbun, defining keys.
-     ;; (setq mew-shimbun-use-unseen t)              ;;; (1)
-     (require 'mew-shimbun)
-     (define-key mew-summary-mode-map "G"  (make-sparse-keymap))
-     (define-key mew-summary-mode-map "Gg" 'mew-shimbun-goto-folder)
-     (define-key mew-summary-mode-map "GG" 'mew-shimbun-goto-unseen-folder)
-     (define-key mew-summary-mode-map "Gi" 'mew-shimbun-retrieve)
-     (define-key mew-summary-mode-map "GI" 'mew-shimbun-retrieve-all)
-     (define-key mew-summary-mode-map "Gr" 'mew-shimbun-re-retrieve)
-     (define-key mew-summary-mode-map "GR" 'mew-shimbun-re-retrieve-all)
-     (define-key mew-summary-mode-map "Ge" 'mew-shimbun-expire)
-     (define-key mew-summary-mode-map "GE" 'mew-shimbun-expire-all)
-
-     ;; Specifying `shimbun' servers and groups to be read with Mew in the
-     ;; `mew-shimbun-folder-groups' variable.  Each element has the form
-     ;; `("folder" ("server.group" . range) ...)'.  You can use `all',
-     ;; `last', and a number for the `range' item.
-
-     (setq mew-shimbun-folder-groups
-           '(;; Fetching `yomiuri.national', `yomiuri.sports', etc.
-             ;; into the `+shimbun/yomiuri' folder collectively.
-             ("yomiuri"
-              ("yomiuri.national" . 2)
-              ("yomiuri.sports". 2)
-              ("yomiuri.world". 2))
-             ;; Fetching `security-memo.memo'
-             ;; into `+shimbun/security-memo'.
-             ("security-memo"
-              ("security-memo.memo" . 2))
-             ("slashdot-jp"
-              ("slashdot-jp.story" . last))
-             ;; You can read several groups in one folder (`+shimbun/emacs')
-             ;; as follows even if each group comes from a different server.
-             ("emacs"
-              ("airw.wl" . last)
-              ("emacs-w3m.emacs-w3m" . last))
-             ;; Fetching diaries into `+shimbun/hns/arisawa' and
-             ;; `+shimbun/hns/miyoshi' respectively.
-             ("hns/arisawa"
-              ("hns.arisawa" . last))
-             ("hns/miyoshi"
-              ("hns.miyoshi" . last))))
-
-     You did the fundamental setups.  For the other user definable
-     variables, use `M-x customize-group' for the `mew-shimbun' group or
-     see the source code.
-
-  2. Reading `shimbun' messages
-
-       a. Getting started
-
-          Type `G I' (`mew-shimbun-retrieve-all') first, after setting
-          things up as mentioned above.  The `shimbun' folders
-          specified by the `mew-shimbun-folder-groups' variable will be
-          created under the `+shimbun' parent folder.  Typing `G I' is
-          also useful when you have added new groups.  You can change
-          the name of the parent folder (`+shimbun' by default) by
-          customizing the `mew-shimbun-folder' variable.
-
-       b. Moving into a `shimbun' folder
-
-          You can move to any folder (including `shimbun') by typing `g'
-          (`mew-summary-goto-folder'), but `G g'
-          (`mew-shimbun-goto-folder') is restricted to moving to only
-          the `shimbun' folder.  In addition, folders which have new
-          messages (in other words, folders which have not been
-          scanned) will be displayed when using a prefix argument with
-          `G g' (i.e.  `C-u G g').  A prefix argument similarly affects
-          `G G' as well.
-
-       c. Fetching messages in each folder
-
-          You can fetch new messages for the current folder exclusively
-          by typing `G i' (`mew-shimbun-retrieve') in a `shimbun'
-          folder.
-
-       d. Fetching updated messages
-
-          If you perform the `G r' command (`mew-shimbun-re-retrieve')
-          when a particular message is being displayed, the message
-          will be updated if it is possible, and new messages will be
-          fetched.  With a prefix argument (i.e.  `C-u G r'), it will
-          attempt to update messages which are marked with the mark
-          specified by the `mew-shimbun-mark-re-retrieve' variable (`@'
-          by default).  It would be useful for CNET, etc.
-
-          The `G R' command (`mew-shimbun-re-retrieve-all') checks the
-          freshness of all messages and re-fetches the updated
-          messages.  If a prefix argument is given (i.e. `C-u G R'),
-          the messages within the region will be processed.  It is
-          probably worthwhile if the site is running the hyper nikki
-          system (`nikki' means "diary" in Japanese).
-
-  3. Managing unseen messages
-
-     If you have the following setting in the `~/.mew.el' file,
-
-          (setq mew-shimbun-use-unseen t)
-
-     newly fetched messages will be marked with the mark specified by
-     the `mew-shimbun-mark-unseen' variable (`*' by default), and it
-     will disappear automatically after reading the message.
-
-     Normally, the unseen marks will not be saved in the `.mew-cache'
-     file if scanning is not performed after adding or deleting marks
-     in the Mew summary mode, but if you add the following line to the
-     `~/.mew.el' file,
-
-          (setq mew-shimbun-use-unseen-cache-save t)
-
-     the unseen marks will be saved in the `.mew-cache' file
-     automatically for the `shimbun' groups when exiting Mew or killing
-     a folder (using `C-c C-q').  However, it is not securely saved
-     (2).  To do this securely, you had better have the habit of
-     performing the `scan update' command after reading the folder.
-
-     If you don't like the `*' mark for unseen messages, customize the
-     `mew-shimbun-mark-unseen' variable (see above).  By specifying the
-     mark by `C-u N', you will be able to lead a better life with
-     taking care of unseen messages.
-
-  4. Expiring messages
-
-     You can expire messages if you set the `mew-shimbun-expires'
-     variable beforehand.  For example:
-
-          (setq mew-shimbun-expires
-                '(("yomiuri" . 7)
-                  ("asahi" . 1)
-                  ("slashdot-jp" . 7)
-                  ("emacs" . 7)))
-
-     If you set this variable as shown above, you can specify the expiry
-     period; 7 days for `+shimbun/yomiuri', 1 day for `+shimbun/asahi'.
-     Messages in the `shimbun' folder where the expiry period is not
-     specified will never be expired.  You can use the `G e' command
-     (`mew-shimbun-expire') to expire the expirable messages in the
-     current folder.  The `G E' command (`mew-shimbun-expire-all') is
-     for expiring the expirable messages in all the `shimbun' folders.
-     Note that once the messages have been expired, you cannot recover
-     them.
-
-  5. How to mark messages with `$' as unseen
-
-     Put the following lines in the `~/.mew.el' file in order to define
-     the `$' mark and use `$' for the mark of unseen.  See
-     `http://www.mew.org/ml/mew-dist-2.0/msg01251.html' if you would
-     like to replace the `$' mark with another.
-
-     ;;---------------------------------------------------------------------
-     ;;; Code for using `$' as the unseen mark.
-     (setq mew-mark-unseen ?$)
-     (setq mew-shimbun-mark-unseen mew-mark-unseen)
-     (setq mew-mark-show-list (cons mew-mark-unseen mew-mark-show-list))
-     (setq mew-mark-afterstep-spec
-           (cons (cons mew-mark-unseen '(1 0 1 0 0 0 0))
-                 mew-mark-afterstep-spec))
-     (setq mew-mark-spec
-           (cons (list mew-mark-unseen "unseen" 0 nil nil nil nil nil)
-                 mew-mark-spec))
-     (setq mew-highlight-mark-keywords
-           (cons
-            (cons mew-mark-unseen 'mew-face-mark-unseen)
-            mew-highlight-mark-keywords))
-     (defface mew-face-mark-unseen
-       '((((class color) (type tty))
-          (:foreground "green"))
-         (((class color) (background light))
-          (:foreground "deep pink" :bold t :italic t))
-         (((class color) (background dark))
-          (:foreground "thistle"))
-         (t (:bold t)))
-       "*Face to highlight the unseen mark"
-       :group 'mew-highlight)
-     (defun mew-summary-unseen (&optional count)
-       "Put the unseen mark(default is '$') in COUNT times."
-       (interactive "P")
-       (mew-mark-put-mark-loop (function mew-summary-unseen-one) count nil))
-     (defun mew-summary-unseen-one (&optional no-msg)
-       "Put the unseen mark(default is '$') on this message."
-       (mew-mark-put-mark mew-mark-unseen no-msg))
-     (defun mew-summary-mark-unseen ()
-       "Change the '*' mark into the '$' mark."
-       (interactive)
-       (mew-summary-exchange-mark mew-mark-review mew-mark-unseen))
-     (defun mew-thread-mark-unseen ()
-       "Put the '$' mark on all messages of the current sub-thread."
-       (interactive)
-       (mew-thread-mark mew-mark-unseen))
-
-     (define-key mew-summary-mode-map "$"  'mew-summary-unseen)
-     (define-key mew-summary-mode-map "m$" 'mew-summary-mark-unseen)
-     (define-key mew-summary-mode-map "t$" 'mew-thread-mark-unseen)
-     ;;---------------------------------------------------------------------
-
-   ---------- Footnotes ----------
-
-   (1) Uncomment this line if you'd like to manage unseen messages.  It
-must be placed before the `(require 'mew-shimbun)' line.
-
-   (2) People who have set the `mew-touch-folder-p' variable to `t'
-will succeed 100% in saving marks, but people who use `nil' value seem
-not to be 0% successful.
-
-
-File: emacs-w3m.info,  Node: Shimbun with Wanderlust,  Next: Shimbun local mode,  Prev: Mew Shimbun,  Up: Shimbun Library
-
-9.3 Reading web newspapers with Wanderlust
-==========================================
-
-Wanderlust includes `elmo-shimbun' as an ELMO module, so you can read
-`shimbun' by just accessing a folder beginning with `@' (*note Shimbun
-Folder: (wl)Shimbun Folder.).
-
-
-File: emacs-w3m.info,  Node: Shimbun local mode,  Next: Shimbun Sites,  Prev: Shimbun with Wanderlust,  Up: Shimbun Library
-
-9.4 Using a shell script to fetch shimbun feeds
-===============================================
-
-If you read lots of `shimbuns', checking those for new articles can
-take some time due to emacs-w3m retrieving the feeds one by one.  If you
-want to speed this up, you can use a shell script to retrieve the feeds,
-which you can either call manually (e.g. from within Emacs) or
-automatically through schedulers like cron.  The feeds must be saved in
-specially named files, and emacs-w3m will then use those files instead
-of calling w3m.
-
-   The following variables control the local mode:
-
-`shimbun-use-local'
-     Setting this to `t' will activate the local mode, meaning that
-     emacs-w3m will first check if a feed is available as a local file.
-     If it cannot be found, it will be retrieved through w3m as usual.
-
-`shimbun-local-path'
-     This is the directory where the shimbun files are stored.  The
-     default value is `w3m-default-save-directory'.
-
-   The file name for a feed is expected to be the MD5 of the URL,
-truncated to the first 10 characters, appended with the string
-`_shimbun'.  You can easily generate the file name for a feed in Emacs
-through
-
-     (concat (substring (md5 "http://example/feed") 0 10) "_shimbun")
-
-   If you use Gnus with `nnshimbun', there is already a function which
-will generate a download shell script for all currently subscribed
-shimbun groups.  Just call `nnshimbun-generate-download-script', and it
-will generate the shell script in a new buffer which you can save
-afterwards.  If you call the function with a prefix, it will put an
-ampersand after each w3m call, so that the feeds are retrieved in
-parallel.
-
-
-File: emacs-w3m.info,  Node: Shimbun Sites,  Next: Shimbun Basics,  Prev: Shimbun local mode,  Up: Shimbun Library
-
-9.5 Sites supported by Shimbun
-==============================
-
-This section provides the list of sites supported by `shimbun' library.
-Unfortunately for people who cannot understand Japanese, almost of
-supported sites are written in Japanese.
-
-* Menu:
-
-* Newspapers Supported by Shimbun::
-* News Sites Supported by Shimbun::
-* Mailing Lists Supported by Shimbun::
-* Sport Sites Supported by Shimbun::
-* Misc Sites Supported by Shimbun::
-
-
-File: emacs-w3m.info,  Node: Newspapers Supported by Shimbun,  Next: News Sites Supported by Shimbun,  Up: Shimbun Sites
-
-9.5.1 Newspapers Supported by Shimbun
--------------------------------------
-
-These are newspapers that are supported by `shimbun' library.
-
-Asahi Shimbun (http://www.asahi.com/)
-     asahi.book asahi.book.column asahi.book.news asahi.book.paperback
-     asahi.book.review asahi.book.special asahi.business asahi.car
-     asahi.culture asahi.digital asahi.editorial asahi.edu asahi.english
-     asahi.food asahi.health asahi.housing asahi.igo asahi.international
-     asahi.international.asia asahi.international.column
-     asahi.international.special asahi.international.world asahi.job
-     asahi.kansai asahi.kansai.entertainment asahi.kansai.kokoro
-     asahi.kansai.sumai asahi.kansai.taberu asahi.komimi asahi.life
-     asahi.life.column asahi.national asahi.politics asahi.rss
-     asahi.science asahi.shopping asahi.shopping.column
-     asahi.shopping.yakimono asahi.shougi asahi.sports
-     asahi.sports.baseball asahi.sports.battle asahi.sports.etc
-     asahi.sports.football asahi.sports.golf asahi.sports.rugby
-     asahi.sports.usa asahi.sports.winter asahi.tenjin asahi.travel
-     asahi.wakata
-
-     Those groups generate articles containing only text by default.
-     If you would like to make them generate HTML articles that contain
-     not only text but also photographs, add the following line to your
-     `~/.emacs' file:
-
-          (setq shimbun-asahi-prefer-text-plain nil)
-
-     On the other hand, you can also use the `asahi-html' back end to
-     generate HTML articles.  In order to use it, specify
-     `asahi-html.business' instead of `asahi.business' as the group
-     name for example.
-
-Asahi Shimbun (http://mytown.asahi.com/)
-     asahi-mytown.(hokkaido...okinawa)
-
-     The Asahi Shimbun local-news sections including all the
-     prefectures of Japan.
-
-BBC (http://www.bbc.co.uk/)
-     bbc.news
-
-Die Welt (http://www.welt.de/)
-     welt-de.news
-
-Die Zeit (http://www.zeit.de/)
-     zeit-de.auto zeit-de.computer zeit-de.deutschland
-     zeit-de.feuilleton zeit-de.gesundheit zeit-de.international
-     zeit-de.leben zeit-de.literatur zeit-de.musik zeit-de.news
-     zeit-de.reisen zeit-de.schule zeit-de.sport zeit-de.studium
-     zeit-de.wirtschaft zeit-de.wissen zeit-de.zuender
-
-Gendai Net (http://gendai.net/)
-     gendai-net.today gendai-net.syakai gendai-net.sports
-     gendai-net.geino gendai-net.wadai gendai-net.kenko
-     gendai-net.syoku gendai-net.book
-
-Mainichi jp (http://mainichi.jp/)
-(This site has been shifted from MSN in October, 2007)
-     mainichi.flash mainichi.sports mainichi.entertainment
-     mainichi.entertainment.art mainichi.mantan mainichi.electronics
-     mainichi.weekly mainichi.opinion.editorial mainichi.opinion.yoroku
-     mainichi.opinion.hasshinbako mainichi.opinion.eye
-     mainichi.opinion.hito mainichi.opinion.kinji
-     mainichi.opinion.yuraku mainichi.opinion.closeup
-     mainichi.opinion.kaisetsu mainichi.opinion.newsup
-
-     Those groups generate HTML articles containing photographs by
-     default.  If you would like to make them generate articles that
-     contain only text, add the following line to your `~/.emacs' file:
-
-          (setq shimbun-mainichi-prefer-text-plain t)
-
-The New York Times (http://www.nytimes.com/)
-     nytimes.homepage nytimes.news.business
-     nytimes.news.business.media&advertising
-     nytimes.news.business.worldbusiness
-     nytimes.news.business.smallbusiness
-     nytimes.news.business.yourmoney nytimes.news.business.dealbook
-     nytimes.news.education nytimes.news.health
-     nytimes.news.health.policy nytimes.news.health.psychology
-     nytimes.news.world nytimes.news.world.africa
-     nytimes.news.world.americas nytimes.news.world.asia
-     nytimes.news.world.europe nytimes.news.world.middleeast
-     nytimes.news.us nytimes.news.newyork nytimes.news.newyork.thecity
-     nytimes.news.newyork.metro nytimes.news.obituaries
-     nytimes.news.science nytimes.news.science.earth
-     nytimes.news.science.nutrition nytimes.news.science.space
-     nytimes.news.sports nytimes.news.sports.basketball.college
-     nytimes.news.sports.football.college nytimes.news.sports.golf
-     nytimes.news.sports.hockey nytimes.news.sports.other
-     nytimes.news.sports.baseball.pro nytimes.news.sports.basketball.pro
-     nytimes.news.sports.football.pro nytimes.news.sports.soccer
-     nytimes.news.technology nytimes.news.technology.bits
-     nytimes.news.technology.circuits nytimes.news.technology.pogue
-     nytimes.news.washington nytimes.features.arts
-     nytimes.features.arts.design nytimes.features.arts.music
-     nytimes.features.arts.television nytimes.features.automobiles
-     nytimes.features.books nytimes.features.books.review
-     nytimes.features.dining&wine nytimes.features.fashion
-     nytimes.features.fashion.thursdaystyles
-     nytimes.features.fashion.weddings nytimes.features.home&garden
-     nytimes.features.jobs nytimes.features.magazine
-     nytimes.features.movie.news nytimes.features.movie.reviews
-     nytimes.features.realestate nytimes.features.theater
-     nytimes.features.travel nytimes.features.travel.escapes
-     nytimes.features.week_in_review nytimes.additional.pop_top
-     nytimes.opinion.editorial
-
-     The New York Times began to offer news articles for free on
-     September 19, 2007.  In spite of having said `charset=iso-8859-1',
-     this site often uses the `windows-1252' charset that is a superset
-     of `iso-8859-1'.  `Shimbun' (and also emacs-w3m) works in even
-     such a case if the `windows-1252' coding system is available in
-     your (X)Emacs.
-
-Nikkan Sports (http://www.nikkansports.com/)
-     nikkansports.flash nikkansports.baseball
-     nikkansports.baseball.highschool nikkansports.baseball.amateur
-     nikkansports.baseball.mlb nikkansports.soccer
-     nikkansports.soccer.japan nikkansports.soccer.world
-     nikkansports.sports nikkansports.sumo nikkansports.nba
-     nikkansports.nfl nikkansports.nhl nikkansports.rugby
-     nikkansports.golf nikkansports.motor nikkansports.battle
-     nikkansports.race nikkansports.race.kka nikkansports.entertainment
-     nikkansports.cinema nikkansports.general
-
-Nihon Keizai Shimbun (http://www.nikkei.co.jp/)
-     nikkei.top nikkei.main nikkei.keizai nikkei.sangyo nikkei.tento
-     nikkei.kansai nikkei.it.business nikkei.it.busi_gyoukai
-     nikkei.it.biz-system nikkei.it.sox nikkei.it.data nikkei.it.taidan
-     nikkei.it.internet nikkei.it.broad nikkei.it.net_gyoukai
-     nikkei.it.iptel nikkei.it.tele nikkei.it.broadcast
-     nikkei.it.internet-column nikkei.it.contents nikkei.it.ec
-     nikkei.it.policy nikkei.it.e-gov nikkei.it.mobile
-     nikkei.it.mob_gyoukai nikkei.it.mobsoft nikkei.it.mobcon
-     nikkei.it.money nikkei.it.one nikkei.it.security
-     nikkei.it.net_crime nikkei.it.digital nikkei.it.pc nikkei.kokunai
-     nikkei.markets nikkei.kawase nikkei.kinri nikkei.ft nikkei.dj
-     nikkei.ngyoseki nikkei.gyosuuchi nikkei.gyoseki nikkei.china
-     nikkei.market nikkei.kaigai nikkei.seiji nikkei.shakai nikkei.retto
-     nikkei.sports nikkei.newpro nikkei.release nikkei.release.it.comp
-     nikkei.release.it.peri nikkei.release.it.sys nikkei.release.it.cont
-     nikkei.release.it.net nikkei.release.it.lsi nikkei.release.it.game
-     nikkei.release.it.etc nikkei.release.dist.depart
-     nikkei.release.dist.ryohan nikkei.release.dist.zakka
-     nikkei.release.dist.cosme nikkei.release.dist.car
-     nikkei.release.dist.book nikkei.release.dist.record
-     nikkei.release.dist.food nikkei.release.dist.mercha
-     nikkei.release.dist.mail nikkei.release.dist.netshop
-     nikkei.release.dist.etc nikkei.release.money.bank
-     nikkei.release.money.sec nikkei.release.money.am
-     nikkei.release.money.insu nikkei.release.money.etc
-     nikkei.release.maker.chemi nikkei.release.maker.mecha
-     nikkei.release.maker.car nikkei.release.maker.elec
-     nikkei.release.maker.food nikkei.release.maker.sports
-     nikkei.release.maker.apparel nikkei.release.maker.commu
-     nikkei.release.maker.etc nikkei.release.service.medic
-     nikkei.release.service.rest nikkei.release.service.trans
-     nikkei.release.service.energy nikkei.release.service.enter
-     nikkei.release.service.env nikkei.release.service.consul
-     nikkei.release.service.edu nikkei.release.service.haken
-     nikkei.release.service.life nikkei.release.service.media
-     nikkei.release.service.lease nikkei.release.service.travel
-     nikkei.release.service.etc nikkei.release.const.const
-     nikkei.release.const.house nikkei.release.const.etc nikkei.shasetsu
-
-MSN Sankei News (http://sankei.jp.msn.com/)
-(This site has been shifted to MSN in October, 2007)
-     sankei.news.shakai sankei.news.kokusai sankei.news.seiji
-     sankei.news.keizai sankei.news.seikatsu sankei.news.kyouiku
-     sankei.news.sports sankei.news.cutlure sankei.news.chiho
-     sankei.special.komori sankei.special.kuroda sankei.special.ito
-     sankei.special.tamura sankei.special.jieitai sankei.special.kenpo
-     sankei.special.kyouiku sankei.special.kiko sankei.ronsetsu.shucho
-     sankei.ronsetsu.sankeisho sankei.ronsetsu.seiron
-
-Spiegel Online (http://www.spiegel.de/)
-     spiegel.news
-
-Sponichi (http://www.sponichi.co.jp/)
-     sponichi.baseball sponichi.soccer sponichi.usa sponichi.others
-     sponichi.society sponichi.entertainment sponichi.horseracing
-
-Sueddeutsche Zeitung (http://www.sueddeutsche.de/)
-     sueddeutsche-de.alles sueddeutsche-de.nachrichten
-     sueddeutsche-de.politik sueddeutsche-de.wirtschaft
-     sueddeutsche-de.finanzen sueddeutsche-de.kino
-     sueddeutsche-de.kultur sueddeutsche-de.sport
-     sueddeutsche-de.muenchen sueddeutsche-de.panorama
-     sueddeutsche-de.leben sueddeutsche-de.gesundheit
-     sueddeutsche-de.computer
-
-Yomiuri Shimbun (http://www.yomiuri.co.jp/)
-     yomiuri.atmoney yomiuri.editorial yomiuri.entertainment
-     yomiuri.iryou yomiuri.kyoiku yomiuri.kyoiku.children
-     yomiuri.kyoiku.english yomiuri.kyoiku.qanda
-     yomiuri.kyoiku.renaissance yomiuri.kyoiku.special yomiuri.national
-     yomiuri.politics yomiuri.science yomiuri.sports yomiuri.world
-
-     Those groups generate articles containing only text by default.
-     If you would like to make them generate HTML articles that contain
-     not only text but also photographs, add the following line to your
-     `~/.emacs' file:
-
-          (setq shimbun-yomiuri-prefer-text-plain nil)
-
-     On the other hand, you can also use the `yomiuri-html' back end to
-     generate HTML articles.  In order to use it, specify
-     `yomiuri-html.atmoney' instead of `yomiuri.atmoney' as the group
-     name for example.
-
-
-File: emacs-w3m.info,  Node: News Sites Supported by Shimbun,  Next: Mailing Lists Supported by Shimbun,  Prev: Newspapers Supported by Shimbun,  Up: Shimbun Sites
-
-9.5.2 News Sites Supported by Shimbun
--------------------------------------
-
-These are news sites that are supported by `shimbun' library.
-
-Al Jazeera (http://english.aljazeera.net/)
-     aljazeera.news aljazeera.africa aljazeera.america
-     aljazeera.asia-pacific aljazeera.central-asia aljazeera.europe
-     aljazeera.middle-east aljazeera.focus aljazeera.business
-     aljazeera.sport aljazeera.programmes
-
-CNET (http://news.com.com/)
-     cnet.news cnet.enterprise.software cnet.enterprise.hardware
-     cnet.security cnet.networking cnet.personal.technology
-     cnet.newsmakers cnet.perspectives
-
-CNET Japan (http://japan.cnet.com/)
-     cnet-jp.general cnet-jp.news cnet-jp.special cnet-jp.opinion
-     cnet-jp.blog.geetstate cnet-jp.blog.kenn cnet-jp.blog.lessig
-     cnet-jp.blog.matsumura cnet-jp.blog.nakajima cnet-jp.blog.saeki
-     cnet-jp.blog.sakamoto cnet-jp.blog.sasaki cnet-jp.blog.sentan
-     cnet-jp.blog.staff cnet-jp.blog.takawata cnet-jp.blog.watanabe
-
-CNN Japan (http://www.cnn.co.jp/)
-     cnn-jp.business cnn-jp.fringe cnn-jp.science cnn-jp.showbiz
-     cnn-jp.sports cnn-jp.top cnn-jp.usa cnn-jp.world
-
-De-Bug Magazine (http://www.de-bug.de/)
-     debugmagazin-de.frontpage debugmagazin-de.musik
-     debugmagazin-de.reviews debugmagazin-de.magazin
-     debugmagazin-de.medien debugmagazin-de.podcast
-     debugmagazin-de.musiktechnik debugmagazin-de.screen
-     debugmagazin-de.gadgets debugmagazin-de.games debugmagazin-de.mode
-
-Engadget Japanese (http://japanese.engadget.com/)
-     engadget-ja.top
-
-Excite News (http://www.excite.co.jp/)
-     excite.bit-koneta excite.world-odd
-
-FAU-IAA (http://www.fau.org/)
-     fau.news
-
-Heise Online (http://www.heise.de/)
-     heise.news heise.telepolis
-
-Infoshop News (http://news.infoshop.org/)
-     infoshop.news
-
-Impress (http://www.watch.impress.co.jp/)
-     impress.enterprise impress.pc impress.dc impress.akiba impress.av
-     impress.game impress.k-tai impress.internet impress.bb
-     impress.forest impress.robot impress.kaden impress.car
-
-ITmedia (http://www.itmedia.co.jp/)
-     itmedia.news.bursts itmedia.news.domestic itmedia.news.foreign
-     itmedia.news.products itmedia.news.technology itmedia.news.web20
-     itmedia.news.nettopics itmedia.news.society itmedia.news.security
-     itmedia.news.industry itmedia.news.research itmedia.news.sp_amd
-     itmedia.anchordesk itmedia.bizid itmedia.enterprise
-     itmedia.+D.plusd itmedia.+D.mobile itmedia.+D.pcupdate
-     itmedia.+D.lifestyle itmedia.+D.games itmedia.+D.docomo
-     itmedia.+D.au_kddi itmedia.+D.vodafone itmedia.+D.shopping
-     itmedia.+D.lifestyle.column.asakura
-     itmedia.+D.lifestyle.column.honda
-     itmedia.+D.lifestyle.column.kobayashi
-     itmedia.+D.lifestyle.column.kodera
-     itmedia.+D.lifestyle.column.nishi
-     itmedia.+D.lifestyle.column.ogikubo
-     itmedia.+D.lifestyle.column.tachibana
-     itmedia.+D.lifestyle.column.takemura
-     itmedia.+D.lifestyle.column.unakami
-
-Japan Times (http://www.japantimes.co.jp/)
-     japantimes.general japantimes.business
-
-LAUT AG (http://www.laut.de/)
-     laut-de.news laut-de.platten laut-de.platten_alternative
-     laut-de.platten_dance laut-de.platten_hiphop platten_jazz
-     laut-de.platten_metal laut-de.platten_pop laut-de.platten_rnb
-     laut-de.platten_rock
-
-N24 (http://www.n24.de/)
-     n24-de.boerse n24-de.boulevard n24-de.nachrichten n24-de.netnews
-     n24-de.politik n24-de.sport n24-de.wirtschaft
-
-Open Tech Press (http://opentechpress.jp/)
-     opentechpress-jp.general opentechpress-jp.enterprise
-     opentechpress-jp.opensource opentechpress-jp.security
-     opentechpress-jp.news opentechpress-jp.pr
-
-Perlentaucher (http://www.perlentaucher.de/)
-     perlentaucher-de.aktuell
-
-Rediff.com (http://www.rediff.com/)
-     rediff.news
-
-Slashdot (http://www.slashdot.org/)
-     slashdot.frontpage slashdot.apple slashdot.askslashdot
-     slashdot.books slashdot.developers slashdot.games
-     slashdot.hardware slashdot.interviews slashdot.IT slashdot.linux
-     slashdot.mobile slashdot.politics slashdot.science
-
-     The following variables are available for configuring the comment
-     section of the Slashdot shimbun:
-
-    `shimbun-slashdot-get-comments'
-          If set to `t' (the default), comments will be retrieved for
-          every article.  They are separated from the intro text
-          through a formfeed character (i.e. "^L"); you can access them
-          by scrolling the article buffer as usual (for Gnus you can
-          use the "Next page" button and the "Previous page" button).
-          Setting this variable to `nil' will deactivate retrieval of
-          comments.
-
-    `shimbun-slashdot-comment-threshold'
-          Threshold for displayed comments (default: 3).  Can be a
-          number between -1 (all comments) and 5 (highest rating).
-
-    `shimbun-slashdot-comment-display'
-          Type of display for the comments (default: "flat").  Can be
-          either "flat", "thread" or "nested".  Note that this must be
-          a string, not a symbol.
-
-Slashdot Japan (http://slashdot.jp/)
-     slashdot-jp.story slashdot-jp.askslashdot slashdot-jp.bookreview
-     slashdot-jp.bsd slashdot-jp.developers slashdot-jp.interview
-     slashdot-jp.linux slashdot-jp.mac slashdot-jp.mobile
-     slashdot-jp.science slashdot-jp.security slashdot-jp.slash
-     slashdot-jp.it slashdot-jp.hardware slashdot-jp.diary.oliver
-
-     Add appropriate configurations to the variable
-     `shimbun-slashdot-jp-group-alist', you can browse other diaries
-     provided at `http://slashdot.jp/'.
-
-Tech-On! by NikkeiBP (http://techon.nikkeibp.co.jp/)
-     tech-on.latestnews tech-on.mobile tech-on.bbint tech-on.d-ce
-     tech-on.AT tech-on.edaonline tech-on.device tech-on.lsi
-     tech-on.silicon tech-on.observer tech-on.fpd tech-on.mono
-     tech-on.embedded tech-on.mecha tech-on.MEMS tech-on.nano
-     tech-on.carele tech-on.board tech-on.mcu tech-on.PLM
-     tech-on.memory tech-on.measurement tech-on.column.mot
-
-     Tech-On! is a technology news site brought by NikkeiBP.  At least
-     in autumn 2007, it doesn't seem to be, but a login account (that's
-     for free) was needed to read the whole contents of articles
-     formerly.  If it becomes required again in the future, visit the
-     registration page
-     (http://techon.nikkeibp.co.jp/guide/inf_regi.html) to have it.
-     The following two variables control how you log in:
-
-    `shimbun-tech-on-user-name'
-          User name to log in on Tech-On! with.  If it is `nil', you
-          will be prompted for a user name when logging in on Tech-On!
-          with.  If it is a string, it will be used as a user name and
-          you will never be prompted.  If it is neither `nil' nor a
-          string (that is the default), you will never log in.
-
-    `shimbun-tech-on-password'
-          Password to use to log in on Tech-On! with.  If it is `nil',
-          you will be prompted for a password when logging in on
-          Tech-On! with.  If it is a string, it will be used as a
-          password and you will never be prompted.  If it is neither
-          `nil' nor a string (that is the default), you will never log
-          in.
-
-     Entering them is required only once in the Emacs session at the
-     first time to start reading a Tech-On! article.
-
-HotWired Japan (http://hotwired.goo.ne.jp/)
-     wired-jp.news wired-jp.business wired-jp.culture
-     wired-jp.technology wired-jp.blog.ogura wired-jp.blog.sasaki
-     wired-jp.blog.takahashi
-
-Yahoo! Japan (http://headlines.yahoo.co.jp/)
-     yahoo.topnews yahoo.news yahoo.politics yahoo.society yahoo.people
-     yahoo.business-all yahoo.market yahoo.stock yahoo.industry
-     yahoo.international yahoo.entertainment yahoo.sports yahoo.computer
-     yahoo.zenkoku yahoo.hokkaido yahoo.aomori yahoo.iwate yahoo.miyagi
-     yahoo.akita yahoo.yamagata yahoo.fukushima yahoo.tokyo
-     yahoo.kanagawa yahoo.chiba yahoo.saitama yahoo.ibaraki
-     yahoo.tochigi yahoo.gunma yahoo.yamanashi yahoo.nagano
-     yahoo.niigata yahoo.toyama yahoo.ishikawa yahoo.fukui yahoo.aichi
-     yahoo.gifu yahoo.shizuoka yahoo.mie yahoo.osaka yahoo.hyogo
-     yahoo.kyoto yahoo.shiga yahoo.nara yahoo.wakayama yahoo.tottori
-     yahoo.shimane yahoo.okayama yahoo.hiroshima yahoo.yamaguchi
-     yahoo.tokushima yahoo.kagawa yahoo.ehime yahoo.kochi yahoo.fukuoka
-     yahoo.saga yahoo.nagasaki yahoo.kumamoto yahoo.oita yahoo.miyazaki
-     yahoo.kagoshima yahoo.okinawa
-
-     The yahoo.news group retrieves the headline news and also the
-     flash news.  Those groups generate HTML articles by default.  If
-     you would like to make them generate articles containing only
-     text, add the following line to your `~/.emacs' file:
-
-          (setq shimbun-yahoo-prefer-text-plain t)
-
-ZDNet Japan (http://japan.zdnet.com/)
-     zdnet-jp.news zdnet-jp.news.network zdnet-jp.news.hardware
-     zdnet-jp.news.software zdnet-jp.news.manage zdnet-jp.news.security
-     zdnet-jp.news.internet zdnet-jp.news.os zdnet-jp.news.db
-     zdnet-jp.news.system zdnet-jp.column zdnet-jp.column.sp1
-     zdnet-jp.column.netsecurity1 zdnet-jp.column.ea1
-     zdnet-jp.column.btl zdnet-jp.column.solutionIT
-     zdnet-jp.channel.security zdnet-jp.channel.ilm zdnet-jp.blog.iida
-     zdnet-jp.blog.mhatta zdnet-jp.blog.kurei zdnet-jp.blog.opensource
-     zdnet-jp.blog.soa zdnet-jp.blog.dp
-
-The Onion (http://www.theonion.com/)
-     the-onion.news
-
-
-File: emacs-w3m.info,  Node: Mailing Lists Supported by Shimbun,  Next: Sport Sites Supported by Shimbun,  Prev: News Sites Supported by Shimbun,  Up: Shimbun Sites
-
-9.5.3 Mailing Lists Supported by Shimbun
-----------------------------------------
-
-These are mailing list archives supported by `shimbun' library.
-
-Semi-gnus Mailing List in Japan (http://lists.airs.net/semi-gnus/archive/)
-     airs.semi-gnus-ja
-
-Wanderlust Mailing List (http://lists.airs.net/)
-     airs.wl airs.wl-en
-
-Big Brother DataBase Mailing List (http://www.rc.tutrp.tut.ac.jp/bbdb-ml/)
-     bbdb-ml.bbdb-ml
-
-GNOME Mailing List (http://mail.gnome.org/archives/)
-     gnome.balsa-list gnome.calendar-list gnome.cvs-commits-list
-     gnome.foundation-announce gnome.foundation-list gnome.fplan-list
-     gnome.gconf-list gnome.gdome gnome.gnome-1.4-list
-     gnome.gnome-announce-list gnome.gnome-components-list
-     gnome.gnome-db-list gnome.gnome-de gnome.gnome-debugger-list
-     gnome.gnome-devel-list gnome.gnome-doc-list gnome.gnome-gui-list
-     gnome.gnome-hackers gnome.gnome-hackers-readonly
-     gnome.gnome-hackers-test gnome.gnome-i18n gnome.gnome-i18n-tools
-     gnome.gnome-kde-list gnome.gnome-list gnome.gnome-office-list
-     gnome.gnome-pilot-list gnome.gnome-sound-list
-     gnome.gnome-themes-list gnome.gnome-ui-hackers
-     gnome.gnome-web-list gnome.gnome-webmaster-list
-     gnome.gnome-workshop-list gnome.gnomecc-list gnome.gnumeric-list
-     gnome.gtk-app-devel-list gnome.gtk-devel-list gnome.gtk-doc-list
-     gnome.gtk-i18n-list gnome.gtk-list gnome.gtk-perl-list
-     gnome.guppi-list gnome.libart gnome.libart-hackers gnome.orbit-list
-     gnome.vote gnome.wm-spec-list gnome.xml gnome.xslt
-
-Java Conference Mailing List (http://www.java-conf.gr.jp/archives/)
-     javaconf.servlet-ml javaconf.business-ml
-     javaconf.duke-in-the-box-ml javaconf.jfriends-ml javaconf.JGT-ml
-     javaconf.jini-ml javaconf.ejb-ml javaconf.cm-ml javaconf.horb-ml
-     javaconf.talk-ml
-
-LinuxCE JP Mailing List (http://www.peanuts.gr.jp/~kei/ml-archive/)
-     linuxce-jp.users
-
-Mule Mailing List (http://www.m17n.org/)
-     m17n.mule-ja m17n.mule
-
-Meadow Mailing List (http://www.ysnb.net/meadow/)
-     meadow.meadow-develop meadow.meadow-users-jp
-
-Mew Mailing List (http://www.mew.org/ml/)
-     mew.mew-dist mew.mew-win32 mew.mew-int
-
-MagicPoint Mailing List (http://www.mew.org/ml/)
-     mew.mgp-users mew.mgp-users-jp
-
-www.namazu.org Mailing Lists (http://www.namazu.org/cgi-bin/mailman/listinfo)
-     namazu.kakasi-commits namazu.kakasi-dev namazu.migemo
-     namazu.namazu-users-en namazu.namazu-users-ja
-     namazu.namazu-devel-ja namazu.namazu-devel-en
-     namazu.namazu-win32-users-ja namazu.sary
-
-emacs-w3m Mailing List (http://emacs-w3m.namazu.org/ml/)
-     emacs-w3m.emacs-w3m
-
-NetBSD JP Mailing List (http://www.jp.netbsd.org/ja/JP/ml/)
-     netbsd.announce-ja netbsd.junk-ja netbsd.tech-misc-ja
-     netbsd.tech-pkg-ja netbsd.port-arm32-ja netbsd.port-hpcmips-ja
-     netbsd.port-mac68k-ja netbsd.port-mips-ja netbsd.port-powerpc-ja
-     netbsd.hpcmips-changes-ja netbsd.members-ja netbsd.admin-ja
-     netbsd.www-changes-ja
-
-Ruby Mailing List (http://blade.nagaokaut.ac.jp/)
-     ruby.comp.lang.ruby ruby.fj.comp.lang.ruby ruby.ruby-dev
-     ruby.ruby-ext ruby.ruby-list ruby.ruby-math ruby.ruby-talk
-
-Toshiba Linux Users JP Mailing List (http://linux.toshiba-dme.co.jp/ML/tlinux-users-j/)
-     toshiba.linux-users-j
-
-w3m-dev Mailing List (http://mi.med.tohoku.ac.jp/~satodai/w3m-dev/)
-     w3m-dev.w3m-dev w3m-dev.w3m-dev-en
-
-digiko Mailing List (http://yar-3.net/digiko/)
-     digiko.digiko
-
-XEmacs Mailing List (http://list-archive.xemacs.org/)
-     xemacs.xemacs-announce xemacs.xemacs-beta-ja xemacs.xemacs-beta
-     xemacs.xemacs-build-reports xemacs.xemacs-cvs xemacs.xemacs-design
-     xemacs.xemacs-mule xemacs.xemacs-nt xemacs.xemacs-patches
-     xemacs.xemacs-users-ja xemacs.xemacs
-
-Security MEMO Mailing List (http://memo.st.ryukoku.ac.jp/archive/)
-     security-memo.memo security-memo.free-memo
-     security-memo.social-memo
-
-     Please note that userid and passowrd are required for
-     `security-memo.*' so you have to write;
-
-          machine memo.st.ryukoku.ac.jp
-          realm input username/password = archives/archives
-          login archives
-          passwd archives
-
-          machine memo.st.ryukoku.ac.jp
-          realm input user: archives / password: archives
-          login archives
-          passwd archives
-
-     in `~/.w3m/passwd' and remove group and others access permissions
-     from the file.
-
-Debian JP Mailing List (http://lists.debian.or.jp/)
-     debian-jp.debian-announce debian-jp.debian-devel
-     debian-jp.debian-www debian-jp.debian-users debian-jp.debian-policy
-     debian-jp.jp-qa
-
-Debian Mailing List (http://lists.debian.org)
-     debian.debian-announce debian.debian-commercial
-     debian.debian-firewall debian.debian-french debian.debian-isp
-     debian.debian-italian debian.debian-kde debian.debian-laptop
-     debian.debian-news debian.debian-news-german
-     debian.debian-news-portuguese debian.debian-security-announce
-     debian.debian-testing debian.debian-user debian.debian-user-catalan
-     debian.debian-user-french debian.debian-user-polish
-     debian.debian-user-portuguese debian.debian-user-spanish
-     debian.debian-user-swedish debian.debian-admintool
-     debian.debian-apache debian.debian-autobuild debian.debian-beowulf
-     debian.debian-boot debian.debian-cd debian.debian-ctte
-     debian.debian-debbugs debian.debian-devel
-     debian.debian-devel-announce debian.debian-devel-french
-     debian.debian-devel-games debian.debian-devel-spanish
-     debian.debian-doc debian.debian-dpkg debian.debian-emacsen
-     debian.debian-events-eu debian.debian-events-na debian.debian-faq
-     debian.debian-gcc debian.debian-glibc debian.debian-gtk-gnome
-     debian.debian-hams debian.debian-ipv6 debian.debian-java
-     debian.debian-jr debian.debian-med debian.debian-mentors
-     debian.debian-newmaint debian.debian-newmaint-admin
-     debian.debian-ocaml-maint debian.debian-openoffice
-     debian.debian-perl debian.debian-pilot debian.debian-policy
-     debian.debian-pool debian.debian-python debian.debian-qa
-     debian.debian-qa-private debian.debian-release
-     debian.debian-security debian.debian-snapshots
-     debian.debian-tetex-maint debian.debian-toolchain
-     debian.debian-vote debian.debian-wnpp debian.debian-www
-     debian.debian-x debian.deity debian.debian-chinese
-     debian.debian-chinese-big5 debian.debian-chinese-gb
-     debian.debian-esperanto debian.debian-i18n debian.debian-japanese
-     debian.debian-l10n-catalan debian.debian-l10n-dutch
-     debian.debian-l10n-english debian.debian-l10n-french
-     debian.debian-l10n-italian debian.debian-l10n-portuguese
-     debian.debian-l10n-spanish debian.debian-laespiral
-     debian.debian-russian debian.debian-simplified-chinese
-     debian.debian-68k debian.debian-alpha debian.debian-arm
-     debian.debian-bsd debian.debian-hppa debian.debian-hurd
-     debian.debian-ia64 debian.debian-mips debian.debian-parisc
-     debian.debian-powerpc debian.debian-s390 debian.debian-sparc
-     debian.debian-superh debian.debian-ultralinux debian.debian-win32
-     debian.debian-all-changes debian.debian-alpha-changes
-     debian.debian-arm-changes debian.debian-books
-     debian.debian-cd-vendors debian.debian-changes
-     debian.debian-consultants debian.debian-curiosa
-     debian.debian-devel-all-changes debian.debian-devel-alpha-changes
-     debian.debian-devel-arm-changes debian.debian-devel-changes
-     debian.debian-devel-hurd-i386-changes
-     debian.debian-devel-i386-changes debian.debian-devel-m68k-changes
-     debian.debian-devel-powerpc-changes
-     debian.debian-devel-sparc-changes debian.debian-hurd-i386-changes
-     debian.debian-i386-changes debian.debian-legal
-     debian.debian-m68k-changes debian.debian-mirrors
-     debian.debian-powerpc-changes debian.debian-project
-     debian.debian-publicity debian.debian-sgml
-     debian.debian-sparc-changes debian.lcs-eng debian.lsb-confcall
-     debian.lsb-discuss debian.lsb-impl debian.lsb-spec debian.lsb-test
-     debian.spi-announce debian.spi-general debian.vgui-discuss
-
-KDE Mailing List in Japan (http://www.kde.gr.jp/ml/)
-     kde.Kuser kde.Kdeveloper
-
-Geocrawler (http://www.geocrawler.com/)
-     All archives of Geocrawler are supported by `shimbun' library.  You
-     can use the command `M-x shimbun-geocrawler-add-group <RET>', to
-     add your favorite archive to the variable
-     `shimbun-geocrawler-group-alist'.
-
-Mailing list ARChives (http://marc.theaimsgroup.com/)
-     Mailing list ARChives (MARC) are supported by `shimbun' library.
-     Add a group name of your favorite archive and its URL to the
-     variable `shimbun-marc-aims-group-alist', and you can browse it.
-
-RedHat Mailing List (http://sources.redhat.com/ml/)
-     redhat.automake redhat.bug-automake redhat.automake-prs
-     redhat.automake-cvs redhat.binutils redhat.binutils-cvs
-     redhat.c++-embedded redhat.crossgcc redhat.cgen redhat.cgen-prs
-     redhat.cgen-cvs redhat.cygwin redhat.cygwin-xfree
-     redhat.cygwin-announce redhat.cygwin-xfree-announce
-     redhat.cygwin-apps redhat.cygwin-patches redhat.cygwin-developers
-     redhat.cygwin-cvs redhat.cygwin-apps-cvs
-     redhat.docbook-tools-discuss redhat.docbook-tools-announce
-     redhat.docbook-tools-cvs redhat.docbook redhat.dssslist
-     redhat.sgml-tools redhat.docbook-apps redhat.ecos-announce
-     redhat.ecos-devel redhat.ecos-discuss redhat.ecos-maintainers
-     redhat.ecos-patches redhat.elix redhat.elix-announce redhat.gdb
-     redhat.gdb-announce redhat.gdb-testers redhat.gdb-testresults
-     redhat.gdb-patches redhat.gdb-cvs redhat.bug-gdb redhat.gdb-prs
-     redhat.libc-alpha redhat.libc-hacker redhat.bug-glibc
-     redhat.glibc-cvs redhat.glibc-linux redhat.bug-gnats
-     redhat.gnats-devel redhat.gnats-announce redhat.gnats-cvs
-     redhat.gsl-discuss redhat.gsl-announce redhat.gsl-cvs redhat.guile
-     redhat.guile-emacs redhat.guile-prs redhat.guile-gtk
-     redhat.bug-guile redhat.guile-cvs redhat.guile-emacs-cvs
-     redhat.insight redhat.insight-announce redhat.insight-prs
-     redhat.installshell redhat.inti redhat.kawa redhat.libffi-discuss
-     redhat.libffi-announce redhat.libstdc++ redhat.libstdc++-cvs
-     redhat.libstdc++-prs redhat.mauve-discuss redhat.mauve-announce
-     redhat.newlib redhat.pthreads-win32 redhat.rhdb
-     redhat.rhdb-announce redhat.rhug-rhats redhat.rpm2html-cvs
-     redhat.rpm2html-prs redhat.rpm2html redhat.sid redhat.sid-announce
-     redhat.sid-cvs redhat.sourcenav redhat.sourcenav-announce
-     redhat.sourcenav-prs redhat.win32-x11 redhat.xconq7
-     redhat.xconq-announce redhat.xconq-cvs
-
-MacOSX JP Mailing List (http://www.tech-arts.co.jp/macosx/)
-     macosx-jp.macosx-jp macosx-jp.macosx-dev-jp macosx-jp.macosx-ws-jp
-     macosx-jp.webobjects-jp
-
-SourceForge JP (http://sourceforge.jp)
-     All archives served by SourceForge JP are supported by `shimbun'
-     library.  Add a group name of your favorite archive to the variable
-     `shimbun-sourceforge-jp-mailing-lists', and you can browse it.
-
-Elips Mailing List (http://heimat.jp/~nakaji/elips/)
-     elips.elips
-
-Squeak-ja Mailing List (http://lists.squeakfoundation.org/pipermail/squeak-ja/)
-     squeak-ja.main
-
-Smalltalkers' Salon Mailing List (http://www.sra.co.jp/smalltalk/SML/archives/)
-     sml.main
-
-Squeak-dev Mailing List (http://lists.squeakfoundation.org/pipermail/squeak-dev/)
-     squeak-dev.main
-
-Plucker Mailing List (http://www.mail-archive.com/plucker-*@rubberchicken.org/maillist.html)
-     plucker.announce plucker.list plucker.dev
-
-pilot-link Mailing List (http://www.pilot-link.org/pipermail/)
-     pilot-link.announce pilot-link.devel pilot-link.general
-     pilot-link.unix-ng
-
-Coldsync Mailing List (http://www.thedotin.net/maillists/coldsync-hackers/maillist.html)
-     coldsync.main
-
-J-Pilot Mailing List (http://www.jpilot.org/pipermail/jpilot/)
-     jpilot.main
-
-pilot-mailsync Mailing List (http://lists.gnu-designs.com/pipermail/pilot-mailsync/)
-     pilot-mailsync.main
-
-Mozilla Users Mailing List in Japan (http://www.mozilla.gr.jp/ml/logs/moz-users/)
-     mozilla-jp.users
-
-     Please note that userid and passowrd are required for
-     `mozilla-jp.users' so you have to write;
-
-          machine www.mozilla.gr.jp
-          realm Please Enter mozilla mozilla
-          login mozilla
-          passwd mozilla
-
-     in `~/.w3m/passwd' and remove group and others access permissions
-     from the file.
-
-tDiary Developers Mailing List in Japan (http://www.tdiary.org/)
-     tdiary-ml.devel tdiary-ml.theme
-
-arch.bluegate.org Mailing Lists (http://arch.bluegate.org/mailman/listinfo)
-     arch-bluegate.subversion-jp arch-bluegate.arch-jp
-     arch-bluegate.mailman arch-bluegate.viewarch
-
-Tigris.org:Open Source Software Engineering (http://www.tigris.org/)
-     All archives served by Tigris.org are supported by `shimbun'
-     library.  Add a group name of your favorite archive to the variable
-     `shimbun-tigris-group-alist', and you can browse it.  Group name
-     is tigris.<project>.<mailinglist>.
-
-www.SciPy.net Mailing Lists (http://www.scipy.net/mailman/listinfo)
-     scipy.astropy scipy.ipython-user scipy.ipython-dev scipy.scipy-user
-     scipy.scipy-dev scipy.scipy-testlog scipy.scipy-chaco
-     scipy.scipy-cvs
-
-
-
-File: emacs-w3m.info,  Node: Sport Sites Supported by Shimbun,  Next: Misc Sites Supported by Shimbun,  Prev: Mailing Lists Supported by Shimbun,  Up: Shimbun Sites
-
-9.5.4 Sport Sites Supported by Shimbun
---------------------------------------
-
-These are sport sites supported by `shimbun' library.
-
-makanai (http://www.makanai.com/)
-     makanai.f1news
-
-F1 FAN (http://www.ksky.ne.jp/~tahara/f1/)
-     f1fan.news
-
-@nifty:motorsports (http://forum.nifty.com/fmotor/)
-     msports-nifty.F1 msports-nifty.IRL msports-nifty.WRC
-     msports-nifty.Europe msports-nifty.USA
-
-Yahoo!SPORTS (http://sports.yahoo.co.jp/)
-     yahoo-sports.F1 yahoo-sports.baseball yahoo-sports.keiba
-     yahoo-sports.NBA yahoo-sports.NFL yahoo-sports.rugby
-
-   @nifty:motorsports requires the Mule-UCS package (*note Other
-Requirements::) for Emacs-21.4 or any previous versions.
-
-
-File: emacs-w3m.info,  Node: Misc Sites Supported by Shimbun,  Prev: Sport Sites Supported by Shimbun,  Up: Shimbun Sites
-
-9.5.5 Misc Sites Supported by Shimbun
--------------------------------------
-
-These are misc sites supported by `shimbun' library.  WEB BBS and
-serial publications are included.
-
-Tea Cup Bulletin Boards (http://www.tcup.com/)
-     You can subscribe to various bulletin boards provided by Tea Cup
-     Communication.  By default, there are three pre-configured boards
-     listed below:
-
-    tcup.yutopia
-          Yutopia BBS (http://www61.tcup.com/6116/yutopia.html)
-
-    tcup.meadow
-          Meadow BBS (http://www66.tcup.com/6629/yutopia.html)
-
-    tcup.skk
-          SKK BBS (http://www67.tcup.com/6718/yutopia.html)
-
-     To add new boards to the list, look up the names and the urls and
-     modify the `shimbun-tcup-group-alist' variable.  The following
-     form is an example to add two boards, `foo' and `bar', to the list:
-
-          (eval-after-load "sb-tcup"
-            '(setq shimbun-tcup-group-alist
-                   (append
-                    '(("foo" "http://MMMM.teacup.com/foo/bbs2")
-                      ("bar" "http://NNNN.teacup.com/bar/bbs2"))
-                    shimbun-tcup-group-alist)))
-
-2ch
-     This is an example to browse Meadow BBS and emacs-w3m BBS on 2ch.
-          (setq shimbun-2ch-group-alist
-                '(("Meadow" .
-                   "http://pc.2ch.net/test/read.cgi/software/1005469775")
-                  ("emacs-w3m" .
-                   "http://pc.2ch.net/test/read.cgi/unix/1013710106")))
-
-Bulletin Board Systems using CGI_Board (http://www.math.tohoku.ac.jp/~kuroki/support/)
-     Set your favorite browse bulletin board systems using CGI_Board to
-     `shimbun-cgi-board-group-alist', and you can browse them.
-
-HNS
-     This is an example to use `sb-hns'.
-          (setq shimbun-hns-group-alist
-                '(("arisawa"                            ;; Group Name
-                   "http://nijino.homelinux.net/diary/" ;; URL
-                   "ari@mbf.sphere.ne.jp")              ;; E-Mail Address
-                  ("miyoshi"
-                   "http://www.be.wakwak.com/cgi-bin/sbox/~miyoshi/hns/"
-                   "miyoshi@meadowy.org")))
-
-tDiary
-     This is an example to use `sb-tdiary'.
-          (setq shimbun-tdiary-group-alist
-                '(("henahena"                          ;; Group Name
-                   "http://www.fan.gr.jp/~ring/d/")    ;; URL
-                  ("yoichi"
-                   "http://yoichi.geiin.org/d/")))
-
-Diaries at Rakuten Plaza (http://plaza.rakuten.co.jp/)
-     This is an example to use `sb-rakuten'.
-          (setq shimbun-rakuten-group-alist
-                '(("rakuten-id" . "email-address")))
-
-EmacsWiKi (http://www.emacswiki.org/)
-     emacswiki.changes emacswiki.diff
-
-RSS feeds containing contents
-     To use this back end, look for the RSS feeds containing contents
-     which you would like to read, and add those groups to the
-     `shimbun-rss-hash-group-path-alist' variable by the following way.
-     The name of the back end is `rss-hash'.  You may use this back end
-     for reading mainly personal blogs.
-
-     The parameters for each group configuration consist of the name of
-     the group, the address of the RSS feed, the type of the mail (`t'
-     for html), the regexp matching the start of contents, and the
-     regexp matching the end of contents.  The parameters other than
-     the name of the group and the address of the RSS feed are optional.
-
-     Here is an example of setting `shimbun-rss-hash-group-path-alist'.
-     In this case, you can browse those groups as `rss-hash.sampleblog1'
-     and `rss-hash.sampleblog2':
-
-          (setq shimbun-rss-hash-group-path-alist
-                '(;; text mail
-                  ("sampleblog1" "http://www.example.com/index1.rss")
-                  ;; html mail
-                  ("sampleblog2" "http://www.example.com/index2.rss"
-                   t "</title>" "<!-- start ads")))
-
-Atom feeds containing contents
-     As well as the previous section (RSS feeds containing contents),
-     you can also read the Atom feeds which contain published contents.
-     To do that, configure the variable
-     `shimbun-atom-hash-group-path-alist' (and possibly
-     `shimbun-atom-hash-x-face-alist', etc.) in the way similar to
-     shimbun-rss-hash-*.  The name of the back end is `atom-hash'.
-
-RSS feeds without published content
-     Many feeds do not contain the full content of the articles, or
-     only so called teasers, i.e. quick summaries.  If a site publishes
-     such a feed, instead of writing a special shimbun for it, you can
-     in many cases use the `rss-blogs' back end.  The setup is similar
-     to the `rss-hash' shimbun; here is an example:
-
-          (setq shimbun-rss-blogs-group-url-regexp
-            '(("first-feed" "http://example/wordpressfeed")
-              ("second-feed" "http://example/somefeed"
-               "<div name=\"content\">" "<div name=\"comments\">")
-              ("third-feed" "http://example/someotherfeed" 'none)))
-
-     The first two items are the name and the URL of the feed.
-     Optionally, you can give two regular expressions denoting the
-     start and end of the actual content on the HTML pages the feed is
-     pointing to.  If you just use the symbol `none' here, no filtering
-     will be done whatsoever.  Additionally, the `rss-blogs' shimbun
-     can deal automatically with some popular blogging engines, namely
-     Google's Blogger/Blogspot (including comment feeds), WordPress,
-     and TypePad.  If your feed is from a site using one of those
-     (which you can see by looking at the `generator' tag), just omit
-     the optional parameters and the code will try to extract the
-     content automatically for you.
-
-Wiki contents
-     This is an example to use `sb-wiki'.  `sb-wiki' support PukiWiki
-     and Hiki.  If you don't know which regexps to set to 4th and 5th
-     elements of an inner list, just set `nil' and you'll just see all
-     contents of a page.
-          (setq shimbun-wiki-group-alist
-                '(("pukiwiki" ;; Group Name
-                   "http://pukiwiki.org/index.php?cmd=rss10" ;; URL
-                   "webmaster@pukiwiki.org" ;; E-Mail Address
-                   nil ;; X-Face
-                   "\n<h3 id=\"" ;; regexp to represent contents start
-                   "</address>") ;; regexp to represent contents end
-                  ("hiki"
-                   "http://www.namaraii.com/hiki/?c=rss"
-                   "webmaster@fdiary.net"
-                   nil
-                   "<div class=\"section\">"
-                   "<div class=\"sidebar\">")
-                  ("apollo"
-                   "http://wiki.fdiary.net/apollo/?c=rss"
-                   "moriq@moriq.com"
-                   nil
-                   "<div class=\"section\">"
-                   "<div class=\"sidebar\">")
-                  ))
-
-Yahoo! AUCTIONS (http://auctions.yahoo.co.jp/)
-     This is an example to use `sb-yahoo-auctions'.
-          (setq shimbun-yahoo-auctions-group-alist
-                '(("mp3player" . "http://list3.auctions.yahoo.co.jp/jp/show/catleaf_rss?category=2084039708&alocale=0jp")
-                  ("iPod" . "http://search3.auctions.yahoo.co.jp/search_rss?p=iPod&auccat=2084039708&alocale=0jp&acc=jp")))
-
-VineLinux Errata (http://www.vinelinux.org)
-     vinelinux.errata.4x.i386 vinelinux.errata.4x.ppc
-     vinelinux.errata.3x.i386 vinelinux.errata.3x.ppc
-     vinelinux.errata.3x.alpha vinelinux.errata.2x.i386
-     vinelinux.errata.2x.ppc vinelinux.errata.2x.sparc
-     vinelinux.errata.2x.alpha vinelinux.errata.1x
-
-Japan's Cabinet Mail Magazine (http://www.mmz.kantei.go.jp/)
-     kantei.m-magazine-en kantei.m-magazine-ja
-     kantei.m-magazine-cn.hatoyama kantei.m-magazine-kr.hatoyama
-     kantei.m-magazine-en.hatoyama kantei.m-magazine-ja.hatoyama
-     kantei.m-magazine-en.aso kantei.m-magazine-ja.aso
-     kantei.m-magazine-en.fukuda kantei.m-magazine-ja.fukuda
-     kantei.m-magazine-en.abe kantei.m-magazine-ja.abe
-     kantei.m-magazine-en.koizumi kantei.m-magazine-ja.koizumi
-
-     `kantei.m-magazine', `kantei.m-magazine-cn' and
-     `kantei.m-magazine-kr' are also available for the backward
-     compatibility.
-
-Patent Office in Japan (http://www.jpo.go.jp/)
-     jpo.news jpo.revision jpo.lawguide jpo.details
-
-IBM developerWorks (http://www-6.ibm.com/jp/developerworks/) (in Japanese)
-     ibm-dev.autonomic ibm-dev.java ibm-dev.linux ibm-dev.opensource
-     ibm-dev.webservices ibm-dev.xml
-
-Pocketgames (http://www.pocketgames.jp/)
-     pocketgames.news
-
-Wincefan (http://www.wince.ne.jp/)
-     wincefan.news
-
-PalmFan (http://www.palmfan.com/)
-     palmfan.news
-
-Report of Electrical Stores Street (http://homepage1.nifty.com/akiba/plat.html) (in Japanese)
-     dennou.report
-
-PCWEB COLUMN Square (http://pcweb.mycom.co.jp/column/)
-     pcweb-column.jsr pcweb-column.yume pcweb-column.hreceipe
-     pcweb-column.kita pcweb-column.shonanlife pcweb-column.kaden
-     pcweb-column.nemurenai pcweb-column.komono pcweb-column.js
-     pcweb-column.en pcweb-column.motherboard pcweb-column.svalley
-     pcweb-column.architecture pcweb-column.motorlife
-     pcweb-column.nihongoprog pcweb-column.objc pcweb-column.ide
-     pcweb-column.music pcweb-column.itsecurity pcweb-column.soundvisual
-     pcweb-column.osx pcweb-column.sopinion pcweb-column.ebook
-     pcweb-column.orerobo pcweb-column.zsh pcweb-column.rikei
-     pcweb-column.lifehack pcweb-column.world pcweb-column.guutara
-     pcweb-column.volt pcweb-column.textclean pcweb-column.person
-     pcweb-column.web20 pcweb-column.system
-
-     below items are also available for the backward compatibility.
-     pcweb-column.itshihonron pcweb-column.yetanother pcweb-column.asia
-     pcweb-column.benri pcweb-column.bytes pcweb-column.game
-     pcweb-column.hitech pcweb-column.java pcweb-column.jisakuparts
-     pcweb-column.scramble pcweb-column.toolexp pcweb-column.winvista
-     pcweb-column.winxp pcweb-column.interview pcweb-column.ityougo
-     pcweb-column.kimeuchi pcweb-column.stratesys pcweb-column.toyagain
-
-Notes Exhibition (http://tsuruo.dominohosting.biz/members/tsuruo/)
-     lotusex.news lotusex.library lotusex.operation lotusex.primer
-     lotusex.tips lotusex.practical lotusex.qanda lotusex.lounge
-     lotusex.bbs
-
-@IT forum (http://www.atmarkit.co.jp)
-     atmarkit.news atmarkit.fwin2k atmarkit.fdotnet atmarkit.fsys
-     atmarkit.fxml atmarkit.fdb atmarkit.flinux atmarkit.fnetwork
-     atmarkit.fjava atmarkit.fsecurity atmarkit.farc atmarkit.fbiz
-     atmarkit.fwcr atmarkit.jibun
-
-TeX Q&A Bulletin Board (http://www.matsusaka-u.ac.jp/~okumura/texfaq/qa/)
-     texfaq.qanda
-
-X51.org (http://x51.org/)
-     x51.anima x51.art x51.auction x51.blow x51.cabal x51.crime
-     x51.disaster x51.edge x51.enema x51.ghost x51.homme x51.info
-     x51.life x51.love x51.media x51.medical x51.military
-     x51.northkorea x51.oparts x51.phallic x51.psychics x51.religion
-     x51.science x51.top x51.ufo x51.uma x51.xfiles
-
-eXperts Connection (eXConn) (http://www.exconn.net/)
-     exconn.news
-
-MSDN (http://msdn.microsoft.com/)
-     msdn.all msdn.netframework msdn.architecture msdn.asp.net msdn.data
-     msdn.longhorn msdn.mobility msdn.subscriptions msdn.msdntv
-     msdn.office msdn.security msdn.sql msdn.theshow msdn.vbasic
-     msdn.vcsharp msdn.visualc msdn.vfoxpro msdn.vjsharp msdn.vstudio
-     msdn.vs2005 msdn.webservices msdn.embedded msdn.xml msdn.japan.msdn
-     msdn.japan.msdn-us
-
-Haiku OS (http://haiku-os.org/)
-     haiku-os.news haiku-os.forums haiku-os.newsletters
-
-Foundation for a Free Information Infrastructure (http://www.ffii.org/)
-     ffii.en.software-patents ffii.en.software-patents.ffii
-     ffii.en.information-infrastructure ffii.en.project
-     ffii.de.software-patente ffii.de.software-patente.ffii
-     ffii.de.informations-infrastruktur ffii.fr.brevets-logiciels
-     ffii.fr.brevets-logiciels.ffii ffii.nl.softwarepatenten
-     ffii.nl.softwarepatenten.ffii
-
-
-File: emacs-w3m.info,  Node: Shimbun Basics,  Prev: Shimbun Sites,  Up: Shimbun Library
-
-9.6 How to make a new shimbun module
-====================================
-
-`Shimbun' is a library set of emacs-w3m that enables you to read
-certain web contents using Gnus, Wanderlust, or Mew as if they were
-email messages.  Here we will explain how to make a new `shimbun'
-module.
-
-* Menu:
-
-* Overview::
-* Getting web page and header information::
-* Displaying an article::
-* Inheriting shimbun module::
-* Making text/plain articles::
-* Zenkaku to hankaku conversion::
-* Coding convention of Shimbun::
-
-
-File: emacs-w3m.info,  Node: Overview,  Next: Getting web page and header information,  Up: Shimbun Basics
-
-9.6.1 Overview
---------------
-
-When you make a new `shimbun' module `foobar' for reading contents of
-`http://www.foobar.net', what you have to do first is to put the
-following S expressions in the first part of the `sb-foobar.el' file:
-
-     (require 'shimbun)
-     (luna-define-class shimbun-foobar (shimbun) ())
-
-We will explain what they are below, so you can understand they are just
-incantations now.  You have to use the same suffix `foobar' in the file
-name (`sb-foobar.el') and the class name (`shimbun-foobar') as the
-second argument for the `luna-define-class' macro.
-
-   Major jobs of the `shimbun-foobar' module can be classified broadly
-into the following four categories (note that you may rephrase "folder"
-with "group" if you are a Gnus user):
-
-  1. Getting a page source from `http://www.foobar.net' in order to
-     gather articles' subjects etc. when a MUA opens the `foobar'
-     folder.
-
-  2. Gathering subjects and other necessary informations from the page
-     source in order to make headlines of articles and returning them
-     as the structured list called `headers'.
-
-  3. Getting a page source for an article from the web site, for
-     example, `http://www.foobar.net/053003.html', when MUA requires to
-     display an article in the `foobar' folder, and
-
-  4. Removing cruft, e.g. advertisements, from the page source and
-     formatting a raw article.
-
-`shimbun-headers' of `shimbun.el' does the first job,
-`shimbun-get-headers' does the second, `shimbun-article' does the third
-and `shimbun-make-contents' does the last.
-
-   The `shimbun-headers' method does the first job, the
-`shimbun-get-headers' method does the second, the `shimbun-article'
-method does the third and the `shimbun-make-contents' method does the
-last thing.  The default methods for those categories are defined in
-the `shimbun.el' module.
-
-   Open the `shimbun.el' file.  You may see unfamiliar definitions like
-`luna-define-generic' or `luna-define-method' there.  Hm, they look
-like `defun', don't you?  You may also see there's just a doc-string in
-the former definition and the same symbol is declared again in the
-later form.  And further, there are some symbols only declared by the
-`luna-define-generic' form, not by the `luna-define-method' form.  What
-on earth are we seeing?  Isn't the program not written in the
-Emacs-Lisp language?
-
-   The truth is that the `shimbun' modules use the `luna.el' module
-provided by FLIM which enables you to write object oriented programs in
-the Emacs-Lisp language.
-
-   There are method programs defined rigidly for the specific purposes
-in the `shimbun.el' module.  The `shimbun-headers' method gets a page
-source from a certain URL, the `shimbun-get-headers' method gathers
-subjects and other informations, etc... (see above).  They do routine
-works, so they cannot take proper method to meet various web contents
-in the world.  Eh?  Oh, you shouldn't believe in a heresy!
-
-   The `shimbun.el' module only provides the default method functions.
-Remember the `defadvice' feature.  There are three ways to modify the
-behavior of a function: `:before', `:around' and `:after'.  Similarly,
-each default `shimbun' method function can be modified for a certain
-purpose (note that the `:around' method-qualifier can be omitted).  And
-it should be written specially that the modification will be effective
-only when the specified `shimbun' module is selected.
-
-   Now as you may have understood that the `luna-define-generic' form
-provides only a husk in a sense, the `luna-define-method' form defines
-an actual function which can be different for each `shimbun' module,
-and the `luna-define-class' form declares the `shimbun' class in the
-first part of the `sb-foobar.el' module.
-
-
-File: emacs-w3m.info,  Node: Getting web page and header information,  Next: Displaying an article,  Prev: Overview,  Up: Shimbun Basics
-
-9.6.2 Getting web page and header information
----------------------------------------------
-
-Let's identify a target web page URL to gather subjects and other
-informations first.  If a web site uses a frame, a target is only one
-of the web pages.  Second, lets create a body of the
-`shimbun-index-url' method function using the `luna-define-method' form
-in your `sb-foobar.el' file.  And make the user customizable variable
-`shimbun-foobar-groups', which we will explain later(1).
-
-     (defvar shimbun-foobar-url "http://www.foobar.net")
-
-     (luna-define-method shimbun-index-url ((shimbun shimbun-foobar))
-       shimbun-foobar-url)
-
-     (defvar shimbun-foobar-groups '("news"))
-
-   After you create a body of the `shimbun-index-url' method, the
-`shimbun-headers' method can get a web page source since the
-`shimbun.el' module already has the default `shimbun-headers' method.
-After the `shimbun-headers' method gets a web page source, it calls the
-`shimbun-get-headers' method to gather headers information.  As the
-`shimbun.el' module does not have the `shimbun-get-headers' method, you
-have to create it in your `sb-foobar.el' file.
-
-   Now look carefully in the page source and create the
-`shimbun-get-headers' method in your `sb-foobar.el' file.
-
-   Create a regular expression that can gather headers information.
-Minimally necessary information are subject, date, author, URL and
-`message-id' of an article.  They are used in MUA as Subject, Date,
-From, Xref and Message-ID.
-
-   If you want to make an article from a line in a web page source,
-like:
-
-     <a href="053003.html">some talks on May 30(posted by Mikio &lt;foo@bar.net&gt;)</a>
-
-use the following regexp:
-
-     "<a href=\"\\(\\([0-9][0-9][0-9][0-9]\\)[0-9][0-9]\\.html\\)\">\\([^<(]+\\)(posted by \\([^<]+\\))<\/a>"
-
-You can get a value for Xref by `(match-string 1)'.  You can get a
-value for Date by modifying a value of `(match-string 2)'.  Subject by
-`(match-string 3)' and From from `(match-string 4)'.  You can modify
-them further for showing additional information in MUA.
-
-   If URL of an article is a relative path like above, use
-`shimbun-expand-url' to expand it before putting information to header.
-If each article doesn't have a each unique URLs (i.e. URL of headers
-and URL of articles are just same), you have to ask Emacs to remember
-body of an article when gathering headers information, For more detail
-see the files `sb-palmfan.el', `sb-dennou.el' and `sb-tcup.el'.
-
-   Sometimes you cannot identify Date information when gathering headers
-information only from a web page source.  If so, leave it, just set a
-null string, `""' to its value.  If you can identify Date only when you
-see contents of an article, you can set it at that time by using
-`shimbun-make-contents' method.  And you may use a fixed From for a web
-site (e.x. "webmaster@foobar.net").
-
-   Be careful when you build a message-id.  Make sure it has uniqueness
-otherwise you may not be able to read some articles in the
-`shimbun'(2).  Assure uniqueness by building message-id using date
-information, a domain of the page and/or a part of URL of the page.
-And use `@' but `:' as a part of message-id in order to display inline
-images.  See RFC2387 and RFC822 for more detail.
-
-   Put these information to header using function
-`shimbun-create-header' of the `shimbun.el' module.
-
-   A bare bone of `shimbun-get-headers' in your `sb-foobar.el' file is
-as follows:
-
-     (luna-define-method shimbun-get-headers ((shimbun shimbun-foobar)
-                                              &optional range)
-       (let ((regexp "....")
-             subject from date id url headers)
-         ...
-         (catch 'stop
-           (while (re-search-forward regexp nil t nil)
-             ...
-             (when (shimbun-search-id shimbun id)
-               (throw 'stop nil))
-             (push (shimbun-create-header
-                    0 subject from date id "" 0 0 url)
-                   headers)))
-         headers))
-
-Note that you can access `shimbun-foobar' instance via temporary
-variable `shimbun' in the method.
-
-   Now we will explain a user variable `shimbun-foobar-groups'.
-
-   Assume that you have two groups of articles in
-`http://www.foobar.net' and there are two different web pages for such
-groups in where `shimbun' module gathers header information.  For
-examples, there are what's new information of the web site in
-`http://www.foobar.net/whatsnew/index.hmtl', and there are archive
-lists of email messages posted to ML in
-`http://www.foobar.net/ml/index.html'.  In such case you may want to
-access the group by `shimbun' folders `foobar.whatsnew' and
-`foobar.ml'.  If so, put the following S expressions to the
-`sb-foobar.el' file.
-
-     (defvar shimbun-foobar-url "http://www.foobar.net")
-
-     (defvar shimbun-foobar-group-path-alist
-       '(("whatsnew" . "/whatsnew/index.html")
-         ("ml" . "/ml/index.html")))
-
-     (defvar shimbun-foobar-groups
-       (mapcar 'car shimbun-foobar-group-path-alist))
-
-     (luna-define-method shimbun-index-url ((shimbun shimbun-foobar))
-       (concat shimbun-foobar-url
-               (cdr (assoc (shimbun-current-group-internal shimbun)
-                           shimbun-foobar-group-path-alist))))
-
-You can get the current group by using
-`shimbun-current-group-internal'.  You can use it in
-`shimbun-get-headers' method (or others) in order to change its
-behavior in accordance with the current group.
-
-   Each `shimbun' module needs at least one group.  There is not a
-special rule for naming a group, but if you don't find out a good name,
-use `news' or `main'.
-
-   ---------- Footnotes ----------
-
-   (1) At least one group is necessary for each `shimbun' module even
-if you don't want it.
-
-   (2) And more, you may not be able to read actual email messages from
-someone when message-ids conflict!
-
-
-File: emacs-w3m.info,  Node: Displaying an article,  Next: Inheriting shimbun module,  Prev: Getting web page and header information,  Up: Shimbun Basics
-
-9.6.3 Displaying an article
----------------------------
-
-`shimbun-article' method defined in the `shimbun.el' module gets URL
-from Xref information of header, get a web page source from the URL,
-and call `shimbun-make-contents' in working buffer of the source.
-Major job of `shimbun-make-contents' is to process such HTML.  Imagine
-that a working buffer has a web page source of an article.
-`shimbun-make-contents' defined in the `shimbun.el' module insert (i)
-header information to top of the buffer, (ii) `<html>', `<body>' and
-etc. right after the information, and (iii) `</body>' and `</html>' to
-end of the buffer.  MUA displays an article as a HTML mail.
-
-     Not only HTML articles, but also articles in the `text/plain'
-     format can be generated.  *Note Making text/plain articles::.
-
-   If you don't want to process an article, you don't have to define
-`shimbun-make-contents' in the `sb-foobar.el' module.
-
-   If you want to remove some part of a web page source of an article at
-its top and its end, set regexp to `shimbun-foobar-content-start' that
-matches content start and `shimbun-foobar-content-end' that matches
-content end.
-
-     (defvar shimbun-foobar-content-start "^<body>$")
-     (defvar shimbun-foobar-content-end "^<\/body>$")
-
-`shimbun-clear-contents', which is called by `shimbun-make-contents'
-defined in the `shimbun.el' module, will remove HTML source from
-`point-min' to `shimbun-foobar-content-start' and from
-`shimbun-foobar-content-end' to `point-max' using the regexps.  Note
-that it will not remove any HTML source when either of the regexp
-searches fails.
-
-   If you want to remove more unnecessary parts (e.x. advertisements)
-diligently, define `shimbun-clear-contents' in your new `sb-foobar.el'
-file as follows:
-
-     (luna-define-method shimbun-clear-contents :around ((shimbun shimbun-foobar)
-                                                         header)
-       ;; cleaning up
-       (while (re-search-forward "..." nil t nil)
-         (delete-region (match-beginning 0) (match-end 0)))
-       (luna-call-next-method))
-
-For more details see `shimbun-make-contents' in the `sb-ibm-dev.el'
-file.
-
-   I said in the subsection of *note Getting web page and header
-information:: that if each article doesn't have a each unique URLs you
-have to ask Emacs to remember body of an article when gathering headers
-information,  In such case you don't have to get a web page from URL of
-Xref in `shimbun-article' method.  Just get texts from Emacs memories
-and put them with pretty printing.  For more detail see definitions of
-`shimbun-article' method of `sb-palmfan.el', `sb-dennou.el' or
-`sb-tcup.el'.
-
-
-File: emacs-w3m.info,  Node: Inheriting shimbun module,  Next: Making text/plain articles,  Prev: Displaying an article,  Up: Shimbun Basics
-
-9.6.4 Inheriting shimbun module
--------------------------------
-
-There are some famous mailing list manager (or archiver).
-
-   * Mailman The GNU Mailing List Manager, formerly called as
-     `pipermail'.  See `http://www.gnu.org/software/mailman/index.html'
-     for detail.
-
-   * MHonArc See `http://www.oac.uci.edu/indiv/ehood/mhonarc.html' for
-     detail.
-
-   * fml fml mailing list server/manager.  See
-     `http://www.fml.org/software/fml/' for detail.
-
-   * mailarc See `http://cvs.namazu.org/mailarc/' for detail.
-
-   If you find out one of such mailing list managers' names in a web
-page source when you analyze it in the step of *Note Getting web page
-and header information::, you are very lucky(1).  The modules
-`sb-mailman.el', `sb-mhonarc.el', `sb-fml.el' and `sb-mailarc.el' have
-the `shimbun-get-headers' method, etc, already, when you write small
-code that is not defined in such `shimbun' modules, your new
-`sb-foobar.el' module works!
-
-   If you use the `sb-mailman.el' module, write the following S
-expressions to the top of the `sb-foobar.el' file:
-
-     (require 'sb-mailman)
-     (luna-define-class shimbun-foobar (shimbun-mailman) ())
-
-Those above mean that `shimbun' module `shimbun-foobar' inherits
-shimbun-mailman class(2) and methods defined in the `sb-mailman.el'
-module will be used in `shimbun-foobar' by default.  You can overwrite
-some of parent methods, if necessary.
-
-   See the `sb-pilot-mailsync.el' file as a sample that uses the
-`sb-mailman.el' module.  You can feel how easy to create a new
-`shimbun' module by using such parent modules.
-
-   Note that there are some localized version of such mailing list
-manager, for examples, some of them show Date information in Japanese.
-The modules `sb-mailman.el', `sb-mhonarc.el', `sb-fml.el' and
-`sb-mailarc.el' assumes that mailing list managers are not localized.
-
-   If you want to read via `shimbun' a web site that uses localized
-mailing list manager, you may have to overwrite some methods in the
-parent module.
-
-   ---------- Footnotes ----------
-
-   (1) Such mailing list managers often show their own name in an
-archive list page
-
-   (2) i.e. shimbun-mailman class is a parent class.
-
-
-File: emacs-w3m.info,  Node: Making text/plain articles,  Next: Zenkaku to hankaku conversion,  Prev: Inheriting shimbun module,  Up: Shimbun Basics
-
-9.6.5 Making text/plain articles
---------------------------------
-
-Even if the MUA is reinforced by emacs-w3m so as to be able to read HTML
-articles, `text/plain' articles might be more convenient in some cases.
-To make the `sb-foobar' module generate `text/plain' articles rather
-than `text/html' articles, there are two ways to do that.
-
-   * The one is to make the `sb-foobar' module inherit (*note
-     Inheriting shimbun module::) the `sb-text' module.  Here's an
-     example you may put in the beginning of the `sb-foobar' module.
-
-          (require 'sb-text)
-          (luna-define-class shimbun-foobar (shimbun-text) ())
-
-     The `sb-text' module provides the `shimbun-make-contents' method
-     which generates the articles in the `text/plain' format.  This
-     will be useful for the `shimbun' modules handling the web sites
-     which put up only text articles.
-
-   * The other is to set the `shimbun-foobar-prefer-text-plain' variable
-     to non-`nil'.  This makes the `shimbun-make-contents' method
-     generate the articles in the `text/plain' format (actually, it uses
-     the functions provided by the `sb-text' module).  Note that this is
-     effective only to the modules which inherit the default
-     `shimbun-make-contents' method (especially the modules which
-     inherit the `sb-text' module are not affected).  The advantage of
-     this way is that users can easily switch `text/plain' articles and
-     `text/html' articles.
-
-     The default value for the `shimbun-foobar-prefer-text-plain'
-     variable is `nil' if it is not defined.  So, it defaults to `nil'
-     in every `shimbun' module except for the modules `sb-asahi.el' and
-     `sb-yomiuri.el'.
-
-     In addition, you can use the variables
-     `shimbun-foobar-text-content-start' and
-     `shimbun-foobar-text-content-end' instead of
-     `shimbun-foobar-content-start' and `shimbun-foobar-content-end' to
-     extract significant text in web pages (*note Displaying an
-     article::).  If the formers are not defined, those values default
-     to the latter values.
-
-Whichever the ways you use, you should note that the `text/plain'
-articles cannot contain images, links, etc.
-
-
-File: emacs-w3m.info,  Node: Zenkaku to hankaku conversion,  Next: Coding convention of Shimbun,  Prev: Making text/plain articles,  Up: Shimbun Basics
-
-9.6.6 Zenkaku to hankaku conversion
------------------------------------
-
-"Zenkaku" or "zenkaku character(s)" is a term commonly used to call
-Japanese wide characters, and "hankaku" is an opposite term for
-ordinary ASCII characters.  There is a complete set of zenkaku
-characters corresponding to at least the ASCII character set.
-
-   Some Japanese web sites tend to use zenkaku characters a lot, and
-those articles might not necessarily be comfortable to read.  If you
-feel so, you can use this feature that converts those zenkaku ASCII
-characters into hankaku.  To do that, set the
-`shimbun-foobar-japanese-hankaku' variable to `t'.  Where `foobar' is a
-server name to which you subscribe for shimbun articles.  That is, you
-have to use it per server.
-
-   If you prefer to convert zenkaku to hankaku only in the body of
-articles, use the value `body' instead of `t'.  Contrarily the value
-`header' or `subject' specifies to perform it only in subjects.
-
-
-File: emacs-w3m.info,  Node: Coding convention of Shimbun,  Prev: Zenkaku to hankaku conversion,  Up: Shimbun Basics
-
-9.6.7 Coding convention of Shimbun
-----------------------------------
-
-   * You can use all functions defined in emacs-w3m in `shimbun.el'.
-
-   * You can use no functions defined in emacs-w3m in `sb-*.el'.  If you
-     want to use emacs-w3m functions in `sb-*.el', you must add their
-     stubs to `shimbun.el'.
-
-   * You must avoid file names that have already used in SpeedBar.
-     Here is a list of file names used in `speedbar-0.14beta4'.
-
-     sb-ant.el     sb-html.el    sb-info.el    sb-texinfo.el
-     sb-gud.el     sb-image.el   sb-rmail.el   sb-w3.el
-
-   * You should select file names which remind their referring WEB
-     servers' URIs.  It is allowed to remove country parts (Ex.
-     jp,de,uk,etc), organization parts (Ex. edu,com,org,net,etc) and
-     redundant parts (Ex. www) if removing does not increase vagueness.
-
-   * You should select group names in USENET style.  It means that small
-     characters are preferred in group names, and that period(.)  is
-     preferred as an delimiter to show hierarchical structure in groups.
-
-
-File: emacs-w3m.info,  Node: Tips,  Next: Mailing List,  Prev: Shimbun Library,  Up: Top
-
-10 Some knick-knacks using emacs-w3m
-************************************
-
-Here are some handy tips to use emacs-w3m with other Emacs facilities.
-
-   * browse-url
-
-     You can use emacs-w3m with the `browse-url' feature.  For instance,
-     put the following lines in your `~/.emacs' file:
-
-          (setq browse-url-browser-function 'w3m-browse-url)
-          (global-set-key "\C-xm" 'browse-url-at-point)
-
-     Emacs-w3m will now be invoked when you type the `C-x m' key on a
-     string which looks like a URL in any Emacs buffer.  In addition,
-     you can use emacs-w3m to preview an HTML file that you are just
-     editing by typing the `C-c C-v' key (note that you need to use
-     Emacs and the `html-mode' major mode to edit the HTML file).
-
-     If you'd like to use another web browser than emacs-w3m when using
-     the `C-x m' key when you are in an emacs-w3m buffer (who wants to
-     do so?), add the following advice to `~/.emacs' file:
-
-          (defadvice browse-url-at-point
-            (around change-browse-url-browser-function activate)
-            "Use Netscape only when it is invoked in an emacs-w3m buffer."
-            (let ((browse-url-browser-function
-                   (if (eq major-mode 'w3m-mode)
-                       'browse-url-netscape
-                     'w3m-browse-url)))
-              ad-do-it))
-
-   * dired
-
-     You can use emacs-w3m to browse an HTML file in a `dired' buffer by
-     typing the `C-x m' key.  Use the following settings in your
-     `~/.emacs' file:
-
-          (eval-after-load "dired"
-            '(define-key dired-mode-map "\C-xm" 'dired-w3m-find-file))
-
-          (defun dired-w3m-find-file ()
-            (interactive)
-            (require 'w3m)
-            (let ((file (dired-get-filename)))
-              (if (y-or-n-p (format "Use emacs-w3m to browse %s? "
-                                    (file-name-nondirectory file)))
-                  (w3m-find-file file))))
-
-   * hnf-mode
-
-     You can see the newest diary using emacs-w3m and the hyper nikki
-     system.  Put the following lines in your `~/.emacs' file and type
-     the `C-c C-b' key in an `hnf-mode' buffer:
-
-          (defun w3m-hnf-browse-url-w3m (url &optional new-window)
-            (interactive (browse-url-interactive-arg "URL: "))
-            (save-selected-window
-              (pop-to-buffer (get-buffer-create "*w3m*"))
-              (w3m-browse-url url new-window)))
-          (setq hnf-browse-url-browser-function #'w3m-hnf-browse-url-w3m)
-
-   * Gnus
-
-     You've mistaken the entrance if you are a Gnus user and this
-     section is the first page you read in this Info.  See *note
-     Hooking into MUAs:: first.
-
-     By default, Gnus will not apply the treatment variables, for
-     instance `gnus-treat-strip-banner', to `text/html' parts.  To have
-     them applied to `text/html' parts automatically, there are two
-     ways to do that:
-
-          ;; Apply all the treatments to text/html parts.
-          (eval-after-load "gnus-art"
-            '(add-to-list 'gnus-article-treat-types "text/html"))
-
-          ;; Apply a certain treatment to text/html parts.
-          (setq gnus-treat-strip-banner '(or t (typep "text/html")))
-
-     Also *Note Customizing Articles: (gnus)Customizing Articles, for
-     details.
-
-     In addition, the experimental code below is used to display
-     `multipart/related' pictures.  The place might be something wrong.
-
-          (eval-after-load "gnus-art"
-            '(or (assoc "multipart/related" gnus-mime-multipart-functions)
-                 (setq gnus-mime-multipart-functions
-                       (cons
-                        (cons
-                         "multipart/related"
-                         (byte-compile
-                          (lambda (handle)
-                            (gnus-mime-display-mixed (cdr handle)))))
-                        gnus-mime-multipart-functions))))
-
-   * yahtml-mode
-
-     You can use emacs-w3m to preview an HTML file that just you are
-     editing with the `yahtml-mode'.  Here is an example:
-
-          (defadvice yahtml-browse-html
-            (around w3m-yahtml-browse-html activate compile)
-            (w3m-goto-url (ad-get-arg 0) t))
-
-   * jisx0213
-
-     You can use JIS X 0213 character set in Emacs using the `jis0213'
-     module which is bundled in the Mule-UCS package.  Although the
-     `decode-char' function is overridden by `mucs' (`jis0213' loads
-     `mucs') and it stops working properly for the `ucs' coded
-     character set, it has been reported that also to load the
-     `unicode' module seems to solve the problem. The reason has not
-     been made clear yet.  Here is an example for the `~/.emacs' file:
-
-          (require 'unicode)
-          (require 'un-define)
-          (require 'jisx0213)
-
-
-File: emacs-w3m.info,  Node: Mailing List,  Next: Emacs-w3m Functions,  Prev: Tips,  Up: Top
-
-11 Mailing list and submitting bug reports
-******************************************
-
-We have set up a mailing list to discuss all things emacs-w3m.  You can
-post without subscribing.  If you find a bug, have a feature request, or
-have written some code, don't hesitate to post to the list.  And if
-you're just a user and like the program, please tell us too!
-
-   The address is:
-
-     Emacs-w3m Mailing List <emacs-w3m@namazu.org>
-
-   You can also send a bug report using the `report-emacs-w3m-bug'
-command (or the `C-c C-b' key) if you have set the `mail-user-agent'
-variable that will work properly.
-
-   English and Japanese can be used when posting to this list, since
-many of its members are Japanese.  Articles posted to the list are
-opened to the public and you can read them on the web (at
-`http://emacs-w3m.namazu.org/ml/'), or in NetNews (group
-`gmane.emacs.w3m' on the server `news.gmane.org').
-
-   If you want to receive articles by mail, send a mail containing
-
-     subscribe Your Name
-
-   (please write your name, not your email address) in its body to
-`emacs-w3m-ctl@namazu.org', then you can subscribe to the list.  To
-unsubscribe from it, send a mail containing just
-
-     # bye
-
-   in its body to `emacs-w3m-ctl@namazu.org'.
-
-
-File: emacs-w3m.info,  Node: Emacs-w3m Functions,  Next: External Packages,  Prev: Mailing List,  Up: Top
-
-12 Details of some emacs-w3m functions
-**************************************
-
-
-File: emacs-w3m.info,  Node: External Packages,  Next: Authors,  Prev: Emacs-w3m Functions,  Up: Top
-
-13 Companion packages you might need
-************************************
-
-Even though emacs-w3m provides a wealth of features, you may want to
-check out the following external packages for even more usability:
-
-   * w3m-type-ahead.el
-
-     The w3m-type-ahead.el package provides "type ahead" searching,
-     similar to the feature by the same name from Mozilla browsers.  It
-     allows you to find anchors using an interface similar to isearch,
-     but results are limited to anchors in the buffer.
-
-     Download w3m-type-ahead.el from
-     `http://alioth.debian.org/project/showfiles.php?group_id=30594'.
-
-   * newsticker.el
-
-     newsticker.el that has been incorporated in Emacs 22 and greater
-     is a rowse rss feeds and also atom feeds.  Here is a configuration
-     example to use newsticker.el together with emacs-w3m (put it in
-     the `~/.emacs' file):
-
-          (require 'w3m-load)
-          (setq newsticker-html-renderer 'w3m-region
-                browse-url-browser-function 'w3m-browse-url)
-
-     *note Top: (Newsticker)Top, for details.
-
-
-File: emacs-w3m.info,  Node: Authors,  Next: Index,  Prev: External Packages,  Up: Top
-
-14 People who wrote this manual
-*******************************
-
-   * Romain Francoise
-
-   * NAKAJIMA Mikio
-
-   * Yoichi NAKAYAMA
-
-   * Ryoko NARITOKU(Translation only)
-
-   * Hideyuki SHIRAI
-
-   * TSUCHIYA Masatoshi
-
-   * Katsumi Yamaoka
-
-   * Masatake YAMATO
-
-   * Naohiro Aota
-
-
-File: emacs-w3m.info,  Node: Index,  Prev: Authors,  Up: Top
-
-Index
-*****
-
-* Menu:
-
-* Concept Index::               Concept Index
-* Key Index::                   Key Index
-* Variable Index::              Variable Index
-* Function Index::              Function Index
-
-
-File: emacs-w3m.info,  Node: Concept Index,  Next: Key Index,  Up: Index
-
-Concept Index
-=============
-
-[index]
-* Menu:
-
-* about://antenna/:                      Using Antenna.       (line   6)
-* Adding a bookmark:                     Adding Bookmarks.    (line   6)
-* Adding autoload settings:              Minimal Settings.    (line  11)
-* Adding new search engines:             Adding New Search Engines.
-                                                              (line   6)
-* Antenna:                               Using Antenna.       (line   6)
-* APEL package:                          Other Requirements.  (line   6)
-* Arrived URLs:                          Tracing History.     (line   6)
-* article expiry:                        Nnshimbun.           (line 170)
-* auto-expire:                           Nnshimbun.           (line 170)
-* Bookmarks:                             Managing Bookmarks.  (line   6)
-* Browsing history:                      Tracing History.     (line   6)
-* codepage-ex:                           Other Requirements.  (line   6)
-* Consulting bookmarks:                  Consulting Bookmarks.
-                                                              (line   6)
-* Creating new buffers:                  Creating and killing buffers.
-                                                              (line   6)
-* Customizing user options:              Customizable Variables.
-                                                              (line   6)
-* Displaying images:                     Inline Images.       (line   6)
-* Downloading files:                     Downloading.         (line   6)
-* Editing bookmarks:                     Editing Bookmarks.   (line   6)
-* expiry-wait:                           Nnshimbun.           (line 170)
-* Firewall:                              Minimal Settings.    (line  27)
-* FLIM package:                          Other Requirements.  (line   6)
-* Functions details:                     Emacs-w3m Functions. (line   6)
-* General variables:                     General Variables.   (line   6)
-* Getting started:                       Getting Started.     (line   6)
-* Gifsicle program:                      Other Requirements.  (line   6)
-* group parameters:                      Nnshimbun.           (line  88)
-* Grouping URLs:                         Grouping URLs.       (line   6)
-* Hooks:                                 Hooks.               (line   6)
-* ImageMagick package:                   Other Requirements.  (line   6)
-* Info-like keymap:                      Key Binding.         (line   6)
-* Installing emacs-w3m:                  Installing Emacs-w3m.
-                                                              (line   6)
-* Installing on non-UNIX-like systems:   Non-UNIX-like systems.
-                                                              (line   6)
-* Introduction:                          Introduction.        (line   6)
-* Key binding:                           Key Binding.         (line   6)
-* Killing buffers:                       Creating and killing buffers.
-                                                              (line   6)
-* Lynx-like keymap:                      Key Binding.         (line   6)
-* Moving in a page:                      Moving in a page.    (line   6)
-* Mule-UCS package:                      Other Requirements.  (line   6)
-* nnshimbun:                             Nnshimbun.           (line   6)
-* Other variables:                       Other Variables.     (line   6)
-* Possible Emacs versions:               Required Emacs Version.
-                                                              (line   6)
-* Proxy gateways:                        Minimal Settings.    (line  27)
-* Proxy servers:                         Minimal Settings.    (line  27)
-* Quick Searching:                       Quick Searching.     (line   6)
-* Reading HTML mails in Gnus:            Gnus.                (line   6)
-* Reporting bugs:                        Mailing List.        (line   6)
-* rfc2368.el:                            Other Requirements.  (line   6)
-* Saving images:                         Inline Images.       (line  68)
-* Search engines:                        Using Search Engines.
-                                                              (line   6)
-* Searching:                             The Search Interface.
-                                                              (line   6)
-* Shimbun library:                       Shimbun Library.     (line   6)
-* shimbun.el:                            Shimbun Basics.      (line   6)
-* Showing the tree structure of local directories: Showing Directory Tree.
-                                                              (line   6)
-* Special URLs:                          Quick Searching.     (line   6)
-* Starting up:                           Getting Started.     (line   6)
-* Startup file:                          Minimal Settings.    (line  20)
-* Subscribing to the emacs-w3m mailing list: Mailing List.    (line   6)
-* Switching buffers using the buffer list: Selecting buffers. (line  47)
-* Switching buffers using the minibuffer: Selecting buffers.  (line  42)
-* The Antenna interface:                 Daily web tracking.  (line   6)
-* Tips:                                  Tips.                (line   6)
-* Tracking changes in web pages:         Using Antenna.       (line   6)
-* Using emacs-w3m as a batch command:    Launching and Jumping.
-                                                              (line  18)
-* Variables related to antenna:          Antenna Variables.   (line   6)
-* Variables related to bookmarks:        Bookmark Variables.  (line   6)
-* Variables related to cookies:          Cookie Variables.    (line   6)
-* Variables related to forms:            Form Variables.      (line   6)
-* Variables related to images:           Image Variables.     (line   6)
-* Variables related to namazu:           Namazu Variables.    (line   6)
-* Variables related to perldoc:          Perldoc Variables.   (line   6)
-* Variables related to searching the web: Search Variables.   (line   6)
-* Variables related to session manager:  Session Manager Variables.
-                                                              (line   6)
-* Variables related to the dtree feature: Dtree Variables.    (line   6)
-* Variables related to the octet feature: Octet Variables.    (line   6)
-* Variables related to weather information: Weather Variables.
-                                                              (line   6)
-* Viewing images:                        Inline Images.       (line  64)
-* w3m:                                   You Need w3m.        (line   6)
-* Web Newspaper:                         Nnshimbun.           (line   6)
-* Zooming images:                        Inline Images.       (line  73)
-
-
-File: emacs-w3m.info,  Node: Key Index,  Next: Variable Index,  Prev: Concept Index,  Up: Index
-
-Key Index
-=========
-
-[index]
-* Menu:
-
-* +:                                     Setting up Antenna.  (line  12)
-* , (Lynx-like keymap):                  Moving in a page.    (line  50)
-* . (Lynx-like keymap):                  Moving in a page.    (line  44)
-* <:                                     Moving in a page.    (line  38)
-* <backspace> <1>:                       Moving over pages.   (line 110)
-* <backspace>:                           Moving in a page.    (line  28)
-* <backtab>:                             Moving in a page.    (line  81)
-* <DEL> <1>:                             Moving over pages.   (line 110)
-* <DEL>:                                 Moving in a page.    (line  28)
-* <down> (Lynx-like keymap):             Moving in a page.    (line  73)
-* <left> (Lynx-like keymap):             Moving over pages.   (line  19)
-* <RET>:                                 Launching and Jumping.
-                                                              (line  55)
-* <right> (Lynx-like keymap):            Launching and Jumping.
-                                                              (line  55)
-* <SPC> <1>:                             Moving over pages.   (line  61)
-* <SPC>:                                 Moving in a page.    (line  19)
-* <TAB>:                                 Moving in a page.    (line  73)
-* <up> (Lynx-like keymap):               Moving in a page.    (line  81)
-* =:                                     HTML File Information.
-                                                              (line  30)
-* >:                                     Moving in a page.    (line  33)
-* [:                                     Moving in a page.    (line  90)
-* \:                                     HTML File Information.
-                                                              (line  26)
-* ]:                                     Moving in a page.    (line  86)
-* ^:                                     Moving over pages.   (line  42)
-* A:                                     Daily web tracking.  (line  39)
-* a:                                     Adding Bookmarks.    (line   6)
-* b <1>:                                 Moving over pages.   (line 110)
-* b:                                     Moving in a page.    (line  28)
-* B (Lynx-like keymap):                  Moving over pages.   (line  19)
-* c (Lynx-like keymap):                  Launching and Jumping.
-                                                              (line  93)
-* C-? <1>:                               Moving over pages.   (line 110)
-* C-?:                                   Moving in a page.    (line  28)
-* C-c C-<SPC>:                           Tracing History.     (line  54)
-* C-c C-@:                               Tracing History.     (line  54)
-* C-c C-a:                               Selecting buffers.   (line  42)
-* C-c C-n:                               Moving across buffers.
-                                                              (line  27)
-* C-c C-p:                               Moving across buffers.
-                                                              (line  22)
-* C-c C-s:                               Selecting buffers.   (line  47)
-* C-c C-t:                               Creating and killing buffers.
-                                                              (line  18)
-* C-c C-v:                               Tracing History.     (line  57)
-* C-c C-w:                               Creating and killing buffers.
-                                                              (line  23)
-* C-c M-w:                               Creating and killing buffers.
-                                                              (line  26)
-* C-S-l (Info-like keymap):              Launching and Jumping.
-                                                              (line 108)
-* C-u a:                                 Adding Bookmarks.    (line   6)
-* C-u o (Info-like keymap):              Tracing History.     (line  48)
-* C-u s (Lynx-like keymap):              Tracing History.     (line  48)
-* d (Info-like keymap):                  Downloading.         (line  26)
-* D (Info-like keymap):                  Downloading.         (line  21)
-* D (Lynx-like keymap):                  Showing Directory Tree.
-                                                              (line  50)
-* d (Lynx-like keymap):                  Downloading.         (line  21)
-* E (Info-like keymap):                  HTML File Information.
-                                                              (line  41)
-* e (Info-like keymap):                  HTML File Information.
-                                                              (line  36)
-* e (Lynx-like keymap):                  HTML File Information.
-                                                              (line  41)
-* E (Lynx-like keymap):                  HTML File Information.
-                                                              (line  36)
-* G:                                     Launching and Jumping.
-                                                              (line  83)
-* g:                                     Launching and Jumping.
-                                                              (line  77)
-* H:                                     Moving over pages.   (line  32)
-* i (Info-like keymap):                  Inline Images.       (line  51)
-* I (Info-like keymap):                  Inline Images.       (line  30)
-* I (Lynx-like keymap):                  Inline Images.       (line  64)
-* l (Info-like keymap):                  Moving over pages.   (line  19)
-* M:                                     HTML File Information.
-                                                              (line  45)
-* M-<TAB>:                               Moving in a page.    (line  81)
-* M-[:                                   Inline Images.       (line  74)
-* M-]:                                   Inline Images.       (line  77)
-* M-a:                                   Adding Bookmarks.    (line   6)
-* M-d (Lynx-like keymap):                Downloading.         (line  26)
-* M-i:                                   Inline Images.       (line  68)
-* M-I (Info-like keymap):                Inline Images.       (line  60)
-* M-l:                                   Moving in a page.    (line  55)
-* M-n:                                   Creating and killing buffers.
-                                                              (line  18)
-* M-s:                                   Session Manager.     (line  11)
-* M-S:                                   Session Manager.     (line   8)
-* M-T (Lynx-like keymap):                Inline Images.       (line  60)
-* mouse-2:                               Browsing with Mouse Operations.
-                                                              (line  17)
-* n (Info-like keymap):                  Moving over pages.   (line  25)
-* N (Lynx-like keymap):                  Moving over pages.   (line  25)
-* o (Info-like keymap):                  Tracing History.     (line  48)
-* p (Info-like keymap):                  Moving over pages.   (line  19)
-* Q:                                     Going Back to Daily Hacking and/or Daily Writing.
-                                                              (line  23)
-* q:                                     Going Back to Daily Hacking and/or Daily Writing.
-                                                              (line  19)
-* R:                                     Launching and Jumping.
-                                                              (line 108)
-* s (Info-like keymap):                  The Search Interface.
-                                                              (line  30)
-* S (Lynx-like keymap):                  The Search Interface.
-                                                              (line  30)
-* s (Lynx-like keymap):                  Tracing History.     (line  48)
-* S-<left> (Info-like keymap):           Moving in a page.    (line  44)
-* S-<mouse-2>:                           Browsing with Mouse Operations.
-                                                              (line  21)
-* S-<right> (Info-like keymap):          Moving in a page.    (line  50)
-* S-<SPC> <1>:                           Moving over pages.   (line 110)
-* S-<SPC>:                               Moving in a page.    (line  28)
-* S-<TAB>:                               Moving in a page.    (line  81)
-* T (Info-like keymap):                  Showing Directory Tree.
-                                                              (line  50)
-* t (Lynx-like keymap):                  Inline Images.       (line  51)
-* T (Lynx-like keymap):                  Inline Images.       (line  30)
-* u (Info-like keymap):                  Moving over pages.   (line  42)
-* u (Lynx-like keymap):                  Launching and Jumping.
-                                                              (line  98)
-* v:                                     Consulting Bookmarks.
-                                                              (line   6)
-* Y (Info-like keymap):                  Launching and Jumping.
-                                                              (line  98)
-* y (Info-like keymap):                  Launching and Jumping.
-                                                              (line  93)
-* {:                                     Moving in a page.    (line  98)
-* |:                                     HTML File Information.
-                                                              (line  52)
-* }:                                     Moving in a page.    (line  94)
-
-
-File: emacs-w3m.info,  Node: Variable Index,  Next: Function Index,  Prev: Key Index,  Up: Index
-
-Variable Index
-==============
-
-[index]
-* Menu:
-
-* gnus-keep-backlog:                     Nnshimbun.           (line  53)
-* mm-inline-text-html-with-images:       Gnus.                (line   6)
-* mm-inline-text-html-with-w3m-keymap:   Gnus.                (line   6)
-* mm-text-html-renderer:                 Gnus.                (line   6)
-* nnmail-expiry-wait:                    Nnshimbun.           (line 170)
-* nnmail-expiry-wait-function:           Nnshimbun.           (line 170)
-* nnshimbun-default-group-level:         Nnshimbun.           (line  71)
-* nnshimbun-directory:                   Nnshimbun.           (line  66)
-* nnshimbun-encapsulate-images:          Nnshimbun.           (line 110)
-* nnshimbun-group-parameters-alist:      Nnshimbun.           (line 154)
-* nnshimbun-index-range:                 Nnshimbun.           (line 122)
-* nnshimbun-keep-backlog:                Nnshimbun.           (line  53)
-* nnshimbun-keep-unparsable-dated-articles: Nnshimbun.        (line 252)
-* nnshimbun-marks-is-evil:               Nnshimbun.           (line  77)
-* nnshimbun-pre-fetch-article:           Nnshimbun.           (line 101)
-* shimbun-local-path:                    Shimbun local mode.  (line  22)
-* shimbun-slashdot-comment-display:      News Sites Supported by Shimbun.
-                                                              (line 123)
-* shimbun-slashdot-comment-threshold:    News Sites Supported by Shimbun.
-                                                              (line 119)
-* shimbun-slashdot-get-comments:         News Sites Supported by Shimbun.
-                                                              (line 110)
-* shimbun-tech-on-password:              News Sites Supported by Shimbun.
-                                                              (line 162)
-* shimbun-tech-on-user-name:             News Sites Supported by Shimbun.
-                                                              (line 155)
-* shimbun-use-local:                     Shimbun local mode.  (line  17)
-* w3m-accept-languages:                  General Variables.   (line   7)
-* w3m-add-referer:                       General Variables.   (line  12)
-* w3m-add-user-agent:                    General Variables.   (line  43)
-* w3m-after-cursor-move-hook:            Hooks.               (line   7)
-* w3m-antenna-file:                      Antenna Variables.   (line   7)
-* w3m-antenna-html-skelton:              Antenna Variables.   (line  12)
-* w3m-antenna-refresh-interval <1>:      Antenna Variables.   (line  15)
-* w3m-antenna-refresh-interval:          Daily web tracking.  (line  34)
-* w3m-antenna-sites:                     Setting up Antenna.  (line   6)
-* w3m-antenna-sort-changed-sites-function: Antenna Variables. (line  24)
-* w3m-antenna-sort-unchanged-sites-function: Antenna Variables.
-                                                              (line  29)
-* w3m-arrived-file:                      General Variables.   (line  47)
-* w3m-async-exec:                        Other Variables.     (line   7)
-* w3m-auto-show:                         General Variables.   (line  50)
-* w3m-bookmark-default-section:          Bookmark Variables.  (line  18)
-* w3m-bookmark-file:                     Bookmark Variables.  (line   7)
-* w3m-bookmark-file-coding-system:       Bookmark Variables.  (line  10)
-* w3m-bookmark-menu-open-new-session:    Bookmark Variables.  (line  21)
-* w3m-bookmark-mode-hook:                Hooks.               (line  56)
-* w3m-broken-proxy-cache:                Other Variables.     (line  11)
-* w3m-charset-coding-system-alist:       General Variables.   (line  60)
-* w3m-coding-system:                     General Variables.   (line  64)
-* w3m-coding-system-priority-list:       General Variables.   (line  67)
-* w3m-command:                           General Variables.   (line  70)
-* w3m-command-arguments:                 Minimal Settings.    (line  27)
-* w3m-command-arguments-alist:           General Variables.   (line  88)
-* w3m-command-environment:               General Variables.   (line 108)
-* w3m-confirm-leaving-secure-page:       General Variables.   (line 111)
-* w3m-content-type-alist:                General Variables.   (line 117)
-* w3m-cookie-accept-bad-cookies:         Cookie Variables.    (line   7)
-* w3m-cookie-accept-domains:             Cookie Variables.    (line  11)
-* w3m-cookie-file:                       Cookie Variables.    (line  14)
-* w3m-cookie-reject-domains:             Cookie Variables.    (line  17)
-* w3m-correct-charset-alist:             General Variables.   (line 150)
-* w3m-db-history-display-size:           General Variables.   (line 153)
-* w3m-decoder-alist:                     General Variables.   (line 156)
-* w3m-default-coding-system:             Quick Searching.     (line   6)
-* w3m-default-content-type:              General Variables.   (line 162)
-* w3m-default-directory:                 General Variables.   (line 165)
-* w3m-default-display-inline-images:     Image Variables.     (line   7)
-* w3m-default-save-directory:            General Variables.   (line 178)
-* w3m-delete-buffer-hook:                Hooks.               (line  12)
-* w3m-delete-duplicated-empty-lines:     General Variables.   (line 181)
-* w3m-dirlist-cgi-program:               General Variables.   (line 185)
-* w3m-display-hook:                      Hooks.               (line  15)
-* w3m-do-cleanup-temp-files:             General Variables.   (line 642)
-* w3m-doc-view-content-types:            General Variables.   (line 189)
-* w3m-dtree-default-allfiles:            Dtree Variables.     (line   7)
-* w3m-dtree-directory-depth:             Dtree Variables.     (line  13)
-* w3m-dtree-indent-strings:              Dtree Variables.     (line  18)
-* w3m-dtree-stop-strings:                Dtree Variables.     (line  22)
-* w3m-edit-function:                     General Variables.   (line 193)
-* w3m-edit-function-alist:               General Variables.   (line 198)
-* w3m-enable-google-feeling-lucky:       General Variables.   (line 205)
-* w3m-encoding-type-alist:               General Variables.   (line 210)
-* w3m-favicon-cache-expire-wait:         Image Variables.     (line  13)
-* w3m-favicon-cache-file:                Image Variables.     (line  17)
-* w3m-favicon-default-background:        Image Variables.     (line  32)
-* w3m-favicon-size:                      Image Variables.     (line  22)
-* w3m-favicon-type:                      Image Variables.     (line  26)
-* w3m-favicon-use-cache-file:            Image Variables.     (line  29)
-* w3m-file-coding-system:                General Variables.   (line 213)
-* w3m-file-name-coding-system:           General Variables.   (line 217)
-* w3m-fill-column:                       General Variables.   (line 221)
-* w3m-follow-redirection:                General Variables.   (line 229)
-* w3m-fontify-after-hook:                Hooks.               (line  20)
-* w3m-fontify-before-hook:               Hooks.               (line  24)
-* w3m-form-input-map-buffer-lines:       Form Variables.      (line   7)
-* w3m-form-input-map-mode-hook:          Hooks.               (line  28)
-* w3m-form-input-map-set-hook:           Hooks.               (line  31)
-* w3m-form-input-select-buffer-lines:    Form Variables.      (line  10)
-* w3m-form-input-select-mode-hook:       Hooks.               (line  34)
-* w3m-form-input-select-set-hook:        Hooks.               (line  37)
-* w3m-form-input-textarea-buffer-lines:  Form Variables.      (line  13)
-* w3m-form-input-textarea-mode-hook:     Hooks.               (line  40)
-* w3m-form-input-textarea-set-hook:      Hooks.               (line  43)
-* w3m-form-mouse-face:                   Form Variables.      (line  16)
-* w3m-form-textarea-directory:           Form Variables.      (line  25)
-* w3m-form-treat-textarea-size:          Form Variables.      (line  19)
-* w3m-form-use-fancy-faces:              Form Variables.      (line  22)
-* w3m-form-use-textarea-backup:          Form Variables.      (line  25)
-* w3m-history-minimize-in-new-session:   Other Variables.     (line  20)
-* w3m-history-reuse-history-elements:    Other Variables.     (line  26)
-* w3m-home-page:                         Launching and Jumping.
-                                                              (line  18)
-* w3m-horizontal-scroll-columns:         Moving in a page.    (line  33)
-* w3m-horizontal-scroll-division:        General Variables.   (line 245)
-* w3m-horizontal-shift-columns:          Moving in a page.    (line  44)
-* w3m-icon-directory:                    Image Variables.     (line  40)
-* w3m-image-default-background:          Image Variables.     (line 108)
-* w3m-imagick-convert-program:           Image Variables.     (line  43)
-* w3m-imitate-widget-button:             General Variables.   (line 266)
-* w3m-init-file <1>:                     Customizable Variables.
-                                                              (line   6)
-* w3m-init-file:                         Minimal Settings.    (line  20)
-* w3m-input-coding-system:               General Variables.   (line 281)
-* w3m-keep-arrived-urls:                 General Variables.   (line 286)
-* w3m-keep-cache-size:                   General Variables.   (line 289)
-* w3m-key-binding:                       Key Binding.         (line   6)
-* w3m-language:                          General Variables.   (line 297)
-* w3m-local-directory-view-method:       General Variables.   (line 300)
-* w3m-local-find-file-function:          General Variables.   (line 306)
-* w3m-local-find-file-regexps:           General Variables.   (line 317)
-* w3m-mailto-url-function:               General Variables.   (line 341)
-* w3m-mailto-url-popup-function-alist:   General Variables.   (line 347)
-* w3m-make-new-session:                  General Variables.   (line 357)
-* w3m-mbconv-command:                    General Variables.   (line 365)
-* w3m-menu-on-forefront:                 General Variables.   (line 613)
-* w3m-minor-mode:                        Gnus.                (line   6)
-* w3m-minor-mode-command-alist:          Gnus.                (line   6)
-* w3m-minor-mode-hook:                   Hooks.               (line  46)
-* w3m-mode-hook:                         Hooks.               (line  49)
-* w3m-namazu-arguments:                  Namazu Variables.    (line  10)
-* w3m-namazu-command:                    Namazu Variables.    (line   7)
-* w3m-namazu-default-index:              Namazu Variables.    (line  17)
-* w3m-namazu-index-alist:                Namazu Variables.    (line  25)
-* w3m-namazu-input-coding-system:        Namazu Variables.    (line  29)
-* w3m-namazu-output-coding-system:       Namazu Variables.    (line  34)
-* w3m-namazu-page-max:                   Namazu Variables.    (line  40)
-* w3m-new-session-in-background:         General Variables.   (line 638)
-* w3m-no-proxy-domains:                  Minimal Settings.    (line  27)
-* w3m-output-coding-system:              General Variables.   (line 375)
-* w3m-perldoc-command:                   Perldoc Variables.   (line   7)
-* w3m-perldoc-input-coding-system:       Perldoc Variables.   (line  11)
-* w3m-perldoc-output-coding-system:      Perldoc Variables.   (line  17)
-* w3m-perldoc-pod2html-arguments:        Perldoc Variables.   (line  25)
-* w3m-perldoc-pod2html-command:          Perldoc Variables.   (line  21)
-* w3m-pixels-per-character:              Image Variables.     (line  59)
-* w3m-pixels-per-line:                   Image Variables.     (line  67)
-* w3m-pop-up-frames:                     General Variables.   (line 378)
-* w3m-pop-up-windows:                    General Variables.   (line 386)
-* w3m-popup-frame-parameters:            General Variables.   (line 395)
-* w3m-prefer-cache:                      General Variables.   (line 400)
-* w3m-process-connection-type:           Other Variables.     (line  47)
-* w3m-process-modeline-format:           Other Variables.     (line  51)
-* w3m-profile-directory:                 General Variables.   (line 404)
-* w3m-quick-start <1>:                   Moving over pages.   (line  32)
-* w3m-quick-start:                       Launching and Jumping.
-                                                              (line  18)
-* w3m-redirect-with-get:                 General Variables.   (line 415)
-* w3m-refresh-minimum-interval:          General Variables.   (line 604)
-* w3m-relationship-estimate-rules:       General Variables.   (line 426)
-* w3m-resize-image-scale:                Image Variables.     (line  76)
-* w3m-resize-images:                     Image Variables.     (line  79)
-* w3m-search-default-engine:             The Search Interface.
-                                                              (line  30)
-* w3m-search-engine-alist:               Quick Searching.     (line   6)
-* w3m-search-thing-at-point-arg:         Search Variables.    (line  25)
-* w3m-search-word-at-point:              Search Variables.    (line  20)
-* w3m-select-buffer-hook:                Hooks.               (line  53)
-* w3m-select-buffer-horizontal-window:   General Variables.   (line 430)
-* w3m-select-buffer-window-ratio:        General Variables.   (line 434)
-* w3m-session-automatic-keep-number:     Session Manager Variables.
-                                                              (line  25)
-* w3m-session-automatic-save:            Session Manager.     (line  40)
-* w3m-session-automatic-title:           Session Manager Variables.
-                                                              (line  13)
-* w3m-session-crash-recovery:            Session Manager.     (line  53)
-* w3m-session-crash-recovery-title:      Session Manager Variables.
-                                                              (line  19)
-* w3m-session-deleted-keep-number:       Session Manager Variables.
-                                                              (line  22)
-* w3m-session-deleted-save:              Session Manager.     (line  40)
-* w3m-session-deleted-title:             Session Manager Variables.
-                                                              (line  16)
-* w3m-session-file:                      Session Manager Variables.
-                                                              (line   7)
-* w3m-session-load-crashed-sessions:     Session Manager.     (line  53)
-* w3m-session-load-last-sessions:        Session Manager.     (line  47)
-* w3m-session-time-format:               Session Manager Variables.
-                                                              (line  10)
-* w3m-session-unknown-title:             Session Manager Variables.
-                                                              (line  28)
-* w3m-show-current-title-in-buffer-tab:  Other Variables.     (line  56)
-* w3m-show-decoded-url:                  General Variables.   (line 439)
-* w3m-show-error-information:            General Variables.   (line 477)
-* w3m-show-graphic-icons-in-header-line: Image Variables.     (line  82)
-* w3m-show-graphic-icons-in-mode-line:   Image Variables.     (line  88)
-* w3m-space-before-favicon:              General Variables.   (line 482)
-* w3m-space-before-modeline-icon:        General Variables.   (line 487)
-* w3m-submit-form-safety-check:          General Variables.   (line 585)
-* w3m-tab-mouse-position-adjuster:       Using Tabs.          (line  60)
-* w3m-tab-track-mouse:                   Using Tabs.          (line  54)
-* w3m-terminal-coding-system:            General Variables.   (line 492)
-* w3m-toggle-inline-images-permanently:  Image Variables.     (line  93)
-* w3m-touch-command:                     General Variables.   (line 499)
-* w3m-track-mouse:                       General Variables.   (line 504)
-* w3m-treat-image-size:                  Image Variables.     (line  46)
-* w3m-uri-replace-alist:                 Quick Searching.     (line   6)
-* w3m-url-local-directory-alist:         General Variables.   (line 558)
-* w3m-use-ange-ftp:                      General Variables.   (line 566)
-* w3m-use-cookies:                       Cookie Variables.    (line  20)
-* w3m-use-cygdrive:                      General Variables.   (line 570)
-* w3m-use-favicon:                       Image Variables.     (line 103)
-* w3m-use-filter:                        General Variables.   (line 574)
-* w3m-use-form:                          General Variables.   (line 581)
-* w3m-use-header-line:                   General Variables.   (line 589)
-* w3m-use-header-line-title:             General Variables.   (line 592)
-* w3m-use-mule-ucs:                      General Variables.   (line 596)
-* w3m-use-refresh:                       General Variables.   (line 599)
-* w3m-use-symbol:                        General Variables.   (line 608)
-* w3m-use-tab:                           Using Tabs.          (line  45)
-* w3m-use-tab-menubar:                   General Variables.   (line 623)
-* w3m-use-title-buffer-name:             General Variables.   (line 474)
-* w3m-use-toolbar:                       General Variables.   (line 631)
-* w3m-user-agent:                        General Variables.   (line 634)
-* w3m-weather-default-area:              Weather Variables.   (line   7)
-* w3m-weather-filter-functions:          Weather Variables.   (line  11)
-
-
-File: emacs-w3m.info,  Node: Function Index,  Prev: Variable Index,  Up: Index
-
-Function Index
-==============
-
-[index]
-* Menu:
-
-* gnus-group-make-shimbun-group:         Nnshimbun.           (line  18)
-* gnus-group-make-shimbun-groups:        Nnshimbun.           (line  40)
-* nnshimbun-generate-download-script:    Shimbun local mode.  (line  32)
-* octet-find-file:                       Octet.               (line   6)
-* w3m:                                   Launching and Jumping.
-                                                              (line  18)
-* w3m-antenna:                           Daily web tracking.  (line  39)
-* w3m-antenna-add-current-url:           Setting up Antenna.  (line  12)
-* w3m-bookmark-add-current-url:          Adding Bookmarks.    (line   6)
-* w3m-bookmark-add-this-url:             Adding Bookmarks.    (line   6)
-* w3m-bookmark-edit:                     Editing Bookmarks.   (line  20)
-* w3m-bookmark-kill-entry:               Editing Bookmarks.   (line  17)
-* w3m-bookmark-undo:                     Editing Bookmarks.   (line  23)
-* w3m-bookmark-view:                     Consulting Bookmarks.
-                                                              (line   6)
-* w3m-browse-url:                        Launching and Jumping.
-                                                              (line  37)
-* w3m-close-window:                      Going Back to Daily Hacking and/or Daily Writing.
-                                                              (line  19)
-* w3m-copy-buffer:                       Creating and killing buffers.
-                                                              (line  18)
-* w3m-delete-buffer:                     Creating and killing buffers.
-                                                              (line  23)
-* w3m-delete-other-buffers:              Creating and killing buffers.
-                                                              (line  26)
-* w3m-download:                          Downloading.         (line  26)
-* w3m-download-this-url:                 Downloading.         (line  21)
-* w3m-dtree:                             Showing Directory Tree.
-                                                              (line  50)
-* w3m-edit-current-url:                  HTML File Information.
-                                                              (line  36)
-* w3m-edit-this-url:                     HTML File Information.
-                                                              (line  41)
-* w3m-fb-mode:                           Frame Local Buffers. (line  11)
-* w3m-find-file:                         Launching and Jumping.
-                                                              (line  33)
-* w3m-gohome:                            Moving over pages.   (line  32)
-* w3m-goto-url:                          Launching and Jumping.
-                                                              (line  77)
-* w3m-goto-url-new-session:              Launching and Jumping.
-                                                              (line  83)
-* w3m-history:                           Tracing History.     (line  48)
-* w3m-history-restore-position:          Tracing History.     (line  57)
-* w3m-history-store-position:            Tracing History.     (line  54)
-* w3m-horizontal-recenter:               Moving in a page.    (line  55)
-* w3m-mouse-view-this-url:               Browsing with Mouse Operations.
-                                                              (line  17)
-* w3m-mouse-view-this-url-new-session:   Browsing with Mouse Operations.
-                                                              (line  21)
-* w3m-next-anchor:                       Moving in a page.    (line  73)
-* w3m-next-buffer:                       Moving across buffers.
-                                                              (line  27)
-* w3m-next-form:                         Moving in a page.    (line  86)
-* w3m-next-image:                        Moving in a page.    (line  94)
-* w3m-pattern-uri-replace:               General Variables.   (line 544)
-* w3m-pipe-source:                       HTML File Information.
-                                                              (line  52)
-* w3m-previous-anchor:                   Moving in a page.    (line  81)
-* w3m-previous-buffer:                   Moving across buffers.
-                                                              (line  22)
-* w3m-previous-form:                     Moving in a page.    (line  90)
-* w3m-previous-image:                    Moving in a page.    (line  98)
-* w3m-print-current-url:                 Launching and Jumping.
-                                                              (line  93)
-* w3m-print-this-url:                    Launching and Jumping.
-                                                              (line  98)
-* w3m-quit:                              Going Back to Daily Hacking and/or Daily Writing.
-                                                              (line  23)
-* w3m-reload-this-page:                  Launching and Jumping.
-                                                              (line 108)
-* w3m-save-image:                        Inline Images.       (line  68)
-* w3m-scroll-down-or-previous-url <1>:   Moving over pages.   (line 110)
-* w3m-scroll-down-or-previous-url:       Moving in a page.    (line  28)
-* w3m-scroll-left:                       Moving in a page.    (line  33)
-* w3m-scroll-right:                      Moving in a page.    (line  38)
-* w3m-scroll-up-or-next-url <1>:         Moving over pages.   (line  61)
-* w3m-scroll-up-or-next-url:             Moving in a page.    (line  19)
-* w3m-search:                            The Search Interface.
-                                                              (line  30)
-* w3m-search-uri-replace:                General Variables.   (line 549)
-* w3m-select-buffer:                     Selecting buffers.   (line  47)
-* w3m-session-select:                    Session Manager.     (line  11)
-* w3m-session-select-delete:             Session Manager.     (line  23)
-* w3m-session-select-next:               Session Manager.     (line  32)
-* w3m-session-select-open-session-group: Session Manager.     (line  19)
-* w3m-session-select-previous:           Session Manager.     (line  35)
-* w3m-session-select-quit:               Session Manager.     (line  38)
-* w3m-session-select-rename:             Session Manager.     (line  26)
-* w3m-session-select-save:               Session Manager.     (line  29)
-* w3m-session-select-select:             Session Manager.     (line  16)
-* w3m-shift-left:                        Moving in a page.    (line  44)
-* w3m-shift-right:                       Moving in a page.    (line  50)
-* w3m-switch-buffer:                     Selecting buffers.   (line  42)
-* w3m-tab-move-left:                     Moving across buffers.
-                                                              (line  42)
-* w3m-tab-move-right:                    Moving across buffers.
-                                                              (line  36)
-* w3m-toggle-inline-image:               Inline Images.       (line  51)
-* w3m-toggle-inline-images:              Inline Images.       (line  30)
-* w3m-turnoff-inline-images:             Inline Images.       (line  60)
-* w3m-view-header:                       HTML File Information.
-                                                              (line  30)
-* w3m-view-image:                        Inline Images.       (line  64)
-* w3m-view-next-page:                    Moving over pages.   (line  25)
-* w3m-view-parent-page:                  Moving over pages.   (line  42)
-* w3m-view-previous-page:                Moving over pages.   (line  19)
-* w3m-view-source:                       HTML File Information.
-                                                              (line  26)
-* w3m-view-this-url:                     Launching and Jumping.
-                                                              (line  55)
-* w3m-view-url-with-external-browser:    HTML File Information.
-                                                              (line  45)
-* w3m-zoom-in-image:                     Inline Images.       (line  77)
-* w3m-zoom-out-image:                    Inline Images.       (line  74)
-
-
-
-Tag Table:
-Node: Top1134
-Node: Introduction6654
-Node: Getting Started7702
-Node: Required Emacs Version8496
-Node: You Need w3m9574
-Node: Other Requirements10101
-Node: Installing Emacs-w3m14843
-Node: Non-UNIX-like systems18082
-Node: Minimal Settings18816
-Node: Basic Usage21112
-Node: Browsing Web Pages21807
-Node: Key Binding22542
-Node: Launching and Jumping23893
-Node: Moving in a page28471
-Node: Moving over pages32180
-Node: Browsing with Mouse Operations37518
-Node: Going Back to Daily Hacking and/or Daily Writing39203
-Node: Inline Images40289
-Node: Tracing History43704
-Node: Managing Bookmarks48235
-Node: Adding Bookmarks48765
-Node: Consulting Bookmarks50304
-Node: Editing Bookmarks50999
-Node: Using Tabs51873
-Ref: Using Tabs-Footnote-155507
-Ref: Using Tabs-Footnote-255693
-Node: Working with buffers55770
-Node: Creating and killing buffers56386
-Node: Moving across buffers57471
-Ref: Moving across buffers-Footnote-159812
-Node: Selecting buffers59998
-Node: Downloading62634
-Node: Submitting Forms63858
-Node: HTML File Information65477
-Node: Pretty Good Features67777
-Node: Using Search Engines68585
-Node: The Search Interface69960
-Node: Quick Searching71535
-Node: Adding New Search Engines74061
-Node: Grouping URLs76405
-Node: Weather Information77508
-Node: Using Antenna77690
-Node: Setting up Antenna78362
-Node: Daily web tracking78976
-Node: Showing Directory Tree80737
-Node: Viewing Perl Documents82399
-Node: Using Namazu82588
-Node: Octet82791
-Node: Frame Local Buffers83236
-Node: Session Manager84837
-Node: Customizable Variables87071
-Node: General Variables89907
-Node: Image Variables116138
-Node: Form Variables120939
-Node: Cookie Variables121855
-Node: Bookmark Variables122503
-Node: Search Variables123328
-Node: Weather Variables124542
-Node: Dtree Variables125181
-Node: Antenna Variables126189
-Node: Perldoc Variables127500
-Node: Namazu Variables128441
-Node: Octet Variables130179
-Node: Session Manager Variables130445
-Node: Hooks131285
-Node: Other Variables133093
-Node: Hooking into MUAs135595
-Node: Gnus136667
-Node: Mew141202
-Node: SEMI MUAs143574
-Node: VM146348
-Node: Frequently Asked Questions146765
-Node: General FAQ147115
-Node: Trouble FAQ149060
-Ref: Trouble FAQ-Footnote-1158521
-Node: Shimbun FAQ158593
-Node: Known Problems159426
-Node: Shimbun Library159595
-Node: Nnshimbun162448
-Ref: Nnshimbun-Footnote-1174745
-Ref: Nnshimbun-Footnote-2174945
-Ref: Nnshimbun-Footnote-3175646
-Ref: Nnshimbun-Footnote-4175750
-Node: Mew Shimbun176220
-Ref: Mew Shimbun-Footnote-1185688
-Ref: Mew Shimbun-Footnote-2185818
-Node: Shimbun with Wanderlust185983
-Node: Shimbun local mode186367
-Node: Shimbun Sites188155
-Node: Newspapers Supported by Shimbun188711
-Node: News Sites Supported by Shimbun199396
-Node: Mailing Lists Supported by Shimbun208955
-Node: Sport Sites Supported by Shimbun222358
-Node: Misc Sites Supported by Shimbun223216
-Node: Shimbun Basics235220
-Node: Overview235815
-Node: Getting web page and header information239650
-Ref: Getting web page and header information-Footnote-1245410
-Ref: Getting web page and header information-Footnote-2245503
-Node: Displaying an article245611
-Node: Inheriting shimbun module248410
-Ref: Inheriting shimbun module-Footnote-1250593
-Ref: Inheriting shimbun module-Footnote-2250678
-Node: Making text/plain articles250732
-Node: Zenkaku to hankaku conversion253062
-Node: Coding convention of Shimbun254172
-Node: Tips255344
-Node: Mailing List260202
-Node: Emacs-w3m Functions261544
-Node: External Packages261732
-Node: Authors262898
-Node: Index263268
-Node: Concept Index263537
-Node: Key Index270357
-Node: Variable Index280083
-Node: Function Index297384
-
-End Tag Table
------------------------------------------------------------
revno: 101419
committer: Daiki Ueno <ueno@unixuser.org>
branch nick: trunk
timestamp: Mon 2010-09-13 19:44:07 +0900
message:
  epa-file: suppress file-locking question on M-x revert-buffer
  
  * epa-file.el (epa-file-insert-file-contents): If visiting, bind
  buffer-file-name to avoid file-locking.  (Bug#7026)
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-13 04:39:36 +0000
+++ lisp/ChangeLog	2010-09-13 10:44:07 +0000
@@ -1,3 +1,8 @@
+2010-09-13  Daiki Ueno  <ueno@unixuser.org>
+
+	* epa-file.el (epa-file-insert-file-contents): If visiting, bind
+	buffer-file-name to avoid file-locking.  (Bug#7026)
+
 2010-09-13  Julien Danjou  <julien@danjou.info>
 
 	* notifications.el (notifications-notify): Add support for

=== modified file 'lisp/epa-file.el'
--- lisp/epa-file.el	2010-08-29 16:17:13 +0000
+++ lisp/epa-file.el	2010-09-13 10:44:07 +0000
@@ -158,12 +158,17 @@
 	  (if (or beg end)
 	      (setq string (substring string (or beg 0) end)))
 	  (save-excursion
-	    (save-restriction
-	      (narrow-to-region (point) (point))
-	      (epa-file-decode-and-insert string file visit beg end replace)
-	      (setq length (- (point-max) (point-min))))
-	    (if replace
-		(delete-region (point) (point-max)))
+	    ;; If visiting, bind off buffer-file-name so that
+	    ;; file-locking will not ask whether we should
+	    ;; really edit the buffer.
+	    (let ((buffer-file-name
+		   (if visit nil buffer-file-name)))
+	      (save-restriction
+		(narrow-to-region (point) (point))
+		(epa-file-decode-and-insert string file visit beg end replace)
+		(setq length (- (point-max) (point-min))))
+	      (if replace
+		  (delete-region (point) (point-max))))
 	    (if visit
 		(set-visited-file-modtime))))
       (if (and local-copy
------------------------------------------------------------
revno: 101418
committer: Robert J. Chassell <bob@gnu.org>
branch nick: trunk
timestamp: Mon 2010-09-13 10:14:52 +0000
message:
  10-09-13
diff:
=== modified file 'configure'
--- configure	2010-09-10 16:44:35 +0000
+++ configure	2010-09-13 10:14:52 +0000
@@ -1,11 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for emacs 24.0.50.
+# Generated by GNU Autoconf 2.67 for emacs 24.0.50.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -316,7 +316,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -356,19 +356,19 @@
 fi # as_fn_arith
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -530,7 +530,7 @@
 exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -910,8 +910,9 @@
   fi
 
   case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -956,7 +957,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -982,7 +983,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1186,7 +1187,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1202,7 +1203,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1232,8 +1233,8 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
@@ -1241,7 +1242,7 @@
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1259,13 +1260,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1288,7 +1289,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1302,8 +1303,8 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1318,9 +1319,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1359,11 +1360,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1403,7 +1404,7 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1621,9 +1622,9 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 emacs configure 24.0.50
-generated by GNU Autoconf 2.65
+generated by GNU Autoconf 2.67
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1739,7 +1740,7 @@
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
+  test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -1763,10 +1764,10 @@
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  if eval "test \"\${$3+set}\"" = set; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -1802,7 +1803,7 @@
 else
   ac_header_preproc=no
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 
@@ -1829,7 +1830,7 @@
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -1893,7 +1894,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1915,15 +1916,18 @@
 
 } # ac_fn_c_check_header_compile
 
-# ac_fn_c_check_decl LINENO SYMBOL VAR
-# ------------------------------------
-# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
 ac_fn_c_check_decl ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
-$as_echo_n "checking whether $2 is declared... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1932,8 +1936,12 @@
 int
 main ()
 {
-#ifndef $2
-  (void) $2;
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
+#endif
 #endif
 
   ;
@@ -1962,7 +1970,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1974,7 +1982,7 @@
 else
   eval "$3=no"
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -1992,7 +2000,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
 $as_echo_n "checking for $2.$3... " >&6; }
-if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$4+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2048,7 +2056,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2116,7 +2124,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=no"
@@ -2165,7 +2173,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by emacs $as_me 24.0.50, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
 
@@ -2275,11 +2283,9 @@
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -2313,11 +2319,9 @@
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
@@ -2330,11 +2334,9 @@
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
@@ -2348,11 +2350,9 @@
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
@@ -2407,7 +2407,12 @@
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -2422,7 +2427,11 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5 ; }
   fi
 done
 
@@ -2503,7 +2512,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2677,7 +2686,7 @@
 	    g | gt | gtk  )	val=gtk ;;
 	    gtk3  )	val=gtk3 ;;
 	    * )
-as_fn_error "\`--with-x-toolkit=$withval' is invalid;
+as_fn_error $? "\`--with-x-toolkit=$withval' is invalid;
 this option's value should be \`yes', \`no', \`lucid', \`athena', \`motif', \`gtk' or
 \`gtk3'.  \`yes' and \`gtk' are synonyms. \`athena' and \`lucid' are synonyms." "$LINENO" 5
 	    ;;
@@ -2972,7 +2981,7 @@
 	stringfreelist) ac_gc_check_string_free_list=1 ;;
 	xmallocoverrun)	ac_xmalloc_overrun=1 ;;
 	conslist)	ac_gc_check_cons_list=1 ;;
-	*)	as_fn_error "unknown check category $check" "$LINENO" 5 ;;
+	*)	as_fn_error $? "unknown check category $check" "$LINENO" 5  ;;
 	esac
 done
 IFS="$ac_save_IFS"
@@ -3090,16 +3099,22 @@
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3113,7 +3128,7 @@
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
@@ -3124,16 +3139,16 @@
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -3158,7 +3173,7 @@
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -3166,7 +3181,7 @@
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -3460,7 +3475,7 @@
 
 
 if test $unported = yes; then
-  as_fn_error "Emacs hasn't been ported to \`${canonical}' systems.
+  as_fn_error $? "Emacs hasn't been ported to \`${canonical}' systems.
 Check \`etc/MACHINES' for recognized configuration names." "$LINENO" 5
 fi
 
@@ -3774,8 +3789,8 @@
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5 ; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3889,9 +3904,8 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -3933,8 +3947,8 @@
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3991,9 +4005,9 @@
     else
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
+as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
     fi
   fi
 fi
@@ -4044,8 +4058,8 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -4377,7 +4391,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -4393,11 +4407,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -4436,7 +4450,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -4452,18 +4466,18 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 
 ac_ext=c
@@ -4524,7 +4538,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
@@ -4590,7 +4604,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -4722,8 +4736,7 @@
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -4967,7 +4980,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -4983,11 +4996,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -5026,7 +5039,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -5042,18 +5055,18 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 
 ac_ext=c
@@ -5490,7 +5503,7 @@
   if test "x${with_makeinfo}" = "xno"; then
     MAKEINFO=off
   elif test ! -e $srcdir/info/emacs; then
-    as_fn_error "You do not seem to have makeinfo >= 4.6, and your
+    as_fn_error $? "You do not seem to have makeinfo >= 4.6, and your
 source tree does not seem to have pre-built manuals in the \`info' directory.
 Either install a suitable version of makeinfo, or re-run configure
 with the \`--without-makeinfo' option to build without the manuals. " "$LINENO" 5
@@ -5644,7 +5657,7 @@
     if test "x$GCC" = "xyes"; then
       C_SWITCH_MACHINE="-fno-common"
     else
-      as_fn_error "What gives?  Fix me if DEC Unix supports ELF now." "$LINENO" 5
+      as_fn_error $? "What gives?  Fix me if DEC Unix supports ELF now." "$LINENO" 5
     fi
   else
     UNEXEC_OBJ=unexalpha.o
@@ -5922,7 +5935,7 @@
   ## Some platforms don't use any of these files, so it is not
   ## appropriate to put this test outside the if block.
   test -e $CRT_DIR/crtn.o || test -e $CRT_DIR/crt0.o || \
-    as_fn_error "crt*.o not found in specified location." "$LINENO" 5
+    as_fn_error $? "crt*.o not found in specified location." "$LINENO" 5
 
 fi
 
@@ -5977,8 +5990,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -6169,7 +6181,7 @@
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
       if test "$emacs_alsa_subdir" != yes; then
-        as_fn_error "pkg-config found alsa, but it does not compile.  See config.log for error messages." "$LINENO" 5
+        as_fn_error $? "pkg-config found alsa, but it does not compile.  See config.log for error messages." "$LINENO" 5
       fi
       ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
     fi
@@ -6204,8 +6216,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -7260,8 +7271,8 @@
 
      ;; #(
    *)
-     as_fn_error "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+     as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5  ;;
  esac
 
 
@@ -7269,7 +7280,7 @@
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -7277,7 +7288,7 @@
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -7413,7 +7424,7 @@
   have_x=disabled
 else
   case $x_includes,$x_libraries in #(
-    *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
+    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
     *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7431,7 +7442,7 @@
 	@echo libdir='${LIBDIR}'
 _ACEOF
   if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
-    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+    # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
     for ac_var in incroot usrlibdir libdir; do
       eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
     done
@@ -7517,7 +7528,7 @@
   fi
 done
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 fi # $ac_x_includes = no
 
 if test "$ac_x_libraries" = no; then
@@ -7700,7 +7711,7 @@
 if test "x$ac_cv_header_AppKit_AppKit_h" = x""yes; then :
   HAVE_NS=yes
 else
-  as_fn_error "\`--with-ns' was specified, but the include
+  as_fn_error $? "\`--with-ns' was specified, but the include
   files are missing or cannot be compiled." "$LINENO" 5
 fi
 
@@ -7816,7 +7827,7 @@
    if test "$HAVE_XSERVER" = true ||
       test -n "$DISPLAY" ||
       test "`echo /usr/lib/libX11.*`" != "/usr/lib/libX11.*"; then
-        as_fn_error "You seem to be running X, but no X development libraries
+        as_fn_error $? "You seem to be running X, but no X development libraries
 were found.  You should install the relevant development files for X
 and for the toolkit you want, such as Gtk+, Lesstif or Motif.  Also make
 sure you have development files for image handling, i.e.
@@ -7939,8 +7950,7 @@
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -8447,8 +8457,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -8848,7 +8857,7 @@
   fi
 
   if test "$pkg_check_gtk" = "no" && test "$USE_X_TOOLKIT" != "maybe"; then
-     as_fn_error "$GTK_PKG_ERRORS" "$LINENO" 5
+     as_fn_error $? "$GTK_PKG_ERRORS" "$LINENO" 5
   fi
 fi
 
@@ -8954,7 +8963,7 @@
   fi
 
   if test "$pkg_check_gtk" = "no" && test "$USE_X_TOOLKIT" != "maybe"; then
-     as_fn_error "$GTK_PKG_ERRORS" "$LINENO" 5
+     as_fn_error $? "$GTK_PKG_ERRORS" "$LINENO" 5
   fi
 fi
 fi
@@ -8981,7 +8990,7 @@
 
   if test "${GTK_COMPILES}" != "yes"; then
     if test "$USE_X_TOOLKIT" != "maybe"; then
-      as_fn_error "Gtk+ wanted, but it does not compile, see config.log.  Maybe some x11-devel files missing?" "$LINENO" 5;
+      as_fn_error $? "Gtk+ wanted, but it does not compile, see config.log.  Maybe some x11-devel files missing?" "$LINENO" 5 ;
     fi
   else
     HAVE_GTK=yes
@@ -9111,8 +9120,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -9477,7 +9485,7 @@
       USE_X_TOOLKIT=LUCID
       LUCID_LIBW=-lXaw
     elif test x"${USE_X_TOOLKIT}" = xLUCID; then
-      as_fn_error "Lucid toolkit requires X11/Xaw include files" "$LINENO" 5
+      as_fn_error $? "Lucid toolkit requires X11/Xaw include files" "$LINENO" 5
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no; do not use toolkit by default" >&5
 $as_echo "no; do not use toolkit by default" >&6; }
@@ -10654,8 +10662,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -10907,7 +10914,7 @@
     MISSING="$MISSING libtiff" && WITH_NO="$WITH_NO --with-tiff=no"
 
   if test "X${MISSING}" != X; then
-    as_fn_error "The following required libraries were not found:
+    as_fn_error $? "The following required libraries were not found:
     $MISSING
 Maybe some development libraries/packages are missing?
 If you don't want to link with them give
@@ -11348,8 +11355,7 @@
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
 
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
@@ -11413,7 +11419,7 @@
 
 
 if test x"$ac_cv_func_alloca_works" != xyes; then
-   as_fn_error "a system implementation of alloca is required " "$LINENO" 5
+   as_fn_error $? "a system implementation of alloca is required " "$LINENO" 5
 fi
 
 # fmod, logb, and frexp are found in -lm on most systems.
@@ -11609,7 +11615,7 @@
 
 
   if test $ac_cv_prog_liblockfile = yes; then
-    as_fn_error "Shared liblockfile found but can't link against it.
+    as_fn_error $? "Shared liblockfile found but can't link against it.
 This probably means that movemail could lose mail.
 There may be a \`development' package to install containing liblockfile." "$LINENO" 5
   fi
@@ -11698,8 +11704,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -11730,8 +11735,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -11783,8 +11787,8 @@
 static time_t time_t_min;
 
 /* Values we'll use to set the TZ environment variable.  */
-static char *tz_strings[] = {
-  (char *) 0, "TZ=GMT0", "TZ=JST-9",
+static const char *tz_strings[] = {
+  (const char *) 0, "TZ=GMT0", "TZ=JST-9",
   "TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00"
 };
 #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
@@ -11801,7 +11805,7 @@
      instead of "TZ=America/Vancouver" in order to detect the bug even
      on systems that don't support the Olson extension, or don't have the
      full zoneinfo tables installed.  */
-  putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
+  putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0");
 
   tm.tm_year = 98;
   tm.tm_mon = 3;
@@ -11814,16 +11818,14 @@
 }
 
 static int
-mktime_test1 (now)
-     time_t now;
+mktime_test1 (time_t now)
 {
   struct tm *lt;
   return ! (lt = localtime (&now)) || mktime (lt) == now;
 }
 
 static int
-mktime_test (now)
-     time_t now;
+mktime_test (time_t now)
 {
   return (mktime_test1 (now)
 	  && mktime_test1 ((time_t) (time_t_max - now))
@@ -11847,8 +11849,7 @@
 }
 
 static int
-bigtime_test (j)
-     int j;
+bigtime_test (int j)
 {
   struct tm tm;
   time_t now;
@@ -11892,7 +11893,7 @@
      instead of "TZ=America/Vancouver" in order to detect the bug even
      on systems that don't support the Olson extension, or don't have the
      full zoneinfo tables installed.  */
-  putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
+  putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0");
 
   t = mktime (&tm);
 
@@ -11927,7 +11928,7 @@
   for (i = 0; i < N_STRINGS; i++)
     {
       if (tz_strings[i])
-	putenv (tz_strings[i]);
+	putenv ((char*) tz_strings[i]);
 
       for (t = 0; t <= time_t_max - delta; t += delta)
 	if (! mktime_test (t))
@@ -11979,7 +11980,7 @@
 
 # Make sure getloadavg.c is where it belongs, at configure-time.
 test -f "$srcdir/$ac_config_libobj_dir/getloadavg.c" ||
-  as_fn_error "$srcdir/$ac_config_libobj_dir/getloadavg.c is missing" "$LINENO" 5
+  as_fn_error $? "$srcdir/$ac_config_libobj_dir/getloadavg.c is missing" "$LINENO" 5
 
 ac_save_LIBS=$LIBS
 
@@ -12848,7 +12849,7 @@
 fi
 
 if test "$have_tputs_et_al" != true; then
-  as_fn_error "I couldn't find termcap functions (tputs and friends).
+  as_fn_error $? "I couldn't find termcap functions (tputs and friends).
 Maybe some development libraries/packages are missing?  Try installing
 libncurses-dev(el), libterminfo-dev(el) or similar." "$LINENO" 5
 fi
@@ -13995,8 +13996,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -14370,14 +14370,14 @@
    && test x"`$CC --version 2> /dev/null | grep 'gcc.* 4.5.0'`" != x \
    && test x"`echo $CFLAGS | grep '\-O[23]'`" != x \
    && test x"`echo $CFLAGS | grep '\-fno-optimize-sibling-calls'`" = x; then
-   as_fn_error "GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS'." "$LINENO" 5
+   as_fn_error $? "GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS'." "$LINENO" 5
 fi
 
 #### Find out which version of Emacs this is.
 version=`grep 'const char emacs_version' ${srcdir}/src/emacs.c \
 	 | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
 if test x"${version}" = x; then
-  as_fn_error "can't find current emacs version in \`${srcdir}/src/emacs.c'." "$LINENO" 5
+  as_fn_error $? "can't find current emacs version in \`${srcdir}/src/emacs.c'." "$LINENO" 5
 fi
 if test x"${version}" != x"$PACKAGE_VERSION"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: version mismatch between \`${srcdir}/configure.in' and \`${srcdir}/src/emacs.c'." >&5
@@ -14936,6 +14936,7 @@
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -15098,19 +15099,19 @@
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -15306,7 +15307,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -15360,7 +15361,7 @@
 # values after options handling.
 ac_log="
 This file was extended by emacs $as_me 24.0.50, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -15426,10 +15427,10 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 emacs config.status 24.0.50
-configured by $0, generated by GNU Autoconf 2.65,
+configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -15445,11 +15446,16 @@
 while test $# != 0
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -15471,6 +15477,7 @@
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -15483,7 +15490,7 @@
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error "ambiguous option: \`$1'
+    as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -15492,7 +15499,7 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
+  -*) as_fn_error $? "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -15560,7 +15567,7 @@
     "leim/Makefile") CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
 
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
   esac
 done
 
@@ -15598,7 +15605,7 @@
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -15632,7 +15639,7 @@
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
+  ac_cs_awk_cr='\\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
@@ -15649,7 +15656,7 @@
   echo "_ACEOF"
 } >conf$$files.sh &&
 . ./conf$$files.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 rm -f conf$$files.sh
 
 {
@@ -15657,18 +15664,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -15763,20 +15770,28 @@
 else
   cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -15804,7 +15819,7 @@
   if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -15889,7 +15904,7 @@
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -15902,7 +15917,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -15930,7 +15945,7 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -15957,7 +15972,7 @@
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
     esac
     ;;
   esac
@@ -16093,22 +16108,22 @@
 else
   $AWK -f "$tmp/subs.awk" | $SHELL
 fi >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
+which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
   -) cat "$tmp/out" && rm -f "$tmp/out";;
   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -16119,19 +16134,19 @@
       $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
     } >"$tmp/config.h" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error "could not create -" "$LINENO" 5
+      || as_fn_error $? "could not create -" "$LINENO" 5
   fi
  ;;
 
@@ -16168,7 +16183,7 @@
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -16189,7 +16204,7 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
+  $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5

=== modified file 'doc/misc/ediff.texi'
--- doc/misc/ediff.texi	2010-01-13 08:35:10 +0000
+++ doc/misc/ediff.texi	2010-09-13 10:14:52 +0000
@@ -1986,8 +1986,7 @@
 this:
 
 @comment Use @set to avoid triggering merge conflict detectors like CVS.
-@set seven-left <<<<<<<
-@set seven-right >>>>>>>
+@set seven-left 
 @example
 @value{seven-left} variant A
 the difference region from buffer A

=== modified file 'lisp/files.el'
--- lisp/files.el	2010-09-06 16:38:03 +0000
+++ lisp/files.el	2010-09-13 10:14:52 +0000
@@ -1,3 +1,18 @@
+;;  (defun auto-save-mode (arg)
+;;   "Toggle auto-saving of contents of current buffer.
+;; With prefix argument ARG, turn auto-saving on if positive, else off."
+;;     (interactive)
+;;     (if (> arg 0) auto-save (null auto-save)))
+
+
+;; (defun auto-fill-mode (arg)
+;;   "Toggle Auto Fill mode.
+;; With ARG, turn Auto Fill mode on if and only if ARG is positive.
+;; In Auto Fill mode, inserting a space at a column beyond `current-fill-column'
+;; automatically breaks the line at a previous space."
+;;    (interactive)
+;;    (if (> arg 0) auto-fill (null auto-fill)))
+
 ;;; files.el --- file input and output commands for Emacs
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994, 1995, 1996,

=== modified file 'lisp/ldefs-boot.el'
--- lisp/ldefs-boot.el	2010-05-08 18:47:07 +0000
+++ lisp/ldefs-boot.el	2010-09-13 10:14:52 +0000
@@ -10464,7 +10464,6 @@
 
 ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off
 ;;;;;;  turn-off-flyspell turn-on-flyspell flyspell-mode flyspell-prog-mode)
-;;;;;;  "flyspell" "textmodes/flyspell.el" (19370 36541))
 ;;; Generated autoloads from textmodes/flyspell.el
 
 (autoload 'flyspell-prog-mode "flyspell" "\

=== modified file 'lisp/net/tramp-cache.el'
--- lisp/net/tramp-cache.el	2010-09-09 13:24:39 +0000
+++ lisp/net/tramp-cache.el	2010-09-13 10:14:52 +0000
@@ -1,3 +1,5 @@
+(setq tramp-version 24)
+
 ;;; tramp-cache.el --- file information caching for Tramp
 
 ;; Copyright (C) 2000, 2005, 2006, 2007, 2008, 2009,
@@ -51,6 +53,8 @@
 ;;; Code:
 
 (require 'tramp)
+; bob, 2010 Sep 11
+; (require 'trampver.el)
 (autoload 'time-stamp-string "time-stamp")
 
 ;;; -- Cache --

=== modified file 'lisp/net/tramp-compat.el'
--- lisp/net/tramp-compat.el	2010-09-08 14:42:54 +0000
+++ lisp/net/tramp-compat.el	2010-09-13 10:14:52 +0000
@@ -29,7 +29,9 @@
 
 ;;; Code:
 
-(require 'tramp-loaddefs)
+(eval-when-compile
+
+  (require 'tramp-loaddefs))
 
 (eval-when-compile
 

=== modified file 'lisp/net/tramp.el'
--- lisp/net/tramp.el	2010-09-08 14:42:54 +0000
+++ lisp/net/tramp.el	2010-09-13 10:14:52 +0000
@@ -1,3 +1,4 @@
+(setq tramp-version 24)
 ;;; tramp.el --- Transparent Remote Access, Multiple Protocol
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,

=== modified file 'lisp/textmodes/page.el'
--- lisp/textmodes/page.el	2010-08-29 16:17:13 +0000
+++ lisp/textmodes/page.el	2010-09-13 10:14:52 +0000
@@ -1,3 +1,10 @@
+;; (push-mark (point) t)  needed at the end of forward-page 
+;; The documentation in simple.el for set-mark says
+;;   To remember a location for internal use in the Lisp program,
+;;   store it in a Lisp variable.  Example:
+;;      (let ((beg (point))) (forward-line 1) (delete-region beg (point)))."
+
+
 ;;; page.el --- page motion commands for Emacs
 
 ;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,

=== added directory 'share'
=== added directory 'share/emacs'
=== added directory 'share/emacs/site-lisp'
=== added directory 'share/emacs/site-lisp/w3m'
=== added file 'share/emacs/site-lisp/w3m/ChangeLog'
--- share/emacs/site-lisp/w3m/ChangeLog	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/ChangeLog	2010-09-13 10:14:52 +0000
@@ -0,0 +1,10524 @@
+2010-09-09  Leo  <sdl.web@gmail.com>
+
+	* w3m.el (w3m-input-url): Pass DEFAULT argument to completing-read,
+	instead of replacing its return value, to enable a user to edit.
+
+2010-09-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-active-region-or-url-at-point): Remove only newlines and
+	leading and trailing whitespace in region string.
+	(w3m-input-url): Treat INITIAL if it is "" as nil but don't mind region
+	even if it is active; treat DEFAULT if it is "" as nil but don't regard
+	to w3m-home-page; always show DEFAULT if any within prompt string.
+	Suggested by Leo <sdl.web@gmail.com>.
+
+2010-09-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-lnum.el (w3m-read-int-interactive): Make it work for XEmacs
+	(note: `?<' is not `eq' to `60' in XEmacs, for example).
+
+2010-09-06  Andrey Kotlarski  <m00naticus@gmail.com>
+
+	* w3m-lnum.el (w3m-linknum-remove-overlays): Simplified.
+	(w3m-link-numbering-mode): Using `or' instead of `unless'.
+	(w3m-read-int-interactive): Added ability to scroll page while
+	selecting number.
+
+2010-09-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-input-url): Move cursor to place where a user likely
+	begins to edit.
+
+2010-09-02  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+	* doc/ptexinfmt.el (texinfo-multitable-widths): Use `make-char'
+	instead of KANJI literal.
+
+2010-08-24  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+	* doc/ptexinfmt.el (texinfo-format-verb): Use (delete-char -1)
+	instead of (delete-backward-char 1); For Emacs24.
+
+2010-08-20  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-entity-table): Reverte last change.
+	(w3m-extra-numeric-character-reference): New variable.
+	(w3m-entity-value): Use it.
+
+2010-08-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* octet.el (octet-find-file)
+	* w3m-form.el (w3m-fontify-textareas, w3m-form-replace)
+	* w3m-proc.el (w3m-process-filter)
+	* w3m-session.el (w3m-session-select-list-all-sessions)
+	(w3m-session-select-list-session-group, w3m-session-select-next)
+	* w3m.el (w3m-idle-images-show, w3m-toggle-inline-images-internal)
+	(w3m-resize-inline-image-internal, w3m-fontify, w3m-refontify-anchor)
+	(w3m-cache-remove-oldest, w3m-cache-remove, w3m-cache-contents)
+	(w3m-cache-request-contents, w3m-create-text-page)
+	(w3m-create-image-page, w3m-select-buffer-generate-contents)
+	(w3m-select-buffer-recheck): Replace let-bindings of buffer-read-only
+	to nil with inhibit-read-only to t.
+
+2010-08-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-search.el (w3m-search-engine-alist): Fix `google news' url forms
+	used to non-Japanese utf-8 environments.
+
+	* w3m.el (w3m-entity-table): Add table for "&#149;".
+	(w3m-entity-value): Prefer "&#NUM;" type entities specified in
+	w3m-entity-table.
+
+2010-08-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-safe-view-this-url): Never query "Are you sure..." if
+	prefix arg is given.
+
+2010-08-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-create-text-page): Make point and window start be the
+	start of contents, especially for text/plain pages.
+
+2010-08-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-relationship-estimate-rules): Update regexps for Google.
+
+2010-07-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el: Autoload w3m-bookmark-add.
+
+	* w3m-lnum.el (w3m-read-int-interactive): Ignore mouse event in XEmacs.
+
+2010-07-29  Andrey Kotlarski  <m00naticus@gmail.com>
+
+	* w3m.el (autoload, w3m-linknum-map):
+	`w3m-linknum-bookmark-add-this-url', `w3m-linknum-zoom-in-image'
+	and `w3m-linknum-zoom-out-image' added.
+
+	* w3m-lnum.el (w3m-link-numbering-mode-map):
+	`w3m-linknum-bookmark-add-this-url', `w3m-linknum-zoom-in-image'
+	and `w3m-linknum-zoom-out-image' added.
+	(w3m-link-numbering-mode, w3m-with-linknum)
+	(w3m-linknum-get-action): Use `zerop'.
+	(w3m-link-numbering): Simplify argument list and checks assosiated
+	with it.
+	(w3m-read-int-interactive): Add <escape> for quit.
+	(w3m-linknum-follow): Add position to history when visiting url in
+	curent page.  Change message when no valid anchor is selected.
+	(w3m-linknum-view-image, w3m-linknum-save-image): Rewrite using
+	`cond'.
+	(w3m-linknum-zoom-image): New macro.
+	(w3m-linknum-zoom-in-image, w3m-linknum-zoom-out-image)
+	(w3m-linknum-bookmark-add-this-url): New functions.
+
+2010-07-25  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-auto-show): Guard error if this-command is not a symbol.
+	Thanks to IRIE Shinsuke san. cf. [emacs-w3m:11282]
+
+2010-07-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-goto-url): Save positions iff called interactively.
+	(w3m-goto-url-new-session): Save positions.
+
+	* w3m-bookmark.el (w3m-bookmark-view): Save positions.
+
+	* w3m-hist.el (w3m-history-copy): Copy positions.
+
+2010-07-13  Andrey Kotlarski  <m00naticus@gmail.com>
+
+	* w3m-lnum.el (w3m-link-numbering-mode): Using `buffer-list' instead of
+	`w3m-list-buffers' as the latter does unnecessary stuff.
+	(w3m-linknum-read-url): Removed. It's now equivalent to:
+	(car (w3m-linknum-get-action prompt 1))
+	(w3m-linknum-toggle-inline-image): If no url under selected image,
+	move over it and toggle it.
+	(w3m-linknum-external-view-this-url, w3m-linknum-edit-this-url):
+	Using `w3m-linknum-get-action' instead of `w3m-linknum-read-url'.
+
+	* w3m.el (autoload): Added `w3m-link-numbering-mode', removed
+	`w3m-linknum-read-url'.
+
+2010-07-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-lnum.el (w3m-linknum-minibuffer-prompt): Make face config valid
+	for XEmacs as well.
+	(w3m-linknum-match): New face.
+	(w3m-read-int-interactive): Make it work for XEmacs as well.
+	(w3m-highlight-numbered-anchor): Use w3m-linknum-match face.
+
+2010-07-12  Andrey Kotlarski  <m00naticus@gmail.com>
+
+	* w3m-lnum.el: Updated commentary and usage sections.
+	(w3m-substitute-key-definitions): New macro.
+	(w3m-link-numbering-mode-map): Changed keybindings.
+	(w3m-link-numbering-mode): Added mode-line indicator. Don't
+	activate numbering overlays. Changing status mode causes all other
+	w3m buffers to change status as well.
+	(w3m-move-numbered-anchor): Removed.
+	(w3m-with-linknum): Numbering overlays should never be active
+	before invoking linknum functions thus less bookkeeping.
+	(w3m-go-to-linknum, w3m-linknum-follow): Add mark for previous
+	position.
+
+2010-07-09  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-lnum.el (w3m-read-int-interactive): Add keys to exit event loop,
+	C-m & C-j.
+
+2010-07-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-ctl-c-map, w3m-redisplay-map)
+	(w3m-linknum-map): New sub-keymaps.
+	(w3m-lynx-like-map, w3m-info-like-map): Move `C-c' prefixed commands
+	and `C' prefixed commands to w3m-ctl-c-map and w3m-redisplay-map
+	respectively.
+
+2010-07-09  Andrey Kotlarski  <m00naticus@gmail.com>
+
+	* w3m.el: Autoload w3m-linknum-follow, w3m-linknum-read-url,
+	w3m-linknum-toggle-inline-image, w3m-linknum-view-image,
+	w3m-linknum-external-view-this-url, w3m-linknum-edit-this-url,
+	w3m-linknum-print-this-url, w3m-linknum-download-this-url.
+
+	* w3m-lnum.el: Update usage comment.
+	(w3m-link-numbering-mode): Cosmetic change.
+	(w3m-get-anchor-info): Added w3m-image-alt char property to return
+	list.
+	(w3m-go-to-linknum, w3m-linknum-get-action): On 0 input select
+	location url.
+	(w3m-linknum-follow): Changed prompt and using w3m-message.
+	(w3m-linknum-toggle-inline-image): Renamed from
+	w3m-linknum-toggle-image and using w3m-message.  When image on
+	point, toggle it.
+	(w3m-linknum-view-image, w3m-linknum-save-image)
+	(w3m-linknum-external-view-this-url)
+	(w3m-linknum-edit-this-url, w3m-linknum-print-this-url)
+	(w3m-linknum-download-this-url): New commands.
+
+2010-07-08  Andrey Kotlarski  <m00naticus@gmail.com>
+
+	* w3m-lnum.el: Update usage comment.
+	(w3m-linknum-minibuffer-prompt): New face.
+	(w3m-linknum-remove-overlays): Quit immediately when it finds and
+	deletes temporary match overlay.
+	(w3m-link-numbering-mode): Pass prefix arg, which makes this function
+	index only images if it is 2, to w3m-link-numbering. Remove
+	interactive declaration and autoload cookie.
+	(w3m-link-numbering, w3m-with-linknum): Vary function according to arg;
+	index only images if it is 2.
+	(w3m-read-int-interactive): Change prompt face to
+	w3m-linknum-minibuffer-prompt.
+	(w3m-highlight-numbered-anchor): Use next-single-property-change.
+	(w3m-get-anchor-info): New function. Renamed from
+	w3m-get-numbered-url. Using macrolet for less clutter.
+	(w3m-go-to-linknum): Rewrote it more in style with the other
+	user commands.
+	(w3m-linknum-get-action): Added optional type argument to
+	determine numbering scheme.
+	(w3m-linknum-follow): Rewrite to use the new
+	w3m-linknum-get-action return format.
+	(w3m-linknum-read-url): Rewrite using w3m-linknum-get-action.
+	(w3m-linknum-toggle-image): New function.
+
+2010-07-06  Andrey Kotlarski  <m00naticus@gmail.com>
+
+	* w3m-lnum.el: Update usage comment.
+	(w3m-linknum-remove-overlays): New function.
+	(w3m-link-numbering-mode): Turn mode off if prefix arg is 0;
+	index forms as well as url links if prefix arg is 4.
+	(w3m-link-numbering): Index forms as well if prefix arg is given.
+	(w3m-move-numbered-anchor): Fix grammar in error message.
+	(w3m-read-int-interactive): New function.
+	(w3m-with-linknum): New macro.
+	(w3m-highlight-numbered-anchor, w3m-get-numbered-url): New functions.
+	(w3m-go-to-linknum): Add autoload cookie; turn on form numbers as well;
+	don't highlight current link if prefix arg is given.
+	(w3m-linknum-get-action, w3m-linknum-follow, w3m-linknum-read-url): New
+	functions.
+
+2010-06-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-toggle-inline-image)
+	(w3m-toggle-inline-images): Fix query logic about safe url.
+
+2010-06-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-menubar): Add w3m-pipe-source.
+	(w3m-lynx-like-map, w3m-info-like-map): Bind "|" to w3m-pipe-source.
+	(w3m-pipe-source): New command.
+
+2010-06-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-update-files-autoloads): Strip subdirectory name
+	that Emacs 24 doesn't strip from load-name.
+
+2010-06-03  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* octet.el (octet-w3m-region): Set to unibyte string for base64
+	encoding.
+
+2010-05-24  Fedor Khod'kov  <fedor76@istra.ru>
+
+	* w3m-cookie.el (w3m-cookie-trusted-host-p): Don't bother to add
+	excessive "$" to a regexp that w3m-cookie-reject-domains specifies.
+
+2010-05-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-relationship-estimate-rules): Update regexps for Google.
+
+2010-04-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-view-previous-page): Save positions.
+
+2010-03-29  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-fontify-images): Use the identical Lisp object for a
+	string used as w3m-image's property in order to enable XEmacs to
+	display images in shimbun articles properly.
+
+2010-03-29  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-active-region-or-url-at-point): Check availability of
+	w3m-current-url.
+
+2010-03-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-ems.el (w3m-ems-create-image): New function that's an alias to
+	create-animated-image or create-image.
+	(w3m-create-image): Use it.
+
+	* w3m.el (w3m-emacs-w3m-icon): Replace it with data not optimized.
+
+2010-03-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* aclocal.m4 (AC_PATH_EMACS): Support Emacs 24.
+	(AC_ADD_LOAD_PATH): Pipe stderr to /dev/null when running
+	w3mhack-print-status.
+
+2010-03-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-ignored-image-url-regexp): Fix custom type.
+
+2010-03-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-view-this-url-1): Don't recenter if page is not changed.
+	(w3m-goto-url): Don't move point to the top unless redisplaying page.
+
+2010-03-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el: Suppress compiler warnings that Emacs<22.2 and XEmacs issue
+	against image-mode functions.
+
+2010-03-02  Naohiro Aota  <naota@elisp.net>
+
+	* w3m.el (top): Require image-mode if available.
+	(w3m-image-page-displayed-p): New function.
+	(w3m-create-image-page): Setup image-mode's variable if possible.
+	(w3m-scroll-up-or-next-url, w3m-scroll-down-or-previous-url)
+	(w3m-shift-left, w3m-shift-right, w3m-beginning-of-line)
+	(w3m-end-of-line): Call image-mode functions if possible and needed.
+
+2010-02-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-goto-url): Turn truncate-lines off for text/plain pages.
+
+2010-02-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-fontify-images): Add menu to images.
+	(w3m-download-this-image, w3m-print-this-image-url): New functions.
+	(w3m-link-menu): Add them; enable menu only when url or image is there.
+
+2010-02-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-window-hscroll): Revert 2010-01-13 change.
+
+2010-02-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-cache-available-p): Now, pages with neither Last-Modified
+	header and ETag header are treated as dynamically-generated pages.
+	(w3m-cache-header-delete-variable-part): Contination lines are also
+	removed.
+
+2010-02-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-local-dirlist-cgi, w3m-set-display-ins-del):
+	Honor w3m-command-environment.
+	Suggested by Toru TSUNEYOSHI <t_tuneyosi@hotmail.com>.
+
+2010-02-01  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-redisplay-this-page): Save positions.
+
+2010-02-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-reload-this-page): Save positions.
+
+	* w3m-hist.el (w3m-history-store-position)
+	(w3m-history-restore-position): Use line number and column number to
+	save positions.
+
+2010-01-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-view-previous-page): Restore positions as well when
+	jumping within a page.
+	(w3m-view-this-url-1): Reset hscroll after retrieving a new page.
+	(w3m-view-this-url): Save positions first.
+	(w3m-delete-buffer): Restore positions in a page being left.
+	(w3m-goto-url): Don't save positions here.
+
+	* w3m-util.el (w3m-popup-buffer): Restore positions only when buffer to
+	be displayed is hidden, not always.
+
+2010-01-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-next-anchor, w3m-previous-anchor, w3m-next-form)
+	(w3m-previous-form, w3m-next-image, w3m-previous-image): Remove unused
+	var `st'.
+
+2010-01-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-goto-url): Make it work as before for group: urls.
+
+2010-01-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-doc-view-map): New variable.
+	(w3m-view-this-url-1): Improve the way to keep the window configuration
+	for the case where w3m-new-session-in-background is non-nil.
+	(w3m-doc-view): Use w3m-doc-view-map.
+	(w3m-doc-view-quit): New function.
+
+2010-01-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bug.el (report-emacs-w3m-bug)
+	* w3m-session.el (w3m-session-save, w3m-session-automatic-save)
+	(w3m-session-deleted-save, w3m-session-crash-recovery-save)
+	* w3m.el (w3m-key-binding): Use save-current-buffer instead of
+	save-excursion.
+
+	* mew-w3m.el (mew-w3m-view-inline-image, mew-mime-text/html-w3m)
+	* w3m-xmas.el (w3m-window-hscroll)
+	* w3mhack.el (toplevel, w3mhack-generate-load-file): Use
+	with-current-buffer rather than save-excursion + set-buffer.
+
+	* w3m-cookie.el (w3m-cookie-parse-args): Use with-current-buffer rather
+	than save-excursion + set-buffer; no need to use save-restriction and
+	narrow-to-region; remove duplicate set-syntax-table.
+
+2010-01-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-print-this-url): Exclude empty image-alt string.
+
+	* w3m-form.el (w3m-form-parse-and-fontify): Strip text props from
+	string elements contained in w3m-current-forms so as to enable XEmacs
+	to read ~/.w3m/.sessions file.
+
+2010-01-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-refontify-anchor, w3m-cache-setup)
+	(w3m-cache-remove-oldest, w3m-cache-remove, w3m-cache-contents)
+	(w3m-cache-request-contents, w3m-view-this-url-1)
+	(w3m-download-this-url, w3m-goto-url)
+	* w3m-session.el (w3m-session-save)
+	* w3m-bookmark.el (w3m-bookmark-sections, w3m-bookmark-write-file)
+	(w3m-bookmark-kill-entries, w3m-bookmark-undo, w3m-bookmark-iterator)
+	* w3m-util.el (w3m-unseen-buffer-p): Use with-current-buffer rather
+	than save-excursion + set-buffer.
+
+	* w3m.el (toplevel, w3m-highlight-current-anchor-1): Use point-at-eol
+	rather than `(save-excursion (end-of-line) (point))'.
+
+	* w3m-util.el: Autoload w3m-history-restore-position when compiling;
+	autoload w3m-fb-frame-parameter only when compiling.
+
+2010-01-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-next-buffer): Save and restore positions.
+	(w3m-close-window): Save positions.
+
+	* w3m-hist.el (w3m-history-store-position)
+	(w3m-history-restore-position): Save and restore hscroll.
+
+	* w3m-util.el (w3m-popup-buffer): Restore positions.
+
+2009-11-06  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-antenna.el (w3m-antenna-check-rss): Ignore future entries to
+	display site announcements.
+
+2009-11-03  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* mew-w3m.el (mew-w3m-region-cite-mark): Add new selection.
+	(mew-w3m-region): Rewrite.
+
+2009-11-02  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* mew-w3m.el (mew-w3m-region-cite-mark): New option.
+	(mew-w3m-region): New function.
+	(mew-mime-text/html-w3m): Use `mew-w3m-region' instead of `w3m-region'.
+
+2009-09-02  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-image.el (w3m-imagick-convert-program-available-p): If someone
+	set `w3m-imagick-convert-program' to nil before load emacs-w3m, do not
+	show warning message for ImageMagick's `convert'.
+
+2009-09-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-mail.el (w3m-mail-embed-base-url, w3m-mail-compose-with-mml)
+	(w3m-mail-compose-with-vm): Don't use
+	default-enable-multibyte-characters that is obsolete in Emacs 23.2.
+
+2009-09-01  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-content-type-alist): Support
+	`browse-url-default-windows|macosx-browser'. Thanks to Leo.
+	Cf. [emacs-w3m:11035].
+
+	* w3m-ems.el (w3m-form-button, w3m-form-button-mouse)
+	(w3m-form-button-pressed, w3m-tab-unselected)
+	(w3m-tab-unselected-retrieving, w3m-tab-unselected-unseen)
+	(w3m-tab-selected, w3m-tab-selected-retrieving, w3m-tab-background)
+	(w3m-tab-selected-background, w3m-tab-mouse): Add type ns. Thanks to
+	Leo. Cf. [emacs-w3m:11034].
+
+2009-08-25  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-toggle-inline-images-internal): Do not display image, if
+	its url is local and current url is not local.
+
+2009-08-24  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-output-coding-system): Use `utf-8' except for emacs-21
+	under Japaese environment.
+
+2009-08-19  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-use-symbol): Set nil with emacs-23 or later.
+	cf. [emacs-w3m:11002].
+
+2009-08-18  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-util.el (w3m-puny-decode-url): Decode the part of hostname only.
+	Add doc-strings.
+	(w3m-puny-encode-url): Add doc-strings.
+
+2009-08-17  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-puny-utf-16be): New variable.
+	(w3m-url-readable-string): Call `w3m-puny-decode-url'.
+	(w3m-url-transfer-encode-string): Call `w3m-puny-encode-url'.
+	(w3m-header-line-insert): Call `w3m-puny-decode-url'.
+	(w3m-input-url): Call `w3m-puny-decode-url' for initial URL.
+
+	* w3m-util.el (top): Add the variable definition of `w3m-puny-utf-16be'
+	to avoid byte-compile warnings.
+	(w3m-puny-code-regex, w3m-puny-code-nonascii, w3m-puny-base)
+	(w3m-puny-tmin, w3m-puny-tmax, w3m-puny-damp, w3m-puny-skew)
+	(w3m-puny-initial-bias, w3m-puny-initial-n, w3m-puny-delimiter): New
+	constants.
+	(w3m-puny-adapt, w3m-puny-decode-digit, w3m-puny-encode-digit)
+	(w3m-puny-decode1, w3m-puny-decode, w3m-puny-decode-url)
+	(w3m-puny-encode1, w3m-puny-encode, w3m-puny-encode-url): New
+	functions.
+
+2009-08-04  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-decode-anchor-string): Convert contol-characters to
+	space.
+
+2009-07-17  Naohiro Aota  <naota@elisp.net>
+
+	* w3m.el (w3m-about-retrieve): When type is `nil', decode cached
+	contents to display source of 404 page.  Reported by Dan Jacobson
+	<jidanni@jidanni.org>.
+	(w3m-do-cleanup-temp-files): New customize variable.
+	(w3m-cleanup-temp-files): Use it.
+	(toplevel): Call it when emacs-w3m shutdown.
+
+2009-07-04  Naohiro Aota  <naota@elisp.net>
+
+	* w3m-search.el (w3m-search-thing-at-point-arg): New variable.
+	(w3m-search-read-query): Use it.
+
+	* w3m-util.el (w3m-current-title): Set title to "<retrieving>>" when
+	w3m is retrieving a page.
+
+2009-06-13  Kevin Ryde  <user42@zip.com.au>
+
+	* w3m.el (w3m-view-recenter): Only nil,t,integer, not a cons.
+	(w3m-search-name-anchor, w3m-view-this-url-1): No arg to w3m-recenter.
+	(w3m-next-anchor, w3m-previous-anchor, w3m-next-form,
+	w3m-previous-form, w3m-next-image, w3m-previous-image): Don't
+	recenter, leave recentering just for following a link, not Tab etc
+	within the buffer.
+	(w3m-recenter): Remove NAME arg, believe don't need to differentiate
+	URLs with an anchor or not since with no anchor `point' is at the
+	start of the buffer and can't be recentered anyway.
+	Use C-u style "(recenter '(4))" for the `t' middle-of-screen case.
+	No need for code to avoid redisplay, `recenter' doesn't redisplay in
+	the integer or C-u cases.
+
+2009-06-13  Naohiro Aota  <naota@elisp.net>
+
+	* w3m.el (w3m-fontify-anchors): Decode entities of name anchor.
+
+2009-05-25  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-cache-available-p): Analyze the cache-control header more
+	strictly.
+	(w3m-scroll-up-or-next-url): Bind w3m-prefer-cache to `t' when goto
+	the w3m-next-url.
+	(w3m-scroll-down-or-previous-url): Bind w3m-prefer-cache to `t' when
+	goto the w3m-previous-url.
+
+2009-05-23  Naohiro Aota  <naota@elisp.net>
+
+	* w3m.el (w3m-reload-this-page): Add new argument `no-popup'; Call
+	w3m-goto-url() with the argument.
+	(w3m-goto-url-with-timer): Use it.
+
+2009-04-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bookmark.el (w3m-bookmark-make-item)
+	* w3m-cookie.el (w3m-cookie-create)
+	* w3m-dtree.el (w3m-dtree-expand-file-name, w3m-dtree-directory-name)
+	* w3m-form.el (w3m-form-normalize-action, w3m-form-p)
+	(w3m-form-set-method, w3m-form-put-property, w3m-form-field-parse)
+	(w3m-form-real-reset)
+	* w3m-hist.el (w3m-history-set-current)
+	* w3m-namazu.el (w3m-namazu-call-process)
+	* w3m-proc.el (w3m-process-p, w3m-process-kill-process)
+	(w3m-process-error-handler)
+	* w3m-session.el (w3m-session-history-to-save, w3m-session-make-item)
+	* w3m-tabmenu.el (w3m-tab-menubar-make-items-1)
+	* w3m-util.el (w3m-get-buffer-create, w3m-kill-buffer)
+	(w3m-current-title, w3m-buffer-title, w3m-buffer-number)
+	(w3m-buffer-set-number, w3m-buffer-name-add-title)
+	(w3m-generate-new-buffer, w3m-lefttab-exist-p, w3m-righttab-exist-p)
+	(w3m-url-valid, w3m-time-newer-p, w3m-time-lapse-seconds)
+	(w3m-url-local-p, w3m-url-authinfo, w3m-url-strip-authinfo)
+	(w3m-url-strip-fragment, w3m-url-strip-query, w3m-which-command)
+	(w3m-assoc-ignore-case, w3m-unseen-buffer-p)
+	* w3m-xmas.el (w3m-make-glyph)
+	* w3m.el (w3m-clear-local-variables, w3m-copy-local-variables)
+	(w3m-arrived-p, w3m-arrived-put, w3m-arrived-get)
+	(w3m-url-transfer-encode-string, w3m-entity-value)
+	(w3m-decode-anchor-string, w3m-toggle-inline-images-internal)
+	(w3m-canonicalize-url, w3m-cache-header-delete-variable-part)
+	(w3m-w3m-canonicalize-url, w3m-view-this-url-1)
+	* mime-w3m.el (mime-w3m-setup): Don't use defsubst.
+
+	* w3m-hist.el (w3m-history-plist-put, w3m-history-remove-properties):
+	Don't inline w3m-history-add-properties.
+
+2009-04-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-cache-available-p): Work around too large integer in
+	Cache-Control header.
+
+2009-04-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-url-to-file-name): Fix regexp used for stripping
+	localhost part; make url a Tramp name if it is guessed.
+
+2009-04-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-url-to-file-name): Allow "file:/foo.html" in addition to
+	"file://foo.html" and "file:///foo.html".
+
+2009-04-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bookmark.el (w3m-bookmark-buffer): Use the time 0 as modtime of
+	the bookmark buffer by default.
+
+2009-04-22  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-view-this-url-1): Pass url to sentinel.
+	(w3m-recenter): Save excursion.
+
+2009-04-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-view-recenter): New user option.
+	(w3m-recenter): New function.
+	(w3m-search-name-anchor, w3m-view-this-url-1, w3m-next-anchor)
+	(w3m-previous-anchor, w3m-next-form, w3m-previous-form, w3m-next-image)
+	(w3m-previous-image): Use it.
+
+2009-04-20  Kevin Ryde  <user42@zip.com.au>
+
+	* w3m.el (w3m-local-find-file-regexps): Make regexp-opt group regexps
+	explicitly.
+
+2009-04-14  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-cache-available-p): The control of expire is added.
+	(w3m-w3m-retrieve-1): The case where the option "no_cache=1" is put has
+	been increased.
+
+2009-04-12  Naohiro Aota  <naota@elisp.net>
+
+	* w3m.el (w3m-select-buffer-delete-buffer, w3m-goto-url)
+	(w3m-delete-buffers): Unqueue image retrieving process manually.
+	(w3m-idle-images-show): Widen narrowing.
+
+	* w3m-proc.el (w3m-process-stop): Don't unqueue image retrieving
+	process.
+
+	* w3m.el (w3m-message-silent): New variable.
+	(w3m-message): Use it: when the variable is `t', don't show a message.
+	(w3m-idle-images-show): Use it.
+	(w3m-w3m-dump-head): lexical-let it.
+	(w3m-w3m-dump-extra): Ditto.
+	(w3m-w3m-retrieve): Ditto.
+	(w3m-retrieve-and-render): Ditto.
+	(w3m-refresh-minimum-interval): New variable.
+	(w3m-check-refresh-attribute): Use it.
+	(w3m-view-previous-page): When visiting pages by history-back or
+	history-next, don't just ignore refresh, but wait for a while.
+	(w3m-idle-images-show): When there are events pended, re-create the
+	idle timer; Check current position's item every time loop starts.
+	(w3m-idle-images-show-unqueue): Set w3m-idle-images-show-timer
+	properly.
+	(w3m-arrived-add): Revert recent changes.
+
+	* w3m-favicon.el (w3m-favicon-retrieve): lexical-let w3m-message-silent.
+
+2009-04-02  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-arrived-add): If url has a multi-byte character, do not
+	do recursive-call itself. If decoded url does not have a multi-byte
+	character, do not do recursive-call itself.
+
+2009-03-28  Naohiro Aota  <naota@elisp.net>
+
+	* w3m.el (w3m-goto-url-with-timer): When going to the same url, use
+	`w3m-reload-this-page'.
+	(w3m-image-no-idle-timer): New variable.
+	(w3m-toggle-inline-images-internal): Use it.
+	(w3m-arrived-add): Add also decoded url.
+	(w3m-goto-url): Restore forms also when url is local.
+
+2009-03-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-link-menu): Always provide title string.  Suggested by
+	David Abrahams <dave@boostpro.com>.
+	Cf. <URL:http://news.gmane.org/group/gmane.emacs.w3m/thread=8126>.
+
+2009-03-17  Victor Ren  <victor.ren@ericsson.com>
+
+	* w3m.el (w3m-url-to-file-name): Support "file://c:/" in addition to
+	"file:///c:/".
+
+2009-03-12  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-w3m-parse-header): The value of w3m-document-charset is
+	not used excluding x-moe-internal.
+
+2009-03-04  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-decode-buffer): If context-charset is x-moe-internal,
+	x-moe-internal is used as charset regardless of w3m-type.
+	(w3m-w3m-parse-header): Add w3m-document-charset to handle of the
+	headers. If w3m-document-charset is x-moe-internal, charset sets to
+	x-moe-internal compulsorily. If x-w3m-content-encoding is exist, the
+	value of x-w3m-content-encoding is used as encoding method regardless
+	of w3m-type.
+
+2009-03-03  Naohiro Aota  <naota@elisp.net>
+
+	* w3m-hist.el (w3m-history-slimmed-history-flat, w3m-history-slim): New
+	functions.
+
+	* w3m-session.el (w3m-session-history-to-save): Use it.
+
+2009-02-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el: Require w3m-session instead of autoloading it.
+
+	* w3m-session.el: Don't require w3m; require w3m-util; silent warnings.
+	(w3m-session-select): Use w3m-get-buffer-create instead of
+	get-buffer-create to kill the session select buffer when quitting.
+
+	* w3m-util.el (w3m-delete-frames-and-windows): Delete frames if the
+	other windows visit buffers being related to emacs-w3m or the session
+	select buffer.
+	(w3m-replace-in-string): eval-and-compile.
+
+2009-02-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el: Autoload w3m-go-to-linknum.
+	(w3m-lynx-like-map, w3m-info-like-map): Bind `C-c C-l' to it.
+	(w3m-mode): Mention w3m-go-to-linknum in doc string.
+
+	* w3m-util.el (w3m-read-number): New function.
+
+	* w3m-lnum.el (w3m-go-to-linknum): Use w3m-read-number.
+
+2008-04-12  Jose A. Ortega Ruiz  <jao@gnu.org>
+
+	* w3m-lnum.el (w3m-go-to-linknum): New function.
+
+2009-02-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-session.el (w3m-session-ignore-errors): New macro.
+	(w3m-session-save, w3m-session-automatic-save)
+	(w3m-session-deleted-save, w3m-session-crash-recovery-save)
+	(w3m-session-crash-recovery-remove, w3m-session-select-mode)
+	(w3m-session-select, w3m-session-make-menu-items)
+	(w3m-session-last-autosave-session, w3m-session-last-crashed-session):
+	Use it.
+
+	(toplevel): Require cl when compiling.
+	(w3m-session-crash-recovery-save)
+	(w3m-session-select-list-all-sessions): Remove unused variables.
+
+2009-02-16  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-session.el (w3m-session-last-crashed-session): Fix tiny typo.
+
+2009-02-15  Naohiro Aota  <naota@elisp.net>
+
+	* w3m.el (w3m-idle-images-show): If detect deleted buffer, unqueue
+	processes related to the buffer.
+
+	* w3m-session.el (w3m-session-crash-recovery): Change the default to t.
+
+2009-02-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-buffer-setup): Add keymap that cycles buffers as usual to
+	mode-line-buffer-identification.
+
+2009-02-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bookmark.el (w3m-bookmark-view, w3m-bookmark-view-new-session)
+	(w3m-bookmark-make-menu-items): Check if bookmark file exists.
+
+2009-02-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-header-line-insert): Don't decode url containing
+	non-ASCII characters already.  e.g. about://weather/WHERE
+
+2009-02-03  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* mew-w3m.el (mew-w3m-cid-retrieve): Remove a wrong set-buffer().
+
+2009-02-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-input-url): Offer decoded url in the minibuffer.
+	(w3m-copy-buffer): Copy w3m-current-coding-system.
+	(w3m-header-line-insert): Display decoded url.
+
+2009-02-02  Naohiro Aota  <naota@elisp.net>
+
+	* w3m.el (w3m-idle-images-show): Change the order of image retrieving.
+	(w3m-toggle-inline-images-internal): Use `w3m-idle-image-item'
+	text-property.
+	(w3m-goto-url): Add new argument `no-popup'.
+	(w3m-goto-url-with-timer): Call w3m-goto-url with `no-popup' nil.
+
+2009-02-01  Naohiro Aota  <naota@elisp.net>
+
+	* w3m.el (w3m-toggle-inline-images-internal): Add new argument
+	`safe-regexp'.
+	(w3m-toggle-inline-images): Pass `safe-regexp' to
+	w3m-toggle-inline-images-internal when called non-interactively.
+
+2009-01-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-proc.el: Autoload w3m-idle-images-show-unqueue when compiling.
+
+2009-01-27  Naohiro Aota  <naota@elisp.net>
+
+	* w3m-proc.el (w3m-process-stop): Call `w3m-idle-images-show-unqueue'.
+
+	* w3m.el (w3m-idle-images-show-timer, w3m-idle-images-show-list)
+	(w3m-idle-images-show-interval): New variables.
+	(w3m-idle-images-show, w3m-idle-images-show-unqueue): New functions.
+	(w3m-toggle-inline-images-internal): Use them.
+
+2009-01-26  Naohiro Aota  <naota@elisp.net>
+
+	* w3m.el (w3m-content-type-alist): Add "application/x-pdf" content
+	type.
+
+2009-01-21  Kevin Ryde  <user42@zip.com.au>
+
+	* w3m.el (w3m-search-name-anchor): Return true meaning "found" if
+	point is already at the anchor position.
+
+2009-01-21  Naohiro Aota  <naota@elisp.net>
+
+	* w3m-session.el (w3m-session-last-autosave-session): Check if
+	autosaved sessions set exists before asking whether to load the last
+	sessions set; Search older sessions sets when the last sessions set
+	doesn't exist (maybe it is removed by user); Load autosaved sessions
+	set when w3m-session-load-last-sessions is non-nil.
+	(w3m-session-load-last-sessions): Fix docstring; Change `auto' to `t'.
+	(w3m-session-crash-recovery-title): New variable.
+	(w3m-session-load-crashed-sessions): Ditto.
+	(w3m-session-crash-recovery-save): New function.
+
+	* w3m.el (w3m-goto-url): Save sessions set for crash recovering.
+	(w3m-delete-buffer): Ditto.
+	(w3m): Load crashed sessions if necessary.  Suggested by Samuel Wales
+	<samologist@gmail.com>.
+
+2009-01-20  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-fontify-anchors): Use new `w3m-balloon-help'
+	text-property for balloon help.
+	(w3m-fontify-images): Ditto and create help together href, alt and URL
+	of image.
+
+2009-01-19  Naohiro Aota  <naota@elisp.net>
+
+	* w3m.el (w3m-image-anchor): Fix docstring.
+	(toplevel): Fix w3m-image-anchor-face's alias.
+
+2009-01-15  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-fontify-images): Put the 'full alt text' on new
+	'w3m-image-alt' property.
+	(w3m-print-this-url): Print the content of 'w3m-image-alt'.
+
+	* w3m-util.el (w3m-image-alt): New macro.
+
+2009-01-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* doc/Makefile.in (.texi.info): Use --no-split.
+
+2009-01-11  Naohiro Aota  <naota@elisp.net>
+
+	* w3m.el (w3m): Move last session restoring asking afterward, so that
+	the restoring wouldn't be avoided by w3m-input-url's input.
+
+	* w3m-session.el (w3m-session-last-autosave-session): Follow the above
+	change.
+
+2009-01-10  Naohiro Aota  <naota@elisp.net>
+
+	* w3m.el (w3m): Check whether to load the last autosaved
+	sessions.  Suggested by Samuel Wales <samologist@gmail.com>.
+
+	* w3m-session.el (w3m-session-automatic-keep-number): New variable.
+	Suggested by Samuel Wales <samologist@gmail.com>.
+	(w3m-session-automatic-save): Use it.
+	(w3m-session-last-autosave-session): New function.
+	(w3m-session-load-last-sessions): New variable.
+
+	* w3m.el (w3m-image-anchor): New face.
+	(w3m-fontify-images): Use it.
+
+2009-01-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-language): Allow the value like "Japanese (UTF-8)" of
+	current-language-environment.
+
+	* w3m-symbol.el (w3m-symbol): Ditto.
+
+	* w3mhack.el (w3mhack-makeinfo): Use locale-coding-system for Emacs to
+	encode Japanese messages.
+
+2009-01-09  Naohiro Aota  <naota@elisp.net>
+
+	* w3m.el (w3m-create-text-page, w3m-goto-url): Check if the url is
+	arrived before getting real-url.
+
+2009-01-06  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (top): Add the variable definitions of
+	`w3m-tab-menubar-make-items-preitems' and `w3m-session-menu-items-pre'
+	to avoid byte-compile warnings.
+	(w3m-setup-menu): Move the postion of session menu.
+	(w3m-mouse-major-mode-menu): Add session menu.
+
+	* w3m-xmas.el (autoload): Add w3m-setup-session-menu.
+	(w3m-menu-on-forefront): Treat "Session" menu.
+	(w3m-setup-menu): Call `w3m-setup-session-menu'.
+
+2008-12-30  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-select-buffer-mode-map): Bind `w3m-select-buffer-quit' to
+	C-g.
+
+	* w3m-session.el (w3m-session-select-mode-map): Bind
+	`w3m-session-select-quit' to C-g.
+
+	* w3m-form.el (w3m-form-input-select-keymap): Bind
+	`w3m-form-input-select-keymap' to C-g.
+	(w3m-form-input-map-keymap): Bind `w3m-form-input-map-exit' to C-g.
+
+2008-12-17  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-session.el (w3m-session-select-mode-map): Add new key.
+	(w3m-session-select-mode): Modify doc-string.
+	(w3m-session-select-rename): New command.
+	(w3m-session-rename): New function.
+
+2008-12-17  Naohiro Aota  <naota@elisp.net>
+
+	* w3m.el (autoload): Add w3m-setup-session-menu.
+	(w3m-menubar): Moved session menu to w3m-session-menu-items.
+	(top): Call w3m-setup-session-menu.
+
+	* w3m-session.el: Change to use major mode; Add session menu.
+	(w3m-session-unknown-title): New option.
+
+2008-12-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-compatible-encoding-alist): Add (gb2312 . gbk).
+
+2008-12-12  David Engster  <dengste@eml.cc>
+
+	* w3m-proc.el (w3m-process-wait-process): Reduce sit-for time.
+	(w3m-process-sentinel): Wait for process output (on Emacs only).
+
+2008-12-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-show-redirection-error-information): Improve the
+	error message.
+
+2008-12-10  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-next-anchor): Go to the first anchor when next
+	anchor is not found.
+	(w3m-previous-anchor): Go to the last anchor when previous anchor
+	is not found.
+	(w3m-url-encode-string): Encode SPC only when encode-space is
+	non-nil.
+
+	* w3m-form.el (w3m-form-make-form-data): Follow the above change.
+
+	* w3m.el (w3m-gmane-url-at-point): Ditto.
+	(w3m-canonicalize-url): Ditto.
+
+2008-12-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-ems.el (w3m-make-ccl-coding-system): Use define-coding-system if
+	it is available.
+
+2008-12-06  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-show-redirection-error-information): New function.
+	(w3m-retrieve-and-render): Use it.
+	(w3m-w3m-retrieve-1): Return 'redirection-exceeded if redirect counter
+	exceeded.
+	(w3m-w3m-retrieve): Return "X-w3m-error/redirection" if attr eq
+	'redirection-exceeded.
+	(w3m-w3m-attributes-1): Return dummy attribute if redirect counter
+	exceeded.
+
+2008-12-05  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m-form.el (w3m-same-window-p): New function.
+	(w3m-form-input-textarea): Use it.
+
+	* w3m.el (w3m-local-find-file-regexps): Try to open with emacs-w3m as
+	many types as possible.
+
+2008-12-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-fontify): Remove hidden anchors like "<a href=url> </a>".
+	cf. [emacs-w3m:10484]
+
+2008-12-01  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m-form.el (w3m-form-input-textarea): Use the whole current window
+	for the textarea when `same-window-buffer-names' contains the buffer
+	name "*w3m form textarea*"; simplify the window size calculation.
+
+2008-11-21  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-w3m-parse-header): Also remove parameters when charset is
+	specified.
+
+2008-11-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el (w3m-visited-file-modtime): New function.
+
+	* w3m-bookmark.el (w3m-bookmark-file-modtime): Just return result of
+	file-attributes().
+
+2008-11-11  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m-antenna.el (w3m-antenna-check-rss): Support RSS2.0. Check also
+	items.
+	(w3m-antenna-alist): Update site-class if needed.
+
+	* w3m-bookmark.el (w3m-bookmark-buffer, w3m-bookmark-verify-modtime):
+	Replace visited-file-modtime with w3m-visited-file-modtime.
+
+2008-10-28  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-view-header): Check if current page is source of
+	about:something.
+
+2008-10-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-active-region-or-url-at-point): Take notice of the link
+	under the point as well; return the url of the current page by default
+	if the new optional argument `default=current' is given.
+	(w3m-input-url): Make w3m-active-region-or-url-at-point return the url
+	of the current page by default; modify the prompt string according to
+	whether there is an initial input.
+	(w3m-download, w3m-goto-url, w3m-goto-url-new-session): Simplify args
+	passed to w3m-input-url.
+	(w3m-view-this-url): Make w3m-active-region-or-url-at-point return the
+	url of the current page by default.
+
+2008-10-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-italic): Make it be a underline face on a non-window
+	system by default.
+
+2008-09-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-toggle-inline-images-internal)
+	(w3m-resize-inline-image-internal): Confirm whether to retrieve
+	insecure image only once, or don't confirm it if
+	w3m-confirm-leaving-secure-page is nil.  Suggested by Dan Jacobson
+	<jidanni@jidanni.org>.
+	(w3m-confirm-leaving-secure-page): Doc fix.
+
+	* w3mhack.el (w3mhack-makeinfo): Remove Emacs 19 stuff; remove TeX
+	directives first; don't call texinfo-mode.
+
+2008-09-21  Akinori MUSHA  <knu@iDaemons.org>
+
+	* doc/emacs-w3m.texi (Image Variables): Fix syntax error.
+
+	* doc/emacs-w3m-ja.texi (Image Variables): Ditto.
+
+2008-09-17  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-buffer-local-url): New constant variable.
+	(w3m-buffer-local-url-p): New function.
+	(w3m-goto-url): Also process buffer local url.
+	(w3m-region): Use w3m-buffer-local-url as url if it is not set.
+	(w3m-safe-view-this-url, w3m-mouse-safe-view-this-url): Check if url is
+	buffer local.
+
+2008-09-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-download): Add doc string.
+	(w3m-lynx-like-map): Bind M-d key to w3m-download.
+	(w3m-mode): Add w3m-download to major mode info; clarify description of
+	w3m-download-this-url.
+
+2008-09-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-gmane-url-at-point): Return a url used for asking Gmane
+	for the thread that begins with the current article instead of the
+	whole thread if it is run on the Message-ID header.
+	(w3m-examine-command-line-args): Make it an alias to `(lambda nil)'
+	instead of `ignore' after it is run for the first time in order to
+	silence the byte compiler.
+
+2008-09-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-use-favicon): Assume w3m-image.elc is always loaded.
+	(w3m-resize-inline-image-internal): Change it to a normal function from
+	an inline function; remove interactive.
+	(w3m-zoom-in-image, w3m-zoom-out-image): Error if ImageMagick's convert
+	program is not available; improve doc string.
+	(w3m-auto-show): Don't make the cursor position disappear after
+	executing beginning-of-buffer and end-of-buffer.
+
+2008-08-25  David Hansen  <david.hansen@gmx.net>
+
+	* w3m.el (w3m-about-header): Fixed typo.
+
+2008-08-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-view-source, w3m-view-header): Save points positioned
+	last in pages.  Suggested by Dan Jacobson <jidanni@jidanni.org>.
+
+2008-07-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-ems.el: Bind w3m-image-default-background when compiling.
+
+2008-07-20  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m-hist.el (w3m-history-restore-position): Run
+	w3m-after-cursor-move-hook after restoring cursor position.
+
+2008-07-18  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-image-default-background): New variable.
+
+	* w3m-ems.el (w3m-create-image): Use it.
+	(w3m-initialize-graphic-icons): Check if xpm is available.  Reported by
+	Diego 'Flameeyes' Petten,Ar(B <flameeyes@gmail.com>.
+
+	* w3m-filter.el (w3m-filter-wikipedia): Improve regexp.
+
+2008-07-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-search.el (w3m-search-engine-alist): Test if mule-version is
+	bound (XEmacs does not provide it).
+
+2008-06-30  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m-form.el (w3m-form-input, w3m-form-input-password): Process
+	readonly attribute.
+
+2008-06-25  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-toggle-inline-images-internal): Make it non-interactive.
+
+	* w3m-form.el (w3m-form-input-textarea): Make buffer unmodified when
+	user selected to reuse saved text; parse readonly attribute; kill newly
+	generated buffer when the reusing question aborted.
+	(w3m-form-textarea-info): Also provide readonly info.
+	(w3m-fontify-textareas): Parse readonly attribute.
+	(w3m-form-parse-and-fontify): Ditto.
+	(w3m-form-input): Ignore cursor moving while read from minibuffer.
+	(w3m-form-input-password): Ditto.
+	(w3m-form-input-file): Ditto.
+
+	* w3m.el (w3m-toggle-inline-image): Don't toggle images that are
+	outside of the region even if they are identical to the ones in the
+	region; don't do recursive call of itself; rearrange the source code.
+	(w3m-toggle-inline-images): Check whether images are safe even if it is
+	called with w3m-display-inline-images=t and force=t; rearrange the
+	source code.
+	(w3m-toggle-inline-images-internal): Add new optional argument:
+	`begin-pos' and `end-pos'. Only process region from `begin-pos' to
+	`end-pos'.
+
+2008-06-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-toggle-inline-image): Work for an image in which there is
+	the region end within its anchor.  Reported by Dan Jacobson
+	<jidanni@jidanni.org>.
+
+	* w3m-util.el (w3m-deactivate-region): Use zmacs-deactivate-region for
+	XEmacs.
+
+2008-06-22  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m-search.el (w3m-search-engine-alist): Improve detection of utf-8
+	capability.
+	(w3m-search-engine-alist): Abolish `yahoo beta' entry; Improve `blog'
+	entry to work like `google' entry.
+
+	* w3m-session.el: Add coding cookie.
+
+2008-06-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-submit-form-safety-check): New user option.  Suggested by
+	Dan Jacobson <jidanni@jidanni.org>.
+	(w3m-submit-form): Use it.
+
+2008-06-12  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-auto-show): Scrool horizontally after executing a search
+	command.
+
+2008-06-07  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-use-header-line-title): Modify the doc-string.
+
+2008-06-06  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-select-buffer): Don't delete other windows.
+
+	* w3m-filter.el (w3m-filter-wikipedia): New function.
+	(w3m-filter-rules): Add w3m-filter-wikipedia.
+
+2008-06-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el: Add coding cookie.
+
+2008-06-02  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-detect-meta-charset): Use also ';' as delimiter.
+
+2008-05-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-examine-command-line-args): Treat the null string given
+	as a url in the command line args as `w3m-home-page' or "about:".
+
+2008-05-28  Naohiro Aota  <nao.aota@gmail.com>
+
+	* doc/emacs-w3m.texi (Inline Images): Update.
+
+	* doc/emacs-w3m-ja.texi (Inline Images): Ditto.
+
+2008-05-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-url-readable-string): Don't decode url if it looks not to
+	have been encoded.
+	(w3m-current-longest-line): New variable.
+	(w3m-set-current-longest-line): New function.
+	(w3m-scroll-left, w3m-shift-left): Don't scroll the window endlessly;
+	beep if the window can't be scrolled any more.
+	(w3m-scroll-right, w3m-shift-right): Beep if the window can't be
+	scrolled any more.
+
+2008-05-25  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-relationship-estimate-rules): Fix regexp for Google
+	search within EmacsWiki.
+
+2008-05-20  Naohiro Aota  <nao.aota@gmail.com>
+
+	* README: Add information about how to create `configure' script.
+
+	* README.ja: Ditto.
+
+	* w3m.el (w3m-goto-url): Delayed encoding of fragment part.
+
+2008-05-18  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m-cookie.el (w3m-cookie-save-current-site-cookies): New function.
+	(w3m-cookie-save): Add optional argument "domain".
+
+2008-05-16  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* mew-w3m.el (mew-w3m-add-text-properties): New inline macro.
+	(mew-w3m-view-inline-image): Use `mew-w3m-add-text-properties'.
+	(mew-mime-text/html-w3m): Ditto.
+
+2008-05-09  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m-cookie.el (w3m-cookie-save): Make it interactive function.
+	(w3m-cookie-save-cookies): New variable.
+	(w3m-cookie-shutdown): Use it.
+
+	* w3m.el (toplevel): Shutdown cookie system when exiting emacs.
+
+2008-05-08  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m-cookie.el (w3m-cookie-shutdown): Fixed docstring.
+
+2008-05-08  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-filter.el (w3m-filter-amazon): Fix string to search the body.
+
+2008-04-30  Naohiro Aota  <nao.aota@gmail.com>
+
+	* doc/emacs-w3m-ja.texi: Update translation.
+
+	* w3m.el (w3m-goto-url): Use w3m-current-coding-system first to encode
+	url if available; Also encode name part when url is local.
+	(w3m-ignored-image-url-regexp): New variable.
+	(w3m-toggle-inline-images-internal): Don't display image whose url
+	match `w3m-ignored-image-url-regexp'.
+	(w3m-decode-entities, w3m-decode-entities-string): Replace
+	"(match-beginning 2)" with "(match-end 1)" to deal with emacs-21's
+	strange behavior.
+
+2008-04-24  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-filter.el (w3m-filter-rules): Support Mixi with SSL.
+
+2008-04-22  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+	* doc/ptexinfmt.el: Fix Comments.
+	(texinfo-format-geq, texinfo-format-leq,): Support @geq and @leq.
+
+2008-04-18  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-filter.el (w3m-filter-rules): Add rule for the site of Allatanys.
+	(w3m-filter-allatanys): New function.
+
+	* w3m.el (w3m-relationship-estimate-rules): Fix regexp for Google
+	search within EmacsWiki. Add rule for Google Mobile Proxy.
+
+2008-04-17  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (top): Add the variables definition of `w3m-bookmark-mode',
+	`w3m-bookmark-menu-items', `w3m-bookmark-menu-items-pre' and
+	`w3m-tab-menubar-make-items-preitems' avoid byte-compile warnings.
+	(w3m-rmouse-menubar): New user option.
+	(w3m-setup-menu): Add the setup of `w3m-rmouse-menubar'.
+	(w3m-mouse-major-mode-menu): Rewrite to use `w3m-rmouse-menubar'.
+	(w3m-link-menu): Add `w3m-external-view-this-url'.
+
+2008-04-15  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-turnoff-inline-images): New command.
+	(w3m-toggle-inline-images): If force is 'turnoff, turn off to display
+	images.
+	(w3m-menubar): Add w3m-turnoff-inline-images.
+	(w3m-lynx-like-map): Ditto.
+	(w3m-info-like-map): Ditto.
+	(w3m-mode): Ditto.
+
+2008-04-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-relationship-estimate-rules): Fix custom type.
+
+2008-04-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-relationship-estimate-rules): Support Google search
+	within EmacsWiki.  cf. [emacs-w3m:10067]
+
+2008-03-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-mouse-safe-view-this-url): Remove redundant confirmation
+	of whether to follow link.
+
+2008-03-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-doc-view-content-types): New variable.
+	(w3m-doc-view): New function.
+	(w3m-create-page): Use it.
+	(w3m-content-type-alist): Add application/dvi.
+	(w3m-delete-buffer): Save windows layout.
+
+2008-03-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-image.el (w3m-imagick-convert-program-available-p): Don't use
+	w3m-imagick-convert-data which may issue a warning when checking
+	whether the convert program supports png32.  cf. [emacs-w3m:10048]
+
+2008-03-03  Naohiro Aota  <nao.aota@gmail.com>
+
+	* doc/emacs-w3m.texi (Inline Images): Updated.
+
+	* doc/emacs-w3m-ja.texi (Inline Images): Ditto.
+
+	* w3m.el (w3m-toggle-inline-images): Only toggle in the region if
+	Transient Mark mode.
+	(w3m-toggle-inline-image): Ditto.
+
+2008-02-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-arrived-intern): Protect against null string.  It enables
+	url completion even for null string.  Suggested by Aota-san.
+
+2008-02-07  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-expand-path-name): New function.
+	(w3m-expand-url): Remove useless expanded path-name check.
+
+2008-02-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* Makefile.in (install-lisp, install-icons, install-icons30): Quote
+	directory name that might contain whitespace.
+
+	* doc/Makefile.in (install): Ditto.
+
+	* aclocal.m4 (AC_PATH_LISPDIR): Ditto; always report prefix name.
+
+	* mkinstalldirs: Replace it with the 2006-05-11.19 version.
+
+2008-01-30  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-fontify-anchors): Don't expand icon's url when it is nil.
+
+2008-01-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-safe-url-regexp): Add note to doc string.
+	(w3m-fontify): Hold the value of w3m-safe-url-regexp with the
+	w3m-safe-url-regexp text-property.
+	(w3m-toggle-inline-image, w3m-toggle-inline-images)
+	(w3m-safe-view-this-url, w3m-mouse-safe-view-this-url): Check whether
+	url is safe by comparing it with the value of the w3m-safe-url-regexp
+	text property; prompt a user to confirm whether to proceed.
+	(w3m-safe-toggle-inline-image, w3m-safe-toggle-inline-images): Abolish.
+	(w3m-minor-mode-command-alist): Map w3m-toggle-inline-image and
+	w3m-toggle-inline-images to themselves.
+
+2008-01-20  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-search-name-anchor): Accept and optional argument
+	`no-record'.
+	(w3m-goto-url): Going other page's anchor, call
+	`w3m-search-name-anchor' with 3rd argument t.
+
+2008-01-16  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m-form.el (w3m-form-input-textarea-coding-system): Revert.
+	(w3m-form-input-textarea): Set w3m-form-input-textarea-coding-system to
+	use in w3m-form-coding-system-accept-region-p.
+
+2008-01-15  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m-form.el (w3m-form-textarea-file-coding-system): New variable.
+	(w3m-form-input-textarea-save): Use it.
+	(w3m-form-input-textarea): Ditto.
+	(w3m-form-input-textarea-coding-system): Abolish.
+
+2008-01-11  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m-filter.el (w3m-filter-iframe): New function.
+	(w3m-filter-rules): Add rule for inserting link to the url iframe
+	displays.
+
+2008-01-09  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m-form.el (w3m-form-coding-system-accept-region-p): Abolish.
+
+	* w3m-ems.el (w3m-form-coding-system-accept-region-p): Use
+	select-safe-coding-system if unencodable-char-position is not
+	available.
+
+	* w3m-xmas.el (w3m-form-coding-system-accept-region-p): Use
+	decode-coding-string and encode-coding-string instead of
+	unencodable-char-position; Only warn coding-system problem.
+
+2008-01-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-url-decode-string): Don't replace +'s with spaces.
+
+2007-12-27  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m-form.el (w3m-form-coding-system-accept-region-p): New function.
+	(w3m-form-input-textarea-save, w3m-form-input-textarea-set): Use it.
+
+2007-12-24  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-session.el (w3m-session-goto-session): Go to the current w3m
+	buffer in data of session.
+
+2007-12-24  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m-session.el (w3m-session-history-to-save): New function.
+	(w3m-session-save): Also record history data.
+	(w3m-session-automatic-save, w3m-session-deleted-save): Ditto.
+	(w3m-session-select): Follow the format change.
+	(w3m-session-goto-session): Also restore history data.
+
+2007-12-23  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-tabmenu.el (w3m-tab-menubar-force-update): New function.
+	(top): Register `w3m-tab-menubar-force-update' to
+	`w3m-display-functions'.
+
+2007-12-20  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-lynx-like-map): Bind `w3m-move-unseen-buffer'.
+	(w3m-info-like-map): Ditto.
+	(w3m-buffer-unseen): New buffer local variable.
+	(w3m-set-buffer-unseen): New function.
+	(w3m-set-buffer-seen): Ditto.
+	(w3m-move-unseen-buffer): Ditto.
+	(w3m-remove-local-hook): Ditto.
+	(w3m-goto-url): Set buffer to unseen.
+	(w3m-select-buffer-generate-contents): Support `unseen'.
+
+	* w3m-util.el (top): Add the variable definition of `w3m-buffer-unseen'
+	to avoid byte-compile warnings.
+	(w3m-unseen-buffer-p): New inline macro.
+
+	* w3m-tabmenu.el (w3m-tab-menubar-make-items-1): Support `unseen'.
+
+	* w3m-ems.el (w3m-remove-local-hook): New function.
+	(w3m-tab-unselected-unseen): New face.
+	(w3m-tab-line): Support `unseen'.
+
+2007-12-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-mode): Set show-trailing-whitespace to nil.
+
+2007-12-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-favicon.el (w3m-favicon-default-background): New user option.
+	(w3m-favicon-set-image): Don't set background color of favicon here.
+	(w3m-favicon-convert): Set the background color of favicon according to
+	w3m-favicon-default-background.
+
+	* w3m-ems.el (w3m-tab-line): Don't set the background color of favicon
+	here.
+
+	* w3m-image.el (w3m-imagick-identify-program): New user option.
+
+2007-12-17  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-proc.el (w3m-process-kill-stray-processes): Do not kill
+	process when the buffer associated to it is alive.
+	(w3m-process-sentinel): Do not call a handler when its parent
+	buffer have been killed.
+
+2007-12-15  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m-form.el (w3m-form-submit): Remove query part from the form's
+	action url when using get method.
+
+2007-12-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-favicon.el (w3m-favicon-size): Change the value form into
+	the cons of WIDTH and HEIGHT.
+	(w3m-favicon-convert-args): New user option.
+	(w3m-favicon-convert): Pass it to convert.
+
+	* w3m-ems.el (w3m-tab-mouse-track-selected-tab): Follow change of
+	w3m-favicon-size.
+
+2007-12-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-ems.el (w3m-tab-line): Set the background color of favicon
+	for Emacs 22+.
+
+	* w3m-favicon.el (w3m-favicon-set-image): Ditto.
+
+	* w3m-image.el (w3m-imagick-convert-program-available-p): Check
+	whether the convert program supports the image type png32 for
+	Emacs 22+.
+	(w3m-imagick-convert-buffer, w3m-imagick-start-convert-buffer):
+	Use png32 if it is available.
+
+2007-12-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-favicon.el (w3m-favicon-convert): Make last change revert.
+
+2007-12-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-favicon.el (w3m-favicon-convert): Apply the background color
+	of header line or mode line to pixels of which the color is
+	transparent.
+
+2007-12-06  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-goto-url): Canonicalize the url when it is called
+	non-interactively.
+
+2007-12-01  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-name-anchor-from-hist): New buffer-local variable.
+	(w3m-clear-local-variables): Also clear w3m-name-anchor-from-hist.
+	(w3m-goto-url): Save and restoe w3m-name-anchor-from-hist.
+	(w3m-search-name-anchor): Record (point)s of before and after
+	following a name-anchor.
+	(w3m-view-previous-page): If possible, move back the cursor to the
+	point where it was before following name-anchors.
+
+2007-11-30  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m-proc.el (w3m-process-y-or-n-p): Ignore space to avoid
+	answering y without intention.
+
+2007-11-29  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-goto-url-new-session): Use
+	w3m-active-region-or-url-at-point.  Reported by Naohiro Aota.
+
+	* w3m-ems.el (w3m-create-image): Don't modify case-fold-search.
+
+	* w3m-xmas.el (w3m-create-image): Ditto; parse image data to
+	identify its type in the beginning position.
+
+2007-11-29  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-w3m-dump-extra, w3m-w3m-retrieve): Removed image
+	data type tests.
+
+	* w3m-xmas.el (w3m-create-image): Parse image data first, use
+	server's content-type when it failed to identify type.
+
+	* w3m-ems.el (w3m-create-image): Ditto.
+
+2007-11-29  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-search.el (w3m-search-engine-alist): Fix google news entry.
+
+	* w3m-ems.el (w3m-create-image): Parse image data if it failed in
+	identifying type.
+
+	* w3m-xmas.el (w3m-create-image): Ditto.
+
+2007-11-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-resize-inline-image-internal): Validate image url.
+	Reported by Naohiro Aota <nao.aota@gmail.com>.
+
+2007-11-27  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-toggle-inline-images-internal): Confirm retrieving
+	non-secure image.
+	(w3m-resize-inline-image-internal): Ditto.
+
+2007-11-27  Katsumi Yamaoka  <yamaoka@jpl.org>,
+	    TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-retrieve-and-render): Permit leaving safe pages
+	without confirmation for several safe commands.
+
+2007-11-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-symbol.el: Autoload w3m-mule-unicode-p when compiling.
+
+	* w3m-proc.el: Update the way to suppress compile warning for gensym.
+
+2007-11-26  Trent W. Buck  <trentbuck@gmail.com>
+
+	* w3m.el (w3m-confirm-leaving-secure-page): New user option.
+	(w3m-retrieve-and-render): Use it.
+
+2007-11-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-use-japanese-menu): Default to nil for XEmacs 21.4 and
+	SXEmacs.
+	(w3m-link-map): New variable.
+	(w3m-fontify-anchors): Add menu to links.
+	(w3m-read-file-name): Don't use default file name if it is "".
+	(w3m-link-menu): Define.
+
+2007-11-06  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-redisplay-with-charset): Strip first 'about://source/'
+	before setf w3m-arrived-content-charset.
+	(w3m-redisplay-and-reset): Ditto.
+
+2007-11-05  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m-filter.el (w3m-filter-rules): Add rule for the site of imepita.
+	(w3m-filter-imepita): New function.
+
+2007-11-03  David Hansen  <david.hansen@gmx.net>
+
+	* w3m-proc.el (w3m-process-wait-process): Preserve the current buffer
+	\(work around an Emacs bug\).
+
+2007-11-03  David Hansen  <david.hansen@gmx.net>
+
+	* w3m.el (w3m-relationship-oddmuse-estimate): Follow new page layout.
+
+2007-11-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-ucs-to-char): Alias to unicode-to-char, ucs-to-char,
+	or int-to-char.
+
+	* w3m-ems.el (w3m-ucs-to-char): Always define it.
+
+	* w3m.el (w3m-ucs-to-char): Abolish.
+
+2007-10-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-module-list): Don't compile mew-w3m.el and
+	mew-shimbun.el if there is only the official Mew XEmacs package that is
+	extremely old.
+
+	* w3m-proc.el: Update the way to suppress compile warning for gensym.
+
+	* w3m-util.el (w3m-list-buffers): Check if w3m-fb-mode is bound.
+
+	* w3m.el (w3m-copy-buffer, w3m-mouse-major-mode-menu): Remove unused
+	let-bound variables.
+
+2007-10-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* Makefile.in (install-lisp): Don't install w3m-ems.el for XEmacs and
+	w3m-xmas.el for GNU Emacs.
+
+2007-10-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* *, doc/*: Fix expressions of the copyright notices.
+
+	* w3mhack.el (w3mhack-makeinfo): Don't split Info file to pieces.
+
+	* doc/emacs-w3m.texi, doc/emacs-w3m-ja.texi: Use @copying and
+	@insertcopying to put up the copyright notice.
+	(Coding convention of Shimbun): Don't use @itemx with @@multitable.
+
+	* doc/ptexinfmt.el (texinfo-copying-text, texinfo-copying)
+	(texinfo-insertcopying, texinfo-format-scan): Add them for old Emacsen.
+
+	* doc/Makefile.in (install): Remove installed *.info-[0-9] files;
+	install only *.info files.
+	(.texi.dvi): Don't specify "-l ja" to texi2dvi.
+	(clean): No need to remove *.info-[0-9] and *.info-[0-9][0-9] files.
+
+2007-10-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-find-coding-system): Return symbol, not coding
+	system object.
+
+2007-10-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-entity-regexp, w3m-entity-value): Accept case-insensitive
+	numeric character references.
+
+2007-10-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-message): Work with XEmacs.
+
+2007-10-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-ems.el: Bind w3m-use-title-buffer-name (see the comment).
+
+	* Makefile.in (very-slow): Add missing semicolon.
+
+2007-10-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* Makefile.in (install-lisp): Don't install ChangeLog~.
+
+2007-10-02  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-show-error-information): When emacs-w3m cannot find
+	host, set charset to us-ascii.
+
+2007-10-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-show-decoded-url): Add entry for nikkei.co.jp.
+
+2007-09-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-decode-buffer): Don't decode escaped URLs.
+	(w3m-toggle-inline-images-internal): Escape non-ASCII characters in the
+	URL of the image before retrieving it.
+
+2007-09-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-safe-view-this-url): When a function which is
+	specified by `w3m-goto-article-function' returns the
+	`w3m-goto-url' symbol, it falls back to emacs-w3m displaying
+	functions.  Cf. [emacs-w3m:09660]
+	(w3m-goto-article-function): Its comment is updated to follow the
+	above change.
+	(w3m-entity-value, w3m-decode-entities-string): Change to save
+	working memory.
+
+2007-09-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-entity-regexp): Bind max-specpdl-size for old Emacsen.
+	(w3m): Revert 2007-09-19 change.
+
+2007-09-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* NEWS: New file.
+
+2007-09-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-examine-command-line-args): Don't pass negative number to
+	nthcdr.
+
+	* w3m-session.el (w3m-session-save, w3m-session-select): Use mapc
+	instead of mapcar.
+
+2007-09-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Changes to stricten entities decoded by
+	`w3m-decode-entities'.
+	(w3m-entity-table, w3m-entity-reverse-table): New constants.
+	(w3m-entity-regexp): Stricten.
+	(w3m-entity-alist, w3m-entity-db, w3m-entity-db-size): Abolished.
+	(w3m-entity-value, w3m-decode-entities, w3m-decode-entities-string,
+	w3m-encode-specials-string): Rewritten to use the above constants.
+
+2007-09-21  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+	* doc/ptexinfmt.el: Support @fonttextsize, @textdegree.
+
+2007-09-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-examine-command-line-args): Rewrite.
+	(w3m): Always call it; set the 2nd arg new-session when Emacs 21 or
+	XEmacs runs in the batch mode.
+
+2007-09-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-examine-command-line-args): Inhibit Emacs head from
+	displaying startup screen when emacs-w3m runs in the batch mode;
+	improve parsing of arguments.
+
+2007-09-13  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-expand-path-name): Save the matched data surely.
+
+2007-09-09  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-expand-url): Use "/" as path when it of base-uri is not
+	defined; Clear query of base-uri when empty query exist; Changes to
+	follow RFC3986.
+
+2007-09-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-ems.el (w3m-euc-japan-encoder, w3m-iso-latin-1-encoder): Use
+	mule-version to decide whether to redefine them.
+
+	* w3m.el: Use emacs-version instead of emacs-major-version to show the
+	version of Emacs that emacs-w3m doesn't support.
+
+2007-09-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-local-file-type): Regard news:* urls as text/html.
+	(w3m-w3m-retrieve): Return nil if retrieving failed.
+	(w3m-show-error-information): Improve error message for news:* urls.
+
+2007-09-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* aclocal.m4 (AC_PATH_EMACS): Improve expression of Emacs version.
+
+	* doc/ptexinfmt.el (ptexinfmt-broken-facility)
+	(ptexinfmt-defun-if-broken, ptexinfmt-defun-if-void)
+	(ptexinfmt-defvar-if-void): Don't use old-style backquotes.
+	(texinfo-format-cedilla-accent): Quote `,'.
+
+	* w3m-antenna.el (w3m-antenna-site-key, w3m-antenna-site-title)
+	(w3m-antenna-site-class, w3m-antenna-site-url)
+	(w3m-antenna-site-last-modified, w3m-antenna-site-size)
+	(w3m-antenna-site-size-detected): Don't use old-style backquotes.
+
+	* w3m-ccl.el (w3m-ccl-write-repeat, w3m-euc-japan-decoder)
+	(w3m-euc-japan-encoder, w3m-iso-latin-1-decoder)
+	(w3m-iso-latin-1-encoder): Don't use old-style backquotes.
+
+	* w3m-dtree.el (w3m-dtree-has-child): Don't use old-style backquotes.
+
+	* w3m-form.el (w3m-form-method, w3m-form-action, w3m-form-charlst)
+	(w3m-form-enctype, w3m-form-plist, w3m-form-get-property, w3m-form-put)
+	(w3m-form-get): Don't use old-style backquotes.
+
+	* w3m-namazu.el (w3m-namazu-default-index-customize-spec): Don't use
+	old-style backquotes.
+
+	* w3m-util.el (w3m-static-if, w3m-static-when, w3m-static-unless)
+	(w3m-condition-case, w3m-add-text-properties)
+	(w3m-get-text-property-around, w3m-action, w3m-anchor, w3m-image)
+	(w3m-submit, w3m-anchor-sequence): Don't use old-style backquotes.
+
+	* w3m.el (w3m-dirlist-cgi-program): Don't use old-style backquotes.
+
+	* w3mhack.el (char-before, match-string-no-properties)
+	(set-text-properties): Don't use old-style backquotes.
+
+	* w3m-filter.el: Set file's coding-system to euc-japan in order to
+	enable non-Mule XEmacsen to byte-compile this module.
+
+2007-08-31  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (top): Remove unnecessary space at the line end.
+	(w3m-use-title-buffer-name): New option.
+	(w3m-copy-buffer): Use `w3m-generate-new-buffer' instead of
+	`generate-new-buffer'.
+	(w3m-pack-buffer-numbers): Call `w3m-form-set-number' with new name of
+	buffer.
+	(w3m-buffer-setup): Use `w3m-generate-new-buffer' instead of
+	`generate-new-buffer'.
+	(w3m-buffer-setup): Do not display title if w3m-use-title-buffer-name
+	is non-nil.
+	(w3m-modeline-title): Retrun "" if w3m-use-title-buffer-name is
+	non-nil.
+	(w3m-goto-url): Call `w3m-buffer-name-add-title' when display.
+	(w3m): Use `w3m-generate-new-buffer' instead of `generate-new-buffer'.
+	(w3m-use-header-line-title): New option.
+
+	* w3m-form.el (w3m-form-set-number): Change 2'nd argument to `newname'
+	from `count'.
+
+	* w3m-util.el (top): Add the variable definition of
+	`w3m-use-title-buffer-name' to avoid byte-compile warnings.
+	(w3m-buffer-number): Support the feature of buffer-name with title.
+	(w3m-buffer-set-number): Ditto.
+	(w3m-generate-new-buffer): Ditto.
+	(w3m-buffer-name-lessp): Ditto.
+	(w3m-buffer-name-add-title): New inline macro.
+
+	* w3m-ems.el (top): Add the variable definition of
+	`w3m-use-header-line-title' to avoid byte-compile warnings.
+	(w3m-setup-header-line): If `w3m-use-header-line-title' is not nil,
+	display title and URI.
+
+2007-08-30  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-proc.el (top): Add the function definition of
+	`w3m-decode-coding-string-with-priority' to avoid byte-compile
+	warnings.
+
+	* w3m-ems.el (top): Add the variable definition of
+	`w3m-default-coding-system' and `w3m-coding-system' to avoid
+	byte-compile warnings.
+
+	* w3m-xmas.el (top): Add the variable definition of `w3m-coding-system'
+	to avoid byte-compile warnings.
+
+2007-08-29  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m-proc.el (w3m-process-filter): Decode realm string.
+
+	* w3m.el (w3m-url-decode-string): Define latter half as a function :
+	w3m-decode-coding-string-with-priority ,and use it.
+
+	* w3m-ems.el (w3m-decode-coding-string-with-priority): New function.
+
+	* w3m-xmas.el (w3m-decode-coding-string-with-priority): Return string
+	itself unless find-coding-system is defined as built-in function.
+
+2007-08-28  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-uri-replace-alist): Add key of "alc:".
+	(w3m-relationship-estimate-rules): Add alc's rule.
+	(w3m-relationship-alc-estimate): New function.
+
+	* w3m-search.el (w3m-search-engine-alist): Add rule of
+	http://eow.alc.co.jp/.
+
+	* w3m-filter.el (w3m-filter-rules): Add w3m-filter-alc.
+	(w3m-filter-alc): New function. Supper `goFairWord'.
+
+2007-08-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-goto-mailto-url): Make it work even with no rfc2368.el.
+
+2007-08-21  Eugene Oleinik  <eo@aoizora.org>
+
+	* w3m-filter.el (w3m-filter-google-separator): New user option.
+	(w3m-filter-google): Replace hard-coded ones with it.
+	(w3m-filter): Iterate through all cases in w3m-filter-rules.
+	(w3m-filter-replace-regexp): New function.
+
+2007-08-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-detect-xml-type): New function that treats
+	application/xml looking like xhtml+xml as text/html.
+	(w3m-content-type-alist): Use it for application/xml.
+	(w3m-w3m-parse-header): Parse Alternates header for a real url.
+	(w3m-w3m-retrieve-1): Retrieve real url according to Alternates header.
+	(w3m-external-view): Treat xhtml+xml as html.
+
+2007-07-30  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m-form.el: Changes to download contents after submitting form.
+	(w3m-form-download): New variable.
+	(w3m-fontify-textareas, w3m-form-parse-and-fontify): Combine the above
+	variable into expressions which represent form actions.
+	(w3m-form-submit): Accept and optional argument `download'.
+
+	* w3m.el: Changes to download contents after submitting form.
+	(w3m-download): Accept and optional argument `post-data'.
+	(w3m-download-this-url): `w3m-form-download' is binded locally.
+	(w3m-view-this-url): Ditto.
+	(w3m-submit-form): Ditto.
+
+2007-07-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-ucs.el (font-ccl-encoder-alist): Bind it for XEmacs 21.5.
+
+2007-07-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-relationship-estimate-rules): Make Google rule support
+	images.
+
+2007-07-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-session.el (w3m-session-select, w3m-session-selected): Add spec
+	for dark tty.
+	(w3m-session-select): Use read-key-sequence rather than read-event or
+	next-command-event in order to enable it to read arrow keys in tty.
+
+2007-07-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-form.el (w3m-form-make-button): Make it work.
+
+	* w3m-ems.el (w3m-form-make-button): Work when w3m-form-use-fancy-faces
+	is nil.
+
+2007-07-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-goto-article-function): Change the default function into
+	browse-url; doc fix.
+	(w3m-safe-view-this-url): Catch a signal from function which is set to
+	w3m-goto-article-function, and don't run the default function if it is
+	nil.
+
+2007-07-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-goto-article-function): Use defcustom; doc fix.
+	(w3m-safe-view-this-url): Use functionp instead of fboundp to check the
+	value of w3m-goto-article-function.
+
+	* w3m-favicon.el, w3m-namazu.el, w3m-perldoc.el, w3m-xmas.el, w3m.el:
+	Use custom-set-default instead of set-default in defcustom forms.
+
+2007-07-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-make-help-echo): Make the function for Emacs bind
+	deactivate-mark to nil.
+
+2007-06-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-ems.el, w3m-form.el, w3m-lnum.el, w3m-search.el, w3m-session.el
+	* w3m.el: Rename w3m-FOO-face with w3m-FOO.
+
+2007-06-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-makeinfo): Format @key{...}.
+
+2007-06-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-lynx-like-map, w3m-info-like-map): Bind [backtab] to
+	w3m-previous-anchor.
+
+2007-06-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-local-retrieve, w3m-w3m-retrieve, w3m-about-retrieve)
+	(w3m-cid-retrieve, w3m-data-retrieve, w3m-retrieve, w3m-about-header):
+	Change the term and the symbol name `no-decode' into `no-uncompress'.
+
+2007-06-08  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-w3m-retrieve): Check if content-type is wrong after
+	decoding encoded contents.
+
+	* w3m-ems.el (w3m-create-image, w3m-create-resized-image): Decode
+	content retrieving image.
+
+	* w3m-xmas.el (w3m-create-image, w3m-create-resized-image): Ditto.
+
+2007-06-07  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m-search.el (w3m-search-engine-alist): Add output encoding argument
+	to google search.
+
+2007-06-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-image.el (w3m-imagick-convert-program, w3m-resize-images): Reset
+	them if convert program is not really available.
+	(w3m-imagick-convert-program-available-p): New function.
+	(w3m-imagick-convert-buffer, w3m-imagick-start-convert-data): Use it.
+
+2007-06-05  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+	* w3m-image.el (w3m-imagick-start-convert-data): Clarify message which
+	is issued when convert program is not available.
+
+2007-06-05  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-filter.el (w3m-filter-mixi): Follow the change of Mixi's HTML.
+
+2007-06-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* attic/vm-w3m.el, attic/vm-7.19.patch: Remove.  They have been
+	integrated into VM 8.x.
+
+2007-05-17  Tatsuya Kinoshita  <tats@vega.ocn.ne.jp>
+
+	* w3m.el (w3m-view-this-url-1): Check whether the marker buffer exists.
+
+2007-05-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-ems.el (w3m-switch-to-buffer, w3m-subst-switch-to-buffer-keys):
+	Remove.
+
+2007-05-17  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-expand-url): Guard error in aref when url is "".
+
+2007-05-16  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-expand-url): Remove query strings when expanding URL like
+	"foo.cgi?#bar"; add "./" to top of URL when expanding "?hoge".
+
+2007-05-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-ems.el (w3m-switch-to-buffer): Work just like switch-to-buffer.
+	Suggested by Robert J. Chassell <bob@rattlesnake.com>.
+
+2007-05-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-url-encode-string, w3m-url-transfer-encode-string): Use
+	uppercase letters in hexadecimal string.  Suggested by Lukasz Demianiuk
+	<ldemianiuk@gmail.com>.
+
+2007-05-09  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-header-line-url): New function.
+	(w3m-url-at-point): Call w3m-header-line-url after
+	w3m-gmane-url-at-point.
+	(w3m-goto-url-with-timer): Execute w3m-goto-url if its buffer does not
+	exist foreground.
+
+2007-05-08  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (all): Revert SHIRAI's 2007-04-24 changes and fix it to
+	accompany Ito-san's patch [w3m-dev 04233].
+	(w3m-display-ins-del): New option.
+	(w3m-support-emacs-w3m): Remove this variable.
+	(w3m-strike-through-face): Modify.
+	(w3m-insert-face): Ditto.
+	(w3m-strike-through-face-no-windowsystem): Remove this face.
+	(w3m-fontify-insert): Remove this variable.
+	(w3m-halfdump-command-arguments): Remove w3m-support-emacs-w3m.
+	(w3m-halfdump-command-common-arguments): Add w3m-display-ins-del
+	support.
+	(w3m-fontify-strike-through): Rewrite.
+	(w3m-fontify-insert): Ditto.
+	(w3m-set-display-ins-del): New function.
+	(w3m-rendering-half-dump): Call w3m-set-display-ins-del.
+
+2007-04-30  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m-form.el (w3m-form-resume): Also resume contents of forms without
+	name.
+	(w3m-fontify-textareas): Also fontify textareas without name.
+	(w3m-form-field-parse): Also parse form fields without name.
+
+2007-04-28  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-decode-buffer): Use w3m-url-transfer-encode-string
+	instead of w3m-url-encode-string.
+
+2007-04-27  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-view-this-url): Check if w3m-current-url is string before
+	matching.
+
+2007-04-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-decode-buffer): Fully decode a source by default.
+	(w3m-view-source): Doc fix.
+
+2007-04-26  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-goto-url): Redisplay to search an anchor sure with
+	goto-new-session.
+
+2007-04-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-view-source-decode-level): New variable.
+	(w3m-decode-buffer): Control how much it decodes an html source
+	according to w3m-view-source-decode-level.
+	(w3m-view-source): Bind w3m-view-source-decode-level with prefix arg.
+
+2007-04-25  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-decode-buffer): Encode urls containing non-ASCII
+	characters quoted with '' as well as those quoted with "".
+	(w3m-goto-url): Decode urls when url is local.
+
+	characters when displaying an html source.
+
+2007-04-24  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-decode-buffer): Use charset specified in meta tag even
+	for decoding html source.
+
+2007-04-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* Makefile.in (install-lisp): Install shimbun/ChangeLog file.
+
+2007-04-24  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-support-emacs-w3m): New variable.
+	(w3m-compile-options): Set w3m-support-emacs-w3m to t if w3m compiled
+	with emacsdump.
+	(w3m-strike-through-face-no-windowsystem): New face.
+	(w3m-halfdump-command-arguments): Use '-emacsdump' instead of
+	'-halfdump' when w3m has it.
+	(w3m-fontify-strike-through): Support w3m-support-emacs-w3m.
+	(w3m-fontify-insert): Ditto.
+
+2007-04-24  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-goto-url): Set truncate-lines to nil, if a source or
+	header view.
+	(w3m-view-source): Remove to set truncate-lines.
+	(w3m-view-header): Ditto.
+
+2007-04-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* ChangeLog, ChangeLog.1: Separate shimbun entries.
+	(Local Variables): Set fill-column to 79.
+
+2007-04-19  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-form.el (w3m-form-input-textarea-filename): Use MD5 first.
+
+2007-04-14  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m-form.el (w3m-form-input-textarea-filename): Truncate filename
+	into less than or equal to 255 bytes long.
+
+2007-04-06  Matt Hodges  <M.P.Hodges@rl.ac.uk>
+
+	* w3m.el (w3m-next-buffer): Fix last change when w3m-fb-mode.
+
+2007-04-04  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-view-parent-page): Use numbered prefix argument to move
+	the parent directory according to input number.
+
+2007-03-31  Andreas Seltenreich  <seltenreich@gmx.de>
+
+	* w3m.el (w3m-external-view-file): Actually kill the temporary buffer.
+
+2007-03-30  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-ems.el (w3m-tab-mouse-track-selected-tab): Sleep anyway.
+	(w3m-tab-make-keymap): Add key-bindings for mouse wheel-up|down to
+	w3m-mode-map.
+
+2007-03-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bug.el (report-emacs-w3m-bug-system-informations): Add gtk.
+	(report-emacs-w3m-bug): Bind print-quoted to t.
+
+	* w3m-ems.el (w3m-force-window-update): Do split-window-vertically
+	instead of performing enlarge-window/shrink-window for Emacs 21.
+	(w3m-tab-mouse-track-selected-tab): Add `decelerate' argument; use it
+	instead of to check the value of this-command.
+	(w3m-tab-move-right): Set it.
+	(w3m-tab-make-keymap): Rearrange.
+	(w3m-update-tab-line): Remove.
+
+	* w3m.el (w3m-select-buffer-update): Use w3m-force-window-update
+	instead of w3m-update-tab-line.
+
+2007-03-29  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-ems.el (w3m-tab-mouse-track-selected-tab): Tiny fix.
+	(w3m-tab-make-keymap): Use next|previous-buffer-action instead of
+	w3m-tab-next|previous-buffer.
+
+2007-03-29  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-ems.el (w3m-tab-mouse-track-selected-tab): Ignore mouse position
+	info if mouse points to other frame; recognize wheel-up and wheel-down
+	in addition to mouse-4 and mouse-5; don't respond to too fast operation
+	of mouse wheel for moving a tab.
+
+2007-03-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-ems.el (w3m-tab-track-mouse): New variable.
+	(w3m-tab-mouse-position-adjuster): Express the values in pixel units
+	rather than the number of characters.
+	(w3m-tab-mouse-track-selected-tab): Be controlled by
+	w3m-tab-track-mouse; calculate the mouse position in pixel units rather
+	than the number of characters.
+	(w3m-tab-make-keymap): Make the buffer selected by a tab the current
+	buffer before performing w3m-tab-move-(left|right).
+	(w3m-tab-separator-map): New keymap.
+	(w3m-tab-separator): Use it as the local-map property.
+	(w3m-tab-line): Use it as the local-map property in trailing space.
+
+2007-03-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-ems.el (w3m-tab-unselected-face)
+	(w3m-tab-unselected-retrieving-face, w3m-tab-selected-face)
+	(w3m-tab-selected-retrieving-face, w3m-tab-mouse-face): Make background
+	colors bright.
+	(w3m-tab-mouse-position-adjuster): New variable.
+	(w3m-tab-mouse-track-selected-tab, w3m-tab-next-buffer)
+	(w3m-tab-previous-buffer, w3m-tab-move-right, w3m-tab-move-left): New
+	functions.
+	(w3m-tab-map): Bind C-wheel-up and C-mouse-4 to w3m-tab-move-left; bind
+	C-wheel-down and C-mouse-5 to w3m-tab-move-right; use
+	w3m-tab-previous-buffer and w3m-tab-next-buffer instead of
+	w3m-previous-buffer and w3m-next-buffer.
+	(w3m-tab-separator): Add tab-separator property.
+
+	* w3m.el (w3m-next-buffer): Fix calculation.
+	(w3m-lynx-like-map, w3m-info-like-map): Bind `C-c C-,' and `C-c C-<' to
+	w3m-tab-move-left, and bind `C-c C-.' and `C-c C->' to
+	w3m-tab-move-right for GNU Emacs.
+
+2007-03-27  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-add-tab-number): New user option.
+
+	* w3m-ems.el (top): Add w3m-add-tab-number to avoid byte-compile
+	warnings.
+	(w3m-tab-line): Display sequential number on tab title when
+	w3m-add-tab-number is not nil.
+
+	* w3m.el (w3m-menubar): Add w3m-session-save and w3m-session-select.
+	(w3m-tab-button-menu-commands): Ditto.
+
+2007-03-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-ems.el: New file merging w3m-e21.el, w3m-e23.el and w3m-fsf.el.
+	(image-size): No need to silence the byte compiler.
+	(w3m-ccl-get-ucs-codepoint-with-emacs-unicode): Remove.
+	(w3m-euc-japan-encoder, w3m-euc-japan-encoder)
+	(w3m-iso-latin-1-encoder, w3m-iso-latin-1-encoder): Redefine them only
+	for Emacs 22 and earlier.
+
+	* w3m-e21.el, w3m-e23.el, w3m-fsf.el: Remove.
+
+	* w3m.el: Load w3m-ems.el instead of w3m-e21.el or w3m-e23.el.
+	(w3m-fontify-strike-through): Remove variable.
+
+	* w3mhack.el (w3mhack-mdelete): Remove.
+	(w3mhack-module-list): Use w3m-ems.el instead of w3m-fsf.el and
+	w3m-e21.el or w3m-e23.el.
+
+	* Makefile.in (tarball): No need to exclude w3m-e23.el.
+
+2007-03-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* aclocal.m4 (AC_SET_XEMACSDEBUG): Fix the way to quote the value of
+	XEMACSDEBUG.  Reported by Norbert Koch <nk@viteno.net>.
+
+2007-03-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* aclocal.m4 (AC_SET_XEMACSDEBUG): Quote VANILLA_FLAG.
+
+2007-03-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* aclocal.m4 (AC_SET_XEMACSDEBUG): New function; set XEMACSDEBUG
+	environment variable, which is eval'd when XEmacs 21.5 starts, to the
+	Lisp form, which sets `log-warning-minimum-level' to `error', in order
+	to suppress warnings for Lisp shadows when XEmacs 21.5 starts.
+	(AC_PATH_EMACS): Run AC_SET_XEMACSDEBUG.
+	(AC_EMACS_LISP, AC_ADD_LOAD_PATH): Use XEMACSDEBUG.
+
+	* Makefile.in (XEMACSDEBUG): New variable.
+	(lisp, what-where, install-package, install-package-ja, dist)
+	(.el.elc, slow, very-slow): Use it.
+
+	* doc/Makefile.in (XEMACSDEBUG): New variable.
+	(EMACSINFO, version.texi, install-en, install-ja): Use it.
+
+	* w3mhack.el: Reset `log-warning-minimum-level' to `info'.
+
+2007-03-15  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-session.el (w3m-session-deleted-save): Sort buffers to use their
+	name.
+
+2007-03-13  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (autoload): Add w3m-session-deleted-save.
+	(w3m-delete-buffer): Call w3m-session-deleted-save.
+	(w3m-delete-other-buffers): Call w3m-delete-buffers instead of piece of
+	code.
+	(w3m-delete-buffers): Call w3m-session-deleted-save.
+
+	* w3m-session.el (w3m-session-deleted-save): New option.
+	(w3m-session-deleted-title): Ditto.
+	(w3m-session-deleted-keep-number): Ditto.
+	(w3m-session-deleted-save): New function.
+	(w3m-session-select): Display URLs.
+	(w3m-session-select): Add key assignment; `k' and `j'.
+
+2007-03-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bug.el (report-emacs-w3m-bug): Use a new buffer to compose a mail
+	if at least mail-user-agent is sendmail-user-agent that is the default.
+	cf. http://article.gmane.org/gmane.emacs.devel/67501
+
+2007-03-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-generate-load-file): Advise make-autoload to
+	support define-minor-mode if it should be necessary.
+
+2007-03-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-async-exec-with-many-urls): New variable; default to t
+	except for XEmacs 21.5.
+	(w3m-goto-url): Bind w3m-async-exec to nil when retrieving group:* urls
+	if w3m-async-exec-with-many-urls is nil.
+
+	* w3m-session.el (w3m-session-goto-session): Bind w3m-async-exec to nil
+	if w3m-async-exec-with-many-urls is nil.
+
+2007-03-08  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-session.el (w3m-session-select): Use next-command-event and
+	event-key for XEmacs with checked surely.
+
+2007-03-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-session.el (w3m-session-automatic-save): Remove unused vars.
+	(w3m-session-select): Use next-command-event for XEmacs; clear the echo
+	area after entering command.
+
+2007-03-08  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (autoload): Add w3m-session-select, w3m-session-save and
+	w3m-session-automatic-save.
+	(w3m-lynx-like-map): Add w3m-session-select and w3m-session-save to
+	map.
+	(w3m-info-like-map): Ditto.
+	(w3m-arrived-shutdown-functions): Add w3m-session-automatic-save.
+	(w3m-quit): Call w3m-session-automatic-save.
+
+	* w3m-session.el: New file.
+
+2007-02-28  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-filter.el (w3m-filter-rules): Add rules for the site of Amazon
+	and Mixi.
+	(w3m-filter-amazon-regxp): New option.
+	(w3m-filter-amazon-short-url-bottom): Ditto.
+	(w3m-filter-google): Add doc-string.
+	(w3m-filter-amazon): New function.
+	(w3m-filter-mixi): New function.
+
+2007-02-24  Tatsuya Kinoshita  <tats@vega.ocn.ne.jp>
+
+	* Makefile.in, doc/Makefile.in (clean): Remove doc/version.texi.
+
+2007-02-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-decode-buffer): Improve further regexp matching urls
+	containing non-ASCII characters.
+
+2007-02-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-decode-buffer): Improve regexp matching urls containing
+	non-ASCII characters.
+
+2007-02-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-decode-buffer): Encode urls containing non-ASCII
+	characters.
+
+2007-02-06  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-decode-entities): Don't decode things like entities in
+	forms of the text or the select type having the name property.
+
+2007-02-05  Naohiro Aota  <nao.aota@gmail.com>
+
+	* w3m.el (w3m-fontify): Don't delete things like tags in forms of
+	type=text as well as of type=textarea.
+
+2007-02-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-arrived-intern): New macro, that normalizes urls by
+	stripping last `/'s.
+	(w3m-arrived-add, w3m-arrived-p, w3m-arrived-time)
+	(w3m-arrived-put, w3m-arrived-get): Use it.
+	(w3m-create-text-page): Make sure to set w3m-current-title.
+
+2007-02-04  David Hansen  <david.hansen@physik.fu-berlin.de>
+
+	* w3m.el (w3m-relationship-estimate-rules): Added
+	`w3m-relationship-slashdot-estimate'.
+	(w3m-relationship-slashdot-estimate): New function.
+
+2007-02-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-menu-on-forefront): New variable.
+	(w3m-setup-menu): Use it.
+
+	* w3m-e21.el (w3m-menu-on-forefront): New function.
+
+	* w3m-xmas.el (w3m-menu-on-forefront): New function.
+	(w3m-setup-menu): Use it.
+
+	* w3m-bookmark.el (w3m-setup-bookmark-menu): Don't arrange the order of
+	the menu items here.
+	* w3m-tabmenu.el (w3m-setup-tab-menu): Ditto.
+
+2007-02-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* Makefile.in, doc/Makefile.in: Add datarootdir setting that is
+	required for newer autoconfs.
+
+	* w3m.el (w3m-lynx-like-map, w3m-info-like-map): Use (featurep 'gtk)
+	instead of (boundp 'gtk-version-string); use down-mouse-3 instead of
+	mouse-3, and bind drag-mouse-3 and mouse-3 to undefined for GTK Emacs.
+
+	* w3m-e21.el (w3m-use-toolbar)
+	(w3m-toolbar-icon-preferred-image-types): Use (featurep 'gtk) instead
+	of (boundp 'gtk-version-string).
+	(w3m-toolbar-configurations): Select frame visiting buffer which is
+	about to apply configurations; use (featurep 'gtk) instead of \(boundp
+	'gtk-version-string); enable it for GTK Emacs; exclude
+	auto-resize-tool-bars and auto-raise-tool-bar-buttons.
+
+2007-01-31  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-clean-hook-options): Remove.
+
+2007-01-31  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-search.el (w3m-search-read-query): Check that face property is
+	`list' to avoid argument error.
+
+2007-01-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-define-w3m-make-ccl-coding-system): Rename from
+	w3m-xmas-define-w3m-make-ccl-coding-system.
+	(w3m-toolbar-make-buttons): Rename from w3m-xmas-make-toolbar-buttons.
+	(w3m-define-missing-widgets): Rename from
+	w3m-xmas-define-missing-widgets.
+	(w3m-show-current-title-in-buffer-tab): Rename from
+	w3m-xmas-show-current-title-in-buffer-tab.
+	(w3m-setup-tab-in-gutter): Rename from w3m-xmas-setup-tab-in-gutter.
+	(w3m-update-tab-in-gutter): Rename from w3m-xmas-update-tab-in-gutter.
+
+	* w3m-e21.el (w3m-toolbar-icon-preferred-image-types)
+	(w3m-toolbar-icon-preferred-image-types): Use w3m-update-toolbars
+	instead of w3m-setup-toolbar.
+	(w3m-toolbar-configurations): Rename from
+	w3m-e21-toolbar-configurations; make it customizable for LUCID Emacs.
+	(w3m-toolbar-define-keys): Rename from w3m-e21-setup-toolbar; don't
+	apply w3m-toolbar-configurations here.
+	(w3m-toolbar-make-buttons): Rename from w3m-e21-make-toolbar-buttons.
+	(w3m-toolbar-set-configurations): New function.
+	(w3m-setup-toolbar): Remove force argument; apply
+	w3m-toolbar-configurations here.
+	(w3m-update-toolbars): New function.
+	(w3m-switch-to-buffer): Rename from w3m-e21-switch-to-buffer.
+	(w3m-subst-switch-to-buffer-keys): Rename from
+	w3m-e21-subst-switch-to-buffer-keys.
+
+	* w3m.el (w3m-message): Clear previous message only if it is longer
+	than the window width and running Emacs 22 and greater.
+
+2007-01-29  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-toolbar-icon-preferred-image-types)
+	(w3m-toolbar-use-single-image-per-icon): New variables.
+	(w3m-find-image): New function.
+	(w3m-xmas-make-toolbar-buttons): Use it; add force argument.
+	(w3m-setup-toolbar): Use it; add force and buffer arguments.
+	(w3m-initialize-graphic-icons): Use it.
+
+	* w3m-e21.el (w3m-toolbar-icon-preferred-image-types)
+	(w3m-toolbar-use-single-image-per-icon): Apply customized value to tool
+	bar immediately.
+	(w3m-e21-make-toolbar-buttons, w3m-setup-toolbar): Add force arg.
+
+2007-01-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* icons/*.png, icons30/*.png: New files.
+
+	* Makefile.in (install-icons, install-icons30): Install png files.
+
+	* w3mhack.el (w3mhack-nonunix-install, w3mhack-make-package): Install
+	png files.
+	(w3mhack-what-where): Update for png files.
+
+	* w3m-e21.el (w3m-use-toolbar): Check whether tool-bar and
+	gtk-version-string are available.
+	(w3m-toolbar-icon-preferred-image-types)
+	(w3m-toolbar-use-single-image-per-icon): New variables.
+	(w3m-find-image): New function.
+	(w3m-e21-make-toolbar-buttons, w3m-setup-toolbar)
+	(w3m-initialize-graphic-icons): Use it.
+
+2007-01-24  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-halfdump-command-arguments): Generate the right values
+	for non-Mule XEmacs.
+
+2007-01-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-message): Clear previous message first.  Suggested by
+	David Hansen <david.hansen@gmx.net>.
+
+2007-01-18  Friedrich Delgado Friedrichs  <delgado@dfn-cert.de>
+
+	* w3m-proc.el (w3m-process-ssl-passphrase): New variable.
+	(w3m-process-filter): Enable w3m to authenticate itself with a client
+	certificate.
+
+2007-01-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el: Autoload iswitchb-read-buffer when compiling.
+
+2007-01-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el (w3m-e21-switch-to-buffer): Add iswitchb-mode support.
+
+2007-01-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-modeline-title): Don't use w3m-force-window-update which
+	obstructs viewing of large images.  Reported by Chris Moore
+	<dooglus@gmail.com>.
+
+2006-12-21  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-filter.el (w3m-filter-rules): Add rule for the site of Google.
+	(w3m-filter-google-use-utf8): New user option.
+	(w3m-filter-google-use-ruled-line): Ditto.
+	(w3m-filter-google): New function.
+
+2006-12-13  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-search.el (w3m-search-engine-alist): Fix amazon entry.
+
+2006-12-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* aclocal.m4 (AC_EXAMINE_PACKAGEDIR): Check for
+	(early|late|last)-package-hierarchies as well as
+	(early|late|last)-packages; prefer them to configure-package-path.
+
+2006-12-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-form.el: Changes to create a new session after submitting form.
+	(w3m-form-new-session): New variable.
+	(w3m-fontify-textareas, w3m-form-parse-and-fontify): Combine the above
+	variable into expressions which represent form actions.
+	(w3m-form-submit): Accept and optional argument `new-session'.
+
+	* w3m.el: Changes to create a new session after submitting form.
+	(w3m-submit-form): Accept and optional argument `new-session'.
+	`w3m-form-new-session' is binded locally.
+	(w3m-view-this-url): `w3m-form-new-session' is binded locally.
+
+2006-12-08  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-view-parent-page): Add prefix argument `TOP'. If TOP is
+	non-nil, visit the top of this site."
+	(w3m-parent-page-available-p): Fix regexp.
+
+2006-12-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* patches/README: Update.
+	* patches/italic-text.patch: New file.
+	* patches/dot-domain.patch: New file.
+	* patches/file-progress.patch: Renew.
+	* patches/w3m-0.2.1-inu-1.5-solaris-xemacs.patch: Remove.
+	* patches/no-proxy.patch: Remove.
+
+2006-12-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-italic-face): New face.
+	(w3m-fontify-italic): New function.
+	(w3m-fontify): Use it.
+
+2006-11-25  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* mew-w3m.el (w3m-mail-compose-with-mew): Refrain handling of
+	`current-prefix-arg'.
+
+2006-11-14  Ren Lifeng  <lfren@cad.zju.edu.cn>
+
+	* w3m-cookie.el (w3m-cookie-1-acceptable-p): Accept cookie whose domain
+	attribute is ".foo.barz.bar" from host "foo.barz.bar".
+	(w3m-cookie-retrieve): Send cookie whose domain attribute is
+	".foo.barz.bar" when requesting host "foo.barz.bar".
+
+2006-11-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-mail.el (w3m-mail-compose-with-vm): Require vm-startup.
+
+2006-11-20  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* w3m-mail.el (w3m-mail-compose-with-semi): Require mime-edit.
+
+2006-10-11  David Hansen  <david.hansen@physik.fu-berlin.de>
+
+	* w3m.el (w3m-relationship-estimate-rules): Support for google code
+	search added.
+
+2006-10-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el, w3m-bookmarks.el, w3m-search.el: Remove misadded Luca Capello
+	from the Authors field.
+
+2006-10-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-compatible-encoding-alist): Add iso-8859-8/windows-1255
+	and iso-8859-9/windows-1254.
+
+2006-10-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-mail.el (w3m-mail-compose-with-vm): Treat source as binary data
+	for images; encode source according to charset; use mail-send-actions
+	to kill source buffer.
+	(w3m-mail): Examine charset when the page is displayed normally.
+
+	* w3m-util.el (w3m-coding-system-to-mime-charset): Rename to
+	w3m-coding-system-to-charset and move to w3m.el
+
+	* w3m.el (w3m-coding-system-to-charset): Move from w3m-util.el.
+	(w3m-buffer): New function.
+
+2006-09-29  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-mail-user-agents): Add vm-user-agent.
+
+	* w3m-mail.el (w3m-mail-user-agent-compose-function-alist): Add
+	vm-user-agent.
+	(w3m-mail-compose-with-vm): New function.
+	(w3m-mail-goto-body-and-clear-body): New function.
+	(w3m-mail-position-point): New function.
+	(w3m-mail-compose-with-mml, w3m-mail-compose-with-semi): Use them.
+
+2006-09-29  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* mew-w3m.el (w3m-mail-compose-with-mew): Handle coding-system and
+	charset accurately. When call with `current-prefix-arg', try to use
+	existing draft buffer.
+
+	* w3m-mail.el (w3m-mail): Bind `w3m-history-reuse-history-elements' to
+	'reload.
+
+2006-09-29  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* w3m-mail.el (w3m-mail-compose-with-semi): Handle types other than
+	text/html as well. Decide the charset when the charset is nil though
+	the content-type is a text.
+
+2006-09-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-mail.el (w3m-mail-compose-with-mml): Treat source as binary data
+	for images (we will probably have to do so for some more types); pass
+	content-type argument to MML.
+
+2006-09-28  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-mail-user-agents): Add mew-user-agent.
+
+	* w3m-mail.el (top): Autoload w3m-mail-compose-with-mew
+	(w3m-mail-user-agent-compose-function-alist): Add mew-user-agent.
+	(w3m-mail-compose-with-mml): Add `content-type' argument
+	(w3m-mail-compose-with-semi): Ditto.
+	(w3m-mail): Handle `content-type' and `about://header/'.
+
+	* mew-w3m.el (w3m-mail-compose-with-mew): New function.  Add
+	`content-type' argument and handle it.
+
+2006-09-28  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* w3m-mail.el (w3m-mail-user-agent-compose-function-alist): Add
+	wl-user-agent.
+	(w3m-mail-compose-with-semi): New function.
+
+	* w3m.el (w3m-mail-user-agents): Add wl-user-agent.
+
+2006-09-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el (w3m-coding-system-to-mime-charset): New function.
+
+	* w3m-mail.el (w3m-mail-compose-with-mml): Bind gnus-newsgroup-name to
+	nil while composing mail if gnus-user-agent is used instead of removing
+	X-Draft-From header.
+	(w3m-mail): Use w3m-coding-system-to-mime-charset.
+
+2006-09-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-mail.el (w3m-mail-compose-with-mml): Remove X-Draft-From header;
+	make charset argument a string.
+	(w3m-mail): Make charset argument to be passed to composer a symbol.
+
+2006-09-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-mail.el: New file.
+
+	* w3m.el: Autoload w3m-mail.
+	(w3m-mail-user-agents): New variable.
+	(w3m-menubar): Add w3m-mail.
+
+2006-09-26  Luca Capello  <luca@pca.it>
+
+	* w3m-search.el (w3m-search-new-session): New command.
+	(w3m-search-read-variables): Ditto.
+	(w3m-search-do-search): Ditto.
+	(w3m-search): Rewrite to use the new commands above; add myself to the
+	authors list.
+
+	* w3m.el (autoload): Add w3m-search-new-session.
+	(w3m-menubar): Add w3m-search-new-session.
+	(w3m-info-like-map): Add w3m-search-new-session at the place of the
+	called-interactively w3m-search to be compliant with the other
+	*-new-session key-bindings.
+	(w3m-mode): Add description of w3m-search-new-session to docstring.
+
+2006-09-25  Luca Capello  <luca@pca.it>
+
+	* w3m-bookmark.el: Add myself to the authors list, forgotten when
+	submitting the patch for w3m-bookmark-view-new-session.
+
+	* w3m.el: Ditto.
+
+2006-09-22  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-e21.el (w3m-tab-make-keymap): Support mouse wheel on the tab.
+
+	* w3m-e23.el (w3m-tab-make-keymap): Ditto.
+
+2006-09-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-fb.el: Bind w3m-delete-buffer, w3m-fb-frame-parameter,
+	w3m-list-buffers, w3m-next-buffer, and w3m-pop-up-frames when
+	compiling.
+
+2006-09-16  David Hansen  <david.hansen@physik.fu-berlin.de>
+
+	* w3m.el (w3m-relationship-estimate-rules): Changed freshmeat URL
+	regexp.
+
+2006-09-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-lynx-like-map, w3m-info-like-map): Don't bind M-g key
+	because Emacs 22 uses it as a prefix command in global map.  Suggested
+	by David Hansen <david.hansen@gmx.net>.
+
+2006-09-09  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
+
+	* w3m-search.el (w3m-search-engine-alist): Instruct explicitly Google
+	to return English pages for google-en.
+
+2006-09-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-default-directory): New variable.
+	(w3m-current-directory): Use it.
+
+2006-09-05  David Hansen  <david.hansen@gmx.net>
+
+	* w3m.el (w3m-local-find-file-regexps): Default to '(nil
+	. "\\.[sx]?html?\\'").
+
+2006-08-31  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-enable-google-feeling-lucky): New variable.
+	(w3m-input-url): Disable the Google feeling lucky feature if it is nil.
+
+2006-08-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-show-decoded-url): Add entry for ohmynews.co.jp.
+
+2006-08-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-relationship-search-patterns): Call
+	`w3m-decode-anchor-string' in order to decode "&amp;" in anchor
+	strings.
+	(w3m-relationship-freshmeat-estimate): Removed.
+	(w3m-relationship-estimate-rules): Use
+	`w3m-relationship-simple-estimate' instead of the above, to simplify
+	related codes.
+
+2006-08-11  David Hansen  <david.hansen@pysik.fu-berlin.de>
+
+	* w3m.el (w3m-relationship-oddmuse-estimate): New function.
+	(w3m-relationship-freshmeat-estimate): New function.
+	(w3m-relationship-estimate-rules): Fixed regexp for google groups.
+	Added above new functions.
+
+2006-07-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el (w3m-truncate-string): Don't autoload mule-util.el.
+
+2006-06-19  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-tabmenu.el (w3m-tab-menubar-make-items-precbuf): New internal
+	variable.
+	(w3m-tab-menubar-make-items-prebuflst): Ditto.
+	(w3m-tab-menubar-make-items-preurl): Ditto.
+	(w3m-tab-menubar-make-items-preitems): Ditto.
+	(w3m-tab-menubar-make-items): Set an use previous variables to used for
+	the speed improvement.
+
+	* w3m-util.el (w3m-make-menu-commands-keys): New internal variable.
+	(w3m-make-menu-commands): Set and use `w3m-make-menu-commands-keys to
+	used for the speed improvement.
+
+2006-06-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* attic/rfc2368.el: Copy from Emacs 22; modify rfc2368-unhexify-string
+	to work with both Emacs and XEmacs.
+
+2006-05-31  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-view-this-url-1): Set 5th argument of `w3m-copy-buffer'
+	to `w3m-new-session-in-background'.
+	(w3m-copy-buffer): Add `background' argument. When URL is null and
+	`background' is not non-nil, stay the current buffer.
+
+2006-05-31  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-search.el (w3m-search-read-query): Ignore page title only in
+	w3m-mode buffers.
+
+2006-05-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-search.el (w3m-search-read-query): Assume there's not only a list
+	of faces but also just a face.
+
+2006-05-30  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+	* w3m.el (w3m-copy-buffer): Create empty w3m buffer when url is not
+	set.  Cause error on meaningless combination of arguments.
+
+2006-05-28  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-e21.el (w3m-tab-selected-background-face): New face.
+	(w3m-tab-separator): Put `mouse-face' for the shape of a mouse button.
+	(w3m-tab-line): Ditto.
+
+	* w3m-e23.el (w3m-tab-selected-background-face): New face.
+	(w3m-tab-separator): Put `mouse-face' for the shape of a mouse button.
+	(w3m-tab-line): Ditto.
+
+2006-05-26  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-tab-button-menu-commands): Disable same items if
+	`w3m-tab-button-menu-current-buffer' is nil.
+	(w3m-tab-button-menu2): New function.
+
+	* w3m-e21.el (top): Add the variables and function to avoid
+	byte-compile warnings.
+	(w3m-tab-drag-mouse-function): Support drag & drop to out of the
+	frame. Don't call `bury-buffer'.
+	(w3m-tab-click-mouse-function): Don't call `bury-buffer'.
+	(w3m-tab-double-click-mouse1-function): new function.
+	(w3m-tab-double-click-mouse2-function): Ditto.
+	(w3m-tab-make-keymap): Add some methods.
+
+	* w3m-e23.el (top): Add the variables and function to avoid
+	byte-compile warnings.
+	(w3m-tab-drag-mouse-function): Support drag & drop to out of the
+	frame. Don't call `bury-buffer'.
+	(w3m-tab-click-mouse-function): Don't call `bury-buffer'.
+	(w3m-tab-double-click-mouse1-function): new function.
+	(w3m-tab-double-click-mouse2-function): Ditto.
+	(w3m-tab-make-keymap): Add some methods.
+
+	* w3m.el (w3m-tab-button-menu-commands): Change position some items.
+
+2006-05-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el (w3m-widget-type-convert-widget): New function.
+
+	* w3m.el (w3m-home-page, w3m-new-session-url)
+	(w3m-uri-replace-alist): Use it.
+
+	* w3m-dtree.el (w3m-dtree-indent-strings, w3m-dtree-stop-strings): Use
+	it.
+
+	* w3m-symbol.el (w3m-symbol-custom-type): Use it.
+
+2006-05-21  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+	* w3m.el (autoload): `w3m-bookmark-view-new-sessiont' ->
+	`w3m-bookmark-view-new-session'.
+
+2006-05-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-home-page): Rewrite :convert-widget function.
+	(w3m-new-session-url): Ditto.
+
+2006-05-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-new-session-url): Doc fix; improve custom type.
+	(w3m-new-session-in-background): Doc fix.
+
+2006-05-19  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-new-session-url): Rename from
+	`w3m-tab-button-new-session-url'.
+	(w3m-tab-button-focus-new-tab): Delete.
+	(w3m-view-this-url-new-session-in-background): This option sets
+	obsolete.
+	(w3m-new-session-in-background): New option.
+	(w3m-menubar): Change and add Some items.
+	(w3m-copy-buffer): If call-interactively, set `just-copy' to `t'.  If
+	`w3m-new-session-in-background' and `just-copy' is non-nil, swith to
+	original buffer when finished.
+	(w3m-lynx-like-map): Add `w3m-bookmark-view-new-session'.
+	(w3m-tab-button-menu-commands): Use `w3m-new-session-in-background'
+	insted of `w3m-tab-button-focus-new-tab'.
+	(w3m-goto-new-session-url): New command.
+	(w3m-goto-url-new-session): Call `w3m-copy-buffer' with
+	`w3m-new-session-in-background'.
+	(w3m-select-buffer-generate-contents): Add prefix number to beginning
+	of title name.
+
+	* w3m-tabmenu.el (w3m-tab-menubar-items-sub-coeff): New variable.
+	(w3m-tab-menubar-items-width): Ditto.
+	(w3m-tab-menubar-make-items-1): New inline macro and trancate string of
+	tab's title if over `w3m-tab-menubar-items-width'.
+	(w3m-tab-menubar-make-items): Use `w3m-tab-menubar-make-items-1'.  If
+	the number of tabs over `(- (frame-height)
+	w3m-tab-menubar-items-sub-coeff)', make sub-menu.
+
+	* w3m-bookmark.el (w3m-bookmark-view-new-session): Use
+	w3m-view-this-url-1 instead of w3m-goto-url; warn if w3m-mode does not
+	run.
+	(w3m-bookmark-menu-items): Add w3m-bookmark-view-new-session.
+
+2006-05-18  Luca Capello  <luca@pca.it>
+
+	* w3m-bookmark.el (w3m-bookmark-view): Add docstring.
+	(w3m-bookmark-view-new-session): New command.
+
+	* w3m.el (autoload): Add docstring to w3m-bookmark-view; add
+	w3m-bookmark-view-new-session.
+	(w3m-menubar): Add Bookmark submenu and w3m-bookmark-view-new-session.
+	(w3m-info-like-map): Add w3m-bookmark-view-new-session.
+	(w3m-mode): Add description of w3m-bookmark-view-new-session to
+	docstring.
+
+2006-05-18  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-tab-button-focus-new-tab): New option.
+	(w3m-menubar): Add some items.
+	(w3m-external-view-this-url): New command.
+	(w3m-external-view-current-url): Ditto.
+	(w3m-tab-button-menu-commands): Use `w3m-tab-button-focus-new-tab' on
+	`w3m-goto-url-new-session' and `w3m-copy-buffer'.
+	(w3m-tab-button-menu): Make with `w3m-make-menu-commands'.
+
+	* w3m-util.el (top): Add the variable definition of `w3m-mode-map' to
+	avoid byte-compile warnings.
+	(w3m-make-menu-commands): New function.
+
+	* w3m-tabmenu.el (w3m-tab-menubar-make-items): Use
+	`w3m-make-menu-commands'.
+
+2006-05-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-view-url-with-external-browser): Add optional url
+	argument.
+	(w3m-tab-button-menu-commands): Make w3m-copy-buffer and
+	w3m-view-url-with-external-browser select the buffer; pass url to
+	w3m-view-url-with-external-browser.
+
+2006-05-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bookmark.el (w3m-bookmark-add-all-urls): New function.
+
+	* w3m.el: Autoload w3m-bookmark-add-all-urls.
+	(w3m-menubar): Add w3m-reload-all-pages.
+	(w3m-lynx-like-map): Add w3m-reload-all-pages and
+	w3m-bookmark-add-all-urls.
+	(w3m-info-like-map): Ditto.
+	(w3m-tab-button-menu-commands): Make it enable to pass arguments to
+	function items; use w3m-goto-url-new-session, w3m-reload-all-pages, and
+	w3m-bookmark-add-all-urls instead of lambda forms.
+	(w3m-tab-button-menu): Pass arguments to functions defined in
+	w3m-tab-button-menu-commands.
+	(w3m-mode): Add descriptions about w3m-reload-all-pages and
+	w3m-bookmark-add-all-urls to docstring.
+	(w3m-reload-all-pages): New function.
+
+2006-05-18  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-lynx-like-map): Define `w3m-mouse-major-mode-menu' to
+	mouse-3.
+	(w3m-info-like-map): Ditto.
+	(w3m-mouse-major-mode-menu): New command.
+
+	* w3m-util.el (top): Add the variable definition of
+	`w3m-use-japanese-menu' to avoid byte-compile warnings.
+	(w3m-make-menu-item): Change method to take measures for garbage
+	characters on XEmacs.
+
+	* w3m-bookmark.el (w3m-bookmark-make-item-xmas): New variable.
+	(w3m-bookmark-make-item): New inline macro.
+	(w3m-bookmark-make-menu-items): Use `w3m-bookmark-make-item'.
+
+2006-05-18  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-menubar): Use `w3m-make-menu-item'.
+	(w3m-tab-button-menu-current-buffer): Enable always.
+	(w3m-tab-button-menu-commands): Ditto. Use `w3m-make-menu-item'.
+
+	* w3m-util.el (w3m-make-menu-item): New function.
+
+	* w3m-tabmenu.el (w3m-tab-menubar-make-items): Handle
+	`w3m-tab-button-menu-commands' always.
+
+	* w3m-bookmark.el (w3m-bookmark-menu-items): Use `w3m-make-menu-item'.
+
+2006-05-17  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-use-japanese-menu): Change default value.
+	(w3m-menubar): Simplify the rule to use Japanese menu.
+	(w3m-tab-button-menu-commands): Ditto.
+
+	* w3m-bookmark.el (w3m-bookmark-menu-items): Simplify the rule to use
+	Japanese menu.
+
+2006-05-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-menubar): Escape the Japanese katakana `a' which breaks
+	the string syntax in non-Mule XEmacs.
+
+	* w3m-bookmark.el (w3m-bookmark-menu-items): Escape the Japanese kanji
+	`etsu' which breaks the string syntax in non-Mule XEmacs.
+
+2006-05-17  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-use-japanese-menu): New option.
+	(w3m-menubar): Add Japanese menu.
+	(w3m-tab-button-menu-commands): Change the way to check Japanse or
+	others.
+
+	* w3m-bookmark.el (w3m-bookmark-menu-items): Add Japanese menu.
+
+2006-05-17  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-tab-button-new-session-url): New option.
+	(w3m-delete-other-buffers): New command.
+	(w3m-delete-left-tabs): Ditto.
+	(w3m-delete-right-tabs): Ditto.
+	(w3m-delete-buffers): New function.
+	(w3m-lynx-like-map): Add `w3m-delete-left|right-tabs'.
+	(w3m-tab-button-menu-commands): New new items.
+
+	* w3m-util.el (w3m-lefttab-exist-p): New inline function.
+	(w3m-righttab-exist-p): Ditto.
+
+	* w3m-tabmenu.el (w3m-tab-menubar-make-items): Handle
+	`w3m-tab-button-menu-commands' if possible.
+
+2006-05-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-tab-button-menu-commands): New variable.
+	(w3m-tab-button-menu-current-buffer): New variable.
+	(w3m-tab-button-menu): New variable.
+	(w3m-tab-button-menu): New function.
+
+	* w3m-e21.el (w3m-tab-make-keymap): Bind mouse-3 to menu.
+
+2006-05-14  Tsuyoshi CHO  <tsuyoshi_cho@ybb.ne.jp>
+
+	* w3m.el (w3m-refontify-anchor): Improve parameter check.
+	(w3m-create-image-page): Use `w3m-add-face-property' instead
+	`put-text-property'/`add-text-properties'/`w3m-add-text-properties'.
+	(w3m-history-highlight-current-url): Ditto.
+	(w3m-header-line-insert): Ditto.
+
+	* w3m-search.el (w3m-search-read-query): Improve parameter check.
+
+	* w3m-lnum.el (w3m-link-numbering): Use `w3m-add-face-property' instead
+	`put-text-property'.
+
+	* w3m-form.el (w3m-form-make-button): Use `w3m-add-face-property'
+	instead `add-text-properties'.
+	(w3m-fontify-textareas): Ditto.
+	(w3m-form-parse-and-fontify): Ditto.
+
+	* w3m-e21.el,w3m-e23.el (w3m-form-make-button): Improve face property
+	append method.
+	(w3m-setup-header-line): Ditto.
+	(w3m-tab-line): Ditto.
+	(w3m-tab-separator): Modify `face' value to list.
+
+2006-05-11  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-search.el (w3m-search-engine-alist): Use utf-8 for google if
+	possible.
+
+2006-05-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-show-decoded-url): Add entry for hatena.ne.jp.
+
+2006-05-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* aclocal.m4 (AC_SET_VANILLA_FLAG): Add --no-unibyte option so as to
+	invalidate EMACS_UNIBYTE environment variable.
+
+2006-05-07  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-symbol.el: Bind w3m-use-symbol when compiling.
+	(w3m-use-symbol): New function.
+	(w3m-replace-symbol): Use it.
+
+	* w3m.el (w3m-use-symbol): Changed its default value when
+	w3m-output-coding-system is utf-8.
+
+2006-05-07  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-util.el (w3m-device-on-window-system-p): New function.
+	(w3m-popup-frame-p): Use it.
+
+	* w3m-search.el (w3m-search-engine-alist): Ditto.
+
+	* w3m.el (w3m-fontify-strike-through): Ditto.
+
+2006-05-06  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+	* w3m-search.el (w3m-search-engine-alist): Remove lycos-ja.
+
+2006-05-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-search.el (w3m-search-engine-history): New variable.
+	(w3m-search): Use it.
+
+2006-05-01  David Hansen  <david.hansen@gmx.net>
+
+	* w3m-search.el (w3m-search-engine-alist): Add freshmeat.
+
+2006-04-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-url-decode-string): Don't perform find-coding-system on a
+	list of coding system in XEmacs.
+
+2006-04-28  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-google-feeling-lucky-charset): New user option.
+	(w3m-canonicalize-url): Support search-keyword for "I'm Feeling Lucky
+	on Google". Add 2nd argument.
+	(w3m-input-url): Suport "I'm Feeling Lucky".  Add 5th argument
+	`feeling-lucky'.  Bind key to `self-insert-command' if `feeling-lucky'.
+	Call `w3m-canonicalize-url' with `feeling-lucky'.
+	(w3m-view-this-url): Call `w3m-input-url' with `feeling-lucky'.
+	(w3m-goto-url-new-session): Ditto.
+	(w3m): Ditto.
+
+2006-04-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el: Require APEL XEmacs package 1.32 and later.
+
+2006-04-22  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+	* w3m-search.el (w3m-search-engine-alist): Add msdn.
+
+2006-04-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-url-decode-string): Support non-Mule XEmacs
+	superficially.
+
+	* w3m-util.el (w3m-replace-in-string): Prefer replace-regexp-in-string
+	over of replace-in-string.  It was done in Gnus by Reiner Steib.
+
+2006-04-20  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* w3m-search.el (w3m-search-engine-alist): Fix url for ja.wikipedia.
+
+2006-04-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-search.el (w3m-search-engine-alist): Add ja.wikipedia.
+
+2006-04-20  David Hansen  <david.hansen@gmx.net>
+
+	* w3m-search.el (w3m-search-engine-alist): Add wikipedia, en.wikipedia
+	and de.wikipedia.
+
+2006-04-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-download): Clear minibuffer after y-or-n-p.
+
+2006-04-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* attic/vm-w3m.el (vm-w3m-use-w3m-minor-mode-map): New variable.
+	(vm-mime-display-internal-text/html): Use it.
+
+2006-04-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-url-decode-string): Make string unibyte before decoding.
+
+2006-03-16  Tsuyoshi CHO  <tsuyoshi_cho@ybb.ne.jp>
+
+	* w3m.el (w3m-data-retrieve): New function.
+	(w3m-attributes, w3m-retrieve): Add support `data:' scheme handled by
+	`w3m-data-retrieve'.
+
+2006-03-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-ccl.el (charset-id): Define it as a macro instead of an alias to
+	charset-id-internal if Emacs doesn't provide it.
+
+2006-03-12  Tsuyoshi CHO  <tsuyoshi_cho@ybb.ne.jp>
+
+	* w3m.el (w3m-insert-face): New face.
+	(w3m-fontify-insert): New variable.
+	(w3m-fontify-insert): New function.
+	(w3m-fontify): Add calling `w3m-fontify-insert'.
+
+2006-02-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-decode-buffer): Decode buffer's string outside the
+	buffer.
+
+2006-02-26  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-w3m-parse-header): When the url matchs to ftp, rewrite
+	type and charset.
+	(w3m-w3m-attributes-1): Don't rewrite type and charset.
+	(w3m-w3m-retrieve): Don't check status code when the url does not match
+	to http.
+
+2006-02-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-url-components-regexp): Move to w3m-util.el.
+	(w3m-fontify-anchors, w3m-canonicalize-url, w3m-add-referer-p)
+	(w3m-expand-url, w3m-view-this-url-1, w3m-goto-url)
+	(w3m-goto-url-new-session): Use w3m-string-match-url-components rather
+	than to run string-match with w3m-url-components-regexp.
+	cf. <URL:http://emacs-w3m.namazu.org/ml/msg08412.html>.
+
+	* w3m-form.el (w3m-form-normalize-action): Ditto.
+
+	* w3m-cookie.el (w3m-parse-http-url): Ditto.
+
+	* w3m-util.el (w3m-string-match-url-components-1): New function.
+	(w3m-url-components-regexp): Move from w3m.el.
+	(w3m-string-match-url-components): New macro.
+
+2006-01-19  Tsuyoshi CHO  <tsuyoshi_cho@ybb.ne.jp>
+
+	* w3m.el (w3m-fontify-strike-through): Improve matching point.
+
+2006-01-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* doc/Makefile.in: Add rules to make pdf files.
+
+	* configure.in: Check for dvipdfmx and texi2pdf.
+
+2005-12-31  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-util.el (top): Add the variable definition of `w3m-mode-hook' to
+	avoid byte-compile warnings.
+
+2005-12-30  Tsuyoshi CHO  <tsuyoshi_cho@ybb.ne.jp>
+
+	* w3m.el (w3m-fontify-strike-through): Fix multi `<del>' problem.
+
+2005-12-23  Matt Hodges  <MPHodges@member.fsf.org>
+
+	* w3m-util.el (w3m-list-buffers): Ensure disabling the w3m-fb-mode
+	after a careless (setq w3m-fb-mode t).
+
+2005-12-22  Tsuyoshi CHO  <tsuyoshi_cho@ybb.ne.jp>
+
+	* w3m-antenna.el (w3m-antenna-refresh-interval): Add new customize
+	variable.
+	(w3m-antenna-make-contents): Add new generation rule for refresh
+	interval replacing `%R' to META Refresh tag and contents value are
+	`w3m-antenna-refresh-interval'.
+	(w3m-antenna-html-skelton): Add %R rule.
+
+2005-12-19  Matt Hodges  <MPHodges@member.fsf.org>
+
+	* w3m-util.el (w3m-list-buffers): Further fix against the case where
+	someone did (setq w3m-fb-mode t).
+
+2005-12-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-fb.el (w3m-fb-mode): Never activate w3m-fb-mode if
+	w3m-pop-up-frames is non-nil.
+
+	* w3m-util.el (w3m-list-buffers): Reset w3m-fb-mode if it seems to have
+	been set thoughtlessly.
+
+2005-12-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-fb.el: Don't require w3m.
+	(w3m-fb-frame-parameter): Always define.
+	(w3m-fb-delete-frame-functions): Ditto.
+	(w3m-fb-select-buffer): Fix the 2nd clause of cond.
+	(w3m-fb-advised-functions): Remove.
+	(w3m-list-buffers): Move advice code to w3m-fb.el.
+	(w3m-close-window): Move advice code to w3m.el.
+	(w3m-delete-buffer): Ditto.
+	(w3m-quit): Ditto.
+	(w3m-fb-mode): Remove w3m-fb-advised-functions stuff.
+
+	* w3m.el (w3m-fb): Require.
+	(w3m-delete-buffer, w3m-quit, w3m-close-window): Merge the codes which
+	were formerly provided as advices in w3m-fb.el.
+
+	* w3m-util.el (w3m-fb-list-buffers-frame, w3m-fb-mode): Bind them when
+	compiling.
+	(w3m-fb-frame-parameter): Autoload.
+	(w3m-list-buffers): Merge the code which was formerly provided as an
+	advice in w3m-fb.el.
+
+2005-11-26  Matt Hodges  <MPHodges@member.fsf.org>
+
+	* w3m-fb.el: New file.
+
+2005-12-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-form.el (w3m-form-submit): Use the post method for the
+	multipart/form-data enctype according to the proposal of RFC2070 even
+	if the form specifies the get method.
+
+2005-11-24  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-form.el (w3m-form-submit): If anchor exists, go to the uri.
+
+2005-11-21  Tsuyoshi CHO  <tsuyoshi_cho@ybb.ne.jp>
+
+	* w3m-favicon.el (w3m-favicon-type): Renew default image type list.
+
+2005-11-19  Tsuyoshi CHO  <tsuyoshi_cho@ybb.ne.jp>
+
+	* w3m.el (w3m-menubar): Renew enable/disable condition for `[Copy This
+	Session]',`[Download This URL]', and Append `[Toggle This Image]'.
+
+	* w3m-bookmark.el (w3m-bookmark-menu-items): Renew enable/disable
+	condition for `[Add This URL to Bookmark]'.
+
+2005-11-16  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-open-all-links-in-new-session): Reverse the list of URLs.
+
+2005-10-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el (w3m-tab-drag-mouse-function): Lower the buffer displayed
+	before moving to the other tab.
+	(w3m-tab-click-mouse-function): Ditto.
+
+2005-10-17  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-util.el (w3m-add-face-property): Simplified.
+
+2005-10-15  Tsuyoshi CHO  <tsuyoshi_cho@ybb.ne.jp>
+
+	* w3m-util.el (w3m-add-face-property): Add new functions.
+	(w3m-remove-face-property): Ditto.
+
+	* w3m.el (w3m-fontify-bold, w3m-fontify-underline)
+	(w3m-fontify-strike-through, w3m-fontify-anchors)
+	(w3m-fontify-images): Replace `w3m-add-text-properties' to
+	`w3m-add-face-property' at FACE.
+	(w3m-refontify-anchor): Change for FACE properly is list type.
+
+2005-10-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el (w3m-insert-image): Make it work with a face text property
+	whose value is a list.
+	(w3m-remove-image): Remove useless text property.
+	* w3m-e23.el (w3m-insert-image,w3m-remove-image): Same as w3m-e21.el's
+	modification.
+
+2005-09-29  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-proc.el (w3m-process-filter): Fixed regexp.
+
+2005-09-27  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-proc.el (w3m-process-filter): Remove SSL warning message for
+	basic authentication over SSL.
+
+2005-09-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-fontify): Remove empty lines at the beginning of the
+	buffer (see the comment).
+
+2005-09-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mime-w3m.el (mime-w3m-preview-text/html): Revert.
+
+2005-09-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mime-w3m.el (mime-w3m-preview-text/html): Bind w3m-treat-image-size
+	to avoid inserting excessive newlines.
+
+2005-09-18  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
+
+	* w3m.el (w3m-relationship-estimate-rules): Add a rule for Google Blog
+	Search.
+
+	* w3m-search.el (w3m-search-engine-alist): Use
+	`http://blogsearch.google.com/' instead of `http://search.blogger.com/'
+	for "blog-*" search, because search.blogger.com does not have a
+	explicit link to previous search result page.
+
+2005-09-16  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-redisplay-this-page): Use the cache always.
+
+2005-09-15  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
+
+	* w3m-search.el (w3m-search-engine-alist): Add "blog-*" entries.
+
+2005-09-02  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+	* doc/ptexinfmt.el: Support @frenchspacing, @euro, @sansserif.
+	(texinfo-format-ordf): Fix typo.
+
+2005-09-01  Hiroshi Fujishima  <hiroshi.fujishima@gmail.com>
+
+	* w3m-search.el (w3m-search-engine-alist): Update goo-ja, waei, eiwa,
+	kokugo URL.
+
+2005-08-29  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-ucs.el: Enable XEmacs 21.5-Mule to compile it anyway.
+
+2005-08-29  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-fontify-anchors): Put the encoded anchor names instead of
+	the itself.
+
+2005-08-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* octet.el (octet-insert-buffer): Use insert-buffer-substring instead
+	of insert-buffer.
+
+	* w3m-bookmark.el (w3m-about-bookmark): Ditto.
+
+	* w3m-proc.el (w3m-process-sentinel): Ditto.
+
+2005-07-29  Kevin Rodgers  <kevin.rodgers@ihs.com>
+
+	* w3m.el (w3m-content-type-alist): Add the text/sgml entry.
+
+2005-07-29  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-scroll-up-1): New function.
+	(w3m-lynx-like-map): Use it for the J command.
+	(w3m-scroll-up-or-next-url): Use it.
+
+2005-07-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-current-message): New internal variable.
+	(w3m-message): Use the above variable to keep the last displayed
+	message, to decide that this function can override the current message
+	in the echo area.
+	(w3m-make-help-echo): Use `message' instead of `w3m-message' to clear
+	the echo area in the foreground context.
+	(w3m-quit): Ditto.
+	(w3m-goto-ftp-url): Ditto.
+	(w3m-select-buffer-show-this-line-and-switch): Ditto.
+
+	* w3m-proc.el (w3m-process-background): New internal variable.
+	(w3m-process-sentinel): Set t to the above variable.
+
+2005-07-13  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-message): Bury messages when the cursor in the echo area
+	which is used by `y-or-n-p' etc.
+	(w3m-view-parent-page): Refer both `start' link element and `content'
+	start element before checking a parent URL.
+
+2005-07-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bookmark.el (w3m-bookmark-menu-dummy-item): Remove.
+	(w3m-bookmark-menubar-dummy): Remove.
+	(w3m-bookmark-menu-items): Also define the menu for the case where
+	w3m-bookmark-mode is turned on.
+	(w3m-setup-bookmark-menu): Rewrite it so as to work properly with Emacs
+	22.
+	(w3m-bookmark-menubar-update): Ditto; remove the iswitchb section.
+	(w3m-bookmark-make-menu-items): Return nil if there's no bookmark.
+
+	* w3m-tabmenu.el (w3m-tab-menubar-dummy): Remove.
+	(w3m-setup-tab-menu): Rewrite it so as to work properly with Emacs 22.
+	(w3m-tab-menubar-update): Ditto; remove the iswitchb section.
+
+2005-07-11  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-bookmark.el (w3m-bookmark-buffer): Disable undo before modify the
+	buffer.
+	(w3m-bookmark-menu-items-pre): New variable.
+	(w3m-bookmark-menu-items-time): Ditto.
+	(w3m-bookmark-make-menu-items): Use previous items if it available.
+
+2005-07-09  Tsuyoshi CHO  <tsuyoshi_cho@yahoo.co.jp>
+
+	* w3m-xmas.el (top): Add `w3m-setup-bookmark-menu' to autoload list at
+	compiled time.
+	(w3m-setup-menu): Append bookmark menu setup calling.
+
+	* w3m-bookmark.el (top): Add requirement `easymenu' and
+	`easy-menu-remove-item' autoload at compiled time.
+	(w3m-bookmark-menu-open-new-session): Add new customize variable.
+	(w3m-bookmark-menu-dummy-item): Add new const variable.
+	(w3m-bookmark-menubar-dummy): Ditto.
+	(w3m-bookmark-menu-items): Ditto, Define Bookmark const menu items.
+	(w3m-setup-bookmark-menu): Add new autoload function.
+	(w3m-bookmark-menubar-update): Add new function.
+	(w3m-bookmark-iterator): Ditto.
+	(w3m-bookmark-menu-open-item): Ditto.
+	(w3m-bookmark-make-menu-items): Ditto.
+
+	* w3m.el (top): Add `w3m-setup-bookmark-menu' to autoload list at
+	compiled time.
+	(w3m-menubar): Remove "Bookmark" menu item.
+
+2005-07-08  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-print-current-url): Bind deactivate-mark.
+	(w3m-print-this-url): Ditto.
+
+2005-07-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-check-current-position): Bind deactivate-mark.  (cf.
+	http://news.gmane.org/group/gmane.emacs.pretest.bugs/thread=8335).
+
+2005-07-05  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
+
+	* ChangeLog: Add file local variables to set fill-column 74 and
+	indent-tabs-mode t.
+
+2005-07-03  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
+
+	* w3m-search.el (w3m-search-engine-alist): Add "technorati-*" entries.
+
+2005-07-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el (w3m-which-command): Make sure the command is not a
+	directory.  cf. <URL:http://emacs-w3m.namazu.org/ml/msg08113.html>.
+
+2005-06-26  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
+
+	* w3m.el (w3m-relationship-estimate-rules): Add a rule for Yahoo Search
+	Beta.
+
+2005-06-26  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
+
+	* w3m.el (w3m-relationship-estimate-rules): Improve regexp for Google
+	in order to make the scroll-to-next-page feature work on Google News as
+	well.
+
+2005-06-26  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
+	    TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-search.el (w3m-search-engine-alist): Add Yahoo Beta.
+
+2005-06-18  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
+
+	* w3m-search.el (w3m-search-engine-alist): Search Google News in US by
+	"google news-en".
+
+2005-06-17  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
+
+	* w3m-search.el (w3m-search-engine-alist): Add "google news" entry.
+
+2005-06-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* aclocal.m4 (AC_PATH_EMACS): Check whether XEmacs works with the shy
+	group regexp and runs call-process-region correctly.
+
+	* w3m-perldoc.el (w3m-about-perldoc): Don't relieve buggy XEmacs 21.5
+	for call-process-region.
+
+	* w3m-xmas.el (w3m-fix-gif): Ditto.
+	(w3m-initialize-graphic-icons): Ditto.
+
+	* w3m.el (w3m-decode-encoded-contents): Ditto.
+	(w3m-x-moe-decode-buffer): Ditto.
+	(w3m-rendering-half-dump): Ditto.
+
+	* w3mhack.el: Advise byte-optimize-form-code-walker to avoid the
+	``...called for effect'' warnings for Emacs 21.4 as well as 21.3; don't
+	relieve buggy XEmacs 21.5 for call-process-region.
+
+2005-06-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	Make emacs-w3m not support the XEmacs versions older than 21.4.17
+	or 21.5-b19.
+
+	* aclocal.m4 (AC_PATH_EMACS): Check whether XEmacs runs the timer
+	functions correctly.
+
+	* w3m-util.el (w3m-cancel-refresh-timer): Use delete-itimer instead of
+	cancel-timer under XEmacs.
+
+	* w3m-xmas.el (call-process-region): Don't advise it.
+	(w3m-run-at-time): Remove.
+
+	* w3m.el (w3m-refresh-at-time): Use run-at-time instead of
+	w3m-run-at-time.
+
+	* w3mhack.el (w3mhack-byte-optimize-letX): Doc fix.
+
+2005-06-09  Tsuyoshi CHO  <tsuyoshi_cho@ybb.ne.jp>
+
+	* w3m.el: Update my mail address.
+
+2005-06-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-antenna.el (w3m-antenna-mapcar): Remove unused temp var.
+
+	* w3m-bookmark.el (w3m-bookmark-buffer): Remove
+	file-coding-system-for-read.
+
+	* w3m-form.el (w3m-form-input-textarea-save): Remove
+	file-coding-system.
+	(w3m-form-input-textarea): Ditto.
+
+	* w3m-image.el (w3m-imagick-convert-buffer): Remove file-coding-system.
+	(w3m-imagick-start-convert-buffer): Remove file-coding-system and
+	jam-zcat-filename-list.
+
+	* w3m.el (w3m-load-list): Remove file-coding-system-for-read.
+	(w3m-save-list): Remove file-coding-system.
+	(w3m-local-retrieve): Remove file-coding-system-for-read and
+	jam-zcat-filename-list.
+	(w3m-download): Remove file-coding-system and jam-zcat-filename-list.
+	(w3m-copy-buffer): Remove unused temp var.
+
+	* w3mhack.el (w3mhack-byte-optimize-letX): Remove file-coding-system,
+	file-coding-system-for-read and pathname-coding-system.
+
+2005-06-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el (w3m-replace-in-string): Don't use eval-and-compile.
+	(w3m-compare-strings): Ditto.
+	(w3m-force-window-update): Alias to ignore if it is not defined.
+	(w3m-force-window-update-later): New function.
+
+	* w3m-favicon.el (w3m-favicon-retrieve): Use
+	w3m-force-window-update-later.
+
+	* w3m-proc.el (w3m-process-stop): Use w3m-force-window-update-later.
+
+	* w3m.el (w3m-retrieve-and-render): Use w3m-force-window-update-later.
+	(w3m-select-buffer-show-this-line): Always run w3m-force-window-update.
+
+2005-06-09  Masatake YAMATO  <jet@gyve.org>
+
+	* w3m-e21.el (w3m-initialize-graphic-icons): Highlight icon under
+	mouse.
+
+2005-06-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el (w3m-tab-mouse-face): New face.
+	(w3m-setup-header-line): Use highlight face for bg color.
+	(w3m-tab-line): Use w3m-tab-mouse-face.
+
+2005-06-08  Masatake YAMATO  <jet@gyve.org>
+
+	* w3m-e21.el (w3m-setup-header-line): Highlight url under mouse.
+	(w3m-tab-line): Highlight tab under mouse.
+
+2005-05-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el (w3m-run-mode-hooks): New function.
+
+	* w3m-form.el (w3m-form-input-select-mode): Use it.
+	(w3m-form-input-map-mode): Use it.
+
+	* w3m.el (w3m-mode): Use it.
+
+2005-05-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el (w3m-truncate-string): Autoload mule-util for
+	truncate-string-to-width.
+
+2005-05-26  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+	* w3m.el (w3m-safe-view-this-url): `unsecure' -> `insecure'.
+	(w3m-safe-toggle-inline-image): Ditto.
+	(w3m-safe-toggle-inline-images): Ditto.
+
+2005-05-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-menubar): Add the "Close Other Sessions" button.
+	(w3m-delete-other-buffers): Run w3m-force-window-update.
+
+2005-05-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* attic/vm-w3m.el (vm-w3m): Provide the feature.
+
+	* attic/vm-7.19.patch: New file.
+
+2005-05-12  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-open-all-links-in-new-session): Fix regexp.
+
+2005-05-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bookmark.el (w3m-about-bookmark): Use shy group in regexp.
+
+	* w3m-cookie.el (w3m-cookie-two-dot-domains-regexp): Ditto.
+	(w3m-cookie-set): Ditto.
+
+	* w3m-dtree.el (w3m-dtree-directory-name): Ditto.
+	(w3m-about-dtree): Ditto.
+
+	* w3m-favicon.el (w3m-favicon-setup): Ditto.
+
+	* w3m-namazu.el (w3m-about-namazu): Ditto.
+
+	* w3m-proc.el (w3m-process-filter): Ditto.
+
+	* w3m-rss.el (w3m-rss-parse-date-string): Ditto.
+
+	* w3m-util.el (w3m-html-string-regexp): Remove useless quotes.
+	(w3m-parse-attributes): Don't use old fashioned backquotes; use shy
+	group in regexp.
+	(w3m-url-authinfo-regexp): Use shy group in regexp.
+
+	* w3m-weather.el (w3m-weather-completion-table): Ditto.
+	(w3m-weather-area-completion): Ditto.
+
+	* w3m-xmas.el (w3m-fix-gif): Ditto.
+
+	* w3m.el: Use shy group in regexp when examining w3m-command.
+	(w3m-content-type-alist): Use shy group in regexp.
+	(w3m-show-decoded-url): Ditto.
+	(w3m-add-referer): Ditto.
+	(w3m-relationship-estimate-rules): Ditto.
+	(w3m-arrived-ignored-regexp): Ditto.
+	(w3m-history-ignored-regexp): Ditto.
+	(w3m-url-to-file-name): Ditto.
+	(w3m-fontify-strike-through): Ditto.
+	(w3m-fontify): Ditto.
+	(w3m-url-completion): Ditto.
+	(w3m-gmane-url-at-point): Ditto.
+	(w3m-cache-header-delete-variable-part): Ditto.
+	(w3m-cache-available-p): Ditto.
+	(w3m-decode-buffer): Ditto.
+	(w3m-local-dirlist-cgi): Ditto.
+	(w3m-w3m-canonicalize-url): Ditto.
+	(w3m-additional-command-arguments): Ditto.
+	(w3m-download): Ditto.
+	(w3m-check-header-tags): Ditto.
+	(w3m-retrieve-and-render): Ditto.
+	(w3m-create-text-page): Ditto.
+	(w3m-view-this-url): Ditto.
+	(w3m-open-all-links-in-new-session): Ditto.
+	(w3m-external-view-file): Ditto.
+	(w3m-edit-url): Ditto.
+	(w3m-convert-ftp-url-for-emacsen): Ditto.
+	(w3m-goto-url): Ditto.
+	(w3m-goto-url-new-session): Ditto.
+	(w3m-about-db-history): Ditto.
+	(w3m-history-highlight-current-url): Ditto.
+
+	* w3mhack.el: Fix the section adding dirs to load-path.
+	(w3mhack-make-package): Use shy group in regexp.
+	(w3mhack-makeinfo): Ditto.
+
+2005-05-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* Makefile.in (clean): Don't remove w3m-kwds.el.
+	(.el.elc): Use batch-byte-compile instead of w3mhack-batch-compile.
+	(very-slow): Don't run keywords.
+	(keywords): Remove.
+
+	* aclocal.m4 (AC_PATH_EMACS): Don't support Emacs 19 and 20.
+	(AC_PATH_LISPDIR): Follow the change of the EMACS_FLAVOR value.
+	(AC_PATH_ICONDIR): Ditto.
+	(AC_CHECK_ELISP): Remove.
+	(AC_CHECK_XML): Remove.
+
+	* configure.in: Don't check for regexp-opt; don't run AC_CHECK_XML.
+
+	* mime-w3m.el (mime-w3m-mode-map): Remove.
+	(mime-w3m-local-map-property): Remove.
+	(mime-w3m-preview-text/html): Don't use it.
+
+	* octet.el (octet-decode-image): Ignore Emacs 19 and 20.
+
+	* w3m-bitmap.el: Remove.
+
+	* w3m-bookmark.el (w3m-bookmark-sections): Use point-at-eol.
+	(w3m-bookmark-safe-string): Don't support Mule 2.3.
+	(w3m-bookmark-current-number): Use point-at-eol.
+	(w3m-bookmark-kill-entries): Use point-at-bol.
+
+	* w3m-bug.el: Don't require w3m-om or w3m-e19.
+
+	* w3m-ccl.el: Don't require w3m-om.
+
+	* w3m-e19.el: Remove.
+
+	* w3m-e20.el: Remove.
+
+	* w3m-hist.el: Don't load w3m-kwds.el.
+
+	* w3m-lnum.el (w3m-link-numbering): Don't support Emacs 20.
+
+	* w3m-om.el: Remove.
+
+	* w3m-proc.el: Don't require w3m-om or w3m-e19.
+
+	* w3m-search.el (w3m-search-read-query): Use point-at-bol.
+
+	* w3m-ucs.el: Ignore Emacs 20.
+
+	* w3m-util.el: Don't load w3m-kwds.el; don't support Emacs 19.
+	(w3m-use-tab-p): Ignore Emacs 19 and 20.
+	(w3m-popup-window-p): Ditto.
+	(w3m-add-w3m-initial-frames): Don't support Emacs 19.
+	(after-make-frame-hook): Don't use it.
+	(delete-frame): Don't advise it for Emacs 19 or 20.
+	(w3m-truncate-string): Don't support Emacs 19 and 20.
+	(w3m-default-face-colors): Remove.
+	(w3m-replace-in-string): Don't support Emacs 19 and 20.
+
+	* w3m-xmas.el (w3m-should-unoptimize-animated-gifs): Default to always
+	t.
+	(w3m-make-glyph): Use string-to-number instead of string-to-int.
+
+	* w3m.el: Don't require w3m-e20, w3m-om or w3m-e19.
+	(emacs-w3m-version): Reset to 1.4.50.
+	(w3m-language): Ignore Mule 2.3.
+	(w3m-history-current-url-face): Don't require wid-edit.
+	(w3m-bold-face): Don't use w3m-default-face-colors.
+	(w3m-underline-face): Ditto.
+	(w3m-strike-through-face): Ditto.
+	(w3m-use-symbol): Ignore Emacs 19 and 20.
+	(w3m-show-decoded-url): Ditto.
+	(w3m-use-tab): Doc fix.
+	(w3m-entity-alist): Don't support Mule 2.3.
+	(w3m-make-help-echo): Ignore Emacs version.
+	(w3m-toggle-inline-images-internal): Ignore bitmap images.
+	(w3m-resize-inline-image-internal): Don't support Emacs 19 and 20.
+	(w3m-url-at-point): Always use ffap.
+	(w3m-about-retrieve): Consider base64 codec is always available.
+	(w3m-close-window): Don't support Emacs 19 and 20.
+	(w3m-store-current-position): Use point-at-bol and point-at-eol.
+	(w3m-buffer-setup): Ditto.
+	(w3m-make-separator): Don't support Mule 2.3.
+	(w3m-select-buffer-current-buffer): Use point-at-bol.
+	(w3m-header-line-insert): Don't support Emacs 19 and 20.
+
+	* w3mhack.el: Consider w3mhack-batch-compile is not used.
+	(locate-library): Don't redefine it for Emacs 19.
+	(APEL): Don't check for it for Emacs.
+	(w3mhack-colon-keywords-file): Remove.
+	(w3mhack-module-list): Ignore Emacs 19, 20, old XEmacsen and
+	BITMAP-MULE.
+	(w3mhack-shimbun-modules-using-rss): Remove.
+	(current-column): Don't take care of it for old Emacsen.
+	(w3mhack-compile): Don't run w3mhack-check-colon-keywords-file.
+	(w3mhack-batch-compile): Remove.
+	(w3mhack-nonunix-install): Ignore Emacs 19 and 20.
+	(custom-declare-variable): Don't take care of it for Emacs 19.
+	(locate-library): Ditto.
+	(w3mhack-generate-colon-keywords-file): Remove.
+	(w3mhack-check-colon-keywords-file): Remove.
+	(w3mhack-load-path): Ignore Emacs 19, 20 and old XEmacsen.
+	(w3mhack-makeinfo): Ignore Mule 2.3.
+
+	* attic/regexp-opt.el: Remove.
+
+	* attic/xml.el: Remove.
+
+	* patches/mule-2.3@19.34.patch: Remove.
+
+2005-04-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-remove-invisible-image-alt): New function.
+	(w3m-rendering-buffer): Use it.
+
+2005-04-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-decode-buffer): Decode "\240" into "&nbsp;".
+
+2005-04-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-decode-buffer): Decode `&#nnn;' entities in 128..159.
+
+2005-04-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-detect-xml-charset): Return nil if the data don't look
+	like xml contents.
+	(w3m-compatible-encoding-alist): New variable.
+	(w3m-decode-buffer): Always use w3m-detect-xml-charset; use a
+	compatible encoding according to w3m-compatible-encoding-alist.
+
+	* w3m-xmas.el (w3m-find-coding-system): Don't return binary for the nil
+	argument.
+
+
+2005-03-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* Release emacs-w3m-1.4.4 from emacs-w3m-1_4 branch.
+
+2005-03-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-setup-toolbar): Make sure icon files exist.
+	(w3m-update-toolbar): Make sure toolbar items have been specified.
+	(w3m-initialize-graphic-icons): Make sure icon files exist.
+
+	* w3m-e21.el (w3m-setup-toolbar): Make sure icon files exist.
+	(w3m-initialize-graphic-icons): Ditto.
+
+2005-03-23  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Makefile.in (tarball): Remove `w3m-e23.el' instead of `w3m-e22.el'.
+
+	* w3m.el (w3m-url-readable-string): Decide a scheme to guess encodings
+	based on the target URL, instead of the current URL.
+	(w3m-show-decoded-url): Doc fix to follow the above change.
+	(w3m-copy-buffer): Do not set `w3m-current-url' and
+	`w3m-current-coding-system'.
+	(w3m-goto-url-new-session): Simplified.
+
+2005-03-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el (display-images-p): Remove alias.
+
+2005-03-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* Makefile.in (very-slow): Don't mv non-existent files.
+
+	* w3m-e19.el (easy-menu-remove-item): Don't autoload it.
+
+	* w3m-om.el (easy-menu-remove-item): Ditto.
+
+	* w3m-rss.el (match-string-no-properties): Avoid warning for Emacs 19
+	and XEmacs.
+	(split-string): Avoid warning for Emacs 19.
+
+	* w3m-symbol.el: Require cl when compiling.
+
+	* w3m-tabmenu.el (easy-menu-remove-item): Aautoload it for Emacs 19.
+
+	* w3m.el: Autoload widget-get to avoid compile warning for Emacs 19.
+	(w3m): Remove unused bound variable.
+
+	* w3mhack.el: Bind executable-binary-suffixes to the proper value for
+	OS/2 and emx while checking for the shell command; cause an error only
+	when compiling or formatting files.
+
+	* attic/addpath.el: Make it work with old Emacsen even if cl is not
+	loaded; load custom, bind defcustom'ed variables and make the
+	locate-library function run quietly for Emacs 19; synch the code
+	testing the shell command with w3mhack.el.
+	(char-after): Add a byte-optimizer for Emacs 19.
+
+	* w3m-ccl.el: Load w3m-om instead of autoloading it for charset-id.
+
+	* w3m-util.el: Load cl independently when compiling.
+
+2005-03-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el: Check whether the shell command can be used.
+
+	* attic/addpath.el: Ditto; add early-package-load-path to load-path for
+	XEmacs 21.5.
+
+2005-03-17  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-favicon.el: Add autoload of `w3m-url-readable-string'.
+
+2005-03-17  Tsuyoshi CHO  <tsuyoshi_cho@ybb.ne.jp>
+
+	* w3m.el (w3m-check-header-tags): Check abnormal `base' url.
+
+2005-03-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el: Add early-package-load-path to load-path for XEmacs 21.5.
+
+	* w3m-xmas.el: Fbind coding-system-type to ignore if it is void.
+
+2005-03-15  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-form.el (w3m-form-mee-new): Display clear signs of coding-system
+	for `w3m-url-decode-string'.
+	(w3m-form-mee-select-value): Ditto.
+	(w3m-form-parse-and-fontify): Ditto.
+
+	* w3m.el (w3m-decode-buffer): Decode the buffer within buffer set the
+	`multibyte'.
+
+2005-03-13  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+	* doc/emacs-w3m-ja.texi (Sport Sites Supported by Shimbun): Update.
+
+	* doc/emacs-w3m.texi (Sport Sites Supported by Shimbun): Ditto.
+
+2005-03-12  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+	* doc/emacs-w3m-ja.texi (Sport Sites Supported by Shimbun): Update.
+
+	* doc/emacs-w3m.texi (Sport Sites Supported by Shimbun): Ditto.
+
+2005-03-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el: Load w3m-e23.el(c) that exists in the same directory as
+	w3m.el(c) so as to exclude ones in other places; report the precise
+	error message if it doesn't exist.
+
+2005-03-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-decode-coding-string-with-priority): Ignore
+	`undecided' so as not to use it for the priority list.
+
+2005-03-10  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-fsf.el (w3m-detect-coding-region): Guard error for `undecided'.
+
+2005-03-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el: Remove the byte-optimizer which replaces truncate-string
+	with truncate-string-to-width.
+
+2005-03-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-modeline-title): Replace truncate-string-to-width with
+	w3m-truncate-string.
+
+	* w3m-util.el (w3m-truncate-string): Use truncate-string-to-width if it
+	is available.
+
+2005-03-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-info-like-map): Bind the `y' key to the
+	w3m-print-current-url command; bind the `Y' key to the
+	w3m-print-this-url command; don't bind the `c' key.
+
+2005-03-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-make-help-echo): Fix the backquote form.
+	(w3m-make-balloon-help): Ditto.
+
+	* w3m-util.el (w3m-set-match-data): Use existing markers.
+
+2005-03-04  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-url-readable-string): Save matching data.  Check whether
+	`w3m-current-url' is string before checking it.
+	(w3m-goto-url-new-session, w3m-copy-buffer): Call `w3m-goto-url' with
+	`redisplay' option to enforce redisplaying the certain content.
+
+	* w3m-favicon.el (w3m-favicon-retrieve): Decode an URL when displaying
+	it.
+
+	* w3m-form.el (w3m-form-input-textarea-mode-setup): An expression is
+	evaluated without checking type, and save matching data.
+
+2005-03-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-url-readable-string): Check whether
+	`w3m-current-coding-system' is valid before calling
+	`w3m-url-decode-string'.
+	(w3m-local-dirlist-cgi, w3m-w3m-dump-extra): Use
+	`w3m-url-readable-string'.
+	(w3m-copy-buffer): Copy all buffer-local variables, and do not cancel
+	them even if `empty' option is set.
+	(w3m-display-progress-message): Import from w3m-util.el to suppress
+	byte-compile warnings.
+
+	* w3m-util.el (w3m-parse-attributes): Accept XHTML format of boolean
+	atttibutes.
+	(w3m-display-progress-message): Export to w3m.el.
+
+2005-03-03  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-url-readable-string): An expression is evaluated without
+	checking type.
+
+2005-03-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-show-decoded-url): Update its customize spec to use it as
+	the rule set to decode URIs when displaying them.  Changed its default
+	value.
+	(w3m-url-readable-string): New function to process the above option.
+	(w3m-make-help-echo, w3m-make-balloon-help): Do not accept `url-decode'
+	option, and use the above function to decore URIs.
+	(w3m-fontify-anchors): Follow the above change.
+	(w3m-print-current-url, w3m-print-this-url): Call the above function.
+	(w3m-make-url-decode-function): Removed.
+	(w3m-entity-alist, w3m-about-history): Remove redundant `function'.
+	For more detail, see http://www.mew.org/~kazu/doc/elisp/function.html.
+
+2005-03-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-modeline-title-string): New variable.
+	(w3m-modeline-title-timer): New variable.
+	(w3m-modeline-title): New function used to truncate the title string
+	not to cut the right end of the mode line.  Works only with Emacs 22
+	and newer.
+	(w3m-buffer-setup): Use it.
+
+2005-03-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-make-help-echo): Make it work with XEmacs.
+	(w3m-make-balloon-help): Support decoding URIs.
+	(w3m-fontify-anchors): Make the balloon-help show decoded URIs.
+
+2005-03-02  ARISAWA Akihiro  <ari@mbf.ocn.ne.jp>
+
+	* w3m.el (w3m-show-decoded-url): New user option.
+	(w3m-make-url-decode-function): New inline function.
+	(w3m-make-help-echo): Use it.
+	(w3m-fontify-anchors): The function of help-echo property has an
+	ability to decode url.
+
+2005-03-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-decode-coding-string-with-priority): New function.
+
+	* w3m.el (w3m-url-decode-string): Use it.
+
+2005-03-01  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-w3m-attributes-1): Support `300 Multiple Choices'.
+	(w3m-w3m-retrieve): Ditto.
+	(w3m-w3m-retrieve-1): Ditto.
+
+2005-02-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-detect-coding-region): Use the name of the coding
+	system instead of the coding category if it is void.
+
+	* w3m-util.el (w3m-set-match-data): New macro which converts points
+	into markers under XEmacs.
+	(w3m-search-tag-1): Use it.
+
+	* w3m-e19.el: Autoload easymenu in order to avoid compile warning.
+	* w3m-om.el: Ditto.
+
+2005-02-25  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (all): Use `w3m-form-set-number' and `w3m-form-kill-buffer'
+	instead of `w3m-form-textarea-set-number' and
+	`w3m-form-textarea-kill-buffer'
+
+	* w3m-form.el (w3m-form-input-select-urlid): New buffer local variable.
+	(w3m-form-input-map-urlname): Ditto.
+	(w3m-form-set-number): Rename from `w3m-form-textarea-set-number' and
+	treate buffers of `select' and `map'.
+	(w3m-form-kill-buffer): Ditto.
+	(w3m-form-input-select-set): Allways remove own buffer.
+	(w3m-form-input-select-exit): Ditto.
+	(w3m-form-input-map-set): Ditto.
+	(w3m-form-input-map-exit): Ditto.
+	(w3m-form-input-select): When exists same from buffer, use it.
+	(w3m-form-input-map): Ditto.
+
+2005-02-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-what-where): Fix the form.
+	(w3mhack-makeinfo): Silence it when formatting @multitable section.
+
+2005-02-25  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (top): Add autoloads of `w3m-form-textarea-kill-buffer' and
+	`w3m-form-textarea-set-number' to avoid byte-compile warnings.
+	(w3m-delete-buffer): Call `w3m-form-textarea-kill-buffer' when use
+	form.
+	(w3m-delete-other-buffers): Ditto.
+	(w3m-quit): Ditto.
+	(w3m-select-buffer-delete-buffer): Ditto.
+	(w3m-pack-buffer-numbers): Call `w3m-form-textarea-set-number' when use
+	form.
+
+	* w3m-form.el (top): Move all buffer local variables on the top to
+	avoid byte-compile warnings.
+	(w3m-form-parse-and-fontify): Set `w3m-form-use-textarea-backup-p' to
+	nil.
+	(w3m-form-input-textarea-save): Use `w3m-form-use-textarea-backup-p'
+	instead of `w3m-form-use-textarea-backup'.
+	(w3m-form-input-textarea-set): Allways remove textarea buffer and
+	window.
+	(w3m-form-input-textarea-exit): Ditto.
+	(w3m-form-input-textarea): Check to call for backup. Check identity of
+	existed textarea buffer and w3m buffer. Treat
+	`w3m-form-use-textarea-backup-p'.
+	(w3m-form-use-textarea-backup-p): New function.
+	(w3m-form-textarea-set-number): Ditto.
+	(w3m-form-textarea-kill-buffer): Ditto.
+	(w3m-form-submit-get-textarea-files): If no backup, return nil.
+
+2005-02-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el: Autoload cancel-timer for XEmacs.
+
+	* w3m-xmas.el (w3m-run-at-time): Use run-at-time which comes from
+	timer-funcs.el if it seems to work correctly.
+	(cancel-timer): Defun if it is void.
+
+2005-02-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* doc/ptexinfmt.el (texinfo-multitable-widths): Reverse the logic that
+	shows whether it is broken.
+
+	* w3m-util.el: Autoload regexp-opt for Emacs 19.
+
+	* w3mhack.el (w3mhack-makeinfo): Load poe for Emacs 19.
+
+2005-02-24  Romain Francoise  <romain@orebokech.com>
+
+	* w3m.el (w3m-lynx-like-map): Bind [follow-link] so as to make mouse-1
+	work in Emacs 22 like mouse-2.
+	(w3m-info-like-map): Ditto.
+
+2005-02-23  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-antenna.el (w3m-antenna-check-rss): Parse all date fields.
+
+2005-02-21  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-form.el (w3m-form-input-textarea): Fix.
+
+2005-02-21  Tsuyoshi CHO  <tsuyoshi_cho@ybb.ne.jp>,
+	Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-form.el (w3m-form-input-textarea-mode-setup): Fix.
+	(w3m-form-input-textarea): Follow the above change.
+
+2005-02-21  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-form.el (w3m-form-textarea-edit-mode): Changed its default value
+	to `text-mode'.
+
+2005-02-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* Makefile.in (install-package): Change the default directory in which
+	icon files will be installed from `etc/w3m/icons/' into
+	`etc/images/w3m/' following the most recent Emacs and Gnus.
+	(install-package-ja): Ditto.
+
+	* aclocal.m4 (AC_EXAMINE_PACKAGEDIR): Use configure-package-path.
+	(AC_PATH_ICONDIR): Change the default directory in which icon files
+	will be installed from `etc/w3m/icons/' into `etc/images/w3m/'
+	following the most recent Emacs and Gnus.
+
+	* w3m.el (w3m-icon-directory): Improve the way to determin the default
+	value.
+
+	* w3mhack.el (w3mhack-nonunix-install): Change the default directory in
+	which icon files will be installed from `etc/w3m/icons/' into
+	`etc/images/w3m/' following the most recent Emacs and Gnus.
+	(w3mhack-make-package): Ditto.
+	(w3mhack-what-where): Ditto.
+
+2005-02-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-lnum.el: Rename from w3m-link-numbering.el.
+
+	* mime-w3m.el: Load mime-parse.el before mime.el and w3m.el when
+	compiling rather than always loading mime.el and w3m.el.
+
+2005-02-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-form.el: Changes to define `w3m-form-input-textarea-mode' as a
+	minor mode.
+	(w3m-form-textarea-edit-mode): New option.
+	(w3m-form-input-textarea-map): Renamed from
+	`w3m-form-input-textarea-keymap'.
+	(w3m-form-input-textarea-mode) [variable]: New internal variable.
+	(w3m-form-input-textarea-mode) [function]: Reconstructed.
+	(w3m-form-input-textarea-mode-setup): New function.
+	(w3m-form-input-textarea): Clean up.
+
+2005-02-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* aclocal.m4 (AC_PATH_EMACS): Show the correct Emacs version.
+
+	* mime-w3m.el: Always require mime and w3m instead of to autoload
+	mime-parse.el.
+
+	* w3m-bitmap.el: Bind w3m-work-buffer-list when compiling.
+
+	* w3m-proc.el: Silence the byte compiler complaining against gensym.
+
+	* w3m-rss.el: Use eval-and-compile in order to autoload timezone.el.
+
+	* w3m.el (w3m-treat-drive-letter): Use eval-and-compile.
+	(w3m-touch-file-available-p): Move forward.
+	(w3m-touch-file): Ditto.
+	(w3m-expand-path-name): Use eval-and-compile.
+	(w3m-window-hscroll): Ditto.
+	(w3m-current-column): Ditto.
+	(w3m-set-window-hscroll): Ditto.
+	(w3m-add-local-hook): Silence the byte compiler.
+	(w3m-run-at-time): Use eval-and-compile.
+
+	* w3mhack.el: Remove the code used to silence the byte compiler which
+	complains make-local-hook is obsolete.
+	(w3mhack-makeinfo): Silence XEmacs when formatting Infos.
+
+	* octet.el: Require cl when compiling.
+	* w3m-filter.el: Ditto.
+	* w3m-fsf.el: Ditto.
+	* w3m-link-numbering.el: Ditto.
+	* w3m-namazu.el: Ditto.
+
+2005-02-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el: Load w3m-e23.el for Emacs 23.
+
+	* w3mhack.el (w3mhack-module-list): Use w3m-e23.el for Emacs 23.
+
+	* w3m-e23.el: Rename from w3m-e22.el.
+
+2005-02-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el: Load w3m-e21.el even if the version of Emacs is 22.x when the
+	Emacs CVS HEAD is used.
+
+	* w3mhack.el (w3mhack-module-list): Prefer w3m-e21.el rather than
+	w3m-e22.el if the Emacs CVS HEAD is used.
+
+2005-02-06  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-antenna.el (w3m-antenna-html-skelton): Fix typo.
+	(w3m-antenna-make-contents): Replace %D to the modified time of
+	`w3m-antenna-file'.
+
+2005-02-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-gmane-url-at-point): New function.
+	(w3m-url-at-point): Use it.
+
+2005-01-30  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+	* w3m.el (w3m-attributes): Support cid urls.
+	(w3m-external-view): Ditto.
+
+2005-01-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el (w3m-force-window-update): Make it work whatever the value
+	for the resize-mini-windows variable is.
+	(w3m-update-tab-line): Ditto.
+
+2005-01-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-rss.el (w3m-rss-parse-date-string): Support the date format in
+	the RFC822 style which RSS 2.0 allows.  Suggested by David Hansen
+	<david.hansen@physik.fu-berlin.de>.
+
+2005-01-23  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-e21.el (w3m-force-window-update, w3m-update-tab-line): Call
+	`enlarge-window' before calling `shrink-window', in order to avoid
+	deleting sole window.
+
+2005-01-19  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-content-type-alist): Check if "fiber.exe" is exist.
+
+2005-01-17  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-form.el (w3m-form-parse-and-fontify): Check if w3m-current-url is
+	available.
+
+2004-07-24  Tsuyoshi CHO  <mfalcon_sky@emailuser.net>
+
+	* w3m.el (w3m-menubar): Rearrange it hierarchical.
+	(w3m-setup-menu): Use easymenu.
+
+2005-01-10  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-form.el (w3m-form-input-textarea): Modify string of the inquiry.
+
+2005-01-07  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-goto-url): Call `w3m-form-textarea-files-remove' if
+	necessary.
+
+	* w3m-util.el (w3m-compare-strings): New define.
+
+	* w3m-form.el (w3m-form-textarea-file-expire-date): Modify Document.
+	(w3m-fontify-textareas): Put `w3m-form-file-name' property.
+	(w3m-form-textarea-files, w3m-form-textarea-post-files): New buffer
+	local variable.
+	(w3m-form-parse-and-fontify): Set `w3m-form-textarea-files'. Put
+	`w3m-form-file-name' property on the form of textarea.
+	(w3m-form-input-textarea): Use same textarea buffer if exist.  Don't
+	ask user if don't modify its area without tailed white space.  Visible
+	the editted text when ask user. Guard against 'C-g'.  Added
+	`w3m-form-textarea-file-cleanup' to hook as `kill-emacs-hook'
+	(w3m-form-textarea-same-check): New function.
+	(w3m-form-textarea-file-cleanup): Remove myself from `kill-emacs-hook'.
+	(w3m-form-textarea-files-remove): New function.
+	(w3m-form-submit-get-textarea-files): Ditto.
+	(w3m-form-submit): Set `w3m-form-textarea-post-files' for removing
+	files.
+	(w3m-form-resume): Check `selects' is cons.
+
+2005-01-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* doc/Makefile.in (.texi.info): Set LC_ALL=C.
+
+2004-12-29  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-quit): Call `w3m-form-textarea-file-cleanup'.
+	(w3m-view-this-url-1): Revert final change.
+
+	* w3m-form.el (w3m-form-textarea-file-expire-date): New user option.
+	(w3m-form-textarea-file-cleanup): New function.
+
+2004-12-28  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-form.el (w3m-form-use-textarea-backup): New user option.
+	(w3m-form-textarea-directory): Ditto.
+	(w3m-form-get-coding-system): New function.
+	(w3m-form-make-form-data): Use `w3m-form-get-coding-system'.
+	(w3m-form-input-textarea-keymap): Define "C-xC-s" to
+	`w3m-form-input-textarea-save'.
+	(w3m-form-input-textarea-file): New variable.
+	(w3m-form-input-textarea-coding-system): Ditto.
+	(w3m-form-input-textarea-filename): New function.
+	(w3m-form-input-textarea-save): Ditto.
+	(w3m-form-input-textarea-set): Call `w3m-form-input-textarea-save'.
+	(w3m-form-input-textarea-exit): Ditto.
+	(w3m-form-input-textarea-mode): Modify doc-string.
+	(w3m-form-input-textarea): Handling filename and coding-system.
+
+2004-12-27  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-view-this-url-1): Revert 2004-12-17 change.  The buffer
+	seems empty killed before to restore window configuration.  Restore the
+	position and window-start if last window equal current-window.
+
+2004-12-24  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-hist.el (w3m-history-restore-position): Handling the window of
+	w3m for sure absolutely.
+
+2004-12-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-makeinfo): Revert.
+
+2004-12-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-makeinfo): Bind undo-outer-limit.
+
+2004-12-17  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-fontify-anchors): Local file is given special treatment
+	for `href'. Fix match data of `href'.
+	(w3m-view-this-url-1): If the points of window was treated in
+	w3m-goto-url(), now reconstruct window configuration.
+
+2004-12-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el (w3m-update-tab-line): Wobble the window size instead of
+	setting the cursor color.
+
+2004-12-15  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-namazu.el (w3m-namazu): Added optional argument `reload'.
+
+2004-12-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el (w3m-tag-regexp-of): Remove.
+	(w3m-search-tag-1): New function.
+	(w3m-search-tag): New macro.
+
+	* w3m-form.el (w3m-form-parse-and-fontify): Use w3m-search-tag instead
+	of w3m-tag-regexp-of.
+
+2004-12-10  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-fontify-anchors): Use 'w3m-name-anchor2 property to avoid
+	overriding 'w3m-name-anchor property.
+	(w3m-search-name-anchor): Search 'w3m-name-anchor2 property if not
+	detect 'w3m-name-anchor property.
+
+2004-12-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-form.el (w3m-form-parse-and-fontify): Ignore a select form in the
+	case where w3mmee is running if its value is not specified.  Reported
+	by Clemens Fischer <ino-qc@spotteswoode.de.eu.org>.
+
+	* w3mhack.el (labels): Remove.
+
+2004-11-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (labels): A temporary substitution against the Emacs CVS
+	bug.
+
+2004-11-26  TSUCHIYA Masatoshi  <tsuchiya@pine.kuee.kyoto-u.ac.jp>
+
+	* w3m-form.el (w3m-form-resume): Check whether a form exists, before
+	resuming its values from its history.
+
+2004-11-21  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-rss.el: New file.
+
+	* w3m-antenna.el (w3m-antenna-check-rss): New function.
+	(w3m-antenna-sites): Improve its customize spec to support
+	`w3m-antenna-check-rss'.
+
+	* w3m.el (w3m-content-type-alist): Add text/xml, application/xml,
+	application/rdf+xml, and application/rss+xml.
+	(w3m-detect-xml-charset): New function.
+	(w3m-decode-buffer): Use the above function when decoding XML contents.
+
+2004-11-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-redisplay-this-page): Don't make a new history.
+
+2004-11-17  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-output-coding-system): Use `utf-8' if Emacs has internal
+	utf-8 only.
+	(w3m-input-coding-system): Revert last change.
+	(w3m-halfdump-command-arguments): Bind `fix_width_conv' and
+	`use_jisx0201' when w3m-m17n.
+
+2004-11-16  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-input-coding-system): Use `utf-8' if Emacs has internal
+	utf-8, it has no Mule-UCS and w3m-type is `w3m-m17n'.
+
+2004-11-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-form.el (w3m-char-to-int, w3m-string-to-char-list,
+	w3m-int-to-char): Silence byte-compiler.
+	* w3m-ccl.el (charset-id): Ditto.
+
+	* w3m-tabmenu.el (w3m-tab-menubar-update): Don't let iswitchb manage
+	the w3m tab menubar.
+
+2004-10-27  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-check-refresh-attribute): Support own page reload.
+	(w3m-goto-url-with-timer): Ditto.
+
+2004-10-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* aclocal.m4 (AC_ADD_LOAD_PATH): Clarify the error message.
+
+2004-10-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (call-process-region): Add an advice in order to fix an
+	XEmacs 21.5.18 bug.
+	* w3mhack.el (call-process-region): Ditto.
+
+2004-10-25  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-check-refresh-attribute): Fix to analyze the URL.
+
+2004-10-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-touch-file): Protect against the absence of
+	file-name-coding-system and default-file-name-coding-system.
+
+2004-10-20  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-buffer-setup): Modify `mode-line-buffer-identification';
+	display "Loading..." instead of `w3m-current-titile' when process of
+	w3m active.
+
+2004-10-16  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-touch-file): Use `set-file-times' if available; bind
+	`coding-system-for-write' while calling `w3m-touch-command'.
+
+2004-10-08  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-perldoc.el (w3m-perldoc-input-coding-system)
+	(w3m-perldoc-output-coding-system): New options.
+	(w3m-about-perldoc): Use the above options, to display both modules
+	encoded in EUC-JP and ones encoded in UTF-8 correctly.
+
+2004-10-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el (w3m-tab-line): Replace "%" with "%%" in
+	w3m-tab-line-format.
+
+2004-10-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-retrieve): Add autoload cookie.
+
+2004-10-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-search.el (w3m-search-engine-alist): Add the parameter
+	`ie=Shift_JIS' to Google for Japanese users.
+
+2004-09-21  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-antenna.el (w3m-about-antenna): Revert 2004-09-16 change.
+
+2004-09-16  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-antenna.el (w3m-about-antenna): Change the method to compare an
+	arrived time to a last-modified time.
+
+2004-09-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-goto-url): Don't make a new history when reloading.
+	(w3m-reload-this-page): Ditto.
+
+	* w3m-hist.el (w3m-history-restore-position): Don't cause an error even
+	if a page has shrunk.
+
+
+2004-08-17  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Release emacs-w3m-1.4.3 from emacs-w3m-1_4 branch.
+
+2004-08-15  Kazuhiro UCHIDA  <kayoujin@yahoo.co.jp>
+
+	* w3m.el (w3m-remove-meta-charset-tags): Check that a content field has
+	a valid value before parsing it.
+
+2004-08-12  Romain Francoise  <romain@orebokech.com>
+
+	* w3m.el (w3m-relationship-estimate-rules): Improve regexp for Google
+	in order to make the scroll-to-next-page feature work on Google Groups
+	as well.
+
+2004-08-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-relationship-estimate-rules): Fix regexp for Google.
+	Suggested by Romain Francoise <romain@orebokech.com>.
+
+2004-08-02  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+	* doc/ptexinfmt.el (slanted): Rename @s to @slanted.
+
+2004-07-30  Romain Francoise  <romain@orebokech.com>
+
+	Enable emacs-w3m to be built with Emacs --without-x.
+
+	* w3m-e21.el (image-size): Alias to ignore if it is not available.
+
+	* w3m-favicon.el (w3m-favicon-type): Don't use image-types if it is not
+	available.
+
+	* w3m.el (mouse-set-point): Autoload mouse.elc.
+
+2004-07-20  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+	* doc/ptexinfmt.el: Support @s.
+
+
+2004-07-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Release emacs-w3m-1.4.2 from emacs-w3m-1_4 branch.
+
+	* w3m.el (w3m-w3m-canonicalize-url): Revival.
+	(w3m-w3m-attributes, w3m-w3m-retrieve): Call the above.
+	(w3m-canonicalize-url): Do not check a slash.
+
+2004-07-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-detect-meta-charset): Check that a content field has a
+	valid value before parsing it.
+
+2004-07-08  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+	Suggested by Tatsuya Kinoshita <tats@vega.ocn.ne.jp>
+
+	* w3m.el (w3m-correct-charset-alist): Reverse "windows-125x" and
+	"cp125x".
+
+
+2004-07-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Release emacs-w3m-1.4.1 from emacs-w3m-1_4 branch.
+
+2004-07-06  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-weather.el: Reconstructed to follow the change of site design.
+	(w3m-weather-completion-table, w3m-weather-filter-functions): Update.
+	(w3m-weather-extract-contents, w3m-weather-adjust-contents): New
+	functions.
+	(w3m-weather-remove-headers, w3m-weather-remove-footers,
+	w3m-weather-get-seikatu-sisu, w3m-weather-insert-seikatu-sisu):
+	Removed.
+
+2004-06-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-canonicalize-url): Don't make sure arg is a string.
+	(w3m-input-url): Don't use w3m-canonicalize-url for non-string url
+	which may be the symbol popup.
+
+2004-06-25  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-canonicalize-url): New function.
+	(w3m-input-url, w3m-browse-url): Call the above.
+	(w3m-w3m-canonicalize-url): Abolished.
+	(w3m-w3m-attributes, w3m-w3m-retrieve): Do not call the abolished
+	function.
+	(w3m-url-hierarchical-schemes): Add `ftps'.
+
+2004-06-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el (w3m-add-w3m-initial-frames): Share the opened frame in
+	w3m-initial-frames over all emacs-w3m buffers if w3m-use-tab is
+	non-nil.
+	(w3m-delete-w3m-initial-frames): New function; add it to
+	delete-frame-functions or delete-frame-hook, or merge into delete-frame
+	using defadvice.
+	(w3m-delete-frames-and-windows): Return to the former buffer after
+	performing walk-windows; don't manage w3m-initial-frames.
+
+	* w3m.el (w3m-delete-buffer): Don't manage w3m-initial-frames.
+
+2004-06-14  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+	* w3m.el (TopLevel): Display meaningful message when w3m-command is
+	nil.
+
+2004-06-21  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-fontify): Call `w3m-replace-symbol' before
+	`w3m-fontify-anchors' in order not to lose text properties.
+
+2004-06-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m): Run w3m-mode before popping to the newly created buffer
+	up.
+
+2004-06-12  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-output-coding-system): Change default value for w3m-m17n.
+
+	* w3m-bug.el (report-emacs-w3m-bug-system-informations): Add
+	w3m-input-coding-system and w3m-output-coding-system.
+
+2004-06-11  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-meta-content-type-charset-regexp)
+	(w3m-meta-charset-content-type-regexp)
+	(w3m-meta-refresh-content-regexp)
+	(w3m-meta-content-refresh-regexp): Removed.
+	(w3m-detect-meta-charset, w3m-remove-meta-charset-tags)
+	(w3m-check-refresh-attribute): Use `w3m-parse-attributes' instead of
+	above regexp.
+	(w3m-rendering-buffer): Don't call `w3m-remove-meta-charset-tags' for
+	w3m-m17n.
+
+2004-06-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-make-new-session): Doc fix.
+	(w3m-safe-view-this-url): Use w3m-goto-url-new-session only when a user
+	invokes this command in a buffer not being running the w3m-mode.
+
+2004-06-07  Masatake YAMATO  <jet@gyve.org>
+
+	* w3m-hist.el (w3m-history-store-position): Fix a wrong message.
+
+2004-06-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-filter.el (w3m-filter-rules): Relax the condition.
+
+2004-06-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-make-new-session): Doc fix.
+	(w3m-safe-view-this-url): Use w3m-goto-url-new-session instead of
+	w3m-goto-url when w3m-make-new-session is non-nil.
+
+2004-06-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-make-new-session): New user option.
+	(w3m): Make a new emacs-w3m buffer if w3m-make-new-session is non-nil
+	and a user specifies a url string.
+
+2004-06-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el (w3m-popup-buffer): Don't use focus-frame in Emacs.
+
+2004-06-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-proc.el (w3m-process-wait-discard-input): Abolish.
+	(w3m-process-wait-process): Don't use accept-process-output to make it
+	possible to show progress messages; discard key press events while
+	waiting for finishing of a process.
+
+2004-05-24  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-form.el (w3m-form-put-by-name): Overwrite ID value when a name is
+	found.
+
+2004-05-22  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-fontify): Remove tags in the form element except for
+	textarea.
+
+2004-05-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+	Suggested by Yoichi NAKAYAMA <yoichi@geiin.org>
+
+	* w3m-util.el (w3m-replace-in-string): New function which is a copy of
+	shimbun-replace-in-string.
+	* w3m.el (w3m-active-region-or-url-at-point): Use it; remove all
+	whitespace in region.
+
+2004-05-18  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* mew-w3m.el (mew-w3m-view-inline-image): Bind mew-use-text/html as t.
+
+2004-05-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-home-page): Improve the customizing widget.
+
+2004-05-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-expand-url): Bind file-name-handler-alist as nil.
+
+2004-05-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-arrived-ignored-regexp): Add about:blank.
+	(w3m-history-ignored-regexp): Ditto.
+	(w3m-about-retrieve): Ditto.
+	(w3m-buffer-setup): Prefer the last visited emacs-w3m buffer.
+
+2004-05-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-filter.el (w3m-filter-rules): Update its default value and its
+	customize spec.
+
+2004-05-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-w3m-dump-extra): Examine image data briefly to detect
+	only gif, jpeg and png by itself.
+
+	* w3m-util.el (w3m-image-type-from-data): Abolish.
+
+2004-05-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-w3m-dump-extra): Check only 300 bytes at the top of the
+	data.
+
+2004-05-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el (w3m-image-type-from-data): New function.  Suggested by
+	KOSEKI Yoshinori <kose@meadowy.org>.
+
+	* w3m.el (w3m-w3m-dump-extra): Use it.
+
+2004-05-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-proc.el (w3m-process-start-process): Use
+	set-process-query-on-exit-flag if it is available.
+
+	* w3m.el (w3m-w3m-dump-extra): Trust the magic at the beginning of
+	image data rather than the content-type header.
+
+2004-05-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-copy-buffer): Prefer cached contents without checking
+	their validity.
+
+2004-05-01  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-proc.el (w3m-process-waited): Revival.
+	(w3m-process-with-wait-handler): Set t to the above.
+
+	* w3m.el (w3m-w3m-dump-extra): Check the above.
+
+2004-04-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (emacs-w3m-version): Reset.
+
+
+2004-04-29  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Release emacs-w3m-1.4 from emacs-w3m-1_4 branch.
+
+	* Makefile.in (install-package): Install w3m-load.el.
+	(dist, tarball): Reimplemented, in order to keep time stamps of source
+	files.
+
+	* w3mhack.el (w3mhack-generate-xemacs-load-file): Simplified.
+
+2004-04-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-generate-xemacs-load-file): Replace
+	`replace-string' with basic functions.
+
+2004-04-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3mhack.el (w3mhack-generate-xemacs-load-file): New function.
+	(w3mhack-make-package): Use `w3mhack-generate-xemacs-load-file.
+
+2004-04-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-update-files-autoloads): New function.
+	(w3mhack-generate-load-file): Use `w3mhack-update-files-autoloads'.
+
+2004-04-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Makefile.in (tarball): Remove w3m-kwds.el and w3m-load.el.
+
+	* configure.in, aclocal.m4: Add `--with-xml' option.
+
+	* w3mhack.el (w3mhack-module-list): New function.
+	(w3mhack-examine-modules): Use the above.
+	(w3mhack-compile): Use `w3mhack-module-list' instead of
+	`w3mhack-examine-modules'.
+	(w3mhack-generate-load-file): Likewise; Insert ^L to avoid an error of
+	`update-file-autoloads' of old emacsen.
+
+2004-04-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-treat-image-size): Default to t.
+
+	* w3m-filter.el (w3m-filter-asahi-shimbun): Use marker to limit the
+	search bound.
+
+2004-04-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-generate-load-file): Save w3m-load.el file before
+	performing `update-file-autoloads'.
+
+2004-04-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Makefile.in (install-lisp): Do not install w3mhack.el.
+	(install-package): Install neither w3mhack.el nor w3m-load.el.
+
+2004-04-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-treat-image-size): Default to nil.
+	(w3m-rendering-half-dump): Fix a logic determining whether to specify
+	`-ppl' and `-ppc' options to the w3m command.
+
+2004-04-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3mhack.el: Create w3m-load.el.
+	(w3mhack-load-file): New variable.
+	(w3mhack-examine-modules): Ignore `w3mhack-load-file'.
+	(w3mhack-generate-load-file): New function.
+	(w3mhack-compile): Call the above.
+
+	* .cvsignore: Ignore w3m-load.el.
+
+	* Makefile.in (clean): Remove w3m-load.el.
+
+2004-04-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-expand-path-name): In Emacs, don't bind
+	directory-sep-char which is an obsolete variable.
+
+2004-04-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el, w3m-favicon.el: Move snippets managing
+	`w3m-arrived-setup-functions' and `w3m-arrived-shutdown-functions' from
+	w3m.el into w3m-favicon.el.
+
+2004-04-23  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-antenna.el (w3m-antenna-hns-last-modified): Use 32400 as a
+	correct timezone instead of JST (suggested by YAMAOKA-san).
+
+2004-04-22  Christian Schmitt  <Christian.Schmitt@Dresdner-Bank.com>
+
+	* w3m.el (w3m-expand-path-name): Bind directory-sep-char to `?/'.  It
+	is `?\' by default in XEmacs on Windows (native, not Cygwin).
+
+2004-04-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-use-symbol): Don't activate it in Emacs 20.  Advised by
+	Arisawa-san.
+
+2004-04-21  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Simplify the rule of sending referers.
+	(w3m-add-referer-regexps): Abolished.
+	(w3m-add-referer-predicate-function): Abolished.
+	(w3m-add-referer): New option.
+	(w3m-add-referer-p): New function.
+	(w3m-add-referer-predicate-by-referer-regexps): Removed.
+	(w3m-add-referer-predicate-by-hosts): Removed.
+	(w3m-request-arguments, w3m-header-arguments): Follow the above
+	changes.
+
+2004-04-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el (w3m-add-w3m-initial-frames): Get the correct value for
+	the newly created frame in Emacs 19.
+
+	* w3m.el (w3m-about-retrieve): Load base64 for Emacs 19.
+	(w3m-minor-mode-command-alist): Add w3m-print-this-url.
+
+	* w3m-bitmap.el (w3m-bitmap-image-insert): Don't put the evaporate
+	property on empty overlays (revert 2004-04-07 change).
+
+2004-04-20  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-link-numbering.el (w3m-view-numbered-link): Removed.
+	(w3m-move-numbered-anchor): New command.
+	(w3m-link-numbering-mode-map): Use `w3m-move-numbered-anchor' instead
+	of `w3m-view-numbered-link'.
+
+2004-04-19  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-input-coding-system): Use `w3m-output-coding-system' as
+	its default value for w3m-m17n and w3mmee.
+	(w3m-halfdump-command-arguments): Use "-I" option to disable
+	automatic-detection of coding systems for w3m-m17n and w3mmee.
+
+2004-04-16  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-meta-refresh-content-regexp): Allow quoted string as url.
+	(w3m-meta-content-refresh-regexp): Ditto.
+	(w3m-check-refresh-attribute): Decode entities.
+
+2004-04-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-link-numbering.el (w3m-link-numbering): Quit when links have
+	already been numbered.
+
+2004-04-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-link-numbering.el (w3m-link-numbering-mode): Delete all overlays
+	that display link numbers, when deactivating.
+
+2004-04-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-link-numbering.el (w3m-link-numbering): Add face to before-string
+	correctly under XEmacs; don't bother to delete overlays (suggested by
+	TSUCHIYA-san).
+
+2004-04-14  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-link-numbering.el (w3m-link-numbering-face): New face.
+	(w3m-link-numbering): Use it.
+
+2004-04-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-link-numbering.el: New file.
+
+	* w3m.el (w3m-browse-url): Load `browse-url' before calling
+	`browse-url-interactive-arg'.
+
+2004-04-12  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+	* doc/ptexinfmt.el: Support @indicateurl, @LaTeX, @ordf, @ordm.  @url
+	is now a synonym for @uref.
+
+2004-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-fontify-anchors): No need to enable evaporation of
+	overlays in XEmacs.
+
+2004-04-08  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* w3m.el (w3m-delete-all-overlays): Revert.
+	(w3m-highlight-current-anchor): Ditto.
+
+2004-04-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-delete-all-overlays): Remove.
+
+2004-04-07  Masatake YAMATO  <jet@gyve.org>
+
+	* w3m-bitmap.el (w3m-bitmap-image-insert): Enable the evaporate
+	property on overlays.
+
+	* w3m-e21.el (w3m-form-make-button): Enable the evaporate property on
+	buttun overlays.
+
+	* w3m.el (w3m-fontify-anchors): Ditto.
+	(w3m-create-text-page): No need to delete zombie overlays.
+	(w3m-create-image-page): Ditto.
+	(w3m-highlight-current-anchor-1): Enable the evaporate property on
+	overlays.
+	(w3m-highlight-current-anchor): No need to delete overlays.
+
+2004-04-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-rendering-extract-title): Remove too much whitespace.
+
+2004-04-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-delete-all-overlays): Simply delete all overlays if the
+	optional arg is given.
+	(w3m-create-text-page): Delete zombie overlays.
+	(w3m-create-image-page): Ditto.
+
+2004-04-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-search.el (w3m-search-engine-alist): Improve custom.
+
+2004-04-04  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-search.el (w3m-search-engine-alist): Add "amazon" entry.
+
+2004-03-31  Yuya Nishida  <yuya@j96.org>
+
+	* w3m-search.el (w3m-search-engine-alist): Add "amazon-ja" entry;
+	"PostData" can be specified.
+	(w3m-search): Support post-data.
+
+2004-04-04  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-header-arguments): Set unibyte at work buffer.
+
+	* w3m-form.el (w3m-form-make-form-data): Set unibyte at work buffer;
+	Encode form data.
+
+2004-03-22  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-type): Check if w3m-compile-options contains "m17n".
+
+2004-03-19  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-add-referer-regexps): Fix typo.
+	(w3m-add-referer-predicate-function): New user option.
+	(w3m-add-referer-predicate-by-referer-regexps): New function.
+	(w3m-add-referer-predicate-by-hosts): Ditto.
+	(w3m-request-arguments): Call w3m-add-referer-predicate-function.
+	(w3m-header-arguments): Ditto.
+
+	* octet.el (mime-view-octet): Avoid redundant invocation of
+	`mime-entity-content'.
+
+2004-03-14  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-symbol.el (w3m-mule-unicode-symbol): Fixed 32th character.
+	Thanks to Taichi KAWABATA for his report.
+
+2004-03-06  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-weather.el (w3m-weather-get-seikatu-sisu): Relax regular
+	expressions to extract indices, to follow the change of the site
+	design.
+
+2004-03-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el (w3m-force-window-update): New function.
+	(w3m-tab-drag-mouse-function, w3m-tab-click-mouse-function,
+	w3m-tab-line, w3m-e21-switch-to-buffer, w3m-select-buffer-hook): Use
+	`w3m-force-window-update' instead of `w3m-e21-wobble-window-size'.
+	(w3m-e21-wobble-window-size): Abolish.
+
+	* w3m-favicon.el (w3m-favicon-retrieve): Use `w3m-force-window-update'.
+
+	* w3m-proc.el: Autoload `w3m-force-window-update' when compiling.
+	(w3m-process-stop): Use `w3m-force-window-update'.
+
+	* w3m.el (w3m-select-buffer-show-this-line): Use
+	`w3m-force-window-update'.
+
+
+2004-02-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (emacs-w3m-version): Release 1.3.85.
+
+2004-02-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el (w3m-tab-drag-mouse-function): Call
+	`w3m-e21-wobble-window-size'.
+	(w3m-tab-click-mouse-function): New function.
+	(w3m-tab-make-keymap): Use it.
+
+2004-02-27  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-form.el (w3m-form-mee-new): Use `w3m-form-normalize-action' for
+	action.
+
+2004-02-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-select-buffer-show-this-line): Call
+	`w3m-e21-wobble-window-size' when Emacs 21 or 22 is running.
+
+	* w3m-e21.el (w3m-tab-line-format): Make it buffer-local variable.
+	(w3m-tab-timer): Ditto.
+	(w3m-e21-wobble-window-size): New function.
+	(w3m-tab-line): Make `w3m-tab-timer' hold boolean value; let a timer
+	function run certainly in a buffer in which a timer started; use
+	`w3m-e21-wobble-window-size'.
+	(w3m-e21-switch-to-buffer): New command.
+	(w3m-e21-subst-switch-to-buffer-keys): New function.
+	(w3m-mode-setup-functions): Add `w3m-e21-subst-switch-to-buffer-keys'.
+	(w3m-select-buffer-hook): Add `w3m-e21-wobble-window-size'.
+	(w3m-spinner-image-index): Make it buffer-local variable.
+
+2004-02-25  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-form.el (w3m-form-make-form-data): Align form by the number of
+	`hseq'.
+
+2004-02-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-antenna.el (w3m-antenna-sites): Add
+	`w3m-antenna-check-another-page' to its customize spec.
+	(w3m-antenna-check-another-page): New function.
+	(w3m-about-antenna): Relaxed the condition to check changed sites.
+	(w3m-antenna-add): Add a new site at the end of `w3m-antenna-sites'
+	instead of adding it at the top.
+
+2004-02-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-antenna.el (w3m-antenna-function): New widget.
+	(w3m-antenna-sites): Use it.
+
+2004-02-20  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-expand-path-name): Protect expand-file-name from
+	cygwin-mount.el's behavior on Windows.
+
+	* w3m-antenna.el (w3m-about-antenna): Check arrived-time if no
+	last-modified.
+
+2004-02-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-antenna.el (w3m-antenna-sites): Fix mis-implemented customizing
+	widgets in Emacs 20.7 through 21.3 and XEmacs.
+	(w3m-antenna-add): Support Emacs 20.
+
+	* w3m-util.el (widget-default-get): Remove advice.
+
+2004-02-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el (widget-default-get): Advise the function to fix a bug in
+	Emacs 21.1 through 21.3.
+
+2004-02-17  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-form.el (w3m-form-resume): Fix for checkbox.
+
+2004-02-11  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+	* doc/ptexinfmt.el: Support @docbook, @ifdocbook, @ifnotdocbook, and
+	@registeredsymbol.
+
+2004-02-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-active-region-or-url-at-point): Move the point backward
+	from the end of the active region instead of moving it forward, in
+	order to avoid enlarging the region.
+
+2004-02-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-active-region-or-url-at-point): Find a url-like string in
+	the region instead of extracting the whole substring when the region is
+	active.  Don't use `w3m-url-at-point' for that since it doesn't work
+	for all url string.
+	(w3m-quit): Delete frames seemingly fast.
+
+2004-02-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-favicon.el (w3m-favicon-retrieve): Because some broken servers
+	provide empty contents as their favicons, check the length of the
+	retrieved content, before calling `w3m-favicon-convert'.
+
+2004-02-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Changes to validate cached contents.
+	(w3m-follow-cache-control-header): Abolished.
+	(w3m-prefer-cache): New option.
+	(w3m-cache-available-p): Check whether a cached header includes cache
+	control headers.
+	(w3m-w3m-dump-extra): Always cache both a header and a content.
+	(w3m-w3m-retrieve-1): Check whether a cache is available, before using
+	it.
+	(w3m-view-this-url): When visiting history pages, prefer cached
+	contents without checking their validity.
+	(w3m-view-previous-page, w3m-view-source, w3m-view-header): Prefer
+	cached contents without checking their validity.
+
+2004-02-05  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-show-error-information): Decode cache contents if
+	necessary.
+
+2004-02-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-edit-url): Define as a command.
+
+2004-02-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-examine-modules): Exclude w3m-e22.el except for
+	Emacs 22.
+
+2004-01-31  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-edit-function-alist): New option.
+	(w3m-edit-url): Refer the above alist to find a suitable function for
+	editing a specified page.
+	(w3m-edit-function, w3m-edit-current-url): Its docstring is modified to
+	follow the above change.
+	(w3m-edit-this-url): Its docstring is modified likewise, and it is
+	simplified.
+	(w3m-goto-url): Ignore cached form data when reloading.
+
+	* w3m.el (w3m-safe-view-this-url): Call `w3m-goto-url' when a function
+	set to `w3m-goto-article-function' returns nil.
+
+2004-01-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Changes to follow anchors that point Shimbun articles.
+	(w3m-goto-article-function): New variable.
+	(w3m-safe-view-this-url): Refer the above.
+
+2004-01-29  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-follow-cache-control-header): New option.
+	(w3m-w3m-dump-extra): If `w3m-follow-cache-control-header' is nil, do
+	not follow the chache control headers.
+
+2004-01-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Makefile.in (tarball): Because Emacs-22 has not been released, remove
+	w3m-e22.el from the creating tarball.
+
+2004-01-27  Taichi KAWABATA  <batta@beige.ocn.ne.jp>
+
+	* w3m-e22.el: New file.  This file is simply the copy of w3m-e21.el
+	except that the ccl section has been removed.
+
+	* w3m.el: Require w3m-e22 when Emacs 22 is running.
+
+2004-01-26  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-after-cursor-move-hook): Add :group keyword.
+	(w3m-auto-show): Check `truncate-lines' before scrolling.
+	(w3m-check-current-position): Do not check `truncate-lines'.
+
+	* mime-w3m.el: Changes to display URI of the current anchor.
+	(mime-w3m-after-cursor-move-hook): New option.
+	(mime-w3m-add-local-hook): New advice.
+	(mime-w3m-check-current-position): New funcion.
+
+2004-01-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-proc.el (w3m-process-start-and-wait): Abolished.
+	(w3m-process-with-wait-handler): Reimplemented.
+
+	* w3m.el (w3m-input-url): Accept other symbols than `popup'.
+	(w3m-copy-buffer): Fix the bug that drops an asynchronous handler
+	returned by `w3m-goto-url'.
+
+2004-01-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-goto-url): Register a url to the history even if it is
+	failed to retrieve.  Suggested by Fujishima-san.
+
+2004-01-23  Hiroshi Fujishima  <pooh@nature.tsukuba.ac.jp>
+
+	* w3m.el (w3m-input-url): Fix a bug which causes an error when there's
+	neither a frame nor a window for the emacs-w3m session and `url' is the
+	symbol `popup' (it is because there's a url-like text around the cursor
+	but deleted by a user in the minibuffer).
+
+2004-01-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-input-url): Add "http://" to its return value, when its
+	return value contains no scheme part.
+
+2004-01-18  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-w3m-dump-extra): Check cache control headers before
+	caching headers and contents.  This change is suggested by Mr. Amagai
+	in [emacs-w3m:06255].
+	(w3m-message): Make it verbose, even if a buffer related to emacs-w3m
+	is not displayed.  w3m-print-this-url() has been broken in buffers
+	displaying text/html messages, because w3m-message() was too silent.
+
+2004-01-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-safe-view-this-url): Bind `w3m-pop-up-windows' to nil
+	locally, in order to keep MUA's window configuration.
+
+	* w3m-proc.el (w3m-process-do-with-temp-buffer): Save the current
+	buffer while executing an asynchronous body.
+
+	* w3m-util.el (w3m-insert-string): Define its `edebug-form-spec'.
+
+2004-01-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-util.el (w3m-keep-region-active): Renamed from
+	`w3m-activate-zmacs-regions'.
+	(w3m-deactivate-region): Declared as a macro.
+
+	* w3m-search.el (w3m-search-read-query): Call `w3m-deactivate-region'
+	instead of `w3m-deactivate-mark'; Call `region-beginning' and
+	`region-end' instead of `point' and `mark'.
+
+	* w3m.el (w3m-next-anchor, w3m-previous-anchor, w3m-next-form,
+	w3m-previous-form, w3m-next-image, w3m-previous-image,
+	w3m-scroll-up-or-next-url, w3m-scroll-down-or-previous-url,
+	w3m-beginning-of-line, w3m-end-of-line): Call `w3m-keep-region-active'
+	instead of `w3m-activate-zmacs-regions'.
+	(w3m-active-region-or-url-at-point): Call `region-beginning' and
+	`region-end' instead of `point' and `mark'.
+
+2004-01-07  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-proc.el (w3m-process-wait-discard-input): New variable.
+	(w3m-process-wait-process): If `w3m-process-wait-discard-input' is
+	non-nil, call `discard-input'.
+
+2004-01-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el (w3m-deactivate-mark): New function alias.
+
+	* w3m.el (w3m-active-region-or-url-at-point): Use it.
+	(w3m-open-all-links-in-new-session): Use it.
+
+	* w3m-search.el (w3m-search-read-query): Use it.
+
+2004-01-04  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-active-region-or-url-at-point): New function.
+	(w3m-input-url, w3m-view-this-url, w3m-goto-url): Call
+	`w3m-active-region-or-url-at-point' instead of `w3m-url-at-point'.
+
+2004-01-04  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-util.el (w3m-region-active-p): New macro.
+
+	* w3m.el (w3m-open-all-links-in-new-session): Deactivate the mark when
+	it is active.
+	(w3m-view-this-url-new-session): Use `w3m-region-active-p'.
+
+	* w3m-search.el (w3m-search-read-query): Use `w3m-region-active-p'.
+
+	* w3m-namazu.el (w3m-namazu): Use `w3m-search-read-query' to read a
+	query from the minibuffer.
+
+	* w3m-search.el (w3m-search-read-query): New function.
+	(w3m-search): Use the above function.
+
+2004-01-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-search.el (w3m-search): Use the region as an initial string if
+	Transient Mark mode.
+	(w3m-search-word-at-point): Follow the above change in its docstring.
+
+	* w3m-e21.el (w3m-tab-line): Check the length of the current title,
+	before checking the breadth of its first character.
+
+2003-12-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-accept-languages): Split the option of w3m with a comma
+	surrounded by some spaces.
+	(w3m-dump-head-source-command-arguments): Use a comma instead of a
+	white space to concatenate elements of `w3m-accept-languages'.
+	Cf. Section 14.4 of RFC2047.
+
+2003-12-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el: Add an advice to byte-optimize-form-code-walker to avoid
+	the warning ``...called for effect'' for the pop form when running
+	Emacs 21.3.
+
+2003-12-26  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-create-text-page): Use the last directory as a title of
+	text/plain page when its uri is terminated by a slash.
+
+
+2003-12-26  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (emacs-w3m-version): Release 1.3.80.
+
+2003-12-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-proc.el (w3m-process-wait-process): Return exit status; Use
+	`accept-process-output' instead of `sit-for' in order to flush pending
+	output.
+	(w3m-process-with-wait-handler): Follow the above change.
+
+2003-12-21  Masatake YAMATO  <jet@gyve.org>
+
+	* w3m.el (w3m-mode): Small doc fix.
+	(w3m-relationship-estimate-rules): Relax the regular expression to
+	detect result pages of Google.
+
+2003-12-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-safe-toggle-inline-image): New function.
+	(w3m-toggle-inline-images): Revoke the recent changes.
+	(w3m-safe-toggle-inline-images): New function.
+	(w3m-safe-view-this-url): Doc fix.
+	(w3m-minor-mode-command-alist): Use `w3m-safe-toggle-inline-image' and
+	`w3m-safe-toggle-inline-images'.
+
+	* w3m-util.el (w3m-find-w3m-buffer): Abolish.
+	(w3m-with-w3m-buffer): Abolish.
+
+	* mew-w3m.el (mew-w3m-view-inline-image): Revert.
+
+	* attic/vm-w3m.el (vm-w3m-safe-toggle-inline-images): New function.
+
+2003-12-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-toggle-inline-images): Ignore `w3m-safe-url-regexp' when
+	the prefix argument is given.
+
+	* w3m-util.el (w3m-find-w3m-buffer): Bind `w3m-safe-url-regexp' to the
+	value specified peculiarly by each MUA.
+	(w3m-with-w3m-buffer): Ditto.
+
+	* mew-w3m.el (mew-w3m-view-inline-image): Don't bind
+	`w3m-safe-url-regexp' there.
+
+2003-12-19  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* mew-w3m.el (mew-w3m-view-inline-image): Fix last change.
+
+2003-12-18  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* mew-w3m.el (mew-w3m-view-inline-image): Use
+	`w3m-toggle-inline-images'.
+	(mew-mime-text/html-w3m): Put the `w3m-images' text property in the
+	message buffer.
+
+	* w3m-util.el (w3m-find-w3m-buffer): Fix for Mew.
+
+2003-12-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-toggle-inline-images): Wrap it with
+	`w3m-with-w3m-buffer'.
+
+	* w3m-util.el (w3m-find-w3m-buffer): New function.
+	(w3m-with-w3m-buffer): New macro.
+
+2003-12-13  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-antenna.el (w3m-antenna-string): Renamed from
+	`string-with-default'.
+	(w3m-antenna-string-create): Renamed from
+	`string-with-default-value-create'.
+	(w3m-antenna-sites): Change its customize spec.
+
+	* w3m-xmas.el (w3m-window-hscroll, w3m-current-column,
+	w3m-set-window-hscroll): Import definitions from w3m.el.
+	(w3m-run-at-time): Renamed from `w3m-xmas-run-at-time'.
+
+	* w3m.el (w3m-window-hscroll, w3m-current-column,
+	w3m-set-window-hscroll): Export definitions for XEmacs to w3m-xmas.el.
+
+2003-12-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* aclocal.m4 (AC_SET_VANILLA_FLAG): New function specifying the
+	`VANILLA_FLAG' variavle.  XEmacs 21.5 needs to be given `-vanilla'
+	rather than `-q -no-site-file'.
+	(AC_EMACS_LISP): Use `VANILLA_FLAG'.
+	(AC_PATH_EMACS): Call `AC_SET_VANILLA_FLAG'.
+	(AC_ADD_LOAD_PATH): Use `VANILLA_FLAG'.
+	(AC_CHECK_ELISP): Ditto.
+
+	* configure.in: Check for `EGREP' before calling `AC_PATH_EMACS'.
+
+	* Makefile.in (VANILLA_FLAG): New variable.
+	(FLAGS): Use it.
+	(very-slow): Use it.
+
+	* doc/Makefile.in (VANILLA_FLAG): New variable.
+	(FLAGS): Use it.
+
+	* w3m-xmas.el (w3m-xmas-run-at-time): Use a simple function definition
+	if there is not a bug in `start-itimer'.
+
+2003-12-11  KAMO Tomoyuki <kamo@ITmanage.co.jp>
+
+	* octet.el (octet-suffix-type-alist): Add suffix of bzip-ed files.
+	(octet-type-filter-alist): Add an entry of bzip2.
+	(octet-guess-type-from-name): Relax the regular expression to detect
+	suffix, in order to handle bzip-ed files.
+
+2003-12-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Experimentally implement the estimation layer of
+	relationships between pages.
+	(w3m-relationship-estimate-rules): New option.
+	(w3m-relationship-estimate, w3m-relationship-simple-estimate,
+	w3m-relationship-magicpoint-estimate,
+	w3m-relationship-search-patterns): New functions.
+	(w3m-use-filter): Cancel the last change; its default value is changed
+	to nil.
+
+	* w3m-filter.el (w3m-filter-rules): Remove rules to find relationships.
+	(w3m-filter-find-relationships): Abolished.
+
+	* w3m-util.el (w3m-html-string-regexp): Import from w3m.el.
+
+2003-12-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-use-filter): Change its default value to t.
+
+	* w3m-filter.el: Reconstructed completely.
+	(w3m-filter-rules): Change its spec and its default value.
+	(w3m-filter): Reimplemented.
+	(w3m-filter-delete-regions, w3m-filter-find-relationships): New
+	functions.
+	(w3m-filter-db, w3m-filter-db-size, w3m-filter-server-regexp,
+	w3m-filter-setup, w3m-filter-delete-region, w3m-filter-lwn.net,
+	w3m-filter-google.com, w3m-filter-www.zdnet.co.jp): Removed.
+
+2003-12-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-xmas-run-at-time): Rewrite w/o using fsf-compat.
+
+	* w3m.el (w3m-run-at-time): New function alias.
+	(w3m-refresh-at-time): Use it.
+
+2003-12-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-xmas-run-at-time): New function.
+
+	* w3m.el (w3m-refresh-at-time): Use it.
+
+2003-12-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-view-this-url-new-session): Abolish the optional arg.
+	(w3m-mouse-view-this-url-new-session): Ditto.
+
+2003-12-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-buffer-setup): Use `defun' instead of `defsubst'.
+
+2003-12-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-current-anchor-face): Replace backquote with quote.
+	(w3m-select-buffer-current-buffer): Ditto.
+	(w3m-header-line-insert): Ditto.
+	(w3m-about-retrieve): Use `defun' instead of `defsubst'.
+	(w3m-cid-retrieve): Ditto.
+	(w3m-current-column): Make it a function, not a macro.
+
+2003-11-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-minor-mode): Run hooks only when this minor mode is
+	enabled.
+	* w3m-bookmark.el (w3m-bookmark-mode): Ditto.
+	* w3m-antenna.el (w3m-antenna-mode): Ditto.
+
+	* w3m-antenna.el (w3m-antenna-alist): Simplified.
+
+2003-11-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-antenna.el: Define a new minor mode `w3m-antenna-mode'.
+	(w3m-antenna-mode-map, w3m-antenna-mode): New variables.
+	(w3m-antenna-mode, w3m-antenna-mode-setter, w3m-antenna-edit): New
+	functions.
+
+	* w3m-bookmark.el (w3m-bookmark-mode): Change its interactive spec, and
+	improve its document.
+
+	* w3m-favicon.el (w3m-favicon-retrieve): Abolish the 4th argument
+	`handler' and wrap the asynchronous processing forms with
+	`w3m-process-with-null-handler', in order to clarify this function's
+	purpose.
+
+	* w3m.el (w3m-message): Use `walk-windows' instead of `window-list',
+	because the latter is not available at Meadow and Mule2.
+	(w3m-w3m-retrieve): Check the status code.
+	(w3m-show-error-information): Also use retrieved error pages.
+	(w3m-minor-mode): Change its interactive spec.
+
+2003-11-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-favicon.el (w3m-favicon-convert): Make sure data of the ico type
+	contains the correct magic numbers.
+
+2003-11-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-util.el (w3m-last-visited-buffer): Abolished.
+	(w3m-popup-buffer): Do not reset the above variable.
+
+	* w3m.el (w3m-close-window): Do not set the above variable.
+	(w3m): Do not refer the above variable.
+
+2003-11-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-retrieve-and-render): Use `w3m-message' instead of
+	`message'; don't let it be controlled by `w3m-verbose'.
+	(w3m-alive-p): Don't sort the return value of `list-buffers' so that it
+	returns the last visited emacs-w3m buffer as much as possible; don't
+	inline the `w3m-list-buffers' function.
+
+2003-11-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-verbose): Change its default value to nil.
+	(w3m-message): When `w3m-verbose' is nil, display messages without
+	logging.
+	(w3m-make-help-echo, w3m-toggle-inline-image, w3m-zoom-in-image,
+	w3m-zoom-out-image, w3m-view-this-url, w3m-submit-form, w3m-view-image,
+	w3m-save-image, w3m-view-url-with-external-browser,
+	w3m-download-this-url, w3m-print-this-url, w3m-edit-current-url,
+	w3m-edit-this-url, w3m-quit, w3m-goto-ftp-url, w3m-select-buffer,
+	w3m-select-buffer-show-this-line,
+	w3m-select-buffer-show-this-line-and-switch): Call `w3m-message'
+	instead of `w3m-display-message'.
+
+	* w3m-util.el (w3m-display-message): Removed.
+	(w3m-display-message-enable-logging): Abolished.
+
+2003-11-26  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-message): Silent when the cursor is in minibuffer.
+
+	* w3m-util.el (w3m-display-message): Ditto.
+
+2003-11-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-html-string-regexp): Fix my fault; enclose it with
+	`eval-and-compile' which is needed for compiling since it is used in a
+	macro.
+
+2003-11-25  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-proc.el (w3m-process-wait-process): Invert the return value of
+	sit-for() that waits an asynchronous process.
+	(w3m-process-kill-process): Relax the condition that checks whether a
+	given process has already finished or not.
+
+2003-11-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-search.el (w3m-search): Use `w3m-goto-url' instead of `w3m'.
+	* w3m-weather.el (w3m-weather): Ditto.
+
+	* w3m.el (w3m-obey-w3m-pop-up-frames): Abolish.
+	(w3m-goto-url-new-session): Find an existing emacs-w3m buffer and then
+	make a copy of it; use `w3m-goto-url' instead of `w3m' if there is no
+	emacs-w3m buffer.
+	(w3m-browse-url): Revert last change; rename the optional arg to
+	`new-session'; call `w3m-goto-url-new-session' or `w3m-goto-url'.
+	(w3m-select-buffer): Use `w3m-goto-url' instead of `w3m'.
+	(w3m-safe-view-this-url): Ditto.
+
+2003-11-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-antenna.el (w3m-antenna): Don't pass the interactive flag to
+	`w3m-goto-url'.
+	* w3m-bookmark.el (w3m-bookmark-view): Ditto.
+	* w3m-cookie.el (w3m-cookie): Ditto.
+	* w3m-dtree.el (w3m-dtree): Ditto.
+	* w3m-namazu.el (w3m-namazu): Ditto.
+	* w3m-perldoc.el (w3m-perldoc): Ditto.
+
+	* w3m.el (w3m-copy-buffer): Don't pop up a window or a frame if
+	`w3m-goto-url' is called.
+	(w3m-goto-url): Abolish the 8th arg `interactive-p'; pop up a window or
+	a frame anyway.
+	(w3m-goto-url-new-session): Abolish the `interactive-p' argument; don't
+	pass it to `w3m-goto-url'.
+	(w3m-gohome): Ditto.
+	(w3m): Don't pop up a window or a frame there.
+	(w3m-browse-url): Make it work as `browse-url-w3'.
+
+2003-11-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-proc.el (w3m-process-wait-process): Don't specify 3 args to
+	`sit-for' for XEmacs.
+
+2003-11-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-antenna.el (w3m-antenna-sites): Change its default value.  Allow
+	a list that consists of a function and its options, as the third
+	element of each site.
+	(w3m-antenna-html-skeleton): Remove the link to the antenna editor.
+	(w3m-antenna-setup): Removed.
+	(w3m-antenna-shutdown): Removed.
+	(w3m-antenna-alist): New function.
+	(w3m-antenna-site-update): Ditto.
+	(w3m-antenna-check-hns): Ditto.
+	(w3m-antenna-check-anchor): Ditto.
+	(w3m-antenna-check-page): Ditto.
+	(w3m-antenna-check-site): Use the above three functions.
+	(w3m-antenna-check-all-sites): Follow the above change.  Use
+	w3m-antenna-alist() and w3m-save-list() instead of w3m-antenna-setup()
+	and w3m-antenna-shutdown().
+	(w3m-antenna-check-site-after): Removed.
+	(w3m-antenna-make-summary): Use a key attribute instead of an url
+	attribute, when the latter is not set.
+	(w3m-antenna-make-summary-like-natsumican): Ditto.
+	(w3m-about-antenna): Call w3m-antenna-alist() instead of
+	w3m-load-list().
+	(w3m-about-antenna-edit): Removed.
+	(w3m-antenna-edit-reset-post-data): Ditto.
+
+2003-11-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-antenna.el (w3m-antenna): Pass the interactive flag to
+	`w3m-goto-url'.
+	* w3m-bookmark.el (w3m-bookmark-view): Ditto.
+	* w3m-cookie.el (w3m-cookie): Ditto.
+	* w3m-dtree.el (w3m-dtree): Ditto.
+	* w3m-namazu.el (w3m-namazu): Ditto.
+	* w3m-perldoc.el (w3m-perldoc): Ditto.
+	* w3m.el (w3m-gohome): Ditto.
+	(w3m-browse-url): Ditto.
+
+2003-11-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-rendering-half-dump): Move point to the end of the region
+	in order to avoid a bug of `call-process-region' in XEmacs 21.5.7+ (see
+	the comment).
+	(w3m-decode-encoded-contents): Ditto.
+	(w3m-x-moe-decode-buffer): Ditto.
+
+	* w3m-perldoc.el (w3m-about-perldoc): Ditto.
+
+	* w3m-xmas.el (w3m-initialize-graphic-icons): Ditto.
+
+	* w3m-favicon.el (w3m-favicon-retrieve): Say "no favicon" if it is not
+	available.
+
+	* w3m-proc.el (w3m-process-with-environment): Rely on the
+	`temp-directory' function and modify TEMP and TMPDIR env vars for
+	XEmacs.
+
+2003-11-20  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-form.el (w3m-form-normalize-action): New inline function.
+	(w3m-form-parse-and-fontify): Use it.
+	(w3m-form-new): Simply set action.
+	(w3m-form-submit): Don't treat !CURRENT_URL! here.
+
+2003-11-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* aclocal.m4 (AC_ADD_LOAD_PATH): Refine the help message for the
+	--with-attic option.
+
+2003-11-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-buffer-setup): Make sure that `truncate-lines' is t.
+	(w3m-view-source): Don't set `truncate-lines' to nil when quitting
+	viewing a source.
+	(w3m-view-header): Set `truncate-lines' to nil when viewing a header.
+
+2003-11-18  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-form.el (w3m-form-put-by-name): New function.
+	(w3m-form-resume): Use w3m-form-get-by-name and w3m-form-put-by-name
+	instead of w3m-form-get and w3m-form-put for radio buttons.
+	(w3m-form-parse-and-fontify): Ditto.
+	(w3m-form-input-radio): Ditto.
+
+2003-11-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-check-current-position): Don't allow horizontal scrolling
+	when `truncate-lines' is nil.
+	(w3m-view-source): Set `truncate-lines' to nil.
+
+	* w3m-favicon.el (w3m-favicon-setup): Retrieve favicon even when
+	viewing the header or the page source.
+
+2003-11-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* Makefile.in (very-slow): Fix echo messages.
+
+	* w3m.el (w3m-follow-redirection): Fix customization type.
+
+	* w3m-e21.el: Bind `w3m-current-title' when compiling.
+
+	* /: Bind `w3m-work-buffer-list' when compiling in: w3m-e21.el,
+	w3m-favicon.el, w3m-image.el, w3m-proc.el and w3m-xmas.el.
+
+	* /: Require `cl' when compiling in: w3m-cookie.el, w3m-form.el and
+	w3m-tabmenu.el.
+
+	* /: Remove unused non-global variables in: octet.el, w3m-cookie.el,
+	w3m-tabmenu.el and w3m-weather.el.
+
+2003-11-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-goto-url): Make `w3m-local-find-file-function' don't
+	handle directories.
+
+2003-11-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el: Bind `w3m-current-process', `w3m-pop-up-frames',
+	`w3m-pop-up-windows', `w3m-popup-frame-parameters',
+	`w3m-select-buffer-name' and `w3m-use-tab', and fbind
+	`select-frame-set-input-focus' when compiling.
+	(w3m-popup-frame-parameters): Move from w3m.el.
+	(w3m-popup-frame-p): Ditto.
+	(w3m-use-tab-p): Ditto.
+	(w3m-popup-window-p): Ditto.
+	(w3m-initial-frames): Ditto.
+	(w3m-last-visited-buffer): Ditto.
+	(w3m-popup-buffer): Ditto; also move the program to make
+	`select-frame-set-input-focus' unbound from w3m.el.
+	(w3m-add-w3m-initial-frames): Ditto; also move the program to add it to
+	`create-frame-hook', `after-make-frame-functions' or
+	`after-make-frame-hook' from w3m.el.
+	(w3m-delete-frames-and-windows): Ditto.
+	(w3m-display-progress-message): Mark a progress message with the
+	`w3m-progress-message' text property.
+
+	* w3m.el: Don't fbind `select-frame-set-input-focus'.
+	(w3m-local-find-file-function): Use `w3m-popup-frame-p'.
+	(w3m-initial-frames): Move to w3m-util.el.
+	(w3m-popup-frame-parameters): Ditto.
+	(w3m-popup-frame-p): Ditto.
+	(w3m-use-tab-p): Ditto.
+	(w3m-popup-window-p): Ditto.
+	(w3m-last-visited-buffer): Ditto.
+	(w3m-popup-buffer): Ditto; also move the program to make
+	`select-frame-set-input-focus' unbound to w3m-util.el.
+	(w3m-add-w3m-initial-frames): Ditto; also move the program to add it to
+	`create-frame-hook', `after-make-frame-functions' or
+	`after-make-frame-hook' to w3m-util.el.
+	(w3m-delete-frames-and-windows): Ditto.
+	(w3m-delete-buffer-if-empty): New function.
+	(w3m-view-this-url-1): Use it.
+	(w3m-goto-url-new-session): Use it.
+	(w3m): Use it.
+
+	* w3m-e21.el (w3m-euc-japan-encoder): Compute the ccl program in each
+	time to load w3m-e21.elc to keep the compatibility of the module with
+	Emacs 21.3 and the later versions.
+	(w3m-iso-latin-1-encoder): Ditto.
+
+2003-11-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-horizontal-scroll-division): Mega doc fix; eliminate
+	illegal values.
+	(w3m-horizontal-on-screen): Rearrange.
+
+2003-11-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-last-visited-buffer): New variable.
+	(w3m-popup-buffer): Clear `w3m-last-visited-buffer'.
+	(w3m-close-window): Set the last emacs-w3m buffer as
+	`w3m-last-visited-buffer'.
+	(w3m): Preferably use the last emacs-w3m buffer kept in
+	`w3m-last-visited-buffer'.
+
+2003-11-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-horizontal-recenter): Do nothing besides resetting the
+	window's hscroll if `truncate-lines' is nil.
+	(w3m-beginning-of-line): Replace `w3m-set-window-hscroll' with
+	`set-window-hscroll'.
+	(w3m-end-of-line): Make it work identically as `end-of-line' if
+	`truncate-lines' is nil.
+	(w3m-display-width): Move downward (see the comment).
+
+2003-11-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-w3m-parse-header): Because a broken server returns a
+	relative URL in the location field, convert a URL to absolute.
+
+	* w3m-proc.el (w3m-process-wait-process): New function.
+	(w3m-process-start-and-wait): Call the above function.
+
+	* w3m-weather.el (w3m-weather-run-filter-functions): New function to
+	call filter functions asynchronously.
+	(w3m-about-weather): Call the above.
+	(w3m-weather-get-seikatu-sisu): Asynchronized.
+	(w3m-weather-insert-seikatu-sisu): Ditto.
+
+2003-11-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-initial-frames): Rename from `w3m-initial-frame'; keep a
+	list of the frame-IDs.
+	(w3m-popup-window-p): Return nil if there is the selection window.
+	(w3m-popup-buffer): Copy a copy of `w3m-initial-frames' from a visible
+	emacs-w3m buffer to a popped-up emacs-w3m buffer; don't set
+	`w3m-initial-frames' for newly created frames there.
+	(w3m-add-w3m-initial-frames): New function; add it to
+	`create-frame-hook', `after-make-frame-functions' or
+	`after-make-frame-hook'.
+	(w3m-copy-buffer): Copy a copy of `w3m-initial-frames'.
+	(w3m-delete-buffer): Pop up another emacs-w3m buffer instead of
+	deleting a frame; remove a deleted frame from `w3m-initial-frames'.
+	(w3m-delete-frames-and-windows): Also allow a window or a frame as the
+	optional argument; emulate XEmacs version's `one-window-p'.
+	(w3m): Set the value for `w3m-initial-frames' even if it is invoked in
+	the batch mode.
+	(w3m-select-buffer): Delete other emacs-w3m frames and windows.
+	(w3m-select-buffer-copy-buffer): Revert the 2003-11-11 change.
+	(w3m-select-buffer-delete-buffer): Simplify.
+
+	(w3m-display-width): New function for showing pages as if there is no
+	selection window.
+	(w3m-halfdump-command-common-arguments): Use it.
+	(w3m-make-separator): Use it.
+	(w3m-about-db-history): Use it.
+	(w3m-header-line-insert): Work as if there is no selection window.
+
+	* w3mhack.el (w3mhack-generate-colon-keywords-file): Preset
+	`:strike-through' and `:strikethru' which aren't supported by the old
+	cus-face.el.
+
+2003-11-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-popup-buffer): Reuse an existing window or frame if it
+	exists; set the value for `w3m-initial-frame' properly; raise, select
+	and focus the new frame.
+	(TopLevel): Make `select-frame-set-input-focus' unbound if it is a
+	dummy.
+	(w3m-view-this-url-1): Show a progress message.
+	(w3m-copy-buffer): Simplify the code to call `w3m-popup-buffer'.
+	(w3m-alive-p): Add an optional arg `visible' (see docs); use inlining
+	`w3m-list-buffers'.
+	(w3m): Simplify the code using `w3m-popup-buffer'; specify the optional
+	arg to `w3m-alive-p'; protect against the case of no url.
+	(w3m-select-buffer-copy-buffer): Bind `w3m-pop-up-windows' to nil.
+
+	* w3m-util.el (w3m-list-buffers): Make it into a normal function; don't
+	call itself recursively.
+
+2003-11-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el (w3m-function-max-args): Move to mew-shimbun.el.
+
+	* w3m.el (w3m-popup-buffer): New function (it still needs to improved
+	in order for the `w3m' function to use).
+	(w3m-view-this-url-1): Specify the value of
+	`w3m-view-this-url-new-session-in-background' to the 3rd arg of
+	`w3m-copy-buffer'; don't pop up a window or a frame there.
+	(w3m-copy-buffer): Change the meaning of the 3rd arg (see docs); don't
+	pop up a window or a frame if it is non-nil, otherwise call
+	`w3m-popup-buffer'.
+	(w3m-goto-url): Change the name of the 8th arg to `interactive-p';
+	don't pop up a window or a frame unless this function is called
+	interactively, otherwise call `w3m-popup-buffer'.
+	(w3m-goto-url-new-session): Specify nil to the 3rd arg of
+	`w3m-copy-buffer'.
+	(w3m-select-buffer-saved-window-config): Abolish.
+	(w3m-select-buffer): Revert the 2003-11-05 change; delete other windows
+	except for the current emacs-w3m window or create a new emacs-w3m
+	buffer when it is called initially.
+	(w3m-select-buffer-current-buffer): Use `line-beginning-position'.
+	(w3m-select-buffer-copy-buffer): Revert the 2003-11-05 change;
+	simplify.
+	(w3m-select-buffer-delete-buffer): Call `w3m-quit' if there is the sole
+	emacs-w3m buffer.
+	(w3m-select-buffer-delete-other-buffers): Revert the 2003-11-07 change.
+	(w3m-select-buffer-quit): Revert the 2003-11-05 change; bind
+	`pop-up-frames'.
+
+2003-11-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-proc.el (w3m-process-stop): Change `w3m-current-process' in the
+	buffer specified in the argument, instead of changing it in the current
+	buffer.
+
+2003-11-08  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-w3m-canonicalize-url): New function.
+	(w3m-w3m-attributes-1): New function.
+	(w3m-w3m-attributes): Call the above functions to follow redirection.
+	(w3m-w3m-retrieve): Call `w3m-w3m-canonicalize-url' before retrieving.
+
+	* w3m-proc.el (w3m-process-start-process): Check the value of
+	`w3m-current-url' before calling `w3m-url-authinfo'.
+	(w3m-process-start-and-wait): Make sure synchronization with
+	sub-process.
+	(w3m-process-do-with-temp-buffer): Call `w3m-kill-buffer' instead of
+	calling `kill-buffer' directly.
+
+	* w3m-antenna.el (w3m-antenna-mapcar): Simplified and follow the change
+	of `w3m-process-do-with-temp-buffer'.
+	(w3m-antenna-mapcar-after): Ditto.
+
+2003-11-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-delete-other-buffers): Use
+	`w3m-delete-frames-and-windows'.
+	(w3m-delete-frames-and-windows): Take an optional argument for the
+	exception; assume a buffer may be at two or more windows.
+	(w3m-close-window): Assume a buffer may be at two or more windows.
+	(w3m-select-buffer-delete-other-buffers): Save-window-excursion.
+
+2003-11-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-popup-frame-parameters): Rename from
+	`w3m-pop-up-frame-parameters' to make it easy to complete the
+	`w3m-pop-up-frames' variable name.
+	(w3m-popup-frame-parameters): Rename from
+	`w3m-pop-up-frame-parameters'.
+	(w3m-popup-frame-p): Make it a generic macro.
+	(w3m-use-tab-p): New macro.
+	(w3m-popup-window-p): Use `w3m-use-tab-p'.
+	(w3m-view-this-url-1): Use `w3m-use-tab-p' and `w3m-popup-frame-p'.
+	(w3m-copy-buffer): Ditto.
+	(w3m-delete-buffer): Use `w3m-use-tab-p'.
+	(w3m-goto-url): Use `w3m-use-tab-p' and `w3m-popup-frame-p'.
+	(w3m): Modify to use new `w3m-popup-frame-p'.
+	(w3m-header-line-insert): Use `w3m-use-tab-p'.
+
+2003-11-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-current-redirect): Abolished.
+	(w3m-clear-local-variables, w3m-copy-local-variables): Follow the above
+	change.
+
+	* w3m-proc.el (w3m-process-do-with-temp-buffer): Keep the current
+	buffer after given FORM and BODY are evaluated.
+
+2003-11-06  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-follow-redirection): Fix its docstring.
+	(w3m-w3m-retrieve): When the above option is equal to nil, it is
+	treated as 0.
+	(w3m-retrieve-and-render): Check content type and charsets with
+	redirected real URI instead of user-specified URI.
+
+	* w3m-antenna.el (w3m-antenna-hns-last-modified): Do not accept
+	`no-cache' argument.
+	(w3m-antenna-check-site): Ditto.
+	(w3m-antenna-mapcar, w3m-antenna-mapcar-after): New functions.
+	(w3m-antenna-check-all-sites): Use the above functions.
+
+2003-11-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-delete-buffer): New implementation.
+	(w3m-delete-frame-maybe): Abolish.
+	(w3m-delete-frames-and-windows): New function.
+	(w3m-quit): Use it.
+	(w3m-close-window): New implementation.
+	(w3m-select-buffer-show-this-line): Specify the 1st arg to
+	`one-window-p'.
+	(w3m-select-buffer-quit): Ditto.
+	(w3m-select-buffer-close-window): Ditto.
+
+2003-11-06  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-fontify-strike-through): Support <strike> element.
+	(w3m-fontify): Change the turn `w3m-fontify-strike-through' and
+	`w3m-fontify-underline'.
+
+2003-11-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* attic/vm-w3m.el: New file.
+
+2003-11-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el: Fbind `select-frame-set-input-focus' when compiling.
+	(w3m-popup-window-p): Rename from `w3m-pop-up-window-p'; use
+	'emacs-major-version' instead of `MULE' to examine the version.
+	(w3m-view-this-url-1): Use `pop-to-buffer' instead of
+	`switch-to-buffer' in order to be able to popup a window or a frame.
+	(w3m-copy-buffer): Ditto; set the `w3m-initial-frame' variable only
+	when `w3m-pop-up-frames' is non-nil.
+	(w3m-delete-buffer): Select the most suitable buffer.
+	(w3m-goto-url): Use `pop-to-buffer' instead of `switch-to-buffer' in
+	order to be able to popup a window or a frame.
+	(w3m): Ditto; rearrange the source code.
+	(w3m-select-buffer-saved-window-config): New variable.
+	(w3m-select-buffer): Save the window configuration.
+	(w3m-select-buffer-copy-buffer): Bind `pop-up-frames'.
+	(w3m-select-buffer-quit): Restore the window configuration; protect
+	agains the absence of an emacs-w3m buffer.
+
+	* w3m-xmas.el: Bind `w3m-use-tab' when compiling.
+	(w3m-xmas-show-current-title-in-buffer-tab): Examine the value for the
+	`gutter-buffers-tab-enabled' variable directly.
+	(w3m-xmas-setup-tab-in-gutter): New function; add it to
+	`w3m-mode-setup-functions' and `w3m-select-buffer-mode-hook'.
+	(w3m-xmas-update-tab-in-gutter): Do update only when `w3m-use-tab' and
+	`gutter-buffers-tab-enabled' are non-nil; always add it to
+	`w3m-display-functions'.
+
+	* octet.el: Don't make sure the `emacs-major-version' variable is
+	bound.
+	* w3m-bitmap: Ditto.
+	* w3m-bug.el: Ditto.
+	* w3m-proc.el: Ditto.
+	* w3m-ucs.el: Ditto.
+	* w3m-util.el: Ditto.
+	* w3m.el: Ditto.
+	* w3mhack.el: Ditto.
+
+2003-11-05  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-delete-buffer, w3m-delete-other-buffers)
+	(w3m-select-buffer-delete-buffer): Call `w3m-process-stop'.
+
+	* w3m-proc.el (w3m-process-kill-stray-processes): New function.
+	(w3m-process-start-queued-processes): Call
+	`w3m-process-kill-stray-processes'.
+	(w3m-process-filter): When parent-buffer was killed, call
+	`w3m-process-kill-stray-processes'
+
+2003-11-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-pop-up-windows): Default to t.
+	(w3m-pop-up-window-p): New macro examining the value for the
+	`w3m-use-tab' variable and the present situation.
+	(w3m-copy-buffer): Use it.
+
+2003-11-04  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-meta-content-type-charset-regexp)
+	(w3m-meta-charset-content-type-regexp)
+	(w3m-meta-refresh-content-regexp)
+	(w3m-meta-content-refresh-regexp): Allow `\n' as whitespaces.
+
+2003-10-31  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-hist.el (w3m-history-backward): Return the current history if the
+	number zero is given as an argument.
+
+2003-10-29  OHASHI Akira  <bg66@koka-in.org>
+
+	* w3m.el (w3m-process-connection-type): Set t when system is darwin
+	version 7.0.0 or later.
+
+2003-10-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-fontify-strike-through (var)): Make it into the variable
+	which is not a user option.
+	(w3m-fontify-strike-through (fn)): Check dynamically whether the window
+	system is used.
+	(w3m-url-at-point): Unify iso646 chars to ascii on XEmacs-mule.
+
+	* mew-w3m.el: Silence the compile warning for `mew-coding-system-p' for
+	people having the Mew XEmacs package installed.
+
+2003-10-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-obey-w3m-pop-up-frames): New variable.
+	(w3m-copy-buffer): Inherit the value of `w3m-initial-frame' into the
+	new buffer if a new frame is not created for the new buffer.
+	(w3m-delete-frame-maybe): Simplify it in the different way.
+
+	* w3m-search.el (w3m-search): Specify the 3rd arg of `w3m'.
+
+2003-10-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el: Revive `w3m-initial-frame' throughout.
+	(w3m-delete-frame-maybe): Revert 2003-10-20 change.
+
+2003-10-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-strike-through-face): Use the :strikethru attribute in
+	XEmacs.
+	(w3m-fontify-strike-through): Enable it also for XEmacs.
+
+2003-10-21  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-w3m-retrieve): Insert no data when either retrieval or
+	decoding is failed.
+	(w3m-w3m-parse-header): Do not return a base URI of retrieved page.
+
+2003-10-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el: Fix some comments and docstrings (to be continued).
+	(w3m-copy-local-variables, w3m-open-all-links-in-new-session,
+	w3m-horizontal-scroll): Remove unused non-global variables.
+
+2003-10-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el: Abolish `w3m-initial-frame' throughout.
+	(w3m-delete-frame-maybe): Simplify.
+
+2003-10-19  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-base-url): Removed.
+	(w3m-attributes, w3m-local-attributes, w3m-w3m-attributes): Do not
+	return a base URI of retrieved page.
+
+2003-10-14  Jose A. Ortega Ruiz  <jao@gnu.org>
+
+	* w3m.el (w3m-decode-entities-string): Move `save-match-data' to the
+	exterior of `with-temp-buffer'.
+
+2003-10-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el (w3m-tab-half-space, w3m-tab-separator): Use `:width'
+	instead of `:relative-width' to specify the space width.
+	(w3m-tab-line): Tidy it up.
+
+	* w3m-favicon.el (w3m-favicon-set-image): Use `:width' instead of
+	`:relative-width' to specify the space width.
+
+2003-10-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el (w3m-tab-unselected-face,
+	w3m-tab-unselected-retrieving-face, w3m-tab-selected-face,
+	w3m-tab-selected-face): Exchange the default TTY colors between
+	selected faces and unselected faces.
+	(w3m-tab-drag-mouse-function): Compare buffer objects instead of buffer
+	names.
+	(w3m-tab-make-keymap): Use buffer objects instead of buffer names.
+	(w3m-tab-line): Make all tab widths the same even if there are wide
+	characters; never use graphic icons in TTY; close the left margin
+	unless there's an icon; add a keymap to favicon; don't put mouse-face
+	on icons.
+	(w3m-initialize-graphic-icons): Don't make graphic icons for TTY; don't
+	put mouse-face on icons.
+
+	* w3m-favicon.el: Bind `w3m-modeline-favicon' when compiling.
+	(w3m-favicon-set-image): Add a half space after favicon.
+
+	* w3m-util.el (w3m-current-title): New function.
+	(w3m-buffer-title): Use it.
+
+	* w3m.el: Silence the byte-compiler for `w3m-info-like-map',
+	`w3m-lynx-like-map', `w3m-minor-mode-map', `w3m-mode-map', and
+	`w3m-setup-menu'.
+
+2003-10-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-favicon.el: Silence the compile warning for `w3m-message'.
+
+	* w3m.el (w3m-url-to-file-name): Enable it to interpret
+	file://localhost/ urls.
+
+2003-10-07  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-form.el (w3m-form-parse-and-fontify): Fix for textarea on w3mmee.
+
+2003-10-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el (frame-current-scroll-bars): Alias to `ignore' if it is
+	not available.
+	(window-fringes): Ditto.
+	(w3m-tab-width): Protect against setting illegal values.
+	(w3m-tab-unselected-face): Don't specify the underline color.
+	(w3m-tab-unselected-retrieving-face): Ditto.
+	(w3m-tab-selected-face): Ditto.
+	(w3m-tab-selected-retrieving-face): Ditto.
+	(w3m-tab-background-face): Ditto.
+	(w3m-tab-timer): Rename from `w3m-tab-line-timer'.
+	(w3m-tab-half-space): New variable.
+	(w3m-tab-separator): New variable.
+	(w3m-tab-line): Show many tabs as far as possible.
+
+	* w3m-favicon.el (w3m-favicon-retrieve): Clear the minibuffer after
+	retrieving favicon.
+
+2003-10-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	We shouldn't use too simple elements like ".+" in the deep nested
+	regexps.  It may cause high cpu or may make Emacs hang.
+
+2003-10-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-use-favicon): Modify the doc-string.
+	(w3m-show-graphic-icons-in-mode-line): New variable.
+	(w3m-show-graphic-icons-in-header-line): New variable.
+	(w3m-buffer-setup): Modify the value for
+	`mode-line-buffer-identification' not to show favicon if
+	`w3m-show-graphic-icons-in-mode-line' is nil.
+
+	* w3m-e21.el: Bind `w3m-show-graphic-icons-in-header-line' and
+	`w3m-show-graphic-icons-in-mode-line' when compiling.
+	(w3m-tab-line): Don't show spinners nor favicons if
+	`w3m-show-graphic-icons-in-header-line' is nil; call
+	`w3m-make-spinner-image' only once.
+	(w3m-initialize-graphic-icons): Don't make graphic icons if
+	`w3m-show-graphic-icons-in-mode-line' is nil.
+
+	* w3m-xmas.el: Bind `w3m-show-graphic-icons-in-mode-line' when
+	compiling.
+	(w3m-initialize-graphic-icons): Don't make graphic icons if
+	`w3m-show-graphic-icons-in-mode-line' is nil.
+
+2003-10-05  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-form.el (w3m-form-replace): Call `set-buffer-modified-p'.
+	(w3m-form-field-parse): Do nothing when fid is nil.
+	(w3m-form-input-radio): Likewise.
+	(w3m-form-get-by-name): New function.
+	(w3m-form-input-map): Use it.
+
+2003-10-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el (w3m-tab-line): Fix the logic determining whether to
+	display favicon.
+
+2003-10-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el (w3m-spinner-map-on-header-line): Abolish.
+	(w3m-modeline-spinner-map): Rename from `w3m-spinner-map-on-mode-line'.
+	(w3m-setup-header-line): Don't initialize
+	`w3m-spinner-map-on-header-line'.
+	(w3m-tab-spinner-map): New variable.
+	(w3m-tab-make-keymap): Initialize it.
+	(w3m-tab-line): Use it.
+
+2003-10-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-modeline-separator): New variable.
+	(w3m-modeline-favicon): New variable.
+	(w3m-favicon-image): Move from w3m-favicon.el.
+	(w3m-buffer-setup): Also call `w3m-initialize-graphic-icons' when Emacs
+	21 is running; simplify the value for
+	`mode-line-buffer-identification'.
+
+	* w3m-e21.el: Bind `w3m-favicon-image' and
+	`w3m-modeline-process-status-on' when compiling.
+	(w3m-spinner-map-on-header-line): New variable.
+	(w3m-spinner-map-on-mode-line): New variable.
+	(w3m-spinner-map-help-echo): New variable.
+	(w3m-setup-header-line): Initialize the value for
+	`w3m-spinner-map-on-header-line'; remove an excessive `list' from the
+	value for `header-line-format'.
+	(w3m-tab-map): New variable.
+	(w3m-tab-make-keymap): Set the value for `w3m-tab-map' in the current
+	buffer.
+	(w3m-tab-line): Add a keymap to the spinner; don't call
+	`w3m-tab-make-keymap', use `w3m-tab-map' instead.
+	(TopLevel): Add-hook `w3m-tab-make-keymap' to
+	`w3m-mode-setup-functions'.
+	(w3m-space-before-modeline-icon): New variable.
+	(w3m-modeline-process-status-on-icon,
+	w3m-modeline-image-status-on-icon, w3m-modeline-status-off-icon,
+	w3m-modeline-ssl-image-status-on-icon,
+	w3m-modeline-ssl-status-off-icon): New variables.
+	(w3m-initialize-graphic-icons): New function.
+	(w3m-make-spinner-image): Don't initialize the value for
+	`w3m-spinner-image-file' here; set the value for
+	`w3m-modeline-process-status-on-icon'.
+
+	* w3m-favicon.el: Bind `w3m-favicon-image' when compiling.
+	(w3m-favicon-image): Move to w3m.el.
+	(w3m-space-before-favicon): Move from w3m-xmas.el.
+	(TopLevel): Make `w3m-modeline-favicon' and `w3m-favicon-image'
+	buffer-local; modify the value or put the `risky-local-variable'
+	property for `w3m-modeline-favicon'.
+	(w3m-favicon-set-image): New macro.
+	(w3m-favicon-setup): Use it.
+	(w3m-favicon-retrieve): Use it.
+
+	* w3m-xmas.el (w3m-xmas-space-before-favicon): Move to w3m-favicon.el
+	and rename to `w3m-space-before-favicon'.
+	(w3m-space-before-modeline-icon): Rename from
+	`w3m-xmas-space-before-modeline-icon'.
+
+2003-10-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-proc.el (w3m-process-filter): Relax the regular expression to
+	detect progress status.
+
+2003-10-02  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-w3m-expand-arguments): Redefine as a function rather than
+	a macro.
+	(w3m-dump-head-source-command-arguments): Simplify.
+	(w3m-halfdump-command-arguments): Ditto.
+
+2003-10-02  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-proc.el (w3m-process-filter): Check return value of
+	`w3m-process-handler-parent-buffer' to move current buffer safely.
+
+2003-10-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-modeline-image-status-on, w3m-modeline-process-status-on,
+	w3m-modeline-ssl-image-status-on, w3m-modeline-ssl-status-off,
+	w3m-modeline-status-off): Use `defvar' instead of `defconst'.
+	(w3m-buffer-setup): Call `w3m-initialize-graphic-icons' instead of
+	`w3m-make-spinner-image'; simplify the value for
+	`mode-line-buffer-identification'.
+
+	* w3m-xmas.el (w3m-xmas-space-before-modeline-icon): Rename from
+	`w3m-xmas-space-before-spinner'.
+	(w3m-modeline-process-status-on-icon,
+	w3m-modeline-image-status-on-icon, w3m-modeline-status-off-icon,
+	w3m-modeline-ssl-image-status-on-icon,
+	w3m-modeline-ssl-status-off-icon): New variables.
+	(w3m-spinner-image): Abolish.
+	(w3m-make-spinner-image): Abolish.
+	(w3m-initialize-graphic-icons): New function.
+
+	* icons/state-00.xpm:
+	* icons/state-01.xpm:
+	* icons/state-10.xpm:
+	* icons/state-11.xpm: New files.
+
+2003-10-02  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-halfdump-command-arguments): Add "ucs_conv" option when
+	using w3m-m17n; check w3m-output-coding-system at run time.
+
+2003-10-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-proc.el (w3m-process-start-after): Make sure the value for
+	`w3m-current-buffer' is non-nil.
+
+2003-10-02  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-process-modeline-format): New option.
+	(w3m-buffer-setup): Set `mode-line-process'.
+
+	* w3m-proc.el: Bind `w3m-process-modeline-format' to suppress
+	byte-compile warning.
+	(w3m-process-modeline-string): New buffer-local variable.
+	(w3m-process-start-after): Reset the above variable.
+	(w3m-process-filter): Check size of retrieved data and set the above
+	variable.
+	(w3m-process-modeline-format): New function.
+
+2003-10-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-make-spinner-image): Make sure the gifsicle program
+	is available.
+
+2003-09-30  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-use-symbol): Use `w3m-mule-unicode-p'.
+
+	* w3m-symbol.el (w3m-mule-unicode-symbol): Ditto.
+
+2003-09-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-proc.el (w3m-process-stop): Redisplay the header-line.
+
+	* w3m-e21.el (w3m-tab-line-format, w3m-tab-line-timer, w3m-tab-line):
+	Revive the timer operation.
+	(w3m-tab-line): Wobble the window size to force redisplay of the
+	header-line using a timer; include spinner images in the return value
+	when external processes are running.
+	(w3m-spinner-image-file): New variable.
+	(w3m-spinner-image-frames): New variable.
+	(w3m-spinner-image-index): New variable.
+	(w3m-make-spinner-image): New function.
+
+	* w3m-favicon.el (w3m-favicon-retrieve): Always redraw Emacs frame
+	using the timer; wobble the window size instead of redrawing; increase
+	the delay time for the timer.
+
+2003-09-30  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-form.el (w3m-form-parse-and-fontify): Fix problem when form_int
+	appears after input_alt and action is specified.
+
+2003-09-29  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-symbol.el (w3m-mule-unicode-symbol): Fix customization type.
+
+2003-09-29  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-symbol.el: Bind `w3m-output-coding-system' when compiling.
+	(w3m-mule-unicode-symbol): New variable.
+	(w3m-symbol): Add it for candidate.
+	(w3m-symbol): Use it.
+
+	* w3m.el (w3m-use-symbol): Check capability for
+	`w3m-mule-unicode-symbol'.
+
+2003-09-29  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el (w3m-tab-line-format, w3m-tab-line-timer, w3m-tab-line):
+	Remove the timer operation temporally.
+
+2003-09-26  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-xmas.el (w3m-make-spinner-image): Bind `format-alist' to nil.
+
+2003-09-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el (w3m-tab-line-timer): New variable.
+	(w3m-tab-line): Use it to control this function running too frequently;
+	simplify the source code.
+
+	* w3m-favicon.el (w3m-favicon-image-of): Abolish.
+	(w3m-favicon-retrieve): Use a timer to redraw Emacs frame.
+
+	* w3m-xmas.el (w3m-xmas-space-before-favicon): New user option.
+	(w3m-xmas-space-before-spinner): New user option.
+	(w3m-make-spinner-image): Make sure the `gif' feature is available.
+
+	* w3m.el (w3m-buffer-setup): Use `w3m-xmas-space-before-spinner' and
+	`w3m-xmas-space-before-favicon'.
+
+2003-09-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* icons/spinner.gif: New file (without LZW compression).
+	* icons30/spinner.gif: Ditto.
+
+	* Makefile.in (install-icons, install-icons30): Also install gifs.
+
+	* w3m-xmas.el (w3m-make-spinner-image): Use the spinner.gif file.
+
+	* w3m-e21.el (w3m-tab-line-format): New variable (see doc-string).
+	(w3m-tab-line): Use it; use a timer to suppress this function running
+	too frequently.
+
+2003-09-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-spinner-image): New variable.
+	(w3m-make-spinner-image): New function.
+
+	* w3m.el (w3m-buffer-setup): Call `w3m-make-spinner-image', show a
+	spinner in the modeline under XEmacs.
+
+2003-09-24  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-form.el (w3m-form-put-property): Don't call intern if it is not a
+	string.
+	(w3m-form-get-property): Ditto.
+	(w3m-form-put): Added argument ID.
+	(w3m-form-get): Changed argument from NAME to ID.
+	(w3m-form-make-form-data): Changed process to get NAME and VALUE.
+	(w3m-form-resume): Follow the API change in w3m-form-put and
+	w3m-form-get.
+	(w3m-fontify-textareas): Ditto.
+	(w3m-form-parse-and-fontify): Ditto.
+	(w3m-form-input): Ditto.
+	(w3m-form-input-password): Ditto.
+	(w3m-form-input-checkbox): Ditto.
+	(w3m-form-input-radio): Ditto.
+	(w3m-form-input-file): Ditto.
+	(w3m-form-input-textarea-set): Ditto.
+	(w3m-form-textarea-info): Ditto.
+	(w3m-form-input-select): Ditto.
+	(w3m-form-submit): Ditto.
+	(w3m-form-real-reset): Follow the structure change.
+	(w3m-form-input-select-id): New buffer local variable.
+	(w3m-form-input-select-set): Use it.
+	(w3m-form-field-parse): New inline function.
+	(w3m-form-parse-and-fontify): Put id for selectinfo.
+	(w3m-form-resume): Fixed regexp.
+	(w3m-form-input-textarea): Fixed line number.
+	(w3m-fontify-textareas): Put w3m-form-id property.
+	(w3m-form-parse-and-fontify): Store id to the textareainfo.
+
+2003-09-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-favicon.el (w3m-favicon-retrieve): Redisplay Emacs frame; rename
+	from `w3m-retrieve-favicon'.
+	(w3m-favicon-image): Rename from `w3m-current-favicon-image'.
+	(w3m-favicon-setup): Rename from `w3m-setup-favicon'.
+	(w3m-favicon-image-of): Rename from `w3m-buffer-favicon'.
+	(w3m-favicon-convert): Rename from `w3m-convert-favicon'.
+	(w3m-favicon-retrieve): Rename from `w3m-retrieve-favicon'.
+
+	* w3m-e21.el (w3m-tab-line): Rename `w3m-buffer-favicon' with
+	`w3m-favicon-image-of'.
+
+	* w3m.el (w3m-clean-hook-options): Rename `w3m-setup-favicon' with
+	`w3m-favicon-setup'.
+	(w3m-buffer-setup): Rename `w3m-current-favicon-image' with
+	`w3m-favicon-image'.
+
+2003-09-23  OHASHI Akira  <bg66@koka-in.org>
+
+	* w3m.el (w3m-process-connection-type): Set nil when system-type is
+	darwin.
+
+2003-09-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-favicon.el: Bind `w3m-icon-data' when compiling.
+	(w3m-current-favicon-data): Abolish.
+	(w3m-favicon-converted): Abolish.
+	(w3m-favicon-cache-data): Contain image data.
+	(w3m-favicon-cache-favicon): Return an image instead of raw data.
+	(w3m-setup-favicon): Fix the condition to check whether Emacs can
+	display images; set the value of `w3m-current-favicon-image' instead of
+	`w3m-current-favicon-data' for the about: pages.
+	(w3m-buffer-favicon): Make it simply get the value of
+	`w3m-current-favicon-image'.
+	(w3m-convert-favicon): Accept raw data and type; simply return an
+	image.
+	(w3m-retrieve-favicon): Rearrange the arguments to accept url and type
+	independently; set the value of `w3m-current-favicon-image' instead of
+	`w3m-current-favicon-data'; store an image into
+	`w3m-favicon-cache-data'.
+	(w3m-favicon-save-cache-file): Save data only if they contained images;
+	strip images from the cache for saving.
+	(w3m-favicon-load-cache-file): Create images for all the cache.
+
+	* w3m.el (w3m-buffer-setup): Use `w3m-current-favicon-image' instead of
+	`w3m-favicon-converted' for `mode-line-buffer-identification' under
+	XEmacs in order to check whether the favicon image is available.
+	(w3m-examine-command-line-args): Use `member' instead of `memq' under
+	XEmacs to check whether `command-line-args' contains the same string as
+	the car of `command-line-args-left'.
+
+2003-09-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-favicon.el: Autoload w3m for `w3m-expand-url' when compiling.
+	(w3m-setup-favicon): Fix the change of 2003-09-12 which was gone to
+	far.
+
+	* w3m.el (w3m-open-all-links-in-new-session): Improve the regexp.
+	(w3m-examine-command-line-args): Don't let it misunderstand the next
+	command as a url string; modify the arguments in `command-line-args'
+	instead of removing them.
+	(w3m): Use `w3m-examine-command-line-args' even if it is called
+	non-interactively.
+
+2003-09-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-open-all-links-in-new-session): Don't use
+	`w3m-select-buffer'.
+
+2003-09-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-popup-frame-p): Make it accept the `interactive-p'
+	argument.
+	(w3m-examine-command-line-args): New function.
+	(w3m): Use it.
+
+2003-09-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-favicon.el: Bind some external variables when compiling.
+
+2003-09-19  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-form.el (w3m-form-make-form-data): Insert "--" before the
+	multipart post boundary.
+
+2003-09-19  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-underline-face): New face.
+	(w3m-strike-through-face): New user variable.
+	(w3m-fontify-strike-through): New function.
+	(w3m-fontify): Call `w3m-fontify-strike-through'
+
+2003-09-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-favicon.el (w3m-setup-favicon): Convert favicon data to an image
+	for the about: pages using `w3m-convert-favicon'.
+	(w3m-buffer-favicon): Move the data conversion procedure to
+	`w3m-convert-favicon'.
+	(w3m-convert-favicon): New function detached from `w3m-buffer-favicon';
+	make it work synchronously.
+	(w3m-retrieve-favicon): Convert favicon data to an image.
+
+	* w3m-image.el (w3m-imagick-convert-buffer): Erase buffer before
+	calling the convert program.
+
+	* w3m.el (w3m-buffer-setup): Modify the value for
+	`mode-line-buffer-identification' in order to make it possible to show
+	favicon under XEmacs.
+
+2003-09-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-open-all-links-in-new-session): New function.  Suggested
+	by Yoichi NAKAYAMA <yoichi@geiin.org>.
+	(w3m-view-this-url-new-session): Call
+	`w3m-open-all-links-in-new-session' if the region is active.
+
+2003-09-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-key-binding): Don't use `custom-set-default'.
+	(w3m-use-favicon): Ditto.
+	* w3m-favicon.el (w3m-favicon-size): Ditto.
+
+	* icons/*.xpm: Remove text.
+
+2003-09-17  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-form.el (w3m-form-new): Use `application/x-www-form-urlencoded'
+	instead of `urlencoded'.
+	(w3m-form-parse-and-fontify): Ditto.
+	(w3m-form-make-form-data): Use `multipart/form-data' instead of
+	`multipart'.
+	(w3m-form-mee-new): Likewise.
+
+2003-09-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el (w3m-e21-toolbar-configurations): Don't modify the values
+	for `tool-bar-button-margin' and `tool-bar-button-relief'.
+
+	* w3mhack.el (w3mhack-nonunix-install): Use icons30 for XEmacs.
+	(w3mhack-make-package): Use icons30.
+
+	* Makefile.in (SUBDIRS): Add icons30.
+	(install-icons30): New rule.
+	(install-package, install-package-ja): Use it.
+
+	* icons/*.xpm: Shrink the size of all icons.
+	* icons30/: Old icons are here.
+
+2003-09-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el (w3m-activate-zmacs-regions): New macro.
+	* w3m.el (w3m-next-anchor, w3m-previous-anchor, w3m-next-form,
+	w3m-previous-form, w3m-next-image, w3m-previous-image,
+	w3m-scroll-up-or-next-url, w3m-scroll-down-or-previous-url,
+	w3m-beginning-of-line, w3m-end-of-line): Use it.
+
+2003-09-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-hist.el (w3m-history-backward): Return nil if there is no
+	previous element.
+
+	* w3m.el (w3m-view-previous-page): Skip the current page if it seems
+	broken; warn if there's no more history.
+	(w3m-copy-buffer): Use the current history for the url string if the
+	current page seems broken.
+	(w3m-goto-url): Use `lexical-let' to pass the history position data to
+	the asynchronous w3m process.
+
+2003-09-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el: Move the favicon stuff to w3m-favicon.el.
+
+	* w3m-favicon.el: New file detached from w3m-e21.el.
+	(w3m-favicon-type): Adapt it to XEmacs as well.
+	(w3m-setup-favicon): Ditto.
+	(w3m-buffer-favicon): Ditto.
+	(w3m-retrieve-favicon): Replace `float-time' with `w3m-float-time'.
+	(w3m-arrived-setup-functions): Don't add-hook it here.
+	(w3m-arrived-shutdown-functions): Ditto.
+
+	* w3m-xmas.el: Require `w3m-favicon'.
+
+	* w3m.el (w3m-arrived-setup-functions): Add
+	`w3m-favicon-load-cache-file' if w3m-favicon is loaded.
+	(w3m-arrived-shutdown-functions): Add `w3m-favicon-save-cache-file' if
+	w3m-favicon is loaded.
+
+	* w3m-util.el (w3m-float-time): New function.
+
+	* w3mhack.el (w3mhack-examine-modules): Exclude w3m-favicon.el from the
+	files to be byte-compiled.
+
+2003-09-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-view-this-url-1): Fix a window configuration only when
+	the buffer's major mode has changed from the w3m-mode to another.
+	(w3m-goto-url): Don't erase a buffer when retrieving a local file.
+
+2003-08-29  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-copy-buffer): Copy the history before visiting a page in
+	order to show the about://history/ page correctly; adjust the position
+	in the history after copying.
+	(w3m-goto-url): Use buffer-local properties instead of global
+	properties for form data.
+	(w3m-reload-this-page): Specify the history element to the
+	`w3m-goto-url' function in order to submit the form data.
+
+2003-08-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-view-this-url-1): Don't kill the emacs-w3m buffer when a
+	process is in progress.
+	(w3m-goto-url-new-session): Ditto.
+
+2003-08-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-view-previous-page): Specify a history element of the
+	previous page to the `w3m-goto-url' function as the 7th arg.
+	(w3m-goto-url): Accept a history element as the 7th argument; specify
+	nil as the 7th argument when recursively calling itself; use a given
+	history element to examine the form data of the url to be visited.
+	(w3m-goto-url-new-session): Specify nil to the `w3m-goto-url' function
+	as the 7th argument.
+	(w3m): Ditto.
+
+2003-08-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-hist.el (w3m-history-minimize-in-new-session): New user option.
+	(w3m-history-set-current): Redefine as an inline function rather than a
+	macro.
+	(w3m-history-current-1): Abolish the function.
+	(w3m-history-current-2): Abolish the function.
+	(w3m-history-element): New function.
+	(w3m-history-current): Abolish the funtction.
+	(w3m-history-backward): Don't modify the current position pointer in
+	the `w3m-history' variable.
+	(w3m-history-forward): Simplify using `w3m-history-backward'.
+	(w3m-history-copy): Minimize the history when
+	`w3m-history-minimize-in-new-session' is non-nil.
+	(w3m-history-plist-get): Abolish the `url' argument; complement the
+	meaning of the `local' argument.
+	(w3m-history-add-properties): Ditto.
+	(w3m-history-plist-put): Ditto.
+	(w3m-history-remove-properties): Ditto.
+	(w3m-history-store-position): Don't specify the optional arguments to
+	`w3m-history-add-properties'.
+	(w3m-history-restore-position): Abolish the `url' argument; don't
+	specify the optional arguments to `w3m-history-plist-get'.
+	(w3m-history-minimize): Simplify using `w3m-history-element'.
+
+	* w3m.el (w3m-view-previous-page): Don't specify the optional arguments
+	to `w3m-history-plist-get' and `w3m-history-restore-position'.
+	(w3m-goto-url): Don't specify the optional arguments to
+	`w3m-history-plist-put', `w3m-history-plist-get',
+	`w3m-history-remove-properties' and `w3m-history-add-properties'.
+	(w3m-reload-this-page): Don't specify the optional arguments to
+	`w3m-history-plist-get' and `w3m-history-remove-properties'.
+
+2003-08-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-hist.el (w3m-history-flat): Reduce the deepness of local
+	prpoerties in the list structure.
+	(w3m-history-assoc): Simplify; redefine as an inline function.
+	(w3m-history-with-element): Abolish the macro.
+	(w3m-history-current-2): New function.
+	(w3m-history-set-plist): New function.
+	(w3m-history-modify-properties): Rewrite.
+	(w3m-history-seek-properties): Abolish the function.
+	(w3m-history-seek-element): New function.
+	(w3m-history-share-properties): Abolish the function.
+	(w3m-history-tree): Tiny change.
+	(w3m-history-push): Rewrite.
+	(w3m-history-copy): Tiny change.
+	(w3m-history-plist-get): Synch to the change of `w3m-history-flat'.
+	(w3m-history-plist-put): Rewrite.
+	(w3m-history-add-properties): Rewrite.
+	(w3m-history-remove-properties): Rewrite.
+	(w3m-history-rename-url): Abolish the function.
+	(w3m-history-store-position): Abolish the optional argument.
+	(w3m-history-minimize): New command.
+
+2003-08-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-hist.el (w3m-history-current-1): Redefine as a function rather
+	than a macro.
+	(w3m-history-previous-position): Ditto.
+	(w3m-history-next-position): Ditto.
+	(w3m-history-modify-properties): Ditto.
+	(w3m-history-save-position): Abolish the macro.
+	(w3m-history-forward-1): Ditto.
+	(w3m-history-backward-1): Ditto.
+	(w3m-history-with-element): Abolish the `set-current' argument.
+	(w3m-history-assoc): Ditto.
+	(w3m-history-plist-get): Ditto.
+	(w3m-history-plist-put): Ditto.
+	(w3m-history-add-properties): Ditto.
+	(w3m-history-remove-properties): Ditto.
+	(w3m-history-rename-url): Ditto.
+	(w3m-history-set-current): New macro.
+	(w3m-history-forward): Abolish the `set-current' argument; use
+	`w3m-history-set-current'.
+	(w3m-history-backward): Ditto.
+	(w3m-history-tree): Use `w3m-history-set-current' instead of
+	`w3m-history-forward-1'.
+	(w3m-history-push): Use `w3m-history-set-current'.
+	(w3m-history-store-position): Don't specify the `set-current' argument
+	to `w3m-history-add-properties'.
+	(w3m-history-restore-position): Don't specify the `set-current'
+	argument to `w3m-history-plist-get'.
+
+	* w3m.el (w3m-view-previous-page): Don't specify the `set-current'
+	argument to `w3m-history-plist-get'.
+	(w3m-goto-url): Don't specify the `set-current' argument to
+	`w3m-history-plist-put', `w3m-history-plist-get',
+	`w3m-history-remove-properties' and `w3m-history-add-properties'.
+	(w3m-reload-this-page): Don't specify the `set-current' argument to
+	`w3m-history-plist-get' and `w3m-history-remove-properties'.
+
+2003-08-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-view-this-url-1): Fix a window configuration if a new
+	buffer visiting the specified url is not in the `w3m-mode'; remove a
+	newly created buffer if it is useless.
+	(w3m-goto-url): Don't use `save-excursion' when performing find-file
+	directly.
+	(w3m-goto-url-new-session): Remove a newly created buffer if it is
+	useless.
+
+2003-08-12  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* Makefile.in (what-where): Add space to avoid error on Solaris.
+
+	* w3m-namazu.el (w3m-about-namazu): Fix last change.
+
+2003-08-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-hist.el (w3m-history-previous-position): New macro.
+	(w3m-history-next-position): New macro.
+	(w3m-history-forward-1): Simplified using new macro(s).
+	(w3m-history-backward-1): Ditto.
+	(w3m-history-regenerate-pointers): Ditto.
+	(w3m-history-assoc): Ditto.
+	(w3m-history-current-1): Don't use old-fashioned backquotes.
+	(w3m-history-save-position): Ditto.
+	(w3m-history-modify-properties): Ditto.
+	(w3m-history-with-element): Ditto.
+
+2003-08-10  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-namazu.el (w3m-about-namazu): Fixed problem when further links
+	contain "&amp;".
+
+2003-08-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-w3m-get-header): Removed.
+	(w3m-w3m-parse-header, w3m-w3m-dump-head): New function.
+	(w3m-w3m-attributes): Call the above functions.
+	(w3m-w3m-dump-head-source): Removed.
+	(w3m-w3m-dump-extra): New function.
+	(w3m-w3m-retrieve, w3m-w3m-retrieve-1): Reimplemented.
+	(w3m-about-header): Call `w3m-w3m-dump-head' instead of
+	`w3m-w3m-get-header'.
+
+	* w3m-proc.el: Changes to support recursive call of functions creating
+	asynchronous processes.
+	(w3m-process-waited): Abolished.
+	(w3m-process-handler-new): Add result slot.
+	(w3m-process-handler-functions): Renamed from
+	`w3m-process-handler-function'.
+	(w3m-process-handler-result): New macro.
+	(w3m-process-with-null-handler): Reimplemented.
+	(w3m-process-start-and-wait): New function.
+	(w3m-process-with-wait-handler): Reimplemented.
+	(w3m-process-do): Reimplemented.
+	(w3m-process-do-with-temp-buffer): Reimplemented.
+	(w3m-process-sentinel): Accept the 3rd argument.  Follow the above
+	changes.
+
+2003-08-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-hist.el (w3m-history-reuse-history-elements): New user option.
+	(w3m-history-forward): Return a cons of a new history element and new
+	position pointers of a history.
+	(w3m-history-backward): Ditto.
+	(w3m-history-regenerate-pointers): New function.
+	(w3m-history-push): If `w3m-history-reuse-history-elements' is nil,
+	sprout a new history branch even if history elements for the same url
+	already exist.
+	(w3m-history-add-arrived-db): Abolish the optional argument; bind
+	`w3m-history-reuse-history-elements' to t.
+
+	* w3m.el (w3m-view-previous-page): Assume `w3m-history-backward'
+	returns cons data; bind `w3m-history-reuse-history-elements' to t; fix
+	position pointers of a history after visiting a page.
+	(w3m-goto-url): Fix position pointers of a history when a page is
+	referred to by the about://history/ page.
+	(w3m-about-history): Include position pointers in an html form.
+	(w3m-history-highlight-current-url): Make history position data
+	invisible.
+
+2003-07-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-decode-entities): Don't trust in the `match-data' after
+	the `w3m-entity-value' function is performed.
+
+2003-07-29  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-command, w3m-user-agent, w3m-command-arguments,
+	w3m-command-arguments-alist, w3m-no-proxy-domains,
+	w3m-command-environment, w3m-fill-column, w3m-mailto-url-function,
+	w3m-mailto-url-popup-function-alist, w3m-imitate-widget-button,
+	w3m-pixels-per-character, w3m-coding-system,
+	w3m-terminal-coding-system, w3m-input-coding-system,
+	w3m-output-coding-system, w3m-file-coding-system,
+	w3m-file-name-coding-system, w3m-default-coding-system,
+	w3m-coding-system-priority-list, w3m-profile-directory, w3m-init-file,
+	w3m-default-save-directory, w3m-accept-languages, w3m-icon-directory,
+	w3m-home-page, w3m-arrived-file, w3m-keep-arrived-urls,
+	w3m-keep-cache-size, w3m-follow-redirection, w3m-resize-image-scale,
+	w3m-default-content-type, w3m-content-type-alist,
+	w3m-encoding-type-alist, w3m-decoder-alist,
+	w3m-charset-coding-system-alist, w3m-correct-charset-alist,
+	w3m-horizontal-scroll-columns, w3m-horizontal-shift-columns,
+	w3m-edit-function, w3m-url-local-directory-alist,
+	w3m-pop-up-frame-parameters, w3m-horizontal-scroll-division,
+	w3m-mbconv-command, w3m-local-find-file-regexps,
+	w3m-local-find-file-function, w3m-local-directory-view-method,
+	w3m-dirlist-cgi-program, w3m-add-referer-regexps, w3m-touch-command,
+	w3m-uri-replace-alist, w3m-db-history-display-size,
+	w3m-select-buffer-window-ratio): Improve the customizing widgets.
+
+	* w3m-symbol.el (w3m-symbol-custom-type): New variable.
+	(w3m-default-symbol, w3m-Chinese-BIG5-symbol, w3m-Chinese-CNS-symbol,
+	w3m-Chinese-GB-symbol, w3m-Japanese-symbol, w3m-Korean-symbol): Use it.
+	(w3m-symbol): Improve the customizing widgets.
+
+	* w3m-search.el (w3m-search-engine-alist, w3m-search-default-engine):
+	Improve the customizing widgets.
+	* w3m-perldoc.el (w3m-perldoc-command, w3m-perldoc-pod2html-command,
+	w3m-perldoc-pod2html-arguments): Ditto.
+	* w3m-filter.el (w3m-filter-rules): Ditto.
+
+2003-07-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-namazu.el (w3m-namazu-command, w3m-namazu-arguments,
+	w3m-namazu-page-max, w3m-namazu-default-index-customize-spec,
+	w3m-namazu-index-alist, w3m-namazu-output-coding-system,
+	w3m-namazu-input-coding-system): Improve the customizing widgets.
+	* w3m-image.el (w3m-imagick-convert-program): Ditto.
+	* w3m-form.el (w3m-form-input-textarea-buffer-lines,
+	w3m-form-input-select-buffer-lines, w3m-form-input-map-buffer-lines):
+	Ditto.
+	* w3m-filter.el (w3m-filter-rules): Ditto.
+	* w3m-e21.el (w3m-favicon-size, w3m-favicon-cache-file,
+	w3m-favicon-cache-expire-wait, w3m-favicon-type, w3m-tab-width): Diito.
+	* w3m-dtree.el (w3m-dtree-directory-depth, w3m-dtree-indent-strings,
+	w3m-dtree-stop-strings): Ditto.
+	* w3m-cookie.el (w3m-cookie-accept-domains, w3m-cookie-reject-domains,
+	w3m-cookie-accept-bad-cookies, w3m-cookie-file): Ditto.
+	* w3m-bookmark.el (w3m-bookmark-file, w3m-bookmark-file-coding-system,
+	w3m-bookmark-default-section): Ditto.
+	* w3m-bitmap.el (w3m-bitmap-convert-arguments): Ditto.
+	* w3m-antenna.el (w3m-antenna-sites, w3m-antenna-make-summary-function,
+	w3m-antenna-sort-changed-sites-function,
+	w3m-antenna-sort-unchanged-sites-function, w3m-antenna-file): Ditto.
+	* mime-w3m.el (mime-w3m-safe-url-regexp): Ditto.
+
+2003-07-27  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-accept-japanese-characters): Checked loosely.
+
+2003-07-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Makefile.in (clean): Do not remove `shimbun-servers.el'.
+
+	* w3mhack.el: Do not generate `shimbun-servers.el'.
+	(shimbun-servers-file): Abolished.
+	(w3mhack-compile, w3mhack-batch-compile): Do not call
+	`w3mhack-check-shimbun-servers-file'.
+	(w3mhack-generate-shimbun-servers-file): Removed.
+	(w3mhack-check-shimbun-servers-file): Removed.
+
+	* w3m.el (w3m-fontify-anchors): Handle `id' attributes of anchors.
+	Thanks to Shinichiro HIDA and TAKAISHI Hayato for their reports.
+	(w3m-fontify-bold, w3m-fontify-underline): Stricten regular expressions
+	to detect tags.  For more detail, see [emacs-w3m:05600].
+
+2003-07-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mime-w3m.el (mime-w3m-display-inline-images): Improve the customizing
+	widget.
+
+2003-07-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-language, w3m-command-environment,
+	w3m-content-type-alist, w3m-encoding-type-alist, w3m-decoder-alist,
+	w3m-charset-coding-system-alist, w3m-correct-charset-alist,
+	w3m-url-local-directory-alist, w3m-pop-up-frame-parameters): Improve
+	the customizing widgets.
+
+2003-07-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-generate-shimbun-servers-file): Exclude rss.
+
+2003-07-25  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-form.el (w3m-form-set-method): New inline function, that is a
+	`setf' method of `w3m-form-method'.
+
+	* w3mhack.el (w3mhack-examine-modules): Because Mew 2.x and later do
+	not support Mule2.3 and Emacs19, ignore mew-shimbun.el when compiling
+	on such Emacsen.
+
+2003-07-24  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-output-coding-system): Changed condition to use utf-8
+	with w3m-m17n.
+	(w3m-halfdump-command-arguments): Ditto.
+
+2003-07-24  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-form.el (w3m-form-parse-and-fontify): Fix for the pages in which
+	form_int appears after input_alt.
+
+2003-07-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-makeinfo): Force texinfmt.elc to load texinfo.elc
+	from the correct place.  <cf. [emacs-w3m:05573]>
+
+2003-07-19  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-e21.el (w3m-euc-japan-encoder): Fixed comment.
+
+
+2003-07-18  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Release emacs-w3m-1.3.6 from emacs-w3m-1_3 branch.
+
+2003-07-18  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-e21.el (w3m-ccl-get-ucs-codepoint-with-emacs-unicode): Remove
+	`translate-character'.
+	(w3m-euc-japan-encoder, w3m-iso-latin-1-encoder): Select appropriate
+	encoders when thie file is loaded.
+
+	* w3m-ccl.el (w3m-ccl-write-repeat): Use a literal list of unibyte
+	character sets, instead of calling `charset-bytes', in order to avoid
+	difference between FSF Emacs and XEmacs.
+	(w3m-euc-japan-encoder, w3m-iso-latin-1-encoder): Do not overwrite, if
+	they have already been defined.
+
+2003-07-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-examine-modules): Ignore w3m-ccl.el when XEmacs
+	doesn't provide the mule feature.
+
+2003-07-17  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-correct-charset-alist): New user option.
+	(w3m-correct-charset): New inline macro.
+	(w3m-detect-meta-charset): New function.
+	(w3m-decode-buffer): Use `w3m-correct-charset' and
+	`w3m-detect-meta-charset'.
+	(w3m-create-page): Set `charset' to `w3m-current-content-charset' if it
+	is nil.
+	(w3m-region): If `charset' is nil, check `content-charset' in `META
+	Tag'.
+
+2003-07-17  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-ccl.el (toplevel): Add autoload for `charset-id' defined at
+	w3m-om.el.
+	(w3m-ccl-write-repeat): Simplified.
+	(w3m-ccl-write-euc-japan-character): Set nil, when
+	`read-multibyte-character' is not available.
+	(w3m-ccl-write-iso-latin-1-character): Ditto.
+
+	* w3m-om.el: Remove redundant `function'.
+	(w3m-om-character-set-alist): New variable.
+	(charset-id): New function.
+
+	* w3m.el (w3m-input-coding-system): Change its default value for
+	Mule2.3 and Emacsen without Mule.
+
+2003-07-17  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3mhack.el (w3mhack-examine-modules): Ignore w3m-ccl.el when ccl.el
+	is missing.
+
+	* w3m-e21.el (w3m-ccl-get-ucs-codepoint-with-emacs-unicode): Import
+	from w3m-ccl.el.
+
+	* w3m-ucs.el (w3m-ccl-get-ucs-codepoint-with-mule-ucs): Import from
+	w3m-ccl.el.
+
+	* w3m-ccl.el: Export the above constants.
+
+	* w3m.el (w3m-retrieve-and-render): Check current content charset
+	before `w3m-create-page' is called.
+
+2003-07-17  ARISAWA Akihiro <ari@mbf.sphere.ne.jp>
+	    TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (toplevel): Do not require `ccl'.
+	(w3m-input-coding-system): Change its default value.
+	(w3m-internal-characters-alist): Moved to w3m-ccl.el
+	(w3m-ccl-write-repeat): Ditto.
+	(w3m-euc-japan-decoder): Ditto.
+	(w3m-euc-japan-encoder): Ditto.
+	(w3m-iso-latin-1-decoder): Ditto.
+	(w3m-iso-latin-1-encoder): Ditto.
+
+	* w3m-ccl.el: New file.
+
+	* w3m-ucs.el: Completely rewritten.
+	(w3m-euc-japan-mule-ucs, w3m-iso-latin-1-mule-ucs): New coding systems.
+
+	* w3m-e21.el (toplevel): Require `w3m-ccl'.
+	(w3m-euc-japan-encoder, w3m-iso-latin-1-encoder): New encoder.
+
+	* w3m-om.el, w3m-e20.el, w3m-xmas.el (toplevel): Require `w3m-ccl'.
+
+2003-07-17  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-about-db-history): Call `w3m-arrived-time' with string.
+
+2003-07-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-uri-replace-alist): Improve the customizing widget.
+
+2003-07-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-copy-buffer): Fix the logical error installed by the last
+	change at 2003-07-15.
+
+2003-07-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-image-only-page): Abolished.
+	(w3m-show-error-information): Return nil.
+	(w3m-create-text-page): Return 'text-page.
+	(w3m-create-image-page): Return 'image-page.
+	(w3m-create-page): Return 'external-view when `w3m-external-view' is
+	called.
+	(w3m-goto-url): Do not encode a given URL when it points a local page.
+	Bind `w3m-current-buffer' locally.  Follow the change of
+	`w3m-create-page'.
+	(w3m-copy-buffer): Wrap `w3m-goto-url' with
+	`w3m-process-with-wait-handler', to avoid unexpected asynchronous
+	processes.
+	(w3m-region): Bind `w3m-current-buffer' locally.
+
+	* w3m-util.el (w3m-url-local-p): Stricten its regexp.
+	(w3m-url-dtree-p): Removed.
+
+2003-07-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-uri-replace-alist): Revert 2003-07-09 change; improve the
+	customizing widget.
+
+	* doc/ptexinfmt.el (texinfo-discard-command-and-arg): New function for
+	old Emacsen.
+
+2003-07-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-decoder-alist): Simplified.
+
+2003-07-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-decoder-alist): Look for the newest inflate command.
+
+2003-07-09  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* mew-w3m.el (w3m-mew-support-cid): Check `mew-version-number'.
+	(mew-w3m-cid-retrieve): Support Mew 4.0.53 and later.  Thanks to Kazu
+	YAMAMOTO for his patch.
+
+2003-07-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-uri-replace-alist): Add `rpm', `waei', `eiwa', `kokugo'
+	and `eiei'.
+	(w3m-input-url): Do not encode its return value.
+	(w3m-goto-url): Call `w3m-url-transfer-encode-string' to encode a given
+	URL.
+
+
+2003-07-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Release emacs-w3m-1.3.5 from emacs-w3m-1_3 branch.
+
+2003-07-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-view-this-url-1): Simply copy buffer's contents to the
+	new session rather than to call `w3m-goto-url'.
+
+2003-07-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-local-file-type): Check whether a regular expression is
+	specified, before matching it on a URL.
+
+	* Following changes are to check whether required libraries are
+	available.
+
+	* w3mhack.el (toplevel): Do not create `shimbun/shimbun-servers.el' and
+	`w3m-kwds.el' only when this file is loaded, to suppress excessive
+	messages.
+	(w3mhack-check-shimbun-servers-file): New function.
+	(w3mhack-check-colon-keywords-file): New function.
+	(w3mhack-compile): Call these functions explicitly.
+	(w3mhack-batch-compile, w3mhack-locate-library, w3mhack-print-status):
+	New functions.
+
+	* configure.in: Check that egrep is available and that regexp-opt.el
+	and xml.el are available.
+
+	* aclocal.m4 (AC_EMACS_LISP): Add `-q' option and `-no-site-file'
+	option.
+	(AC_ADD_LOAD_PATH): Define `--with-attic' option.
+	(AC_CHECK_ELISP): New function.
+
+	* Makefile.in (.el.elc): Call `w3mhack-batch-compile' instead of
+	`batch-byte-compile'.
+	(very-slow): Always call `keywords' target.
+	(keywords): Call `w3mhack-check-colon-keywords-file'.
+
+2003-07-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-antenna.el (w3m-about-antenna): Fix the expression to decide
+	changed sites.
+
+	* w3m.el (w3m-retrieve-and-render): Do not overwrite an arrived time
+	with a modified time, even if the modified time is newer than the
+	arrived time.  Store a real URL to arrived DB.
+	(w3m-about-db-history): Small clean up.
+
+	* attic/xml.el: Import contrib/xml.el of Oort Gnus.  Require cl and
+	poe.
+
+2003-07-02  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-bookmark.el (w3m-bookmark-add): Encode special characters
+	included in a URL and a title.
+
+	* w3m-antenna.el (w3m-antenna-check-all-sites): Use `w3m-antenna-alist'
+	instead of `w3m-antenna-sites'; this change must have no ill effects
+	because `w3m-use-setup' merges site informations kept by
+	`w3m-antenna-sites' into `w3m-antenna-alist'.
+	(w3m-about-antenna): Fix.
+	(w3m-antenna-add-current-url): Encode special characters included in
+	`w3m-current-title'.
+
+	* w3m.el: Changes of functions handling the arrived database, and clean
+	up w3m-retrieve-and-render() and related parts.
+	(w3m-content-type-alist): Change spec.
+	(w3m-attributes): Strip authentication part from URL before checking
+	charsets given by a user.
+	(w3m-arrived-add-1): Removed.
+	(w3m-arrived-add): Reimplemented.
+	(w3m-arrived-modify): Removed.
+	(w3m-arrived-time): Define its `setf' method.
+	(w3m-arrived-get, w3m-arrived-put): New inline functions.
+	(w3m-arrived-title): Define as a macro using `w3m-arrived-get'.
+	(w3m-arrived-last-modified): Ditto
+	(w3m-arrived-content-charset): Ditto
+	(w3m-arrived-content-type): Ditto.
+	(w3m-arrived-shutdown): Modify a predicate used for comparing arrived
+	elements, to ensure that every URL precedes its variants with
+	fragments.
+	(w3m-encode-specials-string): New function.
+	(w3m-safe-decode-buffer): New function.
+	(w3m-rendering-extract-title): Simplified.
+	(w3m-rendering-half-dump): Define as a normal function.
+	(w3m-rendering-buffer): Do not call `w3m-filter'.
+	(w3m-retrieve-and-render): Reimplemented.
+	(w3m-show-error-information): Change its argument spec.
+	(w3m-content-prepare-functions): Abolished.
+	(w3m-prepare-content): Reimplemented.
+	(w3m-prepare-text-content, w3m-prepare-image-content): Removed.
+	(w3m-create-text-page, w3m-create-image-page): New functions; the
+	successors of the aboves.
+	(w3m-create-page): New function.
+	(w3m-goto-url): Follow above changes and clean up.
+	(w3m-redisplay-and-reset): Call `setf' methods instead of using
+	`w3m-arrived-modify'.
+	(w3m-redisplay-with-charset): Ditto.
+	(w3m-redisplay-with-content-type): Ditto.
+	(w3m-about-header): Strip authentication part from URL before
+	extracting titles.
+	(w3m-about-history): Encode special characters included in a title.
+	(w3m-about-db-history): Encode special characters in the title.  Ignore
+	URLs that include fragments.
+
+2003-07-01  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+	* doc/ptexinfmt.el: @verb, @tie, @/ support.
+	(ptexinfmt-broken-facility): Abolish NO-NOTICE argument.  Use
+	`ptexinfmt-disable-broken-notice-flag' instead.
+
+2003-07-01  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* mew-w3m.el (mew-mime-text/html-w3m): Add CHARSET argument of
+	`w3m-region' when no w3m-m17n.
+
+2003-07-01  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* mime-w3m.el (mime-w3m-preview-text/html): Call `w3m-region' with
+	`charset' option.
+
+2003-07-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-goto-url): Use `w3m-url-strip-fragment' instead of
+	`w3m-base-url' for local files.
+
+2003-07-01  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-arrived-load-list): Check that `w3m-arrived-file' exists
+	before deleting it.
+	(w3m-check-refresh-attribute): Condition relaxed.
+	(w3m-region): Disable checking refresh attribute.
+
+2003-06-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Some miscellaneous changes and large changes to make a filter
+	module cooperate with w3mmee and w3m-m17n.
+	(w3m-language): Stricten its customize spec.
+	(w3m-attributes): Call `w3m-url-strip-fragment' instead of using a
+	literal regular expression.
+	(w3m-arrived-load-list): New function.
+	(w3m-arrived-setup, w3m-arrived-shutdown): Use the above.
+	(w3m-url-decode-string): Call `vector' instead of `string' to avoid
+	making unexpected multibyte characters.
+	(w3m-decode-buffer): Do not call `w3m-decode-get-refresh'.
+	(w3m-decode-get-refresh): Removed.
+	(w3m-check-refresh-attribute): New function, the successor of the
+	above.
+	(w3m-rendering-half-dump): Encode a content for w3mmee and w3m-m17n
+	with `w3m-current-coding-system' instead of giving it as a binary data.
+	Because `w3m-current-coding-system' keeps a coding system used to
+	decode the current buffer, all characters should be recovered by this
+	encoding.
+	(w3m-rendering-buffer-1): Removed.
+	(w3m-rendering-buffer): New function, the successor of the above.
+	(w3m-rendering-unibyte-buffer): Removed.
+	(w3m-rendering-multibyte-buffer): Removed.
+	(w3m-prepare-text-content): Always call `w3m-decode-buffer'. Call
+	`w3m-rendering-buffer' instead of `w3m-rendering-unibyte-buffer'.
+	(w3m-goto-url): Fix regular expressions.
+	(w3m-region): Accept the 4th optional argument, `charset'.  Set
+	`w3m-current-coding-system' to the coding system based on the given
+	charset.  Call `w3m-rendering-buffer' with the charset.
+
+2003-06-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-makeinfo): Include other files first.
+
+2003-06-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-shimbun-modules-using-rss): Don't use
+	`with-temp-buffer'.
+
+2003-06-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3mhack.el (w3mhack-shimbun-modules-using-rss): New function.
+	(w3mhack-examine-modules): Call the above instead of a literal list.
+
+2003-06-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* doc/Makefile.in (install): Don't run install-info for non- existent
+	info files.
+
+	* w3mhack.el (w3mhack-examine-modules): Also examine
+	"sb-pukiwiki-rss.el".
+
+2003-06-19  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-namazu.el (w3m-namazu-complete-index): Consider `predicate'
+	option.
+
+	* w3m-weather.el (w3m-weather-completion-table): Add `oki' as the
+	shortend form of `shimanekenoki'.
+
+2003-06-18  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-fontify-anchors): Do not encode fragment parts.
+
+2003-06-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-examine-modules): Ignore the shimbun modules
+	which need xml.el if it is not available.
+
+2003-06-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-makeinfo): Improve the last change.
+
+
+2003-06-18  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Release emacs-w3m-1.3.4 from emacs-w3m-1_3 branch.
+
+2003-06-18  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-arrived-ignored-regexp): Use "\`" instead of "^".
+	(w3m-history-ignored-regexp): Ditto.
+	(w3m-url-transfer-encode-string): New inline function.
+	(w3m-fontify-anchors): Encode URL with the attribute `charset'.
+	(w3m-input-url): Encode URL with `w3m-default-coding-system'.
+	(w3m-about-header): Display the current anchor information.
+
+	* w3m-form.el (w3m-form-parse-and-fontify): Encode URL with the
+	attribute `charset'.
+
+2003-06-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-makeinfo): Encode messages to terminal while
+	formatting info pages.
+
+2003-06-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-w3m-attributes): Improve the regexp to extract
+	content-types.
+
+2003-06-08  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-form.el (w3m-form-parse-and-fontify): Apply
+	`w3m-decode-anchor-string' to the form action url.
+
+2003-06-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* doc/emacs-w3m.texi, doc/emacs-w3m-ja.texi: Their license is changed
+	from GNU Free Documentation License to GNU General Public License.
+
+2003-05-30  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* octet.el (toplevel): Require poe.
+	(octet-filter-call1): Use `make-temp-file' instead of `make-temp-name'.
+	(octet-filter-call2): Ditto.
+	(octet-filter-call2-extra): Ditto.
+	(octet-temp-directory): Changed default value to
+	`temporary-file-directory'.
+
+2003-05-29  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Makefile.in (DOCS): FAQ, FAQ.ja, README.namazu.ja, README.shimbun.ja,
+	TIPS and TIPS.ja are merged into Info.
+
+2003-05-29  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* doc/Makefile.in (dvi): New target to create dvi files; related
+	targets and macros are installed.
+
+	* doc/.cvsignore: Ignore dvi files.
+
+	* configure.in: Check whether texi2dvi, ptex and jbibtex exists.
+
+2003-05-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* .cvsignore: Ignore tarballs.
+
+	* Makefile.in (SUBDIRS): New macro.
+	(tarball): Refer the above macro, and put texinfo sources into a
+	tarball.
+
+	* aclocal.m4 (AC_ADD_LOAD_PATH): Use the variable `EGREP' instead of
+	the literal `grep'.
+
+2003-05-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (byte-optimizer for match-string-no-properties): `lenght'
+	-> `length'.
+
+2003-05-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Simplify functions that rewrite URIs.
+	(toplevel): Autoload `w3m-search-uri-replace' instead of
+	`w3m-search-quick-search-handler'.
+	(w3m-uri-replace-alist): Changed its default value and its customize
+	spec.
+	(w3m-pattern-uri-replace): New function.
+	(w3m-uri-replace): Reimplemented.
+
+	* w3m-search.el (w3m-search-quick-search-engine-alist): Abolished.
+	(w3m-search-quick-search-engines): Removed.
+	(w3m-search-quick-search-handler): Removed.
+	(w3m-search-uri-replace): New function.
+
+2003-05-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-highlight-current-anchor): Don't infloop even if a w3m
+	buffer is narrowed.
+
+2003-05-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-make-package): Make it work under non-Mule
+	XEmacs.
+
+2003-05-19  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* mew-w3m.el (mew-w3m-use-safe-url-regexp): New variable.
+	(mew-w3m-view-inline-image, mew-mime-text/html-w3m): Use
+	`mew-w3m-use-safe-url-regexp' for `w3m-safe-url-regexp'.
+
+2003-05-12  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (Top): Use w3m-treat-drive-letter for `w3m-expand-path-name'.
+
+2003-05-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* mime-w3m.el (mime-w3m-preview-text/html): Apply the patch posted by
+	Yoichi NAKAYAMA <yoichi@geiin.org> in [emacs-w3m:04836], that correct
+	the wrong usage of `message'.
+
+2003-05-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-fontify-anchors): Invalidate the widget keymap in XEmacs;
+	add a help-echo to the widget button.
+	(w3m-make-minor-mode-keymap): Bind [down-mouse-2] to `undefined' to
+	invalidate the `widget-button-click' command in FSF Emacs.
+
+2003-04-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-imitate-widget-button): New variable.
+	(w3m-imitate-widget-button): New function.
+	(w3m-fontify-anchors): Imitate the widget button.
+	(w3m-next-anchor): Look for the widget button.
+	(w3m-previous-anchor): Ditto.
+
+2003-04-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-retrieve-and-render): Hide a exit status from an error
+	message unless `w3m-process-exit-status'.
+
+2003-04-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-goto-url): Improve and bug fix the find-file code.
+
+2003-04-16  Chihiro Kuroda  <chee@iijmio-mail.jp>
+
+	* w3m.el (w3m-download): Download a directory url to index.html
+	(by default) instead of signaling an error.
+
+2003-04-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-local-find-file-regexps): New user option.
+	(w3m-local-find-file-function): New user option.
+	(w3m-goto-url): Use the function specified by the
+	`w3m-local-find-file-function' variable for local files when the file
+	name matches the `w3m-local-find-file-regexps' variable.
+
+2003-04-04  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-search.el (w3m-search-engine-alist): Change coding-system to
+	`euc-japan' of "waei" and "kokugo". Tnx, Mr. Saito (sai@yedo.com) for
+	his report.
+
+2003-03-26  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-antenna.el (w3m-antenna-check-all-sites): Call `make-symbol'
+	instead of `gensym', in order to make this function free from runtime
+	CL functions.
+
+2003-03-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bug.el (report-emacs-w3m-bug): Make it possible to send a bug
+	report even if emacs-w3m is not running.
+
+2003-03-03  Michael Shields  <shields@msrl.com>
+
+	* w3m-xmas.el (w3m-create-image): Protect against images which are not
+	permitted to be loaded according to `w3m-safe-url-regexp'.
+
+2003-02-28  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-util.el (w3m-get-server-hostname): Rename and move from
+	`w3m-process-get-server-root' in `w3m-proc.el'.
+
+	* w3m-proc.el (w3m-process-set-authinfo, w3m-process-read-user)
+	(w3m-process-read-passwd, w3m-process-y-or-n-p): Use
+	`w3m-get-server-hostname' instead of `w3m-process-get-server-root'.
+
+	* w3m.el (w3m-show-error-information): New customized variable.
+	(w3m-w3m-attributes): Message strange `Location:' like lynx.
+	(w3m-retrieve-and-render): When error occur, show error message in `w3m
+	buffer' to be accompanied by `w3m-show-error-information'.
+	(w3m-show-error-information): New function.
+	(w3m-reload-this-page, w3m-redisplay-this-page)
+	(w3m-redisplay-and-reset, w3m-redisplay-with-charset)
+	(w3m-view-source, w3m-view-header): If `w3m-current-url' is nil, dont'
+	execute command.
+	(w3m): Guard from the bug of `select-frame-set-input-focus' in
+	Emacs-21.3.x. If `w3m-current-url' is nil in `w3m buffer'
+
+2003-02-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-generate-shimbun-servers-file): Exclude fml,
+	glimpse, lump, mailarc, mailman, mhonarc and text; indent.
+	(w3mhack-generate-colon-keywords-file): indent.
+
+2003-02-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-search.el (w3m-search-engine-alist): Add www.alltheweb.com
+	suggested by Chris Beggy <chrisb@kippona.com>; make the default value
+	more suitable to the language environment; don't use the old fashioned
+	backquotes.
+	(w3m-search-default-engine): Always default to google.
+	(w3m-search-prefer-japanese-site): Remove.
+	(w3m-search-inhibited-japanese-engines): Remove.
+	(w3m-search): Bind `completion-ignore-case' to t.
+	(w3m-search-quick-search-handler): Remove
+	`w3m-search-prefer-japanese-site' and
+	`w3m-search-inhibited-japanese-engines'.
+
+2003-02-26  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-w3m-attributes): Allow imperfect Status-Line like no
+	Reason-Phrase. Guard broken header like no location field.
+
+2003-02-25  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-util.el (w3m-url-local-p): Use `\`' instead of `^'.
+
+2003-02-21  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-local-dirlist-cgi): Treat a `local cookie file', again.
+
+2003-02-16  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-type): Support "release candidate" of w3m.
+
+2003-02-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-insert-image): Use `map-extents' instead of
+	`extent-at' repeatedly.
+	(w3m-remove-image): Ditto.
+
+2003-02-05  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-form.el (w3m-form-submit): Remove `!CURRENT_URL!' from action
+	tag.
+
+2003-02-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (TopLevel): Don't gererate the w3m-kwds.el file if there
+	is no permission to write.
+
+	* Makefile.in (clean): Remove shimbun/shimbun-servers.el.
+
+2003-02-04  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+	Katsumi Yamaoka <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-generate-shimbun-servers-file): New function.
+	(TopLevel): Call it.
+
+2003-02-04  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+	* w3mhack.el (shimbun-servers-file): New constant.
+
+2003-02-04  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-mode): Bind `auto-hscroll-mode' for Emacs-21.3.
+
+2003-01-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-image-type): Move forward.
+	(w3m-fontify-images): Use `w3m-action' and `w3m-anchor' instead of
+	`get-text-property'.
+	(w3m-toggle-inline-images-internal): Use `w3m-image' instead of
+	`get-text-property'.
+	(w3m-toggle-inline-image): Don't specify the arg to `w3m-image'.
+	(w3m-resize-inline-image-internal): Use `w3m-image' instead of
+	`get-text-property'.
+	(w3m-zoom-in-image): Don't specify the arg to `w3m-image'.
+	(w3m-zoom-out-image): Ditto.
+	(w3m-view-this-url): Don't bother to call `w3m-anchor' if it is
+	needless.
+	(w3m-print-this-url): Don't pull-in the point into the link if it is
+	called non-interactively.
+	(w3m-highlight-current-anchor-1): Use `w3m-anchor-sequence' instead of
+	`get-text-property'.
+	(w3m-next-anchor): Don't put `nil' element into `w3m-goto-anchor-hist';
+	use `push' instead of `cons'.
+	(w3m-previous-anchor): Ditto.
+	(w3m-next-form): Use `w3m-action' instead of `get-text-property'; don't
+	put `nil' element into `w3m-goto-anchor-hist'; specify the current
+	position to `w3m-action'; use `push' instead of `cons'.
+	(w3m-goto-previous-form): indent.
+	(w3m-previous-form): Use `w3m-action' instead of `get-text-property';
+	don't put `nil' element into `w3m-goto-anchor-hist'; specify the
+	current position to `w3m-action'; use `push' instead of `cons'.
+	(w3m-next-image): Use `w3m-image' instead of `get-text-property'; don't
+	put `nil' element into `w3m-goto-anchor-hist'; specify the current
+	position to `w3m-image'; use `push' instead of `cons'.
+	(w3m-previous-image): Ditto.
+
+	* w3m-form.el (w3m-form-resume): Use `w3m-action' instead of
+	`get-text-property'; specify the current position to `w3m-action'.
+	(w3m-fontify-textareas): Use `w3m-anchor-sequence' instead of
+	`get-text-property'.
+	(w3m-form-replace): Use `w3m-action' instead of `get-text-property'.
+	(w3m-form-textarea-info): Use `get-text-property' instead of
+	`w3m-get-text-property-around'.
+	(w3m-form-reset): Use `w3m-action' instead of `get-text-property'.
+
+	* w3m-util.el (w3m-get-text-property-around): Always search for the
+	text prop around there and pull-in the point into the position where
+	the prop exists.
+	(w3m-action, w3m-anchor, w3m-image, w3m-submit): Use
+	`get-text-property' if the argument is omitted.
+	(w3m-image-scale): Abolished.
+	(w3m-anchor-sequence): Simplified.
+
+	* mime-w3m.el (mime-w3m-mode-map): Bind it when compiling.
+
+2003-01-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (top): Move the last addition (modifying the value for
+	`shell-file-name') just after loading `cl'.
+
+2003-01-28  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3mhack.el (top): Set `cmdproxy.exe' to `shell-file-name' when Win32
+	environment.
+
+2003-01-28  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-local-dirlist-cgi): Treat a `local cookie file'.
+
+2003-01-27  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-ucs.el (w3m-ucs-to-char): Guard error for Mule-UCS 0.85.
+
+2003-01-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-byte-optimize-letX): Add `pathname-coding-system'
+	to be removed from `let' bindings.
+
+2003-01-26  MIYOSHI Masanori  <miyoshi@boreas.dti.ne.jp>
+
+	* w3m-e21.el (w3m-favicon-type): Add BMP at the head of the list.
+	(w3m-favicon-type): Undo the last change and make the priority of BMP
+	the lowest.
+
+2003-01-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-makeinfo): Withdraw the change of 2003-01-09.
+
+2003-01-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3mhack.el (w3mhack-examine-modules, w3mhack-load-path): Check the
+	existence of Gnus for shimbun/nnshimbun.el.
+
+2003-01-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el (w3m-function-max-args): Don't use the arglist
+	destructively.
+
+	* mime-w3m.el (kill-new): Don't refer to the whole arglist of the
+	original function.
+
+2003-01-21  Masatake YAMATO  <jet@gyve.org>
+
+	* w3m.el (w3m-scroll-down-or-previous-url): Added doc string.
+
+2003-01-19  TSUCHIYA Masatoshi  <tsuchiya@pine.kuee.kyoto-u.ac.jp>
+
+	* w3m.el (toplevel): Strict checking that buggy `w3m-time-parse-string'
+	is used.
+
+2003-01-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+	Suggested by KURIHARA Kenichi <kenichi_kurihara@nifty.com>.
+
+	* w3m.el (w3m-async-exec): Always default to `t'.
+	(w3m-process-connection-type): Default to `nil' under MacOS X.
+
+2003-01-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-makeinfo): Insert one excessive newline after a
+	@foo{bar} thing to prevent clinging of a line and a line
+	(old texinfmt bug?) if it should be considered only one thing in a
+	line.
+
+2003-01-07  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* mew-w3m.el (mew-w3m-ext-url-show): Use `mew-buffer-message' instead
+	of `mew-window-configure'.
+
+2003-01-06  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* mew-w3m.el (mew-w3m-ext-url-show): New funcition.
+	(mew-w3m-ext-url-fetch): Ditto.
+	(top): Modify comment. Avoid byte-compile warning for
+	`mew-window-configure'.
+
+2002-12-20  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-about-db-history): Display the information of page.
+
+2002-12-19  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-local-dirlist-cgi): Treat a local cookie.
+
+2002-12-18  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-e21.el (w3m-favicon-type): Change default value and type of
+	custom.
+	(w3m-favicon-type-alist): New internal variable.
+	(w3m-setup-favicon): Don't check 'xpm.
+	(w3m-buffer-favicon): Decide image type of Emacs use
+	`w3m-favicon-type-alist'.
+
+2002-12-17  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-type): Suppert `stable version notation' of w3m-m17n.
+
+2002-12-12  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-use-favicon): Moved from w3m-e21.el.
+
+	* w3m-image.el (w3m-favicon-usable-p): Moved from w3m-e21.el.
+
+	* w3m-e21.el : Bind `w3m-use-favicon' when compiling.
+	(w3m-favicon-usable-p): Moved to w3m-image.el.
+	(w3m-use-favicon): Moved to w3m.el.
+
+2002-12-07  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-form.el (w3m-form-text-chop): Added nil check.
+
+2002-12-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-what-where): Don't say [-ja] especially.
+
+2002-12-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* doc/ptexinfmt.el: Modify it not to use APEL functions.
+
+	* w3mhack.el (w3mhack-makeinfo): Remove last temporal mod.
+
+2002-12-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-makeinfo): Temporally fix to help users who don't
+	have APEL that use texinfmt if loading doc/ptexinfmt.el is failed.
+
+2002-12-02  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* doc/Makefile.in: Remove GNU make things.
+
+2002-12-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-makeinfo): Don't format Japanes info if the mule
+	feature is not provided.
+
+	* aclocal.m4 (AC_PATH_LISPDIR, AC_PATH_ICONDIR): Undo last change.
+
+	* doc/Makefile.in (INSTALL_INFO): New variable.
+	(install): Use it.
+
+2002-11-29  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* Makefile.in (srcdir): New variable.
+	(FLAGS): Specify an absolute path to w3mhack.el.
+	(all-en): New rule.
+	(all-ja): Made it make only Japanese info.
+	(info-en): New rule.
+	(install-en): New rule.
+	(install-ja): Made it install only Japanese info.
+	(install-lisp): Use `$(srcdir)/' instead of `./'.
+	(install-icons): Ditto.
+	(install-info-en): New rule.
+	(Makefile): Use `$(srcdir)/' instead of `./'.
+	(config.status): Ditto.
+	(very-slow): Specify an absolute path to attic/addpath.el.
+
+	* doc/.cvsignore: Add version.texi.
+
+	* doc/ChangeLog: Removed.
+
+	* doc/Makefile.in (srcdir, subdir, top_srcdir): New variables.
+	(FLAGS): Specify an absolute path to w3mhack.el.
+	(EMACSINFO): Use `$(top_srcdir)' instead of `..'.
+	(INFO_DEPS): Include both emacs-w3m.info and emacs-w3m-ja.info.
+	(INFO_DEPS_EN): New variable.
+	(en): New rule.
+	(version.texi): New rule.
+	(emacs-w3m.info): Made it depend on version.texi.
+	(emacs-w3m-ja.info): Ditto.
+	(install): Use `$(top_srcdir)/' instead of `../'.
+	(install-en): New rule.
+
+	* doc/version.texi: Removed from the CVS repository.
+
+2002-11-29  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* doc/Makefile.in (clean): Fix target.
+
+2002-11-29  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3mhack.el (w3mhack-nonunix-install): Create parent directories.
+
+2002-11-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* doc/texinfo.tex: Replaced with the latest version.
+
+2002-11-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-header-line-map): Prevent tool-bar from being doubled
+	under Emacs 21.
+
+2002-11-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* Makefile.in (infodir): Add a variable.
+	(default): Use `all'.
+	(all, all-ja): New rules.
+	(lisp): Renamed from `default'.
+	(what-where): Pass `infodir' to `w3mhack-what-where'.
+	(info, info-ja): New rules.
+	(install): Use `install-lisp' and `install-info'.
+	(install-ja): New rule.
+	(install-lisp): Renamed from `install'.
+	(install-info, install-info-ja): New rules.
+	(install-package): Use `install-lisp' instead of `install'; install
+	info files as well.
+	(install-package-ja): New rule.
+	(clean): Remove info files as well.
+	(distclean): Remove doc.Makefile as well.
+
+	* aclocal.m4 (AC_PATH_LISPDIR, AC_PATH_ICONDIR): Modify a message for
+	`install-package'.
+
+	* configure.in: Check for the makeinfo command; create doc/Makefile.
+
+	* w3mhack.el (w3mhack-make-package): Add info file names into a
+	MANIFEST file.
+	(w3mhack-what-where): Show where info files will go.
+	(w3mhack-makeinfo): New function.
+
+2002-11-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* doc/Makefile.in, .cvsignore: New file.
+
+	* doc/emacs-w3m.texi, emacs-w3m-ja.texi: Correct copyright holder.
+
+	* doc/emacs-w3m.texi: Renamed from emacs-w3m-en.texi.
+
+	* doc/txi.tex: Renamed from txi-en.tex.
+
+2002-11-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-search.el (w3m-search-engine-alist): Specify coding-system for
+	the waei and kokugo entries.  Suggested by Hideyuki SHIRAI.
+
+2002-11-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* doc/emacs-w3m-en.texi, emacs-w3m-en.texi: Convert to GFDL.
+
+2002-11-27  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+	* doc/emacs-w3m-en.texi: New files.
+	* doc/emacs-w3m-ja.texi:
+	* doc/ptexinfmt.el:
+	* doc/texinfo.tex:
+	* doc/txi-en.tex:
+	* doc/txi-ja.tex:
+	* doc/version.texi:
+
+2002-11-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-tabmenu.el (w3m-tab-menubar-update): Do nothing when there's no
+	menubar.
+
+2002-11-18  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-view-this-url-1): Keep position when new-session and
+	`w3m-view-this-url-new-session-in-background' is non-nil.
+
+2002-11-17  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* mew-w3m.el (mew-mime-text/html-w3m): Use `match-string-no-properties'
+	if it exist.
+
+2002-11-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-goto-url): Use an optional argument and the function
+	`interactive' to examine whether it is called interactively instead of
+	the function `interactive-p'.  Suggested by TSUCHIYA Masatoshi.
+	(w3m-goto-url-new-session): Ditto.
+	(w3m): Ditto.
+	(w3m-select-buffer-show-this-line): Ditto.
+
+2002-11-14  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-w3m-attributes): Bind `case-fold-search' to t.
+
+2002-11-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-search.el (w3m-search-engine-alist): Add some dictionaries.
+	(w3m-search-default-engine): Default to google.
+	(w3m-search-quick-search-engine-alist): Add iij-archie; add
+	customization type.
+	(w3m-search-prefer-japanese-site): New user option.
+	(w3m-search-inhibited-japanese-engines): New user option.
+	(w3m-search-quick-search-engines): New function.
+	(w3m-search-quick-search-handler): Maybe use a Japanese site; use
+	`w3m-search-quick-search-engines' to merge `w-s-engine-alist' and
+	`w-s-quick-search-engine-alist'.
+
+	* w3m.el (w3m): Allow quicksearch urls if interactive.
+
+2002-11-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3.el (w3m-view-this-url-1): Copy `w3m-current-url' into a copied
+	buffer.
+	(w3m-goto-url): Allow the 7th argument `qsearch'; use it to recursive
+	call the function itself if the quicksearch feature is permitted.
+	(w3m-goto-url-new-session): Specify the 7th arg of `w3m-goto-url' if it
+	is called interactively.
+
+2002-11-08  Romain FRANCOISE  <romain@orebokech.com>
+
+	* w3m-search.el (w3m-search-engine-alist): Add "google groups".
+	(w3m-search-quick-search-engine-alist): New user option.
+	(w3m-search-quick-search-handler): New function.
+
+	* w3m.el: Autoload `w3m-search-quick-search-handler'.
+	(w3m-goto-url): Use `w3m-search-quick-search-handler' to parse
+	quicksearch url schemes.
+
+2002-11-06  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-bookmark.el (w3m-bookmark-safe-string): Abolish its 2nd `coding'
+	argument.  Instead of it, use the coding system to be used for encoding
+	the buffer contents on saving.
+	(w3m-bookmark-write-file): Follow the above change.
+
+2002-11-06  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-form.el (w3m-fontify-textareas): Replace textarea string only
+	when form data contains non-nil data.
+
+2002-11-05  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (toplevel): Added autoload setting for
+	`w3m-fontify-textareas'.
+	(w3m-fontify): Don't remove tag strings in the textareas; Call
+	`w3m-fontify-textareas'.
+
+	* w3m-form.el (w3m-form-treat-textarea-size): New option.
+	(w3m-form-resume): Do nothing if forms is nil.
+	(w3m-fontify-textareas): New function.
+	(w3m-form-parse-and-fontify): Decode entities for form value; Record
+	textarea rows as text property.
+	(w3m-form-parse-and-fontify): Treat CRLF as a newline character.
+	(w3m-form-search-textarea): New function.
+	(w3m-form-textarea-replace): Rewrite.
+	(w3m-form-textarea-info): Ditto.
+
+2002-11-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-bookmark.el (w3m-bookmark-file-coding-system): Fix its docstring.
+	(w3m-bookmark-verify-modtime): Keep buffer modified status.
+	(w3m-bookmark-safe-string): New function.
+	(w3m-bookmark-write-file): Call it to make given strings be safe.
+
+2002-11-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-bookmark.el: Use non-visiting working buffer; Auto-detection of
+	bookmark file coding system.
+	(w3m-bookmark-file-coding-system): Fix its docstring.
+	(w3m-bookmark-buffer-file-name): New internal variable.
+	(w3m-bookmark-mode): Add documents for commands.
+	(w3m-bookmark-mode-setter): Set `default-directory'.
+	(w3m-bookmark-buffer): Use non-visiting working buffer.
+	(w3m-bookmark-sections): Follow the above change.
+	(w3m-bookmark-kill-entries): Likewise.
+	(w3m-bookmark-file-modtime, w3m-bookmark-verify-modtime)
+	(w3m-bookmark-save-buffer): New functions.
+	(w3m-bookmark-write-file): Use it; Stricten check.
+	(w3m-bookmark-add-current-url-group): Call `w3m-bookmark-add' without
+	2nd argument.
+	(w3m-about-bookmark): Give unique id to sections.
+	(w3m-bookmark-current-number): Follow the above change.
+	(w3m-bookmark-kill-entry): If the bookmark file is reverted, reload it.
+	(w3m-bookmark-undo): Ditto.
+	(w3m-bookmark-edit): New function.
+
+2002-11-02  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-bookmark.el (w3m-about-bookmark): Fix.
+	(w3m-bookmark-current-number): Return nil on no entry line.
+	(w3m-bookmark-kill-entry): On no entry line, do not call
+	`w3m-bookmark-kill-entries'.
+	(w3m-bookmark-kill-entries): Fix.
+
+2002-11-01  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-namazu.el (w3m-namazu): Change prompt.
+	(w3m-namazu): Change prompt; Small fix.
+
+	* w3m-bookmark.el: Experimental bookmark editer.
+	(w3m-bookmark-read-file): Removed.
+	(w3m-bookmark-buffer): New function.
+	(w3m-bookmark-sections): Use it.
+	(w3m-bookmark-write-file): Use it; Call `basic-save-buffer'.
+	(w3m-bookmark-view): View about://bookmark/ instead of
+	w3m-bookmark-file directly.
+	(w3m-about-bookmark, w3m-bookmark-current-number)
+	(w3m-bookmark-kill-entry, w3m-bookmark-kill-entries)
+	(w3m-bookmark-undo): New functions.
+	(w3m-bookmark-mode, w3m-bookmark-mode-map): New variables.
+	(w3m-bookmark-mode-hook): New hook.
+	(w3m-bookmark-mode): New minor mode.
+	(w3m-bookmark-mode-setter): New function.
+	(toplevel): Register it to `w3m-display-functions'.
+
+2002-10-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3mhack.el (w3mhack-generate-colon-keywords-file): Protect against
+	unexpected data structure.
+
+2002-10-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-w3m-attributes): Remove workaround for servers which do
+	not support HEAD operations.
+
+
+2002-10-25  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Release emacs-w3m-1.3.3 from emacs-w3m-1_3 branch.
+
+2002-10-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (find-charset): Alias to ignore if no-Mule.
+
+2002-10-25  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-entity-alist): Use `w3m-mule-unicode-p' instead of
+	`w3m-use-mule-ucs'.
+
+	* w3m-xmas.el (w3m-mule-unicode-p): New function.
+
+	* w3m-fsf.el (w3m-mule-unicode-p): New function.
+
+	* w3m-om.el (w3m-mule-unicode-p): Set aliase to `ignore'.
+
+	* w3m-e19.el (w3m-mule-unicode-p): Set aliase to `ignore'.
+
+2002-10-25  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
+
+	* w3m.el (w3m-entity-alist): Support all entities using Mule-UCS.
+
+2002-10-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* mew-w3m.el: Cancel the last change.  Use `w3m-minor-mode'.
+
+	* mime-w3m.el (mime-w3m-display-inline-images): Fix its docstring.
+	(mime-w3m-safe-url-regexp): Fill its docstring.
+	(mime-w3m-setup-hook): New hook.
+	(mime-w3m-setup): Do not initialize `mime-w3m-mode-map'; Run the above
+	hook.
+	(mime-w3m-mode-map): It is not defined for XEmacs and Emacs21.
+	(mime-w3m-local-map-property): New function.
+	(mime-w3m-preview-text/html): Call it.
+
+	* w3m.el (w3m-key-binding): Cancel the last change.
+	(w3m-region): Change the interactive form; Do not process <base> tag by
+	itself.
+	(w3m-minor-mode-command-alist): Cancel the last change.
+	(w3m-minor-mode-map, w3m-minor-mode-hook, w3m-minor-mode): Revival.
+
+2002-10-23  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-toggle-inline-images-internal)
+	(w3m-toggle-inline-image, w3m-view-this-url, w3m-view-this-url)
+	(w3m-submit-form, w3m-external-view, w3m-view-image)
+	(w3m-save-image, w3m-view-url-with-external-browser)
+	(w3m-download-this-url, w3m-edit-this-url, w3m-goto-url)
+	(w3m-goto-url-with-timer, w3m-safe-view-this-url)
+	(w3m-safe-view-this-url): Check validity of the URL.
+	(w3m-print-current-url, w3m-edit-current-url): Check `w3m-current-url'.
+
+	* w3m-util.el (w3m-url-fallback-base): Move from `w3m.el'.
+	(w3m-url-invalid-regexp): New constant.
+	(w3m-url-valid): New inline function.
+
+	* mew-w3m.el (mew-mime-text/html-w3m): Remove any properties from
+	`xref'.
+
+2002-10-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-om.el (coding-system-list): Use `defalias' and `lambda' instead
+	of `defun'; allow an optional dummy argument; don't ignore `*noconv*'.
+	(read-passwd): Use `defalias' and `lambda' instead of `defun'.
+	(compose-mail): Ditto.
+
+2002-10-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-key-binding): Remove the code to reset
+	`w3m-minor-mode-map'.
+	(w3m-minor-mode-command-alist): Update its docstring.
+	(w3m-minor-mode-map, w3m-minor-mode-hook, w3m-minor-mode): Abolished.
+	(w3m-minor-mode): Removed.
+
+	* mime-w3m.el (mime-w3m-setup): Call `w3m-make-minor-mode-keymap'
+	without using `w3m-minor-mode-map'.
+
+	* mew-w3m.el (mew-use-w3m-minor-mode): Update its docstring.
+	(mew-w3m-minor-mode-map): New variable.
+	(toplevel): Revival the code to add a minor mode.
+	(mew-w3m-minor-mode-setter): Cancel the last change.
+
+2002-10-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-key-binding): Revival the code to reset
+	`mime-w3m-mode-map'.
+
+	* mime-w3m.el (mime-w3m-mode-map): Revival.
+	(mime-w3m-setup): Initialize `mime-w3m-mode-map' based on
+	`w3m-minor-mode-map'; Modify it to set its parent map to
+	`mime-view-mode-default-map'.
+	(mime-w3m-preview-text/html) [XEmacs,Emacs21]: Unify `local-map' as
+	text property.
+
+	* w3m.el (w3m-make-minor-mode-keymap): Call `make-spase-keymap' instead
+	of `make-keymap'.
+
+2002-10-22  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el (w3m-entity-regexp): As simple regexp. Existance of final
+	semi-collon is to be detected.
+	(w3m-entity-value): 2nd argument STRICT is added. If not STRICT, find
+	entity from db by maxmum length matching, and returns it with appending
+	unused chars. Returns nil if not match.  And also use defun instead of
+	defsubst.
+	(w3m-decode-entities): Use new `w3m-entity-value' with 2nd arg.
+
+2002-10-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-minor-mode): Define without `define-minor-mode'.
+	(w3m-minor-mode): Ditto.
+	(w3m-minor-mode-hook): Ditto.
+	(w3m-entity-regexp): Set 3000 to `max-specpdl-size' locally to avoid
+	max-specpdl-size error.
+
+	* w3m-e19.el: Cancel the last change to define `define-minor-mode'.
+	* w3m-fsf.el: Ditto.
+	* w3m-om.el: Ditto.
+
+	* attic/easy-mmode.el: Removed.
+
+2002-10-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e19.el: Require `easy-mmode'; make the alias `define-minor-mode'
+	to `easy-mmode-define-minor-mode'.
+	* w3m-fsf.el: Ditto.
+	* w3m-om.el: Ditto.
+
+	* attic/easy-mmode.el: New file imported from Emacs 20.7.
+
+2002-10-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-lynx-like-map, w3m-info-like-map): Add [tab] for
+	`w3m-next-anchor'.
+	(w3m-safe-view-this-url, w3m-mouse-safe-view-this-url): New command.
+	(w3m-minor-mode-command-alist): New constant.
+	(w3m-make-minor-mode-keymap): New function.
+	(w3m-minor-mode-map): New keymap.
+	(w3m-minor-mode): New function.
+
+	* mime-w3m.el (mime-w3m-mode-map): Abolished.
+	(mime-w3m-mode-command-alist): Abolished.
+	(mime-w3m-mode-dont-bind-keys): Abolished.
+	(mime-w3m-mode-ignored-keys): Abolished.
+	(mime-w3m-setup): Do not initialize `mime-w3m-mode-map'.
+	(mime-w3m-preview-text/html): Use `w3m-minor-mode-map' instead of
+	`mime-w3m-mode-map'.
+	(mime-w3m-view-this-url, mime-w3m-mouse-view-this-url): Removed.
+
+	* mew-w3m.el (mew-w3m-minor-mode): Abolished.
+	(mew-w3m-minor-mode-setter): Call `w3m-minor-mode'.
+
+2002-10-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e19.el: Cancel last change for providing the base64 codec.
+
+2002-10-21  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-goto-url): Use 'group:' scheme instead of
+	'about://group/...'; Use url encoding for the member of URL group
+	instead of base64 encoding.
+
+	* w3m-bookmark.el (w3m-bookmark-add-current-url-group): Follow the
+	change above.
+
+2002-10-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e19.el: Require `poe' and `path-util'; attempt to define the
+	functions `base64-decode-string' and `base64-encode-string'.
+
+	* w3m-util.el (w3m-display-progress-message): New function.
+	* w3m.el (w3m-goto-url-new-session): Use it.
+	(w3m): Use it.
+
+2002-10-21  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-goto-url): Process 'about://group/...'.
+
+	* w3m-bookmark.el (w3m-bookmark-add-current-url-group): New function.
+
+2002-10-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-delete-buffer): Run `w3m-delete-buffer-hook' only when a
+	buffer is killed.
+	(w3m-pack-buffer-numbers): Arrange buffers sequentially from 1 instead
+	of 0.
+	(w3m-select-buffer-next-line): Update gutter tabs for XEmacs.
+	(w3m-select-buffer-delete-buffer): Run `w3m-delete-buffer-hook'.
+
+	* w3m-util.el (w3m-buffer-number): Assume the buffer number has begun
+	from 1 instead of 0.
+	(w3m-buffer-set-number): Ditto.
+	(w3m-buffer-name-lessp): Ditto.
+
+2002-10-19  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
+
+	* w3m.el (w3m-entity-alist): Support Greek.
+
+2002-10-20  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-goto-url): Display a help message to stop asynchronous
+	process.
+
+2002-10-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-form.el (w3m-form-input-textarea-keymap): Don't bind C-g.
+	(w3m-form-input-select-keymap): Ditto.
+	(w3m-form-input-map-keymap): Ditto.
+
+	* w3m.el (w3m-select-buffer-mode): Add some key descriptions to the
+	doc-string.
+
+2002-10-17  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* icons/db-history-up.xpm: Add missing comma.
+
+2002-07-19  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-symbol.el: New file.
+
+	* w3m.el: Autoload "w3m-symbol" for `w3m-replace-symbol'.
+	(w3m-use-symbol): New variable.
+	(w3m-fontify): Call `w3m-replace-symbol'.
+
+	* w3mhack.el (w3mhack-examine-modules): Don't byte-compile
+	w3m-symbol.el if no-MULE.
+
+2002-10-17  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-e21.el (w3m-buffer-favicon): Bind local null handler with
+	`w3m-process-with-null-handler' instead of `lexical-let'.
+
+2002-10-16  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-proc.el (w3m-process-push, w3m-process-start): Fix last change.
+
+2002-10-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-rendering-half-dump): To decide whether
+	`w3m-treat-image-size' is ignored, use `w3m-display-inline-images-p'
+	instead of `w3m-display-graphic-p'.  Thanks to Mito for his report.
+	(w3m-about): Add `witdh' and `height' property to <img> tag.
+
+2002-10-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-emacs-w3m-icon): Use helvetica-bold to widen image.
+
+2002-10-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-lynx-like-map): Don't define key bindings for
+	`w3m-zoom-out-image' and `w3m-zoom-in-image' when emacs-w3m in running
+	in non-graphical display.
+	(w3m-info-like-map): Ditto.
+
+2002-10-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+	    Mito <mito@mxa.nes.nec.co.jp>
+
+	* w3m.el (w3m-rendering-half-dump): Ignore `w3m-treat-image-size' when
+	emacs-w3m is running in non-graphical display.
+
+2002-10-13  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-local-dirlist-cgi): Follow the change of
+	`w3m-process-start'.
+	(w3m-w3m-get-header): Ditto.
+	(w3m-w3m-dump-head-source): Ditto.
+
+	* w3m-image.el (w3m-imagick-convert-async-exec): Abolished.
+	(w3m-imagick-start): Removed.
+	(w3m-imagick-start-convert-buffer): Call `w3m-process-start' instead of
+	the above function.
+
+	* w3m-proc.el (w3m-process-push): Accept `command' argument.
+	(w3m-process-start): Ditto.
+
+2002-10-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-w3m-dump-head-source): Do not display the help message
+	when `w3m-process-with-wait-handler' is evaluated.
+	(w3m-make-separator): New function.
+	(w3m-about-header): Use the above function.
+
+	* w3m-proc.el (w3m-process-waited): New variable.
+	(w3m-process-error-handler): New function.
+	(w3m-process-with-wait-handler): Wrap the critical part with
+	`condition-case' to clean running processes up when `quit' signal is
+	occured.
+
+2002-10-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-w3m-dump-head-source): Display the message which
+	describes how to stop asynchronous process.
+	(w3m-lynx-like-map): Changed the key binded to `w3m-process-stop' from
+	`C-c C-g' to `C-c C-k'.
+	(w3m-info-like-map): Ditto.
+
+2002-10-08  MIYOSHI Masanori  <miyoshi@boreas.dti.ne.jp>
+
+	* README.shimbun.ja: Add notice that f1express requires Mule-UCS.
+
+	* README.shimbun.ja: Ditto.
+
+2002-10-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-toggle-inline-images-internal): Simplify the code.
+	(w3m-resize-inline-image-internal): Remove an existing bitmap image
+	first.
+
+	* w3m-bitmap.el (w3m-bitmap-image-insert): Replace
+	`insert-before-markers' with `insert' (return to the state before
+	2002-04-15).
+
+2002-10-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bitmap.el (w3m-create-resized-image): Return nil when resizing is
+	failed; set buffer multibyte before converting xbm to bitmap.
+
+	* w3m-xmas.el (w3m-create-resized-image): Return nil when resizing is
+	failed.
+
+	* w3m-image.el (w3m-resize-image-by-rate): Undo last change.
+
+2002-10-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bitmap.el (w3m-create-resized-image): New function.
+
+	* w3m-e19.el (w3m-create-resized-image): Alias to `ignore'.
+	* w3m-e20.el (w3m-create-resized-image): Alias to `ignore' if the
+	BITMAP-MULE is not available.
+	* w3m-om.el (w3m-create-resized-image): Ditto.
+
+	* w3m-image (w3m-resize-image-by-rate): Limit the minimum scale.
+
+	* w3m.el (w3m-resize-inline-image-internal): Remove an existing image
+	only for XEmacs.
+
+2002-10-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-create-resized-image): New function.
+
+	* w3m.el (w3m-resize-inline-image-internal): Remove an existing image
+	before resizing.
+
+2002-10-01  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-e21.el (w3m-favicon-type): New user variable.
+	(w3m-setup-favicon): Check `w3m-favicon-type'.
+	(w3m-buffer-favicon): Convert image to `w3m-favicon-type' instead of
+	'xpm.
+
+2002-10-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-filter.el (w3m-filter-server-regexp): Fix the value; translate
+	the comment into English.
+
+2002-10-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-lynx-like-map): Bind key M-] to `w3m-zoom-in-image'; bind
+	key M-[ to `w3m-zoom-out-image'.
+	(w3m-info-like-map): Ditto.
+	(w3m-mode): Document those new keys.
+
+2002-09-30  KURODA Chihiro  <chee@iijmio-mail.jp>
+
+	* w3m.el (w3m-resize-image-scale): New user option.
+	(w3m-toggle-inline-image): Call `w3m-zoom-in-image' without resizing.
+	(w3m-resize-inline-image-internal): New inline function.
+	(w3m-zoom-in-image): New command.
+	(w3m-zoom-out-image): New command.
+
+	* w3m-util.el (w3m-image-scale): New macro.
+
+	* w3m-image.el (w3m-resize-image-by-rate): New function.
+
+	* w3m-e21.el (w3m-create-resized-image): New function.
+
+2002-09-21  Kahlil HODGSON  <dorge@tpg.com.au>
+
+	* w3m.el (ffap-url-regexp): Make sure it is non-nil.
+
+2002-09-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+	Follow the change in Gnus.
+
+	* mime-w3m.el (mime-w3m-mode-ignored-keys): New variable.
+	(mime-w3m-setup): Use it.
+
+2002-09-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-lynx-like-map): Unbind the key "N" to the command
+	`w3m-namazu' in order to avoid binding collision to
+	`w3m-view-next-page'.  Thanks to Satoshi TAOKA for his report.
+	(w3m-mode): Fix its docstring for `w3m-antenna-add-current-url'.
+	Thanks to Satoshi TAOKA and Yoichi NAKAYAMA for the advice.
+
+2002-09-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el: Ignore byte-compile warnings for the dummy autoloads,
+	mis-judging of cl run-time functions and the obsoleteness of
+	`make-local-hook' under Emacs CVS.
+
+2002-09-25  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3mhack.el (w3mhack-examine-modules): Do not compile `mew-shimbun.el'
+	with old Mew.
+
+	* mew-w3m.el (top): Avoid byte-compile error and warning for old
+	Mew. Do not push 'mew-w3m-cid-retrieve' for old Mew.
+
+2002-09-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-arrived-setup): Use 0 instead of nil as the initial value
+	for the new obarray.
+
+	* w3m-filter.el (w3m-filter-setup): Use 0 instead of nil as the initial
+	value for the new obarray.
+
+2002-09-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-mode): Fix typo in its docstring.
+
+2002-09-20  Kahlil HODGSON  <dorge@tpg.com.au>
+
+	* w3m.el (w3m-fontify-bold): Permit class attributes, newlines or
+	whitespaces in the tag.
+	(w3m-fontify-underline): Ditto.
+
+2002-09-18  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-treat-drive-letter): New constant.
+	(w3m-url-to-file-name): Check `w3m-treat-drive-letter'.
+
+	* w3m-dtree.el (w3m-dtree-directory-name): Check
+	`w3m-treat-drive-letter'.
+
+2002-09-12  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-filter.el (w3m-filter-rules): Add 'assahi shimbun' rule.
+	(w3m-filter-asahi-shimbun): New function.
+
+2002-09-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-antenna.el (w3m-antenna-setup): Check new entries registered in
+	`w3m-antenna-sites'.
+	(w3m-antenna-shutdown): Return the value of `w3m-antenna-alist'.
+	(w3m-antenna-check-all-sites): Simplified.
+	(w3m-about-antenna): Do not call `w3m-antenna-setup'.
+
+
+2002-09-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Release emacs-w3m-1.3.2 from emacs-w3m-1_3 branch.
+
+	* w3m.el (w3m-init-file): Changed its default value.
+
+	* Makefile.in (PACKAGE): Use `emacs-w3m' instead of `w3m_el'.
+
+	* w3m-antenna.el (w3m-antenna-make-summary-function): Use
+	`function-item' instead of `const'.
+	(w3m-antenna-sort-changed-sites-function): Ditto.
+	(w3m-antenna-sort-unchanged-sites-function): Ditto.
+	(w3m-antenna-hns-last-modified): Asynchronized.
+	(w3m-antenna-last-modified): Removed.
+	(w3m-antenna-check-site): New function
+	(w3m-antenna-check-site-after): New function.
+	(w3m-antenna-check-sites): Removed.
+	(w3m-antenna-check-all-sites): New function.
+	(w3m-about-antenna): Asynchronized.
+	(w3m-about-antenna-edit): Reset post-data after its content is
+	displayed.
+	(w3m-antenna-edit-reset-post-data): New function.
+
+2002-09-02  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-init-file): Changed its default value.
+	(toplevel): When Emacs is running without interactive terminal, do not
+	load the startup file and do not evaluate `w3m-load-hook'.  Load a byte
+	compiled startup file safely.
+
+2002-09-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-mailto-url-popup-function-alist): New user option.
+	(w3m-view-this-url-1): Don't save a window configuration for mailto
+	urls here.
+	(w3m-goto-mailto-url): Save a window configuration while composing a
+	mail message; popup a mail window if the major-mode of a mail buffer
+	matches to `w3m-mailto-url-popup-function-alist'.
+
+2002-09-01  Andrew M. Scott  <ascott@sedona.ch.intel.com>
+
+	* w3m-weather.el (w3m-weather-default-area): Fix typo in its docstring.
+
+2002-08-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el: Provide the feature `w3m' before loading an init file or
+	evaluating `w3m-load-hook'.  Suggested by Seiichi NAMBA
+	<sn@asahi-net.email.ne.jp>.
+
+2002-08-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-init-file, w3m-load-hook): New option.
+	(toplevel): Load `w3m-init-file' and run `w3m-load-hook'.
+
+2002-08-29  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el: Require `custom' for Emacs 19 because of the function
+	`custom-initialize-set'.
+
+2002-08-29  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Clean up hook options.
+	(toplevel): Define the dummy function of `w3m-update-tab-line'.
+	(w3m-mode-hook, w3m-fontify-after-hook, w3m-select-buffer-hook): Clean
+	up its default value to nil.
+	(w3m-display-hook, w3m-delete-buffer-hook): Minimize its default value
+	and use `w3m-custom-hook-initialize' as the initialize function.
+	(w3m-arrived-setup-hook, w3m-arrived-shutdown-hook): Abolished.
+	(w3m-arrived-setup-functions, w3m-arrived-shutdown-functions,
+	w3m-mode-setup-functions, w3m-display-functions): New interanal
+	variables.
+	(w3m-arrived-setup): Refer `w3m-arrived-setup-functions' instead of
+	`w3m-arrived-setup-hook'.
+	(w3m-arrived-shutdown): Refer `w3m-arrived-shutdown-functions' instead
+	of `w3m-arrived-shutdown-hook'.
+	(w3m-fontify): Call `w3m-header-line-insert' by itself.
+	(w3m-next-buffer, w3m-delete-buffer, w3m-delete-other-buffers): Call
+	`w3m-select-buffer-update' by itself.
+	(w3m-clean-hook-options): New function.
+	(w3m-mode): Call `w3m-clean-hook-options', and run functions registered
+	to `w3m-mode-setup-functions'.
+	(w3m-goto-url): Call `w3m-select-buffer-update' by itself, and Run
+	functions registered to `w3m-display-functions'.
+	(w3m-select-buffer-update): Call `w3m-update-tab-line'.
+
+	* w3m-util.el (w3m-custom-hook-initialize): New function.
+
+	* w3m-xmas.el: Cancel the last change and refer `w3m-display-functions'
+	instead of `w3m-display-hook'.
+
+	* w3m-e21.el (toplevel): Add `w3m-setup-favicon' to
+	`w3m-display-functions', `w3m-favicon-load-cache-file' to
+	`w3m-arrived-setup-functions', `w3m-favicon-save-cache-file' to
+	`w3m-arrived-shutdown-functions', and add `w3m-setup-header-line' and
+	`w3m-setup-widget-faces' to `w3m-mode-setup-functions'
+
+	* w3mhack.el (w3mhack-load-path) [Mule]: Add the path of bitmap.el to
+	`load-path'.
+
+	* w3m.el (w3m-select-buffer-hook): Renamed from
+	`w3m-change-buffer-hook'.
+	(w3m-next-buffer): Accept a numerical argument.
+	(w3m-previous-buffer): Accept a numerical argument, and call
+	`w3m-next-buffer'.
+	(w3m-delete-buffer): Call `w3m-next-buffer' instead of
+	`w3m-previous-buffer'.
+
+	* w3m.el (w3m-delete-buffer-hook): Change its default value.
+	(w3m-change-buffer-hook): New option.
+	(w3m-delete-other-buffers-hook, w3m-previous-buffer-hook,
+	w3m-next-buffer-hook): Abolished.
+	(w3m-next-buffer): Run `w3m-change-buffer-hook' instead of
+	`w3m-next-buffer-hook'.
+	(w3m-previous-buffer): Run `w3m-change-buffer-hook' instead of
+	`w3m-previous-buffer-hook'.
+	(w3m-delete-buffer): Not call `w3m-select-buffer-update', which is
+	added to `w3m-delete-buffer-hook'.
+	(w3m-delete-other-buffers): Likewise.  Run `w3m-delete-buffer-hook'
+	instead of `w3m-delete-other-buffers-hook'.
+
+2002-08-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (toplevel): Remove expressions to register hook functions to
+	`w3m-delete-buffer-hook', `w3m-delete-other-buffers-hook',
+	`w3m-display-hook', and `w3m-fontify-after-hook'.
+	(w3m-mode-hook, w3m-fontify-after-hookk, w3m-display-hook,
+	w3m-arrived-setup-hook, w3m-arrived-shutdown-hook,
+	w3m-delete-buffer-hook, w3m-delete-other-buffers-hook,
+	w3m-previous-buffer-hook, w3m-next-buffer-hook): Changed their default
+	values to avoid inconsistency of their customize.
+	(w3m-toolbar): Fix its help messages.
+	(w3m-arrived-file, w3m-keep-arrived-urls, w3m-db-history-display-size):
+	Fix their docstrings.
+	(w3m-history): Moved to avoid a byte compile warning.
+
+	* w3m-xmas.el (toplevel): Remove an expression to register
+	`w3m-xmas-update-tab-in-gutter' to `w3m-display-hook'.
+	(w3m-xmas-show-current-title-in-buffer-tab): Remove expressions to
+	handle `w3m-display-hook' from the form to change its value.
+
+	* w3m-e21.el (toplevel): Remove expressions to register hook functions
+	to `w3m-display-hook', `w3m-arrived-setup-hook',
+	`w3m-arrived-shutdown-hook', `w3m-mode-hook', `w3m-fontify-after-hook',
+	`w3m-next-buffer-hook', `w3m-previous-buffer-hook',
+	`w3m-delete-buffer-hook' and `w3m-delete-other-buffers-hook'.
+
+2002-08-28  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-delete-buffer-hook): New hook.
+	(w3m-other-delete-buffers-hook): Ditto.
+	(w3m-previous-buffer-hook): Ditto.
+	(w3m-next-buffer-hook): Ditto.
+	(w3m-view-this-url-new-session-in-background): Fixed docstring.
+	(w3m-next-buffer): Run `w3m-next-buffer-hook'.
+	(w3m-previous-buffer): Run `w3m-previous-buffer-hook'.
+	(w3m-delete-buffer): Run `w3m-delete-buffer-hook'.
+	(w3m-delete-other-buffers): Run `w3m-delete-other-buffers-hook'.
+	(w3m-pack-buffer-numbers): New function.
+	(w3m-delete-buffer-hook): Add `w3m-pack-buffer-numbers'.
+	(w3m-delete-other-buffer-hook): Add `w3m-pack-buffer-numbers'.
+
+	* w3m-util.el (w3m-buffer-number): New inline function.
+	(w3m-buffer-set-number): Ditto.
+
+	* w3m-e21.el (w3m-update-tab-line): New function.
+	(w3m-mode-hook): Add `w3m-update-tab-line'.
+	(w3m-fontify-after-hook): Ditto.
+	(w3m-previous-buffer-hook): Ditto.
+	(w3m-next-buffer-hook): Ditto.
+	(w3m-delete-buffer-hook): Ditto.
+	(w3m-delete-other-buffers-hook): Ditto.
+	(w3m-tab-width): Changed default value to 16.
+	(w3m-tab-line): Calculate tab width dynamically.
+
+2002-08-27  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-output-coding-system, w3m-halfdump-command-arguments):
+	Use 'utf-8 when `w3m-m17n' with Mule-UCS environment.
+	(w3m-charset-coding-system-alist): Add Windows Code Point.
+	(w3m-current-content-charset): New buffer-local variable.
+	(w3m-clear-local-variables, w3m-copy-local-variables): Handle it.
+	(w3m-decode-buffer): Set `w3m-current-content-charset'.
+	(w3m-rendering-half-dump): Use `w3m-current-content-charset' when
+	`w3m-m17n' or `w3mmee'.
+
+2002-08-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-lynx-like-map): Change the key `C-c w' to `C-c M-w' for
+	the command `w3m-delete-other-buffers'.
+	(w3m-info-like-map): Ditto.
+
+2002-08-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (emacs-w3m-version): Reset for development series toward
+	emacs-w3m-1.4.
+
+2002-08-27  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-history): Call `w3m-db-history' instead of goto
+	`about://db-history/'.
+
+2002-08-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-delete-other-buffers): New user command.
+	(w3m-lynx-like-map): Bind the key `C-c w' to the command
+	`w3m-delete-other-buffers'.
+	(w3m-info-like-map): Ditto.
+	(w3m-select-buffer-mode-map): Bind the key to the command
+	`w3m-select-buffer-delete-other-buffers'.
+	(w3m-select-buffer-delete-other-buffers): New user command.
+
+2002-08-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-check-header-tags): Ignore case of tags.
+	(w3m-about-db-history): Accept range specification in URL.
+	(w3m-db-history-display-size): New option.
+	(w3m-db-history): Refer it.
+
+	* w3m-antenna.el (w3m-antenna-html-skeleton): Add link to
+	about://antenna-edit/.
+	(w3m-about-antenna-edit): New function.  This is an experimental
+	imprement of the editor for Antenna sites.
+
+2002-08-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (char-after): Byte-optimize it for old Emacsen.
+	(char-before): Ditto.
+
+2002-08-23  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-view-this-url-new-session-in-background): New user
+	option.
+	(w3m-view-this-url-1): Use it; enclose `w3m-goto-url' with
+	`save-window-excursion'.
+
+	* w3m-form.el (w3m-form-resume): Confirm `value' for text form is a
+	string.
+
+2002-08-22  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (ffap-url-regexp): Fix last change.
+
+2002-08-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (ffap-url-regexp): Modify the value to make it match to nntp
+	urls.
+
+2002-08-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* Makefile.in (very-slow): New rule.
+
+	* attic/addpath.el: New file.
+
+2002-08-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el: Require `cl' when compiling to provide the function
+	`gensym'.  It is needed to byte-compile this file alone because of the
+	w3m-proc macros.
+	* w3m-image.el: Ditto.
+	* w3m-bitmap.el: Don't bother to load cl-macs.
+
+2002-08-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el (w3m-display-message-enable-logging): New variable.
+	(w3m-display-message): Use it.
+
+2002-08-08  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-w3m-retrieve-1): Do not make error but return nil, even
+	if decoding is failed.
+
+2002-08-08  Nishimoto Masaki  <nishimoto@gaju.org>
+
+	* w3m-proc.el (w3m-process-with-environment): Copy
+	`process-environment' before `getenv' is called, in order to avoid
+	putting side effects to environment variables.
+
+2002-07-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el (w3m-ucs-to-char): Return char for tilde by default.
+
+
+2002-07-17  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Release emacs-w3m-1.3.1 from emacs-w3m-1_3 branch.
+
+2002-07-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* mime-w3m.el (toplevel): Bind `mime-preview-condition' to avoid
+	byte-compile warnings.
+	(mime-w3m-insinuate): Install code to overwrite
+	`mime-preview-condition' which is already initialized before this
+	functions is called.
+
+2002-07-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-image-viewer): New option.
+	(w3m-content-type-alist): Refer it.
+
+2002-07-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-decoder-alist): Don't examine the existence of w3m
+	command when compiling.
+	(w3m-dirlist-cgi-program): Ditto.
+
+2002-07-09  Hironori FUJII  <fujii@chi.its.hiroshima-cu.ac.jp>
+
+	* w3m.el (w3m-highlight-current-anchor): Don't infloop at the beginning
+	of a buffer.
+
+2002-07-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-perldoc.el (w3m-about-perldoc): Install workaround to specify the
+	place in which pod2html generates its cache files.  Adjust links
+	pointing other perldocs.
+
+2002-07-08  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-mode): Make `list-buffers-directory' to buffer local
+	variable.
+	(w3m-goto-url): Set title of the URL to `list-buffers-directory'.
+
+	* w3m-tabmenu.el (w3m-switch-buffer): Bind `completion-ignore-case' to
+	`t'.
+
+2002-07-08  OKAZAKI Tetsurou  <okazaki@be.to>
+
+	* configure.in: Use `AC_PATH_EMACS' instead of `AC_CHECK_EMACS'.
+
+	* aclocal.m4 (AC_PATH_EMACS): New macro.
+	(AC_CHECK_EMACS): Removed.
+
+
+2002-07-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Release emacs-w3m-1.3 from emacs-w3m-1_3 branch.
+
+2002-07-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (byte-optimize-form-code-walker): Advise to make it
+	optimize throughout the and/or forms.
+	(max-specpdl-size): Increase the value by 5 times for Mule 2.
+
+2002-07-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-accept-japanese-characters): Don't call the external
+	command when compiling.
+	(examining the value for `w3m-command'): Ditto.
+
+2002-07-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-lynx-like-map): Use the key `(control space)' instead of
+	`C- ' for the command `w3m-history-store-position' under XEmacs.
+
+2002-06-29  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3mhack.el (w3mhack-nonunix-lispdir): New option.
+	(w3mhack-nonunix-icondir): Ditto.
+	(w3mhack-nonunix-dryrun): Ditto.
+	(w3mhack-nonunix-install): New function.
+
+2002-06-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Makefile.in (DOCS): Add `TIPS'.
+
+2002-06-26  Ando Tsutomu  <ando-tom@ff.iij4u.or.jp>
+
+	* w3m-weather.el (w3m-weather-completion-table): Fix typo.
+
+2002-06-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-info-like-map): Remove redundant code.
+
+2002-06-27  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-fontify-anchors): Put `w3m-name-anchor' property to
+	point-max().
+	(w3m-fontify): Remove `w3m-name-anchor' handling.
+	(w3m-search-name-anchor): Move in the screen.
+
+2002-06-26  Tadashi Watanabe  <watanabe@sigmaitec.co.jp>
+
+	* w3m.el (w3m-info-like-map): Don't use FSF Emacs style key format for
+	XEmacs.
+
+2002-06-26  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (toplevel): Stricten the pattern to detect w3m version.
+	(w3m-info-like-map): Changed key bindings of `w3m-shift-left' and
+	`w3m-shift-right'.
+
+2002-06-25  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-use-ange-ftp): Chenged its default value to nil.
+
+2002-06-21  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-w3m-retrieve-1): Specify -no-cookie option only when the
+	w3m command is configured to accept it.
+
+2002-06-20  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* octet.el (octet-type-filter-alist): Fixed parenthesis.
+	(octet-filter-call1, octet-filter-call2, octet-filter-call2-extra):
+	Enclose call-process with as-binary-process.
+
+2002-05-31  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* octet.el (octet-find-file): Bind `buffer-read-only', only while
+	calling `octet-buffer'.
+
+
+2002-06-20  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Release emacs-w3m-1.2.8 from emacs-w3m-1_2 branch.
+
+2002-06-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bug.el: Require `w3m-e19' for Emacs 19 to be able to compile this
+	module alone.
+
+2002-06-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-search.el (w3m-search): Don't extract a default word from the
+	header line.
+
+2002-06-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-header-line-insert): Use the property `keymap' instead of
+	`local-map' for the recent Emacsen; add a help echo; fix a typo.
+
+	* w3m-xmas.el (w3m-setup-header-line): Remove.
+
+2002-06-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e19.el: Remove many emulating functions on the condition that
+	APEL should be used; require `cl' only when compiling; require
+	`pcustom' instead of `custom'.
+	(compose-mail): New function.
+	(read-passwd): Autoload "ange-ftp".
+
+	* w3m-proc.el (read-passwd): Autoload "w3m-e19" for Emacs 19.
+
+	* w3m-util.el (cancel-timer): Autoload "timer" for not only Mule 2 but
+	also Emacs 19.
+
+	* w3m.el: Require `w3m-e19' for Emacs 19.
+
+	* w3mhack.el (w3mhack-emacs-major-version): New constant.
+	(TopLevel): Silence the byte-compiler for not only Mule 2 but also
+	Emacs 19.
+	(w3mhack-mdelete): New function.
+	(w3mhack-examine-modules): Use it to make the code simple.
+	(w3mhack-generate-colon-keywords-file): Be sure to go to the beginning
+	of each file before looking for colon keywords (I noticed that
+	`insert-file-contents' doesn't always position point to the top).
+
+	* README.ja: Update for the use of Emacs 19.
+
+2002-05-30  Kevin Rodgers  <kevin.rodgers@ihs.com>
+
+	NOTE: The following changes have been posted to the emacs-w3m
+	mailing list, they were not installed in the CVS repository at the
+	time.  The original article has been archived in:
+
+	http://emacs-w3m.namazu.org/ml/msg03472.html
+
+	* w3m-e19.el: New file.
+
+	* w3m.el: Require `w3m-e19' for Emacs 19.
+	(w3m-key-binding): Replace the widget `other' with `const'.
+
+	* w3mhack.el (w3mhack-examine-modules): Include w3m-e19.el in the
+	listing for Emacs 19.
+
+	* README: Update for the use of Emacs 19.
+
+2002-06-13  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-prepare-content): When cdr of
+	`w3m-content-prepare-functions' element is not function, call
+	`w3m-prepare-content' recursively.
+	(w3m-content-prepare-functions): Add "application/xhtml+xml" entry.
+
+2002-06-12  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-uri-replace-alist): New user option.
+	(w3m-uri-replace): New function.
+	(w3m-goto-url): Call `w3m-uri-replace'.
+
+2002-06-02  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-e21.el (w3m-ucs-to-char): Don't define it when already defined.
+
+	* w3m-xmas.el (w3m-ucs-to-char): Ditto.
+
+
+2002-06-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Release emacs-w3m-1.2.7 from emacs-w3m-1_2 branch.
+
+	* w3m-weather.el: Require CL when this module is byte-compiled.
+	(w3m-weather-completion-table): Fix typos, which are noticed by Ando
+	Tsutomu <ando-tom@ff.iij4u.or.jp> in [emacs-w3m:03487].
+
+2002-05-31  Mito <mito@mxa.nes.nec.co.jp>
+
+	* w3m-weather.el (w3m-weather-completion-table): Fix "niigata-kaetsu".
+
+2002-05-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-make-ccl-coding-system): Make it recallable for the
+	existing coding-systems (we can now reload w3m.elc under XEmacs 21.5-b6
+	and later).
+
+2002-05-29  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-w3m-retrieve-1): Don't decode the contents when redirect.
+
+2002-05-29  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (define-ccl-program): Remove advice when non-MULE.  It
+	might be specified by pccl.elc if it has been mis-compiled for XEmacs
+	with MULE.
+
+	* w3m.el (w3m-delete-frame-maybe): Don't delete the current frame if it
+	is the sole frame in the screen.
+
+2002-05-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (unicode-to-char): Shut XEmacs 21.5-b5 and earlier up
+	when compiling.
+
+2002-05-28  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-e21.el (w3m-ucs-to-char): New function.
+
+	* w3m-xmas.el (w3m-ucs-to-char): New function for XEmacs-21.5.
+
+2002-05-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* Makefile.in (tarball): Chmod 755 configure.
+
+2002-05-16  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-auto-show): Check multiple command like a
+	`previous|next-line' or `beginning|end-of-buffer' at the buffer's edge.
+	(w3m-window-hscroll): New function to rescue for XEmacs with Mule.
+	(w3m-current-column, w3m-set-window-hscroll): Chenge method of the
+	calculation point.  the difference points.
+	(w3m-horizontal-scroll, w3m-horizontal-on-screen)
+	(w3m-horizontal-recenter): Use `w3m-window-hscroll'.
+	(w3m-redisplay-this-page): Don't handle store|restore position.
+	(w3m-goto-url): If reload or redisplay, restore position of history.
+
+2002-05-15  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-after-cursor-move-hook): Add `w3m-auto-show'.
+	(w3m-auto-show, w3m-horizontal-scroll-division): New options.
+	(w3m-next-anchor, w3m-previous-anchor, w3m-next-form)
+	(w3m-previous-form, w3m-next-image, w3m-previous-image): Call
+	`w3m-horizontal-on-screen'.
+	(w3m-mode): Bind many variables for automatic scrolling when
+	`w3m-auto-show' is non-nil.
+	(w3m-scroll-left, w3m-scroll-right, w3m-shift-left)
+	(w3m-shift-right): Call `w3m-horizontal-scroll'.
+	(w3m-horizontal-scroll-done): New buffer local variable.
+	(w3m-current-position): Modify initial value.
+	(w3m-auto-show, w3m-horizontal-scroll, w3m-horizontal-on-screen): New
+	functions.
+	(w3m-horizontal-recenter, w3m-beginning-of-line)
+	(w3m-end-of-line): Use `w3m-set-window-hscroll' and
+	`w3m-current-column'.
+	(w3m-store-current-position): Set markers of beginning of line and end
+	of line.
+	(w3m-check-current-position): Check car of `w3m-current-position'.
+	(w3m-current-column, w3m-set-window-hscroll): New functions to rescue
+	for XEmacs with Mule.
+
+2002-05-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-form.el (w3m-form-replace): Don't pad the form slot with spaces
+	if a string is longer than that width.
+
+2002-05-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-arrived-p): Move its definition in order to avoid
+	byte-compile warning.
+
+	* Makefile.in (default, what-where): Change order.
+
+2002-05-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el: Modify the error message that XEmacs APEL package
+	versions 1.23 and later can barely be used to run emacs-w3m.
+
+2002-05-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-mode): Suppress compile warning under old Emacsen.
+
+	* Makefile.in (what-where): New rule.
+
+	* w3mhack.el (w3mhack-what-where): New function.
+	(locate-library): Make the function silent for Mule first.
+
+2002-05-13  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-horizontal-shift-columns): New user option.
+	(w3m-shift-left, w3m-shift-right): New commands.
+	(w3m-lynx-like-map, w3m-info-like-map): Add keybind `w3m-shift-left'
+	and `w3m-shift-right'.
+	(w3m-mode): Modify doc-string for new commands. Bind `auto-show-mode'
+	to nil.
+
+2002-05-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-hist.el (w3m-history-add-arrived-db): Force update the page.
+
+2002-05-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bug.el (report-emacs-w3m-bug-system-informations): Don't include
+	useless infos; eval the value for each time to load it.
+	(report-emacs-w3m-bug): Bind `print-length' and `print-level' with nil.
+
+2002-05-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-menubar): Modify the label for report-emacs-w3m-bug.
+	(w3m-lynx-like-map): Replace the key `C-c C-b' with `C-c C-v' for
+	`w3m-history-restore-position'; replace the key `C-c b' with `C-c C-b'
+	for `report-emacs-w3m-bug'.
+	(w3m-info-like-map): Ditto.
+	(w3m-mode): Add a document for `report-emacs-w3m-bug'.
+
+	* w3mhack.el: Check for the validity on APEL also for XEmacs with MULE.
+
+	* w3m-bug.el (report-emacs-w3m-bug-system-informations): Add
+	(featurep 'mule) and (featurep 'file-coding).
+
+2002-05-07  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-download): Modify string of the prompt.
+	(w3m-prepare-content): Add 5th optional argument `retry'. If not
+	determine content-type, ask its.
+
+2002-04-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bug.el (report-emacs-w3m-bug): Bind `after-load-alist' to nil
+	while loading the file itself; examine system info in the `w3m-mode'
+	buffer.
+
+2002-04-27  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-bug.el (report-emacs-w3m-bug-system-informations): Add
+	`mule-version' and `Meadow-version'.
+	(report-emacs-w3m-bug): Fix when info is a function.
+
+	* w3m.el (w3m-menubar): Add many functions.
+
+2002-04-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bug.el: New file.
+
+	* w3m.el: Autoload "w3m-bug" for `report-emacs-w3m-bug'.
+	(w3m-lynx-like-map): Bind `report-emacs-w3m-bug' to C-cb.<
+	(w3m-info-like-map): Ditto.
+
+	* w3m-om.el (compose-mail): New function.
+
+	* w3mhack.el: Check for the validity on APEL.
+
+2002-04-26  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-arrived-modify): New function.
+	(w3m-local-attributes): If set Content-type in arrived DB, return it.
+	(w3m-redisplay-this-page, w3m-redisplay-and-reset)
+	(w3m-redisplay-with-content-type): New commands.
+	(w3m-redisplay-with-charset): Use `w3m-arrived-modify'.
+	(w3m-lynx-like-map): Bind all new commands and modify bind for
+	`w3m-redisplay-with-charset'.
+	(w3m-info-like-map): Ditto.
+	(w3m-mode): Document them.
+	(w3m-goto-url): If reload is 'redisplay, do redisplay only. Modify
+	content-type decided method at local URL.
+	(w3m-about-header): Display `Modifer Information'.
+	(w3m-header-line-insert): Display modifers when type are setting.
+
+2002-04-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-horizontal-recenter): New command.
+	(w3m-beginning-of-line): New command.
+	(w3m-end-of-line): New command.
+	(w3m-lynx-like-map): Bind them.
+	(w3m-info-like-map): Bind them.
+	(w3m-mode): Document them.
+
+2002-04-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bitmap.el (w3m-bitmap-image-face-inherit): Default to t.
+
+	* w3m-om.el (w3m-om-use-overstrike-to-make-face-bold): New var.
+	(custom-declare-face): Advise it to use `set-face-bold-p' to make faces
+	bold by overstriking.
+
+	* w3m-util.el (w3m-default-face-colors): New constant.
+	* w3m.el (w3m-bold-face, w3m-underline-face): Use it.
+
+2002-04-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bitmap.el (w3m-bitmap-image-insert): Don't put the transparent
+	face except for Emacs 20.
+
+	* w3m.el (w3m-key-binding): Don't manipulate key bindings if w3m.elc
+	has not been loaded (it will fix the problem that the face colors might
+	not be specified under Mule 2).
+
+2002-04-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bitmap.el (w3m-bitmap-transparent-face): Remove.
+	(w3m-bitmap-image-insert): Use the list form instead of
+	`w3m-bitmap-transparent-face' to make the overlay transparent.
+
+2002-04-23  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-bitmap.el (w3m-bitmap-convert-arguments)
+	(w3m-bitmap-image-face-inherit): New customize values.
+	(w3m-create-image): Append argument `w3m-bitmap-convert-arguments' when
+	call `w3m-imagick-start-convert-buffer'.
+	(w3m-insert-image): If `w3m-bitmap-image-face-inherit' is non-nil,
+	inherit the face of bitmap image from the face of text at point.
+
+2002-04-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* Makefile.in (distclean): Remove autom4te*.cache rather than
+	autom4te.cache.
+
+	* w3m-bitmap.el (w3m-bitmap-transparent-face): New face.
+	(w3m-bitmap-image-insert): Put `w3m-bitmap-transparent-face' to
+	overlays; don't use overlays to highlight bitmap images.
+	(w3m-insert-image): Add `w3m-bitmap-image-face' to a bitmap image as a
+	text property.
+
+2002-04-23  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-toggle-inline-images-internal): Call `w3m-insert-image'
+	with the url of image.
+
+	* w3m-xmas.el (w3m-insert-image): Add dummy argument.
+
+	* w3m-e21.el (w3m-insert-image): Add dummy argument.
+
+	* w3m-bitmap.el (w3m-bitmap-cache-image-hook): New hook.
+	(w3m-create-image): Run `w3m-bitmap-cache-image-hook' with `url' when
+	use the cached image.
+	(w3m-insert-image): Add 4th argument `url'. Do nothing which have no
+	'w3m-image property or differ its url.
+
+2002-04-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	Make emacs-w3m can be compiled by `make slow' with no warnings.
+	* Makefile.in (slow): Don't echo the values for EMACS and FLAGS.
+	* octet.el: Require `w3m-util' for `w3m-insert-string'.
+	* w3m-bitmap.el: Autoload w3m-om for `move-to-column-force'.
+	* w3m-hist.el: Load w3m-kwds.el for old Emacsen.
+	* w3m-image.el: Require `pcustom' for old Emacsen; bind some external
+	vars when compiling.
+	* w3m.el: Enclose the definitions for `w3m-current-title' and
+	`w3m-current-url' with `eval-and-compile', and move them forward.
+	(w3m-url-at-point): Enclose with `eval-and-compile'.
+	(w3m-add-local-hook): Ditto.
+	(w3m-about-retrieve): Call `base64-decode-string' indirectly to avoid
+	compile warn under old Emacsen.
+
+	* w3m-util.el (w3m-insert-string): Fix doc-string.
+
+2002-04-22  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-region): Call `w3m-process-stop' first.
+
+	* mew-w3m.el (mew-w3m-view-inline-image): Toggle
+	`mew-w3m-auto-insert-image'.
+	(mew-w3m-cid-retrieve-hook): New customize hook.
+	(mew-w3m-cid-retrieve): Run `mew-w3m-cid-retrieve-hook'.
+
+2002-04-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el (w3m-insert-string): Prevent doubling expansion on the
+	arg.
+
+2002-04-20  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* mime-w3m.el (mime-w3m-cid-retrieve): Use `w3m-insert-string' instead
+	of `insert' to prevent multibyte/unibyte problems.
+	* octet.el (mime-preview-octet, mime-view-octet): Ditto.
+
+	* w3m-util.el (w3m-insert-string): Moved from shimbun/shimbun.el.
+
+2002-04-20  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-w3m-attributes): Set type to downcase.
+
+2002-04-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-about-header): Don't use `make-string' to make a
+	separator text under Mule.
+
+2002-04-19  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* mew-w3m.el (mew-w3m-cid-retrieve): Support w3m-bitmap.el when
+	retrieve `cid image' (Mew cache has multibyte strings, but work buffer
+	is unibyte).
+
+2002-04-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (TopLevel): Not to get the byte-code for `current-column'
+	inlined under old Emacsen.
+
+	* w3m-bitmap.el (w3m-bitmap-emacs-broken-p): Use
+	`ad-Orig-current-column' rather than `current-column' if it has already
+	been defined.
+	(TopLevel): Not to get the byte-code for `current-column' inlined under
+	the broken Emacsen in case when compiling manually.
+
+2002-04-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bitmap.el (TopLevel) Require `cl' and possibly load cl-macs.  The
+	following changes are for old Emacsen.
+	(w3m-bitmap-emacs-broken-p): New constant.
+	(TopLevel): Warn if Emacs has a bug on managing column numbers.
+	(w3m-bitmap-move-to-column): Allow the 3rd arg `strictly'; don't modify
+	the buffer contents unless the 3rd arg has been set.
+	(w3m-bitmap-defadvice-if-broken): New macro; use it to advise the
+	functions `current-column', `move-to-column', `move-to-column-force',
+	`next-line' and `previous-line' to work under the broken Emacsen.
+	(w3m-bitmap-byte-indexed-characters-p): Remove.
+	(TopLevel): Don't alias `w3m-bitmap-current-column' to
+	`current-column'; don't alias `w3m-bitmap-move-to-column-force' to
+	`move-to-column-force'.
+	(w3m-bitmap-substitute-key-definitions): Remove.
+	(w3m-bitmap-image-insert): Replace `w3m-bitmap-current-column' with
+	`current-column'; replace `w3m-bitmap-move-to-column-force' with
+	`move-to-column-force'.
+	(w3m-bitmap-image-delete-internal): Ditto.
+
+	* w3m-om.el (move-to-column-force): New function using
+	`move-to-column-strictly'.
+
+2002-04-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bitmap.el (w3m-bitmap-next-line): Handle `temporary-goal-column'.
+
+2002-04-18  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-halfdump-command-arguments): Fix last change.
+
+2002-04-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bitmap.el (w3m-bitmap-byte-indexed-characters-p): New macro.  The
+	following changes are for old Emacsen.
+	(w3m-bitmap-move-to-column): New function.
+	(w3m-bitmap-move-to-column-force): Use it.
+	(w3m-bitmap-next-line): New command.
+	(w3m-bitmap-previous-line): New command.
+	(w3m-bitmap-substitute-key-definitions): New function; add it to
+	`w3m-mode-hook' as the one-shot function.
+
+2002-04-17  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-halfdump-command-arguments): Add `-I e' option to w3m
+	under Japanese environment.
+
+2002-04-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mime-w3m.el (mime-w3m-cid-retrieve): Use `mime-decode-string',
+	`mime-entity-body' and `mime-entity-encoding' instead of
+	`mime-insert-entity-content' to make it work even if the entity buffer
+	is multibyte.
+
+2002-04-16  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-check-header-tags): Renamed from w3m-check-link-tags.
+	(w3m-check-header-tags): Parse base tag too.
+	(w3m-rendering-buffer-1): Use it.
+	(w3m-prepare-text-content): Don't use w3m-base-url.
+
+2002-04-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bitmap.el (w3m-bitmap-image-insert): Replace `insert' with
+	`insert-before-markers'.
+	(w3m-bitmap-image-delete-internal): Delete trailing newlines.
+	(w3m-insert-image): Don't check for the existence of an image.
+
+	* w3m.el (w3m-history-current-url-face): Provide `font' temporally to
+	avoid loading it and `cl'.
+
+2002-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bitmap.el (w3m-bitmap-image-get-overlay): Don't clear the
+	`evaorate' property here.
+	(w3m-bitmap-image-insert-internal): Rename to
+	`w3m-bitmap-image-insert'; change the meaning of the 2nd arg `image'
+	(see docs); allow the optional arg `ovr'; don't scan for an overlay
+	here; handle `w3m-bitmap-image-count'; use overlays to highlight bitmap
+	images.
+	(w3m-bitmap-image-insert): Remove old one.
+	(w3m-bitmap-image-delete-internal): Allow the 2nd arg `ovr'; don't scan
+	for an overlay here; clear the `evaorate' property here.
+	(w3m-bitmap-image-delete): Allow the 2nd arg `ovr'; don't scan for an
+	overlay here; don't delete an overlay.
+	(w3m-bitmap-image-delete-string): Remove.
+	(w3m-insert-image): Scan for an overlay here; don't use text props to
+	highlight bitmap images.
+	(w3m-remove-image): Scan for an overlay here.
+
+2002-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bitmap.el (w3m-bitmap-image-cleanup): Remove.
+	(w3m-bitmap-image-get-overlay): Clear the `evaorate' property in an
+	overlay temporally.
+	(w3m-bitmap-image-insert-internal): Put the `evaorate' property in an
+	overlay; return an overlay.
+	(w3m-bitmap-image-insert): Use the return value of
+	`w3m-bitmap-image-insert-internal' instead of to call
+	`w3m-bitmap-image-get-overlay'.
+	(w3m-bitmap-image-insert-string): Remove.
+	(w3m-insert-image): Use `w3m-modify-plist' to cleanup plist; don't move
+	the point.
+	(w3m-remove-image): Replace `w3m-bitmap-image-insert-string' with
+	`w3m-bitmap-image-insert-internal'.
+
+	* w3m-util.el (w3m-modify-plist): New function.
+
+2002-04-12  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-proc.el (w3m-process-kill-surely): New internal variable.
+	(w3m-process-kill-process): When `w3m-process-kill-surely' is non-nil,
+	wait for the completion to kill process surely.
+
+2002-04-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bitmap.el (w3m-bitmap-image-get-overlay): Speed up a bit.
+	(w3m-bitmap-image-insert-internal): Replace `current-column' with
+	`w3m-bitmap-current-column'; call `w3m-add-text-properties' only when
+	props are specified; use `overlay-end' dynamically (fix a bug I've
+	made); replace `move-to-column-force' with
+	`w3m-bitmap-move-to-column-force'.
+	(w3m-bitmap-image-delete-internal): Make the 2nd arg optional; replace
+	`current-column' with `w3m-bitmap-current-column'; replace
+	`move-to-column-force' with `w3m-bitmap-move-to-column-force'; guess
+	the end position of an overlay by itself when the 2nd arg is omitted.
+	(w3m-bitmap-image-delete): Remove the 2nd arg.
+	(w3m-bitmap-image-delete-string): Alias to
+	`w3m-bitmap-image-delete-internal' instead of defining as a function.
+	(w3m-insert-image): Don't use the length of a bitmap image.
+	(w3m-remove-image): Ditto.
+
+	* w3m-om.el (move-to-column-force): Remove.
+
+2002-04-10  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-image.el (w3m-imagick-convert-async-exec): Change default value
+	for Meadow.
+
+2002-04-10  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-e21.el (w3m-favicon-converted): New buffer-local variable.
+	(w3m-setup-favicon): Set w3m-favicon-converted as nil.
+	(w3m-buffer-favicon): If w3m-favicon-converted is non-nil, don't start
+	conversion.  Set w3m-favicon-converted as t before conversion.
+
+2002-04-10  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-about-retrieve): Change behavior according to whether the
+	return value of `base64-decode-string' is multibyte or not.
+
+	* w3m-image.el (w3m-imagick-convert-async-exec): New user option.
+	(w3m-imagick-start): Use `call-process' when
+	`w3m-imagick-convert-async-exec' is nil.
+	(w3m-imagick-convert-buffer): Don't use stdin because `convert' can not
+	handle an animation GIF that it input from stdin.
+
+2002-04-10  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-bitmap.el (w3m-create-image): Use w3m-process-do-with-temp-buffer
+	instead of w3m-process-do.
+	(w3m-create-image): Don't call `set-buffer-multibyte' if old mule.
+
+	* w3m-image.el (w3m-imagick-start-convert-buffer): Removed needless
+	`concat'.
+
+	* w3m-bitmap.el (w3m-create-image): Call
+	`w3m-imagick-start-convert-buffer' instead of
+	`w3m-imagick-convert-data'.
+
+2002-04-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bitmap.el (w3m-bitmap-current-column): New function for old
+	Emacsen; alias to `current-column' for the recent Emacsen.
+	(w3m-bitmap-move-to-column-force): New function for old Emacsen; alias
+	to `move-to-column-force' for the recent Emacsen.
+
+2002-04-10  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-image.el (w3m-imagick-convert-data): Check buffer size.
+	(w3m-imagick-start-convert-data): Ditto.
+	(w3m-imagick-start-convert-buffer): Don't use output file
+	(Because it sometimes causes multiple files).
+
+2002-04-10  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3mhack.el (w3mhack-examine-modules): Reverse the turn of the load
+	with `bitmap' and `un-define'.
+
+2002-04-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bitmap.el (w3m-bitmap-image-face): New face.
+	(w3m-bitmap-image-insert-internal): Put text properties.
+	(w3m-bitmap-image-insert): Pass text properties argument to
+	`w3m-bitmap-image-insert-internal'.
+	(w3m-bitmap-image-add-text-properties): Remove.
+	(w3m-insert-image): Pass text properties to `w3m-bitmap-image-insert'.
+
+2002-04-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-bitmap.el (w3m-bitmap-image-get-overlay): Use
+	`line-beginning-position' and/or `line-end-position'.
+	(w3m-bitmap-image-insert-internal): Ditto.
+	(w3m-bitmap-image-delete-internal): Ditto.
+	(w3m-bitmap-image-add-text-properties): Ditto.
+
+	* w3m-om.el: Require `w3m-bitmap' if BITMAP-MULE is available.
+	(move-to-column-force): Define it if void.
+
+2002-04-09  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-bitmap.el: Convert CRLF to LF.
+	(w3m-display-graphic-p): Ruturn nil if no window-system.
+	(w3m-image-type-available-p): Ruturn nil if not found "convert".
+
+	* w3mhack.el (w3mhack-examine-modules): Don't byte-compile
+	w3m-bitmap.el under XEmacs or FSF Emacs-21.
+
+	* w3m.el (w3m-fontify): When delete duplicated empty line, keep
+	'w3m-name-anchor property surely.
+
+	* w3m-e20.el (top): Require 'w3m-bitmap if have BITMAP.
+
+2002-04-09  Taiki SUGAWARA  <taiki.s@cityfujisawa.ne.jp>
+
+	* w3mhack.el (w3mhack-examine-modules): Don't byte-compile
+	w3m-bitmap.el if bitmap.el is not installed.
+	(w3mhack-examine-modules): Add condition to w3m-bitmap.el check.
+
+	* w3m-bitmap.el: New file.
+
+	* w3m-e20.el (w3m-create-image, w3m-insert-image, w3m-remove-image,
+	w3m-image-type-available-p, w3m-display-graphic-p,
+	w3m-display-inline-images-p): Alias to `ignore'. Bitmap image
+	implementation is moved to w3m-bitmap.el.
+	(w3m-bitmap-image-cache-alist, w3m-bitmap-image-use-cache,
+	w3m-bitmap-image-cleanup, w3m-bitmap-image-buffer,
+	w3m-bitmap-image-get-overlay, w3m-bitmap-image-insert-internal,
+	w3m-bitmap-image-insert, w3m-bitmap-image-insert-string,
+	w3m-bitmap-image-delete-internal, w3m-bitmap-image-delete,
+	w3m-bitmap-image-delete-string, w3m-bitmap-image-add-text-properties):
+	Move to w3m-bitmap.el.
+
+2002-04-09  Taiki SUGAWARA  <taiki.s@cityfujisawa.ne.jp>
+
+	* w3m-e20.el (w3m-create-image): Return nil if
+	w3m-imagick-convert-buffer is failed.
+	(w3m-insert-image): Not insert image if image is nil.
+
+2002-04-08  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-coding-system): Change default value to
+	'iso-2022-7bit-ss2 when use w3mmee under mule environment.
+
+2002-04-08  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-xmas.el (w3m-create-image): Resize gif images, too.
+
+2002-04-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-make-glyph): Remove unused var.
+
+2002-04-08  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-form.el (w3m-char-to-int): New alias.
+	(w3m-form-mee-attr-unquote): Use it.
+	(w3m-form-mee-new): Ditto.
+
+	* w3m-xmas.el (toplevel): Require 'w3m-image.
+	(w3m-make-glyph): New inline function.
+	(w3m-create-image): Resize images when w3m-resize-images is non-nil.
+
+	* w3m-form.el (w3m-string-to-char-list)[XEmacs]: Use string-to-list
+	instead of string-to-char-list.
+	(w3m-int-to-char): New alias.
+	(w3m-form-mee-select-value): Use it.
+
+2002-04-08  Taiki SUGAWARA  <taiki.s@cityfujisawa.ne.jp>
+
+	* w3m-e20.el (w3m-bitmap-image-insert-internal): Begin the overlay on
+	`begion-of-line'.
+
+2002-04-08  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* octet.el: Update URL for xlhtml.
+
+2002-04-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el: Don't require `pcustom'.
+
+2002-04-08  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-image.el: New file.
+
+	* w3m.el (w3m-halfdump-command-arguments): Specify single-row-image
+	dump option instead of image.
+	(w3m-goto-mailto-url): Added optional post-data argument and use it.
+	(w3m-goto-url): Set post-data of w3m-goto-mailto-url.
+
+	* w3m-util.el (w3m-imagick-convert-program, w3m-imagick-convert-buffer,
+	w3m-imagick-convert-data): Moved to w3m-image.el.
+
+	* w3m-e21.el (toplevel): Require 'w3m-image.
+	(w3m-resize-images, w3m-imagick-start-convert-data,
+	w3m-imagick-start-convert-buffer, w3m-imagick-start, w3m-resize-image):
+	Moved to w3m-image.el;
+	(w3m-create-image): Follow the change in w3m-resize-image.
+	(w3m-favicon-usable-p): Renamed from w3m-imagick-convert-usable-p.
+	(w3m-use-favicon): Follow the change above.
+	(w3m-favicon-cache-data): Fixed typo.
+	(w3m-favicon-cache-retrieved): Ditto.
+	(w3m-retrieve-favicon): Ditto.
+
+	* w3m-e20.el (w3m-image): Require 'w3m-image.
+
+2002-04-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (multibyte-string-p): Alias to `stringp' if MULE,
+	otherwise `ignore'.
+
+	* w3m-om.el (multibyte-string-p): Alias to `stringp'.
+
+	* w3m-util.el: Require `pcustom' for old Emacsen.
+
+2002-04-05  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-w3m-retrieve): Revert previous change.
+	(w3m-w3m-dump-head-source): Add argument orig-url; Cache header and
+	body using orig-url.
+	(w3m-w3m-retrieve): Don't cache header here; Return error response when
+	follow redirection number exceeds w3m-follow-redirection; Pass orig-url
+	to w3m-w3m-retrieve-1.
+	(w3m-w3m-retrieve-1): Add argument orig-url; Call w3m-dump-head-source
+	with orig-url argument.
+	(w3m-redirect-with-get): Changed default value to t.
+
+2002-04-05  Taiki SUGAWARA  <taiki.s@cityfujisawa.ne.jp>
+
+	* w3m-e20.el (w3m-bitmap-image-insert): Fix (point) -> pos.
+
+2002-04-04  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-form.el (w3m-form-input-map): If menu string is empty, use href
+	string instead.
+
+	* w3m.el (w3m-w3m-dump-head-source): Fixed caching logic.
+	(w3m-w3m-retrieve): Use cache if available after redirection.
+
+2002-04-04  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-e20.el (top): Avoid byte-compile warnings when not found
+	`bitmap'.
+	(w3m-image-type-available-p): Return nil if not have `bitmap'.
+
+2002-04-04  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-fontify-anchors): Set default icon type as ico.
+
+	* w3m-e21.el (w3m-buffer-favicon): Asynchronous implementation.
+
+2002-04-04  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3mhack.el (top): Avoid byte-compile error for `w3m-ucs.el' with
+	Emacs20 when it has `un-define' and `bitmap'.
+	(w3mhack-load-path): Add the path of `bitmap.el' on Emacs20.
+
+2002-04-04  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-request-arguments): Use -header option if no cookie nor
+	no body.
+	(w3m-w3m-retrieve-1): Delete temp-file only when it exists.
+
+	* w3m-e21.el (w3m-imagick-start-convert-data): Don't use
+	string-as-unibyte (no use).
+
+2002-04-04  Taiki SUGAWARA  <taiki.s@cityfujisawa.ne.jp>
+
+	* w3m.el (w3m-toggle-inline-images-internal): Support w3m-bitmap-image.
+
+	* w3m-e21.el (w3m-imagick-convert-program): Move to w3m-util.el.
+	(w3m-imagick-convert-buffer): Ditto.
+	(w3m-imagick-convert-data): Ditto.
+
+	* w3m-util.el (w3m-imagick-convert-program): Move from w3m-e21.el.
+	(w3m-imagick-convert-buffer): Ditto.
+	(w3m-imagick-convert-data): Ditto.
+
+	* w3m-e20.el (w3m-bitmap-image-cache-alist): New variable.
+	(w3m-bitmap-image-use-cache): Ditto.
+	(w3m-bitmap-image-cleanup): New function.
+	(w3m-bitmap-image-buffer): Ditto.
+	(w3m-bitmap-image-get-overlay): Ditto.
+	(w3m-bitmap-image-insert-internal): Ditto.
+	(w3m-bitmap-image-insert): Ditto.
+	(w3m-bitmap-image-insert-string): Ditto.
+	(w3m-bitmap-image-delete-internal): Ditto.
+	(w3m-bitmap-image-delete): Ditto.
+	(w3m-bitmap-image-delete-string): Ditto.
+	(w3m-bitmap-image-add-text-properties): Ditto.
+	(w3m-display-graphic-p): New implementation.
+	(w3m-display-inline-images-p): Ditto.
+	(w3m-image-type-available-p): Ditto.
+	(w3m-create-image): New implementation. It use w3m-bitmap-image-*.
+	(w3m-insert-image): Ditto.
+	(w3m-remove-image): Ditto.
+
+2002-04-03  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-fontify): Put invisible and intangible properties at the
+	duplicated empty lines instead of delete them.
+
+2002-04-03  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-e21.el (w3m-resize-image): Asynchronous implementation.
+	(w3m-imagick-start-convert-data): New function.
+	(w3m-imagick-start-convert-buffer): Ditto.
+	(w3m-imagick-start): Ditto.
+	(w3m-create-image): Rewrite to resize images asynchronously.
+	(w3m-insert-image): Don't resize.
+
+2002-04-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-check-link-tags): Relax the pattern to detect headers.
+
+2002-04-02  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-form.el (w3m-form-submit): Confirm when posting from secure page
+	to normal page.
+
+	* w3m.el (w3m-redirect-with-get): New user option.
+	(w3m-w3m-retrieve): If w3m-redirect-with-get is non-nil, use GET method
+	after redirection; Ask user to use POST data after redirection.
+	(w3m-w3m-attributes): Set w3m-current-redirect as a cons cell of
+	(CODE . LOCATION).
+	(w3m-w3m-dump-head-source): Don't cache content if the response code is
+	one of 302, 303, 307.
+	(w3m-w3m-retrieve): Change POST redirection behavior according to
+	response code.
+	(w3m-retrieve-and-render): Confirm leaving secure pages.
+
+	* octet.el (mime-preview-octet): Change behavior according to whether
+	the return value of mime-entity-content is multibyte or not.
+	(mime-view-octet): Ditto.
+
+	* w3m.el (w3m-w3m-retrieve): Don't call w3m-cache-request-header when
+	type is nil.
+
+2002-04-01  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-follow-redirection): New user option.
+	(w3m-w3m-attributes): Set w3m-current-redirect as nil.
+	(w3m-cookie-command-arguments): Abolish.
+	(w3m-request-arguments): Use cookie only when w3m-use-cookies is
+	non-nil.
+	(w3m-header-arguments): New function.
+	(w3m-w3m-retrieve): Treat redirection when w3m-follow-redirection is
+	non-nil.
+	(w3m-w3m-retrieve-1): Renamed from w3m-w3m-retrieve.
+	(w3m-prepare-content): Don't care w3m-current-redirect.
+	(w3m-goto-url): Ditto.
+
+	* w3m-form.el (w3m-form-new): Added argumnet enctype.
+	(w3m-form-enctype): New macro.
+	(w3m-form-plist): Changed definition.
+	(w3m-form-put-property): Ditto.
+	(w3m-form-make-form-data): Removed optional argument urlencode; Encode
+	form data acording to w3m-form-enctype.
+	(w3m-form-mee-new): Set enctype field.
+	(w3m-form-parse-and-fontify): Parse enctype.
+	(w3m-form-submit): Don't pass enctype argumnet.
+
+2002-04-01  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-fontify-anchors): Put a property of `w3m-name-anchor' as
+	a list.
+	(w3m-move-point-for-localcgi): Use `w3m-search-name-anchor'.
+	(w3m-search-name-anchor): Use `member' when compare a name with
+	`w3m-name-anchor'. Fix continuous name-anchor.
+
+2002-03-29  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* mew-w3m.el (mew-mime-text/html-w3m): Use `match-string' instead of
+	`mew-match'.
+
+	* w3m.el (w3m-fontify-anchors): Modify the point for 'w3m-name-anchor
+	property when its has an empty body.
+
+2002-03-28  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-dump-head-source-command-arguments)[w3mmee]: Don't add
+	Accept-Language header option.
+	(w3m-cookie-command-arguments)[w3mmee]: Don't add Cookie header option.
+	(w3m-request-arguments): New function to generate -request option.
+	(w3m-w3m-retrieve)[w3mmee]: Use w3m-request-arguments to make request
+	header and body.
+
+2002-03-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-url-at-point (ffap)): Strip text props under XEmacs.
+	(ffap-url-regexp): Modify the value to make it match to https urls for
+	Emacs 19, 20 and XEmacs.
+
+2002-03-27  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-e21.el (w3m-tab-drag-mouse-function): Fix problem when dragged
+	mouse position is outside of the original frame.
+
+	* w3m.el (w3m-version): New variable.
+	(toplevel): Detect w3m version.
+	(w3m-user-agent): New user option.
+	(w3m-add-user-agent): Ditto.
+	(w3m-w3m-retrieve): Add User-Agent: field if w3m-add-user-agent is
+	non-nil.
+
+	* w3m-e21.el (w3m-tab-drag-mouse-function): New function.
+	(w3m-tab-make-keymap): Add mouse-1, mouse-2, drag-mouse-1 and
+	drag-mouse-2.
+
+	* w3m-cookie.el (w3m-cookie-set): Fixed docstring.
+
+2002-03-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-find-coding-system): Alias to ignore if the function
+	`find-coding-system' is not available.
+	(w3m-make-ccl-coding-system): Check whether the function
+	`make-ccl-coding-system' is available instead of checking the feature
+	`mule' to determine what function should be aliased to.
+	(coding-system-list): Alias to ignore if it is not available.
+	(define-ccl-program): Check whether it is available instead of checking
+	the feature `mule' to determine if it is aliased to `ignore'.
+	(w3m-detect-coding-with-priority): Quote `w3m-default-coding-system'.
+
+2002-03-24  Nix  <nix@esperi.demon.co.uk>
+
+	* w3m-xmas.el (w3m-detect-coding-with-priority): New macro, handle
+	non-MULE XEmacsen.
+	(w3m-detect-coding-region): Use it.
+
+2002-03-26  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-cookie.el (w3m-cookie-1-set): Fixed problem when no `Expires',
+	ignore is ignored.
+
+2002-03-26  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-cookie.el (w3m-cookie-url, w3m-cookie-domain, w3m-cookie-secure,
+	w3m-cookie-name, w3m-cookie-value, w3m-cookie-path, w3m-cookie-version,
+	w3m-cookie-expires, w3m-cookie-ignore): Define as macro.
+	(w3m-cookie-set-url, w3m-cookie-set-domain, w3m-cookie-set-secure,
+	w3m-cookie-set-name, w3m-cookie-set-value, w3m-cookie-set-path,
+	w3m-cookie-set-version, w3m-cookie-set-expires, w3m-cookie-set-ignore):
+	Removed.
+	(w3m-cookie-create): New implementation.
+	(w3m-about-cookie): Call `setf' instead of `w3m-cookie-set-ignore'.
+
+2002-03-26  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-fontify-anchors): Changed anchor name property position.
+	(w3m-lynx-like-map): Bind w3m-cookie as `M-k'.
+	(w3m-info-like-map): Ditto.
+
+2002-03-26  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-cookie.el (w3m-cookie-save): Use `w3m-time-newer-p' instead of
+	`w3m-time-lapse-seconds'.
+
+2002-03-26  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-cookie.el (w3m-cookie): New command.
+	(w3m-about-cookie): Do nothing if w3m-use-cookies is nil.
+
+	* w3m.el (toplevel): Added autoload setting for w3m-about-cookie; Added
+	autoload setting for w3m-cookie.
+
+	* w3m-cookie.el (w3m-cookie-store): Don't replace if ignored cookie.
+	(w3m-cookie-retrieve): Don't use cookie which is ignored.
+	(w3m-about-cookie): New function.
+
+	* w3m-e21.el (w3m-setup-favicon): Do nothing when w3m-current-url is
+	nil.
+
+	* w3m.el (w3m-goto-url): Force reload if w3m-current-redirect is set.
+	(w3m): If w3m-current-url is nil, erase buffer.
+
+	* w3m-util.el (w3m-time-less-p): Abolish.
+	(w3m-assoc-ignore-case): Moved from w3m-cookie.el and rewrote not to
+	use assoc* (because it's cl function).
+
+	* w3m-cookie.el (w3m-cookie-retrieve): Use w3m-time-newer-p instead of
+	w3m-time-less-p.
+	(w3m-cookie-1-set): Ditto.
+	(w3m-assoc-ignore-case): Moved to w3m-util.el.
+
+2002-03-25  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-cookie.el (w3m-cookie-1-set): Use w3m-time-less-p instead of
+	w3m-time-lapse-seconds.
+	(w3m-cookie-retrieve): Ditto.
+
+	* w3m-util.el (w3m-time-less-p): New inline function.
+
+	* w3m.el (w3m-current-redirect): New buffer local variable.
+	(w3m-clear-local-variables): Add w3m-current-redirect.
+	(w3m-copy-local-variables): Treat w3m-current-redirect.
+	(w3m-w3m-attributes): Set w3m-current-redirect instead of
+	w3m-current-refresh when 30x response.
+	(w3m-prepare-content): Use w3m-current-redirect instead of
+	w3m-current-refresh.
+	(w3m-goto-url): Do nothing but w3m-goto-url after retrieval if
+	w3m-current-redirect is set.
+
+2002-03-25  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-cookie.el (w3m-cookie-file): Changed default value.
+	(w3m-cookie-save): Follow the above change.
+	(w3m-cookie-load): Ditto.
+
+2002-03-25  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-w3m-attributes): Don't call w3m-cookie-set.
+	(w3m-w3m-dump-head-source): Call w3m-cookie-set.
+	(w3m-cookie-command-arguments): Set `-no-cookie'; Don't set
+	cookie_accept_domains, cookie_reject_domains.
+
+	* w3m-cookie.el (toplevel): Require 'w3m.
+	(w3m-cookie-accept-domains): Moved from w3m.el.
+	(w3m-cookie-reject-domains): Ditto.
+	(w3m-cookie-accept-bad-cookies): New user option.
+	(w3m-cookie-file): Ditto.
+	(w3m-cookie-set-ignore): Fix.
+	(w3m-cookie-retrieve): Remove expired cookies.
+	(w3m-cookie-trusted-host-p): Fixed domain match.
+	(w3m-cookie-1-set): Treat all cookies.  Accept bad cookies according to
+	w3m-cookie-accept-bad-cookies.
+	(w3m-cookie-init): New variable.
+	(w3m-cookie-clear): New function.
+	(w3m-cookie-save): Ditto.
+	(w3m-cookie-load): Ditto.
+	(w3m-cookie-setup): Ditto.
+	(w3m-cookie-shutdown): Rewrite.
+	(w3m-cookie-set): Call w3m-cookie-setup; Changed API.
+	(w3m-cookie-get): Call w3m-cookie-setup.
+
+	* w3m.el (w3m-goto-url): Don't resume form from history when POST.
+
+2002-03-24  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-cookie.el: New file.
+
+	* w3m-form.el (w3m-form-resume): Use cdr of forms if car is t
+	(Just in case).
+	(w3m-form-parse-and-fontify)[w3m]: Search form structure according to
+	fid.
+
+	* w3m.el (toplevel): Added autoload setting for w3m-cookie.
+	(w3m-use-cookies): New user option.
+	(w3m-cookie-accept-domains): Ditto.
+	(w3m-cookie-reject-domains): Ditto.
+	(toplevel): Bind system-time-locale as "C" while calling
+	format-time-string.
+	(w3m-w3m-attributes): Call w3m-cookie-set; When 30x response is
+	received, set w3m-current-refresh as
+	(0 . Location).
+	(w3m-cookie-command-arguments): New function.
+	(w3m-w3m-retrieve): Use it.
+	(w3m-retrieve-and-render): Mark w3m-current-forms as `not history' if
+	retrieval failed.
+	(w3m-prepare-content): If w3m-current-refresh rate is 0, do nothing.
+	(w3m-quit): Call `w3m-cookie-shutdown'.
+
+2002-03-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-decode-encoded-contents): Convert encoding to lower case
+	before checking alist.
+
+2002-03-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-remove-redundant-spaces): New implementation.
+	(w3m-about-retrieve): Call `insert-buffer-substring' instead of
+	`insert-buffer'.
+	(w3m-rendering-unibyte-buffer): Ditto.
+	(w3m-rendering-multibyte-buffer): Ditto.
+	(w3m-prepare-text-content): Ditto.
+
+2002-03-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-w3m-attributes): Ignore trailing whitespaces in header
+	lines.
+
+2002-03-20  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-view-this-url): Eval action even when anchor is set.
+
+	* w3m-form.el (w3m-form-parse-and-fontify): Clear mapval if it is set.
+
+	* w3m.el (w3m-halfdump-command-arguments)[w3mmee]: Add `image' to the
+	-dump argument only if `w3m-treat-image-size' is non-nil.
+
+2002-03-20  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-form.el (w3m-form-parse-and-fontify): If not detect `usemap'
+	attribute of `img_alt', use `value' attribute of `input_alt' for the
+	select map name; W3M removes `usemap' attribute when
+	"display_image=off".
+
+2002-03-19  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-w3m-attributes): Ignore `w3m-document-charset' when
+	w3m-m17n.
+
+2002-03-19  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-fontify-images): Parse width and height attributes of
+	img_alt.
+	(w3m-toggle-inline-images-internal): Set `size' argument of
+	w3m-create-image.
+	(w3m-highlight-current-anchor): Fixed logic.
+
+	* w3m-xmas.el (w3m-create-image): Added optional argument `size'
+	(ignored currently).
+
+	* w3m-e21.el (w3m-imagick-convert-program): Use w3m-which to set
+	initial value.
+	(w3m-resize-images): New user option.
+	(w3m-resize-image): New function.
+	(w3m-create-image): Added optional argument `size'; Changed return
+	value.
+	(w3m-insert-image): Call w3m-resize-image if size is specified.
+	(w3m-imagick-convert-buffer): Accept nil for from-type and to-type.
+
+2002-03-18  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-form.el (w3m-form-mee-select-value): Fix.
+	(w3m-form-parse-and-fontify): If w3m-type is not w3mmee, use last form
+	object as current form.
+
+2002-03-18  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-highlight-current-anchor): New implementation.
+	(w3m-highlight-current-anchor-1): New function.
+
+	* w3m-form.el (w3m-form-replace): Fixed problem when string is nil.
+
+2002-03-16  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-form.el (w3m-string-to-char-list): Fixed.
+
+2002-03-15  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-form.el (w3m-form-mee-select-value): Use w3m-output-coding-system
+	instead of w3m-current-coding-system.
+	(w3m-form-parse-and-fontify)[w3mmee]: Ditto.
+	(w3m-form-mee-select-value): Fixed select value.
+	(w3m-form-resume): Fixed checkbox resuming.
+	(w3m-form-parse-and-fontify): Use `form' instead of `(car forms)';
+	Search the form which corresponds to input_alt by fid; Use `nconc'
+	instead of `push'.
+
+	* w3m-form.el (w3m-form-mee-select-value): New function.
+	(w3m-form-parse-and-fontify)[w3mmee]: Set select value.
+
+	* w3m.el (w3m-halfdump-command-arguments)[w3mmee]: Added image.
+
+	* w3m-form.el (w3m-form-parse-and-fontify): Set the value of form only
+	if the method is not internal; Add internal form to the
+	w3m-current-forms; Treat input type `image' as same as `submit'.
+	(w3m-form-mee-attr-unquote): New function.
+	(w3m-string-to-char-list): New function/alias.
+	(w3m-form-mee-new): New function.
+	(w3m-form-parse-and-fontify): Parse w3mmee's form info.
+	(w3m-form-input-textarea-keymap): Bind C-g.
+	(w3m-form-input-select-keymap): Bind C-g, h,j,k,l.
+	(w3m-form-input-map-keymap): Ditto.
+	(w3m-form-parse-and-fontify): Set textarea value.
+
+2002-03-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-form.el (w3m-form-resume): Typo.
+
+2002-03-13  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (toplevel): Removed autoload setting for
+	`w3m-form-parse-buffer'.
+	(w3m-clear-local-variables): Don't treat w3m-current-forms any more.
+	(w3m-copy-local-variables): Ditto.
+	(w3m-additional-command-arguments): Fixed problem when no-proxy host
+	has port number other than 80.
+	(w3m-rendering-buffer-1): Don't call w3m-form-parse-buffer.
+	(w3m-goto-url): Setup w3m-current-forms from history structure.
+
+	* w3m-form.el (w3m-form-parse-buffer): Abolish.
+	(w3m-form-parse-forms): Ditto.
+	(w3m-form-resume): Set value of `w3m-current-forms'.
+	(w3m-fontify-forms): Call `w3m-form-parse-and-fontify' instead of
+	`w3m-form-fontify'.
+	(w3m-form-parse-and-fontify): New function.
+	(w3m-form-input-select): Fix problem when candidate label is "".
+
+2002-03-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+	Suggested by HAYASHI Chifumi <chifumi@mscom.or.jp>.
+
+	* w3m-form.el (w3m-form-new): Ignore the 2nd arg `action' if it is nil.
+	(w3m-form-parse-forms): Don't parse the value of `w3m-current-url' if
+	it is nil.
+
+
+2002-03-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Release emacs-w3m-1.2.6 from emacs-w3m-1_2 branch.
+
+2002-03-11  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-ucs.el (w3m-euc-japan-encoder): Treat japanese-jisx0208-1978 as
+	japanese-jisx0208.
+
+2002-03-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-view-this-url, w3m-goto-url-new-session,
+	w3m-select-buffer-copy-buffer): Remove unused non-global variables.
+
+2002-03-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+	Suggested by Yuuichi Teranishi <teranisi@gohome.org> with mod.
+
+	* w3m.el (w3m-no-proxy-domains): New user option renamed from
+	`w3m-no-proxy-hosts' and changed the meaning.
+	(w3m-additional-command-arguments): Refer to it.
+
+2002-03-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Makefile.in (tarball): Fix permissions.
+
+2002-03-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-command-arguments-alist): Change the meaning that the car
+	of each element will be compared with a url instead of a hostname.
+	(w3m-no-proxy-hosts): New user option.
+	(w3m-additional-command-arguments): Look into it.
+
+2002-03-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-command-arguments-alist): New user option.
+	(w3m-additional-command-arguments): New function.
+	(w3m-w3m-retrieve): Use it.
+	(w3m-history-current-url-face, w3m-copy-buffer, w3m-about-header):
+	Remove unused non-global variables.
+
+2002-03-08  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-w3m-attributes) [w3mmee]: Fetch content-encoding from
+	"x-w3m-content-encoding" filed.
+
+2002-03-07  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* mew-w3m.el (mew-w3m-cid-retrieve): Return lowercase string always
+	because `w3m-image-type-alist' has lowercase keys.
+
+2002-03-07  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+	* w3m.el (w3m-lynx-like-map): Switch J and K so as to behave like w3m.
+
+2002-03-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* aclocal.m4 (AC_EXAMINE_PACKAGEDIR): Use `(eq 0 foo)' instead of
+	`(zerop foo)' because foo might not be a number.
+	(AC_PATH_ICONDIR): Ditto.
+
+2002-03-07  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-decoder-alist): Change default commands to `gzip' and
+	`bzip2' instead of `gunzip' and `bunzip2' because some broken OS and
+	its environment does not work them.
+
+2002-03-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* Makefile.in (datadir): New variable.
+
+2002-03-06  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-proc.el (w3m-process-filter): Modify a regexp for "Password:".
+
+2002-03-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* Makefile.in (install): Don't chdir to shimbun/ while installing
+	shimbun modules.
+	(install-icons): Don't chdir to icons/ while installing icons.
+
+2002-03-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* Makefile.in (install): Install all ChangeLog files.
+	* w3mhack.el (w3mhack-make-package): List all ChangeLog files in the
+	manifest.
+
+2002-03-05  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-local-dirlist-cgi): Set `w3m-current-url' for avoid error
+	in `w3m-process-start-process()'.
+	(w3m-goto-url): When use w3m-dtree and the URL is local directory,
+	change the URL to `about://dtree' securely.
+
+2002-03-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el (w3m-function-max-args): Alias to `function-max-args'
+	under XEmacs, otherwise define it as a function.
+	(symbol-for-testing-whether-colon-keyword-is-available-or-not): Use
+	`dont-compile' instead of `eval'.
+
+
+2002-03-02  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Release emacs-w3m-1.2.5 from emacs-w3m-1_2 branch.
+
+2002-03-01  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* octet.el (octet-find-file): Decode even in the read-only buffer.
+
+2002-02-26  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Makefile.in (DOCS): Add ChangeLog.1.
+
+
+Local Variables:
+coding: iso-2022-7bit
+fill-column: 79
+indent-tabs-mode: t
+End:

=== added file 'share/emacs/site-lisp/w3m/ChangeLog.1'
--- share/emacs/site-lisp/w3m/ChangeLog.1	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/ChangeLog.1	2010-09-13 10:14:52 +0000
@@ -0,0 +1,6731 @@
+2002-02-25  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-proc.el (w3m-process-filter): Use `ignore-errors' instead of
+	`condition-case'.
+	(w3m-process-y-or-n-p): Regist answers only when they have non-nil
+	values.
+
+2002-02-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-perldoc.el: New file.
+
+	* w3m.el (top): Add autoload for `w3m-perldoc.el'.
+	(w3m-tmp-urluser-alist): Abolished.
+	(w3m-read-file-name): Call `w3m-url-strip-query'.
+	(w3m-download): Ditto.
+	(w3m-w3m-get-header): Accept URLs which includes authentication
+	information like scheme://user:pass@netloc/.  Set `w3m-current-url'
+	before `w3m-process-start' is called.
+	(w3m-w3m-dump-head-source): Ditto.
+	(w3m-retrieve): Call `w3m-url-strip-fragment'.
+	(w3m-retrieve-and-render): Modified to accept URLs which includes
+	authentication information.  Do not set `w3m-current-url'.
+	(w3m-goto-url): Modified to accept URLs which includes authentication
+	information and to pass them through to sub-routines.
+	(w3m): Small modified to accept URLs which includes authentication
+	information.
+
+	* w3m-util.el (w3m-url-authinfo-regexp): New internal constant.
+	(w3m-url-authinfo): New function.
+	(w3m-url-strip-authinfo): Ditto.
+	(w3m-url-strip-fragment): Ditto.
+	(w3m-url-strip-query): Ditto.
+
+	* w3m-proc.el (top): No bind `w3m-tmp-urluser-alist'.
+	(w3m-process-authinfo-alist): Renamed from `w3m-process-user-alist'.
+	(w3m-process-accept-list): Abolished.
+	(w3m-process-accept-alist): New internal variable.
+	(w3m-process-user-counter): Abolished.
+	(w3m-process-start-process): In order to set `w3m-process-user' and
+	`w3m-process-passwd' call `w3m-url-authinfo', instead of refering
+	`w3m-tmp-urluser-alist'.
+	(w3m-process-stop): Reset `w3m-process-authinfo-alist' and
+	`w3m-process-accept-alist'.
+	(w3m-process-sentinel): Regist an authentication information only when
+	`w3m-process-realm' is set.
+	(w3m-process-filter): Call `w3m-process-y-or-n-p' instead of
+	`w3m-process-accept-get' and `w3m-process-accept-set'.  When a user
+	name and a password of a proxy server are reasked, their old values are
+	discarded.  Reconstruct the part checking user names and passwords.
+	(w3m-process-get-server-root): Its regular expression are small
+	modified.  Call `w3m-url-strip-authinfo'.
+	(w3m-process-get-user): Removed.
+	(w3m-process-get-passwd): Ditto.
+	(w3m-process-set-user): Ditto.
+	(w3m-process-accept-get): Ditto.
+	(w3m-process-accept-set): Ditto.
+	(w3m-process-set-authinfo): New function.
+	(w3m-process-read-user): Ditto.
+	(w3m-process-read-passwd): Ditto.
+	(w3m-process-y-or-n-p): Ditto.
+
+2002-02-14  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-modeline-ssl-image-status-on)
+	(w3m-modeline-ssl-status-off): New constants.
+	(w3m-current-ssl): New buffer local variable.
+	(w3m-clear-local-variables, w3m-copy-local-variables): Handling
+	`w3m-current-ssl'.
+	(w3m-w3m-attributes): When detect `W3m-ssl-certificate:' header, set
+	`w3m-current-ssl'. Skip reading of folded lines of each header.
+	(w3m-buffer-setup): Display SSL indicator at mode-line.
+	(w3m-about-header): Display SSL information when exist
+	`W3m-ssl-certificate:' header.
+
+2002-02-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-read-file-name): Strip the query part from a default file
+	name.
+	(w3m-download): Ditto.
+	(w3m-url-components-regexp): Move forward.
+
+	* mime-w3m.el: Always require `font' under XEmacs.
+
+2002-02-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-async-exec): Default to nil under MacOS X.
+
+2002-02-12  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-e21.el (w3m-setup-favicon): Fix handling of
+	`w3m-about-xxxx-favicon'.
+
+2002-02-08  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-icon-data): New buffer local variable.
+	(w3m-clear-local-variables): Add `w3m-icon-data'.
+	(w3m-copy-local-variables): Ditto.
+	(w3m-fontify-anchors): Setup `w3m-icon-data'.
+	(w3m-check-link-tags): Parse `type' of link attribute; Set
+	`w3m-icon-data' if `icon' rel attribute exist.
+	(w3m-goto-url): Added local variable real-data.
+
+	* w3m-e21.el (w3m-favicon-cache-favicon): Added compatibility code.
+	(w3m-setup-favicon): Use w3m-icon-data if it exists; Changed first
+	argument for `w3m-retrieve-favicon'.
+	(w3m-buffer-favicon): Use car of `w3m-current-favicon-data' as image
+	data and cdr as image type.
+	(w3m-retrieve-favicon): Changed first argument to cons cell of image
+	data and its type.
+
+2002-02-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-save-list): Allow the 4th arg `escape-ctl-chars'.
+	(w3m-arrived-shutdown): Call it with the 4th arg.
+
+	* w3m-antenna.el (w3m-antenna-shutdown): Call `w3m-save-list' with the
+	4th arg.
+
+2002-02-08  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-pixels-per-line): Renamed from w3m-pixel-per-line; Fixed
+	custom type.
+	(w3m-pixels-per-character): Likewise.
+	(w3m-rendering-half-dump): Follow the changes above.
+
+2002-02-08  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-type): Considerd as an internal variable.
+	(w3m-options): Removed.
+	(w3m-compile-options): New internal variable.
+	(toplevel): Set `w3m-compile-options' instead of `w3m-options'.
+	(w3m-treat-image-size): Refer `w3m-compile-options' instead of
+	`w3m-options'.
+	(w3m-rendering-half-dump): Ditto.
+	(w3m-local-file-type): When a remote URL is passed, refer its
+	non-directory part to decide its content type.
+	(w3m-touch-file): Bind `default-directory' locally.
+
+2002-02-08  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-pixel-per-line): New user option.
+	(w3m-rendering-half-dump): Use `w3m-pixel-per-line' as the -ppl
+	argument of the w3m command.
+	(w3m-pixel-per-character): New user option.
+	(w3m-rendering-half-dump): Use `w3m-pixel-per-character' as the -ppc
+	argument of the w3m command.
+
+2002-02-07  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-e21.el (w3m-favicon-size): Set default value to nil.
+	(w3m-buffer-favicon): If w3m-favicon-size is nil, detect frame char
+	height and use it.
+
+	* w3m.el (w3m-command): Set default value to nil.
+	(w3m-type): Ditto.
+	(w3m-options): New user option.
+	(toplevel): Set w3m-command, w3m-type and w3m-options.
+	(w3m-treat-image-size): New user option.
+	(w3m-rendering-half-dump): Set rendering options -o
+	display_image=on/off, -ppc, -ppl according to the value of
+	`w3m-treat-image-size'.
+
+2002-02-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el (w3m-display-message): New macro.
+
+	* w3m.el (w3m-make-help-echo): Clear the echo area when Emacs 21 is
+	running; use the modern styles of backquote.
+	(w3m-make-balloon-help): Use the modern styles of backquote.
+	(w3m-toggle-inline-image): Use `w3m-display-message' instead of
+	`message' to say a trivial message.
+	(w3m-view-this-url): Ditto.
+	(w3m-submit-form): Ditto.
+	(w3m-view-image): Ditto.
+	(w3m-save-image): Ditto.
+	(w3m-download-this-url): Ditto.
+	(w3m-print-current-url): Ditto.
+	(w3m-print-this-url): Ditto.
+	(w3m-edit-this-url): Ditto.
+	(w3m-quit): Ditto.
+	(w3m-goto-ftp-url): Ditto.
+	(w3m-select-buffer): Ditto.
+	(w3m-select-buffer-show-this-line): Ditto.
+	(w3m-select-buffer-show-this-line-and-switch): Ditto.
+
+2002-02-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-after-cursor-move-hook): New option.
+	(w3m-check-current-position): New function.
+	(w3m-print-this-url-after-command): Removed.
+	(w3m-buffer-setup): Set `w3m-check-current-position' to
+	`post-command-hook', instead of `w3m-print-this-url-after-command'.
+	(w3m-add-local-hook): Check version of Emacsen dynamically.
+
+	* w3m-e21.el (w3m-add-local-hook): New function.
+
+2002-02-07  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-fontify-images): Changed regexp to more generic one to
+	search img_alt tag.
+	(w3m-toggle-inline-images-internal): Fixed image redisplay flickers.
+
+2002-02-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-halfdump-command-common-arguments): Replace `frame-width'
+	with `window-width'.
+	(w3m-about-db-history): Ditto.
+
+2002-02-05  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-proc.el (w3m-process-accept-list): New internal variable.
+	(w3m-process-filter): Watch `accept? (y/n)' for certification.
+	(w3m-process-accept-get, w3m-process-accept-set): New functions.
+
+2002-02-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-make-ccl-coding-system): Alias to `ignore' if
+	no-MULE (the feature `mule' is not provided).
+	(coding-system-category): Ditto.
+	(define-ccl-program): Define it as an empty macro if no-MULE.
+
+	* w3m.el (TopLevel): Don't require `ccl' if no-MULE.
+	(w3m-accept-japanese-characters): Default to nil if no-MULE.
+	(w3m-coding-system): Default to `iso-8859-1' if no-MULE.
+	(w3m-output-coding-system): Ditto.
+	(w3m-file-coding-system): Ditto.
+	(w3m-toolbar): Don't express some Japaneses chars directly.
+
+	* w3mhack.el (w3mhack-examine-modules): Don't byte-compile w3m-ucs.el,
+	shimbun modules, mime-w3m.el, octet.el and w3m-weather.el if no-MULE.
+
+2002-02-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-meta-content-type-charset-regexp)
+	(w3m-meta-charset-content-type-regexp)
+	(w3m-meta-refresh-content-regexp)
+	(w3m-meta-content-refresh-regexp): Remove redundant double quote.
+
+	* w3m.el (w3m-content-prepare-functions): New internal contsant.
+	(w3m-prepare-content): Refer it.
+	(w3m-prepare-text-content): New function.
+	(w3m-prepare-image-content): Ditto.
+
+2002-02-05  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-meta-charset-content-type-regexp)
+	(w3m-meta-content-refresh-regexp): Allow broken quotation mark.
+
+2002-02-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-touch-file): Robust checking.
+
+2002-02-05  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-util.el (w3m-which-command): If called with `not string', return
+	nil.
+
+2002-02-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-touch-file-avaiable-p): New internal variable.
+	(w3m-touch-file): Check the validity of `touch' command.
+
+2002-02-05  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-touch-file): Call touch command with "-t time" instead of
+	"-d time".
+
+2002-02-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-touch-command): New option.
+	(w3m-touch-file): New function.
+	(w3m-download): Call it.
+	(w3m-toggle-inline-images-internal): Fix inconsistency of text
+	properties when images are not downloaded.
+	(w3m-toggle-inline-image): Simplified.
+	(w3m-toggle-inline-images): Ditto.
+
+2002-02-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el (w3m-prin1): New function.
+	* w3m.el (w3m-save-list): Use it instead of `prin1'.
+
+	* w3mhack.el, w3m.el, w3m-xmas.el, w3m-om.el: Say emacs-w3m not
+	Emacs-W3M.
+
+2002-02-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mime-w3m.el (mime-w3m-mode-dont-bind-keys): New variable.
+	(mime-w3m-setup): Don't bind keys listed in the above.
+
+	* w3m.el (w3m-key-binding): Switch key bindings also in w3m-mode
+	buffers when customizing; don't manipulate keymaps when Emacs is
+	running in the batch mode.
+
+2002-02-01  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* octet.el (octet-suffix-type-alist): Added lzh, tar, pdf.
+	(octet-type-filter-alist): Ditto.
+	(octet-content-type-alist): Added application/x-msexcel, text/html,
+	application/x-tar, application/pdf.
+	(octet-magic-type-alist): Fixed magic for html.
+	(octet-tar-mode): New function.
+	(octet-guess-type-from-name): Downcase suffix.
+	(octet-mime-setup): Add action for application/vnd.ms-powerpoint.
+
+2002-02-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mime-w3m.el (mime-w3m-safe-url-regexp): New user option.
+	(mime-w3m-preview-text/html): Use it.
+
+	* w3m.el (w3m-key-binding): Don't eval a part of the `set:' form when
+	compiling nnshimbun.el in the Gnus source tree.
+
+2002-02-01  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* octet.el (octet-buffer): Fixed problem when 'Quit'.
+	(mime-preview-octet-hook): New hook.
+	(mime-preview-octet): Run it.
+	(w3m-about-octet-attachments): Fixed problem when there's no
+	octet-attachment which corresponds to the src url.
+	(mime-view-octet): Set content-type argument for `octet-buffer'.
+	(mime-preview-octet): Ditto.
+
+2002-02-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mime-w3m.el (mime-w3m-preview-text/html): Bind `w3m-force-redisplay'
+	with nil.
+
+2002-02-01  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* octet.el (octet-buffer): Set default of `completing-read'.
+
+2002-02-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-key-binding): Switch `w3m-mode-map', `mime-w3m-mode-map'
+	and `mm-w3m-mode-map' when customizing.
+
+2002-01-31  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mime-w3m.el (mime-w3m-mode-command-alist): New variable.
+	(mime-w3m-setup): Use it; invalidate widget button in
+	`mime-w3m-mode-map'.
+	(mime-w3m-keymap-property): Removed.
+	(mime-w3m-preview-text/html): Add `text-rendered-by-mime-w3m' text
+	property to the rendered area.
+	(kill-new): Strip keymap properties from a killed string only if it has
+	`text-rendered-by-mime-w3m' property.
+
+2002-01-31  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-url-at-point): Remove all text-properties from url.
+
+	* w3m-search.el (w3m-search): Remove all text-properties from default
+	search value.
+
+2002-01-31  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-search.el (w3m-search-word-at-point): New option.
+	(w3m-search): Refer `w3m-search-word-at-point'.
+
+2002-01-31  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* octet.el (octet-content-type-alist): Added text/html.
+	(octet-magic-type-alist): Likewise.
+	(octet-type-filter-alist): Likewise; Added `guess'; Changed result type
+	of gzip as `guess'.
+	(octet-find-file-hook): New hook.
+	(octet-find-file): Run it.
+	(octet-filter-guess): New function.
+	(octet-buffer): Fix.
+
+2002-01-30  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* octet.el (toplevel): Require 'static.
+	(octet-html-render-function): Changed default value to
+	`octet-w3m-region.'
+	(octet-type-filter-alist): Changed filter function to
+	`octet-filter-call2-extra'.
+	(octet-attachments): New buffer-local variable.
+	(w3m-about-octet-attachments): New function.
+	(octet-w3m-region): Ditto.
+	(octet-filter-call2-extra): New function.
+	(octet-find-file): Do nothing when buffer is read-only.
+
+	* w3m.el (w3m-about-retrieve): Decode buffer only if the content-type
+	is text.
+
+	* octet.el (octet-guess-type-from-name): Return nil if guess failed.
+	(octet-buffer): Ask octet type if guess failed.
+	(octet-content-type-alist): New variable.
+	(octet-guess-type-from-content-type): New function.
+	(octet-buffer): Added optional argument `content-type'.
+	(octet-buffer): Ignore `quit'.
+	(octet-suffix-type-alist): Added images.
+	(octet-content-type-alist): Ditto.
+	(octet-type-filter-alist): Ditto.
+	(octet-magic-type-alist): Renamed from mime-magic-type-alist.
+	(octet-decode-image): New function.
+	(octet-guess-type-from-magic): New function.
+	(octet-buffer): Use it.
+	(octet-insert-buffer): New function.
+	(mime-preview-octet): Use it.
+
+2002-01-29  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* octet.el (octet-type-filter-alist): Changed default value for xlhtml
+	and ppthtml.
+	(octet-filter-call2): Fixed problem when return value of call-process
+	is not numeric.
+	(octet-filter-call1): Ditto.
+	(octet-find-file): Use unwind-protect.
+	(octet-filter-call2): Fixed docstring.
+	(octet-filter-call1): Ditto.
+	(octet-buffer): Fixed argument for `interactive'.
+
+2002-01-29  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-encoding-type-alist): New option.
+	(w3m-local-file-type): New function.
+	(w3m-local-content-type): New implementation.
+	(w3m-local-attributes): Call `w3m-local-file-type' instead of
+	`w3m-local-content-type'.
+	(w3m-download): `url' is lexically binded.  Call `message' to display
+	error messages.
+
+	* w3mhack.el (w3mhack-examine-modules): Fix to avoid that octet.el is
+	byte-compiled repeatedly.
+
+2002-01-29  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3mhack.el (w3mhack-examine-modules): Add octet.el to the module list
+	if FLIM is installed.
+
+	* octet.el: New file.
+
+2002-01-25  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-highlight-current-anchor): Don't search for the anchor
+	points which are out of sight.
+
+2002-01-25  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-tmp-urluser-alist): New variable.
+	(w3m-goto-url): If URL include user and passwd, set
+	`w3m-tmp-urluser-alist' for process handling.  Remove passwd from URL.
+	(w3m): Remove passwd from URL when insert it in buffer.
+
+	* w3m-util.el (w3m-get-user-passwd-from-url)
+	(w3m-remove-passwd-from-url): New functions.
+
+	* w3m-proc.el (top): Define `w3m-tmp-urluser-alist' to avoid
+	byte-compile warning.
+	(w3m-process-start-process): If URL include user or passwd, set them to
+	default values.
+	(w3m-process-filter): Use default values of `w3m-process-user' and
+	`w3m-process-passwd'.
+	(w3m-process-get-server-root): Remove `about://.../' from server root.
+
+	* w3m-search.el (w3m-search): Insert default string in minibuffer.
+
+2002-01-25  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-about-history): Don't add to history if url is nil.
+	(w3m-print-this-url-after-command): Call
+	`w3m-highlight-current-anchor'.
+	(w3m-delete-all-overlays): New macro.
+	(w3m-highlight-current-anchor): New function.
+	(w3m-current-anchor-face): New face.
+	(w3m-arrived-anchor-face): Removed underline property.
+	(w3m-anchor-face): Ditto.
+
+2002-01-18  OHASHI Akira  <bg66@koka-in.org>
+
+	* w3m.el (w3m-header-line-map): Inherit `w3m-mode-map'.
+
+2002-01-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-e21.el (w3m-setup-favicon): Reversed the condition that decide
+	whether favicons are used.
+
+2002-01-15  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-e21.el (w3m-setup-favicon): If url is `ftp://', not retrieve a
+	favicon data.
+
+	* w3m.el (w3m-current-directory): New function.
+	(w3m-goto-url): Use `w3m-current-directory' when set
+	`default-directory'.
+
+2002-01-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-use-ange-ftp): New option.
+	(w3m-w3m-attributes): Handle ftp scheme URLs.
+	(w3m-download): Refer `w3m-use-ange-ftp'.
+	(w3m-goto-url): Ditto.
+
+2002-01-11  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-read-file-name): Remove an optional argument
+	`initial'. Call `read-file-name' without `default' option.
+
+2002-01-11  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-url-encode-string): Fixed for Mule2.
+
+	* w3m-util.el (w3m-truncate-string): New function.
+
+	* w3m-form.el (w3m-form-replace): Use `w3m-truncate-string' instead of
+	`truncate-string'.
+
+2002-01-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-region): Process <base> tag.
+
+2002-01-09  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-local-content-type): Fix handling of the remote url.
+	(w3m-file-directory-p): New function.
+	(w3m-goto-ftp-url): Use `w3m-file-directory-p' instead of
+	`file-directory-p'.
+
+
+2002-01-08  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Release emacs-w3m-1.2.4 from emacs-w3m-1_2 branch.
+
+2002-01-08  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-arrived-setup-hook): New hook.
+	(w3m-arrived-shutdown-hook): Ditto.
+	(w3m-arrived-setup): Run `w3m-arrived-setup-hook'.
+	(w3m-arrived-shutdown): Run `w3m-arrived-shutdown-hook'.
+	(w3m-quit): Don't remove `w3m-arrived-shutdown' from `kill-emacs-hook'.
+
+	* w3m-e21.el (w3m-favicon-cache-expire-wait): New user option.
+	(w3m-favicon-cache-p): New macro.
+	(w3m-favicon-cache-favicon): Ditto.
+	(w3m-favicon-cache-retrived): Ditto.
+	(w3m-retrieve-favicon): Don't use old cache data.
+	(w3m-favicon-cache-data): Renamed from `w3m-favicon-data-cache'.
+	(w3m-favicon-save-cache-file): Follow above change.
+	(w3m-favicon-load-cache-file): Ditto.
+	(w3m-arrived-setup-hook): Regist `w3m-favicon-load-cachee-faile'.
+	(w3m-arrived-shutdown-hook): Regist `w3m-favicon-save-cache-file'.
+
+2002-01-08  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-goto-url): Use a URL-like string under the cursor as the
+	initial value of the target URL when interactively called.
+	(w3m-view-this-url): When a URL-like string is found under the cursor,
+	view it.
+	(w3m-view-this-url-1): New internal function.
+
+2002-01-08  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-display-hook): Change default variable to `nil'.
+	(top): Use `add-hook' when `w3m-history-highlight-current-url',
+	`w3m-move-point-for-localcgi' and `w3m-select-buffer-update' set to
+	`w3m-display-hook'.
+	(w3m-local-dirlist-cgi): When use `dirlist.cgi', decode filename tag.
+
+2002-01-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-url-to-file-name): When the pointed file is not found,
+	decode the specified URL and recheck it.
+
+2002-01-07  Shiro Takeda  <zbc08106@park.zero.ad.jp>
+
+	* w3m.el (w3m-bold-face, w3m-underline-face): New faces.
+	(w3m-fontify-bold): Use `w3m-bold-face' instead of `bold'.
+	(w3m-fontify-underline): Use `w3m-underline-face' instead of
+	`underline'.
+
+2002-01-07  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-w32-browser-with-fiber): Fix handling of the local url.
+
+	* w3m-util.el (w3m-url-local-p): Fix its regexp for Windows.
+
+2002-01-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-about-header): Protect against null title.
+	(w3m-arrived-setup): Ignore database of arrived URLs in too old style.
+
+2002-01-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-url-encode-string): Add a period to the set of characters
+	which are not encoded.  From Fabrice Bauzac <noon@noon.dnsalias.net>
+
+2001-12-31  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-add-local-hook): New function.
+	(w3m-current-position): New buffer local variable.
+	(w3m-store-current-position): New hook function.
+	(w3m-print-this-url-after-command): New hook funtcion.
+	(w3m-buffer-setup): Regist these hook functions.
+	(w3m-header-line-location-title-face): Integrated with the defition in
+	w3m-e21.el
+	(w3m-header-line-location-content-face): Ditto.
+	(w3m-header-line-map): Ditto.
+	(w3m-header-line-insert): Renamed from `w3m-insert-header-line'.
+
+	* w3m-e21.el (w3m-header-line-location-title-face): Integrated to the
+	defition in w3m.el.
+	(w3m-header-line-location-content-face): Ditto.
+	(w3m-header-line-map): Ditto.
+	(w3m-setup-header-line): Clean up.
+	(w3m-insert-header-line): Removed.
+
+2001-12-30  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-url-to-file-name): Fix its regexp.
+
+2001-12-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-print-this-url): Display a message when it is called
+	interactively.
+
+2001-12-29  OHASHI Akira  <bg66@koka-in.org>
+
+	* w3m.el (w3m-print-this-url): Don't print any messages when there is
+	no url or form under point.
+
+2001-12-29  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-url-local-directory-alist): Renamed from
+	`w3m-edit-url-directory-alist'.
+	(w3m-url-to-file-name): Return nil, when the specified URL points no
+	local file.
+	(w3m-url-completion): Modified its regexp.  Fix completion of dot
+	files.
+	(w3m-edit-url): Simplified.
+	(w3m-goto-url): Removed the redundant local variable.  Set
+	`default-directory' to the local directory to which the current URL is
+	related by `w3m-url-local-directory-alist'.
+	(w3m-about-history): Installed the ad-hoc workaround.
+
+	* w3m-util.el (w3m-url-dtree-p): Modified its regexp.
+
+2001-12-26  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-decode-get-refresh): Not run Refresh timer if the URI is
+	matched `about://', .
+	(w3m-goto-url): Modify the timing to call `w3m-cancel-refresh-timer'.
+
+2001-12-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-util.el: Autoload "timer" for the function `cancel-timer' when
+	Mule 2 is running.
+
+2001-12-26  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-refresh-at-time): Run `w3m-goto-url-with-timer'
+	immediately, if the delay of refresh is zero.
+
+	* w3m-xmas.el (w3m-refresh-at-time): Removed.
+
+2001-12-25  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-use-refresh): New user option.
+	(w3m-refresh-timer, w3m-current-refresh): New buffer-local variables.
+	(w3m-clear-local-variables, w3m-copy-local-variables): Handle
+	`w3m-current-refresh'.
+	(w3m-meta-refresh-content-regexp)
+	(w3m-meta-content-refresh-regexp): New constant.
+	(w3m-decode-buffer): Call `w3m-decode-get-refresh' first.
+	(w3m-decode-get-refresh): New function.
+	(w3m-view-previous-page): Bind `w3m-use-refresh' to nil.
+	(w3m-quit, w3m-close-window): Call `w3m-cancel-refresh-timer' at any
+	buffers.
+	(w3m-goto-url): Call `w3m-cancel-refresh-timer' first.  Call
+	`w3m-refresh-at-time' at last; start REFRESH timer.
+	(w3m-goto-url-with-timer): New function.
+	(w3m-refresh-at-time): New function for FSF Emacs.
+
+	* w3m-xmas.el (w3m-refresh-at-time): New function for XEmacs.
+
+	* w3m-util.el (w3m-cancel-refresh-timer): New function.
+	(w3m-current-refresh, w3m-refresh-timer, w3m-use-refresh): Avoid
+	byte-compiled warnings.
+
+	* w3m-proc.el (w3m-process-stop): Call `w3m-cancel-refresh-timer'.
+
+2001-12-24  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-dump-head-source-command-arguments) [w3mmee]: Support
+	`w3m-accept-languages'.
+
+
+2001-12-21  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Release emacs-w3m-1.2.3 from emacs-w3m-1_2 branch.
+
+2001-12-21  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-type): Changed condition to decide type.
+	(w3m-decoder-alist): Call `file-name-nondirectory' before `w3m-command'
+	is refered.
+	(w3m-dirlist-cgi-program): Ditto.
+
+2001-12-21  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-type): Changed condition to decide type.
+	(w3m-decoder-alist): Use `w3m-command' for inflate command path.
+	(w3m-dirlist-cgi-program): Use `w3m-command'.
+	(w3m-dump-head-source-command-arguments) [w3mmee]: Don't add "-o
+	accept_language=xxx".
+
+2001-11-16  OKAZAKI Tetsurou <okazaki@be.to>
+
+	* w3m.el (w3m-type): Use "w3m-m17n" if exists.
+
+2001-12-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-goto-mailto-url): Use the property `composefunc' to get
+	the function to compose a mail from `mail-user-agent'.
+
+2001-12-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-load-list): Removed a bogus code for XEmacs; don't bind
+	the value of `file-coding-system-for-read' if the optional arg is nil
+	and `w3m-file-coding-system-for-read' is nil.
+
+2001-12-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3m-use-favicon): Don't bind it.
+
+	* w3m-e21.el (w3m-use-favicon): Set it to nil anyway when Emacs is
+	running in the batch mode.
+	(w3m-imagick-convert-buffer): Reverted.
+
+2001-12-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el (w3m-imagick-convert-buffer): Don't growl errors when
+	Emacs is running in the batch mode.
+
+2001-12-18  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-e21.el (w3m-favicon-use-cache-file): New user option.
+	(w3m-favicon-cache-file): Ditto.
+	(w3m-favicon-data-cache): New variable.
+	(w3m-retrieve-favicon): Use `w3m-favicon-data-cache' or store it.
+	(w3m-favicon-save-cache-file): New function.
+	(w3m-favicon-load-cache-file): Ditto.
+
+2001-12-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el (w3m-e21-toolbar-configurations): Replace
+	`auto-resize-tool-bar' to `auto-resize-tool-bars'.
+
+2001-12-17  OHASHI Akira  <bg66@koka-in.org>
+
+	* README.shimbun.ja: Add information for sb-debian-jp.el and
+	sb-debian.el.
+
+2001-12-17  Taiki SUGAWARA  <t-suga@atomsystem.co.jp>
+	    TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-form.el (w3m-form-parse-forms): Change the separater string for
+	option tag.
+
+2001-12-12  Taiki SUGAWARA  <t-suga@atomsystem.co.jp>
+
+	* w3m-form.el (w3m-form-parse-forms): If not find selected, first
+	element is made into default.
+
+2001-12-14  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-dtree.el (w3m-about-dtree): Ignore arguments on and after 4th.
+
+2001-12-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+	Suggested by NAKAJIMA Mikio <minakaji@osaka.email.ne.jp>.
+
+	* w3m-e21.el (w3m-use-favicon): Default to t, but it will be altered to
+	nil automatically if ImageMagick does not support a favicon; never use
+	ImageMagick if it has been set to nil.
+
+	* w3mhack.el (w3m-use-favicon): Bind it to nil to inhibit the use of
+	ImageMagick.
+
+2001-12-12 Kazuyoshi Koreeda <k_koreed@d2.dion.ne.jp>
+
+	* w3m-weather.el (w3m-weather-insert-seikatu-sisu): New function.
+	(w3m-weather-get-seikatu-sisu): Ditto.
+
+2001-12-10  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-form.el (w3m-form-parse-forms): Use `w3m-decode-entities-string'
+	to value in the textarea and option menu.
+
+2001-12-11  Mito  <mito@mxa.nes.nec.co.jp>
+
+	* w3m.el (w3m-scroll-left): Modify doc-string.
+	(w3m-scroll-right): Ditto.
+
+2001-12-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el (w3m-imagick-convert-usable-p): New function.
+	(w3m-use-favicon): Use it.
+
+2001-12-06  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>,
+	    TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-e21.el (top): Installed the check of the validity of ImageMagick.
+
+
+2001-12-06  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Release emacs-w3m-1.2.2 from emacs-w3m-1_2 branch.
+
+2001-12-06  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-type): Follow the new official release of w3m.
+	(w3m-attributes): Follow the change of error symbols which are defined
+	in w3m-proc.el.
+	(w3m-retrieve): Ditto.
+	(w3m-about-header): Likewise.  Ignore optional arguments safely.
+	(w3m-message): Display message only when original w3m buffer is
+	displayed.
+	(w3m-about-retrieve): Asynchronized.
+	(w3m-retrieve-and-render): Follow the change of `w3m-message'.
+	(w3m-prepare-content): Install the measure against narrowed buffers.
+
+	* w3m-proc.el (w3m-process-start-process): Accept the 2nd optional
+	argument to reset the sentinel funtcion for the generated asynchronous
+	process.
+	(w3m-process-failure): Removed.
+	(w3m-process-timeout): Simplified its error condition.
+	(w3m-process-with-wait-handler): No sentinel function is registered and
+	the sentinel function is called from this macro itself.
+
+	* w3m-weather.el (w3m-weather-filter-functions): Add
+	`w3m-weather-expand-anchors'.
+	(w3m-about-weather): Asynchronized.
+	(w3m-weather-remove-headers): Follow changes of original content.
+	(w3m-weather-remove-footers): Ditto.
+	(w3m-weather-expand-anchors): New filter function.
+
+2001-12-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-emacs-w3m-icon): Made it interlaced and endlessly
+	animated.
+
+2001-12-06  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-decode-buffer): When content-charset is unknown, detect
+	coding-system automatically.
+
+2001-12-04  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-e21.el (w3m-buffer-favicon): Reset `w3m-current-favicon-data' to
+	nil when conversion was failure.
+
+2001-12-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el (w3m-imagick-convert-buffer): Say errors and return nil if
+	the process returns a non-zero status (possibly a string).
+
+2001-12-03  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-xmas.el (w3m-create-image): Bind some arguments lexically for
+	w3m-fix-gif().
+
+2001-12-04  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-e21.el (w3m-setup-favicon): Fix for "about://" url.
+	(w3m-buffer-favicon): Renamed local variable.
+	(w3m-tab-line): Call `w3m-buffer-favicon' only when w3m-use-favicon is
+	non-nil.
+
+2001-12-03  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-modeline-process-status-on): Modify default value.
+	(w3m-buffer-setup): Simplified `mode-line-buffer-identification'.
+
+2001-11-29  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-e21.el (w3m-imagick-convert-program): New user option.
+	(w3m-favicon-size): Ditto.
+	(w3m-use-favicon): Ditto.
+	(w3m-favicon-name): New constant.
+	(w3m-current-favicon-data): New buffer local variable.
+	(w3m-current-favicon-image): Ditto.
+	(w3m-display-hook): Added 'w3m-setup-favicon.
+	(w3m-imagick-convert-buffer): New function.
+	(w3m-imagick-convert-data): Ditto.
+	(w3m-setup-favicon): Ditto.
+	(w3m-buffer-favicon): Ditto.
+	(w3m-retrieve-favicon): Ditto.
+	(w3m-tab-line): Display favicon on tab.
+
+2001-11-28  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-xmas.el (w3m-insert-image): Rewrite.
+	(if displayed images exist on the right side, keep them and display
+	again)
+	(w3m-remove-image): Call `delete-extent' to destroy extents.
+
+2001-11-27  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+	* TIPS: New file.
+
+2001-11-27  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-download-this-url): Fix a problem of broken URL.
+
+2001-11-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (top, w3m-about): Change the URL of w3m's official page.
+
+2001-11-21  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-max-anchor-sequence): New buffer local variable.
+	(w3m-copy-local-variables, w3m-clear-local-variables): Handle
+	`w3m-max-anchor-sequence'.
+	(w3m-fontify-anchors): Reset `w3m-max-anchor-sequence' to zero.  Use
+	the text-property `w3m-anchor-sequence' insted of `w3m-cursor-anchor'.
+	(w3m-goto-next-anchor, w3m-next-anchor, w3m-goto-previous-anchor)
+	(w3m-previous-anchor): Rewrite use the text-property
+	`w3m-anchor-sequence'.
+	(w3m-next-form, w3m-goto-next-image, w3m-next-image)
+	(w3m-previous-image): Fix mistake as modified last time.
+
+	* w3m-util.el (w3m-anchor-sequence): New macro.
+	(w3m-cursor-anchor) Remove macro.
+
+	* w3m-form.el (w3m-form-fontify): Use the text-property
+	`w3m-anchor-sequence' insted of `w3m-cursor-anchor'.
+
+2001-11-21  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-download-this-url): Wrap the form which is evaluated in
+	asynchronous context with `w3m-process-with-null-handler', to fix the
+	bug reported by Hideyuki SHIRAI <shirai@meadowy.org>.
+
+	* w3m-xmas.el (w3m-create-image): Modified to avoid calling
+	`w3m-process-with-wait-handler'.
+
+2001-11-20  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-proc.el (w3m-process-push): Set the buffer-local variable
+	`w3m-process-object' in the appropriate buffer.
+	(w3m-process-sentinel): Removed redundant call of
+	`with-current-buffer'.
+
+	* Makefile.in (default): Reintroduce of checking time stamps of
+	w3m-util.elc and w3m-proc.elc.
+
+	* w3m-proc.el (w3m-process-temp-file): Abolished.
+
+	* w3m.el (w3m-content-charset, w3m-content-encoding,
+	w3m-content-length, w3m-content-type, w3m-last-modified, w3m-real-url):
+	Fixed asynchrounization.
+	(w3m-download): Changed the argument spec and the body to accept an
+	asynchrounous context.
+	(w3m-external-view): Follow change of `w3m-download'.
+	(w3m-external-view-file): Changed the argument spec and the body;
+	`w3m-process-temp-file' is not refered.
+	(w3m-download-this-url): Follow change of `w3m-download'.
+	(w3m-scroll-left, w3m-scroll-right): Use `call-interactively' to avoid
+	a strange behavior of Emacs21.  This change is suggested by Hironori
+	FUJII <fujii@chi.its.hiroshima-cu.ac.jp>.
+
+	* w3m-proc.el (w3m-process-failure): New error symbol.
+	(w3m-process-timeout): Change its error condition.
+	(w3m-process-with-wait-handler): Install adhoc workaround.
+
+	* w3m.el (w3m-attributes, w3m-retrieve, w3m-about-header): Follow
+	change of `w3m-process-with-wait-handler'.
+
+2001-11-19  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-modeline-process-status-on): New constant.
+	(w3m-modeline-status-off): Rename from `w3m-modeline-image-status-off'.
+	(w3m-buffer-setup): Show the string of `w3m-modeline-process-status-on'
+	when process running.
+	(w3m-download): Add 4th argument `extview' for w3m-external-view(). If
+	`extview' is gived, apply `extview' on process-sentinel like (apply
+	(car extview) (cdr extview)).
+	(w3m-external-view): When execute `w3m-download', call with `extview'
+	argument.
+	(w3m-external-view-file): New function.
+
+2001-11-19  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-print-this-url): View current image info.
+	(w3m-goto-next-image, w3m-next-image, w3m-goto-previous-image)
+	(w3m-previous-image): New functions.
+	(w3m-lynx-like-map, w3m-info-like-map): Bind "}" as the key to call
+	`w3m-next-image'. Bind "{" as the key to call `w3m-previous-image'.
+	(w3m-mode): Modify dos-string.
+
+2001-11-19  Masatake YAMATO  <jet@gyve.org>
+
+	* w3m.el (w3m-goto-next-form, w3m-next-form)
+	(w3m-goto-previous-form, w3m-previous-form): New functions.
+	(w3m-lynx-like-map, w3m-info-like-map): Bind "]" as the key to call
+	`w3m-next-form'. Bind "[" as the key to call `w3m-previous-form'.
+
+2001-11-19  Kazuhiko  <kazuhiko@ring.gr.jp>
+
+	* w3m-xmas.el (w3m-create-image): Fix a problem in handling XBM on
+	XEmacs.
+
+2001-11-18  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-attributes): Establish the error handler for
+	`w3m-process-timeout' when the argument `handler' is equal to nil.
+	(w3m-retrieve): Ditto.
+	(w3m-about-header): Establish the error handler for
+	`w3m-process-timeout' before `w3m-w3m-get-header' is called.
+	(w3m-select-buffer-close-window): Check whether the menu's window
+	exists.
+
+	* w3m-proc.el: Changes to avoid endless loop.
+	(w3m-process-start-process): Changed the spec of its return value.
+	(w3m-process-timeout): New error symbol.
+	(w3m-process-with-wait-handler): Bind `inhibit-quit' to nil, in order
+	to accept user's quit; Signal `w3m-process-timeout' when time out is
+	detected.
+	(w3m-process-do): Accept null variable.
+	(w3m-process-do-with-temp-buffer): Ditto.
+
+	* Makefile.in (default): Cancel the last change.
+
+2001-11-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Makefile.in (default): When files which define macros and inline
+	functions such as w3m-util.el and w3m-proc.el are newer than their
+	byte-compiled files, run clean target before compile.
+
+	* w3m.el (w3m-about-db-history-today): Removed.
+	(w3m-about-db-history): Call `w3m-time-lapse-seconds' to classify
+	entries.
+
+	* w3m-proc.el: Changes to avoid endless loop.
+	(w3m-process-inhibit-quit): New internal variable.
+	(w3m-process-timeout): New variable.
+	(w3m-process-with-wait-handler): Strict check when asynchrounous
+	processes finish; Refer `w3m-process-timeout' to check idle time.
+	(w3m-process-sentinel): Bind `inhibit-quit' according to
+	`w3m-process-sentinel'.
+
+	* w3m-e21.el: Changes to display tabs which are retieving contents in
+	the other face.
+	(top): Define `w3m-current-process' to avoid byte-compile warning.
+	(w3m-tab-unselected-retrieving-face): New face.
+	(w3m-tab-selected-retrieving-face): Ditto.
+	(w3m-tab-line): Refer `w3m-current-process' in order to select the face
+	of the tab which is retriving some pages.
+
+	* w3m-util.el (w3m-time-lapse-seconds): New inline function.
+
+	* w3m-antenna.el (top): Add autoload of `w3m-filter' to avoid
+	byte-compile warning.
+
+2001-11-16  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-select-buffer): If nomsg eq 'update, don't save
+	selected-window; so called `w3m-select-buffer-update' any window to
+	differ original window executed process, is broken
+	`w3m-select-buffer-window'.
+	(w3m-select-buffer-update): Call `w3m-select-buffer' with 'update.
+
+2001-11-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* mime-w3m.el (mime-w3m-keymap-property): New macro.
+	(mime-w3m-preview-text/html, kill-new): Use the above macro instead of
+	`w3m-static-if'.
+
+2001-11-16  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-select-buffer-window-ratio): New user option.
+	(w3m-select-buffer-window-size): Remove user option.
+	(w3m-select-buffer-window-size): New function.
+	(w3m-select-buffer-toggle-style): Ditto.
+	(w3m-select-buffer): Use `w3m-select-buffer-window-size' when calculate
+	window size. When call with prefix argument, toggle
+	`w3m-select-buffer-horizontal-window'.
+	(w3m-select-buffer-show-this-line): Use `w3m-select-buffer-window-size'
+	when calculate window size.  If exist w3m-buffer another window under
+	control, use it.
+	(w3m-select-buffer-mode-map): Modify the key binding 'C-cC-s' for
+	toggle `w3m-select-buffer-horizontal-window'.
+	(w3m-select-buffer-update): Call `w3m-select-buffer' with two
+	arguments.
+	(w3m-select-buffer-mode): Modify doc-string.
+
+	* w3m-tabmenu.el (w3m-switch-buffer): Change the rule of detecting
+	default buffer.
+	(w3m-tab-menubar-make-items): Ditto.
+
+2001-11-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* mime-w3m.el: Changes to make installation of this module be easy;
+	Comments updated; Initialize code is moved to `mime-w3m-setup'; Changed
+	requirement of other modules.
+	(mime-w3m-display-inline-images): Changed the default value.
+	(mime-w3m-insinuate, mime-w3m-setup): New function.
+	(mime-w3m-preview-text/html): Call `mime-w3m-setup'.
+
+2001-11-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-search.el: Require `cl' when compiling.
+
+2001-11-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Changes to avoid that multi async processes are started in
+	the same buffer.
+	(w3m-current-process): New internal variable to protect parallel
+	retriving.
+	(w3m-attributes, w3m-base-url, w3m-content-charset,
+	w3m-content-encoding, w3m-content-length, w3m-content-type,
+	w3m-last-modified, w3m-real-url): Asynchronized.
+	(w3m-toggle-inline-images-internal): Set `w3m-current-buffer' to this
+	buffer locally, in order to classify the generated async process to the
+	appropriate buffer.
+	(w3m-toggle-inline-images): Stop processes which are retrieving images
+	of this buffer.
+	(w3m-retrieve-and-render): Remove redundant `let'.
+	(w3m-view-this-url): Refontify anchor.
+	(w3m-lynx-like-map, w3m-info-like-map): Bind `C-cC-g' as the key to
+	call `w3m-process-stop'.
+	(w3m-goto-url): Check `w3m-current-process' to avoid reenterant and set
+	it to the value of `w3m-retrieve-and-render'; Before the retrieving
+	process of the next page is started, select this buffer in the current
+	window and stop processes which are retrieving images of this buffer.
+	(w3m): Not select this buffer in the current window.
+
+	* w3m-proc.el (top): Define `w3m-current-process' to avoid byte-compile
+	warning.
+	(w3m-process-queue-registrable-p): Abolished.
+	(w3m-process-new): Its argument spec is changed; Changed the strucuture
+	of `w3m-process' object.
+	(w3m-process-command): New macro.
+	(w3m-process-arguments): Follow the structural change of `w3m-process'
+	object.
+	(w3m-process-push): Likewise; Follow change of `w3m-process-new'; No
+	check for `w3m-process-queue-registrable-p'.
+	(w3m-process-kill-process): Check process status before stopping them.
+	(w3m-process-start-process): Follow the structural change of
+	`w3m-process' object.
+	(w3m-process-stop): Ditto; Start queued processes.
+	(w3m-process-with-null-handler): No check for
+	`w3m-process-queue-registrable-p'.
+
+	* w3m-util.el (w3m-kill-buffer): Fix code to kill this buffer.
+
+2001-11-15  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-select-buffer): Fix window height calculation when
+	w3m-select-buffer-horizontal-window is nil.
+	(w3m-select-buffer-mode-map): Add the key bind of
+	`w3m-select-buffer-show-this-line-and-down'. Modify the key bind of
+	`w3m-select-buffer-show-this-line'.
+	(w3m-select-buffer-show-this-line): Fix window height calculation when
+	w3m-select-buffer-horizontal-window is nil. If already displayed
+	w3m-buffer and call interactively, call `w3m-scroll-up-or-next-url'.
+	(w3m-select-buffer-show-this-line-and-down): New function.
+
+2001-11-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Merge experimental-async branch to main trunk.
+
+	* w3m-util.el: Rename from w3m-macro.el; Require `poe' and `poem'
+	module for XEmacs and Mule; Import some functions from w3m.el and
+	w3m-proc.el.
+
+	* w3m.el: Require `w3m-util' instead of `w3m-macro'; Export
+	`w3m-kill-all-buffer' to w3m-util.el.
+	(w3m-work-binary-buffer-name): Removed.
+	(w3m-rendering-half-dump): Accept an optional argument for w3mmee and
+	w3m-m17n.
+	(w3m-rendering-buffer-1): Accept two optional arguments for w3mmee and
+	w3m-m17n.
+	(w3m-rendering-unibyte-buffer): Generate a new working buffer for
+	w3mmee and w3m-m17n, in order to avoid racing.
+	(w3m-rendering-multibyte-buffer): Ditto.
+
+	* w3m-proc.el: Require `w3m-util' instead of `w3m-macro'; Export
+	`w3m-buffer-title', `w3m-buffer-name-lessp' and `w3m-list-buffers' to
+	w3m-util.el.
+
+	* mime-w3m.el, w3m-antenna.el, w3m-bookmark.el, w3m-e21.el,
+	w3m-form.el, w3m-tabmenu.el, w3m-xmas.el: Require `w3m-util' instead of
+	`w3m-macro'.
+
+	* w3mhack.el (w3mhack-examine-modules): Handle w3m-util.el instead of
+	w3m-macro.el.
+
+2001-11-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (top): Colon keywords definition are moved to `w3m-macro.el'.
+	(w3m-process-connection-type): Imported from `w3m-proc.el'.
+	(w3m-next-buffer, w3m-previous-buffer): Simplified.
+	(w3m-delete-buffer): Call `w3m-quit' when the number of w3m-mode
+	buffers is equal to 1.
+	(w3m-quit): Kill all w3m-mode buffers.
+	(w3m-close-window): Call `w3m-select-buffer-close-window'.
+	(w3m-select-buffer-generate-contents): Simplified.
+	(w3m-select-buffer-close-window): New function.
+
+	* w3m-tabmenu.el (w3m-tab-menubar-make-items): Use `w3m-buffer-title'
+	and `w3m-list-buffers'.
+
+	* w3m-proc.el (top): Require `poe' module in XEmacs; Require `w3m-om'
+	in Mule; Define `w3m-current-title' to avoid byte-compile warning.
+	(w3m-process-connection-type): Exported to `w3m.el'.
+	(w3m-buffer-title, w3m-buffer-name-lessp, w3m-list-buffers): New
+	functions.
+
+	* w3m-macro.el (top): Colon keywords definition are imported from
+	`w3m.el'.
+	(w3m-pullout-buffer-number): Removed.
+
+	* w3m-e21.el (w3m-tab-line): Use `w3m-buffer-title' and
+	`w3m-list-buffers'.
+
+	* w3m.el (w3m-attributes): Wrap `w3m-w3m-attributes' with
+	`w3m-process-with-wait-handler'.
+	(w3m-w3m-attributes): Changed the argument spec.  Now, this function
+	can be used only in asynchronous context.
+	(w3m-rendering-unibyte-buffer): Changed the argument spec, and the
+	first argument `url' is refered instead of `w3m-current-url'.  This
+	change is made to avoid using `w3m-process-with-wait-handler' in
+	asynchronous context.
+	(w3m-prepare-content): Follow the change of
+	`w3m-rendering-unibyte-buffer'.
+
+2001-11-14  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-next-buffer): Use `w3m-pullout-buffer-number' when sort
+	buffer-name.
+	(w3m-previous-buffer): Ditto.
+	(w3m-select-buffer): Change the turn to call of functions.
+	(w3m-select-buffer-generate-contents): Use `w3m-pullout-buffer-number'
+	when sort buffer-name.  Use text-property instead of point when move to
+	point.
+	(w3m-select-buffer-recheck): Fix read-only error.
+	(w3m-select-buffer-copy-buffer): Rewrite.
+
+	* w3m-tabmenu.el (w3m-tab-menubar-make-items): Use
+	`w3m-pullout-buffer-number' instead of `w3m-tab-menubar-pull-bufnum'.
+	(w3m-tab-menubar-pull-bufnum): Remove.
+
+	* w3m-macro.el (w3m-pullout-buffer-number): New defsubst.
+
+	* w3m-e21.el (w3m-tab-line): Use `w3m-pullout-buffer-number' when sort
+	buffer-name.
+
+2001-11-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-parse-attributes): Moved it again to w3m-macro.el.
+	* w3m-macro.el: The opposite of above.
+
+2001-11-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el: Moved back some macros and inline functions from
+	w3m-macro.el.
+
+	* w3m-macro.el (w3m-parse-attributes, w3m-real-url, w3m-last-modified,
+	w3m-content-type, w3m-content-length, w3m-content-encoding,
+	w3m-content-charset, w3m-base-url, w3m-attributes): Moved back to
+	w3m.el.
+
+2001-11-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-w3m-retrieve) Call `w3m-w3m-attributes' instead of
+	`w3m-attributes'.
+
+	* w3m-proc.el (w3m-process-with-wait-handler): Reimplemented.
+
+2001-11-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el: Moved some macros and inline functions to w3m-macro.el.
+
+	* w3m-macro.el (w3m-time-newer-p, w3m-url-local-p, w3m-url-dtree-p,
+	w3m-parse-attributes, w3m-real-url, w3m-last-modified,w3m-content-type,
+	w3m-content-length, w3m-content-encoding, w3m-content-charset,
+	w3m-base-url, w3m-attributes, w3m-cursor-anchor, w3m-submit, w3m-image,
+	w3m-anchor, w3m-action, w3m-get-text-property-around): Moved from
+	w3m.el.
+	(w3m-condition-case): Use old-fashioned backquotes.
+
+	* w3m.el, w3m-xmas.el, w3m-tabmenu.el, w3m-form.el, w3m-e21.el,
+	w3m-bookmark.el, w3m-antenna.el, mime-w3m.el: Require `w3m-macro'.
+
+2001-11-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-w3m-get-header, w3m-w3m-attributes): Asynchronized.
+	(w3m-w3m-retrieve): Argument spec is changed.
+	(w3m-w3m-dump-head-source): Follow change of `w3m-w3m-attributes'.
+	(w3m-copy-buffer): Removed redundant code.
+	(w3m-about-header): Follow change of `w3m-w3m-get-header'.
+
+	* w3m-proc.el (w3m-process-do): The generated asynchronous process in
+	the post handler is started at the end of `w3m-process-sentinel'.
+	(w3m-process-do-with-temp-buffer): Ditto.
+	(w3m-process-sentinel): Fixed.
+
+	* w3m.el (w3m-download): Use `progn' instead of `inline', in order to
+	make debugging be easy.
+	(w3m-retrieve-and-render): Ditto.
+
+	* w3m-proc.el: Changed the order of asynchronous form evaluation and
+	starting asynchronous processes.
+	(w3m-process-queue): Renamed from `w3m-processes'.
+	(w3m-process-queue-registrable-p): New internal variable.
+	(w3m-process-with-coding-system): New macro.
+	(w3m-process-with-environment): Redefine with new backquote style.
+	(w3m-process-push): Refer `w3m-process-queue-registrable-p' to add the
+	handler to processes registered in `w3m-process-queue' safely.
+	(w3m-process-start-process): New internal function.
+	(w3m-process-start-queued-processes): Renamed from
+	`w3m-process-start-internal'; Call `w3m-process-start-process'; Follow
+	renaming of variables.
+	(w3m-process-stop, w3m-process-shutdown): Follow renaming of variables.
+	(w3m-process-with-null-handler): Start asynchronous processes at the
+	end of this macro.
+	(w3m-process-do, w3m-process-do-with-temp-buffer): Reimplemented.
+	(w3m-process-start): Reimplemented.  Asynchronous processes are not
+	started in this function.
+	(w3m-process-start-after): New internal function.
+	(w3m-process-sentinel): Follow renaming of variables and functions.
+
+2001-11-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-macro.el (w3m-condition-case): New macro.
+
+2001-11-13  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Makefile.in: Fix the macro rule to generate *.elc files.
+
+	* w3m.el (w3m-display-hook): Add `w3m-select-buffer-update'.
+	(w3m-select-buffer-name): Move the definition position to avoid
+	byte-compile warning.
+	(w3m-goto-url): Removed the code to update the select buffer.
+	(w3m-select-buffer-update): New function.
+
+	* w3m-proc.el (w3m-process-with-wait-handler): Adhoc workaround.
+	(w3m-process-start): Fix.
+
+2001-11-13  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-lynx-like-map): Bind `C-cC-a' as the key to call
+	`w3m-switch-buffer'.
+	(w3m-info-like-map): Ditto. Bind `\C-c\C-@' and `C-c\C- ' as the key to
+	call `w3m-history-store-position'. Bind `C-cC-b' as the key to call
+	`w3m-history-restore-position'.
+	(w3m-mode): Modify doc-string.
+	(w3m-select-buffer-show-this-line-and-switch): New function.
+	(w3m-select-buffer-name): New internal constant.
+	(w3m-select-buffer-mode-map): Bind `w' and `h' as the key to call
+	`w3m-select-buffer-show-this-line-and-switch'.
+	(w3m-select-buffer-mode): Modify doc-string.
+	(w3m-select-buffer): Use `w3m-select-buffer-name'. If alive
+	select-buffer, use it.  Add optional argument `nomsg'.
+	(w3m-select-buffer-generate-contents): If w3m-current-title is
+	`<no-title>', use w3m-current-url.
+	(w3m-select-buffer-show-this-line): Return selected buffer.
+	(w3m-select-buffer-quit): Always pop up the w3m window when quit.
+	(w3m-select-buffer-show-this-line-and-quit): Rewrite.
+	(w3m-goto-url): If alive w3m-select-buffer, update it.
+	(w3m-copy-buffer): If w3m-pop-up-windows is nil, use
+	switch-to-buffer. Block to change w3m-select-buffer to w3m buffer, if
+	w3m-pop-up-windows is t.
+	(top): Add autoload of `w3m-setup-tab' and `w3m-switch-buffer'.
+	(w3m-setup-menu): Call `w3m-setup-tab-menu' when w3m-use-tab-menubar is
+	t.
+	(w3m-mode): Remove to call `w3m-setup-tab-menu'.
+
+	* w3m-e21.el (TOP): Remove `(require 'w3m-tabmenu)'.
+
+	* w3m-e20.el (TOP): Ditto.
+
+	* w3m-om.el (TOP): Ditto.
+
+	* w3m-xmas.el (w3m-setup-tab-menu, w3m-tab-menubar-pull-bufnum)
+	(w3m-tab-menubar-make-items, w3m-select-buffer): Remove.
+	(w3m-setup-menu): Call `w3m-setup-tab-menu' when w3m-use-tab-menubar is
+	t.
+
+	* w3mhack.el (w3mhack-examine-modules): Revival byte-compile
+	`w3m-tabmenu.el' when XEmacs.
+
+	* w3m-tabmenu.el (ALL): Full rewrite to use `easymenu'.
+
+2001-11-13  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-select-buffer-horizontal-window): New user option.
+	(w3m-select-buffer-window-size): Ditto.
+	(w3m-lynx-like-map): Bind `C-cC-b' as the key to call
+	`w3m-switch-buffer.
+	(w3m-info-like-map): Ditto.
+	(w3m-select-buffer-window): New internal variable.
+	(w3m-select-buffer-message): New internal constant.
+	(w3m-select-buffer): New implementation.
+	(w3m-select-buffer-generate-contents): New function.
+	(w3m-select-buffer-mode-map): New keymap.
+	(w3m-select-buffer-mode): New function.
+	(w3m-select-buffer-recheck): New command.
+	(w3m-select-buffer-current-buffer): New macro.
+	(w3m-select-buffer-show-this-line): New command.
+	(w3m-select-buffer-next-line): Ditto.
+	(w3m-select-buffer-previous-line): Ditto.
+	(w3m-select-buffer-copy-buffer): Ditto.
+	(w3m-select-buffer-delete-buffer): Ditto.
+	(w3m-select-buffer-quit): Ditto.
+	(w3m-select-buffer-show-this-line-and-quit): Ditto.
+
+	* w3m-xmas.el (w3m-switch-buffer): Renamed from `w3m-select-buffer'.
+
+	* w3m-tabmenu.el (w3m-switch-buffer): Renamed from `w3m-select-buffer'.
+
+2001-11-12  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-e20.el (w3m-display-inline-images-p): Renamed from
+	`w3m-display-inline-image-p'.
+
+	* w3m-om.el (w3m-display-inline-images-p): Ditto.
+
+2001-11-12  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* mew-w3m.el (mew-mime-text/html-w3m): Bind `w3m-display-inline-images'
+	instead of `w3m-current-image-status'.
+
+	* mime-w3m.el (mime-w3m-display-inline-images): Renamed from
+	`mime-w3m-display-inline-image'.
+	(mime-w3m-preview-text/html): Follow the change above; Bind
+	`w3m-display-inline-images' instead of `w3m-current-image-status'.
+
+	* w3m-xmas.el (w3m-display-inline-images-p): Renamed from
+	`w3m-display-inline-image-p'; Refer `w3m-display-inline-images' instead
+	of `w3m-current-image-status'.
+
+	* w3m-e21.el (w3m-display-inline-images-p): Renamed from
+	`w3m-display-inline-image-p'; Refer `w3m-display-inline-images' instead
+	of `w3m-current-image-status'.
+
+	* w3m.el (w3m-display-inline-image): Abolish.
+	(w3m-current-image-status): Ditto.
+	(w3m-display-inline-images): New buffer local variable.
+	(w3m-default-display-inline-images): New user option.
+	(w3m-toggle-inline-images-permanently): Ditto.
+	(w3m-toggle-inline-image): Added docstring.
+	(w3m-toggle-inline-images): Ditto; Refer `w3m-display-inline-images'
+	instead of `w3m-current-image-status'.
+	(w3m-view-url-with-external-browser): Ditto.
+	(w3m-goto-url): Ditto.
+	(w3m-toggle-inline-images): Change the value of
+	`w3m-display-inline-images' even when displaying images is not
+	completed.
+	(w3m-copy-buffer): Set `w3m-display-inline-images' according to
+	`w3m-toggle-inline-images-permanently'.
+	(w3m-mode): Set value of `w3m-display-inline-images' according to
+	`w3m-default-display-inline-images'.
+	(w3m-goto-url): Set `w3m-display-inline-images' according to
+	`w3m-toggle-inline-images-permanently'; Use
+	`w3m-display-inline-images-p' instead of `w3m-display-inline-image-p'.
+	(w3m-redisplay-with-charset): Use `w3m-display-inline-images' instead
+	of `w3m-display-inline-image'.
+	(w3m-region): Use `w3m-display-inline-images-p' instead of
+	`w3m-display-inline-image-p'.
+
+2001-11-12  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (Top): Abolished autoload of `w3m-setup-tab'.
+	(w3m-use-tab-menubar): Revival.
+	(w3m-lynx-like-map): Bind `C-cC-s' as the key to call
+	`w3m-select-buffer'.
+	(w3m-info-like-map): Ditto.
+	(w3m-mode): Update the doc-string for the commands `w3m-next-buffer',
+	`w3m-previous-buffer', `w3m-delete-buffer' and `w3m-select-buffer'.
+	Use `w3m-use-tab-menubar' and `w3m-setup-tab-menu()'.
+
+	* w3m-e21.el (Top): Require `w3m-tabmenu'.
+
+	* w3m-e20.el (Top): Ditto.
+
+	* w3m-om.el (Top): Ditto.
+
+	* w3m-tabmenu.el: Rename from `w3m-tab.el'.
+	(w3m-setup-tab-menu): Rename from `w3m-setup-tab'.
+	(w3m-tab-menubar-make-items): Add new option `nomenu' for
+	w3m-select-buffer().
+	(w3m-select-buffer): New function.
+
+	* w3m-xmas.el (w3m-setup-tab-menu): Use `defun' insted of `ignore' to
+	avoid byte-compile warnings.
+	(w3m-tab-menubar-pull-bufnum, w3m-tab-menubar-make-items)
+	(w3m-select-buffer): Copy from w3m-tabmenu.el
+
+	* w3mhack.el (w3mhack-examine-modules): Don't byte-compile
+	`w3m-tabmenu.el' when XEmacs.
+
+
+2001-11-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Release emacs-w3m-1.2.1 from emacs-w3m-1_2 branch.
+
+2001-11-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-expand-url): Remove the last segment of the base URL
+	before concatination the specified URL which has only a query part and
+	the base URL.
+
+2001-11-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-proc.el (w3m-process-new): Argument spec is changed.
+	(w3m-process-process): New macro.
+	(w3m-process-handlers): Follow the change of `w3m-process-new'.
+	(w3m-process-kill-process): New inline function.
+	(w3m-process-start-internal): Strict checking.
+	(w3m-process-stop): Fixed.
+	(w3m-process-with-wait-handler): Simplified.
+	(w3m-process-do): Strict checking of redundant evaluation.
+	(w3m-process-do-with-temp-buffer): Ditto.
+	(w3m-process-start): Not bind `w3m-process-exit-status' as a local
+	variable.
+	(w3m-process-sentinel): Ensure that this function will be never called
+	repeatedly; Strict checking.
+
+2001-11-12  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-e21.el (top): Abolished a ignore() of `w3m-use-tab'.
+
+2001-11-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-w3m-dump-head-source): Fix the problem which occurs when
+	no content is retrieved.
+
+2001-11-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3mhack.el (w3mhack-examine-modules): Handle `w3m-proc.el'.
+
+	* w3m.el: Modified to retrieve contents asynchronously.
+	(top): Require `w3m-proc.el' instead of `w3m-macro.el'.
+	(w3m-command-environment): Old name is `w3m-process-environment'.
+	(w3m-display-hook): Changed the default value.
+	(w3m-current-buffer): New internal variable.
+	(w3m-arrived-user-alist): Renamed to `w3m-process-user-alist' and
+	exported to `w3m-proc.el'.
+	(w3m-process-connection-type, w3m-process-user, w3m-process-passwd,
+	w3m-process-user-counter, w3m-process-realm, w3m-process-temp-file,
+	w3m-process-exit-status): Exported to `w3m-proc.el'.
+	(w3m-toggle-inline-images-internal): Follow change of
+	`w3m-create-image'.
+	(w3m-exec-process): Removed.
+	(w3m-exec-get-user): Renamed to `w3m-process-get-user' and exported to
+	`w3m-proc.el'.
+	(w3m-exec-get-passwd): Renamed to `w3m-process-get-passwd' and exported
+	to `w3m-proc.el'.
+	(w3m-exec-set-user): Renamed to `w3m-process-set-user' and exported to
+	`w3m-proc.el'.
+	(w3m-get-server-root): Renamed to `w3m-process-get-server-root' and
+	exported to `w3m-proc.el'.
+	(w3m-proxy-user): Renamed to `w3m-process-proxy-user' and exported to
+	`w3m-proc.el'.
+	(w3m-proxy-passwd): Renamed to `w3m-process-proxy-passwd' and exported
+	to `w3m-proc.el'.
+	(w3m-exec-filter): Renamed to `w3m-process-filter' and exported to
+	`w3m-proc.el'; Slightly modified to protect illegal type of
+	`w3m-current-url'.
+	(w3m-decode-encoded-contents, w3m-x-moe-decode-buffer,
+	w3m-local-dirlist-cgi, w3m-rendering-half-dump): Use
+	`w3m-process-with-environment' to adjust the environment variables.
+	(w3m-local-retrieve, w3m-cid-retrieve): Insert the retrieved content to
+	this current buffer.
+	(w3m-w3m-get-header): Call `w3m-process-start' instead of
+	`w3m-exec-process'.
+	(w3m-w3m-dump-head-source, w3m-w3m-retrieve, w3m-about-retrieve,
+	w3m-retrieve, w3m-download): Reconstructed to support asynchronous
+	operation.
+	(w3m-exec): Removed.
+	(w3m-retrieve-and-render, w3m-prepare-content): New function.
+	(w3m-quit): Call `w3m-process-shutdown'.
+	(w3m-buffer-setup): New inline function.
+	(w3m-goto-url): Accept the 6th optional argument, and modified for
+	asynchronous processing.
+	(w3m-goto-url-localcgi-movepoint): Removed.
+	(w3m-move-point-for-localcgi): New function.
+	(w3m): Removed redundant quote from the definition of
+	`focusing-function'; Display the browsing buffer.
+	(w3m-region): Set `w3m-current-buffer' to this current buffer.
+	(w3m-about, w3m-about-header): Insert the generated content to this
+	current buffer.
+	(w3m-about-history, w3m-about-db-history): To access buffer-local
+	variables, refer the value of `w3m-current-buffer'.
+
+	* w3m-xmas.el (top): Require `w3m-proc.el' instead of `w3m-macro.el'.
+	(w3m-create-image): Accept the 4th optional argument, and modified for
+	asynchronous processing.
+
+	* w3m-weather.el (w3m-about-weather): Insert the generated content to
+	this current buffer.
+
+	* w3m-proc.el: New file.
+
+	* w3m-namazu.el (w3m-about-namazu): Insert the generated content to
+	this current buffer.
+
+	* w3m-macro.el (w3m-with-work-buffer): Removed.
+	(w3m-kill-buffer): New inline function.
+
+	* w3m-filter.el (w3m-filter): Filtering the content in this current
+	buffer.
+
+	* w3m-e21.el (top): Require `w3m-proc.el' instead of `w3m-macro.el'.
+	(w3m-create-image): Accept the 4th optional argument, and modified for
+	asynchronous processing.
+
+	* w3m-antenna.el (w3m-about-antenna): Insert the generated content to
+	this current buffer.
+
+	* mime-w3m.el (mime-w3m-cid-retrieve): Insert the retrieved content to
+	this current buffer.
+
+	* mew-w3m.el (mew-w3m-cid-retrieve): Insert the retrieved content to
+	this current buffer.
+
+2001-11-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-use-tab-menubar): Abolished.
+	(w3m-pop-up-windows): Changed the expression to decide its default
+	value.
+	(w3m-setup-menu): Removed the code to set the menubar item of TAB.
+	(w3m-fontify-images): Accept an image-type input tag.
+	(w3m-fontify): To accept an image-type input tag, changed the order of
+	calling fontify functions.
+	(top): Add autoload of `w3m-setup-tab'.
+	(w3m-mode): Call `w3m-setup-tab'.
+	(w3m-tab-menubar-open-buffer): Moved to `w3m-tab.el'.
+	(w3m-tab-menubar-update): Ditto.
+	(w3m-tab-menubar-pull-bufnum): Ditto.
+	(w3m-tab-menubar-make-items): Ditto.
+
+	* w3m-tab.el: New file.
+
+	* w3m-e21.el (top): Define `w3m-use-tab' to avoid byte-compile warning.
+	(w3m-use-tab): Moved to `w3m.el'.
+	(w3m-setup-tab): Define as a dummy function.
+
+	* w3m-xmas.el (w3m-setup-tab): Define as a dummy function.
+
+	* w3m-form.el: Changes of the structure of the `w3m-form' object.
+	(w3m-form-put-property): New inline function.
+	(w3m-form-get-property): New macro.
+	(w3m-form-put): Use `w3m-form-put-property'.
+	(w3m-form-get): Use `w3m-form-get-property'.
+	(w3m-form-make-form-data): Follow change of structure of the `w3m-form'
+	object.
+	(w3m-form-parse-forms): Accept an image-type input tag.
+	(w3m-form-resume): Ditto.
+	(w3m-form-fontify): Ditto.
+
+2001-11-09  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-use-tab-menubar): New user variable.
+	(w3m-setup-menu): Handling tab-menubar.
+	(w3m-tab-menubar-open-buffer, w3m-tab-menubar-update,
+	w3m-tab-menubar-make-items): New functions.
+	(w3m-tab-menubar-pull-bufnum): New macro.
+	(top-level): Add define-key-after() to avoid byte-compile warnings, if
+	XEmacs.
+
+2001-11-08  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
+
+	* w3m.el (w3m-start-url, w3m-contents-url): New buffer-local vars.
+	(w3m-clear-local-variables): Also clear `w3m-start-url' and
+	`w3m-contents-url'.
+	(w3m-copy-local-variables): Also copy `w3m-start-url' and
+	`w3m-contents-url'.
+	(w3m-fontify-anchors, w3m-check-link-tags): Add support the tags
+	"previous", "start" and "contents".
+
+2001-11-02  Masatake YAMATO  <jet@gyve.org>
+
+	* w3m.el (autoload): Added w3m-antenna-add-current-url.
+	(w3m-lynx-like-map): Likewise.
+	(w3m-info-like-map): Likewise.
+	(w3m-mode): Added w3m-antenna-add-current-url to doc string.
+
+	* w3m-antenna.el (string-with-default): New widget.
+	(string-with-default-value-create): New function.
+	(w3m-antenna-sites): Use string-with-default widgets instead of string
+	widgets.
+	(w3m-antenna-tmp-url): New variable.
+	(w3m-antenna-tmp-title): New variable.
+	(w3m-antenna-add-current-url): New function.
+	(w3m-antenna-add): New function.
+
+2001-11-08  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-form.el (w3m-form-replace): Don't use `save-excursion' because
+	point at start time may be deleted at end time.
+	(w3m-form-textarea-replace): Ditto.
+	(w3m-form-textarea-info): Use `w3m-get-text-property-around'.
+
+2001-11-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-goto-ftp-url): Rewrote.
+	(w3m-download): Use `w3m-goto-ftp-url' for ftp files.
+
+	* w3m-e20.el (w3m-make-ccl-coding-system): Copied from w3m-fsf.el;
+	don't call `make-coding-system' if a coding-system already exists.
+	* w3m-e21.el (w3m-make-ccl-coding-system): Moved from w3m-fsf.el.
+	* w3m-fsf.el (w3m-make-ccl-coding-system): Moved to w3m-e21.el.
+
+2001-11-08  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (top): Removed autoload of `w3m-remove-image'.
+
+	* w3m-om.el (w3m-remove-image): Define as a dummy function.
+
+	* w3m-e20.el (w3m-remove-image): Define as a dummy function.
+
+	* w3m.el (w3m-quick-start): New option.
+	(w3m-input-url): When the default string is equal to nil, it is not
+	displayed in the prompt.
+	(w3m): Refer `w3m-quick-start' to decide the action when interactively
+	called.
+
+2001-11-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-current-title, w3m-current-url): Define them before
+	loading the version specific modules.
+
+2001-11-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-xmas.el (format-buffers-tab-line): Protect aginst errors caused
+	by the illegal type of `w3m-current-url'.
+
+	* w3m-e21.el (top): Define `w3m-current-url' and `w3m-current-title' to
+	avoid byte-compile warnings.
+	(w3m-insert-header-line): Protect aginst errors caused by the illegal
+	type of `w3m-current-url'.
+	(w3m-tab-line): Protect aginst errors caused by illegal types of
+	`w3m-current-url' and `w3m-current-title'.
+
+2001-11-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (format-buffers-tab-line): Don't use the value of
+	`w3m-current-title' if it is nil.
+
+2001-11-07  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-exec-filter): Modify regexp pattern of "Wrong username or
+	passwd".
+
+
+2001-11-06  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Release emacs-w3m-1.2 from emacs-w3m-1_2 branch.
+
+	* w3m.el (emacs-w3m-version): Modified.
+	(top): Protect against the error occurs when `w3m-ucs.el' isn't found.
+
+2001-11-06  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* README.shimbun.ja (mew-shimbun.el): Modify description.
+
+2001-11-03  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-copy-buffer): Added argument `empty'.
+	(w3m-goto-url-new-session): Call `w3m-copy-buffer' with argument
+	`empty' non-nil; If new url has `name' portion, goto the base url
+	first.
+	(w3m-view-this-url): Likewise.
+
+2001-11-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Makefile.in (DOCS): Add `FAQ'.
+
+2001-11-02  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-form.el (w3m-form-parse-forms): Decode value of input tag.
+	(w3m-form-replace): Use `w3m-get-text-property-around'.
+
+	* w3m.el (w3m-parse-attributes): Add :decode-entity attribute.
+	(w3m-decode-entities-string): New function.
+
+2001-11-02  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-lynx-like-map): Remove binding of `C-tab' and `C-S-tab'
+	Bind `C-cC-t' as the key to call `w3m-copy-buffer'.  Bind `C-cC-p' as
+	the key to call `w3m-previous-buffer'.  Bind `C-cC-n' as the key to
+	call `w3m-next-buffer'.  Bind `C-cC-w' as the key to call
+	`w3m-delete-buffer'.
+	(w3m-info-like-map): Ditto.
+
+2001-11-02  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-reload-this-page): When execute with prefix argument,
+	clear post-data certainty.
+
+2001-11-01  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-goto-url): Remove processing url's forms from the history
+	when post data.
+	(w3m): Use `select-frame-set-input-focus' instead of `x-focus-frame'.
+
+	* w3m-form.el (w3m-form-resume): Fix typo.
+
+2001-11-01  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-delete-buffer): New function.
+	(w3m-copy-buffer): Call `w3m-goto-url' instead of copying buffer
+	content.
+
+2001-10-31  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-form.el (w3m-form-resume): Remove submit button status to support
+	forms containing multiple submit buttons.
+
+2001-10-31  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-accept-languages): Don't use config file if there are no
+	contents for "accept_language".
+
+2001-10-31  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-e21.el (w3m-tab-unselected-face): Setup color for tty.
+	(w3m-tab-selected-face): Ditto.
+	(w3m-tab-background-face): Ditto.
+
+	* w3m.el (w3m-next-buffer): New function.
+	(w3m-previous-buffer): Ditto.
+	(w3m-lynx-like-map): Bind `C-tab' as the key to call `w3m-next-buffer';
+	Bind `C-S-tab' as the key to call `w3m-previous-buffer'.
+	(w3m-info-like-map): Ditto.
+
+2001-10-31  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-accept-languages): New option.
+	(w3m-dump-head-source-command-argument): Abolished.
+	(w3m-dump-head-source-command-arguments): New constant.
+	(w3m-w3m-expand-arguments): New macro.
+	(w3m-w3m-dump-head-source): To generate command arguments for w3m, use
+	`w3m-w3m-expand-arguments' and refer
+	`w3m-dump-head-source-command-arguments'.
+	(w3m-rendering-half-dump): To generate command arguments for w3m, use
+	`w3m-w3m-expand-arguments'.
+
+2001-10-31  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-reload-this-page): Change the semantic of the prefix
+	argument to `clear form and post datas'.
+
+2001-10-31  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-pop-up-windows): Changed default value
+	(See [emacs-w3m: 01999]).
+
+	* w3m-e21.el (w3m-tab-unselected-face): Changed underline color.
+	(w3m-tab-selected-face): Ditto.
+	(w3m-tab-background-face): Ditto.
+	(w3m-tab-line): Removed needless local variable `len'.
+
+2001-10-30  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-e21.el (w3m-header-line-location-title-face): Specify background
+	color.
+	(w3m-header-line-location-title-face): Ditto.
+	(w3m-use-tab): New user option.
+	(w3m-tab-width): Ditto.
+	(w3m-tab-unselected-face): New face.
+	(w3m-tab-selected-face): Ditto.
+	(w3m-tab-background-face): Ditto.
+	(w3m-header-line-map): New variable.
+	(w3m-setup-header-line): If w3m-use-tab is non-nil, use header-line as
+	a tab area.
+	(w3m-insert-header-line): New function.
+	(w3m-tab-make-keymap): New function.
+	(w3m-tab-line): New function.
+	(w3m-fontify-after-hook): Add 'w3m-insert-header-line.
+
+2001-10-30  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-reload-this-page): If form data exist, ask to make use of
+	its. Check form data modified.
+
+	* README.shimbun.ja (mew-shimbun.el): Modify description.
+
+2001-10-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-form.el (w3m-form-parse-forms): Dismantle `w3m-current-url' of
+	its query part before the rest is refered as the default value of the
+	action.
+
+	* w3m.el (w3m-ccl-write-repeat): Accept optional arguments to avoid
+	difference between Emacesn on CCL.
+	(w3m-iso-latin-1-decoder): Call `w3m-ccl-write-repeat' with optional
+	argument.
+
+2001-10-30  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* README.shimbun.ja: Add information for mew-shimbun.el
+
+2001-10-29  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-terminal-coding-system): Changed default value for
+	w3m(en).
+	(w3m-input-coding-system): Ditto.
+	(w3m-default-coding-system): Ditto.
+	(w3m-iso-latin-1-decoder): Fixed for latin-iso8859-1 under old Emacsen.
+	(w3m-ccl-write-repeat): Ditto.
+
+2001-10-29  ORI Manabu <ori@tahoo.org>
+
+	* w3m.el (w3m-type): Added the expression to detect `w3m-m17n'.
+
+2001-10-29  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-accept-japanese-characters): Use `-halfdump' option
+	instead of `-dump' option in order to detect the real internal
+	character set of `w3m-command'.
+	(w3m-profile-directory): Fixed the expression to determine the default
+	value for the environment where `w3m-command' includes redundant
+	suffixes.
+	(w3m-default-save-directory): Ditto.
+	(w3m-euc-japan-encoder): Define in the old-style backquote.
+	(w3m-iso-latin-1-encoder): Ditto.
+
+	* w3m.el (w3m-use-mule-ucs): Simplified.
+	(w3m-ccl-write-repeat): Fixed.
+	(w3m-euc-japan-decoder): Ditto.
+
+2001-10-29  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-ccl-write-repeat): Avoid a byte-compile warning.
+
+2001-10-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-info-like-map): Bind `\M-g' as the key to call
+	`goto-line'.
+
+	* w3m.el (w3m-use-mule-ucs): More safe default value.
+	(w3m-accept-japanese-characters): Improved automatic detection.
+	(w3m-ccl-write-repeat): Fix typo.
+
+	* w3m.el (w3m-type): Use the default value which detected
+	automatically.
+	(w3m-accept-japanese-characters): New internal variable.
+	(w3m-terminal-coding-system): Changed the default value for w3m which
+	doesn't accept Japanese characters.
+	(w3m-input-coding-system): Ditto.
+	(w3m-output-coding-system): Ditto.
+	(w3m-default-coding-system): Changed the default value for the
+	environment that `w3m-language' doesn't equal to "Japanese".
+	(w3m-internal-characters-alist): New constant.
+	(w3m-ccl-write-repeat): New internal function to generate a part of CCL
+	decoder.
+	(w3m-euc-japan-decoder): Modified.
+	(w3m-iso-latin-1-decoder): New CCL program.
+	(w3m-iso-latin-1-encoder): New CCL program which is used when
+	`w3m-use-mule-ucs' equals to nil.
+	(w3m-iso-latin-1): New coding system.
+
+	* w3m-ucs.el (w3m-ucs-generate-ncr-program): New constant.
+	(w3m-euc-japan-encoder): Refer `w3m-ucs-generate-ncr-program'.
+	(w3m-iso-latin-1-encoder): New CCL program.
+
+	* w3m-macro.el (w3m-static-when): New macro.
+	(w3m-static-unless): Ditto.
+
+	* w3m-e21.el (w3m-setup-header-line): Protect aginst the error occurs
+	when `w3m-current-url' isn't string.
+
+2001-10-26  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* mew-w3m.el (mew-mime-text/html-w3m): Support `Xref' header in SHIMBUN
+	article.
+
+2001-10-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m): Call `w3m-mode' for a new session; use
+	`generate-new-buffer' instead of `get-buffer-create' for a new session;
+	allow the optional 2nd arg NEW-SESSION.
+	(w3m-goto-url-new-session): New command.
+	(w3m-goto-url): Always set the value of
+	`mode-line-buffer-identification'.
+	(w3m-mode): Update the doc-string for the new command
+	`w3m-goto-url-new-session'.
+	(w3m-info-like-map): Bind the key "G" to the command
+	`w3m-goto-url-new-session'.
+	(w3m-lynx-like-map): Bind the key "G" to the command
+	`w3m-goto-url-new-session'; replace the key "G" to "\M-g" for the
+	command `goto-line'.
+	(w3m-copy-buffer): Make all the arguments optional; make the 1st arg
+	BUF default to the current buffer.
+	(w3m-view-this-url): Call `w3m-copy-buffer' with the 1st arg nil.
+	(w3m-region, w3m-find-file, w3m-browse-url, w3m-gohome, w3m-download):
+	Add autoload magic cookie.
+	(w3m-popup-frame-p): Allow the optional arg FORCE.
+
+2001-10-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-examine-modules): Don't byte-compile w3m-ucs.el
+	when the version of XEmacs is not greater than or equal to 21.2.37.
+
+	* w3m.el (w3m-pop-up-frames, w3m-pop-up-windows): Add a recommendation
+	to the doc-string about the use of XEmacs' buffers tab.
+
+	* w3m-xmas.el (w3m-xmas-update-tab-in-gutter): New function; add it to
+	`w3m-display-hook'.
+	(format-buffers-tab-line): Advise the function to show the current
+	title string in the buffer tab.
+	(w3m-xmas-show-current-title-in-buffer-tab): New user option.
+	(TopLevel): When compiling, use `autoload' "w3m" for the void functions
+	instead of the use of `defalias' to `ignore'; autoload "gutter-items"
+	for `update-tab-in-gutter'.
+
+2001-10-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-copy-buffer): Bind `pop-up-windows' to the value of
+	`w3m-pop-up-windows'.
+	(w3m-pop-up-windows): New user option.
+
+2001-10-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-rendering-buffer-1): Redundant argument is removed.
+
+2001-10-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-view-this-url): Fixed the interactive spec.
+
+2001-10-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+	    Suggested by Clifford Caoile <piyokun@email.com>.
+
+	* w3m.el (w3m-info-like-map, w3m-lynx-like-map): Bind S-SPC key to the
+	command `w3m-scroll-down-or-previous-url'.
+
+2001-10-23  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-use-mule-ucs): Changed.
+	(w3m-url-encode-string): Refer `w3m-default-coding-system' and
+	`w3m-coding-system' when `coding' argument is lacked.
+	(w3m-url-decode-string): Ditto.
+	(w3m-rendering-buffer-1): Define as a normal function.
+	(w3m-lynx-like-map): Changed the key which calls `w3m-save-image' from
+	`M-I' to `M-i'.
+	(w3m-info-like-map): Ditto; Registerd `O' as the key which calls
+	`w3m-db-history'.
+
+	* aclocal.m4 (AC_ADD_LOAD_PATH): Remove empty lines from auto detection
+	result.
+
+	* Makefile.in (DOCS): Add FAQ.ja, README.namazu.ja and
+	README.shimbun.ja.
+	(tarball): Handle attic/ and patches/.
+
+2001-10-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-mode): Update the doc-string about making a new session.
+	(w3m-info-like-map, w3m-lynx-like-map): Bind keys for the new commands
+	to make a new session.
+	(w3m-mouse-view-this-url-new-session): New command.
+	(w3m-view-this-url-new-session): New command.
+	(w3m-mouse-view-this-url): Make it can create a new session.
+	(w3m-view-this-url): Ditto.
+
+2001-10-23  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (top): Add autoload for `w3m-form-parse-buffer'.
+	(w3m-display-hook): New option.
+	(w3m-decoder-alist): Reindent.
+	(w3m-use-form): Changed default value.
+	(w3m-dirlist-cgi-program): Changed the expression to get default path.
+	(w3m-work-binary-buffer-name): New constant.
+	(w3m-attributes): Handle URLs which start `about://source/'; It isn't
+	defined as an inline function but a normal function to avoid
+	byte-compile error.
+	(w3m-arrived-add): Fixed codes to remove fragments in the specified
+	URL.
+	(w3m-local-retrieve): Clean up.
+	(w3m-about-retrieve): Handle URLs which start `about://source/'.
+	(w3m-retrieve): Doesn't call `w3m-filter'.
+	(w3m-remove-meta-charset-tags): Renamed from `w3m-remove-meta-tags'.
+	(w3m-rendering-region): Removed.
+	(w3m-rendering-extract-title): New function.
+	(w3m-rendering-half-dump): Ditto.
+	(w3m-rendering-buffer-1): Ditto.
+	(w3m-rendering-unibyte-buffer): Ditto.
+	(w3m-rendering-multibyte-buffer): Ditto.
+	(w3m-exec): Call `w3m-rendering-unibyte-buffer' instead of
+	`w3m-rendering-region'.
+	(w3m-edit-url): Improved to handle URLs which start `about://source/'
+	or `about://header/'.
+	(w3m-goto-url): Removed code to highlight current line in the history;
+	Call hook functions in `w3m-display-hook'.
+	(w3m-region): Call `w3m-rendering-multibyte-buffer' instead of
+	`w3m-rendering-region'.
+	(w3m-about): Clean up.
+	(w3m-about-source): Removed.
+	(w3m-view-source): Make URLs which start `about:' available.
+	(w3m-about-header): Simplified.
+	(w3m-history-highlight-current-url): New function.
+
+	* w3m-form.el (w3m-form-parse-buffer): New function.
+	(w3m-form-parse-region): Removed.
+
+	* w3m-filter.el (w3m-filter-rules): Add the rule to call
+	`w3m-filter-www.zdnet.co.jp'.
+	(w3m-filter): Protect against wrong type argument.
+	(w3m-filter-www.zdnet.co.jp): New function.
+
+	* w3m-antenna.el (w3m-antenna-size): Call `w3m-remove-comments' and
+	`w3m-filter' before checking size of contents.
+
+	* w3mhack.el (w3mhack-load-path): Search `un-define' instead of
+	`un-define.el' to check the path where Mule-UCS is installed.
+
+2001-10-22  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3mhack.el (w3mhack-examine-modules): Handle `mew-shimbun.el'.
+
+	* w3m-dtree.el (w3m-dtree-indent-strings, w3m-dtree-stop-strings):
+	Throw out the "Japanese Character" for non-mule's environments.
+
+2001-10-19  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* aclocal.m4 (AC_ADD_LOAD_PATH): When `yes' or null string is passed as
+	an argument, call `w3mhack-load-path' to search places of required
+	modules automatically.
+
+	* w3mhack.el (w3mhack-load-path): New function.
+
+2001-10-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-create-image): Call `w3m-fix-gif' if
+	`w3m-should-convert-interlaced-gifs' is non-nil.
+	(w3m-fix-gif): Renamed from `w3m-unoptimize-animated-gif'; convert an
+	interlaced gif to be non-interlaced as well as unoptimization.
+	(w3m-cache-fixed-gif-images-max-length): Renamed from
+	`w3m-cache-unoptimized-gif-images-max-length'.
+	(w3m-cache-fixed-gif-images): Renamed from
+	`w3m-cache-unoptimized-gif-images'.
+	(w3m-should-convert-interlaced-gifs): New variable.
+
+2001-10-16  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* README.ja: Add description about "new custom".
+
+	* README: Ditto.
+
+	* w3m.el (w3m-attributes): When URL matches `about://source/', returns
+	nil as its content-charset.
+	(w3m-about-retrieve): When URL matches `about://source/', don't call
+	`encode-coding-region'.
+	(w3m-about-source): Don't call `w3m-decode-region'.
+	(w3m-exec): Use `set-buffer-file-coding-system' instead of to set
+	`buffer-file-coding-system'.
+
+2001-10-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-exec): Substitute `w3m-current-coding-system' for
+	`buffer-file-coding-system' to show the current coding system in the
+	mode line.
+
+2001-10-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-use-mule-ucs): Don't use Mule-UCS package for XEmacs
+	versions prior to 21.2.37.
+
+2001-10-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (top): It doesn't require `thingatpt'.
+	(w3m-url-at-point): New function.
+	(w3m-input-url): Call `w3m-url-at-point' instead of `thing-at-point';
+	The 4th optional argument is added.
+	(w3m): Call `w3m-input-url' with the 4th argument.
+
+2001-10-15  NAKAJIMA Mikio  <minakaji@osaka.email.ne.jp>
+
+	* README: Add description about ftp site of FLIM.
+
+2001-10-15  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* mew-w3m.el (mew-w3m-auto-insert-image): Change from 'defcont' to
+	'defcustom', again.
+	(mew-w3m-safe-url-regexp): New constant.
+	(mew-w3m-view-inline-image): Rewrite.
+	(mew-mime-text/html-w3m): Bind 'w3m-safe-url-regexp' to
+	'mew-w3m-safe-url-regexp'.
+
+2001-10-15  NAKAJIMA Mikio  <minakaji@osaka.email.ne.jp>
+
+	* README.ja: Divided original section 2. a) into two parts, 2. a) and
+	2. b).  Add new section 2. c), 2. e) about APEL, FLIM, shimbun library.
+	* README: Ditto.
+
+	* FAQ.ja (Q. ~~~~ Emacs ~?): Add description about where to get APEL.
+
+2001-10-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-expand-url): Accept URL which has the scheme part only.
+
+2001-10-15  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-url-components-regexp): Don't except `\' for scheme,
+	authority and path.
+
+2001-10-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (top): Removed autoload for `regexp-opt'.
+
+	* w3m-weather.el (top): Likewise.
+
+	* w3m-om.el (top): Add autoload for `regexp-opt'.
+
+2001-10-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-entity-regexp): Unified to the use of `regexp-opt';
+	autoload regexp-opt for old Emacsen.
+
+	* attic/regexp-opt.el: New file.
+
+	* README.ja, README: Emacs-w3m requires the module regexp-opt.
+
+	* w3m-weather.el: Autoload regexp-opt for old Emacsen.
+
+2001-10-13  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-safe-url-regexp): New variable.
+	(w3m-retrieve): When `w3m-safe-url-regexp' has non-nil value and it
+	matches the requested URL, doesn't fetch its contents.
+
+	* mime-w3m.el (mime-w3m-display-inline-image): New option.
+	(mime-w3m-preview-text/html): In order to avoid web bug which is
+	described in [mew-dist 19267], restrict accesible URLs.
+
+	* mew-w3m.el (mew-mime-text/html-w3m): Likewise.
+
+	* w3m-weather.el (w3m-weather-url-alist): Abolished.
+	(w3m-weather-completion-table): New constant.
+	(w3m-weather-default-area): Refer `w3m-weather-completion-table'
+	instead of `w3m-weather-url-alist' to decide customize spec.
+	(w3m-weather-input-history): New variable.
+	(w3m-weather-input-area): New function.
+	(w3m-weather-area-completion): Ditto.
+	(w3m-weather): Call `w3m-weather-input-area'.
+	(w3m-about-weather): Refer `w3m-weather-completion-table' instead of
+	`w3m-weather-url-alist' to convert the area to the real URL.
+
+2001-10-12  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* mew-w3m.el (mew-w3m-auto-insert-image): Change from 'defcustom' to
+	'defconst' and default value to 'nil'.
+	(mew-w3m-view-inline-image): New function.
+
+2001-10-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-input-url): Accept the 3rd optional argument.
+	(w3m): Improved interactive form.
+
+2001-10-12  Yuuichi Teranishi  <teranisi@gohome.org>,
+	    TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+	* w3m-e21.el (w3m-form-button-keymap): Renamed from
+	`w3m-widget-keymap'.
+	(w3m-form-make-button): Fixed.
+	(w3m-setup-widget-faces): Revived.
+
+2001-10-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m): Always prompts user for a URL string.
+
+2001-10-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-weather.el (w3m-weather-url-alist): Refer
+	`http://weather.yahoo.co.jp'.
+	(w3m-weather-default-area): Change default region.
+	(w3m-weather-filter-functions): Change default value.
+	(w3m-about-weather): Accept `no-cache' argument.
+	(w3m-weather-remove-headers): Modified for Yahoo.
+	(w3m-weather-remove-footers): Ditto.
+	(w3m-weather-insert-title): Ditto.
+	(w3m-weather-remove-weather-images): Removed.
+	(w3m-weather-remove-washing-images): Removed.
+	(w3m-weather-remove-futon-images): Removed.
+	(w3m-weather-remove-week-weather-images): Removed.
+
+	* w3m-e21.el (w3m-widget-keymap): New keymap.
+	(w3m-form-make-button): Set `w3m-widget-keymap' as keymap on buttons;
+	Fix condition to make buttons.
+	(w3m-setup-widget-faces): Removed.
+
+2001-10-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mew-w3m.el, w3m-form.el, w3m.el: Remove useless whitespaces.
+
+2001-10-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-local-dirlist-cgi): Replace `re-search-forward' to
+	`search-forward'; bind `beg' as a non-global variable.
+
+2001-10-11  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-local-dirlist-cgi): Remove <from>...</form>.
+
+2001-10-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-expand-path-name): Fix incompatibility of drive letter.
+
+2001-10-11  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-e21.el (toplevel): Require 'wid-edit.
+	(w3m-form-button-face): Set background and foreground color; Set box
+	line-width as 2.
+	(w3m-form-button-pressed-face): Ditto.
+	(w3m-form-button-mouse-face): New face.
+	(w3m-form-button): New widget button.
+	(w3m-form-make-button): Use `widget-convert-button' to put
+	w3m-form-button.
+	(w3m-setup-widget-faces): New function.
+	(w3m-mode-hook): Add `w3m-setup-widget-faces'.
+	(w3m-form-make-button): Don't check :box attribute when
+	w3m-form-use-fancy-faces is non-nil.
+
+2001-10-11  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-decoder-alist): Fix for Windows or OS/2 environments.
+
+2001-10-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-display-inline-image): Update document.
+	(w3m-decoder-alist): Change default value.
+	(w3m-current-image-status): New buffer-local variable.
+	(w3m-which-command): Export to w3m-macro.el.
+	(w3m-decode-encoded-contents): Small change.
+	(w3m-expand-url): Fix to remove an empty query part and an empty
+	fragment part correctly.
+	(w3m-toggle-inline-images): Refer `w3m-current-image-status' instead of
+	`w3m-display-inline-image'.
+	(w3m-view-url-with-external-browser): Ditto.
+	(w3m-goto-url): Ditto.
+	(w3m-reload-this-page): Ditto.
+	(w3m-redisplay-with-charset): Ditto.
+
+	* w3m-e21.el (top, w3m-display-inline-image-p): Refer
+	`w3m-current-image-status' instead of `w3m-display-inline-image'.
+
+	* w3m-om.el (w3m-expand-path-name): Add 2nd optional argument.
+
+	* w3m-macro.el (w3m-which-command): Import from w3m.el.
+
+	* w3m-xmas.el (top, w3m-display-inline-image-p): Refer
+	`w3m-current-image-status' instead of `w3m-display-inline-image'.
+
+	* mew-w3m.el (mew-mime-text/html-w3m): Refer `w3m-current-image-status'
+	instead of `w3m-display-inline-image'.
+
+2001-10-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-cache-header): Add 3rd optional argument.
+	(w3m-w3m-dump-head-source): Call `w3m-cache-header' with `overwrite'
+	option.
+
+	* w3m.el (w3m-cache-header-delete-variable-part): New function.
+	(w3m-cache-header): Remove cached contents when inconsistency between
+	new header and cached header is found.
+
+	* w3m.el (w3m-expand-url): Fix the last change.
+	(w3m-url-hierarchical-schemes): Add `file'.
+	(w3m-goto-url): Use `\`' instead of `^' as a meta character.
+
+	* w3m.el (w3m-fontify-anchors): Fix.
+	(w3m-url-fallback-base): New constant.
+	(w3m-expand-url): Make it robust against illegal base-URL.
+
+	* w3m.el (w3m-url-components-regexp): New constant.
+	(w3m-url-hierarchical-schemes): Ditto.
+	(w3m-expand-url): Reimplemented.
+	(w3m-view-this-url): Remove a redundant local variable.
+	(w3m-mouse-view-this-url): Call `w3m-view-this-url'.
+	(w3m-goto-url): Refer `w3m-url-components-regexp' to delete a fragment
+	part of URL.
+
+	* mime-w3m.el (mime-w3m-view-this-url): When there is an inline image
+	under point, display it.
+	(mime-w3m-mouse-view-this-url): Call `mime-w3m-view-this-url'.
+
+2001-10-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-expand-url): Emergency fixed.
+
+2001-10-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-expand-url): Make it work correctly when a url begins
+	with "//".
+
+2001-10-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-language): New option.
+	(w3m-default-coding-system): Refer `w3m-language' to decide default
+	value.
+	(w3m-coding-system-priority-list): Ditto.
+	(w3m-toolbar): Ditto.
+	(w3m-url-to-file-name): Moved to avoid byte-compile warnings.
+	(w3m-expand-file-name-as-url): Ditto.
+	(w3m-url-local-p): Ditto.
+	(w3m-url-dtree-p): Ditto.
+	(w3m-view-this-url): When there is an inline image under point, display
+	it.
+	(w3m-mouse-view-this-url): Ditto.
+	(w3m-view-url-with-external-browser): Renamed from
+	`w3m-view-current-url-with-external-browser'.  Handle an inline image
+	under point.
+	(w3m-download-this-url): Handle an inline image under point.
+	(w3m-info-like-map): Reconstructed.
+
+	* w3m-search.el (w3m-search-default-coding-system): Abolished.
+	(w3m-search-engine-alist): Refer `w3m-language' to decide default
+	value.
+	(w3m-search-escape-query-string): Refer `w3m-default-coding-system'
+	instead of `w3m-search-default-coding-system'.
+
+2001-10-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-form.el (w3m-form-use-fancy-faces): New option.
+	(w3m-form-make-button): New function.
+	(w3m-form-fontify): Call `w3m-form-make-button'.
+
+	* w3m-e21.el (w3m-form-button-face): New face.
+	(w3m-form-button-pressed-face): Ditto.
+	(w3m-form-make-button): New function.
+
+2001-10-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-om.el (read-string): Unify the advice form.
+	(w3m-om-coding-system-alist): Fix doc-string.
+
+2001-10-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-om.el (read-string): Don't modify the value of
+	`current-load-list' when advising it.
+
+	* mime-w3m.el (mime-w3m-remove-text-properties): Don't modify the value
+	of `current-load-list' when advising the function `kill-new'; add a
+	doc-string.
+
+	* w3m.el (w3m-decode-entities): Save-match-data when `w3m-entity-value'
+	is called.
+
+2001-10-03  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-xmas.el (w3m-detect-coding-region): Return just the return value
+	of `detect-coding-with-priority' if it is not a list, again.
+
+2001-10-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-om.el (read-string): Advise the function to allow the 4th
+	argument `default-value'.
+
+2001-10-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* mime-w3m.el (mime-w3m-remove-text-properties): New advice to protect
+	`kill-ring-save' against the `local-map' text property.
+
+2001-10-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-om.el (w3m-detect-coding-region): Use the fixed value for the
+	list of coding-categories; suppress the duplication of coding-
+	categories.
+	(TopLevel): Protect against non-existent coding-systems when creating
+	the modern coding-systems.
+	(w3m-om-coding-category-alist): Reinforce the default value.
+	(w3m-om-coding-categories): Abolish.
+	(w3m-om-coding-system-alist): Add some new coding-systems.
+
+	* w3m-fsf.el (w3m-detect-coding-region): Suppress the duplication of
+	coding-categories.
+	* w3m-xmas.el (w3m-detect-coding-region): Ditto; use
+	`coding-system-category' instead of `coding-system-type'.
+
+2001-10-03  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-show-inline-images-before-hook,
+	w3m-show-inline-images-after-hook,
+	w3m-remove-inline-images-before-hook,
+	w3m-remove-inline-images-after-hook): Abolished.
+	(w3m-modeline-image-status-on): New constant.
+	(w3m-modeline-image-status-off): Ditto.
+	(w3m-image-only-page): New buffer local variable.
+	(w3m-display-inline-image-status): Abolished.
+	(w3m-fontify-images): Put `w3m-image-status property'.
+	(w3m-toggle-inline-images-internal): New inline function.
+	(w3m-exec): Set w3m-image-only-page as t.
+	(w3m-lynx-like-map): Bind "T" to 'w3m-toggle-inline-images and "t" to
+	'w3m-toggle-inline-image.
+	(w3m-goto-url): Set w3m-image-only-page as nil at first; Setup modeline
+	to display image display status; Display image if w3m-image-only-page
+	is nil.
+
+	* w3m-e21.el (w3m-cache-underline-faces): Abolished.
+	(w3m-insert-image): Set text property 'w3m-undeline-face to the image
+	instead of setting up w3m-cache-underline-faces.
+	(w3m-remove-image): Recover underline faces.
+	(w3m-fontify-before-hook, w3m-show-inline-images-before-hook,
+	w3m-show-inline-images-after-hook,
+	w3m-remove-inline-images-after-hook): Don't set up.
+
+2001-10-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-om.el (w3m-detect-coding-region): Make it work.
+
+	* w3m-xmas.el (w3m-detect-coding-region): Return just the return value
+	of `detect-coding-with-priority' if it is not a list, otherwise the car
+	of the value.
+
+2001-10-02  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-coding-system-priority-list): New user option.
+	(w3m-decode-buffer): Use it.
+
+	* w3m-fsf.el (w3m-detect-coding-region): Remove argument `highest';
+	always return the first possible coding system.  Add new optional
+	argument `priority-list'.  Use `detect-coding-with-priority'.
+
+	* w3m-xmas.el (w3m-detect-coding-region): Ditto.
+
+	* w3m-om.el (w3m-detect-coding-region): Remove argument `highest';
+	always return the first possible coding system.  Add new optional
+	argument `priority-list'.
+
+2001-10-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-om.el (w3m-detect-coding-region): Return a non-list of a
+	coding-system if the number of return value is only one; use
+	`w3m-om-modernize-coding-system' and `w3m-om-coding-categories'; use
+	`code-detect-region' instead of `detect-coding-region'.
+	(w3m-om-modernize-coding-system): New function.
+	(w3m-om-coding-category-alist): Use `w3m-om-coding-categories'.
+	(w3m-om-coding-categories): New constant.
+	(w3m-om-coding-system-alist): Add `emacs-mule'.
+
+2001-10-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (TopLevel): Don't byte-compile the source form to bind colon
+	keywords for old Emacsen.
+
+2001-10-01  Masatake YAMATO  <jet@gyve.org>
+
+	* w3m.el (w3m-mode): Added `w3m-toggle-inline-images' to the mode
+	description.
+
+2001-10-01  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-edit-url-directory-alist): New option.
+	(w3m-edit-url): New function.
+	(w3m-edit-current-url): Call `w3m-edit-url'.
+	(w3m-edit-this-url): Ditto.
+
+2001-10-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-om.el (w3m-detect-coding-region): Prefer the coding-category that
+	the value of `w3m-default-coding-system' belongs to.
+	(w3m-om-coding-category-alist): New variable.
+	(w3m-om-coding-system-alist): New variable.
+
+	* w3m.el (w3m-default-coding-system): Default to `shift_jis' when Mule2
+	is running.
+
+2001-09-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3mhack.el (w3mhack-examine-modules): Handle `w3m-fsf.el'.
+
+	* w3m.el (w3m-default-coding-system): New option.
+	(w3m-decode-buffer): Call `w3m-detect-coding-region' instead of
+	`detect-coding-region'.
+	(w3m-make-ccl-coding-system): Export it to `w3m-fsf.el'.
+
+	* w3m-xmas.el (coding-system-category): Removed.
+	(w3m-detect-coding-region): New function.
+
+	* w3m-om.el (coding-system-category): Removed.
+	(w3m-detect-coding-region): New function.
+
+	* w3m-fsf.el: New file.
+
+	* w3m-form.el (w3m-form-default-coding-system): Abolished.
+	(w3m-form-make-form-data): Refer `w3m-default-coding-system' instead of
+	`w3m-form-default-coding-system'.
+
+	* w3m-e21.el (top): Require `w3m-fsf'.
+	(w3m-find-coding-system): Export it to `w3m-fsf.el'.
+
+	* w3m-e20.el (top): Require `w3m-fsf'.
+	(w3m-find-coding-system): Export it to `w3m-fsf.el'.
+
+	* w3m.el (w3m-goto-url): Change effect of the 3rd argument `charset'.
+	(w3m-redisplay-with-charset): Reimplemented.
+	(w3m-view-source): Improved to handle `about://header/...'.
+	(w3m-about-header): Show title etc.
+	(w3m-view-header): Improved to handle `about://source/...'.
+
+2001-09-28  kkonishi <ironbeat@mail.st.rim.or.jp>
+
+	* w3m-search.el (w3m-search-engine-alist): New search engines,
+	`excite-ja', `lycos-ja', `altavista' and `freebsd-users-jp'.
+
+2001-09-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-goto-url): Speed up the action to refer a name anchor in
+	the same document.
+
+2001-09-27  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-copy-local-variables): Simplified.
+	(w3m-region): Set `w3m-current-base-url'.
+
+	* w3m.el: Fix the bug reported in [emacs-w3m:01564].
+	(w3m-current-base-url): New buffer-local variable.
+	(w3m-clear-local-variables): Handle `w3m-current-base-url'.
+	(w3m-copy-local-variables): Ditto.
+	(w3m-attributes): Change spec of return value.
+	(w3m-w3m-attributes): Ditto.
+	(w3m-local-attributes): Ditto.
+	(w3m-base-url): New macro.
+	(w3m-expand-url): Make the second argument `base' optional, and refer
+	`w3m-current-base-url' when a relative URL is canonicalized.
+	(w3m-fontify-anchors): Follow change of `w3m-expand-url'.
+	(w3m-fontify-images): Ditto.
+	(w3m-toggle-inline-images): Ditto.
+	(w3m-exec): Call `w3m-base-url' to set `w3m-current-base-url'.
+
+	* w3m-form.el (w3m-form-new): Canonicalize `action' whenever this
+	function is called.
+	(w3m-form-parse-forms): Follow change of `w3m-form-new'.
+	(w3m-form-submit): Ditto.
+	(w3m-form-input-map-set): Follow change of `w3m-expand-url'.
+
+2001-09-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-goto-url): Position point to the current url and
+	highlight the line when the page is for listing the history
+	(suggested by SHIRAI-san).
+	(w3m-history-current-url-face): New face.
+	(w3m-image-face, w3m-arrived-anchor-face, w3m-anchor-face): Fix
+	doc-string.
+
+2001-09-26  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-about-db-history-today): New defsubst.
+	(w3m-about-db-history): If arrived time within 18 hours, display with
+	"HH:MM:SS".
+
+2001-09-18  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-ucs.el (w3m-euc-japan-encoder): Convert lain-jisx0201 to ASCII;
+	Avoid deep nesting.
+	(TopLevel): Don't require `w3m-macro'.
+
+2001-09-18  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-om.el (w3m-expand-path-name): Cancel last change.
+
+2001-09-17  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-expand-path-name): Except Mule2, define alias of
+	`expand-file-name'.
+
+	* w3m-om.el (w3m-expand-path-name): Re-implemented.
+
+	* w3m-e20.el (w3m-expand-path-name): Removed.
+
+	* w3m-e21.el (w3m-expand-path-name): Ditto.
+
+	* w3m-xmas.el (w3m-expand-path-name): Ditto.
+
+2001-09-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-generate-colon-keywords-file): Renamed from
+	`w3mhack-bind-colon-keywords'; generate a file which contains a list of
+	colon keywords; don't bind colon keywords.
+	(w3mhack-colon-keywords-file): New constant.
+
+	* w3m.el: Load w3m-kwds.el if a colon keyword is not avaulable.
+	(w3m-colon-keywords): Abolished.
+
+	* Makefile.in (keywords): Create w3m-kwds.el instead of w3mkwds.el;
+	don't remove w3m-kwds.el in advance.
+	(clean): Remove w3m-kwds.el instead of w3mkwds.el.
+	(install): Install w3m-kwds.el if it exists.
+
+2001-09-17  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-expand-url): Use `w3m-expand-path-name' instead of
+	`expand-file-name'.
+
+	* w3m-om.el (w3m-expand-path-name): New function.
+
+	* w3m-e20.el (w3m-expand-path-name): New alias.
+
+	* w3m-xmas.el (w3m-expand-path-name): Ditto.
+
+	* w3m-e21.el (w3m-expand-path-name): Ditto.
+
+2001-09-17  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-search.el (w3m-search-engine-alist): Changed default value of
+	`google'.  Add new engines `debian-pkg', `debian-bts', and
+	`iij-archie'.
+
+2001-09-17  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
+
+	* w3m-search.el (w3m-search-engine-alist): Changed default value of
+	`google-ja'.
+
+2001-09-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (top): Require `ccl'.
+	(w3m-make-ccl-coding-system): New function for Emacs20 / Emacs21.
+	(w3m-euc-japan): Define with `w3m-make-ccl-coding-system'.
+
+	* w3m-macro.el (top): Delete garbage.
+
+	* w3m-e21.el (top): Fix to avoid byte-compile warnings.
+
+	* w3m-xmas.el (top): Require `pccl' and fix to avoid byte-compile
+	warnings.
+	(w3m-make-ccl-coding-system): New alias to `make-ccl-coding-system'.
+
+	* w3m-om.el (top): Require `pccl'.
+	(w3m-make-ccl-coding-system): New alias to `make-ccl-coding-system'.
+
+	* w3m-search.el (w3m-search): Fixed search engine specification error
+	when interactively called with prefix arguments.
+
+2001-09-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-macro.el (w3m-with-work-buffer): Keep `w3m-history' and
+	`w3m-history-flat' through buffers.
+
+	* w3m.el (w3m-current-buffer): Abolished.
+	(w3m-goto-url): Don't set `w3m-current-buffer'.
+	(w3m-region): Ditto.
+	(w3m-about-history): Don't refer `w3m-current-buffer'.
+
+	* w3m-form.el (w3m-form-parse-region): Simplified.
+	(w3m-form-parse-forms): Accept <OPTION> tag lacks `value' attribute.
+
+	* w3m.el (w3m-resume-forms): Abolished.
+	(w3m-clear-local-variables): Don't handle `w3m-resume-forms'.
+	(w3m-copy-local-variables): Ditto.
+	(w3m-fontify): Don't call `w3m-form-resume'.
+	(w3m-cache-available-p): Protect against the illegal type of arguments.
+	(w3m-rendering-region): Removed the fourth optional argument, `forms'.
+	(w3m-exec): Follow change of `w3m-rendering-region'.
+
+	* w3m-form.el (w3m-form-parse-region): Check the cached form/map
+	objects are available, and if available return them with the flag.
+	(w3m-fontify-forms): Its real part is moved to `w3m-form-fontify'.
+	Call `w3m-form-resume' if `w3m-current-forms' includes the flag.
+	(w3m-form-fontify): New function.
+
+2001-09-15  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-form.el (w3m-form-resume): Ignore `hidden' type form; Fixed
+	problem when no item is selected in the select form.
+
+	* w3m.el (w3m-copy-local-variables): Bind local variable resume.
+
+2001-09-14  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-resume-forms): New buffer local variable.
+	(w3m-clear-local-variables): Add w3m-resume-forms.
+	(w3m-copy-local-variables): Ditto.
+	(w3m-fontify): If w3m-resume-forms is non-nil, call w3m-form-resume.
+	(w3m-rendering-region): Set w3m-resume-forms if form is cached.
+
+	* w3m-form.el (w3m-form-replace-string): Eliminate.
+	(w3m-form-resume): New function.
+	(w3m-fontify-forms): Don't call `w3m-form-replace-string'.
+
+2001-09-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-form.el (w3m-form-replace-string): Protect against the illegal
+	type of arguments.
+
+2001-09-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-region): Defined new optional argument, `url'.
+
+	* mime-w3m.el (mime-w3m-preview-text/html): Call `w3m-region' with an
+	optional argument `url'.
+
+2001-09-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-form.el (w3m-fontify-forms): Restore a string for the input
+	button from the history if it is available.
+	(w3m-form-replace-string): New function.
+
+	* w3m.el (w3m): Clear the startup screen on the new frame.
+	(w3m-reload-this-page, w3m-goto-url, w3m-view-previous-page):
+	Save/restore post-data and referer as buffer-local properties in the
+	history.
+
+2001-09-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-goto-url): Register the value of `w3m-current-forms' in
+	the history as a buffer-local property.
+	(w3m-view-previous-page): Specify a url string to
+	`w3m-history-restore-position'.
+	(w3m-exec): Use cached forms if it is valid.
+	(w3m-rendering-region): Allow the optional argument `forms'; use
+	`forms' if it is non-nil.
+	(w3m-close-window, w3m-copy-buffer, w3m-exec-set-user, w3m-input-url,
+	w3m-copy-local-variables): Remove unused non-global variables.
+
+	* w3m-hist.el (w3m-history-restore-position): Allow the optional
+	argument `url'.
+	(w3m-history-store-position): Ditto.
+	(w3m-history-plist-get): Return nil instead of to signal an error.
+
+	* w3m-form.el (w3m-form-parse-region): Don't set the value of
+	`w3m-current-forms' here.
+	(w3m-form-input-map, w3m-form-input-map-set): Remove unused non- global
+	variables.
+
+2001-09-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-goto-url): Don't use `w3m-cleanup-plist'.
+
+	* w3m-macro.el (w3m-cleanup-plist): Abolished.
+
+	* w3m-hist.el (w3m-history-push): Don't add property whose value is
+	nil.
+	(w3m-history-modify-properties): Don't infloop.
+
+	* Makefile.in (keywords): New rule.
+	(distclean): Remove the directory autom4te.cache which will be created
+	by autoconf v2.5x.
+	(clean): Remove w3mkwds.el.
+
+	* .cvsignore: Add autom4te.cache.
+
+	* w3mhack.el (w3mhack-bind-colon-keywords): Always define it.
+
+2001-09-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-current-referer, w3m-current-post-data): Abolished.
+	(w3m-copy-local-variables, w3m-clear-local-variables): Don't handle
+	them.
+	(w3m-reload-this-page, w3m-goto-url): Don't use them; use the history
+	instead.
+
+2001-09-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-add-referer): Removed.
+	(w3m-add-referer-regexps): Default value is changed.
+	(w3m-goto-url): No check `w3m-add-referer'.
+
+2001-09-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-w3m-retrieve): Don't send a referer if it does not
+	satisfy the rule of `w3m-add-referer-regexps'.
+	(w3m-add-referer-regexps): New user option.
+
+2001-09-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-cache-available-p): New function.
+
+2001-09-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-hist.el, w3m.el: Don't quote colon keywords.
+
+	* Makefile.in (install): Don't install w3mkwds.el.
+
+2001-09-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-colon-keywords): New variable; bind some colon keywords
+	for Emacs versions prior to 20.3.
+
+	* .cvsignore: Add w3mkwds.el.
+
+	* w3mhack.el (w3mhack-bind-colon-keywords): New function; byte- compile
+	and exec it.
+	(w3mhack-examine-modules): Don't byte-compile w3mkwds.el.
+
+	* w3m-macro.el (w3m-tag-regexp-of): Reverted; add a documentation.
+	(TopLevel): Require `cl' when compiling.
+
+2001-09-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-goto-url): Register post-data and a referer in the
+	history.
+	(w3m-info-like-map, w3m-lynx-like-map): Use `suppress-keymap'.
+	(w3m-view-previous-page): Give post-data and a referer to
+	`w3m-goto-url'.
+	(w3m-view-next-page): Use `w3m-view-previous-page'.
+
+	* w3m-macro.el (w3m-cleanup-plist): New macro.
+	(w3m-tag-regexp-of): Use backquote.
+
+	* w3m-hist.el (w3m-history-modify-properties): Don't infloop.
+
+2001-09-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-clear-local-variables): Not reset `w3m-initial-frame'.
+	(w3m-copy-local-variables): Not copy `w3m-initial-frame'.
+
+	* w3m-form.el (w3m-form-parse-region): Modify `w3m-current-forms' in
+	this buffer.
+
+2001-09-11  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-expand-url): Use `expand-file-name' to expand path; If
+	URL is a form like 'scheme://server/path?query', only path is expanded.
+
+2001-09-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-meta-content-type-charset-regexp): Relaxed to accept
+	<meta> tag in XML style.
+	(w3m-meta-charset-content-type-regexp): Ditto.
+	(w3m-tag-regexp-of): Exported to `w3m-macro.el'.
+
+	* w3m-macro.el (w3m-tag-regexp-of): Imported from `w3m.el'.
+
+	* w3m.el (w3m-goto-url): Changed timing when `w3m-current-referer' and
+	`w3m-current-post-data' are set.
+	(w3m-exec): Call `w3m-clear-local-variables' before image data is
+	inserted.
+
+	* w3m.el (w3m-current-forms): Definition imported from `w3m-form.el'.
+	(w3m-current-coding-system): New buffer local variable.
+	(w3m-clear-local-variables): New function.
+	(w3m-copy-local-variables): Ditto.
+	(w3m-arrived-p): Cancel the last change.
+	(w3m-arrived-auto-detected-coding-system): Removed.
+	(w3m-arrived-set-auto-detected-coding-system): Ditto.
+	(w3m-fontify-anchors): Expand `w3m-next-url' and `w3m-previous-url' on
+	`w3m-current-url'.
+	(w3m-decode-buffer): Set auto-detected coding system to
+	`w3m-current-coding-system'.
+	(w3m-remove-comments): Simplified.  No point is saved.
+	(w3m-check-link-tags): `w3m-next-url' and `w3m-previous-url' are not
+	reseted.
+	(w3m-remove-meta-tags): New function.
+	(w3m-rendering-region): Call `w3m-remove-meta-tags'.
+	(w3m-exec): Clean up codes.
+	(w3m-redisplay-with-charset): Refer `w3m-current-coding-system'.
+	(w3m-region): Call `w3m-clear-local-variables'.
+
+	* w3m-form.el (w3m-current-forms): Definition moved to `w3m.el'.
+	(w3m-form-make-form-data): Refer `w3m-current-coding-system'.
+
+2001-09-10  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-expand-url): Changed regexp for detecting absolute spec;
+	Don't use `expand-file-name'.
+
+2001-09-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-ucs.el (w3m-euc-japan-encoder): Simplified.
+
+2001-09-10  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
+
+	* w3m-ucs.el (w3m-euc-japan-encoder): Fixed for ASCII under XEmacs.
+
+2001-09-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-goto-url): Refer `coding-system-for-read' which is
+	specified by `universal-coding-system-argument'.
+
+	* w3m-ucs.el (w3m-euc-japan-encoder): Protect against invalid value
+	which `emacs-char-to-ucs-codepoint-conversion' returns.
+
+2001-09-09  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* w3m-ucs.el (w3m-euc-japan-encoder): Fixed for katakana-jisx0201.
+
+2001-09-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-form.el (w3m-form-make-form-data): Call
+	`w3m-arrived-auto-detected-coding-system' when `w3m-content-charset'
+	returns nil.
+
+	* w3m.el (w3m-arrived-p): Strict checking.
+	(w3m-arrived-auto-detected-coding-system): New function.
+	(w3m-arrived-set-auto-detected-coding-system): Ditto.
+	(w3m-decode-buffer): Call `w3m-arrived-set-auto-detected-coding-system'
+	to store the coding system detectd by this function.
+	(w3m-w3m-attributes): Use content of w3m-document-charset: field as
+	charset, only when `w3m-type' equals `w3mmee' or `w3m-m17n'.
+	(w3m-redisplay-with-charset): Call
+	`w3m-arrived-auto-detected-coding-system' to get current coding-system.
+
+2001-09-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-use-mule-ucs): Strict checking.
+	(w3m-euc-japan-decode): Use `write-multibyte-character' except Mule2
+	and XEmacs21.1.
+	(w3m-find-file): Refer `coding-system-for-read' which is specified by
+	`universal-coding-system-argument'.
+
+	* w3m-xmas.el (w3m-euc-japan-decoder): Removed.
+
+2001-09-09  MIYOSHI Masanori  <miyoshi@boreas.dti.ne.jp>
+
+	* README.shimbun.ja: Ditto.
+
+	* README.shimbun.ja: Ditto.
+
+2001-09-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-use-mule-ucs): New user option.
+	(w3m-input-coding-system): Changed default value.
+	(w3m-async-exec): Ditto.
+	(w3m-process-connection-type) [Solaris]: Changed default value.
+	(w3m-entity-alist): Enlarge a regular expression.
+	(w3m-ucs-to-char): New function.
+	(w3m-euc-japan-encoder): Follow the change of `w3m-ucs.el'.
+
+	* w3mhack.el (w3mhack-examine-modules): Handle `w3m-ucs.el'.
+
+	* w3m-ucs.el: New file.
+
+2001-09-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el (w3m-use-toolbar): Use `w3m-image-type-available-p'.
+	(w3m-image-type-available-p): Use `display-images-p' instead of
+	`display-graphic-p'.
+	(w3m-display-inline-image-p): Ditto.
+	(w3m-display-graphic-p): Alias to `display-images-p' instead of
+	`display-graphic-p'.
+	(display-images-p): Make an alias to `display-graphic-p' if it is not
+	available.  It is for Emacs version prior to 21.0.105.
+
+2001-09-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-filter.el (w3m-filter-lwn.net): Add link information to next
+	page.
+
+2001-08-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-load-list): Retry to read a file when failed.
+
+2001-08-26  MIYOSHI Masanori  <miyoshi@boreas.dti.ne.jp>
+
+	* README.shimbun.ja: Add information on nikkansports.
+
+2001-08-24  MIYOSHI Masanori  <miyoshi@boreas.dti.ne.jp>
+
+	* README.shimbun.ja: Add information on makanai, f1fan, f1express and
+	isize-sports.
+
+2001-08-13  NAKAGAWA Takayuki  <tknakaga@kanagawa.hitachi.co.jp>
+
+	* w3m.el (w3m-w3m-attributes): Refer `w3m-base-url' as current url,
+	when it is available.
+
+2001-08-10  Takenobu Sugiyama  <sugiyama@ae.advantest.co.jp>
+
+	* w3m-weather.el (w3m-weather-url-alist): Update data to follow the
+	most recent urls.
+	(w3m-weather-default-area): Ditto.
+	(w3m-weather-remove-weather-images): Ditto.
+
+2001-08-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-download): Made it to work as a command.
+
+2001-08-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-fontify-images): Use `w3m-decode-anchor-string' to
+	convert "&amp;" to "&" in the url string.
+
+2001-08-10  NOMIYA Masaru  <nomiya@ttmy.ne.jp>
+
+	* w3m.el (w3m-content-type-alist): Fix typos for gif and tiff.
+
+2001-08-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-goto-url): Put the url in the history even if `w3m-exec'
+	returns nil.
+
+2001-08-09  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* mew-w3m.el (mew-mime-text/html-w3m): Bug fix. Guess charset in cache
+	buffer.
+
+2001-08-07  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-type): Remove `w3m-mnc' option.
+	(w3m-w3m-dump-source): Removed.
+	(w3m-w3m-retrieve): Don't use `w3m-w3m-dump-source'.
+
+2001-08-07  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-content-type-alist): [Win32] Executed 'fiber' with
+	synchronous mode
+	(w3m-w32-browser-with-fiber): Ditto.
+	(w3m-external-view): Add a suffix to the temporally file name if
+	possible.
+
+2001-08-06  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-async-exec): Fix doc-string.
+	(w3m-exec-get-user): Rewrite.
+	(w3m-exec-get-passwd): New funciton.
+	(w3m-exec-set-user): Rewrite.
+	(w3m-get-server-root): Set 'server root' to downcase.
+	(w3m-exec-filter): Modify the method of 'user' and 'passwd' handling.
+
+2001-08-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-next-url): New buffer local variable.
+	(w3m-previous-url): Ditto.
+	(w3m-arrived-ignored-regexp): Add 'about://namazu/'.
+	(w3m-history-ignored-regexp): Ditto.
+	(w3m-url-decode-string): New funtcion.
+	(w3m-fontify-anchors): Process `rel' element of anchor tag.
+	(w3m-check-link-tags): New funtcion.
+	(w3m-rendering-region): Call `w3m-check-link-tags'.
+	(w3m-exec): Set `w3m-next-url' and `w3m-previous-url'.
+	(w3m-lynx-like-map): Replace `scroll-up' with
+	`w3m-scroll-up-or-next-url'.  Replace `scroll-down' with
+	`w3m-scroll-down-or-previous-url'.
+	(w3m-info-like-map): Ditto.
+	(w3m-mode): Ditto.
+	(w3m-scroll-up-or-next-url): New command.
+	(w3m-scroll-down-or-previous-url): Ditto.
+
+	* w3m-namazu.el (w3m-namazu-default-index-customize-spec): New
+	constant.
+	(w3m-namazu-index-alist): Change customize spec.
+	(w3m-namazu-default-index): Ditto.
+	(w3m-namazu-call-process): Change argument spec and followed change of
+	`w3m-namazu-index-alist'.
+	(w3m-about-namazu): Add link information to next or previous results.
+	(w3m-namazu): Stricter checking of arguments.  Encoded index and query.
+
+	* w3m-filter.el (w3m-filter-rules): Add `w3m-filter-google.com'.
+	(w3m-filter-google.com): New function.
+
+2001-08-03  Masayuki Ataka  <ataka@milk.freemail.ne.jp>,
+	    TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-namazu.el (w3m-namazu): Fixed the problem which is reported in
+	[emacs-w3m:01389].
+
+2001-08-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-download-save-directory): Abolished.
+	(w3m-goto-ftp-url, w3m-download): Reverted.  ;; Those last changes were
+	nonsensical.
+
+2001-08-03  Masayuki Ataka  <ataka@milk.freemail.ne.jp>,
+	    TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-namazu.el (w3m-namazu-default-index): Changed customize spec.
+	(w3m-namazu): Follow change of `w3m-namazu-default-index'.
+
+2001-08-03  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-toggle-inline-images): Display "Showing images..."
+	message only when there is at least one inline image.
+	(w3m-current-post-data): New buffer local variable.
+	(w3m-current-referer): Ditto.
+	(w3m-goto-url): Set up `w3m-current-post-data' and
+	`w3m-current-referer'.
+	(w3m-reload-this-page): Process post-data and referer.
+
+2001-08-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-download-save-directory): New user option.
+	(w3m-goto-ftp-url, w3m-download): Refer it.
+
+2001-08-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-antenna.el (w3m-antenna-shutdown): Don't specify a coding-system
+	to `w3m-save-list'.
+	(w3m-antenna-setup): Don't specify a coding-system to `w3m-load-list'.
+	(w3m-antenna-file-coding-system): Abolished.
+
+	* w3m.el (w3m-arrived-shutdown): Don't specify a coding-system to
+	`w3m-save-list'.
+	(w3m-arrived-shutdown, w3m-arrived-setup): Don't specify a
+	coding-system to `w3m-load-list'.
+	(w3m-save-list): Made the arg `coding-system' optional; refer to
+	`w3m-file-coding-system' by default; insert the file magic in the
+	beginning of a file.
+	(w3m-load-list): Made the arg `coding-system' optional; refer to
+	`w3m-file-coding-system-for-read' by default.
+	(w3m-arrived-file-coding-system): Abolished.
+	(w3m-file-coding-system-for-read): New variable.
+	(w3m-file-coding-system): New user option.
+
+2001-08-02  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-arrived-user-alist): Rename from w3m-arrived-user-list.
+	(w3m-process-realm): New variable.
+	(w3m-exec-process): Bind w3m-process-realm to nil.  Call
+	w3m-exec-set-user() for the certification.
+	(w3m-exec-get-user): Rewrite.
+	(w3m-exec-set-user): New function.
+	(w3m-get-server-root): Ditto.
+	(w3m-exec-filter): Support a pair of 'rootserver' and 'realm'.
+
+2001-08-02  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-form.el (w3m-form-make-form-data): Fixed typo.
+	(w3m-form-input-file): Rewrite.
+	(w3m-fontify-forms): Parse hseq attribute as well; Changed textarea
+	properties.
+	(w3m-form-text-chop): New function.
+	(w3m-form-input-textarea-hseq): New buffer local variable.
+	(w3m-form-input-textarea-name): Eliminated.
+	(w3m-form-input-textarea-set): Use `w3m-form-textarea-info',
+	`w3m-form-textarea-replace' and `w3m-form-input-textarea-hseq'.
+	(w3m-form-input-textarea): Use `w3m-form-textarea-info'; Adjust cursor
+	line at start time.
+	(w3m-form-textarea-replace): New function.
+	(w3m-form-textarea-info): Ditto.
+
+2001-08-02  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-add-referer): New option.
+	(w3m-goto-url): When `w3m-add-referer' equals nil, no reference
+	information is given to `w3m-exec'.
+
+	* README, README.ja: Update documents for required version of w3m.
+
+	* w3m-0.2.1-mnc.patch: Removed.
+
+	* w3m.el (TOP): Add autoload for w3m-namazu.
+
+	* w3m-namazu.el: New file.
+
+2001-08-01  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-w3m-retrieve): Bind coding-system-for-write as 'binary.
+
+	* w3m-form.el (w3m-form-make-form-data): New function.
+	(w3m-form-make-form-urlencoded): Eliminated.
+	(w3m-fontify-forms): Added 'file' input processing.
+	(w3m-form-input-file): New function.
+	(w3m-form-input-textarea-keymap): Bind "\C-c\C-k" as well.
+	(w3m-form-input-select-keymap): Ditto.
+	(w3m-form-input-map-keymap): Ditto.
+	(w3m-form-submit): Call `w3m-form-make-form-data' instead of
+	`w3m-form-make-form-urlencoded'.
+
+2001-07-31  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el: Applied patch [emacs-w3m: 01330].
+	(w3m-exec-filter): Changed regexp for authentication realm.
+
+	* w3m.el (w3m-toggle-inline-images): Set `referer' argument of
+	`w3m-create-image'.
+
+	* w3m-e21.el (w3m-create-image): Added argument `referer'.
+
+	* w3m-xmas.el (w3m-create-image): Ditto.
+
+	* w3m-form.el (w3m-form-submit): Set `referer' argument of
+	w3m-goto-url.
+
+	* w3m.el (w3m-w3m-retrieve): Make a temporary file for POST; Use
+	-header option to specify Content-Type: field.
+	(w3m-w3m-retrieve): Added argument `referer'; Add -header option to
+	specify Referer: field.
+	(w3m-retrieve): Added argument `referer'.
+	(w3m-exec): Ditto.
+	(w3m-goto-url): Ditto.
+	(w3m-view-this-url): Set `referer' argument of w3m-goto-url.
+
+2001-07-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-make-help-echo): For FSF Emacs 21, specify the third
+	argument of `get-text-property' where the buffer is to be checked; for
+	XEmacs, make it not to work if the buffer is not focused.
+	(w3m-make-balloon-help): Make it not to work if the buffer is not
+	focused.
+
+2001-07-27  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-form.el (w3m-form-parse-forms): Fixed for initial value in the
+	textarea.
+
+2001-07-27  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-form.el (w3m-form-input-textarea-exit): New function.
+	(w3m-form-input-select-exit): Ditto.
+	(w3m-form-input-map-exit): Ditt.
+	(w3m-form-input-textarea-keymap): Add key for 'exit'.
+	(w3m-form-input-select-keymap): Ditto.
+	(w3m-form-input-map-keymap): Ditto.
+	(w3m-form-input-textarea-mode): Modify doc-string.
+	(w3m-form-input-select-mode): Ditto.
+	(w3m-form-input-map-mode): Ditto.
+	(w3m-form-input-select-set-mouse): Add doc-string.
+	(w3m-form-input-map-set-mouse): Ditto.
+
+2001-07-26  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-x-moe-decode-buffer): Use 'w3m-coding-system' instead of
+	'euc-jp.
+	(w3m-w32-browser-with-fiber): Ignore process output.
+
+	* w3m-form.el (w3m-form-mouse-face): New user option.
+	(w3m-form-input-select): Add mouse-face.
+	(w3m-form-input-map): Ditto.
+
+	* mew-w3m.el (toplevel): Require 'cl, when byte-compile.
+	(mew-mime-text/html-w3m): Guess charset with the use of the Mew's
+	funcion and use its charset, if executed a combination of Mew Ver.2 and
+	w3m-m17n.
+
+2001-07-25  NAKAGAWA Takayuki  <tknakaga@kanagawa.hitachi.co.jp>
+
+	* w3m.el (w3m-fontify-anchors): Don't delete trailing whitespaces,
+	etc. from anchors.
+
+2001-07-19  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-form.el (w3m-form-parse-forms): Support the USEMAP attribute of
+	the IMG element.
+	(w3m-fontify-forms): Ditto.
+	(w3m-form-input-textarea-wincfg): New buffer local variable.
+	(w3m-form-input-select-wincfg): Ditto.
+	(w3m-form-input-textarea): Save the configuration of current window.
+	Guard error of the minimum height of window.
+	(w3m-form-input-select): Ditto.
+	(w3m-form-input-textarea-set): Restore the configuration of window.
+	(w3m-form-input-select-set): Ditto.
+	(w3m-form-input-map-buffer-lines): New user option.
+	(w3m-form-input-map-mode-hook): Ditto.
+	(w3m-form-input-map-set-hook): Ditto.
+	(w3m-form-input-map-keymap): New keymap.
+	(w3m-form-input-map-buffer): New buffer local variable.
+	(w3m-form-input-map-wincfg): Ditto.
+	(w3m-form-input-map-set): New function.
+	(w3m-form-input-map-mode): Ditto.
+	(w3m-form-input-map): Ditto.
+	(w3m-form-input-select-keymap): Added mouse operation.
+	(w3m-form-input-map-keymap): Ditto.
+	(w3m-form-input-select-set-mouse): New function.
+	(w3m-form-input-map-set-mouse): Ditto.
+
+2001-07-18  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-submit): New defmacro.
+	(w3m-mouse-view-this-url): Handle the action of form tag.
+	(w3m-submit-form): New function, submit the form.
+	(w3m-lynx-like-map): Add w3m-submit-form().
+	(w3m-info-like-map): Ditto.
+	(w3m-mode): Modify doc-string.
+
+	* w3m-form.el (w3m-fontify-forms): Add 'w3m-submit property on all tags
+	except the "reset".
+
+2001-07-18  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-w3m-retrieve): Added argument `post-data'.
+	(w3m-w3m-retrieve): Add -post and -post_ct to `w3m-command-arguments'
+	when `post-data' is specified.
+	(w3m-retrieve): Added argument `post-data'.
+	(w3m-exec): Ditto.
+	(w3m-goto-url): renamed `post-body' to `post-data'.  Don't bind
+	w3m-command-arguments here.
+
+2001-07-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-w3m-dump-source, w3m-w3m-dump-head-source,
+	w3m-local-dirlist-cgi): Say where the url is being connected to.
+
+	* w3mhack.el (w3mhack-compile): Changed message convention.
+	* w3m.el (w3m-view-source, w3m-rendering-region, w3m-w3m-dump-source,
+	w3m-w3m-dump-head-source, w3m-w3m-get-header, w3m-local-dirlist-cgi,
+	w3m-fontify): Ditto.
+	* w3m-e21.el (w3m-setup-header-line): Ditto.
+	* w3m-dtree.el (w3m-about-dtree): Ditto.
+	* w3m-bookmark.el (w3m-bookmark-add-current-url,
+	w3m-bookmark-add-this-url, w3m-bookmark-add-this-url): Ditto.
+	* mime-w3m.el (mime-w3m-mouse-view-this-url): Ditto.
+
+	* w3m.el (w3m-gohome, w3m-convert-ftp-url-for-emacsen,
+	w3m-goto-mailto-url, w3m-edit-current-url, w3m-external-view,
+	w3m-local-dirlist-cgi, w3m-toggle-inline-images, w3m-parse-attributes):
+	Changed error message convention.
+	* w3m-hist.el (w3m-history-add-arrived-db, w3m-history-rename-url,
+	w3m-history-remove-properties, w3m-history-add-properties,
+	w3m-history-plist-put, w3m-history-plist-get): Ditto.
+	* w3m-bookmark.el (w3m-bookmark-add, w3m-bookmark-write-file): Ditto.
+
+2001-07-16  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-mbconv-command): New customize variable.
+	(w3m-decode-buffer): If charset equal 'x-moe-internal', call
+	w3m-x-moe-decode-buffer().
+	(w3m-x-moe-decode-buffer): New funcion. A coding-system of buffer
+	converts 'x-moe-internal' to usual coding-system for emacsen.
+
+	* w3m-form.el (w3m-form-parse-region): If charset equal
+	'x-moe-internal', call w3m-x-moe-decode-buffer().
+	(w3m-form-parse-forms): Handles value of 'charset', if w3m-type eq
+	'w3mmee.
+
+2001-07-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-byte-optimize-letX): Remove `pop-up-frame-alist'
+	when compiling.
+
+	* w3m.el (w3m): Use the new macros; set the value of
+	`w3m-initial-frame' in the popped up frame.
+	(w3m-close-window): Use `w3m-delete-frame-maybe'.
+	(w3m-quit): Use `w3m-delete-frame-maybe'.
+	(w3m-delete-frame-maybe): New function.
+	(w3m-copy-buffer): Pop up a new frame if `w3m-pop-up-frames' is
+	non-nil; set the value of `w3m-initial-frame' in the new frame.
+	(w3m-popup-frame-p): New macro.
+	(w3m-pop-up-frame-parameters): New macro.
+	(w3m-initial-frame): New internal variable.
+
+	* w3m-xmas.el (w3m-setup-header-line): Use text-properties instead of
+	the raw extents for highlighting a header line.
+
+2001-07-13  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-form.el (w3m-form-new): Added 'charlst' option.
+	(w3m-form-charlst): New macro.
+	(w3m-form-plist): Move a indent of an array.
+	(w3m-form-put): Ditto.
+	(w3m-form-make-form-urlencoded): Remove 'coding' option.  If
+	'accept-charset' denotes within <form> tag, resolve coding-system
+	according to its list of charset.
+	(w3m-form-parse-forms): Handle value of 'accept-charset'.
+
+2001-07-12  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el (w3m-tag-regexp-of): New macro to generate regexp of specified
+	tag(s).
+	(w3m-parse-attributes): Skip spaces before parsing.
+
+	* w3m-form.el (w3m-form-parse-forms): More flexible and simple tag
+	finding using `w3m-tag-regexp-of' macro.
+
+2001-07-12  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-charset-coding-system-alist): Added 'us_ascii'.
+	(w3m-w3m-attributes): Use content of w3m-document-charset: field as
+	charset if exists.
+
+2001-07-12  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-form.el (w3m-form-parse-forms): Parse the tags only within the
+	"<form ..> ... </form>".
+
+2001-07-12  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-remove-redundant-spaces): Don't cause an error when str
+	contains only spaces.
+
+2001-07-12  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* mew-w3m.el: Hand-over of copyright of this file from Goto to
+	Tsuchiya. This is consensual.
+
+2001-07-11  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-rendering-region): Add charset option when call
+	w3m-form-parse-region().
+
+	* w3m-form.el (w3m-form-parse-region): Add charset option.  If w3m-type
+	is 'w3mmee or 'w3m-m17n, forms parse within a decoded temporally
+	buffer.
+	(w3m-form-parse-forms): New function.
+
+2001-07-11  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
+
+	* w3m-form.el (w3m-form-parse-region): Don't extract value from submit
+	button, again.
+	(w3m-form-submit): Don't set value when NAME is omitted.
+
+2001-07-11  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el (w3m-rendering-region): Do not break matching data.
+
+2001-07-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-form.el (w3m-fontify-forms): Put text properties corresponding to
+	form types.
+	(w3m-form-input): Simplify.
+	(w3m-form-input-password): New function.
+	(w3m-form-input-checkbox): Ditto.
+	(w3m-form-input-radio): Ditto.
+	(w3m-form-input-textarea): Follow changes in `w3m-form-input'.
+	(w3m-form-input-select): Ditto.
+
+2001-07-11  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m-form.el (w3m-form-goto-next-field): New function.
+	(w3m-form-make-form-urlencoded): Refine to support value of check-box
+	type which is list of value string.
+	(w3m-form-parse-region): Support CHECKBOX type and RADIO type. Note
+	that CHECKBOX type has multiple values.
+	(w3m-fontify-forms): Use new property 'w3m-form-field-id to identify
+	each field to support RADIO type item. Also removed value putting code
+	because values are already set in parsing.
+	(w3m-form-input): Support action for CHECKBOX and RADIO type field.
+
+	* w3m.el (w3m-url-encode-string): Encode SPACE(0x20) as "+".
+	(w3m-rendering-region): Decode entities in title string.
+
+2001-07-10  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-w3m-attributes): Fixed problem when charset is quoted.
+
+	* w3m-form.el (w3m-form-parse-region): Don't extract value from submit
+	button.
+	(w3m-form-submit): If ACTION is not specified, send data to current
+	url.
+	(w3m-form-make-get-string): Removed.
+
+2001-07-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el: Bind `:bool' for old Emacsen.
+
+2001-07-10  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el (w3m-parse-attributes): Support :bool type attribute.
+
+	* w3m-form.el (w3m-form-parse-region): Use :bool type for SELECTED
+	attribute of OPTION tag.
+
+2001-07-09  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-form.el (w3m-form-make-form-urlencoded): If second value of plist
+	is consp, use car value (for select).
+	(w3m-form-parse-region): Don't parse type attribute for textarea;
+	Process select.
+	(w3m-fontify-forms): Save value and name for submit.
+	(w3m-form-replace): Added optional argument `invisible'.
+	(w3m-form-input): Process SELECT and PASSWORD.
+	(w3m-form-input-select-buffer-lines): New user option.
+	(w3m-form-input-select-mode-hook): Ditto.
+	(w3m-form-input-select-set-hook): Ditto.
+	(w3m-form-input-select-keymap): New keymap.
+	(w3m-form-input-select-buffer): New buffer local variable.
+	(w3m-form-input-select-form): Ditto.
+	(w3m-form-input-select-name): Ditto.
+	(w3m-form-input-select-point): Ditto.
+	(w3m-form-input-select-candidates): Ditto.
+	(w3m-form-input-select-set): New function.
+	(w3m-form-input-select-mode): Ditto.
+	(w3m-form-input-select): Ditto.
+	(w3m-form-submit): Added optional argument name and value.
+
+	* w3m.el (w3m-remove-comments): New function.
+	(w3m-rendering-region): Call it.
+
+2001-07-06  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-form.el (w3m-form-default-coding-system): Changed default value
+	to shift_jis.
+	(w3m-form-make-form-urlencoded): Removed redundant local variable.
+
+	* w3m.el (w3m-url-encode-string): Encode newline as "%0D%0A"
+
+	* w3m-form.el (w3m-form-default-coding-system): New user option.
+	(w3m-form-make-form-urlencoded): Use it.
+	(w3m-form-input-textarea-set): Get values of buffer local variables
+	before changing buffer.
+	(w3m-form-input-textarea): Set values of buffer local variables after
+	changing buffer.
+
+2001-07-06  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-form.el (comment): Modify URI of emacs-w3m.
+	(w3m-form-input-textarea-mode-hook): New user option.
+	(w3m-form-input-textarea-point): New buffer local variable.
+	(w3m-form-input-textarea-set): Run 'w3m-form-input-textarea-set-hook'
+	hook first.  Get 'w3m-buffer' from input buffer.  Go to the point of
+	the orignal form when switch to 'w3m-buffer'.
+	(w3m-form-input-textarea): Save original point to
+	'w3m-form-input-textarea-point'.  Set 'w3m-form-input-textarea-buffer'
+	within the buffer of the input area.
+
+	* w3m.el (w3m-about): Modify URI of emacs-w3m.
+	* w3m-xmas.el (comment): Ditto.
+	* w3m-weather.el (comment): Ditto.
+	* w3m-search.el (comment): Ditto.
+	* w3m-om.el (comment): Ditto.
+	* w3m-macro.el (comment): Ditto.
+	* w3m-e21.el (comment): Ditto.
+	* w3m-e20.el (comment): Ditto.
+	* w3m-dtree.el (comment): Ditto.
+	* w3m-bookmark.el (comment): Ditto.
+	* w3m-antenna.el (comment): Ditto.
+
+2001-07-05  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-0.2.1-mnc.patch: Added [-post body] option.
+
+	* w3m.el (w3m-url-encode-string): Don't cause an error when str is nil.
+	(w3m-goto-url): Added post-body argument; Set -post option if post-body
+	is specified.
+
+	* w3m-form.el (w3m-form-make-form-urlencoded): New function.
+	(w3m-form-make-get-string): Use `w3m-form-make-form-urlencoded'.
+	(w3m-form-parse-region): Add textarea processing.
+	(w3m-form-replace): Delete newline characters.
+	(w3m-form-input): Added textarea processing.
+	(w3m-form-submit): If form method is POST, then set post-body argument
+	of `w3m-goto-url'.
+	(w3m-form-input-textarea-buffer-lines): New user option.
+	(w3m-form-input-textarea-mode-hook): Ditto.
+	(w3m-form-input-textarea-keymap): New keymap.
+	(w3m-form-input-textarea-buffer): New buffer local variable.
+	(w3m-form-input-textarea-form): Ditto.
+	(w3m-form-input-textarea-name): Ditto.
+	(w3m-form-input-textarea-set): New function.
+	(w3m-form-input-textarea-mode): Ditto.
+	(w3m-form-input-textarea): Ditto.
+
+2001-06-29  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* mime-w3m.el (mime-w3m-preview-text/html): Search xref in the root
+	entitiry.
+
+2001-06-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-version): Bind `print-level' and `print-length'
+	to nil.
+	(w3mhack-examine-modules): Ditto.
+	* w3m.el (w3m-rendering-region): Ditto.
+	* w3m-form.el (w3m-form-submit): Ditto.
+
+2001-06-12  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el: Added support code for w3m-m17n.
+	(w3m-type): Add new candidate.
+	(w3m-command, w3m-input-coding-system, w3m-output-coding-system)
+	(w3m-halfdump-command-arguments): Add default value for w3m-m17n.
+	(w3m-exec) [w3m-m17n]: No call `w3m-decode-buffer'.
+	(w3m-region) [w3m-m17n]: No call `encode-coding-region'.
+
+2001-06-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-dump-head-source-command-argument): Its old name is
+	`w3m-dump-head-source-command-arguments'.
+
+2001-06-11  Mito  <mit@nines.nec.co.jp>
+
+	* w3m.el (w3m-broken-proxy-cache): New variable.
+	(w3m-dump-head-source-command-arguments): Defined as list.
+	(w3m-w3m-retrieve): Cache on proxy server isn't used when neither
+	`no-cache' nor `w3m-broken-proxy-cache' equal to nil.
+
+2001-06-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-form.el (w3m-form-parse-region): Check the value of
+	`w3m-current-buffer' to avoid wrong type argument error.
+
+	* w3m.el (w3m-rendering-region): Set `w3m-current-buffer' refered in
+	`w3m-form-parse-region'.
+
+2001-06-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-attributes): Remove URL fragments before checking its
+	attributes.
+	(w3m-retrieve): Remove URL fragments before getting its contents.
+	(w3m-w3m-retrieve): Follow changes in `w3m-retrieve'.
+	(w3m-arrived-add): Simplified regular expression.
+	(w3m-parse-attributes): Changed form spec for edebug.
+
+	* w3m-form.el (w3m-form-parse-region): Set `w3m-current-forms' in the
+	buffer `w3m-current-buffer'.
+
+	* mime-w3m.el (mime-w3m-save-background-color): Changed form spec for
+	edebug.
+
+2001-06-09  Kiyokazu SUTO  <suto@ks-and-ks.ne.jp>,
+	    TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-fontify-anchors): Process w3m internal tag `<_id>' which
+	represents ID properties.
+
+2001-06-08  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-w3m-retrieve): Remove URL's fragment before checking
+	cache.
+
+2001-06-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-unoptimize-animated-gif): Truncate an animated gif
+	to have only one frame when the size is larger than the value of
+	`w3m-animated-gif-maximum-size'.
+	(w3m-animated-gif-maximum-size): New variable.
+
+2001-06-06  Kenichi OKADA  <okada@opaopa.org>
+
+	* w3m-xmas.el: Require `path-util'.
+
+2001-06-07  NAKAJIMA Mikio <minakaji@osaka.email.ne.jp>
+
+	* w3m.el (w3m-exec-process): Replace `delete' with `delq'.
+
+2001-06-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-toolbar): Use the English language when the value of the
+	variable `current-language-environment' is not "Japanese".
+
+2001-06-04  Pavel Janik  <Pavel@Janik.cz>
+
+	* w3m.el (w3m-about-db-history): Fix typo Titile -> Title.
+
+2001-06-01  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-halfdump-command-arguments): Changed default value to
+	"-dump=half-buffer" when w3m-type equal 'w3mmee.
+
+2001-05-31  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-om.el (iso-2022-7bit): New coding-system generated by copying
+	from `*iso-2022-jp*'.
+
+2001-05-31  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-coding-system): Changed default value to 'iso-2022-7bit.
+	(w3m-input-coding-system): Ditto.
+
+2001-05-31  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-dtree.el (w3m-dtree-create): Insert 'Meta tag' to the binding of
+	charset.
+
+	* w3m.el (w3m-local-dirlist-cgi): Fix charset handling.
+
+2001-05-30  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-file-name-coding-system): New customizable value.
+	(w3m-charset-coding-system-alist): Reverse list.
+	(w3m-dirlist-cgi-program): Change default value for OS/2.
+	(w3m-local-dirlist-cgi): Set "QUERY_STRING" to encoded string of
+	'w3m-file-name-coding-system'. Insert 'Meta tag' to the binding of
+	charset.
+
+2001-05-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-goto-url): Set a string representing file interpreted as
+	a directory to `default-directory'.
+	(w3m-about-source): Call `w3m-decode-buffer'.
+
+2001-05-29  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-decode-buffer): Allow `detect-coding-region' to return
+	both a coding-system and a list of coding-systems.
+
+2001-05-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (XEmacs): Require `byte-optimize' expressly before
+	advising the function `byte-optimize-form-code-walker'.
+
+2001-05-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-hist.el (w3m-history-rename-url): Don't use `with-current-buffer'
+	for old Emacsen.
+	(w3m-history-copy): Ditto.
+	(w3m-history-share-properties): Ditto.
+	(w3m-history-seek-properties): Ditto.
+
+2001-05-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* Makefile.in (slow): New rule for the developers to check a
+	portability for each module.
+	* w3m-xmas.el (w3m-cache-unoptimized-gif-images): Fix typo.
+
+2001-05-26  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-local-directory-view-method): Modify default value.
+	(w3m-direlist-cgi-program): New variable.
+	(w3m-local-retrieve): Call w3m-local-dirlist-cgi() when local
+	directory.
+	(w3m-local-dirlist-cgi): New function. Execute either 'w3m' or
+	'direlist.cgi'.
+	(w3m-goto-url-localcgi-movepoint): Use 'w3m-name-anchor instead of
+	'patter-matching'.
+	(w3m-url-completion): Handling drive letter for any broken OSes.
+
+	* w3m-dtree.el (w3m-dtree-stop-strings): Add a new alternative.
+
+2001-05-26  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-decode-buffer): Removed reference of `w3m-coding-system'.
+
+2001-05-25  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-dtree.el (w3m-dtree-directory-depth): New variable.
+	(w3m-dtree-stop-strings): Ditto.
+	(w3m-dtree-create-sub): Add new arugument 'depth'. Stop recursive call,
+	if directory-depth over the 'w3m-dtree-directory-depth'.
+
+2001-05-25  NAKAGAWA Takayuki <tknakaga@kanagawa.hitachi.co.jp>
+
+	* w3m-dtree.el (w3m-dtree-create-sub): To avoid infinite recusion,
+	directory-files now returns absolute file names and expand-file-name is
+	omitted.
+
+2001-05-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-about-history): Get the values of `w3m-current-url' and
+	`w3m-history-flat' from the buffer `w3m-current-buffer'.
+	(w3m-goto-url): Set the value of `w3m-current-buffer' as the current
+	buffer.
+	(w3m-current-buffer): New internal variable.
+
+2001-05-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-examine-modules): Made it to return w3m-macro.elc
+	and the version specific module first.
+
+	* w3m.el (w3m-setup-menu): Define it if the feature `xemacs' is not
+	provided.
+	(TopLevel): Don't bind the functions `w3m-display-inline-image-p',
+	`w3m-display-graphic-p', `w3m-update-toolbar', `w3m-setup-toolbar',
+	`w3m-image-type-available-p', `w3m-insert-image' and
+	`w3m-create-image'.
+	(w3m-get-buffer-create, w3m-add-text-properties, w3m-with-work-buffer):
+	Moved to w3m-macro.el.
+	(w3m-charset-coding-system-alist): Use `w3m-find-coding-system'
+	directly.
+	(w3m-find-coding-system): Moved to the version specific modules.
+	(w3m-static-cond, w3m-static-if): Moved to w3m-macro.el.
+	(TopLevel): Require `w3m-e20' when the version of the running Emacs is
+	neither XEmacs, Emacs 21 nor Mule2.
+	(TopLevel): Require `w3m-macro'.
+
+	* w3m-xmas.el (w3m-euc-japan-decoder): Define it when the function
+	`ccl-compile-write-multibyte-character' is bound.
+	(widget-coding-system-action): Use `eval' instead of the funcall'ing
+	for the function `widget-coding-system-prompt-value'.  It is only for
+	avoiding a byte-compile warning.
+	(w3m-should-unoptimize-animated-gifs): Check for both
+	`emacs-patch-level' and `emacs-beta-version' when XEmacs 21.2 is
+	running.
+	(TopLevel): Bind the functions `w3m-image-type' and `w3m-retrieve' when
+	compiling.
+	(TopLevel): Bind the variables `w3m-current-url',
+	`w3m-display-inline-image', `w3m-icon-directory', `w3m-menubar',
+	`w3m-toolbar', `w3m-toolbar-buttons', `w3m-use-header-line' and
+	`w3m-work-buffer-name' when compiling.
+	(TopLevel): Don't require `w3m'.
+	(TopLevel): Provide the feature `w3m-xmas' in the end of the file.
+
+	* w3m-om.el (read-passwd): Enclose it with `eval-and-compile'.
+	(w3m-find-coding-system): New inline function moved from w3m.el.
+	(w3m-display-inline-image-p, w3m-display-graphic-p, w3m-update-toolbar,
+	w3m-setup-toolbar, w3m-image-type-available-p, w3m-insert-image,
+	w3m-create-image): Alias to `ignore'.
+	(TopLevel): Bind the variables `w3m-menubar' and `w3m-mode-map' when
+	compiling.
+	(TopLevel): Don't require `w3m'.
+	(TopLevel): Provide the feature `w3m-om' in the end of the file.
+
+	* w3m-macro.el: New file which currently contains
+	`w3m-get-buffer-create', `w3m-add-text-properties',
+	`w3m-with-work-buffer', `w3m-static-cond' and `w3m-static-if'.
+
+	* w3m-e21.el (w3m-update-toolbar): Alias to `ignore'.
+	(w3m-find-coding-system): New inline function moved from w3m.el.
+	(TopLevel): Bind the functions `w3m-image-type' and `w3m-retrieve' when
+	compiling.
+	(TopLevel): Bind the variables `w3m-work-buffer-name',
+	`w3m-use-header-line', `w3m-toolbar-buttons', `w3m-toolbar',
+	`w3m-mode-map', `w3m-icon-directory' and `w3m-display-inline-image'
+	when compiling.
+	(TopLevel): Don't require `w3m'; require `w3m-macro'.
+	(TopLevel): Provide the feature `w3m-e21' in the end of the file.
+
+	* w3m-e20.el: New file.
+
+2001-05-25  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-expand-file-name-as-url): Remove handling
+	'about://dtree'.
+	(w3m-local-content-type): Ditto.
+	(w3m-url-local-p): Ditto.
+	(w3m-local-directory-view-method): New variable.
+	(w3m-local-retrieve): If url is directory, call w3m by way of kick
+	'dirlist.cgi'
+	(w3m-url-dtree-p): New defsubst.
+	(w3m-edit-current-url, w3m-edit-this-url): Use w3m-url-dtree-p().
+	(w3m-goto-url-localcgi-movepoint): New function.
+	(w3m-goto-url): If URL is a local directory, check and change URL by
+	the use of 'w3m-local-directory-view-method'.  If URL type is a local
+	cgi, move to its directory point.
+
+2001-05-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-euc-japan-decoder): Check if `emacs-major-version'
+	is 21 instead of 20 and check for `emacs-beta-version' instead of
+	`emacs-patch-level'.
+	(w3m-should-unoptimize-animated-gifs): Ditto.
+
+2001-05-25  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-xmas.el (w3m-euc-japan-decoder): Fix typo.
+
+2001-05-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-euc-japan-decoder): Don't check for the constant
+	`emacs-patch-level' when the beta versions of XEmacs is running.
+
+2001-05-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-euc-japan-decoder): Not define when it has been already
+	defined.
+
+	* w3m-xmas.el (w3m-euc-japan-decoder): Define when XEmacs whose version
+	is greater than 21.2.19 is used.
+
+2001-05-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el: Modify messages in `w3m-view-header', `w3m-view-source',
+	`w3m-edit-this-url', `w3m-print-this-url', `w3m-download-this-url',
+	`w3m-view-current-url-with-external-browser', `w3m-save-image',
+	`w3m-view-image', `w3m-mouse-view-this-url', `w3m-view-this-url' and
+	`w3m-search-name-anchor'.
+
+	* w3m.el (w3m-toggle-inline-images): Signal an error when the function
+	`w3m-display-graphic-p' returns nil.
+	(w3m-display-graphic-p): Alias to `ignore' by default.
+	(w3m-menubar): Disable a menu button "Toggle Images" when the function
+	`w3m-display-graphic-p' returns nil.
+	* w3m-xmas.el (w3m-display-graphic-p): Alias to
+	`device-on-window-system-p'.
+	* w3m-e21.el (w3m-display-graphic-p): Alias to `display-graphic-p'.
+
+2001-05-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-find-coding-system): New function to replace
+	`find-coding-system'.
+	(w3m-charset-to-coding-system): Use `w3m-find-coding-system'.
+	(make-ccl-coding-system): Removed.
+	(toplevel) [emacs20, emacs21]: Removed dependency on `pccl'.
+
+2001-05-24  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (toplevel): Fix condition for (require 'pccl).
+
+2001-05-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-charset-to-coding-system): Simplified.
+	(make-ccl-coding-system) [XEmacs, Mule]: Removed.
+
+2001-05-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-region): Use `w3m-display-inline-image-p'.
+	(w3m-goto-url): Ditto.
+	(w3m-display-inline-image-p): New function.
+	* w3m-xmas.el (w3m-display-inline-image-p): New function.
+	* w3m-e21.el (w3m-display-inline-image-p): New function.
+
+2001-05-24  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (toplevel): Define make-ccl-coding-system() myself, when
+	failed (require 'pccl).
+
+2001-05-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m): Made it can be called non-interactively or a batch job.
+
+	* w3m.el (w3m-goto-url): Add autoload magic cookie.
+	* w3m-weather.el (w3m-about-weather, w3m-weather): Ditto.
+	* w3m-search.el (w3m-search): Ditto.
+	* w3m-form.el (w3m-fontify-forms, w3m-form-parse-region): Ditto.
+	* w3m-filter.el (w3m-filter): Ditto.
+	* w3m-dtree.el (w3m-dtree, w3m-about-dtree): Ditto.
+	* w3m-bookmark.el (w3m-bookmark-view, w3m-bookmark-add-current-url,
+	w3m-bookmark-add-this-url): Ditto.
+	* w3m-antenna.el (w3m-antenna, w3m-about-antenna): Ditto.
+	* mime-w3m.el (mime-w3m-preview-text/html): Ditto.
+
+2001-05-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-coding-system): Changed default value to
+	'iso-2022-7bit-ss2.
+	(w3m-terminal-coding-system): New user option.
+	(w3m-attributes): When URL whose scheme equals to `about' is specified,
+	returns `w3m-coding-system' as its content-charset.
+	(w3m-exec-process): Refer `w3m-terminal-coding-system'.
+	(w3m-decode-buffer): Decode buffer everywhen it is called.
+	(w3m-about-retrieve): New function.
+	(w3m-cid-retrieve): Ditto.
+	(w3m-retrieve): Call `w3m-about-retrieve' and `w3m-cid-retrieve'.
+	(w3m-rendering-region) [w3mmee]: No call `encode-coding-region'.  Fix
+	coding-system spec error for Mule-2.3.
+	(w3m-rendering-region): Simplified.
+	(w3m-region) [w3mmee]: Encode this buffer as unibyte representation.
+	(w3m-about-history): No call `w3m-with-work-buffer'.
+	(w3m-about-db-history): Ditto.
+
+	* w3m-dtree.el (w3m-about-dtree): Ditto.
+
+	* w3m-weather.el (w3m-about-weather): Call `w3m-decode-buffer'.
+
+2001-05-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m): Popup a new frame if there is neither a window nor a
+	frame associated with w3m and `w3m-pop-up-frames' is non-nil; refer to
+	`w3m-pop-up-frame-parameters' when creating a new w3m frame.
+	(w3m-pop-up-frame-parameters): New user option which allows a kludge
+	that it can be either an alist or a plist.
+	(w3m-pop-up-frames): New user option.
+
+	* w3m-e21.el (w3m-setup-header-line): Replace "%" with "%%" in an url
+	string.
+
+2001-05-23  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-read-coding-system): Removed.
+	(w3m-process-environment): New variable.
+	(w3m-input-coding-system): Changed default value.
+	(w3m-output-coding-system) [w3mmee]: Changed default value.
+	(w3m-arrived-add-1): Changed argument spec.
+	(w3m-arrived-add): Ditto.
+	(w3m-arrived-coding-system): Removed.
+	(w3m-arrived-content-charset): New function.
+	(w3m-arrived-setup): Changed arrived file format to keep
+	content-charset instead of coding-system.
+	(w3m-arrived-shutdown): Ditto.
+	(w3m-exec-process): Refer `w3m-process-environment' to set environments
+	for sub-processes.
+	(w3m-decode-encoded-contents): Ditto.
+	(w3m-coding-system-to-charset): Removed.
+	(w3m-read-content-charset): New function.
+	(w3m-decode-buffer): Changed argument spec.  Process this buffer if and
+	only if it's represented in unibyte.
+	(w3m-rendering-region): Reconstruced.
+	(w3m-exec): Changed argument spec and followed the change of
+	`w3m-decode-buffer'.
+	(w3m-goto-url): Changed argument spec and followed the change of
+	`w3m-exec'.
+	(w3m-redisplay-with-coding-system): Removed.
+	(w3m-redisplay-with-charset): New command to replace
+	`w3m-redisplay-with-coding-system'.
+	(w3m-region): No call `encode-coding-region'.
+	(w3m-about-history): Ditto.
+	(w3m-about-db-history): Ditto.
+
+	* w3m-antenna.el (w3m-about-antenna): No call `encode-coding-region'.
+
+	* w3m-dtree.el (w3m-about-dtree): Ditto.
+
+	* w3m-om.el (w3m-read-coding-system): Removed.
+	(coding-system-list): New function.
+
+2001-05-23  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-expand-file-name-as-url): If file is directory, expand to
+	use 'about://dtree'.
+	(w3m-local-content-type): If url is directory or 'about://dtree/",
+	return "text/html" type.
+	(w3m-goto-url): If URL is local and directory, change URL 'file://' to
+	'about://dtree'.
+	(w3m-halfdump-command): New variable.
+	(w3m-halfdump-command-arguments): Change to defvar.
+	(w3m-halfdump-command-common-arguments): New constant, common arguments
+	for 'halfdump' execution of all w3m variants.
+	(w3m-rendering-region): Use 'w3m-halfdump-command' if setted. Change
+	call process arguments.
+	(w3m-lynx-like-map): Add w3m-gohome() keybind.
+	(w3m-info-like-map): Add w3m-dtree() and w3m-edit-this-url()
+	keybind. Use w3m-gohome() instead of lamda expression.
+	(w3m-mode): Modify doc-string.
+
+	* w3m-dtree.el (w3m-about-dtree): Modify message.
+
+2001-05-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-unoptimize-animated-gif): New function which is
+	separated from `w3m-create-image'; improve a way to check whether a
+	data should be unoptimized or not.
+	(w3m-create-image): Use it.
+
+2001-05-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-create-image): Attempt to extract the first frame of
+	an animated gif when the unoptimization is failed.
+
+2001-05-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-add-text-properties): Don't specify `end-open' nor
+	`front-nonsticky' that are the default.
+	(w3m-emacs-w3m-icon): Colorized.
+
+2001-05-22  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-cache-contents): Don't insert additional '\n' for binary
+	data.
+
+2001-05-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el: Don't make the coding-system `w3m-euc-japan' if it already
+	exists to make w3m.el reloadable in Emacs 20.
+
+2001-05-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-about): Put an icon image as about://emacs-w3m.gif.
+	(w3m-retrieve): Make an exception of about://emacs-w3m.gif.
+	(w3m-attributes): Ditto.
+	(w3m-emacs-w3m-icon): New constant for about://emacs-w3m.gif.
+
+2001-05-22  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-region): Call w3m-render-region for the region from
+	`point-min' to `point-max' because buffer is already narrowed.
+
+2001-05-22  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* mew-w3m.el (mew-mime-text/html-w3m): Fix condition when
+	mew-mime-text/html() call, again. Avoid byte-compile warning when
+	compiling.
+
+2001-05-21  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Add support code of w3mmee.  Reorganaized codes to handle
+	content types and coding systems which are specified by user.
+	(toplevel): Require 'pccl.
+	(w3m-type): New user option.
+	(w3m-mnc): Removed user option.
+	(w3m-linefeed-type): Removed variable.
+	(w3m-dump-head-source-option): Ditto.
+	(w3m-decode-all-to-this-charset): Ditto.
+	(w3m-halfdump-option): Ditto.
+	(w3m-halfdump-expand-options): Ditto.
+	(w3m-extended-characters-table): Ditto.
+	(w3m-command): Refer `w3m-type' to decide default value.
+	(w3m-command-arguments): Ditto.
+	(w3m-output-coding-system): Changed default value to `w3m-euc-japan'.
+	(w3m-profile-directory): Refer `w3m-command' to decide default value.
+	(w3m-default-save-directory): Ditto.
+	(w3m-dump-head-source-command-arguments): New constant.
+	(w3m-halfdump-command-arguments): Refer `w3m-type' to decide default
+	value.
+	(w3m-arrived-add-1): Add an argument `content-type'.
+	(w3m-arrived-add): Likewise and follow change of `w3m-arrived-add-1'.
+	(w3m-arrived-coding-system): Strict checking of return value.
+	(w3m-arrived-content-type): New function.
+	(w3m-arrived-setup): Follow change of `w3m-arrived-add'.
+	(w3m-arrived-shutdown): Ditto.
+	(w3m-exec-process): Set process environment to avoid unexpected
+	conversion in Windows.
+	(w3m-charset-to-coding-system): New function.
+	(w3m-decode-encoded-contents): Old name is `w3m-decode-encoded-buffer'.
+	Set process environment to avoid unexpected conversion in Windows.
+	(w3m-local-retrieve). Simplified.
+	(w3m-pretty-length): Removed.
+	(w3m-crlf-to-lf): Removed.
+	(w3m-w3m-dump-head-source): No call `w3m-crlf-to-lf'.
+	(w3m-w3m-dump-source): Ditto.
+	(w3m-w3m-retrieve) Removed optional argument `cs' and simplified.
+	(w3m-retrieve): Ditto.
+	(w3m-decode-extended-characters): Removed.
+	(w3m-euc-japan-decoder): New CCL program.
+	(w3m-euc-japan-encoder): Dummy CCL program.
+	(w3m-euc-japan): New coding system.
+	(w3m-rendering-region): New optional argument `charset' and support
+	codes of `w3mmee' are added.  Handle new defintion style of
+	`w3m-halfdump-command-arguments'.  Refer `w3m-euc-japan' to process
+	outputs of `w3m'.
+	(w3m-exec): Reconstructed.  This accepts new optional argument
+	`content-type'.
+	(w3m-goto-url): Reconstructed to handle files which have unknown
+	cotent-types.
+	(w3m-redisplay-with-coding-system): Simplified.
+	(w3m-find-file): Simplified and optional argument `type' is removed.
+	(w3m-region): Encode output buffer into `w3m-input-coding-system'.
+	(w3m-about-history): Ditto.
+	(w3m-about-db-history): Ditto.
+
+	* w3m-antenna.el (w3m-about-antenna): Encode output buffer into
+	`w3m-input-coding-system'.
+
+	* w3m-dtree.el (w3m-about-dtree): Ditto.
+
+	* mime-w3m.el (mime-w3m-cid-retrieve): Changed spec of arguments.
+
+	* mew-w3m.el (mew-w3m-cid-retrieve): Ditto.
+
+2001-05-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-toggle-inline-images): Message "Showing...".
+
+	* w3m-xmas.el (w3m-create-image): Unoptimize animated GIFs using
+	gifsicle program.
+	(w3m-cache-unoptimized-gif-images-max-length): New variable.
+	(w3m-cache-unoptimized-gif-images): New variable.
+	(w3m-gifsicle-program): New variable.
+	(w3m-should-unoptimize-animated-gifs): New variable.
+
+2001-05-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-fontify): Don't initialize the value of
+	`w3m-cache-underline-faces' here.
+	(w3m-toggle-inline-images): Run the following new hooks instead of to
+	hide/show underlines behind inline images here.
+	(w3m-cache-underline-faces): Variable moved to w3m-e21.el.
+	(w3m-remove-inline-images-after-hook): New hook.
+	(w3m-remove-inline-images-before-hook): New hook.
+	(w3m-show-inline-images-after-hook): New hook.
+	(w3m-show-inline-images-before-hook): New hook.
+
+	* w3m-e21.el: Use `w3m-remove-inline-images-after-hook',
+	`w3m-show-inline-images-after-hook',
+	`w3m-show-inline-images-before-hook' and `w3m-fontify-before-hook' to
+	fix the undesirable feature of Emacs 21 that to show an underline of a
+	text even if it has an image as a text property.
+	(w3m-cache-underline-faces): Variable moved from w3m.el.
+
+2001-05-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-cache-underline-faces): Modified docs that it is for
+	Emacs 21's exclusive use.
+
+2001-05-18  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-dtree.el (w3m-dtree-indent): Remove variable.
+	(w3m-dtree-fancy-display): Ditto.
+	(w3m-dtree-indent-strings): New variable.
+	(w3m-dtree-create-fancy): Remove function.
+	(w3m-dtree-create-sub): Rename function from w3m-dtree-create-fancy()
+	and tiny modified.
+	(w3m-about-dtree): Remove 'fancy style' method.
+
+2001-05-18  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* icons/db-history-up.xpm: Change color.
+
+	* mew-w3m.el (mew-mime-text/html-w3m): Fix condition when
+	mew-mime-text/html() call.
+
+2001-05-18  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-find-file): Improved.
+	(w3m-default-content-type): New user option.
+	(w3m-url-completion): New function.
+	(w3m-input-url): Call `w3m-url-completion' to complete URLs.
+
+2001-05-17  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-find-file): New optional argument, `type' is added.
+
+2001-05-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-hist.el (w3m-history-add-arrived-db): Improve the madness.
+
+	* w3m.el (w3m-about-history): Add small indentation to sub trees.
+
+2001-05-17  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-about-db-history): Modify display format for no folding.
+
+2001-05-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-about-history): New implementation.
+	(w3m-about-history-indent-level): New variable.
+	(w3m-about-history-max-indentation): New variable.
+
+	* icons/history-up.xpm: Replaced a pixmap with a new pattern.
+
+2001-05-16  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-dtree.el (w3m-dtree-default-allfiles): Modify default value.
+	(w3m-dtree-fancy-display): New variable.
+	(w3m-dtree-create-fancy): New function.
+	(w3m-dtree-create-sub): Insert the indicator which directory or file,
+	if allfiles.
+	(w3m-about-dtree): Use fancy style function, if
+	'w3m-dtree-fancy-display' is non-nil.
+
+2001-05-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m): Use existing frame or window.
+
+2001-05-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-dtree.el (w3m-dtree-create): Fix HTML bug.
+
+2001-05-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-cache-underline-faces): Added docs that it is currently
+	needed for only pretest versions of Emacs 21.
+	(w3m-fontify-anchors): Don't fontify the trailing white spaces of a
+	href.
+	* w3m-xmas.el (w3m-insert-image): Don't handle underline faces.
+	* w3m-e21.el (w3m-insert-image): Simplified.
+
+2001-05-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-setup-header-line, w3m-exec, w3m-decode-entities):
+	Replace `add-text-properties' with `w3m-add-text-properties'.
+	(w3m-fontify-images, w3m-fontify-anchors): Ditto.
+	(w3m-setup-header-line, w3m-cache-contents, w3m-refontify-anchor):
+	Replace `put-text-property' with `w3m-add-text-properties'.
+	(w3m-toggle-inline-images, w3m-fontify-anchors): Ditto.
+	(w3m-fontify-underline, w3m-fontify-bold): Ditto.
+	(w3m-add-text-properties): New macro used to put non-sticky text
+	properties.
+
+	* w3m-xmas.el (w3m-setup-header-line): Don't put non-sticky text
+	property here.
+
+2001-05-16  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* mew-w3m.el (mew-w3m): Typo fix.
+
+2001-05-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-bookmark.el (w3m-bookmark-default-section): Changed
+	initialization order.
+
+2001-05-16  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-dtree.el (w3m-dtree-create): Modify warning message.
+	(w3m-about-dtree): Set path to directory name.
+
+2001-05-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el, w3m-antenna.el, w3m-bookmark.el, w3m-dtree.el, w3m-search.el,
+	w3m-weather.el: Fixed document strings of functions.
+
+	* mew-w3m.el (mew-w3m): New customize group.
+	(mew-use-w3m-minor-mode): Use defcustom.
+	(mew-w3m-auto-insert-image): Use defcustom.
+
+2001-05-16  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-goto-url): Set 'default-directory' to
+	'w3m-profile-directory', if 'url' is local but not exist that
+	directory.
+
+	* w3m-dtree.el (w3m-dtree-create): If 'path' is not a directory,
+	display warning message.
+
+2001-05-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-fontify): Initialize the value of
+	`w3m-cache-underline-faces'.
+	(w3m-toggle-inline-images): Remove or restore the underlined faces.
+	(w3m-cache-underline-faces): New buffer-local variable used to cache
+	the detached underlined faces from a buffer.
+
+	* w3m-xmas.el (w3m-insert-image): Detach an underlined face in
+	`w3m-cache-underline-faces'.
+	* w3m-e21.el (w3m-insert-image): Ditto.
+
+2001-05-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-toggle-inline-images): Restore hidden faces in the text
+	property `w3m-hidden-face'.
+
+	* w3m-xmas.el (w3m-setup-header-line): Don't inherit existing text
+	properties in a header line.
+
+	* w3m-xmas.el (w3m-insert-image): Hide a face in the text property
+	`w3m-hidden-face' if it is underlined, instead of the removing.
+	* w3m-e21.el (w3m-insert-image): Ditto.
+
+2001-05-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (top-level): Fixed argument of autoload for `w3m-dtree', and
+	added autoload for `w3m-about-dtree'.
+
+	* w3m-dtree.el (w3m-dtree): Fixed doc-string.
+
+2001-05-15  "Takayuki Nakagawa"  <tknakaga@kanagawa.hitachi.co.jp>
+
+	* w3m.el (w3m-goto-ftp-url): Use `file-directory-p' instead of file
+	name suffix to distinguish directories and files.
+	(w3m-time-parse-string (for buggy timezone.el)): Ignore errors occured
+	in `encode-time'.
+
+2001-05-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-dtree.el (top-level): Require `w3m' to suppress byte-compile
+	warnings.
+
+2001-05-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-view-this-url): Message if there is no link.
+	(w3m-cursor-anchor): Redefine as a macro for byte-optimization.
+	(w3m-action, w3m-image, w3m-anchor): Redefine as a macro using
+	`w3m-get-text-property-around'.
+	(w3m-get-text-property-around): New macro.
+
+2001-05-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-exec): Report a process exit status if an error has
+	occurred.
+	(w3m-download): Ditto.
+	(w3m-w3m-dump-source): Don't use `zerop' to check for a process exit
+	status.
+	(w3m-w3m-dump-head-source): Ditto.
+	(w3m-w3m-get-header): Ditto.
+	(w3m-exec-process): Made it to return t if succeeded otherwise nil, to
+	keep a process exit status in `w3m-process-exit-status'.
+	(w3m-process-exit-status): New variable.
+
+2001-05-15  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (TOP): Add autoload for w3m-dtree.
+	(w3m-url-to-file-name): If URL is started 'about://dtree', it convert
+	to local file. Change [A-z] to [A-Za-z].
+	(w3m-url-local-p): If URL is started 'about://dtree', it assume to
+	local file.
+	(w3m-prog-dtree): Delete variable.
+	(w3m-about-history-ignored-regexp): Delete constant.
+	(w3m-arrived-ignored-regexp): New constant.
+	(w3m-history-ignored-regexp): New constant.
+	(w3m-arrived-add): Use 'w3m-arrived-ignored-regexp' instead of
+	'w3m-about-history-ignored-regexp'.
+	(w3m-arrived-p): Ditto.
+	(w3m-parse-attributes): Change [A-z] to [A-Za-z].
+	(w3m-fontify): Ditto.
+	(w3m-external-view): Remove 'about://dtree' handling.
+	(w3m-about-history): Use 'w3m-history-ignored-regexp' instead of
+	'w3m-about-history-ignored-regexp'.
+	(w3m-about-db-history): Ditto.
+	(w3m-about-dtree): Move to 'w3m-dtree.el'.
+	(w3m-dtree): Ditto.
+
+	* w3m-dtree.el: New file.
+
+2001-05-11  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-cursor-anchor): New defsubst.
+	(w3m-fontify-anchors): Add 'w3m-cursor-anchor property for
+	w3m-goto-(next|previous)-anchor.
+	(w3m-goto-anchor-hist): New buffer local variable.
+	(w3m-goto-next-anchor): Use 'w3m-cursor-anchor property.
+	(w3m-goto-previous-anchor): Ditto.
+	(w3m-next-anchor): Don't stop divided anchor using
+	'w3m-goto-anchor-hist'.
+	(w3m-previous-anchor): Ditto.
+
+	* w3m-form.el (w3m-fontify-forms): Add 'w3m-cursor-anchor property for
+	w3m-goto-(next|previous)-anchor.
+
+2001-05-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-hist.el (w3m-history-copy): New implementation without recursive
+	funcall'ing using `w3m-history-tree'.
+	(w3m-history-tree): Allow the optional argument `newpos'.
+	(w3m-history-copy-1): Removed.
+
+	* w3m.el (w3m-gohome): New command.
+	(w3m-setup-menu): Use `w3m-menubar'.
+	(w3m-menubar): New constant.
+	(w3m-toolbar): Added "copy"; use `w3m-gohome'.
+	(w3m-toolbar-buttons): Added "copy".
+
+	* w3m-xmas.el (w3m-setup-menu): Moved menubar definition to w3m.el.
+
+	* icons/copy-up.xpm: New file.
+
+2001-05-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-antenna.el (w3m-antenna-last-modified): When specified URL is not
+	found, returns t.
+	(w3m-antenna-check-sites): When the checking site is not found, use old
+	record.
+	(w3m-about-antenna): Excess arguments are ignored.
+
+2001-05-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-insert-image): Remove `face' property from a text
+	behind an image.
+
+	* w3m-e21.el (w3m-remove-image): Use a regular plist in the arg of
+	`remove-text-properties'.
+	* w3m.el (w3m-toggle-inline-images): Ditto.
+
+2001-05-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-e21.el (w3m-insert-image): Remove `face' property from a text
+	behind an image.
+
+2001-05-10  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el:
+	(w3m-dump-head-source-option): New variable.
+	(w3m-decode-all-to-this-charset): Ditto.
+	(w3m-halfdump-option): Ditto.
+	(w3m-halfdump-expand-options): Ditto.
+	(w3m-edit-function): Ditto.
+	(w3m-prog-dtree): Ditto.
+	(w3m-halfdump-command-arguments): Remove "-halfdump".
+	(w3m-fontify): Display minibuffer messages.
+	(w3m-decode-buffer): Use w3m-decode-all-to-this-charset, when its
+	non-nil.
+	(w3m-local-retrieve): If file is directory, return 'nil'.
+	(w3m-w3m-dump-head-source): Use 'w3m-dump-head-source-option' instead
+	of "-dump_extra".
+	(w3m-rendering-region): Use 'w3m-halfdump-option',
+	'w3m-halfdump-command-arguments' and 'w3m-halfdump-expand-options',
+	when call-process.
+	(w3m-exec): Add no-cache option for w3m-dtree when call
+	w3m-external-view().
+	(w3m-external-view): Add no-cache option. If url is local directory,
+	call w3m-dtree().
+	(w3m-print-this-url): Expand output message.
+	(w3m-edit-current-url): Use 'w3m-edit-function' instead of find-file().
+	(w3m-edit-this-url): New function.
+	(w3m-goto-next-anchor): Input form support.
+	(w3m-goto-previous-anchor): Ditto.
+	(keymap): Add w3m-edit-current-url() and w3m-edit-this-url().
+	(w3m-mode): Modify doc-string for new functions.
+	(w3m-view-header): Modify doc-string.
+	(w3m-history): Add doc-string.
+	(w3m-about-dtree): New function.
+	(w3m-dtree): Ditto.
+
+2001-05-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-hist.el (w3m-history-flat): Don't funcall itself recursively.
+
+	* w3m.el (w3m-fontify-images): Only put text properties `w3m-image' and
+	`w3m-image-redundant' if there is a property `w3m-href-anchor'.
+
+2001-05-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-hist.el (w3m-history-tree): New function.
+
+
+2001-05-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Release emacs-w3m-1.0 from emacs-w3m-1_0 branch.
+
+2001-05-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-setup-menu): Don't set up menu if it has already been
+	available.
+
+	* w3m.el (w3m-setup-menu): Locate W3M menu in the forefront of the
+	menubar.
+	* w3m-xmas.el (w3m-setup-menu): Ditto.
+
+2001-05-08  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-mode): Modify doc-string for describe mode, again.
+
+2001-05-08  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-form.el (top-level): Modify string to 'iso-2022-7bit' for
+	set-auto-coding.
+	(w3m-form-make-get-string): Guard error in w3m-url-encode-string()
+	reported [emacs-w3m:00686].
+
+2001-05-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-about-history): Run `set-buffer-multibyte' after
+	`erase-buffer' is done.
+
+2001-05-07  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-w3m-retrieve): Fixed problem when no-cache is non-nil and
+	w3m-content-type returns nil.
+
+2001-05-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-search.el (top-level): Removed magic string to decide coding
+	system.
+
+	* w3m-xmas.el (top-level): Ditto.
+
+	* w3m-e21.el (top-level): Ditto.
+
+2001-05-07  Masatake YAMATO  <jet@gyve.org>
+
+	* w3m-xmas.el (w3m-setup-menu): Implemented.
+
+2001-05-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-w3m-attributes): Check validity of contents length, to
+	avoid the problem reported in [emacs-w3m:00682].
+
+2001-05-07  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-bookmark.el (w3m-bookmark-section-history): Revival.
+	(w3m-bookmark-title-history): Ditto.
+
+	* w3m.el (w3m-extended-characters-table): Add "\x90" entry.
+	(w3m-setup-menu): Move from w3m-e21.el.
+	(w3m-mode): Modify doc-string for describe mode.
+	(top-level): Add key-bind, w3m-antenna(), w3m-weather() and
+	w3m-search().
+	(w3m-about-history): Set w3m work buffer as multibyte.
+
+	* w3m-e21.el (w3m-setup-menu): Move to w3m.el.
+
+2001-05-03  Masatake YAMATO  <jet@gyve.org>
+
+	* w3m.el (w3m-mode): Call w3m-setup-menu.
+
+	* w3m-xmas.el (w3m-setup-menu): New stub.
+
+	* w3m-e21.el (w3m-setup-menu): New function.
+
+2001-04-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-about-history): Replace ">" with "&gt;".
+
+2001-04-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-about-history): New implementation without recursive
+	funcall'ing.
+	(w3m-about-history-1): Removed.
+
+2001-04-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-goto-ftp-url): Don't give a url string to the function
+	`file-name-nondirectory'.
+
+2001-04-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-about-history): Enhance the last link.
+	(w3m-arrived-p): Return non-nil when url matches
+	`w3m-about-history-ignored-regexp'.
+	(w3m-arrived-add): Don't put url into an arrived-db when url matches
+	`w3m-about-history-ignored-regexp'.
+	(w3m-about-history-ignored-regexp): Renamed from
+	`w3m-about-history-except-regex'.
+
+	* w3m-hist.el (w3m-history-restore-position): Instruct
+	`w3m-history-plist-get' to work with buffer-local properties.
+	(w3m-history-store-position): Instruct `w3m-history-add-properties' to
+	work with buffer-local properties.
+	(w3m-history-remove-properties): Allow the optional arg `local'.
+	(w3m-history-add-properties): Ditto.
+	(w3m-history-plist-put): Ditto.
+	(w3m-history-plist-get): Ditto.
+	(w3m-history-copy): Remove buffer-local properties.
+	(w3m-history-flat): Made it to have buffer-local properties.
+
+2001-04-24  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* mew-w3m.el (mew-mime-text/html-w3m): Support Mew 1.95b120 or later.
+
+2001-04-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-quit): Clear the echo area just after prompting.
+	(w3m-save-list): Format a list by itself instead of the use of pp.
+
+2001-04-24  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-0.2.1-mnc.patch: See [emacs-w3m:00629].
+
+2001-04-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-goto-url): Use `w3m-history-store-position' instead of
+	`w3m-arrived-store-position'.
+	(w3m-lynx-like-map): Bind `w3m-history-restore-position' instead of
+	`w3m-view-previous-point' for the key `C-c C-b'; new key `C-c C-SPC' to
+	bind the command `w3m-history-store-position'.
+	(w3m-view-previous-point): Removed.
+	(w3m-view-next-page): Use `w3m-history-restore-position' instead of
+	`w3m-arrived-restore-position'.
+	(w3m-view-previous-page): Ditto.
+	(w3m-arrived-restore-position): Removed.
+	(w3m-arrived-store-position): Removed.
+
+	* w3m-hist.el (w3m-history-add-arrived-db): Don't specify the 2nd arg
+	in `w3m-history-push'; specify the 2nd in `w3m-history-backward'.
+	(w3m-history-restore-position): New command.
+	(w3m-history-store-position): New command.
+	(w3m-history-plist-put): Use `w3m-history-modify-properties'.
+	(w3m-history-plist-get): Don't specify the 3rd arg in
+	`w3m-history-assoc'.
+	(w3m-history-push): Allow the optional arg `replace-props'; use
+	`w3m-history-modify-properties'.
+	(w3m-history-assoc): Allow the optional arg `replace-props'; always
+	modify the properties of a history element; use
+	`w3m-history-modify-properties'.
+	(w3m-history-backward): Allow the optional arg `set-current'; don't
+	modify the position pointer of `w3m-history' normally; use
+	`w3m-history-save-position'.
+	(w3m-history-forward): Ditto.
+	(w3m-history-with-element): Don't specify the 3rd arg in
+	`w3m-history-assoc'.
+	(w3m-history-modify-properties): New macro.
+	(w3m-history-save-position): New macro.
+
+2001-04-23  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-xmas.el (w3m-setup-header-line): Check `major-mode' to decide
+	whether header line should be set up.
+
+2001-04-23  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-linefeed-type): Change default value.
+
+	* w3m-0.2.1-mnc.patch: Define setmode(fileno(stdout), O_BINARY) if
+	win32 or OS/2. Define lrand48() and srand48() used if they don't have.
+
+2001-04-23  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-about-db-history): Set w3m work buffer as multibyte.
+
+2001-04-23  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-info-like-map): Changed key of `w3m-reload-this-page'.
+
+2001-04-20  Taiki SUGAWARA <taiki.s@cityfujisawa.ne.jp>
+
+	* w3m.el (w3m-expand-file-name-as-url): Use "file:///cygdrive/" instead
+	of "/cygdrive/" when `w3m-use-cygdrive' is non-nil.
+
+2001-04-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-hist.el (w3m-history-add-arrived-db): New command.
+
+	* w3m.el (w3m-db-history): New command.
+	(w3m-about-history, w3m-about-history-1): Don't deactivate "about://*"
+	links.
+	(w3m-exec): Share a url string between the variable `w3m-current-url'
+	and the history structure.
+	(w3m-toolbar, w3m-toolbar-buttons): Added history and db-history.
+
+	* icons/db-history-up.xpm: New file.
+	* icons/history-up.xpm: New file.
+
+2001-04-20  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-view-source): Don't execute if can't load its source.
+	(w3m-view-header): Don't execute if can't load its header. Toggle
+	html/header if execute twice.
+
+2001-04-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-goto-url): Use `set-text-properties' to remove all text
+	props from url string.
+	(w3m-exec): Use `add-text-properties' instead of `set-text-properties'.
+	(w3m-w3m-dump-source, w3m-w3m-dump-head-source): Removed not-used bound
+	variable `w3m-w3m-retrieve-length'.
+	(w3m-cache-request-contents): Removed not-used bound variables `type'
+	and `charset'.
+	(w3m-entity-value): Removed not-used bound variable `sym'.
+	(w3m-arrived-add): Use `w3m-arrived-add-1'; don't funcall itself
+	recursively to get rid of redundancy; don't use `set-text-properties'
+	here.
+	(w3m-arrived-add-1): New macro.
+
+	* w3mhack.el (XEmacs): Byte-optimize `set-text-properties' to make the
+	program run a little bit faster.
+
+2001-04-19  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-use-cygdrive): Change default value.
+	(w3m-linefeed-type): New customize variable.
+	(w3m-executable-type): Remove variable.
+	(w3m-crlf-to-lf): Use 'w3m-linefeed-type' instead of
+	'w3m-executable-type'.
+
+2001-04-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el: Byte-optimize `match-string-no-properties' not to use
+	`set-text-properties' under XEmacs.
+
+2001-04-19  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-setup-header-line): Check `major-mode' to decide whether
+	header line should be set up.
+
+	* mime-w3m.el (mime-w3m-use-header-line): Removed.
+	(mime-w3m-preview-text/html): Canceled last change.
+
+2001-04-18  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-mode-map): Initialize when source file is loaded.
+
+	* mime-w3m.el (mime-w3m-mode-map): Simplify.
+
+	* mew-w3m.el (TopLevel): Initialization code of `w3m-mode-map' is
+	removed.
+
+	* w3m.el, w3m-weather.el, w3m-filter.el, w3m-form.el: Change
+	coding-system.
+
+	* mime-w3m.el (mime-w3m-use-header-line): New user option.
+	(mime-w3m-preview-text/html): Refer `mime-w3m-use-header-line' to
+	control `w3m-use-header-line'.
+
+2001-04-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-hist: Made the history management system to keep properties of
+	each history element to be shared by all the w3m buffers.
+	(w3m-history-remove-properties): Share properties.
+	(w3m-history-add-properties): Ditto.
+	(w3m-history-plist-put): Ditto.
+	(w3m-history-copy, w3m-history-copy-1): Ditto.
+	(w3m-history-push): Ditto.
+	(w3m-history-assoc): Ditto.
+	(w3m-history-share-properties): New function.
+	(w3m-history-seek-properties): New function.
+
+	(w3m-history-rename-url): Allow the 4th arg `this-buffer'.
+	(w3m-history-with-element): Renamed from `w3m-history-with-elements';
+	bind only the variable `element' to have a history element of
+	`w3m-history-flat'.
+
+2001-04-18  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-setup-header-line): Don't execute the setup-header-line,
+	if w3m-current-url is 'nil'.
+
+	* w3m-xmas.el (w3m-setup-header-line): Ditto.
+
+2001-04-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-fontify-images): Use `match-string-no-properties' instead
+	of `buffer-substring-no-properties'.
+	(w3m-parse-attributes): Use `match-string-no-properties' instead of
+	`match-string' to remove text properties.
+
+	* w3m-xmas.el: Require `poe' for the function
+	`match-string-no-properties'.
+
+2001-04-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-setup-header-line): New function except for Emacs 21 nor
+	XEmacs.
+	(w3m-header-line-map): New variable except for Emacs 21 nor XEmacs.
+	(w3m-fontify-after-hook): Use it for emulating a header-line.
+	(w3m-header-line-location-content-face): New face except for Emacs 21.
+	(w3m-header-line-location-title-face): Ditto.
+	(w3m-use-header-line): Moved from w3m-e21.el.
+
+	* w3m-xmas.el (w3m-setup-header-line): New function.
+	(w3m-header-line-map): New variable.
+
+	* w3m-e21.el (w3m-use-header-line): Moved to w3m.el.
+
+2001-04-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* icons/parent-up.xpm: Reduced color depth.
+	* icons/parent-disabled.xpm: Renamed from parent-down.xpm.
+
+2001-04-16  Masatake YAMATO  <masata-y@gyve.aist-nara.ac.jp>
+
+	* w3m.el (w3m-toolbar): Added w3m-toolbar-parent-icon.
+	(w3m-toolbar-buttons): Added "parent".
+	(w3m-parent-page-available-p): New function.
+
+	* icons/parent-up.xpm: New file.
+	* icons/parent-down.xpm: New file.
+
+2001-04-16  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-about-history): Set w3m work buffer as multibyte.
+
+2001-04-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-about-history-1, w3m-about-history): Deactivate all
+	"about://*" links.
+
+2001-04-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-about-history-1): New internal function.
+	(w3m-about-history): Use it.
+
+2001-04-15  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-e21.el (w3m-header-line-location-title-face): New face.
+	(w3m-header-line-location-content-face): Ditto.
+	(w3m-use-header-line): New user option.
+	(w3m-setup-header-line): New function.
+	(w3m-mode-hook): Add `w3m-setup-header-line'.
+
+2001-04-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-about-history): Show a history tree (incompleted).
+	(w3m-exec): Put a title string into the history structure.
+
+2001-04-12  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-about-db-history): Change the format on display.
+
+2001-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-om.el (w3m-icon-directory): Define it as the constant nil to
+	avoid byte-compile warnings when compiling.
+	* w3m.el (w3m-icon-directory): Undo last change.
+
+2001-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-icon-directory): Hide the actual function name
+	`locate-data-directory' for old Emacsen to avoid byte-compile warnings.
+
+	* w3m-om.el (w3m-om-define-missing-widgets): New function.
+	(TopLevel): Use it for defining some missing widgets after the library
+	wid-edit is loaded.
+
+2001-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el (w3m-xmas-define-missing-widgets): New function.
+	(TopLevel): Use it for defining some missing widgets after the library
+	wid-edit is loaded.
+
+	* w3m.el (w3m-track-mouse): Added a description about balloon-help.
+	(w3m-make-balloon-help): New macro.
+	(w3m-fontify-anchors, w3m-fontify-images): Use it.
+
+2001-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-track-mouse): Default to t.
+	(w3m-make-help-echo): New macro.
+	(w3m-fontify-anchors, w3m-fontify-images): Use it.
+
+2001-04-12  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* mew-w3m.el (TopLevel): Set w3m-mode-map if not exec w3m-mode() yet.
+
+2001-04-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-fontify-images, w3m-fontify-anchors): Put a url string to
+	each anchor as a `help-echo' property when the value of
+	`w3m-track-mouse' is non-nil.
+	(w3m-track-mouse): New user option.
+
+2001-04-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-copy-buffer): Use `w3m-history-copy' to make copies of
+	`w3m-history' and `w3m-history-flat'.
+
+2001-04-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* mime-w3m.el (mime-w3m-mode-map): Refer `w3m-key-binding' to avoid the
+	problem reported in [emacs-w3m:00498].
+
+2001-04-10  Keisuke Nishida  <kxn30@po.cwru.edu>
+
+	* w3m-search.el (w3m-search): Find default using thing-at-point.
+
+2001-04-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-about-history): Use `w3m-history-flat' instead of
+	`w3m-url-history'.
+	(w3m-view-source): Don't bind `w3m-url-yrotsih' nor `w3m-url-history'.
+	(w3m-redisplay-with-coding-system): Don't treat `w3m-url-history'.
+	(w3m-reload-this-page): Ditto.
+	(w3m-view-next-page): Use `w3m-history-forward' instead of
+	`w3m-url-yrotsih'.
+	(w3m-view-previous-page): Use `w3m-history-backward' instead of
+	`w3m-url-history'.
+	(w3m-exec): Use `w3m-history-push' instead of `w3m-url-yrotsih' or
+	`w3m-url-history'.
+	(w3m-toolbar): Use `w3m-history-next-link-available-p' and
+	`w3m-history-previous-link-available-p'.
+	(w3m-url-yrotsih, w3m-url-history): Removed.
+	(TopLevel): Require `w3m-hist'.
+
+2001-04-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-info-like-map): Use `(shift iso-lefttab)' instead of
+	`S-iso-lefttab'.
+	(w3m-lynx-like-map): Ditto.
+
+	* w3mhack.el (w3mhack-make-package): Add shimbun modules in
+	MANIFEST.w3m file.
+	(w3mhack-examine-modules): Look for the library "mime-def" instead of
+	"mime" to check whether FLIM has been installed or not.
+	* Makefile.in (install): Install shimbun modules as well.
+	(install-icons): Show subdirectory name.
+
+2001-04-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-key-binding): New user option.
+	(w3m-lynx-like-map, w3m-info-like-map): New keymaps.
+	(w3m): Refer w3m-key-binding, to decide whether keymap is used.
+
+2001-04-06  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-edit-current-url): New command.
+	(w3m-mode-map): `w3m-edit-current-url' is registered.
+	(w3m-save-this-url): Removed.
+	(w3m-decode-encoded-buffer): Use `w3m-which-command' in order to find
+	appropriate command in Windows.
+
+2001-04-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Makefile.in (default): Depends `Makefile'.
+	(Makefile): Removed `--recheck' option in order to re-create itself
+	when `Makefile.in' or `config.status' is updated.
+
+2001-04-05  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (top): Define w3m-read-coding-system().
+	(w3m-content-type-alist): Change "fiber" to "fiber.exe".
+	(w3m-quit): Remove hook if no w3m exist.
+	(w3m-arrived-add): Add 'coding-system entry.
+	(w3m-arrived-coding-system): New function.
+	(w3m-arrived-setup): Handle 'coding-system entry.
+	(w3m-arrived-shutdown): Ditto.
+	(w3m-goto-url): Handle specified coding-system.
+	(w3m-redisplay-with-coding-system): Use w3m-read-coding-system.  If no
+	coding-system specify, set 'reset.
+
+	* w3m-om.el (w3m-read-coding-system): New function.
+
+2001-04-04  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-w3m-retrieve): Add 'cs(coding-system)' option.
+	(w3m-retrieve): Ditto.
+	(w3m-exec): Ditto.
+	(w3m-goto-url): Ditto.
+	(w3m-decode-buffer): Ditto. If 'cs' specify, decoding use it.
+	(w3m-mode-map): Add w3m-redisplay-with-coding-system() at "C".
+	(w3m-mode): Change doc string.
+	(w3m-redisplay-with-coding-system): New function.
+
+2001-04-04  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-w3m-attributes): When content type has trailing
+	semicolon, make it removed.
+
+	* w3mhack.el (load-path): Add `shimbun' sub-directory.
+
+2001-04-04  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* Makefile.in (clean): Remove shimbun modules.
+
+	* w3mhack.el (shimbun-module-directory): New constant.
+	(w3mhack-examine-modules): Add shimbun modules if mime is installed.
+
+	* w3m.el (w3m-decode-entities): New function.
+	(w3m-fontify): Use it.
+
+2001-04-04  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-print-this-url): New optional argument `add-kill-ring' is
+	added.
+
+2001-04-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-filter.el: New file.
+
+	* w3m-antenna.el (w3m-antenna-size): Refer decoded buffer as size.
+
+	* w3m.el (TopLevel): Add autoload code of `w3m-filter'.
+	(w3m-use-filter): New user option.
+	(w3m-retrieve): Call `w3m-filter' when decode.
+
+2001-04-03  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-force-redisplay): New variable, default is 't'.
+	(w3m-toggle-inline-images): If w3m-force-redisplay is nil, don't
+	redraw.
+	(w3m-goto-url): Ditto.
+	(w3m-region): Ditto.
+
+	* mew-w3m.el (mew-mime-text/html-w3m): Bind w3m-force-redisplay to
+	'nil'.
+	(w3m-mew-support-cid): New variable.
+	(mew-w3m-cid-retrieve): Use mew-syntax-get-entry-by-cid(), Tnx, Kazu
+	Yamamoto <kazu@mew.org>.
+
+2001-04-03  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-process-message): Removed.
+	(w3m-exec-process): Clean up.
+	(w3m-w3m-dump-head-source): Removed code which refers
+	`w3m-process-message'.
+	(w3m-w3m-dump-source): Ditto.
+	(w3m-parse-attributes): Remove leading and trailing white space in
+	CDATA attribute values.
+
+2001-04-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-hist.el (w3m-history-copy): Make a copy of `w3m-history-flat'
+	using `w3m-history-flat' instead of `w3m-history-copy-1'.
+
+2001-04-02  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Makefile.in (DISTS): Removed `Makefile'.
+
+2001-04-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-hist.el (w3m-history-backward, w3m-history-forward): Simplified.
+
+2001-04-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-hist.el (w3m-history-backward, w3m-history-forward): Allow the
+	optional argument `count'.
+	(w3m-history-backward-1, w3m-history-forward-1): New macros.
+
+2001-04-02  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-0.2.1-mnc.patch: Apply patch posted in [w3m-dev 01887].
+
+	* w3m.el (w3m-w3m-dump-head-source): Follow change in MNC patch.
+	(w3m-w3m-attributes): Ditto.
+
+2001-04-02  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-crlf-to-lf): New function.
+	(w3m-w3m-dump-head-source): Do crlf-to-lf when executable-type eq
+	'cygwin.
+	(w3m-w3m-dump-source): All time do crlf-to-lf function when
+	executable-type eq 'cygwin.
+
+2001-04-02  Taiki SUGAWARA <taiki.s@cityfujisawa.ne.jp>
+
+	* w3m.el (w3m-exec-process): Guard the process from some errors.
+	(w3m-copy-buffer): Restore view point with new window to the point in
+	original window.
+
+2001-04-02  Hiroya Murata  <hiroya@use-ebisu.co.jp>
+
+	* Makefile.in (Makefile): Depends on config.status instead of
+	configure.
+	(config.status): New rule.
+
+2001-04-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* aclocal.m4 (AC_PATH_ICONDIR): Quote "$(data-directory)" in help-
+	string.
+
+2001-04-02  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-html-string-regexp): Make no exception of back-quote.
+	(w3m-parse-attributes): Follow up above change.
+
+2001-03-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-home-page): Default value is changed.
+	(w3m-html-string-regexp): Support single quoted string.
+	(w3m-parse-attributes): Import from w3m-form.el.
+	(w3m-fontify-anchors): Fix bug reported in [emacs-w3m:00400].
+	(w3m-external-view): Fix.
+	(w3m-goto-url): Default argument is changed when it is interactively
+	called.
+	(w3m-browse-url): Fix.
+	(w3m-about): Update.
+	(w3m-about-history-except-regex): Add `about:'.
+
+	* w3m-form.el: (w3m-parse-attributes): Exported.
+
+	* mime-w3m.el (mime-w3m-save-background-color): Changed
+	`edebug-form-spec'.
+
+	* Makefile.in (dist): Improved.
+	(Makefile, configure): New rules.
+	(ECC, MODULES): Removed macros.
+
+2001-03-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-hist.el (w3m-history-with-elements): New macro.
+	(w3m-history-rename-url): Use it.
+	(w3m-history-remove-properties): Use it.
+	(w3m-history-add-properties): Use it.
+	(w3m-history-plist-put): Use it.
+
+2001-03-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-hist.el (w3m-history-rename-url): New function.
+	(w3m-history-remove-properties): New function.
+	(w3m-history-add-properties): New function.
+	(w3m-history-plist-put): New function.
+	(w3m-history-plist-get): New function.
+	(w3m-history-assoc): Return a history element of `w3m-history-flat'
+	instead of `w3m-history'.
+
+2001-03-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-w3m-attributes): Fixed spec of return value when response
+	code is greater than 500.
+
+2001-03-29  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Fix bugs in caching deflated contents.
+	(w3m-attributes): Fixed spec of return value when `about:' is
+	specified.
+	(w3m-cache-available-p): Removed.
+	(w3m-w3m-dump-head-source): Reconstructed.
+	(w3m-w3m-dump-source): New function.
+	(w3m-w3m-retrieve): Use `w3m-w3m-dump-head-source' or
+	`w3m-w3m-dump-source'.
+	(w3m-real-url): Fix side effect of macro expansion.
+
+	* w3m-0.2.1-mnc.patch: New file.
+
+2001-03-29  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* Makefile.in (default): Replace with `fast'.
+	(install): Undo the last change.
+	(.el.elc, .SUFFIXES, install-anyway): Removed.
+	(fast-install-package, fast-install, fast): Removed.
+
+	* w3m-hist.el (w3m-hist): Provide as a feature.
+	(w3m-history-copy, w3m-history-copy-1): New functions.
+	(w3m-history-push): Handle the variable `w3m-history-flat' as well as
+	`w3m-history'.
+	(w3m-history-assoc): Ditto.
+	(w3m-history-flat function): Set the value of the variable
+	`w3m-history-flat'.
+	(w3m-history-flat variable): New buffer-local variable.
+	(The whole module): Replace the term ATTRIBUTES with PROPERTIES;
+	replace the symbol name of the variable `w3m-url-history' with
+	`w3m-history'.
+
+2001-03-29  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-real-url): Return original url when real url is nil.
+
+	* w3m-antenna.el (w3m-antenna-sites): Add 'time' type.
+	(w3m-antenna-alist): Modify comment.
+	(w3m-antenna-hns-last-modified): Don't use old 'Last-Modified:' format.
+	(w3m-antenna-last-modified): Use w3m-last-modified() when can not get
+	'diary/di.cgi'.
+	(w3m-antenna-check-sites): Push current-time() if (nth 6 pre) is nil.
+
+2001-03-29  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Support deflated contents and redirected URLs.
+	(w3m-decoder-alist, w3m-mnc): New variable.
+	(w3m-encoding-alist): New constant.
+	(w3m-attributes, w3m-w3m-attributes, w3m-local-attributes): Spec of
+	return value is changed.
+	(w3m-content-charset, w3m-content-encoding, w3m-real-url): New macro.
+	(w3m-cache-available-p): New function.
+	(w3m-decode-encoded-buffer): Ditto.
+	(w3m-decode-buffer): Changed arguments spec.  Call
+	`w3m-decode-encoded-buffer' to process encoded contents.
+	(w3m-w3m-dump-head-source): New function.
+	(w3m-w3m-retrieve): Call `w3m-w3m-dump-head-source' when `w3m-mnc' is
+	non-nil value.  Follow change of `w3m-decode-buffer'.
+	(w3m-exec): Call `w3m-real-url' to process redirected URLs.
+	(w3m-sub-list): When N is nil, no elements in LIST should be deleted.
+	(w3m-save-list): Preserve file permission when file is overwritten.
+
+2001-03-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-compile): New function.
+
+	* Makefile.in (fast-install-package, fast-install, fast): New rules.
+	(install-package): Make it to be more talkative.
+	(install-anyway): New rule separated from `install'.
+	(install): Use `install-anyway'.
+
+	* w3m-hist.el (w3m-history-push): Rewrite for following the change of
+	`w3m-url-history'.
+	(w3m-history-assoc): Ditto.
+	(w3m-history-backward): Ditto.
+	(w3m-history-forward): Ditto.
+	(w3m-history-current): Ditto.
+	(w3m-history-current-1): New macro.
+	(w3m-history-next-link-available-p): New function.
+	(w3m-history-previous-link-available-p): New function.
+	(w3m-url-history): Make it to have the previous and the next position
+	pointers.
+
+2001-03-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-hist.el (w3m-history-push): New function.
+
+2001-03-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-hist.el (w3m-url-history): Define it here.
+	(w3m-history-assoc, w3m-history-flat, w3m-history-backward): New
+	functions.
+
+2001-03-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-hist.el (w3m-history-forward): New function.
+
+2001-03-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-goto-url): Put cursor at the top of minibuffer.
+
+2001-03-23  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-w3m-attributes): Don't check "OK" string in Status-Line.
+
+2001-03-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-time-parse-string the 2nd): Don't funcall
+	`parse-time-string' directly for avoiding compile warning.
+
+	* w3m-hist.el (w3m-history-current): New function.
+
+2001-03-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-hist.el: New file.
+
+2001-03-23  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-time-parse-string): Fix condition to detect timezone.el
+	includes bug.
+
+	* w3m-time.el: Removed.
+
+	* w3m.el (TopLevel): Require `timezone' instead of `w3m-time'.
+	(w3m-time-parse-string): Use `timezone-fix-time' and spec of return
+	value is changed.
+	(w3m-time-newer-p): Imported.
+
+	* w3m-antenna.el (w3m-antenna-hns-last-modified): Follow change of
+	`w3m-time-parse-string'.
+
+2001-03-23  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* README, README.ja: Update for w3m-0.2.1.
+
+	* Makefile.in (dist, tarball): Fix that some files are not included in
+	package.
+
+2001-03-22  Keisuke Nishida  <kxn30@po.cwru.edu>
+
+	* w3m.el (w3m-goto-url): Insert the current url for input by default.
+
+2001-03-22  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-xmas.el (w3m-update-toolbar): New function.
+	(w3m-setup-toolbar): Added docstring.
+
+	* w3m.el (w3m-goto-url): Call `w3m-update-toolbar'.
+	(toplevel): Define `w3m-update-toolbar' if it is not bound as function.
+
+2001-03-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-w3m-attributes): Ignore errors while parsing a
+	time-string.
+
+2001-03-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el: Moved generic macros and defsubsts in front of functions.
+	(w3m-content-encoding, w3m-content-charset): Commented out.
+	* w3m-form.el (w3m-parse-attributes): Moved from w3m.el.
+
+2001-03-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el: Make `w3m-fontify-forms' and `w3m-form-parse-region' to be
+	always autoloaded; encolose the defining procedures for the unbound
+	functions with `eval-and-compile'.
+	(browse-url-interactive-arg): Bind it only at the compile-time as an
+	autoload'ed function.
+	* w3m-xmas.el: Provide `w3m-xmas' and then require `w3m'.
+	* w3m-om.el: Provide `w3m-om' and then require `w3m'.
+	* w3m-form.el: Require `w3m'.
+	* w3m-e21.el: Provide `w3m-e21' and then require `w3m'.
+
+2001-03-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-antenna.el: All occurrence of `natsumikan' is replaced with
+	`natsumican'.
+
+2001-03-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (coding-system-category): Don't define it for the Emacs
+	variants.
+	* w3m-om.el (coding-system-category): Defalias to `get-code-mnemonic'.
+	* w3m-xmas.el (coding-system-category): Defalias to
+	`coding-system-type' if it is not bound.
+
+	* w3mhack.el (w3mhack-version): Don't require `w3m' in the top level,
+	do it here instead.
+
+2001-03-22  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-save-list): Use 'pp' if have pp().  Bind 'print-length'
+	and 'print-level' to nil.
+
+2001-03-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Structure of hash database of arrived urls is changed.
+	(w3m-arrived-setup): Follow change of DB structure.
+	(w3m-arrived-shutdown): Likewise.
+	(w3m-arrived-add): Likewise, and argument spec is changed.
+	(w3m-arrived-time): New function.
+	(w3m-arrived-seq, w3m-arrived-put-title, w3m-arrived-arrived-time,
+	w3m-arrived-put-arrived-time): Removed.
+	(w3m-goto-url): Follow change of `w3m-arrived-add'.
+
+2001-03-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-goto-url): Refresh the visibility of toolbar when XEmacs
+	is running.
+
+2001-03-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-url-to-file-name): Fix bug reported in [emacs-w3m:00305].
+	(w3m-goto-url): Set the value interpreted as a directory to
+	`default-directory'.
+
+2001-03-21  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-about-db-history): Use w3m-arrived-arrived-time().
+	(w3m-goto-url): Put arrived time to w3m-arrived-db.
+	(w3m-arrived-shutdown): Handling 'arrived-time in w3m-arrived-db.
+	(w3m-arrived-setup): Ditto.
+	(w3m-arrived-put-title): New function.
+	(w3m-arrived-arrived-time): Ditto.
+
+2001-03-21  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-arrived-shutdown): Check sites which are arrived on the
+	other emacs process.
+
+2001-03-21  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-input-url): 'nil' don't add candidates.
+
+2001-03-21  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-antenna.el (w3m-antenna-make-summary-function): Default value is
+	changed.
+	(w3m-antenna-make-summary-like-natsumikan): New function.
+
+	* w3m.el (w3m-about-db-history-sort-time): Removed.
+	(w3m-about-db-history): Use `w3m-time-newer-p' instead of
+	`w3m-about-db-history-sort-time'.
+
+2001-03-20  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-about-history-except-regex): New constant.
+	(w3m-about-db-history): New function.
+	(w3m-about-db-history-sort-time): Ditto.
+	(w3m-about-history): If 'titile' is '<no-title>', show 'URL' instead of
+	'title'. Use w3m-about-history-except-regex.
+	(w3m-history): If exec with 'C-u', goto 'about://db-history/'.
+	(w3m-w3m-attributes): Adhoc implementation when server return 'HTTP/1.x
+	500x'.
+
+2001-03-19  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Format of arrived URL database is changed in order to store
+	page's title.
+	(w3m-arrived-title, w3m-arrived-put-title): New function.
+	(w3m-arrived-setup, w3m-arrived-shutdown): Follow format change.
+	(w3m-about-history): Use page's title to make history contents.
+
+2001-03-19  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-url-to-file-name): Fix 'file:///c/xxxx' format in
+	Windows.
+	(w3m-expand-file-name-as-url): Use 'file:///c|/xxxx' format if
+	non-cygwin Windows.
+	(w3m-about-history): Uniq history. Insert exposition of html.
+
+2001-03-19  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-url-to-file-name): Fix (Cf. RFC-1808).
+	(w3m-expand-file-name-as-url): Ditto.
+	(w3m-url-local-p): New function.
+	(w3m-goto-url): Set `default-directory' when URL points a local file.
+	(w3m-find-file): Use `w3m-goto-url'.
+	(w3m-w32-browser-with-fiber): Use `w3m-url-to-file-name'.
+
+2001-03-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-make-package): Fixed entries of autoloads and
+	cus-load, and added ChangeLog in the file MANIFEST.w3m.
+
+	* aclocal.m4 (AC_CHECK_EMACS): Added the option `--with-xemacs'.
+
+2001-03-19  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-download): Bind `file-coding-system' to binary.
+	(w3m-content-type-alist): Fix.
+
+2001-03-18  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-antenna.el (w3m-antenna): Optional argument, `no-cache' is added.
+
+2001-03-18  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-goto-url): Switch to buffer of w3m, certainty.
+	(w3m): Ditto.
+
+2001-03-17  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-halfdump-command-arguments): Rename from
+	'w3m-command-arguments'.
+	(w3m-command-arguments): New customize variable.
+	(w3m-exec-process): Add w3m-command-arguments to args when w3m execute.
+	(w3m-rendering-region): Use w3m-halfdump-command-arguments when w3m
+	execute.
+	(w3m-fontify-anchors): Put w3m-name-anchor certainty.
+
+2001-03-17  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-antenna.el: Changed antenna database format.
+	(w3m-antenna-site-key, w3m-antenna-site-title, w3m-antenna-site-class,
+	w3m-antenna-site-url, w3m-antenna-site-last-modified,
+	w3m-antenna-site-size, w3m-antenna-site-size-detected): New macros.
+	(w3m-antenna-setup): Follow change of database format.
+	(w3m-antenna-check-sites): New function.
+	(w3m-antenna-make-summary, w3m-antenna-sort-sites-by-time,
+	w3m-antenna-sort-sites-by-title): Use macros to refer database.
+	(w3m-about-antenna): Use w3m-antenna-check-sites.
+
+	* w3m.el (w3m-about-history): Don't print "about://antenna/".
+
+2001-03-17  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* icons/antenna-up.xpm: New file.
+
+	* w3m.el (w3m-toolbar-buttons): Added "antenna".
+	(w3m-toolbar): Ditto; Fixed behavior of `home'.
+
+2001-03-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el, w3m-antenna.el: Fix typo.
+
+2001-03-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-make-package): Remove autoloads and cus-load
+	files before generating.
+
+	* w3m.el (w3m): Added autoload cookie.
+	(w3m-icon-directory): Attempt to set the default value using the way of
+	Wanderlust.
+
+2001-03-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* README: Update for `install-package' and `install-icons'.
+	* README.ja: Ditto.
+
+	* w3mhack.el (w3mhack-make-package): New function.
+	(w3mhack-examine-modules): Ignore auto-save files.
+
+	* mkinstalldirs: New file.
+
+	* configure.in: Call `AC_PATH_PACKAGEDIR'.
+
+	* aclocal.m4 (AC_PATH_PACKAGEDIR): New function.
+	(AC_EXAMINE_PACKAGEDIR): New function.
+	(AC_CHECK_EMACS_FLAVOR): Merged into `AC_CHECK_EMACS'.
+
+	* Makefile.in (install-package): New rule.
+	(install-icons, install): Exec mkinstalldirs.
+	(SHELL, PACKAGEDIR): New variable.
+
+2001-03-16  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-goto-url): Force switch to '*w3m*' buffer.
+	(w3m-view-source): Don't add current-url to w3m-url-history|yrotsih.
+
+	* mew-w3m.el (mew-w3m-cid-retrieve): Change mime-part handling.
+
+2001-03-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m-antenna.el (w3m-antenna-sort-function): Removed.
+	(w3m-antenna-sort-changed-sites-function): New variable.
+	(w3m-antenna-sort-unchanged-sites-function): Ditto.
+	(w3m-antenna-sort-sites-by-time): Refer time, when size modification
+	detected.
+	(w3m-about-antenna): Use new variables.
+
+2001-03-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-time.el (w3m-time-rules): Don't use backquote.
+	(w3m-time-zoneinfo): Ditto.
+	(w3m-time-parse-integer): Ditto.
+
+2001-03-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (TopLevel): Require `w3m-time'.
+	(w3m-w3m-attributes): Use `w3m-time-parse-string' instead of
+	`parse-time-string'.
+
+	* w3m-time.el: Import parse-time.el of T-gnus and rename it.
+
+	* w3m-antenna.el: Use `w3m-time-parse-string' instead of
+	`parse-time-string'.
+
+2001-03-16  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m-e21.el (w3m-create-image): Changed arguments spec, that
+	`accept-type-regexp' is removed.
+
+	* w3m-xmas.el (w3m-create-image): Ditto.
+
+2001-03-16  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Arrived URL database format is changed and code to get
+	headers and to retrieve contents is cleaned up.
+	(w3m-attributes, w3m-local-attributes): New function.
+	(w3m-w3m-attributes): Old name is `w3m-w3m-check-header'.
+	(w3m-content-type): Use `w3m-attributes'.
+	(w3m-content-charset, w3m-content-length, w3m-content-encoding,
+	w3m-last-modified): New macro.
+	(w3m-retrieve, w3m-local-retrieve): Changed arguments spec, that
+	`accept-type-regexp' is removed.
+	(w3m-w3m-retrieve): Likewise and call `w3m-w3m-attributes' instead of
+	`w3m-w3m-check-header'.
+	(w3m-exec): Follow change of arguments spec of `w3m-retrieve'.
+	(w3m-about-source, w3m-about-header): Changed arguments spec that
+	`accept-type-regexp' is removed and follow change of arguments spec of
+	w3m-retrieve.
+	(w3m-arrived-last-modified): New function.
+	(w3m-arrived-add): Support optional argument `time' and follow change
+	of database format.
+	(w3m-arrived-setup, w3m-arrived-shutdown, w3m-arrived-store-position,
+	w3m-arrived-restore-position): Follow change of database format.
+	(w3m-with-work-buffer, w3m-parse-attributes): Changed
+	`edebug-form-spec', see [emacs-w3m:00238].
+	(TopLevel): Add autoload codes for `w3m-antenna.el'.
+
+	* w3m-antenna.el: New file.
+
+	* mime-w3m.el (mime-w3m-cid-retrieve): Changed arguments spec, that
+	`accept-type-regexp' is removed.
+
+	* mew-w3m.el (mew-w3m-cid-retrieve): Ditto.
+
+2001-03-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* Makefile.in (install-icons): New rule.
+	(ICONDIR): New variable.
+
+	* aclocal.m4 (AC_PATH_ICONDIR): New function.
+	* configure.in: Call it.
+
+2001-03-16  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* icons: New directory (Some toolbar icons are contained).
+
+2001-03-16  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-view-source): Render as html if already display source.
+
+2001-03-15  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-icon-directory): New variable.
+	(w3m-toolbar-buttons): New constant.
+	(w3m-toolbar): Ditto.
+	(w3m-setup-toolbar): Define as null function.
+	(w3m-mode): Call `w3m-setup-toolbar'.
+
+	* w3m-xmas.el (w3m-use-toolbar): New variable.
+	(w3m-xmas-make-toolbar-buttons): New function.
+	(w3m-setup-toolbar): Ditto.
+
+	* w3m-e21.el (w3m-use-toolbar): New variable.
+	(w3m-e21-toolbar-configurations): Ditto.
+	(w3m-e21-setup-toolbar): New function.
+	(w3m-e21-make-toolbar-buttons): Ditto.
+	(w3m-setup-toolbar): Ditto.
+
+2001-03-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (XEmacs): Implemented the source level optimizer for `let'
+	or `let*' form to remove some obsolete variables.
+
+2001-03-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* README, README.ja: Update procedure of package installation.
+
+	* w3m.el (w3m-hook): Removed.
+	(w3m-goto-mailto-url): Old name is `w3m-mailto-url'.
+	(w3m-goto-ftp-url): Old name is `w3m-exec-ftp'.
+	(w3m-convert-ftp-url-for-emacsen): Old name is
+	`w3m-convert-ftp-to-emacsen'.
+	(w3m-exec): Removed code for ftp protocol.
+	(w3m-alive-p): Change spec of return value when w3m is alive.
+	(w3m-goto-url): Made this function safe when it is called at the buffer
+	whose major mode is not equal to w3m-mode.
+	(w3m): If it is interactively called when w3m is alive, it is simply
+	select the appropriate buffer in the current window without asking url.
+	(w3m-view-parent-page, w3m-browse-url, w3m-view-source, w3m-history):
+	Use `w3m-goto-url' instead of `w3m'.
+	(w3m-mode-map): Replace `w3m' with `w3m-goto-url'.
+
+2001-03-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (MULE): Make `locate-library' run quietly; bind
+	defcustom'ed variables at compile-time; require `w3m' after
+	byte-optimizations are done.
+
+	* w3m.el (w3m-static-cond): New macro; use it for defining
+	`find-coding-system'.
+	(w3m-url-encode-string): Use `append' instead of `string-to-list' to
+	coerce a string to a list of chars.
+	(w3m-entity-regexp): Don't funcall `regexp-opt' directly for avoiding
+	compile warning.
+
+2001-03-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-exec-process): Add `delete-process' to clean up resources
+	of child process.
+
+2001-03-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* Makefile.in (default): Report errors if it has occurred while
+	examining modules.
+
+	* w3m.el: Add autoload for `w3m-remove-image' when compiling.
+	(w3m-charset-coding-system-alist): Use `coding-system-p' if the
+	function `find-coding-system' is not bound.
+
+	* w3mhack.el: Use `require' instead of `load' for loading "w3m" to
+	avoid undesirable newlines in stdout.
+
+2001-03-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-xmas.el: Require `wid-edit' when the widget `coding-system' is
+	not available.
+
+	* mime-w3m.el: Add autoload for `font-set-face-background' since it is
+	not auto-autoload'ed in XEmacs.
+
+	* w3mhack.el: Require `bytecomp'; make XEmacs don't warn for unused
+	non-global variables.
+
+2001-03-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el: Bind colon keywords only if it is not available.
+	(rfc2368-parse-mailto-url):
+	(w3m-form-parse-region):
+	(w3m-fontify-forms): Bind them only at the compile-time as autoload'ed
+	functions to avoid byte-compile warnings.
+
+	* w3mhack.el: Byte optimize `truncate-string' for replacing with
+	`truncate-string-to-width' if it is bound.
+
+	* mew-w3m.el (mew-w3m-minor-mode-setter): Defun it after defining some
+	variables.
+
+2001-03-15  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Makefile.in (default): Add `-k' option to continue byte-compile as
+	much as possible after an error.
+
+2001-03-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* Makefile.in (default): Don't use `for' loop.
+	* w3mhack.el (w3mhack-examine-modules): Use space instead of newline
+	for the module names separator.
+
+2001-03-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Removed functions and variables of bookmark.
+	* w3m-bookmark.el: New file.
+	* Makefile.in: Clean up rules and removed GNU-make depended functions.
+	* w3mhack.el (TopLevel): Load w3m.el.
+	(w3mhack-version): New function.
+	* .cvsignore: Add files generated by autoconf.
+
+2001-03-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3mhack.el (w3mhack-examine-modules): Renamed from
+	`w3mhack-examine-additional-modules'.
+	* Makefile.in: Ditto.
+
+2001-03-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* Makefile.in, aclocal.m4, configure.in, install-sh, w3mhack.el: New
+	files.
+	* Makefile: Removed.
+
+2001-03-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Split file.
+
+	* w3m-form.el: New file.
+
+2001-03-14  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m-xmas.el (w3m-insert-image): Don't use current cursor point to
+	make a new extent.
+
+	* w3m.el (w3m-region): Call `sit-for' to redisplay before image
+	display.
+	(w3m-goto-url): Ditto.
+	(w3m-exec-process): Use `sleep-for' instead of `sit-for'.
+	(w3m-toggle-inline-images): Set cursor point before image insertion.
+	(w3m-goto-url): Set cursor point before redisplay.
+
+2001-03-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-read-passwd): Removed.
+	(w3m-exec-filter): Use `read-passwd' instead of `w3m-read-passwd'.
+
+	* w3m-om.el (read-passwd): Added.
+
+2001-03-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m-om.el: Rewrite to insert "-" into the name of eol-type variants
+	of each newly generated coding-system.
+
+2001-03-14  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Split files.
+	(w3m-coding-system): Changed customize type.
+	(w3m-input-coding-system): Ditto.
+	(w3m-output-coding-system): Ditto.
+	(w3m-bookmark-file-coding-system): Ditto.
+	(w3m-url-encode-string): Removed redundant code for Mule-2.
+
+	* w3m-e21.el: New file.
+
+	* w3m-xmas.el: New file.
+
+	* w3m-om.el: New file.
+
+	* w3m-search.el (w3m-search-default-coding-system): Changed customize
+	type.
+	(w3m-search-engine-alist): Ditto.
+
+	* w3m-weather.el: Fix comments.
+
+2001-03-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el: Use the copy of info-vector for newly generated coding-
+	systems; use `eval-when-compile' separately from "cl" for loading
+	"cl-macs".
+
+2001-03-13  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Split files.
+	* w3m-search.el: New file.
+	* w3m-weather.el: New file.
+
+2001-03-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* w3m.el (w3m-rendering-region): Make no exceptions of Mule 2 in
+	coding-systems.
+	(w3m-download): Ditto.
+	(w3m-local-retrieve): Ditto.
+	(w3m-exec-process): Ditto.
+	(w3m-arrived-file-coding-system): Unified the default value to
+	`euc-japan'.
+	(w3m-bookmark-file-coding-system): Ditto.
+	(w3m-default-url-coding-system): Ditto.
+	(w3m-output-coding-system): Ditto.
+	(w3m-coding-system): Ditto.
+	(w3m-input-coding-system): Unified the default value to `iso-2022-jp'.
+	(TopLevel): Generate some coding-systems by copying for Mule 2.
+	(TopLevel): Load "cl-macs" if the macro `dolist' has been defined
+	incorrectly.
+
+2001-03-13  Masatake YAMATO  <jet@gyve.org>
+
+	* w3m.el (w3m-url-yrotsih): New variable.
+	(w3m-view-previous-page): Set w3m-url-yrotsih.  Use while/cdr instead
+	of nthcdr.
+	(w3m-view-next-page): New function.
+	(w3m-mode-map): Bind w3m-view-next-page.
+	(w3m-mode): Added w3m-view-next-page and w3m-view-parent-page to the
+	function document.
+	(w3m-reload-this-page): Guard w3m-url-yrotsih from resetting.
+	(w3m-exec): Reset yrotsih.
+
+2001-03-13  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-content-type-alist): [UNIX] Change method for text/html
+	type.
+
+2001-03-13  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>,
+	    TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Require `poem' when Mule 2.3 is running.  Bind keywods
+	`:case-ignore' and `:integer' for Mule 2.3.
+	(coding-system-category): New alias when Mule 2.3 is running.
+	(w3m-arrived-file-coding-system): Fix typo.
+	(w3m-entity-alist): Fix for Mule 2.3.
+	(w3m-form-method, w3m-form-action, w3m-form-plist, w3m-form-put,
+	w3m-form-get): Convert to old style of macro definition.
+	(w3m-fontify): Removed code to decode w3m-specific characters.
+	(w3m-decode-extended-characters): New function.
+	(w3m-rendering-region): Use an unibyte temporary buffer and call
+	`w3m-decode-extended-characters'.
+
+2001-03-13  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-exec-process): Return process exit status.
+	(w3m-w3m-get-header): Check the return value of w3m-exec-process.
+	(w3m-w3m-check-header): Check the return value of w3m-w3m-get-header.
+
+2001-03-13  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-exec-process): Check exit status and cause an error if it
+	is not zero.
+
+2001-03-12  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-executable-type): Use (eq system-type 'windows-nt) for
+	determination of win32.
+	(w3m-content-type-alist): Ditto.
+
+2001-03-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-which-command): Support executable suffix, `.exe' for
+	win32.
+
+2001-03-12  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-content-type-alist): Add 'use fiber.exe' alist for
+	Windows.
+	(w3m-w32-browser-with-fiber): New funciton.
+
+2001-03-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-which-command): New function.
+	(w3m-external-view): When no viewing method is defined, call
+	`w3m-download' as alternative method.  Added check which command exists
+	with `w3m-which-command'.
+
+2001-03-12  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-display-inline-image-status): Define as buffer local
+	variable.
+	(w3m-image-type): New function.
+	(w3m-image-type-available-p): Ditto.
+	(w3m-create-image): Check image type by `w3m-image-type-available-p'.
+	(w3m-exec): Accept all content-types in `w3m-retrieve'; Make an image
+	only page, if the image can be displayed inline; Call
+	`w3m-external-view' if the content-type of retrieved content is not
+	text nor image.
+
+2001-03-12  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-view-parent-page): Add a postfix '/' to parent-url.
+
+2001-03-12  Takaaki MORIYAMA  <taka@airlab.cs.ritsumei.ac.jp>
+
+	* w3m.el (w3m-extended-charcters-table): Add '\x80'.
+
+2001-03-12  Masatake YAMATO  <masata-y@is.aist-nara.ac.jp>
+
+	* w3m.el (w3m-view-parent-page): New command.
+	(w3m-mode-map): Add `w3m-view-parent-page'.
+
+2001-03-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* mime-w3m.el (mime-w3m-message-structure): Make variable buffer local
+	at top leve.
+
+2001-03-10  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-entity-alist): Eval at compile time.; Add character
+	entity references for ISO 8859-1 characters.
+
+2001-03-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-entity-regexp): New constant.
+	(w3m-fontify): Use `w3m-entity-regexp'.
+	(w3m-entity-value): Use defsubst, and fix typo.
+	(w3m-decode-anchor-string): New function.
+	(w3m-fontify-anchors): Decode `&amp;' exists in URL string.
+
+2001-03-09  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-create-image) [EMACS21,XEMACS]: Guard against error.
+
+	* mew-w3m.el (mew-w3m-auto-insert-image): New variable.
+	(mew-mime-text/html-w3m): Bind 'w3m-display-inline-image' with
+	'mew-w3m-auto-insert-image'.
+	(mew-w3m-cid-retrieve): New function. Fix wrong guess.
+
+2001-03-09  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-mode-map): Add `w3m-close-window', `w3m-view-source',
+	`w3m-view-header', and `w3m-history'.  Keybind of `w3m-quit' is
+	changed.
+	(w3m-close-window, w3m-about-source, w3m-view-source, w3m-about-header,
+	w3m-view-header, w3m-about-history, w3m-history): New functions.
+
+	* mime-w3m.el (mime-put-keymap-region): Removed.
+	(mime-w3m-save-background-color): Old name is
+	`mime-save-background-color'.
+	(mime-w3m-mode-map): Add workaround for `w3m-close-window',
+	`w3m-view-source', `w3m-view-header', and `w3m-history'.
+
+2001-03-09  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
+
+	* w3m.el (w3m-cid-retrieve-function-alist): New variable.
+	(w3m-retrieve): Add support for URLs which has `cid:' prefix.
+
+	* mime-w3m.el: Always require `w3m'.  Require `cl' when compiling.  Set
+	`w3m-cid-retrieve-function-alist'.
+	(mime-w3m-message-structure): New variable.
+	(mime-w3m-preview-text/html): Set `mime-w3m-message-structure'.
+	(mime-w3m-cid-retrieve): New function.
+
+2001-03-09  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-toggle-inline-images): Eliminated needless local
+	variable.
+	(toplevel): Encloses old emacs judgement with eval-and-compile; Define
+	`find-coding-system' using `w3m-static-if'.
+
+2001-03-08  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: All w3m-backlog-* symbols are renamed into w3m-cache-*, and
+	coupling of retrieve module and cache module are cleand up.
+	(w3m-keep-cache-size): Old name is `w3m-keep-backlog'.
+	(w3m-cache-buffer, w3m-cache-articles, w3m-cache-hashtb,
+	w3m-cache-setup, w3m-cache-shutdown, w3m-cache-contents,
+	w3m-cache-request-contents): These symbols are renamed.
+	(w3m-cache-header, w3m-cache-request-header): New function.
+	(w3m-work-buffer-list): New variable.
+	(w3m-get-buffer-create): New function.
+	(w3m-with-work-buffer): New macro.
+	(w3m-kill-all-buffer): New function.
+	(w3m-create-image, w3m-local-retrieve): Use `w3m-with-work-buffer'
+	instead of `with-current-buffer'.
+	(w3m-arrived-setup): Set `w3m-input-url-history' when its value is nil.
+	(w3m-arrived-shutdown): More strict error check.  This function is
+	added to `kill-emacs-hook'.
+	(w3m-w3m-get-header): New function.
+	(w3m-w3m-check-header): Use `w3m-w3m-get-header'.
+	(w3m-w3m-retrieve): Clean up code.
+	(w3m-download, w3m-exec): More strict error check.
+	(w3m-content-type): New optional argument `no-cache' is added.
+	(w3m-alive-p): New function.
+	(w3m-quit): Use `w3m-alive-p'.
+
+2001-03-08  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-local-retrieve): Bind 'auto conversion variables' to nil
+	when insert file with binary .
+
+2001-03-08  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-insert-image): Eliminated needless local variable.
+	(w3m-remove-image) [XEmacs]: Remove images at `end' too.
+	(w3m-fontify-images): Set `w3m-image-redundant' property if "img_alt"
+	string is upper case.
+	(w3m-toggle-inline-images): Fixed docstring; Insert and remove dummy
+	string if alt string has `w3m-image-redundant' property.
+
+2001-03-08  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el (w3m-fontify): Allow '_' char for element name.
+
+2001-03-08  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-display-inline-image-status): New variable.
+	(w3m-image-type-alist): Define as constant.
+	(w3m-anchor): Moved position.
+	(w3m-image): Ditto.
+	(w3m-action): Ditto.
+	(w3m-create-image): Added argument `no-cache'.
+	(w3m-remove-image): New function.
+	(w3m-fontify-images): Don't display inline image here.
+	(w3m-toggle-inline-images): New function.
+	(w3m-mode-map): Bind 't' to `w3m-toggle-inline-images'.
+	(w3m-goto-url): Call `w3m-toggle-inline-images'; Set
+	`w3m-display-inline-image-status'.
+	(w3m-region): Ditto.
+
+2001-03-08  Akihiro Arisawa  <ari@mbf.sphere.ne.jp>
+
+	* mime-w3m.el (mime-w3m-preview-text/html): Use
+	`mime-entity-fetch-field' instead of `mime-w3m-get-xref'.
+	(mime-w3m-get-xref): Removed.
+
+2001-03-07  Keisuke Nishida  <kxn30@po.cwru.edu>
+
+	* w3m.el (w3m-search-engine-alist): Added "rpmfind".
+	(w3m-fontify-anchors): Treat single quotes (') as quotation marks.
+
+2001-03-08  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Backlog module is separated from front-end functions and code
+	to access the list of arrived URLs is put in order.
+	(w3m-arrived-file): Renamed from `w3m-arrived-urls-file'.
+	(w3m-arrived-anchor-list): Removed variable.
+	(w3m-arrived-list-load, w3m-arrived-list-save, w3m-arrived-list-add,
+	w3m-save-position, w3m-restore-position): Removed functions.
+	(w3m-arrived-db-size): New constant.
+	(w3m-arrived-db, w3m-arrived-seq): New variables.
+	(w3m-arrived-p, w3m-arrived-add, w3m-arrived-setup,
+	w3m-arrived-shutdown, w3m-arrived-store-position,
+	w3m-arrived-restore-position): New functions.
+	(w3m-input-url): Follow changes.
+	(w3m-view-previous-page): Ditto.
+	(w3m-view-previous-point): Ditto.
+	(w3m-quit): Ditto.
+	(w3m-goto-url): Ditto.
+	(w3m-create-image): Clean up codes.
+
+2001-03-07  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-view-current-url-with-external-browser): Fix typo when
+	browse current URL.
+
+2001-03-07  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* w3m.el (w3m-create-image) [XEmacs]: Retrieve header to determine
+	image type when `w3m-local-content-type' failed.
+
+2001-03-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-arrived-file-coding-system): Default value is changed to
+	avoid unknown coding system error on XEmacs.
+	(w3m-input-url): Changed for old style `completing-read'.
+
+2001-03-07  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-download): Bind 'auto conversion variables' to nil.
+	(w3m-w3m-check-header): Fix search 'HTTP/1.[01] 200' method.
+	(inline-image-features): Patch from Yuuichi Teranishi san
+	<teranisi@gohome.org> at [emacs-w3m:00103].
+
+2001-03-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* mime-w3m.el: Renamed mime-w3m-preview-text/html from
+	w3m-mime-preview-text/html.  Check of user setting is required.
+	(mime-w3m-mode-map): New variable.
+	(mime-w3m-get-xref): New function.
+	(mime-w3m-view-this-url): Ditto.
+	(mime-w3m-mouse-view-this-url): Ditto.
+	(mime-w3m-preview-text/html): Use `mime-w3m-mode-map' insted of
+	`w3m-mode-map'.  Refer Xref: header to set `w3m-current-url'.
+	(mime-put-keymap-region): Define with `defmacro' instead of
+	`defmacro-maybe'.
+	(mime-save-background-color): Ditto.
+
+	* w3m.el (w3m-exec-filter): Improved code to process prompt string.
+
+2001-03-06  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-exec-filter): Delete Prompt string with process output
+	buffer.
+	(w3m-w3m-check-header): Check 'HTTP/1.[01] 200' for valid
+	'content-length'.
+	(w3m-w3m-retrieve): Cygwin binary data support. Remove Prompt handling.
+
+2001-03-06  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (emacs-w3m-version): New constant.
+	(find-coding-system): Removed duplicated definition.
+	(w3m-backlog-remove-oldest): Simplify.
+	(w3m-search): Fix typo in function document.
+
+2001-03-05  Keisuke Nishida  <kxn30@po.cwru.edu>
+
+	* w3m.el (w3m-anchor, w3m-image, w3m-action): Use defsubst.
+
+2001-03-05  Keisuke Nishida  <kxn30@po.cwru.edu>
+
+	* w3m.el (and-let*): Removed
+	(w3m-save-this-url): Updated.
+
+2001-03-06  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el (w3m-goto-previous-anchor): Fix mistake on merging w3-anchor
+	patch. Cursor should go to beginning of anchor previous.
+	(w3m-mode-map): Assign Shift-TAB key with w3m-previous-anchor.
+
+2001-03-06  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el (TOP): No need to load cl-macs explicitly.
+	(w3m-charset-coding-system-alist): Do not use doloop in defcustom
+	because it is not expanded in compile time.
+
+2001-03-05  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el: apply patch from Keisuke Nishida.  URL is hold in text
+	property as already expanded.  Some utility functions (w3m-anchor,
+	w3m-image, w3m-action) is defined and used.
+	(and-let*): New macro.
+	(w3m-fontify-anchors): Hold expanded url in text property.
+	(w3m-fontify-images): Likewise.
+	(w3m-expand-url): Save matching data.  Match pattern bug fix (by
+	gotoh).
+	(w3m-anchor): New function.
+	(w3m-image): New function.
+	(w3m-action): New function. (added by gotoh)
+	(w3m-view-this-url): Use new functions to extract text prop.
+	(w3m-mouse-view-this-url): Likewise.
+	(w3m-download-this-url): Likewise.
+	(w3m-print-this-url): Likewise.
+	(w3m-save-this-url): Likewise.
+	(w3m-goto-next-anchor): Likewise, and do not expand url.
+	(w3m-external-view): Remove 1st arg CONTENT-TYPE.
+	(w3m-next-anchor): Use and-let* macro and do not expand url.
+	(w3m-goto-previous-anchor): Use utility functions.
+	(w3m-bookmark-add-this-url): Likewise and refine.
+	(w3m-url-encode-string): Do not escape ':' and '/'.
+
+2001-03-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-retrieve): Add support for URLs which has `about:'
+	prefix.
+	(w3m-content-type): Likewise.
+	(w3m-about, w3m-about-weather, w3m-weather, w3m-weather-remove-headers,
+	w3m-weather-remove-footers, w3m-weather-remove-weather-images,
+	w3m-weather-remove-washing-images, w3m-weather-remove-futon-images,
+	w3m-weather-remove-week-weather-images, w3m-weather-insert-title): New
+	function.
+	(w3m-weather-url-alist): New associative list of AREA vs. URL.
+	(w3m-weather-default-area): New customize variable.
+	(w3m-weather-default-area): Ditto.
+	(w3m-entity-value): When unknown entity is specified, return original
+	string instead of null string.
+
+2001-03-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-url-encode-string): New function.
+	(w3m-escape-query-string): Use `w3m-url-encode-string'.
+	(w3m-form-make-get-string): Ditto.
+	(w3m-message): Changed to support Emacs-19.
+	(w3m-parse-attributes): Ditto.
+	(w3m-fontify): Refer `mc-flag' when mule is used.
+
+2001-03-05  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el (w3m-command-arguments): Make it as system constants user not
+	for user variable. User need not change this value.  "-S" options is
+	removed because it doesn't work for non Text/Plain object.
+	(w3m-default-url-coding-system): New variable.
+	(w3m-search-engine-alist): Change format to hold encoding type for
+	query string. And add some engines.
+	(w3m-fill-column): Born again variable. Positive value is for fixed
+	column, negative value is for fitting frame width.
+	(w3m-mode): Add key description of "<" and ">" in doc-string.
+	(w3m-escape-query-string): Add 2nd argument for coding system.
+	(w3m-search): Adapt to new format of w3m-search-engine-alist.
+
+2001-03-05  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-sub-list): Guard error for XEmacs (N must count from
+	zero).
+
+2001-03-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-search): Simplify.
+	(w3m-do-search): Removed.
+
+2001-03-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Merge form branch to main trunk.
+
+2001-03-05  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-form-new): Changed w3m-form structure.
+	(w3m-form-p): Likewise.
+	(w3m-form-put): Likewise.
+	(w3m-form-get): Likewise.
+	(w3m-form-plist): New macro.
+	(w3m-form-symbol): Removed.
+	(w3m-url-encode): Ditto.
+	(w3m-form-make-get-string): Follow change of w3m-form and use
+	w3m-escape-query-string instead of w3m-url-encode.
+	(w3m-parse-attributes): New macro.
+	(w3m-form-parse-region): Use w3m-parse-attributes.
+	(w3m-fontify-forms): Use w3m-parse-attributes.
+
+2001-03-05  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-content-type-alist): Add some content-type.
+	(w3m-w3m-retrieve): Change bind variables method to 'let*'.
+
+2001-03-05  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el (w3m-command-arguments): Add "-S" option for w3m.
+	(w3m-search-engine-alist): Add new spec for google with JA lang.
+	(w3m-current-url): Make variable buffer local at top leve.
+	(w3m-current-title): Likewise.
+	(w3m-url-history): Likewise.
+	(w3m-process-temp-file): Likewise.
+	(w3m-rendering-region): Do not make local variable for the reason
+	above.
+	(w3m-exec): Likewise.
+	(w3m-external-view): Likewise.
+	(w3m-goto-next-anchor): Bug fix.
+	(w3m-goto-previous-anchor): Bug fix.
+	(w3m-escape-query-string): Bug: Escape SPC char as "+" not "%20".
+
+2001-03-04  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-form-string-regexp): Add `eval-and-compile' to suprress
+	byte-compile error.
+	(w3m-form-p): Fix typo.
+	(w3m-mode-map): Swapped keybindings of w3m-scroll-left and
+	w3m-scroll-right to fit w3m's keybindings.
+
+2001-03-04  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el: Add Keisuke Nishida as author.
+	(TOP): Use thingatpt instead of ffap.
+	(w3m-fill-column): Obsoleted. Determine in dynamic.
+	(w3m-command-arguments): Specify as lambda
+	(w3m-command-arguments): Change initial value.
+	(w3m-search-engine-alist): Change spec more simple.
+	(w3m-input-url): Use thing-at-point.
+	(w3m-do-search): Adapt to new w3m-search-engine-alist spec.
+	(w3m-search): Change variable name and refine codes.
+
+	* w3m.el: (w3m-entity-value): Allow immediate entity (&#nnn).
+	(w3m-fontify): Likewise.
+
+2001-03-04  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el (w3m-delete-duplicated-empty-lines): New variable.
+	(w3m-search-engine-alist): New variable.
+	(w3m-default-search-engine): New variable.
+	(w3m-horizontal-scroll-columns): New variable.
+	(w3m-fontify): Change regexp to allow non-double-quoted string for href
+	attribute value of anchor tag. Remove duplicated empty lines for
+	compact view.
+	(w3m-mode-map): Add keymap "<" and ">" to scroll horizontaly.
+	(w3m-mode): Truncate lines.
+	(w3m-scroll-left): New interactive function.
+	(w3m-scroll-right): New interactive function.
+	(w3m-escape-query-string): New function.
+	(w3m-do-search): New function.
+	(w3m-search): New interactive function for searching word with various
+	search engine.
+
+2001-03-04  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Start implementation of code to process <form> tag.
+	(w3m-form-face): New face.
+	(w3m-current-forms): New internal variable.
+	(w3m-form-string-regexp): New internal constant.
+	(w3m-form-new, w3m-form-p, w3m-form-symbol, w3m-form-method,
+	w3m-form-action, w3m-form-put, w3m-form-get, w3m-url-encode,
+	w3m-form-make-get-string, w3m-form-parse-region, w3m-fontify-forms,
+	w3m-form-replace, w3m-form-input, w3m-form-submit, w3m-form-real-reset,
+	w3m-form-reset, w3m-fontify-bold, w3m-fontify-underline,
+	w3m-fontify-images): New function.
+	(w3m-fontify): Use new functions.
+	(w3m-mode-map): Add scroll-right and scroll-left.
+	(w3m-mode): Set t to `truncate-line'.
+
+2001-03-04  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el: Patch from Keisuke Nishida <kxn30@po.cwru.edu>.
+	(w3m-print-this-url): Do not save URL, print only.
+	(w3m-save-this-url): New function. Print and save URL under cursor.
+	(w3m-goto-next-anchor): New function.
+	(w3m-next-anchor): Move to top anchor from bottom.  Print URL after
+	move.
+	(w3m-goto-previous-anchor): New function.
+	(w3m-previous-anchor): Move to bottom anchor from top.  Print URL after
+	move.
+
+2001-03-04  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el: Patch from Keisuke Nishida <kxn30@po.cwru.edu>.
+	(TOP): Require ffap.el.
+	(w3m-input-url): Prompt with default URL, and use URL under cursor as
+	default if not specified.
+	(w3m): Do not specify default url for w3m-input-url.
+
+2001-03-02  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-backlog-enter): Overwrite backlog data when specified URL
+	is duplicated.
+	(w3m-home-page): Changed official emacs-w3m page's address to
+	namazu.org.
+
+2001-03-02  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Renamed w3m-http-* to w3m-w3m-* in order to prepare name
+	space of symbols processing HTTP protocol directly, and fix for cookie.
+	(w3m-w3m-check-header): Renamed from `w3m-http-check-header'.
+	(w3m-w3m-retrieve): Renamed from `w3m-http-retrieve' and added code to
+	remove cookies.
+	(w3m-retrieve): Follow changes of fuction name.
+	(w3m-download): Likewise and changed argument spec.
+	(w3m-exec): Changed argument spec.
+	(w3m-goto-url): Changed reload scheme,
+	(w3m-fontify): Move point to the top of the buffer before delete <?xml
+	... ?> tag.
+
+2001-03-02  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (TOP): Changed code to detect XEmacs and add to define
+	`find-coding-system'.
+	(w3m-backlog-setup): Changed caching data format.
+	(w3m-backlog-enter): Ditto and changed argument spec.
+	(w3m-backlog-request): Ditto and changed spec of return value.
+	(w3m-http-retrieve): Access backlog in this function and changed
+	argument spec.
+	(w3m-retrieve): Changed argument spec.
+	(w3m-exec): Clean up and chaned spec of return value.
+	(w3m-goto-url): Follow changes in `w3m-exec'.
+	(w3m-decode-buffer): Clean up.
+	(w3m-process-temp-file): New variable to suppress byte-compile warning.
+	(w3m-external-view): Use w3m-process-temp-file to suppress byte-compile
+	warning.
+	(w3m): Change `mode-line-buffer-identification'.
+
+2001-03-02  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el (w3m-home-page): Initialize as URL.
+
+2001-03-02  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el: Correcting wrong use of cygwin type filename usage, using
+	dolist macro, adding handling codes html character entities, correct
+	bug of w3m-view-bookmark on win32 environment, fixing some small bugs,
+	etc.
+	(w3m-url-to-file-name): New function.
+	(w3m-expand-file-name-as-url): Renamed from w3m-expand-file-name.
+	(w3m-bookmark-file): Initialize as native filename format.
+	(w3m-arrived-urls-file): Likewise.
+	(w3m-charset-coding-system-alist): Use dolist macro.
+	(w3m-entity-alist): New constant.
+	(w3m-entity-db): New variable.
+	(w3m-entity-db-size): New variable.
+	(w3m-entity-db-setup): New function.
+	(w3m-entity-value): New function
+	(w3m-fontify): Refine html character entity decoding.  Use dolist
+	macro. Some bug fix.
+	(w3m-exec-get-user): Simplify using dolist macro.
+	(w3m-bookmark-save): Likewise.
+	(w3m-local-content-type): Likewise.
+	(w3m-local-retrieve): Fix filename handling considering cygwin
+	convention by using w3m-local-file-name function.
+	(w3m-http-retrieve): Buf fix.
+	(w3m-rendering-region): Bug fix, use w3m-current-url.
+	(w3m-view-bookmark): Use w3m to do initialize on interactive call.
+	(w3m-find-file): Fix for renamed function.
+
+2001-03-01  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* Merge changes on `url' branch to main trunk.
+
+2001-03-01  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-home-page): Changed to official w3m.el page.
+	(w3m-anchor-face): Changed default face in dark backgraound.
+	(w3m-arrived-anchor-face): Ditto.
+	(w3m-download): Fix typo.
+	(w3m-content-type-alist): Accept .png file.
+	(w3m-external-view): Fix typo.
+	(w3m-view-image): Fix.
+
+2001-03-01  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* mew-w3m.el: New file to use w3m with Mew.
+
+2001-03-01  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* mime-w3m.el: New file to use w3m with SEMI.
+
+	* w3m.el (w3m-message): New function.
+	(w3m-verbose): New variable.
+	(w3m-process-message): Ditto.
+	(w3m-process-url): Removed.
+	(w3m-exec-process): Add code to show progress status.
+	(w3m-exec-filter): Fix prompt bug and clean up codes.
+	(w3m-retrieve): Changed arguments spec.
+	(w3m-local-retrieve): Ditto.
+	(w3m-http-retrieve): Ditto.
+	(w3m-pretty-length): New function.
+	(w3m-rendering-region): Add code to show progress status.
+
+2001-03-01  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-http-retrieve): Add adhoc fragment to avoid new-line
+	replacement.
+	(w3m-decode-buffer): Renamed from w3m-html-decode-buffer.
+
+2001-02-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-content-type-alist): Accept .htm as text/html.
+	(w3m-backlog-enter): Add code to memory w3m-current-title.
+	(w3m-backlog-request): Resume w3m-current-title from backlog data.
+	(w3m-html-decode-buffer): Change arguments spec.
+	(w3m-rendering-region): Removed code to set w3m-current-url.
+	(w3m-exec): Fix bug of proecessing text/plain files and changed data
+	format to preserve in backlog.
+
+2001-02-28  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el: Support XEmacs using APEL.
+	(w3m-fontify): Delete <?XML ... ?> tag for XHTML page.
+	(w3m-input-url): Do not use 7th arg of completing-read for XEmacs
+	support.
+	(w3m-bookmark-save): Check bookmark file is writable.
+
+2001-02-28  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el (w3m-bookmark-add): Fix problem of adding bookmark first time.
+
+2001-02-28  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Reconstructed drastically and removed w3 depended codes.
+
+2001-02-28  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el (w3m-executable-type): New variable.
+	(w3m-cygwin-path): New function.
+	(w3m-region): New function.
+
+2001-02-26  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-fontify): Add code to decode w3m-specific extended
+	charcters.
+	(w3m-extended-charcters-table): New constant.
+
+2001-02-08  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-async-exec): New customizable variable.
+	(w3m-exec-process): Use 'w3m-async-exec' instead of 'w3m-process-type'.
+
+2001-02-07  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el: Fixed small and thoughtless bugs...
+	(w3m-bookmark-file-modified-p): Bug fix.
+	(w3m-bookmark-save): Bug fix. Don't forget time stamp updating.
+	(w3m-bookmark-add): Bug fix. Function name miss-typing.
+
+2001-02-07  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el: Add bookmark operations. This feature is very ad-hoc.
+	Support loading w3m's bookmark file into internal bookmark data, adding
+	new entry interactively, and saving data as w3m's bookmark file format.
+	(w3m-bookmark-file-coding-system): New user varible.
+	(w3m-bookmark-data): New internal variable.
+	(w3m-bookmark-file-time-stamp): ditto.
+	(w3m-bookmark-section-history): ditto.
+	(w3m-bookmark-title-history): ditto.
+	(w3m-mode-map): Add bookmark operation functions to mode map.
+	(w3m-bookmark-file-modified-p): New function.
+	(w3m-bookmark-parse): ditto.
+	(w3m-bookmark-load): ditto.
+	(w3m-bookmark-save): ditto.
+	(w3m-bookmark-data-prepare): ditto.
+	(w3m-bookmark-add): ditto.
+	(w3m-bookmark-add-this-url): ditto.
+	(w3m-bookmark-add-current-url): ditto.
+
+2000-12-12  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el (w3m-sub-list, w3m-load-list, w3m-save-list): New utility
+	function.
+	(w3m-arrived-list-load): Refine and move out common code into
+	w3m-load-list.
+	(w3m-arrived-list-save): Refine and move out common code into
+	w3m-save-list and w3m-sub-list. (Previous code had side effect of
+	nreverse).
+
+2000-12-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* makepatch.pl, Makefile, .cvsignore: New files.
+
+2000-10-26  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-view-this-url): Chang optinal argument 'arg'.
+	(w3m-next-anchor, w3m-previous-anchor): Bind 'pos'.
+	(w3m-fontify): Put mouse-face at anchor and image property.
+	(w3m-mouse-view-this-url): Handling 'w3m-image property.
+
+2000-10-20  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-process-type): Change default valule to 'start-process.
+	(w3m-process-user-counter): New buffer local variable.
+	(w3m-exec-get-user): New funciton, get user and passwd from
+	w3m-arrived-user-list.
+	(w3m-exec-filter): Use w3m-exec-get-user().
+
+2000-10-18  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-view-previous-point): New function.
+	(w3m-expand-url): If BASE is nil, it set "".
+	(w3m-download-this-url): w3m-refontify-anchor() exec when finished
+	download.
+
+2000-10-16  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-arrived-ct-file, w3m-arrived-file-cs,
+	w3m-always-html-url-regex): New variables.
+	(w3m-process-type): Change name from w3m-exec-process-type.
+	(w3m-refontify-anchor): New funcition.
+	(w3m-exec): Pre-check content-type.
+	(w3m-exec-w3m-ctcheck): New funcition, check context-type for URL.
+	(w3m-exec-w3m): New funcion, execute w3m.
+	(w3m-exec-ftp): New function, execute dired-other-window() or
+	copy-file(), if URL is 'ftp://'.
+	(w3m-convert-ftp-to-emacsen): Change 'ftp://' to '/user@host:/' from
+	elisp ML.
+	(w3m-download-this-url, w3m-save-image, w3-view-image): Use w3
+	features.
+
+2000-10-12  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (top-level): Add authors.
+	(w3m-expand-url): Check relative URL first.
+	(w3m-fontify): Add original text properties when replace 'escaped
+	character'.
+
+2000-10-11  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+	* w3m.el (w3m-mailto-url-function, w3m-use-cygdrive,
+	w3m-default-save-dir, w3m-arrived-list-file, w3m-arrived-list-keep,
+	w3m-arrived-anchor-face, w3m-exec-process-type,
+	w3m-process-connection-type, w3m-arrived-anchor-list): New user
+	custumize variables.
+	(w3m-mode): Change doc-string for key binding.
+	(w3m-arrived-list-add, w3m-arrived-list-load, w3m-arrived-list-save):
+	New functions for handling arrived anchor.
+	(w3m-fontify): Add arrived anchor face.
+	(w3m-exec-process, w3m-exec-filter, w3m-exec-sentinel): New functions
+	for asynchronous w3m execution.
+	(w3m-find-file, w3m-read-file-name, w3m-read-passwd): New miscellaneous
+	functions.
+	(w3m-expand-file-name): Support old cygwin.
+	(w3m-view-current-url-with-external-browser): If w3m-browser-command is
+	function, funcall it.
+	(w3m-mailto-url): If w3m-mailto-url-function is function, funcall it.
+	(w3m-mode-map): If running xemacs, use (button2) instead of (mouse-2).
+
+2000-09-21  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el (w3m): Cancel last change, use switch-to-buffer again.
+
+2000-09-20  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el (w3m): Do not switch buffer if w3m window already exists.
+
+2000-09-20  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Add declaration of dependency on APEL.
+	(w3m-quit): When other w3m buffers exist, don't destruct cache.
+	(w3m-browse-url): New function.
+
+2000-09-20  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el (w3m-command-arguments): Remove option -m, that's not good for
+	bookmark / local file handling.
+
+2000-09-19  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el (w3m-command-arguments): Add -m option explicitly.
+	(w3m-exec): Ad-hoc change to view .txt object. It's temporary
+	fix. Should we consider type? w3m option -dump_head may help us.
+	(w3m-exec): Get title and remove both format <title_alt> and <title>.
+	(w3m-view-this-url): Force reloading by prefix.
+	(w3m-view-current-url-with-external-browser): Works correctly.
+	(w3m-print-current-url): Push url to kill king to paste later.
+	(w3m-print-this-url): ditto.
+	(w3m-mailto-url): Use rfc2368.el instead of mailto.el.
+	(w3m-goto-url): Add 2nd argument RELOAD to withdraw data cached on
+	emacs.
+	(w3m-reload-this-page): Simplified by using new w3m-goto-url.
+	(w3m): Set mode-line-buffer-identification after changing major mode
+	because it overwrite that variable.
+
+2000-09-19  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el (w3m-fontify): Add code to handle irregular ordered elements
+	of anchor tags.
+	(w3m-mailto-url): Adopt for Emacs-19.
+	(w3m-input-url): Call `w3m-backlog-setup' to initialize
+	`w3m-backlog-hashtb'.
+
+2000-09-19  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el (w3m): Sorry, over paren.
+
+2000-09-18  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el (w3m-exec): Get title correctly within -halfdump format of
+	w3m.
+	(w3m-mouse-view-this-url): New function to view page by clicking mouse
+	middle button.
+	(w3m-mode-map): Assign mouse middle button to view page.
+	(w3m): Change mode-line spec to show title of current page.
+
+2000-09-18  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Add authors.
+
+2000-09-18  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el (w3m-input-url): Enter url with completion. Candidates are
+	visited url kept in w3m-backlog-hashtb.
+	(w3m-backlog-setup): Change hash size as prime number and initialized
+	with value 0 for obarray.
+	(w3m-backlog-remove): Remove unused 2nd arg NUMBER and remove when
+	block to check NUMBER.
+	(w3m-exec): Show message "Loading..." while loading.
+	(w3m-save-position): New function to keep display position in Emacs
+	window into hash symbol, but I think this is not best way.
+	(w3m-restore-position): New function to restore display position.
+	(w3m-view-previous-page): Restore display position.
+	(w3m-expand-url): Canonicalize url, ex. "http://www.host.org" to
+	"http://www.host.org/".  Change regexp to allow "mailto:" protocol.
+	Remove drive letter as side-effect using expand-file-name to expand url
+	for Win32 emacen.
+	(w3m-expand-file-name): New function to alternates expand-file-name
+	function with convert drive letter prefixed path to cygwin path.
+	i.e. c:/users/home to /cygdrive/c/users/home
+	(w3m-view-bookmark): Expand bookmark filename as cygwin path format to
+	pass to w3m.
+	(w3m-mode-map): Add new key binding 'B' to back to previous page.  Add
+	new key binding 'R' to force reloading current page.
+	(w3m-mailto-url): New function to support mailto: protocol.  It use
+	rfc2368.el if available.
+	(w3m-goto-url): Ad-hoc support mailto: protocol. We should consider
+	more...
+	(w3m-reload-this-page): New function to reload current page.
+
+2000-09-18  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
+
+	* w3m.el (w3m): Add 2nd arguemnt to use with browse url.  This is patch
+	from Satoru Takabayashi <satoru-t@is.aist-nara.ac.jp> in ELF-ML, Seq#
+	875.
+	(w3m-fontify): Change regexp for <a ...> tag to allow newline in
+	between attributes.  This is patch from Satoru Takabayashi
+	<satoru-t@is.aist-nara.ac.jp> in ELF-ML, Seq# 876.
+	(w3m-fontify): Allow un-ended tag for name attribute, is it w3m bug?).
+	This is Patch from Satoru Takabayashi <satoru-t@is.aist-nara.ac.jp> in
+	ELF-ML, Seq# 876.
+
+2000-07-13  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Added handling of name anchors. Add comments.
+
+2000-07-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Improved to handle multi buffer. Fix broken cache and order
+	of fontify.
+
+2000-07-01  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: Handle &-sequence. Add history and cache.
+
+2000-06-25  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* w3m.el: New file.
+
+
+Local Variables:
+coding: iso-2022-7bit
+fill-column: 79
+indent-tabs-mode: t
+End:

=== added file 'share/emacs/site-lisp/w3m/mew-w3m.el'
--- share/emacs/site-lisp/w3m/mew-w3m.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/mew-w3m.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,474 @@
+;; mew-w3m.el --- View Text/Html content with w3m in Mew
+
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Author: Shun-ichi GOTO  <gotoh@taiyo.co.jp>,
+;;         Hideyuki SHIRAI <shirai@meadowy.org>
+;; Created: Wed Feb 28 03:31:00 2001
+;; Version: $Revision: 1.69 $
+;; Keywords: Mew, mail, w3m, WWW, hypermedia
+
+;; This file is a part of emacs-w3m.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; This package is for viewing formatted (rendered) Text/Html content
+;; in Mew's message buffer.
+
+;;; Installation:
+
+;; (1) Simply load this file and add followings in your ~/.mew file.
+;;
+;; (require 'mew-w3m)
+;;
+;; (2) And you can use keymap of w3m-mode as mew-w3m-minor-mode.
+;; To activate this feaeture, add followings also:
+;;
+;; (setq mew-use-w3m-minor-mode t)
+;; (add-hook 'mew-message-hook 'mew-w3m-minor-mode-setter)
+;;
+;; (3) If you use mew-1.95b118 or later on which Emacs 21, 22 or XEmacs,
+;; can display the images in the Text/Html message.
+;; To activate this feaeture, add following in your ~/.mew file.
+;;
+;; (define-key mew-summary-mode-map "T" 'mew-w3m-view-inline-image)
+;;
+;; Press "T":    Toggle the visibility of the images included its message only.
+;; Press "C-uT": Display the all images included its Text/Html part."
+;;
+;; (4) You can use emacs-w3m to fetch and/or browse
+;; `external-body with URL access'. To activate this feaeture,
+;; add followings also:
+;;
+;; (setq mew-ext-url-alist
+;;      '(("^application/" "Fetch by emacs-w3m" mew-w3m-ext-url-fetch nil)
+;;        (t "Browse by emacs-w3m" mew-w3m-ext-url-show nil)))
+;;  or
+;; (setq mew-ext-url-alist
+;;      '((t "Browse by emacs-w3m" mew-w3m-ext-url-show nil)))
+;;
+
+;;; Usage:
+
+;; There's nothing special. Browse messages in usual way.
+;; On viewing Text/Html file, rendered text is appeared in message
+;; buffer instead of usual "HTML" banner.
+;; C-c C-e operation is also allowed to view with external browser.
+;;
+;; If mew-use-w3m-minor-mode is t, key operations of w3m-mode is
+;; allowed (as minor-mode-map) and jump links in message buffer.
+;; NOTE: This feature is not complete. You may confuse.
+;;
+;;
+
+;;; Code:
+
+(require 'mew)
+(require 'w3m)
+(eval-when-compile (require 'cl))
+
+;;; initializer for mew
+(defgroup mew-w3m nil
+  "mew-w3m - Inline HTML rendering extension of Mew"
+  :group 'w3m)
+
+(defcustom mew-use-w3m-minor-mode nil
+  "*Use w3m minor mode in message buffer.
+Non-nil means that the minor mode whose keymap contains keys binded to
+some emacs-w3m commands are activated in message buffer, when viewing
+Text/Html contents."
+  :group 'mew-w3m
+  :type 'boolean)
+
+(defcustom mew-w3m-auto-insert-image nil
+  "*If non-nil, images are inserted automatically in Multipart/Related message.
+This variable is effective only in XEmacs, Emacs 21 and Emacs 22."
+  :group 'mew-w3m
+  :type 'boolean)
+
+(defcustom mew-w3m-cid-retrieve-hook nil
+  "*Hook run after cid retrieved"
+  :group 'mew-w3m
+  :type 'hook)
+
+(defcustom mew-w3m-region-cite-mark "&gt;&nbsp;"
+  "*Method of converting `blockquote'."
+  :group 'mew-w3m
+  :type '(choice (const :tag "Use Indent" nil)
+		 (const :tag "Use Cite Mark \"> \"" "&gt;&nbsp;")
+		 (string :tag "Use Other Mark")))
+
+(defconst mew-w3m-safe-url-regexp "\\`cid:")
+
+;; Avoid bytecompile error and warnings.
+(eval-when-compile
+  (defvar mew-use-text/html)
+  (unless (fboundp 'mew-current-get-fld)
+    (autoload 'mew-coding-system-p "mew")
+    (autoload 'mew-current-get-fld "mew")
+    (autoload 'mew-current-get-msg "mew")
+    (autoload 'mew-syntax-get-entry-by-cid "mew")
+    (defun mew-cache-hit (&rest args) ())))
+
+(defmacro mew-w3m-add-text-properties (props)
+  `(add-text-properties (point-min)
+			(min (1+ (point-min)) (point-max))
+			,props))
+
+(defun mew-w3m-minor-mode-setter ()
+  "Check message buffer and activate w3m-minor-mode."
+  (w3m-minor-mode (or (and (get-text-property (point-min) 'w3m)
+			   mew-use-w3m-minor-mode)
+		      0)))
+
+(defvar mew-w3m-use-safe-url-regexp t)
+
+(defun mew-w3m-view-inline-image (&optional allimage)
+  "Display the images of Text/Html part.
+\\<mew-summary-mode-map>
+'\\[mew-w3m-view-inline-image]'	Toggle display the images included its message only.
+'\\[universal-argument]\\[mew-w3m-view-inline-image]'	Display the all images included its Text/Html part."
+  (interactive "P")
+  (mew-summary-msg-or-part
+   (if allimage
+       (let ((mew-use-text/html t)
+	     (mew-w3m-auto-insert-image t)
+	     (mew-w3m-use-safe-url-regexp nil))
+	 (mew-summary-display 'force))
+     (with-current-buffer (mew-buffer-message)
+       (let* ((image (get-text-property (point-min) 'w3m-images))
+	      (w3m-display-inline-images image)
+	      (w3m-safe-url-regexp (when mew-w3m-use-safe-url-regexp
+				     mew-w3m-safe-url-regexp)))
+	 (w3m-toggle-inline-images)
+	 (mew-elet
+	  (mew-w3m-add-text-properties `(w3m-images ,(not image)))
+	  (set-buffer-modified-p nil)))))))
+
+(defun mew-w3m-region (start end &optional url charset)
+  "w3m-region with inserting the cite mark."
+  (if (null mew-w3m-region-cite-mark)
+      (w3m-region start end url charset)
+    (save-restriction
+      (narrow-to-region start end)
+      (let ((case-fold-search t)
+	    pos lines tagbeg0 tagend0 tagbeg1 tagend1)
+	(goto-char (point-min))
+	(while (w3m-search-tag "blockquote")
+	  (setq tagbeg0 (match-beginning 0))
+	  (setq tagend0 (match-end 0))
+	  (when (w3m-search-tag "/blockquote")
+	    (setq tagbeg1 (match-beginning 0))
+	    (setq tagend1 (match-end 0))
+	    (setq lines (buffer-substring tagend0 tagbeg1))
+	    (delete-region tagbeg0 tagend1)
+	    (insert (with-temp-buffer
+		      (insert lines)
+		      (goto-char (point-min))
+		      (if (and (w3m-search-tag "pre")
+			       (setq tagbeg0 (match-beginning 0))
+			       (setq tagend0 (match-end 0))
+			       (w3m-search-tag "/pre")
+			       (setq tagbeg1 (match-beginning 0))
+			       (setq tagend1 (match-end 0)))
+			  (progn
+			    (delete-region tagbeg1 tagend1)
+			    (delete-region tagbeg0 tagend0))
+			;; delete <br>
+			(goto-char (point-min))
+			(while (w3m-search-tag "br")
+			  (delete-region (match-beginning 0) (match-end 0))
+			  (unless (looking-at "[\n\r]") (insert "\n"))))
+		      (goto-char (point-max))
+		      (skip-chars-backward " \t\n\f\r")
+		      (delete-region (point) (point-max))
+		      (goto-char (point-min))
+		      (skip-chars-forward " \t\n\f\r")
+		      (delete-region (point-min) (point))
+		      (goto-char (point-min))
+		      (while (not (eobp))
+			(insert mew-w3m-region-cite-mark)
+			(forward-line 1))
+		      (goto-char (point-min))
+		      (insert "<pre>\n")
+		      (goto-char (point-max))
+		      (insert "\n</pre>\n")
+		      (buffer-substring (point-min) (point-max)))))))
+      (w3m-region (point-min) (point-max) url charset))))
+
+;; processing Text/Html contents with w3m.
+(defun mew-mime-text/html-w3m (&rest args)
+  "View Text/Html contents with w3m rendering output."
+  (let ((w3m-display-inline-images mew-w3m-auto-insert-image)
+	(w3m-safe-url-regexp (when mew-w3m-use-safe-url-regexp
+			       mew-w3m-safe-url-regexp))
+	w3m-force-redisplay	;; don't redraw
+	charset wcs xref
+	cache begin end params execute)
+    (if (= (length args) 2)
+	;; Mew-2
+	(setq begin (nth 0 args) end (nth 1 args))
+      ;; Old Mew
+      (setq cache (nth 0 args))
+      (setq begin (nth 1 args))
+      (setq end (nth 2 args))
+      (setq params (nth 3 args))
+      (setq execute (nth 4 args)))
+    (if (and cache (or execute (<= end begin)))
+	;; 'C-cC-e' + Old Mew
+	(apply 'mew-mime-text/html (list cache begin end params execute))
+      (save-excursion
+	;; search Xref: Header in SHIMBUN article
+	(when cache (set-buffer cache))
+	(goto-char (point-min))
+	(when (re-search-forward mew-eoh nil t)
+	  (let ((eoh (point))
+		(case-fold-search t))
+	    (goto-char (point-min))
+	    (when (and (re-search-forward "^X-Shimbun-Id: " eoh t)
+		       (goto-char (point-min))
+		       (re-search-forward "^Xref: \\(.+\\)\n" eoh t))
+	      (setq xref (match-string 1))
+	      (w3m-static-if (fboundp 'match-string-no-properties)
+		  (setq xref (match-string-no-properties 1))
+		(setq xref (match-string 1))
+		(set-text-properties 0 (length xref) nil xref))))))
+      (mew-elet
+       (cond
+	((and (null cache) (eq w3m-type 'w3m-m17n))
+	 ;; Mew-2 + w3m-m17n.
+	 ;; Coding-system and charset are decided by Mew.
+	 (let ((w3m-input-coding-system w3m-input-coding-system)
+	       (w3m-output-coding-system w3m-output-coding-system)
+	       (w3m-halfdump-command-arguments w3m-halfdump-command-arguments))
+	   (when (setq charset (mew-charset-guess-region begin end))
+	     (setq wcs (mew-charset-to-cs charset)))
+	   (when (and charset wcs (mew-coding-system-p wcs))
+	     ;; guess correctly and not us-ascii
+	     (setq w3m-input-coding-system wcs)
+	     (setq w3m-output-coding-system wcs)
+	     (setq w3m-halfdump-command-arguments
+		   (list "-halfdump"
+			 "-I" charset "-O" charset
+			 "-o" "ext_halfdump=1"
+			 "-o" "pre_conv=1"
+			 "-o" "strict_iso2022=0")))
+	   (mew-w3m-region begin end xref)))
+	((null cache)	;; Mew-2 + w3m, w3mmee
+	 (mew-w3m-region begin end xref (mew-charset-guess-region begin end)))
+	(t		;; Old Mew
+	 (setq charset (or (mew-syntax-get-param params "charset")
+			   (with-current-buffer cache
+			     (mew-charset-guess-region begin end))))
+	 (if charset
+	     (setq wcs (mew-charset-to-cs charset))
+	   (setq wcs mew-cs-text-for-write))
+	 (mew-frwlet
+	     mew-cs-dummy wcs
+	   (mew-w3m-region (point)
+			   (progn (insert-buffer-substring cache begin end)
+				  (point))
+			   xref))))
+       (mew-w3m-add-text-properties `(w3m t w3m-images ,mew-w3m-auto-insert-image))))))
+
+(defvar w3m-mew-support-cid (and (boundp 'mew-version-number)
+				 (fboundp 'mew-syntax-get-entry-by-cid)))
+
+(defun mew-w3m-cid-retrieve (url &rest args)
+  (let ((output-buffer (current-buffer)))
+    (with-current-buffer w3m-current-buffer
+      (when (and w3m-mew-support-cid
+		 (string-match "^cid:\\(.+\\)" url))
+	(setq url (match-string 1 url))
+	(let* ((fld (mew-current-get-fld (mew-frame-id)))
+	       (msg (mew-current-get-msg (mew-frame-id)))
+	       (cache (mew-cache-hit fld msg 'must-hit))
+	       (syntax (mew-cache-decode-syntax cache))
+	       cidstx beg end)
+	  (if (string< "4.0.53" mew-version-number)
+	      (setq cidstx (mew-syntax-get-entry-by-cid syntax (concat "<" url ">")))
+	    (setq cidstx (mew-syntax-get-entry-by-cid syntax url)))
+	  (when cidstx
+	    (setq beg (mew-syntax-get-begin cidstx))
+	    (setq end (mew-syntax-get-end cidstx))
+	    (prog1
+		(with-current-buffer output-buffer
+		  (set-buffer-multibyte t)
+		  (insert-buffer-substring cache beg end)
+		  (set-buffer-multibyte nil)
+		  (downcase (car (mew-syntax-get-ct cidstx))))
+	      (run-hooks 'mew-w3m-cid-retrieve-hook))))))))
+
+(when w3m-mew-support-cid
+  (push (cons 'mew-message-mode 'mew-w3m-cid-retrieve)
+	w3m-cid-retrieve-function-alist))
+
+(defun mew-w3m-ext-url-show (dummy url)
+  (pop-to-buffer (mew-buffer-message))
+  (w3m url))
+
+(defun mew-w3m-ext-url-fetch (dummy url)
+  (lexical-let ((url url)
+		(name (file-name-nondirectory url))
+		handler)
+    (w3m-process-do
+	(success (prog1
+		     (w3m-download url nil nil handler)
+		   (message "Download: %s..." name)))
+      (if success
+	  (message "Download: %s...done" name)
+	(message "Download: %s...failed" name))
+      (sit-for 1))))
+
+(defun w3m-mail-compose-with-mew (source url charset content-type
+					 to subject other-headers)
+  "Compose a mail using Mew."
+  (when (one-window-p)
+    (split-window))
+  (select-window (next-window))
+  (condition-case nil
+      (unless (and (boundp 'mew-init-p) mew-init-p
+		   (progn
+		     (mew-summary-jump-to-draft-buffer)
+		     (and (eq major-mode 'mew-draft-mode)
+			  (y-or-n-p "Attatch this draft? "))))
+	(mew-user-agent-compose to subject other-headers))
+    (quit
+     (if (y-or-n-p "Create new draft? ")
+	 (mew-user-agent-compose to subject other-headers)
+       (delete-window)
+       (error "Abort mail composing"))))
+  (let* ((basename (file-name-nondirectory (w3m-url-strip-query url)))
+	 (ct (downcase  content-type))
+	 (mew-attach-move-next-after-copy nil)
+	 (i 1)
+	 (pos -1)
+	 (csorig (mew-charset-to-cs (symbol-name charset)))
+	 last filename cs)
+    (unless (mew-attach-p)
+      (mew-draft-prepare-attachments))
+    ;; goto last attachment
+    (setq last (catch 'last
+		 (while (not (= pos (point)))
+		   (setq i (1+ i))
+		   (mew-attach-goto-number 'here `(,i))
+		   (when (mew-attach-line-lastp)
+		     (throw 'last t)))))
+    (when (eq csorig mew-cs-unknown)
+      (setq csorig nil))
+    (if (or (not last) (not (mew-attach-not-line012-1)))
+	(message "Can not attach from emacs-w3m here!")
+      ;; Application/.*xml is not inline view with Mew.
+      (cond
+       ((string= "application/xhtml+xml" ct)
+	(setq ct "text/html"))
+       ((string-match "^application/.*xml$" ct)
+	(setq ct "text/xml")))
+      (setq filename (expand-file-name (cond
+					((and (string-match "^[\t ]*$" basename)
+					      (string= ct "text/html"))
+					 "index.html")
+					((and (string-match "^[\t ]*$" basename)
+					      (string= ct "text/xml"))
+					 "index.xml")
+					((string-match "^[\t ]*$" basename)
+					 "dummy")
+					(t
+					 basename))
+				       mew-temp-dir))
+      (with-temp-buffer
+	(cond
+	 ((string= "text/html" ct)
+	  (insert source)
+	  (setq cs (w3m-static-if (fboundp 'mew-text/html-detect-cs)
+		       (mew-text/html-detect-cs (point-min) (point-max))))
+	  (when (or (eq cs mew-cs-unknown) (not cs))
+	    (cond
+	     (csorig
+	      (setq cs csorig))
+	     (t
+	      (setq cs mew-cs-autoconv)))))
+	 ((string= "text/xml" ct)
+	  (insert source)
+	  (setq cs (w3m-static-if (fboundp 'mew-text/html-detect-cs)
+		       (mew-text/html-detect-cs (point-min) (point-max))))
+	  (when (or (eq cs mew-cs-unknown) (not cs))
+	    (cond
+	     (csorig
+	      (setq cs csorig))
+	     ((mew-coding-system-p 'utf-8)
+	      (setq cs 'utf-8))
+	     (t
+	      (setq cs mew-cs-autoconv)))))
+	 ((string-match "^text/" ct)
+	  (insert source)
+	  (setq cs mew-cs-autoconv))
+	 (t
+	  (mew-set-buffer-multibyte nil)
+	  (insert source)
+	  (setq cs mew-cs-binary)))
+	(setq charset (cond
+		       ((eq cs mew-cs-autoconv)
+			(mew-charset-guess-region (point-min) (point-max)))
+		       ((eq cs mew-cs-binary)
+			nil)
+		       (t
+			(mew-cs-to-charset cs))))
+	(mew-frwlet
+	    mew-cs-text-for-read cs
+	  (write-region (point-min) (point-max) filename nil 'nomsg)))
+      (when ct
+	(setq ct (mew-capitalize ct)))
+      (mew-attach-copy filename (file-name-nondirectory filename))
+      ;; content-type check & set
+      (let* ((nums (mew-syntax-nums))
+	     (syntax (mew-syntax-get-entry mew-encode-syntax nums))
+	     (file (mew-syntax-get-file syntax))
+	     (ctl (mew-syntax-get-ct syntax))
+	     (ct-orig (mew-syntax-get-value ctl 'cap))
+	     cte)
+	(unless (string= ct ct-orig)
+	  (setq ctl (list ct))
+	  (mew-syntax-set-ct syntax ctl)
+	  (setq cte (mew-ctdb-cte (mew-ctdb-by-ct ct)))
+	  (mew-syntax-set-cte syntax cte)
+	  (mew-syntax-set-cdp syntax (mew-syntax-cdp-format ct file))
+	  (mew-encode-syntax-print mew-encode-syntax)))
+      ;; charset set
+      (let* ((nums (mew-syntax-nums))
+	     (syntax (mew-syntax-get-entry mew-encode-syntax nums))
+	     (file (mew-syntax-get-file syntax))
+	     (ctl (mew-syntax-get-ct syntax))
+	     (ct (mew-syntax-get-value ctl 'cap))
+	     (params (mew-syntax-get-params ctl))
+	     (ocharset "charset"))
+	(when (and (string-match "^Text" ct) charset)
+	  (setq params (mew-delete ocharset params))
+	  (setq ctl (cons ct (cons (list ocharset charset) params)))
+	  (mew-syntax-set-ct syntax ctl))
+	(mew-syntax-set-cd syntax url)
+	(mew-encode-syntax-print mew-encode-syntax))
+      (message "Compose a mail using Mew with %s...done" url)
+      (when (and (file-exists-p filename) (file-writable-p filename))
+	(delete-file filename)))))
+
+;;;
+(provide 'mew-w3m)
+
+;; mew-w3m.el ends here

=== added file 'share/emacs/site-lisp/w3m/mime-w3m.el'
--- share/emacs/site-lisp/w3m/mime-w3m.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/mime-w3m.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,227 @@
+;;; mime-w3m.el --- mime-view content filter for text
+
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Author: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
+;;         Akihiro Arisawa    <ari@mbf.sphere.ne.jp>
+;; Keywords: HTML, MIME, multimedia, mail, news
+
+;; This file is *NOT* yet part of SEMI (Suite of Emacs MIME Interfaces).
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+
+;;; Install:
+
+;; (1) Install SEMI.
+;; (2) Put this file to appropriate directory.
+;; (3) Write these following code to your ~/.emacs or ~/.gnus.
+;;
+;;        (require 'mime-w3m)
+
+
+;;; Code:
+
+(eval-when-compile
+  (require 'cl)
+  ;; mime-parse.el should be loaded before mime.el so as not to make
+  ;; `mime-uri-parse-cid' an autoloaded function to which the byte
+  ;; compiler might issue a nonsense warning.
+  (require 'mime-parse)
+  (require 'mime)
+  (require 'w3m)
+  (defvar mime-preview-condition)
+  (defvar mime-setup-enable-inline-html)
+  (defvar mime-view-mode-default-map))
+
+(eval-and-compile
+  (when (featurep 'xemacs)
+    (require 'font)))
+
+(defcustom mime-w3m-display-inline-images 'default
+  "*Non-nil means that inline images are displayed.
+When this option is equal to `default',
+`w3m-default-display-inline-images' is refered instead of this option,
+to decide whether inline images are displayed."
+  :group 'w3m
+  :group 'mime-view
+  :type '(radio (const :format "%v " nil)
+		(sexp :format "non-nil "
+		      :match
+		      (lambda (widget value)
+			(and value (not (eq value 'default))))
+		      :value-to-internal
+		      (lambda (widget value)
+			(if (and value (not (equal value "default")))
+			    (widget-sexp-value-to-internal widget value)
+			  "t")))
+		(const default)))
+
+(defcustom mime-w3m-safe-url-regexp "\\`cid:"
+  "*Regexp that matches safe url names.
+Some HTML mails might have the trick of spammers using <img> tags.  It
+is likely to be intended to verify whether you have read the mail.
+You can prevent your personal informations from leaking by setting
+this to the regexp which matches the safe url names.  The value of the
+variable `w3m-safe-url-regexp' will be bound with this value.  You may
+set this value to nil if you consider all the urls to be safe."
+  :group 'mime-w3m
+  :type '(choice (regexp :format "%t: %v\n" :size 0)
+		 (const :tag "All URLs are safe" nil)))
+
+(defcustom mime-w3m-after-cursor-move-hook
+  '(w3m-print-this-url)
+  "*Hook run each time after the cursor moves in mime-w3m buffers.
+This hook is called by the `mime-w3m-check-current-position' function
+by way of `post-command-hook'."
+  :group 'mime-w3m
+  :type 'hook)
+
+(defcustom mime-w3m-setup-hook nil
+  "*Hook run at the end of function `mime-w3m-setup'."
+  :group 'mime-w3m
+  :type 'hook)
+
+(defvar mime-w3m-message-structure nil)
+(make-variable-buffer-local 'mime-w3m-message-structure)
+
+(defun mime-w3m-insinuate ()
+  "Insinuate `mime-w3m' module to SEMI."
+  (setq mime-setup-enable-inline-html nil)
+  (let (flag)
+    (when (boundp 'mime-preview-condition)
+      (labels ((overwrite (x)
+		(if (symbolp x)
+		    (if (eq x 'mime-preview-text/html)
+			(setq flag 'mime-w3m-preview-text/html)
+		      (when (eq x 'mime-w3m-preview-text/html)
+			(setq flag t))
+		      x)
+		  (if (consp x)
+		      (cons (overwrite (car x)) (overwrite (cdr x)))
+		    x))))
+	(setq mime-preview-condition
+	      (overwrite mime-preview-condition))))
+    (unless flag
+      (eval-after-load "mime-view"
+	'(progn
+	   (ctree-set-calist-strictly
+	    'mime-preview-condition
+	    '((type . text)
+	      (subtype . html)
+	      (body . visible)
+	      (body-presentation-method . mime-w3m-preview-text/html)))
+	   (set-alist 'mime-view-type-subtype-score-alist
+		      '(text . html) 3))))))
+
+(defun mime-w3m-setup ()
+  "Setup `mime-w3m' module."
+  (require 'w3m)
+  (when (eq mime-w3m-display-inline-images 'default)
+    (setq mime-w3m-display-inline-images w3m-default-display-inline-images))
+  (unless (assq 'mime-view-mode w3m-cid-retrieve-function-alist)
+    (push (cons 'mime-view-mode 'mime-w3m-cid-retrieve)
+	  w3m-cid-retrieve-function-alist))
+  (run-hooks 'mime-w3m-setup-hook))
+
+(def-edebug-spec mime-w3m-save-background-color t)
+(defmacro mime-w3m-save-background-color (&rest body)
+  (if (featurep 'xemacs)
+      `(let ((color (color-name (face-background 'default))))
+	 (prog1
+	     (progn ,@body)
+	   (font-set-face-background 'default color (current-buffer))))
+    (cons 'progn body)))
+
+;;;###autoload
+(defun mime-w3m-preview-text/html (entity situation)
+  (mime-w3m-setup)
+  (setq mime-w3m-message-structure (mime-find-root-entity entity))
+  (let ((p (point))
+	(xref
+	 (or (mime-entity-fetch-field entity "xref")
+	     (mime-entity-fetch-field mime-w3m-message-structure "xref"))))
+    (goto-char p)
+    (insert "\n")
+    (goto-char p)
+    (mime-w3m-save-background-color
+     (save-restriction
+       (narrow-to-region p p)
+       (mime-insert-text-content entity)
+       (run-hooks 'mime-text-decode-hook)
+       (condition-case err
+	   (let ((w3m-safe-url-regexp mime-w3m-safe-url-regexp)
+		 (w3m-display-inline-images mime-w3m-display-inline-images)
+		 w3m-force-redisplay)
+	     (w3m-region p (point-max)
+			 (and (stringp xref)
+			      (string-match "\\`http://" xref)
+			      xref)
+			 (mime-content-type-parameter
+			  (mime-entity-content-type entity)
+			  "charset"))
+	     (add-text-properties p (point-max)
+				  (list 'keymap w3m-minor-mode-map
+					'text-rendered-by-mime-w3m t)))
+	 (error (message "%s" err)))))))
+
+(let (current-load-list)
+  (defadvice mime-display-message
+    (after mime-w3m-add-local-hook activate compile)
+    "Advised by emacs-w3m.
+Set hooks run arround each command is executed."
+    (when (featurep 'w3m)
+      (w3m-add-local-hook 'pre-command-hook
+			  'w3m-store-current-position)
+      (w3m-add-local-hook 'post-command-hook
+			  'mime-w3m-check-current-position))))
+
+(defun mime-w3m-check-current-position ()
+  "Run `mime-w3m-after-cursor-move-hook' if the cursor has been moved."
+  (when (and (/= (point) (car w3m-current-position))
+	     (ignore-errors
+	       (or (get-text-property (point)
+				      'text-rendered-by-mime-w3m)
+		   (get-text-property (car w3m-current-position)
+				      'text-rendered-by-mime-w3m))))
+    (run-hooks 'mime-w3m-after-cursor-move-hook)))
+
+(defun mime-w3m-cid-retrieve (url &rest args)
+  (let ((entity (mime-find-entity-from-content-id
+		 (mime-uri-parse-cid url)
+		 (with-current-buffer w3m-current-buffer
+		   mime-w3m-message-structure))))
+    (when entity
+      ;; `mime-decode-string' should be performed in a unibyte buffer.
+      (w3m-insert-string (mime-entity-content entity))
+      (mime-entity-type/subtype entity))))
+
+(let (current-load-list)
+  (defadvice kill-new (before strip-keymap-properties-from-kill activate)
+    "Advised by emacs-w3m.
+Strip `keymap' or `local-map' properties from a killed string."
+    (if (text-property-any 0 (length (ad-get-arg 0))
+			   'text-rendered-by-mime-w3m t (ad-get-arg 0))
+	(remove-text-properties 0 (length (ad-get-arg 0))
+				'(keymap nil local-map nil)
+				(ad-get-arg 0)))))
+
+(mime-w3m-insinuate)
+
+(provide 'mime-w3m)
+
+;;; mime-w3m.el ends here

=== added file 'share/emacs/site-lisp/w3m/octet.el'
--- share/emacs/site-lisp/w3m/octet.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/octet.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,548 @@
+;;; octet.el --- An octet stream viewer.
+
+;; Copyright (C) 2000, 2002, 2003, 2004, 2005, 2010
+;; Yuuichi Teranishi <teranisi@gohome.org>
+
+;; Author: Yuuichi Teranishi <teranisi@gohome.org>
+;; Created: 2000/05/19
+;; Keywords: octet-stream, broken document
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Display application/octet-stream inline on the emacs buffer.
+;;
+;; This program requires:
+;;
+;; emacs-w3m for HTML rendereing.
+;; (http://emacs-w3m.namazu.org/)
+;; Mule-UCS  for UTF-8 decoding.
+;; (ftp://ftp.m17n.org/pub/mule/Mule-UCS/)
+;; wvHtml for MS Word document.
+;; (http://www.wvware.com/)
+;; xlHtml for MS Excel document.
+;; (http://chicago.sourceforge.net/xlhtml/)
+;; pptHtml for MS PowerPoint document.
+;; (http://chicago.sourceforge.net/xlhtml/)
+;; gunzip for decoding gzipped file.
+;; bunzip2 for decoding bzip2ed file.
+
+;; Put follwing line in your setting file:
+;;
+;; (require 'octet)
+;;
+;; To display octet data file, execute following command.
+;;
+;; M-x octet-find-file
+;;
+;; If you use SEMI, put following lines in your setting file:
+;;
+;; (require 'octet)
+;; (octet-mime-setup)
+;;
+;; Then you can toggle displaying application/octet-stream messages.
+
+;;; History:
+;;
+;; This file is created in 2000/05/19.
+;; All part was rewrote in 2002/01/28.
+;; Added to emacs-w3m repository in 2002/01/29.
+
+;;; Code:
+
+(eval-when-compile
+  (require 'cl))
+
+(require 'poe)     ; for compatibility
+(require 'pces)    ; as-binary-process
+(require 'mime)    ; SEMI
+(require 'static)
+(require 'w3m-util); w3m-insert-string
+
+(defvar octet-temp-directory temporary-file-directory
+  "A directory to create temporal files.")
+
+(defvar octet-html-render-function 'octet-w3m-region
+  "A function for HTML rendering.")
+
+(defvar octet-suffix-type-alist
+  '(("xls"  . msexcel)
+    ("ppt"  . msppt)
+    ("doc"  . msword)
+    ("gz"   . gzip)
+    ("bz2"  . bzip2)
+    ("html" . html)
+    ("jpg"  . jpeg)
+    ("jpeg" . jpeg)
+    ("gif"  . gif)
+    ("png"  . png)
+    ("tif"  . tiff)
+    ("tiff" . tiff)
+    ("txt"  . text)
+    ("lzh"  . lzh)
+    ("tar"  . tar)
+    ("pdf"  . pdf))
+  "Alist of suffix-to-octet-type.")
+
+(defvar octet-content-type-alist
+  '(("application/vnd\\.ms-excel"	. msexcel)
+    ("application/vnd\\.ms-powerpoint"	. msppt)
+    ("application/x-msexcel"		. msexcel)
+    ("application/msword"		. msword)
+    ("image/jpeg"			. jpeg)
+    ("image/gif"			. gif)
+    ("image/png"			. png)
+    ("image/tiff"			. tiff)
+    ("audio/midi"			. ignore)
+    ("video/mpeg"			. ignore)
+    ("text/html"			. html-un)
+    ("application/x-tar"		. tar)
+    ("application/pdf"			. pdf))
+  "Alist of content-type-regexp-to-octet-type.")
+
+(defvar octet-magic-type-alist
+  '(("^\377\330\377[\340\356]..JFIF"	image jpeg)
+    ("^\211PNG"				image png)
+    ("^GIF8[79]"			image gif)
+    ("^II\\*\000"			image tiff)
+    ("^MM\000\\*"			image tiff)
+    ("^MThd"				audio midi)
+    ("^\000\000\001\263"		video mpeg)
+    ("^<!doctype html"			text  html)
+    ("^<head"				text  html)
+    ("^<title"				text  html)
+    ("^<html"				text  html))
+  "*Alist of regexp about magic-number vs. corresponding content-types.
+Each element looks like (REGEXP TYPE SUBTYPE).
+REGEXP is a regular expression to match against the beginning of the
+content of entity.
+TYPE is symbol to indicate primary type of content-type.
+SUBTYPE is symbol to indicate subtype of content-type.")
+
+(defvar octet-type-filter-alist
+  `((msexcel octet-filter-call1	      "xlhtml" ("-te")	html-u8)
+    (msppt   octet-filter-call1	      "ppthtml" nil	html-u8)
+    (msword  octet-filter-call2-extra "wvHtml"	nil	html-u8)
+    (html    octet-render-html	      nil	nil	nil)
+    (html-u8 octet-decode-u8-text     nil	nil	html)
+    (html-un octet-decode-text	      nil	nil	html)
+    (gzip    octet-filter-call1	      "gunzip"	("-c")	guess)
+    (bzip2   octet-filter-call1	      "bunzip2"	("-c")	guess)
+    (text    octet-decode-text	      nil	nil	nil)
+    (ignore  ignore		      nil	nil	nil)
+    (jpeg    octet-decode-image	      nil	jpeg	nil)
+    (gif     octet-decode-image	      nil	gif	nil)
+    (png     octet-decode-image	      nil	png	nil)
+    (tiff    octet-decode-image	      nil	tiff	nil)
+    (guess   octet-filter-guess	      nil	nil	nil)
+    (lzh     octet-filter-call1	      "lha"	("-v")	text)
+    (tar     octet-tar-mode	      nil	nil	nil)
+    (pdf     octet-filter-call2	     "pdftotext" ("-q" "-eucjp" "-raw") text))
+  "Alist of type-to-filter-program.
+Each element should have the form like:
+\(TYPE FUNCTION FILTER_PROGRAM ARGUMENT NEW-TYPE\)
+nil in NEW-TYPE means filtering is completed.")
+
+(defvar octet-find-file-hook nil)
+
+(defvar octet-attachments nil)
+(make-variable-buffer-local 'octet-attachments)
+
+(defun octet-render-html (&rest args)
+  (funcall octet-html-render-function (point-min) (point-max))
+  0)
+
+(defun octet-decode-text (&rest args)
+  (let ((string (buffer-string)))
+    (erase-buffer)
+    (set-buffer-multibyte t)
+    (insert (decode-coding-string string 'undecided)))
+  0)
+
+;;; HTML rendering by w3m.el
+(defun w3m-about-octet-attachments (url &optional no-decode no-cache
+					&rest args)
+  (let (buffer attachments pair)
+    (set-buffer-multibyte nil)
+    (when (string-match "\\`about://octet-attachments/\\([^/]+\\)/" url)
+      (setq buffer (get-buffer (base64-decode-string (match-string 1 url)))
+	    url (substring url (match-end 0))
+	    attachments (with-current-buffer buffer
+			  octet-attachments))
+      (when (and buffer attachments
+		 (setq pair (assoc url attachments)))
+	(insert (cdr pair)))))
+  (car (funcall (symbol-function 'w3m-local-file-type) url)))
+
+(defun octet-w3m-region (beg end)
+  (let ((w3m-display-inline-images t)
+	(w3m-url-hierarchical-schemes '("about")))
+    (funcall (symbol-function 'w3m-region)
+	     beg end (concat "about://octet-attachments/"
+			     (base64-encode-string
+			      (string-as-unibyte
+			       (buffer-name (current-buffer))) "/")))
+    (setq octet-attachments nil))
+  0)
+
+;; Decode image
+(static-cond
+ ((featurep 'xemacs)
+  (defun octet-decode-image (ignore &rest args)
+    (let (glyph)
+      (if (memq (car args) (image-instantiator-format-list))
+	  (progn
+	    (setq glyph (make-glyph (vector (car args) :data (buffer-string))))
+	    (if glyph
+		(progn (erase-buffer)
+		       (set-extent-end-glyph
+			(make-extent (point-min)(point-min))
+			glyph)
+		       0)
+	      1))
+	1))))
+ (t
+  (defun octet-decode-image (ignore &rest args)
+    (let (image)
+      (if (image-type-available-p (car args))
+	  (progn
+	    (setq image (create-image (buffer-string) (car args) 'data))
+	    (if image
+		(progn (erase-buffer)
+		       (insert-image image) 0)
+	      1))
+	1)))))
+
+(defun octet-decode-u8-text (&rest args)
+  (let ((string (buffer-string)))
+    (erase-buffer)
+    (set-buffer-multibyte t)
+    (insert (decode-coding-string string 'utf-8)))
+  0)
+
+(defun octet-filter-call2 (filter &optional args)
+  "Call octed filter with two arguments (infile, outfile).
+Current buffer content is replaced.
+Returns 0 if succeed."
+  (let ((infile (file-name-nondirectory
+		 (make-temp-file (expand-file-name "octet"
+						   octet-temp-directory))))
+	(outfile (file-name-nondirectory
+		  (make-temp-file (expand-file-name "octet"
+						    octet-temp-directory))))
+	(last-dir default-directory)
+	result)
+    (cd octet-temp-directory)
+    (write-region-as-binary (point-min) (point-max) infile nil 'no-msg)
+    (unwind-protect
+	(progn
+	  (as-binary-process
+	   (setq result (apply 'call-process filter nil nil nil
+			       (append args (list infile outfile)))))
+	  (when (and (numberp result)
+		     (zerop result))
+	    (erase-buffer)
+	    (insert-file-contents-as-binary outfile))
+	  0)
+      (if (file-exists-p infile) (delete-file infile))
+      (if (file-exists-p outfile) (delete-file outfile))
+      (cd last-dir))))
+
+(defun octet-filter-call2-extra (filter &optional args)
+  "Call octed filter with two arguments (infile, outfile).
+Current buffer content is replaced.
+Also, exta attachments are collected to `octet-attachments'.
+Returns 0 if succeed."
+  (let ((infile (file-name-nondirectory
+		 (make-temp-file (expand-file-name "octet"
+						   octet-temp-directory))))
+	(outfile (file-name-nondirectory
+		  (make-temp-file (expand-file-name "octet"
+						    octet-temp-directory))))
+	(last-dir default-directory)
+	result)
+    (cd octet-temp-directory)
+    (write-region-as-binary (point-min) (point-max) infile nil 'no-msg)
+    (unwind-protect
+	(progn
+	  (as-binary-process
+	   (setq result (apply 'call-process filter nil nil nil
+			       (append args (list infile outfile)))))
+	  (when (and (numberp result)
+		     (zerop result))
+	    (erase-buffer)
+	    (insert-file-contents-as-binary outfile)
+	    (dolist (attach (directory-files "." nil (concat
+						      (regexp-quote outfile)
+						      ".*\\..*")))
+	      (setq octet-attachments
+		    (cons (cons
+			   attach
+			   (with-temp-buffer
+			     (insert-file-contents-as-binary attach)
+			     (buffer-string)))
+			  octet-attachments))
+	      (if (file-exists-p attach) (delete-file attach))
+	      ))
+	  0)
+      (if (file-exists-p infile) (delete-file infile))
+      (if (file-exists-p outfile) (delete-file outfile))
+      (cd last-dir))))
+
+(defun octet-filter-call1 (filter &optional args)
+  "Call external octed filter with two arguments (infile) and obtain stdout.
+Current buffer content is replaced.
+Returns 0 if succeed."
+  (let ((infile (file-name-nondirectory
+		 (make-temp-file (expand-file-name "octet"
+						   octet-temp-directory))))
+	(last-dir default-directory)
+	result)
+    (cd octet-temp-directory)
+    (write-region-as-binary (point-min) (point-max) infile nil 'no-msg)
+    (unwind-protect
+	(progn
+	  (erase-buffer)
+	  (as-binary-process
+	   (setq result (apply 'call-process filter nil t nil
+			       (append args (list infile)))))
+	  (if (numberp result) result 1))
+      (if (file-exists-p infile) (delete-file infile))
+      (cd last-dir))))
+
+(defun octet-filter-guess (&rest args)
+  (let (buffer-file-name)
+    (octet-buffer)
+    0))
+
+(defun octet-tar-mode (&rest args)
+  (funcall (symbol-function 'tar-mode))
+  0)
+
+(defun octet-guess-type-from-name (name)
+  (when (string-match "\\.\\([a-z0-9]+\\)\\'" name)
+    (cdr (assoc (downcase (match-string 1 name))
+		octet-suffix-type-alist))))
+
+(defun octet-guess-type-from-content-type (content-type)
+  (let ((alist octet-content-type-alist)
+	type)
+    (while alist
+      (when (string-match (car (car alist)) content-type)
+	(setq type (cdr (car alist))
+	      alist nil))
+      (setq alist (cdr alist)))
+    type))
+
+(defun octet-guess-type-from-magic ()
+  (let ((rest octet-magic-type-alist)
+	type subtype)
+    (goto-char (point-min))
+    (while (not (let ((cell (car rest)))
+		  (if cell
+		      (if (looking-at (car cell))
+			  (setq type (nth 1 cell)
+				subtype (nth 2 cell)))
+		    t)))
+      (setq rest (cdr rest)))
+    (if type
+	(octet-guess-type-from-content-type
+	 (concat (symbol-name type) "/" (symbol-name subtype))))))
+
+(defun octet-filter-buffer (type)
+  "Call a filter function in `octet-type-filter-alist'.
+TYPE is the symbol of type.
+Returns NEW-TYPE."
+  (let ((elem (assq type octet-type-filter-alist)))
+    (if (zerop (apply (nth 1 elem) (list (nth 2 elem) (nth 3 elem))))
+	(nth 4 elem))))
+
+;;;###autoload
+(defun octet-buffer (&optional name content-type)
+  "View octet-stream content according to `octet-type-filter-alist'.
+Optional NAME is the filename.
+If optional CONTENT-TYPE is specified, it is used for type guess."
+  (interactive)
+  (let ((type (or (and content-type
+		       (octet-guess-type-from-content-type
+			content-type))
+		  (octet-guess-type-from-magic)
+		  (and (or name buffer-file-name)
+		       (octet-guess-type-from-name
+			(or name buffer-file-name)))
+		  (intern (condition-case nil
+			      (completing-read "Octet Type(text): "
+					       (mapcar
+						(lambda (pair)
+						  (list (symbol-name
+							 (cdr pair))))
+						octet-suffix-type-alist)
+					       nil 'require-match nil nil
+					       "text")
+			    (quit "text"))))))
+    (while (setq type (octet-filter-buffer type)))))
+
+(static-if (featurep 'xemacs)
+    (defun octet-insert-buffer (from)
+      "Insert after point the contents of BUFFER and the image."
+      (let (extent glyph)
+	(with-current-buffer from
+	  (if (setq extent (extent-at (point-min) nil nil nil 'at))
+	      (setq glyph (extent-end-glyph extent))))
+	(insert-buffer-substring from)
+	(if glyph
+	    (set-extent-end-glyph (make-extent (point) (point))
+				  glyph))))
+  (defalias 'octet-insert-buffer 'insert-buffer))
+
+;;;###autoload
+(defun octet-find-file (file)
+  "Find FILE with octet-stream decoding."
+  (interactive "fFilename: ")
+  (as-binary-input-file	(find-file file))
+  (unwind-protect
+      (let ((inhibit-read-only t))
+	(octet-buffer))
+    (goto-char (point-min))
+    (set-buffer-modified-p nil)
+    (auto-save-mode -1)
+    (setq buffer-read-only t
+	  truncate-lines t)
+    (run-hooks 'octet-find-file-hook)))
+
+;;;
+;; Functions for SEMI.
+;;
+
+(defvar mime-preview-octet-hook nil)
+(defvar mime-view-octet-hook nil)
+
+;;;###autoload
+(defun mime-preview-octet (entity situation)
+  "A method for mime-view to preview octet message."
+  (goto-char (point-max))
+  (let ((p (point))
+	(name (mime-entity-filename entity))
+	from-buf to-buf)
+    (insert "\n")
+    (goto-char p)
+    (save-restriction
+      (narrow-to-region p p)
+      (setq to-buf (current-buffer))
+      (with-temp-buffer
+	(setq from-buf (current-buffer))
+	(w3m-insert-string (mime-entity-content entity))
+	(octet-buffer name (mime-entity-type/subtype entity))
+	(with-current-buffer to-buf
+	  (octet-insert-buffer from-buf)
+	  (run-hooks 'mime-preview-octet-hook))))))
+
+;;;###autoload
+(defun mime-view-octet (entity situation)
+  "A method for mime-view to display octet message."
+  (let (type subtype)
+    (let ((mdata (mime-entity-content entity))
+	  (rest octet-magic-type-alist))
+      (while (not (let ((cell (car rest)))
+		    (if cell
+			(if (string-match (car cell) mdata)
+			    (setq type (nth 1 cell)
+				  subtype (nth 2 cell)))
+		      t)))
+	(setq rest (cdr rest)))
+      (if type
+	  (progn
+	    (setq situation (del-alist 'method (copy-alist situation)))
+	    (funcall (symbol-function 'mime-play-entity)
+		     entity
+		     (put-alist 'type type
+				(put-alist 'subtype subtype
+					   situation))
+		     'mime-view-octet))
+	(let ((buf (get-buffer-create
+		    (format "%s-%s" (buffer-name) (mime-entity-number entity))))
+	      (name (mime-entity-filename entity)))
+	  (with-current-buffer buf
+	    (set-buffer-multibyte nil)
+	    (setq buffer-read-only nil)
+	    (erase-buffer)
+	    (w3m-insert-string mdata)
+	    (octet-buffer name (mime-entity-type/subtype entity))
+	    (setq buffer-read-only t
+		  truncate-lines t)
+	    (set-buffer-multibyte t)
+	    (set-buffer-modified-p nil))
+	  (let ((win (get-buffer-window (current-buffer))))
+	    (or (eq (selected-window) win)
+		(select-window (or win (get-largest-window)))))
+	  (view-buffer buf)
+	  (run-hooks 'mime-view-octet-hook)
+	  (goto-char (point-min)))))))
+
+;;;###autoload
+(defun octet-mime-setup ()
+  "Octet setting for MIME module."
+  (eval-after-load "mime-view"
+    '(progn
+       (ctree-set-calist-strictly
+	'mime-acting-condition
+	'((mode . "play")
+	  (type . application)(subtype . msword)
+	  (method . mime-view-octet)))
+
+       (ctree-set-calist-strictly
+	'mime-acting-condition
+	'((mode . "play")
+	  (type . application)(subtype . excel)
+	  (method . mime-view-octet)))
+
+       (ctree-set-calist-strictly
+	'mime-acting-condition
+	'((mode . "play")
+	  (type . application)(subtype . x-msexcel)
+	  (method . mime-view-octet)))
+
+       (ctree-set-calist-strictly
+	'mime-acting-condition
+	'((mode . "play")
+	  (type . application)(subtype . vnd.ms-excel)
+	  (method . mime-view-octet)))
+
+       (ctree-set-calist-strictly
+	'mime-acting-condition
+	'((mode . "play")
+	  (type . application)(subtype . vnd.ms-powerpoint)
+	  (method . mime-view-octet)))
+
+       (ctree-set-calist-strictly
+	'mime-acting-condition
+	'((mode . "play")
+	  (type . application)(subtype . octet-stream)
+	  (method . mime-view-octet)))
+
+       (ctree-set-calist-strictly
+	'mime-preview-condition
+	'((type . application)(subtype . t)
+	  (encoding . t)
+	  (body . invisible)
+	  (body-presentation-method . mime-preview-octet)))
+       ;; another condition?
+       )))
+
+(provide 'octet)
+
+;;; octet.el ends here

=== added file 'share/emacs/site-lisp/w3m/w3m-antenna.el'
--- share/emacs/site-lisp/w3m/w3m-antenna.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-antenna.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,659 @@
+;;; w3m-antenna.el --- Utility to detect changes of WEB
+
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Keywords: w3m, WWW, hypermedia
+
+;; This file is a part of emacs-w3m.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+
+;;; Commentary:
+
+;; w3m-antenna.el is the add-on utility of emacs-w3m to detect changes
+;; of WEB pages.  For more detail about emacs-w3m, see:
+;;
+;;    http://emacs-w3m.namazu.org/
+
+
+;;; How to install:
+
+;; Please put this file to appropriate directory, and if you want
+;; byte-compile it.  And add following lisp expressions to your
+;; ~/.emacs.
+;;
+;;     (autoload 'w3m-antenna "w3m-antenna" "Report changes of WEB sites." t)
+
+
+;;; Code:
+
+(eval-when-compile (require 'cl))
+(require 'w3m-util)
+(require 'w3m-rss)
+(require 'w3m)
+
+(defgroup w3m-antenna nil
+  "w3m-antenna - Utility to detect changes of WEB."
+  :group 'w3m
+  :prefix "w3m-antenna-")
+
+(define-widget 'w3m-antenna-string 'string
+  "String widget with default value.
+When creating a new widget, its value is given by an expression specified
+with :value-from."
+  :tag "URL"
+  :value-from nil
+  :create 'w3m-antenna-string-create)
+
+(defun w3m-antenna-string-create (widget)
+  (if (string= "" (widget-get widget :value))
+      ;; No value is given.
+      (widget-put widget :value
+		  (let* ((symbol (widget-get widget :value-from))
+			 (value  (eval symbol)))
+		    (if value
+			(set symbol nil)
+		      (setq value ""))
+		    value)))
+  (widget-default-create widget))
+
+(eval-when-compile
+  ;; Compiler warning in Emacs 19.
+  (autoload 'widget-default-get "wid-edit"))
+
+(apply 'define-widget 'w3m-antenna-function 'function
+       "Bug-fixed version of the `function' widget.
+In Emacs 20.7 through 21.4 and XEmacs, it doesn't represent a value as
+a string internally, converts it into a string in the customization
+buffer, and provides the default value as `ignore'."
+       (if (and (fboundp 'widget-default-get)
+		(widget-default-get
+		 '(function :value-to-external ignore :value foo)))
+	   '(:value-create
+	     (lambda (widget)
+	       (widget-put widget :value
+			   (widget-sexp-value-to-internal widget value))
+	       (widget-field-value-create widget))
+	     :value-to-internal
+	     (lambda (widget value) value)
+	     :value ignore)))
+
+(defvar w3m-antenna-alist nil
+  "A list of site information (internal variable).  nil means that
+antenna database is not initialized.  Each site information is a list
+that consists of:
+ 0. Format string of URL.
+ 1. Title.
+ 2. Class (Normal, HNS or TIME).
+ 3. Real URL.
+ 4. Last modification time.
+ 5. Size in bytes.
+ 6. Time when size modification is detected.
+")
+
+(defmacro w3m-antenna-site-key (site)
+  `(car ,site))
+(defmacro w3m-antenna-site-title (site)
+  `(nth 1 ,site))
+(defmacro w3m-antenna-site-class (site)
+  `(nth 2 ,site))
+(defmacro w3m-antenna-site-url (site)
+  `(nth 3 ,site))
+(defmacro w3m-antenna-site-last-modified (site)
+  `(nth 4 ,site))
+(defmacro w3m-antenna-site-size (site)
+  `(nth 5 ,site))
+(defmacro w3m-antenna-site-size-detected (site)
+  `(nth 6 ,site))
+
+(defcustom w3m-antenna-file
+  (expand-file-name ".antenna" w3m-profile-directory)
+  "File which has list of antenna URLs."
+  :group 'w3m-antenna
+  :type '(file :size 0))
+
+(defcustom w3m-antenna-refresh-interval nil
+  "Interval time to update (to refresh) the antenna page automatically.
+The value should be a positive integer in seconds, or nil which means
+not to update the page."
+  :group 'w3m-antenna
+  :type '(choice
+	  (const :tag "Not reload." nil)
+	  (integer :tag "Interval second.")))
+
+(defcustom w3m-antenna-sites
+  (unless noninteractive
+    (mapcar (lambda (site)
+	      (list (w3m-antenna-site-key site)
+		    (w3m-antenna-site-title site)
+		    (w3m-antenna-site-class site)))
+	    (w3m-load-list w3m-antenna-file)))
+  "List of WEB sites, watched by `w3m-antenna'."
+  :group 'w3m-antenna
+  :type `(repeat
+	  (group
+	   :indent 7
+	   (w3m-antenna-string :format "URL: %v\n" :size 0
+			       :value-from w3m-antenna-tmp-url)
+	   (w3m-antenna-string :format "Title: %v\n" :size 0
+			       :value-from w3m-antenna-tmp-title)
+	   (choice
+	    :tag "Procedure"
+	    (const :tag "Check either its last modified time or its size" nil)
+	    (const :tag "Check its last modified time only" time)
+	    (const :tag "Check its current date provided by Hyper Nikki System"
+		   hns)
+	    (list :tag "Check RSS"
+		  (function-item :format "" w3m-antenna-check-rss)
+		  (string :format "URL: %v\n" :value ""))
+	    (list :tag "Check the another changelog page"
+		  (function-item :format "" w3m-antenna-check-another-page)
+		  (string :format "URL: %v\n" :value ""))
+	    (list :tag "Check the page linked by the anchor that matches"
+		  (function-item :format "" w3m-antenna-check-anchor)
+		  (regexp :value "")
+		  (integer :value 0))
+	    (cons :tag "Check with a user defined function"
+		  (w3m-antenna-function
+		   :match (lambda (widget value)
+			    (and (functionp value)
+				 (not (memq value
+					    '(w3m-antenna-check-rss
+					      w3m-antenna-check-another-page
+					      w3m-antenna-check-anchor))))))
+		  (repeat :tag "Arguments" sexp))))))
+
+(defcustom w3m-antenna-html-skelton
+  (eval-when-compile
+    (concat "<!doctype html public \"-//W3C//DTD HTML 3.2//EN\">\n"
+	    "<html>\n<head>\n<title>Antenna</title>\n%R</head>\n<body>\n"
+	    "<h1>Antenna</h1>\n<p align=\"right\">Checked at %D.</p>\n"
+	    "<h2>Updated</h2>\n<ul>\n%C</ul>\n"
+	    "<h2>Visited</h2>\n<ul>\n%U</ul>\n"
+	    "</body>\n</html>\n"))
+  "HTML skelton of antenna."
+  :group 'w3m-antenna
+  :type 'string)
+
+(defcustom w3m-antenna-make-summary-function
+  'w3m-antenna-make-summary-like-natsumican
+  "Function to make summary of site information."
+  :group 'w3m-antenna
+  :type '(choice
+	  :format "%{%t%}:\n %[Value Menu%] %v"
+	  (function-item :tag "Simple style." w3m-antenna-make-summary)
+	  (function-item :tag "Natsumican style."
+			 w3m-antenna-make-summary-like-natsumican)
+	  (function :format "User function: %v\n" :size 0)))
+
+(defcustom w3m-antenna-sort-changed-sites-function
+  'w3m-antenna-sort-sites-by-time
+  "Function to sort list of changed sites."
+  :group 'w3m-antenna
+  :type '(choice
+	  :format "%{%t%}:\n %[Value Menu%] %v"
+	  (function-item :tag "Sort by last modification time."
+			 w3m-antenna-sort-sites-by-time)
+	  (function-item :tag "Sort by title." w3m-antenna-sort-sites-by-title)
+	  (function-item :tag "Do nothing." identity)
+	  (function :format "User function: %v\n" :size 0)))
+
+(defcustom w3m-antenna-sort-unchanged-sites-function
+  'w3m-antenna-sort-sites-by-time
+  "Function to sort list of unchanged sites."
+  :group 'w3m-antenna
+  :type '(choice
+	  :format "%{%t%}:\n %[Value Menu%] %v"
+	  (function-item :tag "Sort by last modification time."
+			 w3m-antenna-sort-sites-by-time)
+	  (function-item :tag "Sort by title." w3m-antenna-sort-sites-by-title)
+	  (function-item :tag "Do nothing." identity)
+	  (function :format "User function: %v\n" :size 0)))
+
+(defun w3m-antenna-alist ()
+  (let ((alist (w3m-load-list w3m-antenna-file)))
+    (mapcar (lambda (site)
+	      (let ((l (assoc (w3m-antenna-site-key site) alist)))
+		(if l
+		    (progn
+		      (setf (w3m-antenna-site-class l)
+			    (w3m-antenna-site-class site))
+		      l)
+		  (append site (list nil nil nil nil)))))
+	    w3m-antenna-sites)))
+
+(defun w3m-antenna-hns-last-modified (url handler)
+  (w3m-process-do-with-temp-buffer
+      (type (w3m-retrieve (w3m-expand-url "di.cgi" url) nil t nil nil handler))
+    (when type
+      (or (let (start str)
+	    ;; Process a line such as "Tue, 27 Mar 2001 12:43:16 GMT<br>".
+	    (goto-char (point-min))
+	    (and
+	     (search-forward "\nLast-Modified: " nil t)
+	     (setq start (match-end 0))
+	     (search-forward "<br>" nil t)
+	     (setq str (buffer-substring start (match-beginning 0)))
+	     ;; Ignore format such as "2001, 27 03 GMT", which is used
+	     ;; by old HNS.
+	     (not (string-match
+		   " *[0-9][0-9][0-9][0-9], +[0-9][0-9] +[0-9][0-9] +" str))
+	     (w3m-time-parse-string str)))
+	  (progn
+	    ;; Process a line such as "newest day is 2001/03/15".
+	    (goto-char (point-min))
+	    (and
+	     (re-search-forward "\
+^newest day is \\([0-9][0-9][0-9][0-9]\\)/\\([0-9][0-9]\\)/\\([0-9][0-9]\\)$"
+				nil t)
+	     (encode-time 0 0 0
+			  (string-to-number (match-string 3))
+			  (string-to-number (match-string 2))
+			  (string-to-number (match-string 1))
+			  32400)))))))
+
+(defun w3m-antenna-check-hns (site handler)
+  "Check the page served by HNS (Hyper Nikki System) asynchronously."
+  (lexical-let ((site site))
+    (w3m-process-do
+	(time
+	 (w3m-antenna-hns-last-modified (w3m-antenna-site-key site) handler))
+      (if time
+	  (w3m-antenna-site-update site (w3m-antenna-site-key site) time nil)
+	(w3m-antenna-check-page site handler)))))
+
+(defun w3m-antenna-check-rss (site handler url)
+  "Check RSS to detect change of SITE asynchronously.
+In order to use this function, `xml.el' is required."
+  (lexical-let ((url url)
+		(site site))
+    (w3m-process-do-with-temp-buffer
+	(type (w3m-retrieve url nil t nil nil handler))
+      (let (link date dates)
+	(when type
+	  (w3m-decode-buffer url)
+	  (let* ((xml (ignore-errors
+			(xml-parse-region (point-min) (point-max))))
+		 (dc-ns (w3m-rss-get-namespace-prefix
+			 xml "http://purl.org/dc/elements/1.1/"))
+		 (rss-ns (w3m-rss-get-namespace-prefix
+			  xml "http://purl.org/rss/1.0/"))
+		 (channel (car (w3m-rss-find-el
+				(intern (concat rss-ns "channel"))
+				xml)))
+		 (items (w3m-rss-find-el
+			 (intern (concat rss-ns "item"))
+			 xml)))
+	    (setq link (nth 2 (car (w3m-rss-find-el
+				    (intern (concat rss-ns "link"))
+				    channel))))
+	    (setq dates (append
+			 (w3m-rss-find-el
+			  (intern (concat dc-ns "date"))
+			  channel)
+			 (w3m-rss-find-el
+			  (intern (concat dc-ns "date"))
+			  items)
+			 (w3m-rss-find-el 'pubDate channel)
+			 (w3m-rss-find-el 'pubDate items)))
+	    (when dates
+	      ;; Ignore future entries to display site announcements.
+	      (let ((now (current-time)))
+		(let ((low (+ (nth 1 now) 3600))) ; 3600 = clock skew margin
+		  (setq now
+			(if (>= low 65536)
+			    (list (1+ (car now))
+				  (- low 65536)
+				  (nth 2 now))
+			  (list (car now)
+				low
+				(nth 2 now)))))
+		(setq date '(0 0))
+		(dolist (tmp dates)
+		  (setq tmp (w3m-rss-parse-date-string (nth 2 tmp)))
+		  (and (w3m-time-newer-p tmp date)
+		       (w3m-time-newer-p now tmp)
+		       (setq date tmp)))))))
+	(if (and link date)
+	    (w3m-antenna-site-update site link date nil)
+	  (w3m-antenna-check-page site handler))))))
+
+(defun w3m-antenna-check-another-page (site handler url)
+  "Check the another page to detect change of SITE asynchronously.
+This function checks the another page specified by the URL before
+checking the SITE itself.  This function is useful when the SITE's
+owner either maintains the page which describes the change of the
+SITE."
+  (lexical-let ((site site))
+    (w3m-process-do-with-temp-buffer
+	(time (w3m-last-modified url t handler))
+      (if time
+	  (w3m-antenna-site-update site (w3m-antenna-site-key site) time nil)
+	(w3m-antenna-check-page site handler)))))
+
+(defun w3m-antenna-check-anchor (site handler regexp number)
+  "Check the page linked from SITE asynchronously.
+This function checks the page linked by an anchor that matches REGEXP
+from the page that is specified by SITE's key attribute."
+  (lexical-let ((site site)
+		(regexp regexp)
+		(number (or number 0)))
+    (w3m-process-do-with-temp-buffer
+	(type (w3m-retrieve (w3m-antenna-site-key site)
+			    nil nil nil nil handler))
+      (w3m-antenna-check-page site
+			      handler
+			      (when type
+				(w3m-decode-buffer (w3m-antenna-site-key site))
+				(goto-char (point-min))
+				(when (re-search-forward regexp nil t)
+				  (w3m-expand-url
+				   (match-string number)
+				   (w3m-antenna-site-key site))))))))
+
+;; To avoid byte-compile warning.
+(eval-and-compile
+  (autoload 'w3m-filter "w3m-filter"))
+
+(defun w3m-antenna-check-page (site handler &optional url)
+  "Check SITE with the generic procedure.
+It consists of 3 steps:
+\(1\) Check the time when the SITE was last modified with HEAD request.
+\(2\) Check the size of the SITE with HEAD request.
+\(3\) Get the real content of the SITE, and check its size.
+"
+  (lexical-let ((site site)
+		(url (or url
+			 (w3m-antenna-site-url site)
+			 (w3m-antenna-site-key site))))
+    (w3m-process-do
+	(attr (w3m-attributes url t handler))
+      (when attr
+	(if (nth 4 attr)	; Use the value of Last-modified header.
+	    (w3m-antenna-site-update site url (nth 4 attr) (nth 2 attr))
+	  (unless (eq 'time (w3m-antenna-site-class site))
+	    (if (nth 2 attr)	; Use the value of Content-Length header.
+		(w3m-antenna-site-update site url nil (nth 2 attr))
+	      ;; Get the real content of the SITE, and calculate its size.
+	      (w3m-process-do-with-temp-buffer
+		  (type (w3m-retrieve url nil t nil nil handler))
+		(when type
+		  (w3m-decode-buffer url nil type)
+		  (w3m-remove-comments)
+		  (when w3m-use-filter
+		    (w3m-filter url))
+		  (w3m-antenna-site-update site url nil (buffer-size)))))))))))
+
+(defun w3m-antenna-site-update (site url time size)
+  "Update SITE's status information with specified TIME and SIZE."
+  ;; (w3m-antenna-site-size-detected site) keeps the time when SITE's
+  ;; size attribute is checked.
+  (setf (w3m-antenna-site-size-detected site)
+	(when size
+	  (or (when (and url
+			 (w3m-antenna-site-url site)
+			 (string= url (w3m-antenna-site-url site))
+			 (w3m-antenna-site-size site)
+			 (= size (w3m-antenna-site-size site)))
+		(w3m-antenna-site-size-detected site))
+	      (current-time))))
+  (setf (w3m-antenna-site-url site) url)
+  (setf (w3m-antenna-site-last-modified site) time)
+  (setf (w3m-antenna-site-size site) size)
+  site)
+
+(defun w3m-antenna-check-site (site handler)
+  "Check SITE asynchronously.
+If a class attribute of the SITE is a list that consists of a function
+to check SITE and its options, call it.  When a class attribute of the
+SITE is equal to the symbol `hns', call `w3m-antenna-check-hns'.
+Otherwise, call `w3m-antenna-check-page'."
+  (if (and (listp (w3m-antenna-site-class site))
+	   (functionp (car (w3m-antenna-site-class site))))
+      (apply (car (w3m-antenna-site-class site))
+	     site handler (cdr (w3m-antenna-site-class site)))
+    (if (eq 'hns (w3m-antenna-site-class site))
+	(w3m-antenna-check-hns site handler)
+      (w3m-antenna-check-page site
+			      handler
+			      (format-time-string (w3m-antenna-site-key site)
+						  (current-time))))))
+
+(defun w3m-antenna-mapcar (function sequence handler)
+  "Apply FUNCTION to each element of SEQUENCE asynchronously, and make
+a list of the results."
+  (let ((index -1)
+	(table (make-symbol "table"))
+	(buffer (make-symbol "buffer")))
+    (set table (make-vector (length sequence) nil))
+    (set buffer (current-buffer))
+    (dolist (element sequence)
+      (aset (symbol-value table)
+	    (incf index)
+	    (funcall function
+		     element
+		     (cons `(lambda (x)
+			      (aset ,table ,index x)
+			      (w3m-antenna-mapcar-after ,table ,buffer))
+			   handler))))
+    (w3m-antenna-mapcar-after (symbol-value table) (symbol-value buffer))))
+
+(defun w3m-antenna-mapcar-after (result buffer)
+  "Handler function of `w3m-antenna-mapcar'.
+If all asynchronous processes have finished, return a list of the
+results for the further handler functions.  Otherwise, return an
+asynchronous process that has not finished yet."
+  (or (catch 'found-proces
+	(let ((index -1))
+	  (while (< (incf index) (length result))
+	    (when (w3m-process-p (aref result index))
+	      (throw 'found-proces (aref result index))))))
+      (progn
+	(set-buffer buffer)
+	(append result nil))))
+
+(defun w3m-antenna-check-all-sites (&optional handler)
+  "Check all sites specified in `w3m-antenna-sites'."
+  (unless w3m-antenna-alist
+    (setq w3m-antenna-alist (w3m-antenna-alist)))
+  (if (not handler)
+      (w3m-process-with-wait-handler
+	(w3m-antenna-check-all-sites handler))
+    (w3m-process-do
+	(result
+	 (w3m-antenna-mapcar 'w3m-antenna-check-site
+			     w3m-antenna-alist
+			     handler))
+      (prog1 w3m-antenna-alist
+	(w3m-save-list w3m-antenna-file w3m-antenna-alist)
+	(setq w3m-antenna-alist nil)))))
+
+(defun w3m-antenna-make-summary (site)
+  (format "<li><a href=\"%s\">%s</a> %s"
+	  (or (w3m-antenna-site-url site)
+	      (w3m-antenna-site-key site))
+	  (w3m-antenna-site-title site)
+	  (cond
+	   ((w3m-antenna-site-last-modified site)
+	    (current-time-string (w3m-antenna-site-last-modified site)))
+	   ((w3m-antenna-site-size site) "Size")
+	   (t ""))))
+
+(defun w3m-antenna-make-summary-like-natsumican (site)
+  (let ((t1 (w3m-antenna-site-last-modified site))
+	(t2 (w3m-antenna-site-size-detected site)))
+    (format "<li>%20s&nbsp;&nbsp;(%s)&nbsp;&nbsp;<a href=\"%s\">%s</a>"
+	    (if (or t1 t2)
+		(format-time-string "%Y/%m/%d %R" (or t1 t2))
+	      "----/--/-- --:--")
+	    (cond
+	     (t1 "T")
+	     (t2 "S")
+	     (t "?"))
+	    (or (w3m-antenna-site-url site)
+		(w3m-antenna-site-key site))
+	    (w3m-antenna-site-title site))))
+
+(defun w3m-antenna-sort-sites-by-time (sites)
+  (sort sites
+	(lambda (a b)
+	  (w3m-time-newer-p
+	   (or (w3m-antenna-site-last-modified a)
+	       (w3m-antenna-site-size-detected a))
+	   (or (w3m-antenna-site-last-modified b)
+	       (w3m-antenna-site-size-detected b))))))
+
+(defun w3m-antenna-sort-sites-by-title (sites)
+  (sort sites
+	(lambda (a b)
+	  (string< (w3m-antenna-site-title a)
+		   (w3m-antenna-site-title b)))))
+
+(defun w3m-antenna-make-contents (changed-sites unchanged-sites)
+  (insert w3m-antenna-html-skelton)
+  (goto-char (point-min))
+  (while (re-search-forward "%\\(.\\)" nil t)
+    (let ((c (char-after (match-beginning 1))))
+      (cond
+       ((memq c '(?C ?U))
+	(save-restriction
+	  (narrow-to-region (match-beginning 0) (match-end 0))
+	  (delete-region (point-min) (point-max))
+	  (goto-char (point-min))
+	  (dolist (site (if (eq c ?C)
+			    changed-sites
+			  unchanged-sites))
+	    (insert (funcall w3m-antenna-make-summary-function site)
+		    "\n"))
+	  (goto-char (point-max))))
+       ((eq c '?D)
+	(goto-char (match-beginning 0))
+	(delete-region (match-beginning 0) (match-end 0))
+	(insert (let ((time (nth 5 (file-attributes w3m-antenna-file))))
+		  (if time
+		      (current-time-string time)
+		    "(unknown)"))))
+       ((eq c '?R)
+	(save-restriction
+	  (narrow-to-region (match-beginning 0) (match-end 0))
+	  (delete-region (point-min) (point-max))
+	  (when (and w3m-antenna-refresh-interval
+		     (integerp w3m-antenna-refresh-interval)
+		     (< 0 w3m-antenna-refresh-interval))
+	    (insert (format "<META HTTP-EQUIV=\"Refresh\" CONTENT=\"%d\">\n"
+			    w3m-antenna-refresh-interval)))))))))
+
+;;;###autoload
+(defun w3m-about-antenna (url &optional no-decode no-cache
+			      post-data referer handler)
+  (w3m-process-do
+      (alist (if no-cache
+		 (w3m-antenna-check-all-sites handler)
+	       (or w3m-antenna-alist (w3m-antenna-alist))))
+    (let (changed unchanged)
+      (dolist (site alist)
+	(if (w3m-time-newer-p (or (w3m-antenna-site-last-modified site)
+				  (w3m-antenna-site-size-detected site))
+			      (or (w3m-arrived-last-modified
+				   (w3m-antenna-site-url site))
+				  (w3m-arrived-time
+				   (w3m-antenna-site-url site))))
+	    (progn
+	      (w3m-cache-remove (w3m-antenna-site-url site))
+	      (push site changed))
+	  (push site unchanged)))
+      (w3m-antenna-make-contents
+       (funcall w3m-antenna-sort-changed-sites-function (nreverse changed))
+       (funcall w3m-antenna-sort-unchanged-sites-function (nreverse unchanged)))
+      "text/html")))
+
+;;;###autoload
+(defun w3m-antenna (&optional no-cache)
+  "Report changes of WEB sites, which is specified in `w3m-antenna-sites'."
+  (interactive "P")
+  (w3m-goto-url "about://antenna/" no-cache))
+
+(defvar w3m-antenna-tmp-url nil)
+(defvar w3m-antenna-tmp-title nil)
+
+(defun w3m-antenna-add-current-url (&optional arg)
+  "Add link of current page to antenna.
+With prefix, ask new url to add instead of current page."
+  (interactive "P")
+  (w3m-antenna-add (if arg (w3m-input-url) w3m-current-url)
+		   (w3m-encode-specials-string w3m-current-title)))
+
+(defun w3m-antenna-add (url &optional title)
+  "Add URL to antenna.
+Optional argument TITLE is title of link."
+  (setq w3m-antenna-tmp-url url)
+  (setq w3m-antenna-tmp-title title)
+  (customize-variable 'w3m-antenna-sites)
+  ;; dirty...
+  (goto-char (point-max))
+  (re-search-backward "INS")
+  (widget-button-press (point))
+  (re-search-forward "State:\\|\\(\\[State\\]:\\)")
+  (backward-char (if (match-beginning 1) 3 2)))
+
+(defvar w3m-antenna-mode-map
+  (let ((map (make-sparse-keymap)))
+    (substitute-key-definition 'w3m-edit-current-url 'w3m-antenna-edit
+			       map w3m-mode-map)
+    map)
+  "*Keymap for `w3m-antenna-mode'.")
+
+(defvar w3m-antenna-mode nil "Non-nil if w3m antenna mode is enabled.")
+(make-variable-buffer-local 'w3m-antenna-mode)
+(unless (assq 'w3m-antenna-mode minor-mode-alist)
+  (push (list 'w3m-antenna-mode " antenna") minor-mode-alist))
+(unless (assq 'w3m-antenna-mode minor-mode-map-alist)
+  (push (cons 'w3m-antenna-mode w3m-antenna-mode-map) minor-mode-map-alist))
+
+(defun w3m-antenna-mode (&optional arg)
+  "\\<w3m-antenna-mode-map>
+Minor mode to edit antenna.
+
+\\[w3m-antenna-edit]	Customize `w3m-antenna-sites'.
+"
+  (interactive "P")
+  (when (setq w3m-antenna-mode
+	      (if arg
+		  (> (prefix-numeric-value arg) 0)
+		(not w3m-antenna-mode)))
+    (run-hooks 'w3m-antenna-mode-hook)))
+
+(defun w3m-antenna-mode-setter (url)
+  "Activate `w3m-antenna-mode', when visiting page shows antenna."
+  (w3m-antenna-mode (if (string-match "\\`about://antenna/" url)
+			 (progn
+			   (setq default-directory
+				 (file-name-directory w3m-antenna-file))
+			   1)
+		       0)))
+(add-hook 'w3m-display-functions 'w3m-antenna-mode-setter)
+
+(defun w3m-antenna-edit ()
+  "Start customize of `w3m-antenna-sites'."
+  (interactive)
+  (customize-variable 'w3m-antenna-sites))
+
+(provide 'w3m-antenna)
+
+;;; w3m-antenna.el ends here

=== added file 'share/emacs/site-lisp/w3m/w3m-bookmark.el'
--- share/emacs/site-lisp/w3m/w3m-bookmark.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-bookmark.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,591 @@
+;;; w3m-bookmark.el --- Functions to operate bookmark file of w3m
+
+;; Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Authors: Shun-ichi GOTO     <gotoh@taiyo.co.jp>,
+;;          TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Keywords: w3m, WWW, hypermedia
+
+;; This file is a part of emacs-w3m.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+
+;;; Commentary:
+
+;; w3m-bookmark.el is the add-on program of emacs-w3m to operate
+;; bookmark file.  For more detail about emacs-w3m, see:
+;;
+;;    http://emacs-w3m.namazu.org/
+
+
+;;; Code:
+
+(eval-when-compile (require 'cl))
+(require 'w3m-util)
+(require 'w3m)
+(require 'easymenu)
+
+(defcustom w3m-bookmark-file
+  (expand-file-name "bookmark.html" w3m-profile-directory)
+  "Bookmark file of w3m."
+  :group 'w3m
+  :type '(file :size 0))
+
+(defcustom w3m-bookmark-file-coding-system 'euc-japan
+  "Coding system for a created bookmark file.
+This option is used when a new bookmark file is created, or when an
+existing bookmark file includes ASCII characters only.  If the coding
+system which is used to encode your using bookmark file is different
+from the value of this option, emacs-w3m does not change the encoding
+of your bookmark file."
+  :group 'w3m
+  :type '(coding-system :size 0))
+
+(defcustom w3m-bookmark-default-section
+  nil
+  "Default section to add new entry."
+  :group 'w3m
+  :type '(radio (const :tag "Not specified" nil)
+		(string :format "Default section name: %v\n" :size 0)))
+
+(defcustom w3m-bookmark-mode-hook nil
+  "*Hook run at the end of function `w3m-bookmark-mode'."
+  :group 'w3m
+  :type 'hook)
+
+(defcustom w3m-bookmark-menu-open-new-session nil
+  "If non-nil, \"Bookmark\" menu item open new session."
+  :group 'w3m
+  :type 'boolean)
+
+(eval-and-compile
+  (defconst w3m-bookmark-section-delimiter
+    "<!--End of section (do not delete this comment)-->\n"))
+
+(eval-and-compile
+  (defconst w3m-bookmark-section-format
+    (eval-when-compile
+      (concat "<h2>%s</h2>\n<ul>\n"
+	      "<li><a href=\"%s\">%s</a>\n"
+	      w3m-bookmark-section-delimiter
+	      "</ul>\n"))))
+
+(defconst w3m-bookmark-initial-format
+  (eval-when-compile
+    (concat "<html><head><title>Bookmarks</title></head>\n"
+	    "<body>\n<h1>Bookmarks</h1>\n"
+	    w3m-bookmark-section-format
+	    "</body>\n</html>\n")))
+
+(defvar w3m-bookmark-section-history nil)
+(defvar w3m-bookmark-title-history nil)
+
+(defvar w3m-bookmark-buffer-file-name nil
+  "Non-nil means that `w3m-bookmark-file' has been loaded to this buffer.")
+(make-variable-buffer-local 'w3m-bookmark-buffer-file-name)
+
+(defvar w3m-bookmark-mode-map
+  (let ((map (make-sparse-keymap))
+	(table '((kill-line . w3m-bookmark-kill-entry)
+		 (undo . w3m-bookmark-undo))))
+    (dolist (pair table)
+      (substitute-key-definition (car pair) (cdr pair) map global-map))
+    (substitute-key-definition 'w3m-edit-current-url 'w3m-bookmark-edit
+			       map w3m-mode-map)
+    map)
+  "*Keymap for `w3m-bookmark-mode'.")
+
+(defvar w3m-bookmark-mode nil "Non-nil if w3m bookmark mode is enabled.")
+(make-variable-buffer-local 'w3m-bookmark-mode)
+(unless (assq 'w3m-bookmark-mode minor-mode-alist)
+  (push (list 'w3m-bookmark-mode " bookmark") minor-mode-alist))
+(unless (assq 'w3m-bookmark-mode minor-mode-map-alist)
+  (push (cons 'w3m-bookmark-mode w3m-bookmark-mode-map) minor-mode-map-alist))
+
+(defun w3m-bookmark-mode (&optional arg)
+  "\\<w3m-bookmark-mode-map>
+Minor mode to edit bookmark.
+
+\\[w3m-bookmark-kill-entry]	Kill the current entry of this bookmark.
+\\[w3m-bookmark-undo]	Undo some previous changes on this bookmark.
+\\[w3m-bookmark-edit]	Open `w3m-bookmark-file'.
+"
+  (interactive "P")
+  (when (setq w3m-bookmark-mode
+	      (if arg
+		  (> (prefix-numeric-value arg) 0)
+		(not w3m-bookmark-mode)))
+    (run-hooks 'w3m-bookmark-mode-hook)))
+
+(defun w3m-bookmark-mode-setter (url)
+  "Activate `w3m-bookmark-mode', when visiting page shows bookmark."
+  (w3m-bookmark-mode (if (string-match "\\`about://bookmark/" url)
+			 (progn
+			   (setq default-directory
+				 (file-name-directory w3m-bookmark-file))
+			   1)
+		       0)))
+(add-hook 'w3m-display-functions 'w3m-bookmark-mode-setter)
+
+(defun w3m-bookmark-file-modtime ()
+  "Return the modification time of the bookmark file `w3m-bookmark-file'.
+The value is a list of two time values `(HIGH LOW)' if the bookmark
+file exists, otherwise nil."
+  (nth 5 (file-attributes w3m-bookmark-file)))
+
+(defun w3m-bookmark-buffer (&optional no-verify-modtime)
+  "Return the buffer reading `w3m-bookmark-file' current."
+  (let ((buffer (get-file-buffer w3m-bookmark-file)))
+    (if buffer
+	;; When a buffer visiting `w3m-bookmark-file' is found, return
+	;; it instead of a working buffer.  In this case, kill the
+	;; working buffer which was generated in the past.
+	(progn (w3m-kill-buffer " *w3m bookmark*") buffer)
+      ;; Generate a working buffer.
+      (with-current-buffer (w3m-get-buffer-create " *w3m bookmark*")
+	(unless (and w3m-bookmark-buffer-file-name
+		     (or no-verify-modtime
+			 (equal (w3m-visited-file-modtime)
+				(w3m-bookmark-file-modtime))))
+	  (when (file-readable-p w3m-bookmark-file)
+	    (buffer-disable-undo)
+	    (erase-buffer)
+	    (let ((coding-system-for-read 'binary))
+	      (insert-file-contents w3m-bookmark-file))
+	    (w3m-decode-buffer
+	     (w3m-expand-file-name-as-url w3m-bookmark-file))
+	    (set-buffer-file-coding-system
+	     (if (memq w3m-current-coding-system
+		       '(undecided undecided-dos undecided-mac undecided-unix))
+		 w3m-bookmark-file-coding-system
+	       w3m-current-coding-system))
+	    (set-buffer-modified-p nil))
+	  (setq w3m-bookmark-buffer-file-name w3m-bookmark-file)
+	  (set-visited-file-modtime (or (w3m-bookmark-file-modtime)
+					;; No bookmark file.
+					(with-temp-buffer
+					  ;; 0 in Emacs; (0 . 0) in XEmacs
+					  (visited-file-modtime))))
+	  (buffer-enable-undo))
+	(current-buffer)))))
+
+(defun w3m-bookmark-verify-modtime ()
+  (unless (equal (w3m-visited-file-modtime)
+		 (w3m-bookmark-file-modtime))
+    (if (buffer-file-name)
+	(ask-user-about-supersession-threat w3m-bookmark-file)
+      (let ((modified (buffer-modified-p))
+	    (name (buffer-name)))
+	(unwind-protect
+	    (progn
+	      (set-visited-file-name w3m-bookmark-file)
+	      (ask-user-about-supersession-threat w3m-bookmark-file))
+	  (set-visited-file-name nil)
+	  (rename-buffer name)
+	  (set-buffer-modified-p modified))))))
+
+(defun w3m-bookmark-sections ()
+  "Return collection of registered sections."
+  (let (sections)
+    (with-current-buffer (w3m-bookmark-buffer)
+      (goto-char (point-min))
+      (while (search-forward "<h2>" nil t)
+	(push (cons (buffer-substring-no-properties
+		     (point)
+		     (if (search-forward "</h2>" nil t)
+			 (match-beginning 0)
+		       (point-at-eol)))
+		    nil)
+	      sections)))
+    (nreverse sections)))
+
+(defun w3m-bookmark-save-buffer ()
+  "Save this current buffer to `w3m-bookmark-file'."
+  (cond
+   ((buffer-file-name)
+    (basic-save-buffer))
+   ((buffer-modified-p)
+    (let ((backup-info (find-backup-file-name w3m-bookmark-file))
+	  (modes (when (file-exists-p w3m-bookmark-file)
+		   (file-modes w3m-bookmark-file))))
+      (when (and modes ; means that `w3m-bookmark-file' exists.
+		 make-backup-files
+		 (funcall backup-enable-predicate w3m-bookmark-file))
+	(rename-file w3m-bookmark-file (car backup-info) t))
+      (write-region (point-min) (point-max) w3m-bookmark-file)
+      (when modes
+	(set-file-modes w3m-bookmark-file modes))
+      (set-visited-file-modtime (w3m-bookmark-file-modtime))
+      (set-buffer-modified-p nil)
+      (dolist (file (cdr backup-info))
+	(condition-case ()
+	    (delete-file file)
+	  (file-error nil)))))))
+
+(defun w3m-bookmark-safe-string (string format)
+  (labels ((filter (s c) (decode-coding-string (encode-coding-string s c) c)))
+    (if (let ((encoding (w3m-static-when (featurep 'mule)
+			  buffer-file-coding-system)))
+	  (or (string= string (filter string encoding))
+	      (when w3m-use-mule-ucs
+		(string= (setq string
+			       (filter string
+				       (if w3m-accept-japanese-characters
+					   'w3m-euc-japan
+					 'w3m-iso-latin-1)))
+			 (filter string encoding)))))
+	string
+      (error format string))))
+
+(defun w3m-bookmark-write-file (url title section)
+  "Make new bookmark with specified spec, and save it."
+  (with-current-buffer (w3m-bookmark-buffer)
+    (setq title (w3m-bookmark-safe-string
+		 title
+		 "Specified title includes unsafe character(s): %s")
+	  section (w3m-bookmark-safe-string
+		   section
+		   "Specified section includes unsafe character(s): %s"))
+    (if (zerop (buffer-size))
+	;; New bookmark file.
+	(progn
+	  (insert (format w3m-bookmark-initial-format section url title))
+	  (set-buffer-file-coding-system w3m-bookmark-file-coding-system))
+      (goto-char (point-min))
+      (if (search-forward (format "<h2>%s</h2>" section) nil t)
+	  (progn
+	    (unless (search-forward w3m-bookmark-section-delimiter nil t)
+	      (error "Can't find section delimiter: %s" section))
+	    (goto-char (match-beginning 0))
+	    (insert (format "<li><a href=\"%s\">%s</a>\n" url title)))
+	;; New section.
+	(unless (search-forward "</body>\n" nil t)
+	  (error "%s" "Can't find terminator of bookmark"))
+	(goto-char (match-beginning 0))
+	(insert (format w3m-bookmark-section-format
+			section url title))))
+    (w3m-bookmark-save-buffer)))
+
+(defun w3m-bookmark-add (url &optional title)
+  "Add URL to bookmark.
+Optional argument TITLE is title of link."
+  (let ((section (completing-read
+		  (if w3m-bookmark-default-section
+		      (format "Section (default %s): "
+			      w3m-bookmark-default-section)
+		    "Section: ")
+		  (w3m-bookmark-sections) nil nil nil
+		  'w3m-bookmark-section-history)))
+    (and (string= section "")
+	 (setq section w3m-bookmark-default-section))
+    (when (or (not section)
+	      (string-match section "^ *$"))
+      (error "%s" "You must specify section name"))
+    (setq title (read-string "Title: " title 'w3m-bookmark-title-history))
+    (when (or (not title)
+	      (string-match title "^ *$"))
+      (error "%s" "You must specify title"))
+    (w3m-bookmark-write-file url
+			     (w3m-encode-specials-string title)
+			     (w3m-encode-specials-string section))))
+
+;;;###autoload
+(defun w3m-bookmark-add-this-url ()
+  "Add link under cursor to bookmark."
+  (interactive)
+  (if (null (w3m-anchor))
+      (message "No anchor")		; nothing to do
+    (let ((url (w3m-anchor))
+	  (title (buffer-substring-no-properties
+		  (previous-single-property-change (1+ (point))
+						   'w3m-href-anchor)
+		  (next-single-property-change (point) 'w3m-href-anchor))))
+      (w3m-bookmark-add url title))
+    (message "Added")))
+
+;;;###autoload
+(defun w3m-bookmark-add-current-url (&optional arg)
+  "Add a url of the current page to the bookmark.
+With prefix, ask for a new url instead of the present one."
+  (interactive "P")
+  (w3m-bookmark-add (if arg (w3m-input-url) w3m-current-url)
+		    w3m-current-title)
+  (message "Added"))
+
+;;;###autoload
+(defun w3m-bookmark-add-all-urls ()
+  "Add urls of all pages being visited to the bookmark."
+  (interactive)
+  (let ((buffers (w3m-list-buffers)))
+    (if (and w3m-use-tab
+	     (>= (length buffers) 2))
+	(while buffers
+	  (switch-to-buffer (pop buffers))
+	  (condition-case nil
+	      (w3m-bookmark-add-current-url)
+	    (quit)))
+      (message
+       "Use the `%s' command instead"
+       (key-description (car (where-is-internal 'w3m-bookmark-add-current-url
+						w3m-mode-map)))))))
+
+;;;###autoload
+(defun w3m-bookmark-add-current-url-group ()
+  "Add link of the group of current urls to the bookmark."
+  (interactive)
+  (w3m-bookmark-add
+   (concat "group:"
+	   (mapconcat
+	    'w3m-url-encode-string
+	    (mapcar (lambda (buffer)
+		      (with-current-buffer buffer w3m-current-url))
+		    (w3m-list-buffers))
+	    "&")))
+  (message "Added as URL group"))
+
+;;;###autoload
+(defun w3m-bookmark-view (&optional reload)
+  "Display the bookmark."
+  (interactive "P")
+  (if (file-exists-p w3m-bookmark-file)
+      (progn
+	;; Store the current position in the history structure.
+	(w3m-history-store-position)
+	(w3m-goto-url "about://bookmark/" reload))
+    (message "No bookmark file is available")))
+
+;;;###autoload
+(defun w3m-bookmark-view-new-session (&optional reload)
+  "Display the bookmark on a new session."
+  (interactive "P")
+  (if (not (eq major-mode 'w3m-mode))
+      (message "This command can be used in w3m mode only")
+    (if (file-exists-p w3m-bookmark-file)
+	(w3m-view-this-url-1 "about://bookmark/" reload 'new-session)
+      (message "No bookmark file is available"))))
+
+;;;###autoload
+(defun w3m-about-bookmark (&rest args)
+  (insert-buffer-substring (w3m-bookmark-buffer))
+  (let ((ident) (i 0) (j 0))
+    (goto-char (point-min))
+    (while (search-forward (setq ident (format "w3mbk%d." i)) nil t)
+      (incf i))
+    (setq i 0)
+    (goto-char (point-min))
+    (while (re-search-forward "\n<\\(?:h2\\|\\(li\\)\\)>" nil t)
+      (forward-char -1)
+      (insert (if (match-beginning 1)
+		  (format " id=\"%s%d.%d\"" ident i (incf j))
+		(format " id=\"%s%d\"" ident (incf i))))))
+  "text/html")
+
+(defun w3m-bookmark-current-number ()
+  "Return the ordinal number of the current bookmark entry."
+  (let ((x (car (get-text-property (point-at-eol) 'w3m-name-anchor))))
+    (and x
+	 (string-match "\\`w3mbk[0-9]+\\.[0-9]+\\.\\([0-9]+\\)\\'" x)
+	 (string-to-number (match-string 1 x)))))
+
+(defun w3m-bookmark-kill-entry (num)
+  "Kill the bookmark entry of the current line.
+With prefix argument, kill that many entries from point."
+  (interactive "p")
+  (let ((entries (w3m-bookmark-current-number)))
+    (when entries
+      (setq entries (list entries))
+      (while (> (decf num) 0)
+	(push (1+ (car entries)) entries))
+      (condition-case nil
+	  (w3m-bookmark-kill-entries entries)
+	(file-supersession nil))
+      (w3m-bookmark-view t))))
+
+(defun w3m-bookmark-kill-entries (entries)
+  (with-current-buffer (w3m-bookmark-buffer t)
+    (w3m-bookmark-verify-modtime)
+    (goto-char (point-min))
+    (let ((i 0))
+      (while (search-forward "\n<li>" nil t)
+	(when (memq (incf i) entries)
+	  (let ((beg (point-at-bol))
+		(end (progn
+		       (search-forward w3m-bookmark-section-delimiter)
+		       (match-beginning 0))))
+	    (delete-region (goto-char beg)
+			   (if (search-forward "\n<li>" end t)
+			       (point-at-bol)
+			     end))
+	    (goto-char (1- beg))))))
+    (w3m-bookmark-save-buffer)))
+
+(defun w3m-bookmark-undo (&optional arg)
+  "Undo some previous changes on bookmark."
+  (interactive "p")
+  (condition-case nil
+      (with-current-buffer (w3m-bookmark-buffer t)
+	(w3m-bookmark-verify-modtime)
+	(undo arg)
+	(w3m-bookmark-save-buffer))
+    (file-supersession nil))
+  (w3m-bookmark-view t))
+
+(defun w3m-bookmark-edit ()
+  "Edit the bookmark file."
+  (interactive)
+  (w3m-edit-url (w3m-expand-file-name-as-url w3m-bookmark-file)))
+
+;; Bookmark menu
+(defvar w3m-bookmark-menu-items
+  (let ((etsu (when w3m-use-japanese-menu
+		(decode-coding-string "\e$B1\\\e(B" 'iso-2022-jp)))) ;; $B1\(B
+    `(([,(w3m-make-menu-item (concat "$B%V%C%/%^!<%/$N(B" etsu "$BMw(B") "View Bookmark")
+	w3m-bookmark-view t]
+       [,(w3m-make-menu-item (concat "$B?7%;%C%7%g%s$G%V%C%/%^!<%/$N(B" etsu "$BMw(B")
+			     "View Bookmark in a New Session")
+	w3m-bookmark-view-new-session t]
+       [,(w3m-make-menu-item "$B%V%C%/%^!<%/$NJT=8(B" "Edit Bookmark")
+	w3m-bookmark-edit t]
+       "----"
+       [,(w3m-make-menu-item "$B$3$N%Z!<%8$r%V%C%/%^!<%/(B" "Add Current URL to Bookmark")
+	w3m-bookmark-add-current-url t]
+       [,(w3m-make-menu-item "$B$9$Y$F$N(B URL $B$r%V%C%/%^!<%/(B" "Add These URLs to Bookmark")
+	w3m-bookmark-add-current-url-group t]
+       [,(w3m-make-menu-item "$B$3$N(B URL $B$r%V%C%/%^!<%/(B" "Add This URL to Bookmark")
+	w3m-bookmark-add-this-url (w3m-anchor)])
+      .
+      ([,(w3m-make-menu-item "$B$3$N%(%s%H%j$r>C5n(B" "Kill Current Entry")
+	w3m-bookmark-kill-entry
+	(text-property-not-all (point-at-bol) (point-at-eol)
+			       'w3m-href-anchor nil)]
+       [,(w3m-make-menu-item "$B$b$H$KLa$9(B" "Undo")
+	w3m-bookmark-undo t]
+       [,(w3m-make-menu-item "$B%V%C%/%^!<%/$NJT=8(B" "Edit Bookmark")
+	w3m-bookmark-edit t])))
+  "*List of the bookmark menu items.
+The car is used if `w3m-bookmark-mode' is nil, otherwise the cdr is used.")
+
+;;;###autoload
+(defun w3m-setup-bookmark-menu ()
+  "Setup w3m bookmark items in menubar."
+  (w3m-static-if (featurep 'xemacs)
+      (unless (car (find-menu-item current-menubar '("Bookmark")))
+	(easy-menu-define w3m-bookmark-menu w3m-mode-map
+	  "" '("Bookmark" ["(empty)" ignore nil]))
+	(easy-menu-add w3m-bookmark-menu)
+	(add-hook 'activate-menubar-hook 'w3m-bookmark-menubar-update))
+    (unless (lookup-key w3m-mode-map [menu-bar Bookmark])
+      (easy-menu-define w3m-bookmark-menu w3m-mode-map "" '("Bookmark"))
+      (easy-menu-add w3m-bookmark-menu)
+      (add-hook 'menu-bar-update-hook 'w3m-bookmark-menubar-update))))
+
+(defun w3m-bookmark-menubar-update ()
+  "Update w3m bookmark menubar."
+  (when (and (eq major-mode 'w3m-mode)
+	     (w3m-static-if (featurep 'xemacs)
+		 (frame-property (selected-frame) 'menubar-visible-p)
+	       menu-bar-mode))
+    (let ((items (if w3m-bookmark-mode
+		     (cdr w3m-bookmark-menu-items)
+		   (car w3m-bookmark-menu-items)))
+	  (pages (w3m-bookmark-make-menu-items)))
+      (easy-menu-define w3m-bookmark-menu w3m-mode-map
+	"The menu kepmap for the emacs-w3m bookmark."
+	(cons "Bookmark" (if pages
+			     (append items '("----") pages)
+			   items)))
+      (w3m-static-when (featurep 'xemacs)
+	(when (setq items (car (find-menu-item current-menubar '("Bookmark"))))
+	  (setcdr items (cdr w3m-bookmark-menu))
+	  (set-buffer-menubar current-menubar))))))
+
+(defun w3m-bookmark-iterator ()
+  "Iteration bookmark groups/entries.
+Format as (list (\"Group name\" . (\"Entry URL\" . \"Entry name\")* )* )."
+  (let ((entries nil))
+    (with-current-buffer (w3m-bookmark-buffer)
+      (goto-char (point-min))
+      (let (group entry beg end)
+	(while (re-search-forward "<h2>\\([^<]+\\)</h2>" nil t)
+	  (setq group (match-string-no-properties 1))
+	  (setq beg (match-beginning 0))
+	  (setq end (re-search-forward "</ul>" nil t))
+	  (save-excursion
+	    (let (urls)
+	      (narrow-to-region beg end)
+	      (goto-char (point-min))
+	      (while (re-search-forward
+		      "<a href=\"\\([^\"]+\\)\">\\([^<]+\\)</a>"
+		      nil t)
+		(push (cons (match-string-no-properties 1)
+			    (match-string-no-properties 2))
+		      urls))
+	      (setq entry (cons group (nreverse urls)))
+	      (push entry entries)
+	      (widen)))
+	  (goto-char (match-end 0))))
+      (nreverse entries))))
+
+(defun w3m-bookmark-menu-open-item (url)
+  "Open URL at current/new buffer"
+  (if w3m-bookmark-menu-open-new-session
+      (w3m-goto-url-new-session url)
+    (w3m-goto-url url)))
+
+(defvar w3m-bookmark-menu-items-pre nil)
+(defvar w3m-bookmark-menu-items-time nil)
+
+(defvar w3m-bookmark-make-item-xmas
+  (and (equal "Japanese" w3m-language) (featurep 'xemacs)))
+
+(defun w3m-bookmark-make-item (item)
+  (if w3m-bookmark-make-item-xmas
+      (concat item "%_ ")
+    item))
+
+(defun w3m-bookmark-make-menu-items (&optional nomenu)
+  "Create w3m bookmark menu items."
+  (when (not nomenu)
+    (if (and w3m-bookmark-menu-items-pre
+	     w3m-bookmark-menu-items-time
+	     (equal w3m-bookmark-menu-items-time
+		    (w3m-bookmark-file-modtime)))
+	w3m-bookmark-menu-items-pre
+      (setq w3m-bookmark-menu-items-time (w3m-bookmark-file-modtime))
+      (let ((entries (when (file-exists-p w3m-bookmark-file)
+		       (w3m-bookmark-iterator))))
+	(setq w3m-bookmark-menu-items-pre
+	      (and entries
+		   (mapcar
+		    (lambda (entry)
+		      (let ((group (car entry))
+			    (items (cdr entry)))
+			(cons (w3m-bookmark-make-item group)
+			      (and items
+				   (mapcar
+				    (lambda (item)
+				      (vector
+				       (w3m-bookmark-make-item (cdr item))
+				       `(w3m-bookmark-menu-open-item
+					 ,(car item))))
+				    items)))))
+		    entries)))))))
+
+(provide 'w3m-bookmark)
+
+;;; w3m-bookmark.el ends here

=== added file 'share/emacs/site-lisp/w3m/w3m-bug.el'
--- share/emacs/site-lisp/w3m/w3m-bug.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-bug.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,192 @@
+;;; w3m-bug.el --- command to report emacs-w3m bugs -*- coding: euc-japan -*-
+
+;; Copyright (C) 2002, 2003, 2005, 2007, 2010
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Author: Katsumi Yamaoka <yamaoka@jpl.org>
+;; Keywords: w3m, WWW, hypermedia
+
+;; This file is a part of emacs-w3m.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; `M-x report-emacs-w3m-bug' starts an email note to the emacs-w3m
+;; developers describing a problem.
+
+;;; Code:
+
+(defvar report-emacs-w3m-bug-address "emacs-w3m@namazu.org"
+  "*Address of mailing list for emacs-w3m bugs.")
+
+(defvar report-emacs-w3m-bug-no-explanations nil
+  "*If non-nil, suppress the explanations given for the sake of novice users.")
+
+(defconst report-emacs-w3m-bug-system-informations
+  (eval
+   '`(emacs-w3m-version
+      emacs-version
+      ,@(if (or (boundp 'mule-version)
+		(functionp 'mule-version))
+	    '(mule-version))
+      ,@(cond ((featurep 'xemacs)
+	       '((featurep 'mule)
+		 (featurep 'file-coding)))
+	      ((or (boundp 'Meadow-version)
+		   (functionp 'Meadow-version))
+	       '(Meadow-version)))
+      system-type
+      (featurep 'gtk)
+      w3m-version
+      w3m-type
+      w3m-compile-options
+      w3m-language
+      w3m-command-arguments
+      w3m-command-arguments-alist
+      w3m-command-environment
+      w3m-input-coding-system
+      w3m-output-coding-system
+      w3m-use-mule-ucs))
+  "List of the system informations.  Users should NEVER modify the value."
+  ;; For the developers:
+  ;; It is possible that it would be a security hole.  To prevent those
+  ;; rogue attacks, this constant should be reloaded for each time to
+  ;; send a bug report.  Each element can be the symbol of a variable,
+  ;; a Lisp function with no argument or any Lisp form to be evaluated.
+  )
+
+(eval-when-compile
+  (require 'cl))
+
+(defun report-emacs-w3m-bug (topic &optional buffer)
+  "Report a bug in emacs-w3m.
+Prompts for bug subject.  Leaves you in a mail buffer."
+  (interactive
+   (let* ((buffer (current-buffer))
+	  (buffers (cons buffer (delq buffer (buffer-list))))
+	  (inhibit-point-motion-hooks t)
+	  keymap)
+     (save-current-buffer
+       (while buffers
+	 (setq buffer (car buffers)
+	       buffers (cdr buffers))
+	 (set-buffer buffer)
+	 (save-restriction
+	   (widen)
+	   (if (or (eq major-mode 'w3m-mode)
+		   (and (keymapp (setq keymap
+				       (or (get-text-property
+					    (max (1- (point-max)) (point-min))
+					    'keymap)
+					   (get-text-property
+					    (max (1- (point-max)) (point-min))
+					    'local-map)))))
+		   (where-is-internal 'w3m-print-current-url keymap))
+	       (setq buffers nil)
+	     (setq buffer nil)))))
+     (list (read-string "Bug Subject: ") buffer)))
+  (let (after-load-alist)
+    ;; See the comment for `report-emacs-w3m-bug-system-informations'.
+    (load "w3m-bug"))
+  (compose-mail report-emacs-w3m-bug-address topic nil 'new)
+  (goto-char (point-min))
+  (re-search-forward (concat "^" (regexp-quote mail-header-separator) "$"))
+  (forward-line 1)
+  (unless buffer
+    (insert
+     (if (and (boundp 'w3m-language)
+	      (equal (symbol-value 'w3m-language) "Japanese"))
+	 "¤â¤·²Äǽ¤Ê¤é emacs-w3m ¤òµ¯Æ°¤·¤Æ¤«¤é¤ä¤êľ¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+       "It is if possible, please redo after starting emacs-w3m.\n")
+     "\
+================================================================\n"))
+  (unless report-emacs-w3m-bug-no-explanations
+    ;; Insert warnings for the novice users.
+    (if (and (boundp 'w3m-language)
+	     (equal (symbol-value 'w3m-language) "Japanese"))
+	(progn
+	  (insert "¤³¤Î¥Ð¥°¥ê¥Ý¡¼¥È¤Ï emacs-w3m ³«È¯¥Á¡¼¥à¤ËÁ÷¤é¤ì¤Þ¤¹¡£\n")
+	  (put-text-property (point)
+			     (progn
+			       (insert "\
+¤¢¤Ê¤¿¤Î¥í¡¼¥«¥ë¥µ¥¤¥È¤Î´ÉÍý¼Ô°¸¤Æ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!!")
+			       (point))
+			     'face 'underline)
+	  (insert "\n\n¤Ç¤­¤ë¤À¤±´Ê·é¤Ë½Ò¤Ù¤Æ¤¯¤À¤µ¤¤:
+\t- ²¿¤¬µ¯¤­¤Þ¤·¤¿¤«?
+\t- ËÜÅö¤Ï¤É¤¦¤Ê¤ë¤Ù¤­¤À¤Ã¤¿¤È»×¤¤¤Þ¤¹¤«?
+\t- ¤½¤Î¤È¤­²¿¤ò¤·¤Þ¤·¤¿¤«? (Àµ³Î¤Ë)
+
+¤â¤· Lisp ¤Î¥Ð¥Ã¥¯¥È¥ì¡¼¥¹¤¬¤¢¤ì¤ÐźÉÕ¤·¤Æ¤¯¤À¤µ¤¤¡£\n"))
+      (insert "\
+This bug report will be sent to the emacs-w3m development team,\n")
+      (put-text-property (point)
+			 (progn
+			   (insert " not to your local site managers!!")
+			   (point))
+			 'face 'italic)
+      (insert "\nPlease write in ")
+      (put-text-property (point) (progn
+				   (insert "simple")
+				   (point))
+			 'face 'italic)
+      (insert " English, because the emacs-w3m developers
+aren't good at English reading. ;-)
+
+Please describe as succinctly as possible:
+\t- What happened.
+\t- What you thought should have happened.
+\t- Precisely what you were doing at the time.
+
+Please also include any Lisp back-traces that you may have.\n"))
+    (insert "\
+================================================================\n"))
+  (insert "Dear Bug Team!\n\n")
+  (let ((user-point (point))
+	(print-escape-newlines t)
+	(print-quoted t)
+	infos print-length print-level)
+    (insert "\n
+================================================================
+
+System Info to help track down your bug:
+---------------------------------------\n")
+    (with-current-buffer (or buffer (current-buffer))
+      (dolist (info report-emacs-w3m-bug-system-informations)
+	(push (prin1-to-string info) infos)
+	(push "\n => " infos)
+	(push (cond ((functionp info)
+		     (prin1-to-string (condition-case code
+					  (funcall info)
+					(error
+					 code))))
+		    ((symbolp info)
+		     (prin1-to-string (condition-case code
+					  (symbol-value info)
+					(error
+					 code))))
+		    ((consp info)
+		     (prin1-to-string (condition-case code
+					  (eval info)
+					(error
+					 code)))))
+	      infos)
+	(push "\n" infos)))
+    (apply 'insert (nreverse infos))
+    (goto-char user-point)))
+
+;;; w3m-bug.el ends here

=== added file 'share/emacs/site-lisp/w3m/w3m-ccl.el'
--- share/emacs/site-lisp/w3m/w3m-ccl.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-ccl.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,202 @@
+;;; w3m-ccl.el --- CCL programs to process Unicode and internal characters.
+
+;; Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
+;;          ARISAWA Akihiro <ari@mbf.sphere.ne.jp>
+;; Keywords: w3m, WWW, hypermedia
+
+;; This file is a part of emacs-w3m.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; This file contains CCL programs to process Unicode and internal
+;; characters of w3m.  For more detail about emacs-w3m, see:
+;;
+;;    http://emacs-w3m.namazu.org/
+
+;;; MEMO:
+
+;; It is possible to support multi scripts without Mule-UCS.  For more
+;; detail, see [emacs-w3m:01950]
+
+;;; Code:
+
+(eval-and-compile
+  (cond
+   ((featurep 'xemacs)
+    (require 'pccl))
+   (t
+    (require 'ccl))))
+
+;;; CCL programs:
+
+(eval-when-compile
+  (when (and (not (fboundp 'charset-id))
+	     (fboundp 'charset-id-internal))
+    (defmacro charset-id (charset)
+      "Return charset identification number of CHARSET."
+      `(charset-id-internal ,charset))))
+
+(eval-and-compile
+  (defconst w3m-internal-characters-alist
+    '((?\x90 . ? )			; ANSP (use for empty anchor)
+      (?\x91 . ? )			; IMSP (blank around image)
+      (?\xa0 . ? ))			; NBSP (non breakble space)
+    "Alist of internal characters v.s. ASCII characters.")
+
+  (defun w3m-ccl-write-repeat (charset &optional r0 r1)
+    (unless r0
+      (setq r0 'r0))
+    (unless r1
+      (setq r1 (if (eq r0 'r1) 'r0 'r1)))
+    (let ((unibyte (memq charset '(latin-iso8859-1 katakana-jisx0201))))
+      (if (fboundp 'ccl-compile-write-multibyte-character)
+	  `((,r1 &= ?\x7f)
+	    ,@(unless unibyte
+		`((,r1 |= ((,r0 & ?\x7f) << 7))))
+	    (,r0 = ,(charset-id charset))
+	    (write-multibyte-character ,r0 ,r1)
+	    (repeat))
+	`((write ,(charset-id charset))
+	  ,@(unless unibyte
+	      `((write ,r0)))
+	  (write-repeat ,r1)))))
+
+  (defconst w3m-ccl-write-euc-japan-character
+    (when (fboundp 'ccl-compile-read-multibyte-character)
+      `((read-multibyte-character r1 r0)
+	(if (r1 == ,(charset-id 'ascii))
+	    ;; (1) ASCII characters
+	    (write-repeat r0))
+	(if (r1 == ,(charset-id 'latin-jisx0201))
+	    ;; (2) Latin Part of Japanese JISX0201.1976
+	    ;;     Convert to ASCII
+	    (write-repeat r0))
+	(r2 = (r1 == ,(charset-id 'japanese-jisx0208-1978)))
+	(if ((r1 == ,(charset-id 'japanese-jisx0208)) | r2)
+	    ;; (3) Characters of Japanese JISX0208.
+	    ((r1 = ((r0 & 127) | 128))
+	     (r0 = ((r0 >> 7) | 128))
+	     (write r0)
+	     (write-repeat r1)))
+	(if (r1 == ,(charset-id 'katakana-jisx0201))
+	    ;; (4) Katakana Part of Japanese JISX0201.1976
+	    ((r0 |= 128)
+	     (write ?\x8e)
+	     (write-repeat r0)))))
+    "CCL program to write characters represented in `euc-japan'.")
+
+  (defconst w3m-ccl-write-iso-latin-1-character
+    (when (fboundp 'ccl-compile-read-multibyte-character)
+      `((read-multibyte-character r1 r0)
+	(if (r1 == ,(charset-id 'ascii))
+	    ;; (1) ASCII characters
+	    (write-repeat r0))
+	(if (r1 == ,(charset-id 'latin-jisx0201))
+	    ;; (2) Latin Part of Japanese JISX0201.1976
+	    ;;     Convert to ASCII
+	    (write-repeat r0))
+	(if (r1 == ,(charset-id 'latin-iso8859-1))
+	    ;; (3) Latin-1 characters
+	    ((r0 |= ?\x80)
+	     (write-repeat r0)))))
+    "CCL program to write characters represented in `iso-latin-1'.")
+
+  (defconst w3m-ccl-generate-ncr
+    `((r1 = 0)
+      (r2 = 0)
+      (loop
+       (r1 = (r1 << 4))
+       (r1 |= (r0 & 15))
+       (r0 = (r0 >> 4))
+       (if (r0 == 0)
+	   (break)
+	 ((r2 += 1)
+	  (repeat))))
+      (write "&#x")
+      (loop
+       (branch (r1 & 15)
+	       ,@(mapcar
+		  (lambda (i)
+		    (list 'write (string-to-char (format "%x" i))))
+		  '(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15)))
+       (r1 = (r1 >> 4))
+       (if (r2 == 0)
+	   ((write ?\;)
+	    (break))
+	 ((r2 -= 1)
+	  (repeat))))
+      (repeat))
+    "CCL program to generate a string which represents a UCS codepoint
+in NCR (Numeric Character References)."))
+
+(define-ccl-program w3m-euc-japan-decoder
+  `(2
+    (loop
+     (read r0)
+     ;; Process normal EUC characters.
+     (if (r0 < ?\x80)
+	 (write-repeat r0))
+     (if (r0 > ?\xa0)
+	 ((read r1)
+	  ,@(w3m-ccl-write-repeat 'japanese-jisx0208)))
+     (if (r0 == ?\x8e)
+	 ((read r1)
+	  ,@(w3m-ccl-write-repeat 'katakana-jisx0201)))
+     (if (r0 == ?\x8f)
+	 ((read r0)
+	  (read r1)
+	  ,@(w3m-ccl-write-repeat 'japanese-jisx0212)))
+     ;; Process internal characters used in w3m.
+     ,@(mapcar (lambda (pair)
+		 `(if (r0 == ,(car pair))
+		      (write-repeat ,(cdr pair))))
+	       w3m-internal-characters-alist)
+     (write-repeat r0))))
+
+(unless (get 'w3m-euc-japan-encoder 'ccl-program-idx)
+  (define-ccl-program w3m-euc-japan-encoder
+    `(1 (loop (read r0) (write-repeat r0)))))
+
+(define-ccl-program w3m-iso-latin-1-decoder
+  `(2
+    (loop
+     (read r0)
+     ;; Process ASCII characters.
+     (if (r0 < ?\x80)
+	 (write-repeat r0))
+     ;; Process Latin-1 characters.
+     (if (r0 > ?\xa0)
+	 (,@(w3m-ccl-write-repeat 'latin-iso8859-1 'r1)))
+     ;; Process internal characters used in w3m.
+     ,@(mapcar (lambda (pair)
+		 `(if (r0 == ,(car pair))
+		      (write-repeat ,(cdr pair))))
+	       w3m-internal-characters-alist)
+     (write-repeat r0))))
+
+(unless (get 'w3m-iso-latin-1-encoder 'ccl-program-idx)
+  (define-ccl-program w3m-iso-latin-1-encoder
+    `(1 (loop (read r0) (write-repeat r0)))))
+
+
+(provide 'w3m-ccl)
+
+;;; w3m-ccl.el ends here

=== added file 'share/emacs/site-lisp/w3m/w3m-cookie.el'
--- share/emacs/site-lisp/w3m/w3m-cookie.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-cookie.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,578 @@
+;;; w3m-cookie.el --- Functions for cookie processing
+
+;; Copyright (C) 2002, 2003, 2005, 2006, 2008, 2009, 2010
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Authors: Teranishi Yuuichi  <teranisi@gohome.org>
+;; Keywords: w3m, WWW, hypermedia
+
+;; This file is a part of emacs-w3m.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; This file contains the functions for cookies.  For more detail
+;; about emacs-w3m, see:
+;;
+;;    http://emacs-w3m.namazu.org/
+
+;; Reference for version 0 cookie:
+;;	http://www.netscape.com/newsref/std/cookie_spec.html
+;; Reference for version 1 cookie:
+;;	http://www.ietf.org/rfc/rfc2965.txt
+;;
+
+;;; Code:
+
+(eval-when-compile
+  (require 'cl))
+
+(require 'w3m-util)
+(require 'w3m)
+
+(defvar w3m-cookies nil
+  "A list of cookie elements.
+Currently only browser local cookies are stored.")
+
+(defconst w3m-cookie-two-dot-domains-regexp
+  (concat "\\.\\(?:"
+	  (mapconcat 'identity (list "com" "edu" "net" "org" "gov" "mil" "int")
+		     "\\|")
+	  "\\)$")
+  "A regular expression of top-level domains that only require two matching
+'.'s in the domain name in order to set a cookie.")
+
+(defcustom w3m-cookie-accept-domains nil
+  "A list of trusted domain name string."
+  :group 'w3m
+  :type '(repeat (string :format "Domain name: %v\n" :size 0)))
+
+(defcustom w3m-cookie-reject-domains nil
+  "A list of untrusted domain name string."
+  :group 'w3m
+  :type '(repeat (string :format "Domain name: %v\n" :size 0)))
+
+(defcustom w3m-cookie-accept-bad-cookies nil
+  "If nil, don't accept bad cookies.
+If t, accept bad cookies.
+If ask, ask user whether accept bad cookies or not."
+  :group 'w3m
+  :type '(radio
+	  (const :tag "Don't accept bad cookies" nil)
+	  (const :tag "Ask accepting bad cookies" ask)
+	  (const :tag "Always accept bad cookies" t)))
+
+(defcustom w3m-cookie-save-cookies t
+  "*Non-nil means save cookies when emacs-w3m cookie system shutdown."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-cookie-file
+  (expand-file-name ".cookie" w3m-profile-directory)
+  "File in which cookies are kept."
+  :group 'w3m
+  :type '(file :size 0))
+
+;;; Cookie accessor.
+(defmacro w3m-cookie-url (cookie)
+  `(aref ,cookie 0))
+(defmacro w3m-cookie-domain (cookie)
+  `(aref ,cookie 1))
+(defmacro w3m-cookie-secure (cookie)
+  `(aref ,cookie 2))
+(defmacro w3m-cookie-name (cookie)
+  `(aref ,cookie 3))
+(defmacro w3m-cookie-value (cookie)
+  `(aref ,cookie 4))
+(defmacro w3m-cookie-path (cookie)
+  `(aref ,cookie 5))
+(defmacro w3m-cookie-version (cookie)
+  `(aref ,cookie 6))
+(defmacro w3m-cookie-expires (cookie)
+  `(aref ,cookie 7))
+(defmacro w3m-cookie-ignore (cookie)
+  `(aref ,cookie 8))
+
+(defun w3m-cookie-create (&rest args)
+  (let ((cookie (make-vector 9 nil)))
+    (setf (w3m-cookie-url cookie)     (plist-get args :url))
+    (setf (w3m-cookie-domain cookie)  (plist-get args :domain))
+    (setf (w3m-cookie-secure cookie)  (plist-get args :secure))
+    (setf (w3m-cookie-name cookie)    (plist-get args :name))
+    (setf (w3m-cookie-value cookie)   (plist-get args :value))
+    (setf (w3m-cookie-path cookie)    (plist-get args :path))
+    (setf (w3m-cookie-version cookie) (or (plist-get args :version) 0))
+    (setf (w3m-cookie-expires cookie) (plist-get args :expires))
+    (setf (w3m-cookie-ignore cookie)  (plist-get args :ignore))
+    cookie))
+
+(defun w3m-cookie-store (cookie)
+  "Store COOKIE."
+  (let (ignored)
+    (catch 'found
+      (dolist (c w3m-cookies)
+	(when (and (string= (w3m-cookie-domain c)
+			    (w3m-cookie-domain cookie))
+		   (string= (w3m-cookie-path c)
+			    (w3m-cookie-path cookie))
+		   (string= (w3m-cookie-name c)
+			    (w3m-cookie-name cookie)))
+	  (if (w3m-cookie-ignore c)
+	      (setq ignored t)
+	    (setq w3m-cookies (delq c w3m-cookies)))
+	  (throw 'found t))))
+    (unless ignored
+      (push cookie w3m-cookies))))
+
+(defun w3m-cookie-remove (domain path name)
+  "Remove COOKIE if stored."
+  (dolist (c w3m-cookies)
+    (when (and (string= (w3m-cookie-domain c)
+			domain)
+	       (string= (w3m-cookie-path c)
+			path)
+	       (string= (w3m-cookie-name c)
+			name))
+      (setq w3m-cookies (delq c w3m-cookies)))))
+
+(defun w3m-cookie-retrieve (host path &optional secure)
+  "Retrieve cookies for DOMAIN and PATH."
+  (let ((case-fold-search t)
+	expires	cookies)
+    (dolist (c w3m-cookies)
+      (if (and (w3m-cookie-expires c)
+	       (w3m-time-newer-p (current-time)
+				 (w3m-time-parse-string
+				  (w3m-cookie-expires c))))
+	  (push c expires)
+	(when (and (not (w3m-cookie-ignore c))
+		   (or
+		    ;; A special case that domain name is ".hostname".
+		    (string= (concat "." host) (w3m-cookie-domain c))
+		    (string-match (concat
+				   (regexp-quote (w3m-cookie-domain c)) "$")
+				  host))
+		   (string-match (concat
+				  "^" (regexp-quote (w3m-cookie-path c)))
+				 path))
+	  (if (w3m-cookie-secure c)
+	      (if secure
+		  (push c cookies))
+	    (push c cookies)))))
+    ;; Delete expired cookies.
+    (dolist (expire expires)
+      (setq w3m-cookies (delq expire w3m-cookies)))
+    cookies))
+
+;; HTTP URL parser.
+(defun w3m-parse-http-url (url)
+  "Parse an absolute HTTP URL."
+  (let (secure split)
+    (w3m-string-match-url-components url)
+    (when (and (match-beginning 4)
+	       (or (equal (match-string 2 url) "http")
+		   (setq secure (equal (match-string 2 url) "https"))))
+      (setq split (save-match-data
+		    (split-string (match-string 4 url) ":")))
+      (vector secure
+	      (nth 0 split)
+	      (string-to-number (or (nth 1 split) "80"))
+	      (if (eq (length (match-string 5 url)) 0)
+		  "/"
+		(match-string 5 url))))))
+
+(defsubst w3m-http-url-secure (http-url)
+  "Secure flag of the HTTP-URL."
+  (aref http-url 0))
+
+(defsubst w3m-http-url-host (http-url)
+  "Host name of the HTTP-URL."
+  (aref http-url 1))
+
+(defsubst w3m-http-url-port (http-url)
+  "Port number of the HTTP-URL."
+  (aref http-url 2))
+
+(defsubst w3m-http-url-path (http-url)
+  "Path of the HTTP-URL."
+  (aref http-url 3))
+
+;;; Cookie parser.
+(defvar w3m-cookie-parse-args-syntax-table
+  (copy-syntax-table emacs-lisp-mode-syntax-table)
+  "A syntax table for parsing sgml attributes.")
+
+(modify-syntax-entry ?' "\"" w3m-cookie-parse-args-syntax-table)
+(modify-syntax-entry ?` "\"" w3m-cookie-parse-args-syntax-table)
+(modify-syntax-entry ?{ "(" w3m-cookie-parse-args-syntax-table)
+(modify-syntax-entry ?} ")" w3m-cookie-parse-args-syntax-table)
+
+(defun w3m-cookie-parse-args (str &optional nodowncase)
+  (let (name value results name-pos val-pos)
+    (with-current-buffer (get-buffer-create " *w3m-cookie-parse-temp*")
+      (erase-buffer)
+      (set-syntax-table w3m-cookie-parse-args-syntax-table)
+      (insert str)
+      (goto-char (point-min))
+      (while (not (eobp))
+	(skip-chars-forward "; \n\t")
+	(setq name-pos (point))
+	(skip-chars-forward "^ \n\t=;")
+	(unless nodowncase
+	  (downcase-region name-pos (point)))
+	(setq name (buffer-substring name-pos (point)))
+	(skip-chars-forward " \t\n")
+	(if (/= (or (char-after (point)) 0)  ?=) ; There is no value
+	    (setq value nil)
+	  (skip-chars-forward " \t\n=")
+	  (setq val-pos (point)
+		value
+		(cond
+		 ((or (= (or (char-after val-pos) 0) ?\")
+		      (= (or (char-after val-pos) 0) ?'))
+		  (buffer-substring (1+ val-pos)
+				    (condition-case ()
+					(prog2
+					    (forward-sexp 1)
+					    (1- (point))
+					  (skip-chars-forward "\""))
+				      (error
+				       (skip-chars-forward "^ \t\n")
+				       (point)))))
+		 (t
+		  (buffer-substring val-pos
+				    (progn
+				      (skip-chars-forward "^;")
+				      (skip-chars-backward " \t")
+				      (point)))))))
+	(push (cons name value) results)
+	(skip-chars-forward "; \n\t"))
+      results)))
+
+(defun w3m-cookie-trusted-host-p (host)
+  "Returns non-nil when the HOST is specified as trusted by user."
+  (let ((accept w3m-cookie-accept-domains)
+	(reject w3m-cookie-reject-domains)
+	(trusted t)
+	regexp tlen rlen)
+    (while accept
+      (cond
+       ((string= (car accept) ".")
+	(setq regexp ".*"))
+       ((string= (car accept) ".local")
+	(setq regexp "^[^\\.]+$"))
+       ((eq (string-to-char (car accept)) ?.)
+	(setq regexp (concat (regexp-quote (car accept)) "$")))
+       (t (setq regexp (concat "^" (regexp-quote (car accept)) "$"))))
+      (when (string-match regexp host)
+	(setq tlen (length (car accept))
+	      accept nil))
+      (pop accept))
+    (while reject
+      (cond
+       ((string= (car reject) ".")
+	(setq regexp ".*"))
+       ((string= (car reject) ".local")
+	(setq regexp "^[^\\.]+$"))
+       ((eq (string-to-char (car reject)) ?.)
+	(setq regexp (concat (regexp-quote (car reject)) "$")))
+       (t (setq regexp (concat "^" (regexp-quote (car reject)) "$"))))
+      (when (string-match regexp host)
+	(setq rlen (length (car reject))
+	      reject nil))
+      (pop reject))
+    (if tlen
+	(if rlen
+	    (if (<= tlen rlen)
+		(setq trusted nil)))
+      (if rlen
+	  (setq trusted nil)))
+    trusted))
+
+;;; Version 0 cookie.
+(defun w3m-cookie-1-acceptable-p (host domain)
+  (let ((numdots 0)
+	(last nil)
+	(case-fold-search t)
+	(mindots 3))
+    (while (setq last (string-match "\\." domain last))
+      (setq numdots (1+ numdots)
+	    last (1+ last)))
+    (if (string-match w3m-cookie-two-dot-domains-regexp domain)
+	(setq mindots 2))
+    (cond
+     ((string= host domain)		; Apparently netscape lets you do this
+      t)
+     ;; A special case that domain name is ".hostname".
+     ((string= (concat "." host) domain)
+      t)
+     ((>= numdots mindots)		; We have enough dots in domain name
+      ;; Need to check and make sure the host is actually _in_ the
+      ;; domain it wants to set a cookie for though.
+      (string-match (concat (regexp-quote domain) "$") host))
+     (t
+      nil))))
+
+(defun w3m-cookie-1-set (url &rest args)
+  ;; Set-Cookie:, version 0 cookie.
+  (let ((http-url (w3m-parse-http-url url))
+	(case-fold-search t)
+	secure domain expires path rest)
+    (when http-url
+      (setq secure (and (w3m-assoc-ignore-case "secure" args) t)
+	    domain (or (cdr-safe (w3m-assoc-ignore-case "domain" args))
+		       (w3m-http-url-host http-url))
+	    expires (cdr-safe (w3m-assoc-ignore-case "expires" args))
+	    path (or (cdr-safe (w3m-assoc-ignore-case "path" args))
+		     (file-name-directory
+		      (w3m-http-url-path http-url))))
+      (while args
+	(if (not (member (downcase (car (car args)))
+			 '("secure" "domain" "expires" "path")))
+	    (setq rest (cons (car args) rest)))
+	(setq args (cdr args)))
+      (cond
+       ((not (w3m-cookie-trusted-host-p (w3m-http-url-host http-url)))
+	;; The site was explicity marked as untrusted by the user
+	nil)
+       ((or (w3m-cookie-1-acceptable-p (w3m-http-url-host http-url) domain)
+	    (eq w3m-cookie-accept-bad-cookies t)
+	    (and (eq w3m-cookie-accept-bad-cookies 'ask)
+		 (y-or-n-p (format "Accept bad cookie from %s for %s? "
+				   (w3m-http-url-host http-url) domain))))
+	;; Cookie is accepted by the user, and passes our security checks
+	(dolist (elem rest)
+	  ;; If a CGI script wishes to delete a cookie, it can do so by
+	  ;; returning a cookie with the same name, and an expires time
+	  ;; which is in the past.
+	  (when (and expires
+		     (w3m-time-newer-p (current-time)
+				       (w3m-time-parse-string expires)))
+	    (w3m-cookie-remove domain path (car elem)))
+	  (w3m-cookie-store
+	   (w3m-cookie-create :url url
+			      :domain domain
+			      :name (car elem)
+			      :value (cdr elem)
+			      :path path
+			      :expires expires
+			      :secure secure))))
+       (t
+	(message "%s tried to set a cookie for domain %s - rejected."
+		 (w3m-http-url-host http-url) domain))))))
+
+;;; Version 1 cookie.
+(defun w3m-cookie-2-acceptable-p (http-url domain)
+  ;;   A user agent rejects (SHALL NOT store its information) if the Version
+  ;;   attribute is missing.  Moreover, a user agent rejects (SHALL NOT
+  ;;   store its information) if any of the following is true of the
+  ;;   attributes explicitly present in the Set-Cookie2 response header:
+
+  ;;      *  The value for the Path attribute is not a prefix of the
+  ;;         request-URI.
+
+  ;;      *  The value for the Domain attribute contains no embedded dots,
+  ;;         and the value is not .local.
+
+  ;;      *  The effective host name that derives from the request-host does
+  ;;         not domain-match the Domain attribute.
+
+  ;;      *  The request-host is a HDN (not IP address) and has the form HD,
+  ;;         where D is the value of the Domain attribute, and H is a string
+  ;;         that contains one or more dots.
+
+  ;;      *  The Port attribute has a "port-list", and the request-port was
+  ;;         not in the list.
+  )
+
+(defun w3m-cookie-2-set (url &rest args)
+  ;; Set-Cookie2:, version 1 cookie.
+  ;; Not implemented yet.
+  )
+
+
+;;; Save & Load
+(defvar w3m-cookie-init nil)
+
+(defun w3m-cookie-clear ()
+  "Clear cookie list."
+  (setq w3m-cookies nil))
+
+(defun w3m-cookie-save (&optional domain)
+  "Save cookies.
+When DOMAIN is non-nil, only save cookies whose domains match it."
+  (interactive)
+  (let (cookies)
+    (dolist (cookie w3m-cookies)
+      (when (and (or (not domain)
+		     (string= (w3m-cookie-domain cookie) domain))
+		 (w3m-cookie-expires cookie)
+		 (w3m-time-newer-p (w3m-time-parse-string
+				    (w3m-cookie-expires cookie))
+				   (current-time)))
+	(push cookie cookies)))
+    (w3m-save-list w3m-cookie-file cookies)))
+
+(defun w3m-cookie-save-current-site-cookies ()
+  "Save cookies for the current site."
+  (interactive)
+  (when (and w3m-current-url
+	     (not (w3m-url-local-p w3m-current-url)))
+    (w3m-string-match-url-components w3m-current-url)
+    (w3m-cookie-save (match-string 4 w3m-current-url))))
+
+(defun w3m-cookie-load ()
+  "Load cookies."
+  (when (null w3m-cookies)
+    (setq w3m-cookies
+	  (w3m-load-list w3m-cookie-file))))
+
+(defun w3m-cookie-setup ()
+  "Setup cookies. Returns immediataly if already initialized."
+  (interactive)
+  (unless w3m-cookie-init
+    (w3m-cookie-load)
+    (setq w3m-cookie-init t)))
+
+;;;###autoload
+(defun w3m-cookie-shutdown ()
+  "Save cookies, and reset cookies' data."
+  (interactive)
+  (when w3m-cookie-save-cookies
+    (w3m-cookie-save))
+  (setq w3m-cookie-init nil)
+  (w3m-cookie-clear)
+  (if (get-buffer " *w3m-cookie-parse-temp*")
+      (kill-buffer (get-buffer " *w3m-cookie-parse-temp*"))))
+
+;;;###autoload
+(defun w3m-cookie-set (url beg end)
+  "Register cookies which correspond to URL.
+BEG and END should be an HTTP response header region on current buffer."
+  (w3m-cookie-setup)
+  (when (and url beg end)
+    (save-excursion
+      (let ((case-fold-search t)
+	    (version 0)
+	    data)
+	(goto-char beg)
+	(while (re-search-forward
+		"^\\(?:Set-Cookie\\(2\\)?:\\) *\\(.*\\(?:\n[ \t].*\\)*\\)\n"
+		end t)
+	  (setq data (match-string 2))
+	  (if (match-beginning 1)
+	      (setq version 1))
+	  (apply
+	   (case version
+	     (0 'w3m-cookie-1-set)
+	     (1 'w3m-cookie-2-set))
+	   url (w3m-cookie-parse-args data 'nodowncase)))))))
+
+;;;###autoload
+(defun w3m-cookie-get (url)
+  "Get a cookie field string which corresponds to the URL."
+  (w3m-cookie-setup)
+  (let* ((http-url (w3m-parse-http-url url))
+	 (cookies (and http-url
+		       (w3m-cookie-retrieve (w3m-http-url-host http-url)
+					    (w3m-http-url-path http-url)
+					    (w3m-http-url-secure http-url)))))
+    ;; When sending cookies to a server, all cookies with a more specific path
+    ;; mapping should be sent before cookies with less specific path mappings.
+    (setq cookies (sort cookies
+			(lambda (x y)
+			  (< (length (w3m-cookie-path x))
+			     (length (w3m-cookie-path y))))))
+    (when cookies
+      (mapconcat (lambda (cookie)
+		   (concat (w3m-cookie-name cookie)
+			   "=" (w3m-cookie-value cookie)))
+		 cookies
+		 "; "))))
+
+;;;###autoload
+(defun w3m-cookie (&optional no-cache)
+  "Display cookies and enable you to manage them."
+  (interactive "P")
+  (w3m-goto-url "about://cookie/" no-cache))
+
+;;;###autoload
+(defun w3m-about-cookie (url &optional no-decode no-cache post-data &rest args)
+  "Make the html contents to display and to enable you to manage cookies."
+  (unless w3m-use-cookies (error "You must enable emacs-w3m to use cookies."))
+  (w3m-cookie-setup)
+  (let ((pos 0))
+    (when post-data
+      (dolist (pair (split-string post-data "&"))
+	(setq pair (split-string pair "="))
+	(setf (w3m-cookie-ignore
+	       (nth (string-to-number (car pair)) w3m-cookies))
+	      (eq (string-to-number (cadr pair)) 0))))
+    (insert
+     (concat
+      "\
+<html><head><title>Cookies</title></head>
+<body><center><b>Cookies</b></center>
+<p><form method=\"post\" action=\"about://cookie/\">
+<ol>"))
+    (dolist (cookie w3m-cookies)
+      (insert
+       (concat
+	"<li><h1><a href=\""
+	(w3m-cookie-url cookie)
+	"\">"
+	(w3m-cookie-url cookie)
+	"</a></h1>"
+	"<table cellpadding=0>"
+	"<tr><td width=\"80\"><b>Cookie:</b></td><td>"
+	(w3m-cookie-name cookie) "=" (w3m-cookie-value cookie)
+	"</td></tr>"
+	(when (w3m-cookie-expires cookie)
+	  (concat
+	   "<tr><td width=\"80\"><b>Expires:</b></td><td>"
+	   (w3m-cookie-expires cookie)
+	   "</td></tr>"))
+	"<tr><td width=\"80\"><b>Version:</b></td><td>"
+	(number-to-string (w3m-cookie-version cookie))
+	"</td></tr>"
+	(when (w3m-cookie-domain cookie)
+	  (concat
+	   "<tr><td width=\"80\"><b>Domain:</b></td><td>"
+	   (w3m-cookie-domain cookie)
+	   "</td></tr>"))
+	(when (w3m-cookie-path cookie)
+	  (concat
+	   "<tr><td width=\"80\"><b>Path:</b></td><td>"
+	   (w3m-cookie-path cookie)
+	   "</td></tr>"))
+	"<tr><td width=\"80\"><b>Secure:</b></td><td>"
+	(if (w3m-cookie-secure cookie) "Yes" "No")
+	"</td></tr><tr><td>"
+	"<tr><td width=\"80\"><b>Use:</b></td><td>"
+	(format "<input type=radio name=\"%d\" value=1%s>Yes"
+		pos (if (w3m-cookie-ignore cookie) "" " checked"))
+	"&nbsp;&nbsp;"
+	(format "<input type=radio name=\"%d\" value=0%s>No"
+		pos (if (w3m-cookie-ignore cookie) " checked" ""))
+	"</td></tr><tr><td><input type=submit value=\"OK\"></table><p>"))
+      (setq pos (1+ pos)))
+    (insert "</ol></form></body></html>")
+    "text/html"))
+
+(provide 'w3m-cookie)
+
+;;; w3m-cookie.el ends here

=== added file 'share/emacs/site-lisp/w3m/w3m-dtree.el'
--- share/emacs/site-lisp/w3m/w3m-dtree.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-dtree.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,239 @@
+;;; w3m-dtree.el --- The add-on program to display local directory tree.
+
+;; Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2009
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Author: Hideyuki SHIRAI    <shirai@meadowy.org>,
+;;         TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Keywords: w3m, WWW, hypermedia, directory, tree
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+
+;;; Commentary:
+
+;; w3m-dtree.el is the add-on program of emacs-w3m to display local
+;; directory tree.  For more detail about emacs-w3m, see:
+;;
+;;    http://emacs-w3m.namazu.org/
+
+
+;;; Code:
+(require 'w3m)
+
+(defcustom w3m-dtree-default-allfiles nil
+  "*If non-nil, set 'allfiles' to default."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-dtree-directory-depth 8
+  "*Interger of a depth of the viewing directory."
+  :group 'w3m
+  :type '(choice
+	  (const :tag "No limit" nil)
+	  (integer :format "%t: %v\n" :size 0 :tag "depth" 10)))
+
+(defcustom w3m-dtree-indent-strings ["|-" "+-" "|  " "   "]
+  "*Vector of strings to be used for indentation with w3m-dtree.
+
+If use default value or choice 'ASCII', display like this,
+/home/shirai/work/emacs-w3m/
+ |-CVS/
+ |-icons/
+ |  +-CVS/
+ +-shimbun/
+    +-CVS/
+
+If you care for another style, set manually and try it :-).
+"
+  :group 'w3m
+  :type '(radio
+	  (const :format "ASCII: " ["|-" "+-" "|  " "   "])
+	  (vector
+	   :convert-widget w3m-widget-type-convert-widget
+	   (let ((defaults (if (equal w3m-language "Japanese")
+			       (vconcat
+				(mapcar
+				 (lambda (s)
+				   (decode-coding-string s 'iso-2022-7bit))
+				 '("\e$B('\e(B" "\e$B(&\e(B"
+				   "\e$B(\"\e(B" "\e$B!!\e(B")))
+			     ["|-" "+-" "|  " "   "])))
+	     `(:format "Others:\n%v" :indent 4
+		       (string :format "%{|-%}          %v\n"
+			       :sample-face widget-field-face :size 0
+			       :value ,(aref defaults 0))
+		       (string :format "%{+-%}          %v\n"
+			       :sample-face widget-field-face :size 0
+			       :value ,(aref defaults 1))
+		       (string :format "%{|  %}         %v\n"
+			       :sample-face widget-field-face :size 0
+			       :value ,(aref defaults 2))
+		       (string :format "%{   %}         %v"
+			       :sample-face widget-field-face :size 0
+			       :value ,(aref defaults 3)))))))
+
+(defcustom w3m-dtree-stop-strings ["|=" "+="]
+  "*Vector of strings to be used for indentation when a depth of directory
+over the 'w3m-dtree-directory-depth'."
+  :group 'w3m
+  :type '(radio
+	  (const :format "ASCII: " ["|=" "+="])
+	  (const :format "ASCII Bold: " ["<b>|-</b>" "<b>+-</b>"])
+	  (vector
+	   :convert-widget w3m-widget-type-convert-widget
+	   (let ((defaults (if (equal w3m-language "Japanese")
+			       (vconcat
+				(mapcar
+				 (lambda (s)
+				   (decode-coding-string s 'iso-2022-7bit))
+				 '("\e$B(<\e(B" "\e$B(1\e(B")))
+			     ["|=" "+="])))
+	     `(:format "Others:\n%v" :indent 4
+		       (string :format "|=          %{|=%}              %v\n"
+			       :sample-face bold :size 0
+			       :value ,(aref defaults 0))
+		       (string :format "+=          %{+=%}              %v\n"
+			       :sample-face bold :size 0
+			       :value ,(aref defaults 1)))))))
+
+(defun w3m-dtree-expand-file-name (path)
+  (if (string-match "^\\(.\\):\\(.*\\)" path)
+      (if w3m-use-cygdrive
+	  (concat "/cygdrive/"
+		  (match-string 1 path) (match-string 2 path))
+	(concat "/" (match-string 1 path) "|" (match-string 2 path)))
+    path))
+
+(defun w3m-dtree-directory-name (path)
+  (when (and w3m-treat-drive-letter
+	     (string-match
+	      "^/\\(?:\\([A-Za-z]\\)[|:]?\\|cygdrive/\\([A-Za-z]\\)\\)/"
+	      path))
+    (setq path (concat
+		(or (match-string 1 path)
+		    (match-string 2 path))
+		":/"
+		(substring path (match-end 0)))))
+  path)
+
+(defmacro w3m-dtree-has-child (path)
+  `(let ((w32-get-true-file-link-count t)) ;; true link count for Meadow
+     (and (nth 1 (file-attributes ,path))
+	  (/= (nth 1 (file-attributes ,path)) 2))))
+
+(defun w3m-dtree-create-sub (path allfiles dirprefix fileprefix indent depth)
+  (let* ((files (directory-files path t))
+	 (limit (and (integerp w3m-dtree-directory-depth)
+		     (>= depth w3m-dtree-directory-depth)))
+	 (indent-sub1 (if limit
+			  (aref w3m-dtree-stop-strings 0)
+			(aref w3m-dtree-indent-strings 0)))
+	 (indent-sub2 (aref w3m-dtree-indent-strings 2))
+	 file fullpath tmp)
+    (setq files (delete (concat (file-name-as-directory path) ".")
+			(delete (concat (file-name-as-directory path) "..")
+				files)))
+    (unless allfiles
+      (setq tmp files)
+      (while (setq file (car tmp))
+	(unless (file-directory-p file)
+	  (setq files (delete file files)))
+	(setq tmp (cdr tmp))))
+    (while (setq fullpath (car files))
+      (when (= (length files) 1)
+	(if limit
+	    (setq indent-sub1 (aref w3m-dtree-stop-strings 1))
+	  (setq indent-sub1 (aref w3m-dtree-indent-strings 1)))
+	(setq indent-sub2 (aref w3m-dtree-indent-strings 3)))
+      (setq file (file-name-nondirectory fullpath))
+      (cond
+       ((or (not allfiles) (file-directory-p fullpath))
+	(insert (format "%s%s%s<A HREF=\"%s%s\">%s</A>\n"
+			indent indent-sub1
+			(if allfiles "<B>[d]</B>" "")
+			dirprefix
+			(w3m-dtree-expand-file-name (file-name-as-directory fullpath))
+			(concat file "/")))
+	(when (and (null limit)
+		   (or allfiles (w3m-dtree-has-child fullpath)))
+	  (w3m-dtree-create-sub fullpath allfiles dirprefix fileprefix
+				(concat indent indent-sub2) (1+ depth))))
+       ((and allfiles (file-exists-p fullpath))
+	(insert (format "%s%s%s<A HREF=\"%s%s\">%s</A>\n"
+			indent indent-sub1
+			(if allfiles "(f)" "")
+			fileprefix (w3m-dtree-expand-file-name fullpath)
+			file))))
+      (setq files (cdr files)))))
+
+(defun w3m-dtree-create (path allfiles dirprefix fileprefix)
+  (let ((charset (or (car (rassq w3m-file-name-coding-system
+				 w3m-charset-coding-system-alist))
+		     w3m-file-name-coding-system)))
+    (insert "<!doctype html public \"-//W3C//DTD HTML 3.2//EN\">\n"
+	    "<html>\n<head>\n"
+	    "<meta http-equiv=\"CONTENT-TYPE\" "
+	    "content=\"text/html; charset="
+	    (symbol-name charset)
+	    "\">\n"
+	    "<title>"
+	    path
+	    "</title>\n</head>\n<body>\n<pre>\n")
+    (insert (format "<A HREF=\"%s%s\">%s</A>%s\n"
+		    dirprefix (w3m-dtree-expand-file-name path) path
+		    (if allfiles " (allfiles)" "")))
+    (if (file-directory-p path)
+	(w3m-dtree-create-sub path allfiles dirprefix fileprefix " " 0)
+      (insert (format "\n<h3>Warning: Directory not found.</h3>\n")))
+    (insert "</pre>\n</body>\n</html>\n")))
+
+;;;###autoload
+(defun w3m-about-dtree (url &optional nodecode allfiles &rest args)
+  (let ((prelen (length "about://dtree"))
+	(dirprefix "about://dtree")
+	(fileprefix "file://")
+	path)
+    (if (string-match "\\?allfiles=\\(?:\\(true\\)\\|false\\)$" url)
+	(progn
+	  (setq path (substring url prelen (match-beginning 0)))
+	  (if (match-beginning 1) (setq allfiles t)))
+      (if w3m-dtree-default-allfiles
+	  (setq allfiles (not allfiles)))
+      (setq path (substring url prelen)))
+    ;; counter drive letter
+    (setq path (file-name-as-directory (w3m-dtree-directory-name path)))
+    (setq default-directory path)
+    (w3m-message "Dtree (%s)..." path)
+    (w3m-dtree-create path allfiles dirprefix fileprefix)
+    (w3m-message "Dtree...done")
+    "text/html"))
+
+;;;###autoload
+(defun w3m-dtree (allfiles path)
+  "Display directory tree on local file system.
+If called with 'prefix argument', display all directorys and files."
+  (interactive "P\nDDtree directory: ")
+  (if w3m-dtree-default-allfiles
+      (setq allfiles (not allfiles)))
+  (w3m-goto-url (format "about://dtree%s%s"
+			(w3m-dtree-expand-file-name
+			 (file-name-as-directory
+			  (expand-file-name path)))
+			(if allfiles "?allfiles=true" ""))))
+
+(provide 'w3m-dtree)
+;;; w3m-dtree.el ends here

=== added file 'share/emacs/site-lisp/w3m/w3m-ems.el'
--- share/emacs/site-lisp/w3m/w3m-ems.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-ems.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,1416 @@
+;;; w3m-ems.el --- GNU Emacs stuff for emacs-w3m
+
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Authors: Yuuichi Teranishi  <teranisi@gohome.org>,
+;;          TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
+;;          Katsumi Yamaoka    <yamaoka@jpl.org>
+;; Keywords: w3m, WWW, hypermedia
+
+;; This file is a part of emacs-w3m.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+
+;;; Commentary:
+
+;; This file contains GNU Emacs stuff that emacs-w3m uses.  For more
+;; detail about emacs-w3m, see:
+;;
+;;    http://emacs-w3m.namazu.org/
+;;
+;; We can use w3m-static- switches to make the byte code differ between
+;; Emacs 2[12] and 2[34], if anything, it is impossible to share the byte
+;; code with those versions of Emacsen.
+
+;;; Code:
+
+(eval-when-compile
+  (require 'cl))
+
+(require 'w3m-util)
+(require 'w3m-proc)
+(require 'w3m-image)
+(require 'w3m-favicon)
+(require 'w3m-ccl)
+(require 'wid-edit)
+
+;; Functions and variables which should be defined in the other module
+;; at run-time.
+(eval-when-compile
+  (defvar w3m-add-tab-number)
+  (defvar w3m-coding-system)
+  (defvar w3m-current-process)
+  (defvar w3m-current-title)
+  (defvar w3m-current-url)
+  (defvar w3m-default-coding-system)
+  (defvar w3m-display-inline-images)
+  (defvar w3m-favicon-image)
+  (defvar w3m-form-input-textarea-coding-system)
+  (defvar w3m-form-use-fancy-faces)
+  (defvar w3m-icon-directory)
+  (defvar w3m-image-default-background)
+  (defvar w3m-mode-map)
+  (defvar w3m-modeline-process-status-on)
+  (defvar w3m-new-session-in-background)
+  (defvar w3m-process-queue)
+  (defvar w3m-show-graphic-icons-in-header-line)
+  (defvar w3m-show-graphic-icons-in-mode-line)
+  (defvar w3m-toolbar)
+  (defvar w3m-toolbar-buttons)
+  (defvar w3m-use-favicon)
+  (defvar w3m-use-header-line)
+  (defvar w3m-use-header-line-title)
+  (defvar w3m-use-tab)
+  ;; `w3m-tab-move-right' calls the inline function `w3m-buffer-set-number'
+  ;; which uses it.
+  (defvar w3m-use-title-buffer-name)
+  (defvar w3m-work-buffer-list)
+  (defvar w3m-work-buffer-name)
+  (autoload 'w3m-copy-buffer "w3m")
+  (autoload 'w3m-delete-buffer "w3m")
+  (autoload 'w3m-image-type "w3m")
+  (autoload 'w3m-retrieve "w3m")
+  (autoload 'w3m-select-buffer-update "w3m"))
+
+(eval-and-compile
+  (unless (fboundp 'frame-current-scroll-bars)
+    (defalias 'frame-current-scroll-bars 'ignore))
+  (unless (fboundp 'window-fringes)
+    (defalias 'window-fringes 'ignore))
+  (unless (fboundp 'unencodable-char-position)
+    (defalias 'unencodable-char-position 'ignore)))
+
+;;; Coding system and charset.
+
+(defsubst w3m-find-coding-system (obj)
+  "Return OBJ if it is a coding-system."
+  (if (coding-system-p obj) obj))
+
+(defun w3m-detect-coding-region (start end &optional priority-list)
+  "Detect coding system of the text in the region between START and END.
+Return the first possible coding system.
+
+PRIORITY-LIST is a list of coding systems ordered by priority."
+  (let (category categories)
+    (dolist (codesys priority-list)
+      (setq category (coding-system-category codesys))
+      (unless (or (null category) (assq category categories))
+	(push (cons category codesys) categories)))
+    (car (detect-coding-with-priority start end (nreverse categories)))))
+
+(defun w3m-mule-unicode-p ()
+  "Check the existence as charsets of mule-unicode."
+  (and (charsetp 'mule-unicode-0100-24ff)
+       (charsetp 'mule-unicode-2500-33ff)
+       (charsetp 'mule-unicode-e000-ffff)))
+
+(defalias 'w3m-make-ccl-coding-system
+  (if (fboundp 'define-coding-system)
+      (eval-when-compile
+	(funcall (if (and (fboundp 'define-coding-system)
+			  (featurep 'bytecomp))
+		     'byte-compile
+		   'identity)
+		 '(lambda (coding-system mnemonic docstring decoder encoder) "\
+Define a new CODING-SYSTEM by CCL programs DECODER and ENCODER.
+CODING-SYSTEM, DECODER and ENCODER must be symbols.
+This function is an interface to `define-coding-system'."
+		    (define-coding-system coding-system docstring
+		      :mnemonic mnemonic :coding-type 'ccl
+		      :ccl-decoder decoder :ccl-encoder encoder))))
+    (eval-when-compile
+      (funcall (if (featurep 'bytecomp)
+		   (lambda (form)
+		     (let ((byte-compile-warnings
+			    (if (eq (get 'make-coding-system 'byte-compile)
+				    'byte-compile-obsolete)
+				(delq 'obsolete
+				      (copy-sequence
+				       (cond ((consp byte-compile-warnings)
+					      byte-compile-warnings)
+					     (byte-compile-warnings
+					      byte-compile-warning-types)
+					     (t nil))))
+			      byte-compile-warnings)))
+		       (byte-compile form)))
+		 'identity)
+	       '(lambda (coding-system mnemonic docstring decoder encoder) "\
+Define a new CODING-SYSTEM by CCL programs DECODER and ENCODER.
+CODING-SYSTEM, DECODER and ENCODER must be symbols.
+This function is an interface to `make-coding-system'."
+		  (make-coding-system coding-system 4 mnemonic docstring
+				      (cons decoder encoder)))))))
+
+;; For Emacsen of which the `mule-version' is 5.x, redefine the ccl
+;; programs that been defined in w3m-ccl.el.
+(w3m-static-when (string-match "\\`5\\." mule-version)
+  (let ((source
+	 ;; CCL program to convert multibyte char to ucs with emacs-unicode.
+	 `((if (r1 == ,(charset-id 'latin-iso8859-1))
+	       ((r1 = (r0 + 128)))
+	     (if (r1 == ,(charset-id 'mule-unicode-0100-24ff))
+		 ((r1 = ((((r0 & #x3f80) >> 7) - 32) * 96))
+		  (r0 &= #x7f)
+		  (r1 += (r0 + 224)))		; 224 == -32 + #x0100
+	       (if (r1 == ,(charset-id 'mule-unicode-2500-33ff))
+		   ((r1 = ((((r0 & #x3f80) >> 7) - 32) * 96))
+		    (r0 &= #x7f)
+		    (r1 += (r0 + 9440)))	; 9440 == -32 + #x2500
+		 (if (r1 == ,(charset-id 'mule-unicode-e000-ffff))
+		     ((r1 = ((((r0 & #x3f80) >> 7) - 32) * 96))
+		      (r0 &= #x7f)
+		      (r1 += (r0 + 57312)))	; 57312 == -32 + #xe000
+		   ,(if (fboundp 'ccl-compile-lookup-character)
+			'((lookup-character utf-subst-table-for-encode r1 r0)
+			  (if (r7 == 0)		; lookup failed
+			      (r1 = #xfffd)))
+		      '((r1 = #xfffd)))))))
+	   (if (r1 == #xfffd)
+	       (write-repeat ?~)		; unknown character.
+	     (r0 = r1)))))
+    (if (get 'utf-translation-table-for-encode 'translation-table-id)
+	;; Emacs 21.3 and later.
+	(progn
+	  (eval
+	   `(define-ccl-program w3m-euc-japan-encoder
+	      '(4
+		(loop
+		 ,@w3m-ccl-write-euc-japan-character
+		 (translate-character utf-translation-table-for-encode r1 r0)
+		 ,@source
+		 ,@w3m-ccl-generate-ncr))))
+	  (eval
+	   `(define-ccl-program w3m-iso-latin-1-encoder
+	      '(4
+		(loop
+		 ,@w3m-ccl-write-iso-latin-1-character
+		 (translate-character utf-translation-table-for-encode r1 r0)
+		 ,@source
+		 ,@w3m-ccl-generate-ncr)))))
+      ;; Emacs 21.2 and earlier.
+      (eval
+       `(define-ccl-program w3m-euc-japan-encoder
+	  '(4
+	    (loop
+	     ,@w3m-ccl-write-euc-japan-character
+	     ,@source
+	     ,@w3m-ccl-generate-ncr))))
+      (eval
+       `(define-ccl-program w3m-iso-latin-1-encoder
+	  '(4
+	    (loop
+	     ,@w3m-ccl-write-iso-latin-1-character
+	     ,@source
+	     ,@w3m-ccl-generate-ncr)))))))
+
+;; This might be redefined by w3m-ucs.el.
+(defun w3m-ucs-to-char (codepoint)
+  (or (decode-char 'ucs codepoint) ?~))
+
+(defun w3m-add-local-hook (hook function &optional append)
+  "Add to the buffer-local value of HOOK the function FUNCTION."
+  (add-hook hook function append t))
+
+(defun w3m-remove-local-hook (hook function)
+  "Remove to the buffer-local value of HOOK the function FUNCTION."
+  (remove-hook hook function t))
+
+;; Function which returns non-nil when the current display device can
+;; show images inline.
+(defalias 'w3m-display-graphic-p 'display-images-p)
+
+(defun w3m-display-inline-images-p ()
+  "Returns non-nil when images can be displayed under the present
+circumstances."
+  (and w3m-display-inline-images (display-images-p)))
+
+(eval-and-compile
+  (defalias 'w3m-ems-create-image (if (fboundp 'create-animated-image)
+				      'create-animated-image
+				    'create-image)))
+
+(defun w3m-create-image (url &optional no-cache referer size handler)
+  "Retrieve data from URL and create an image object.
+If optional argument NO-CACHE is non-nil, cache is not used.
+If second optional argument REFERER is non-nil, it is used as Referer: field.
+If third optional argument SIZE is non-nil, its car element is used as width
+and its cdr element is used as height."
+  (if (not handler)
+      (w3m-process-with-wait-handler
+	(w3m-create-image url no-cache referer size handler))
+    (lexical-let ((set-size size)
+		  (url url)
+		  image size)
+      (w3m-process-do-with-temp-buffer
+	  (type (progn
+		  (set-buffer-multibyte nil)
+		  (w3m-retrieve url nil no-cache nil referer handler)))
+	(goto-char (point-min))
+	(when (w3m-image-type-available-p
+	       (setq type
+		     (or (and (let (case-fold-search)
+				(looking-at
+				 "\\(GIF8\\)\\|\\(\377\330\\)\\|\211PNG\r\n"))
+			      (cond ((match-beginning 1) 'gif)
+				    ((match-beginning 2) 'jpeg)
+				    (t 'png)))
+			 (w3m-image-type type))))
+	  (setq image (w3m-ems-create-image
+		       (buffer-string) type t
+		       :ascent 'center
+		       :background w3m-image-default-background))
+	  (if (and w3m-resize-images set-size)
+	      (progn
+		(set-buffer-multibyte t)
+		(setq size (image-size image 'pixels))
+		(if (and (null (car set-size)) (cdr set-size))
+		    (setcar set-size
+			    (/ (* (car size) (cdr set-size)) (cdr size))))
+		(if (and (null (cdr set-size)) (car set-size))
+		    (setcdr set-size
+			    (/ (* (cdr size) (car set-size)) (car size))))
+		(if (or (not (eq (car size)
+				 (car set-size)))  ; width is different
+			(not (eq (cdr size)
+				 (cdr set-size)))) ; height is different
+		    (lexical-let ((image image))
+		      (w3m-process-do
+			  (resized (w3m-resize-image
+				    (plist-get (cdr image) :data)
+				    (car set-size)(cdr set-size)
+				    handler))
+			(if resized (plist-put (cdr image) :data resized))
+			image))
+		  image))
+	    image))))))
+
+(defun w3m-create-resized-image (url rate &optional referer size handler)
+  "Resize an cached image object.
+URL is the image file's url.
+RATE is resize percentage.
+If REFERER is non-nil, it is used as Referer: field.
+If SIZE is non-nil, its car element is used as width
+and its cdr element is used as height."
+  (if (not handler)
+      (w3m-process-with-wait-handler
+	(w3m-create-image url nil referer size handler))
+    (lexical-let ((url url)
+		  (rate rate)
+		  image)
+      (w3m-process-do-with-temp-buffer
+	  (type (progn
+		  (set-buffer-multibyte nil)
+		  (w3m-retrieve url nil nil nil referer handler)))
+	(when (w3m-image-type-available-p (setq type (w3m-image-type type)))
+	  (setq image (create-image (buffer-string) type t :ascent 'center))
+	  (progn
+	    (set-buffer-multibyte t)
+	    (w3m-process-do
+		(resized (w3m-resize-image-by-rate
+			  (plist-get (cdr image) :data)
+			  rate
+			  handler))
+	      (if resized (plist-put (cdr image) :data resized))
+	      image)))))))
+
+(defun w3m-insert-image (beg end image &rest args)
+  "Display image on the current buffer.
+Buffer string between BEG and END are replaced with IMAGE."
+  (let ((faces (get-text-property beg 'face))
+	(idx 0)
+	orig len face)
+    (add-text-properties beg end (list 'display image
+				       'intangible image
+				       'invisible nil))
+    ;; Hide underlines behind inline images.
+    ;; Gerd Moellmann <gerd@gnu.org>, the maintainer of Emacs 21, wrote in
+    ;; the article <86heyi7vks.fsf@gerd.segv.de> in the list emacs-pretest-
+    ;; bug@gnu.org on 18 May 2001 that to show an underline of a text even
+    ;; if it has an image as a text property is the feature of Emacs 21.
+    ;; However, that behavior is not welcome to the w3m buffers, so we do
+    ;; to fix it with the following stuffs.
+    (when faces
+      (unless (listp faces)
+	(setq faces (list faces)))
+      (setq orig (copy-sequence faces)
+	    len (length orig))
+      (while (< idx len)
+	(when (face-underline-p (setq face (nth idx orig)))
+	  (setq faces (delq face faces)))
+	(setq idx (1+ idx)))
+      (when (< (length faces) len)
+	(put-text-property beg end 'face faces)
+	(put-text-property beg end 'w3m-faces-with-underline orig)))))
+
+(defun w3m-remove-image (beg end)
+  "Remove an image which is inserted between BEG and END."
+  (remove-text-properties beg end '(display nil intangible nil))
+  (let ((underline (get-text-property beg 'w3m-faces-with-underline)))
+    (when underline
+      (add-text-properties
+       beg end (list 'face underline 'w3m-faces-with-underline nil)))))
+
+(defun w3m-image-type-available-p (image-type)
+  "Return non-nil if an image with IMAGE-TYPE can be displayed inline."
+  (and (display-images-p)
+       (image-type-available-p image-type)))
+
+;;; Form buttons
+(defface w3m-form-button
+  '((((type x w32 mac ns) (class color))
+     :background "lightgrey" :foreground "black"
+     :box (:line-width 2 :style released-button))
+    (((class color) (background light)) (:foreground "cyan" :underline t))
+    (((class color) (background dark)) (:foreground "red" :underline t))
+    (t (:underline t)))
+  "*Face to fontify buttons in forms."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-form-button-face 'face-alias 'w3m-form-button)
+
+(defface w3m-form-button-mouse
+  '((((type x w32 mac ns) (class color))
+     :background "DarkSeaGreen1" :foreground "black"
+     :box (:line-width 2 :style released-button))
+    (((class color) (background light)) (:foreground "cyan" :underline t))
+    (((class color) (background dark)) (:foreground "red" :underline t))
+    (t (:underline t)))
+  "*Face to fontify focused buttons in forms."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-form-button-mouse-face 'face-alias 'w3m-form-button-mouse)
+
+(defface w3m-form-button-pressed
+  '((((type x w32 mac ns) (class color))
+     :background "lightgrey" :foreground "black"
+     :box (:line-width 2 :style pressed-button))
+    (((class color) (background light)) (:foreground "cyan" :underline t))
+    (((class color) (background dark)) (:foreground "red" :underline t))
+    (t (:underline t)))
+  "*Face to fontify pressed buttons in forms."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-form-button-pressed-face 'face-alias 'w3m-form-button-pressed)
+
+(defvar w3m-form-button-keymap
+  (let ((map (copy-keymap widget-keymap)))
+    (substitute-key-definition 'widget-forward nil map)
+    (substitute-key-definition 'widget-backward nil map)
+    map))
+
+(define-widget 'w3m-form-button 'push-button
+  "Widget for w3m form button."
+  :keymap w3m-form-button-keymap
+  :action (function (lambda (widget &optional e)
+		      (eval (widget-get widget :w3m-form-action)))))
+
+(defun w3m-form-make-button (start end properties)
+  "Make button on the region from START to END."
+  (if w3m-form-use-fancy-faces
+      (progn
+	(unless (memq (face-attribute 'w3m-form-button :box)
+		      '(nil unspecified))
+	  (and (eq ?\[ (char-after start))
+	       (eq ?\] (char-before end))
+	       (save-excursion
+		 (goto-char start)
+		 (delete-char 1)
+		 (insert " ")
+		 (goto-char end)
+		 (delete-char -1)
+		 (insert " ")
+		 (setq start (1+ start)
+		       end (1- end)))))
+	(let ((w (widget-convert-button
+		  'w3m-form-button start end
+		  :w3m-form-action (plist-get properties 'w3m-action))))
+	  (overlay-put (widget-get w :button-overlay) 'evaporate t))
+	(add-text-properties start end properties))
+    (w3m-add-text-properties start end (append '(face w3m-form) properties))))
+
+(defun w3m-setup-widget-faces ()
+  (make-local-variable 'widget-button-face)
+  (make-local-variable 'widget-mouse-face)
+  (make-local-variable 'widget-button-pressed-face)
+  (setq widget-button-face 'w3m-form-button)
+  (setq widget-mouse-face 'w3m-form-button-mouse)
+  (setq widget-button-pressed-face 'w3m-form-button-pressed))
+
+;;; Menu bar
+(defun w3m-menu-on-forefront (arg &optional curbuf)
+  "Place emacs-w3m menus on the forfront of the menu bar if ARG is non-nil.
+If CURBUF is given, this function works only in the current buffer,
+otherwise works in all the emacs-w3m buffers."
+  (if curbuf
+      (if arg
+	  (let ((items (mapcar 'car (cdr (lookup-key global-map [menu-bar])))))
+	    (when items
+	      (set (make-local-variable 'menu-bar-final-items) items)))
+	(kill-local-variable 'menu-bar-final-items))
+    (save-current-buffer
+      (dolist (buffer (w3m-list-buffers t))
+	(set-buffer buffer)
+	(w3m-menu-on-forefront arg t)))))
+
+;;; Toolbar
+(defcustom w3m-use-toolbar
+  (and (featurep 'tool-bar)
+       ;; Emacs 22 and greater return t for `(featurep 'tool-bar)'
+       ;; even if being launched with the -nw option.
+       (display-images-p)
+       (or (featurep 'gtk)
+	   (image-type-available-p 'xpm)))
+  "Non-nil activates toolbar of w3m."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-toolbar-icon-preferred-image-types
+  (if (featurep 'gtk)
+      '(png)
+    '(xpm))
+  "List of image types that you prefer to use for the tool bar icons.
+By default, `png' is most preferred for Emacs built with GTK and `xpm'
+is for others."
+  :group 'w3m
+  :type '(repeat (symbol :tag "Image type"))
+  :set (lambda (symbol value)
+	 (prog1
+	     (custom-set-default symbol value)
+	   (when (and (not noninteractive) (boundp 'w3m-toolbar-buttons))
+	     (w3m-update-toolbars)))))
+
+(defcustom w3m-toolbar-use-single-image-per-icon nil
+  "Non-nil means use single image (named possibly *-up) per icon.
+If it is nil, subsidiaries, e.g., *-down and *-disabled, if any, are
+used together."
+  :group 'w3m
+  :type 'boolean
+  :set (lambda (symbol value)
+	 (prog1
+	     (custom-set-default symbol value)
+	   (when (and (not noninteractive) (boundp 'w3m-toolbar-buttons))
+	     (w3m-update-toolbars)))))
+
+(defcustom w3m-toolbar-configurations
+  `((tool-bar-button-margin . global)
+    ,@(unless (featurep 'gtk)
+	'((tool-bar-button-relief . global))))
+  "Alist of the variables and the values controls the tool bar appearance.
+The value `global' means to use the global value of the variable.
+
+If you're annoyed with changing of the frame height of Emacs built for
+GTK because of the difference of the sizes between the emacs-w3m tool
+bar icons and the ones that Emacs natively uses, try customizing this
+variable or both the value of this variable and the global value of
+`tool-bar-button-margin'.  For examples:
+
+;; The case where the emacs-w3m icons are smaller than the others.
+\(setq w3m-toolbar-configurations '((tool-bar-button-margin . 5)))
+
+;; The case where the emacs-w3m icons are bigger than the others.
+\(setq w3m-toolbar-configurations '((tool-bar-button-margin . 0))
+      tool-bar-button-margin 7)"
+  :group 'w3m
+  :type '(repeat (cons :format "%v"
+		       (symbol :tag "Variable")
+		       (radio :format "%v"
+			      (const :format "%v " global)
+			      (sexp :tag "Local Value"))))
+  :set (lambda (symbol value)
+	 (prog1
+	     (custom-set-default symbol value)
+	   (when (and (not noninteractive) (featurep 'w3m))
+	     (w3m-toolbar-set-configurations)))))
+
+(defun w3m-toolbar-define-keys (keymap defs)
+  ;; Invalidate the default bindings.
+  (let ((keys (cdr (key-binding [tool-bar] t)))
+	item)
+    (while (setq item (pop keys))
+      (when (setq item (car-safe item))
+	(define-key keymap (vector 'tool-bar item) 'undefined))))
+  (let ((n (length defs))
+	def)
+    (while (>= n 0)
+      (setq n (1- n)
+	    def (nth n defs))
+      (define-key keymap (vector 'tool-bar (aref def 1))
+	(list 'menu-item (aref def 3) (aref def 1)
+	      :enable (aref def 2)
+	      :image (symbol-value (aref def 0)))))))
+
+(defun w3m-find-image (name &optional directory)
+  "Find image file for NAME and return cons of file name and type.
+This function searches only in DIRECTORY, that defaults to the value of
+`w3m-icon-directory', for an image file of which the base name is NAME.
+Files of types that Emacs does not support are ignored."
+  (unless directory
+    (setq directory w3m-icon-directory))
+  (when (and directory
+	     (file-directory-p directory)
+	     (display-images-p))
+    (let* ((case-fold-search nil)
+	   (files (directory-files directory t
+				   (concat "\\`" (regexp-quote name) "\\.")))
+	   (types (append w3m-toolbar-icon-preferred-image-types image-types))
+	   file type rest)
+      (while files
+	(when (string-match "\\.\\([^.]+\\)\\'" (setq file (pop files)))
+	  (setq type (intern (downcase (match-string 1 file))))
+	  (setq type (or (cdr (assq type '((tif . tiff)
+					   (jpg . jpeg)
+					   (ps . postscript)
+					   (pgm . pbm)
+					   (ppm . pbm))))
+			 type))
+	  (push (cons file (memq type types)) rest)))
+      (setq rest (car (sort rest (lambda (a b) (> (length a) (length b))))))
+      (when (cdr rest)
+	(cons (car rest) (cadr rest))))))
+
+(defun w3m-toolbar-make-buttons (buttons &optional force)
+  (let ((xpm-props '(:color-symbols (("backgroundToolBarColor" . "None"))))
+	button icon down disabled up)
+    (while buttons
+      (setq button (pop buttons)
+	    icon (intern (concat "w3m-toolbar-" button "-icon")))
+      (when (or force (not (boundp icon)))
+	(setq down (w3m-find-image (concat button "-down"))
+	      disabled (w3m-find-image (concat button "-disabled")))
+	(if (setq up (or (w3m-find-image (concat button "-up"))
+			 (prog1
+			     (or down disabled (w3m-find-image button))
+			   (setq down nil
+				 disabled nil))))
+	    (progn
+	      (setq up (apply 'create-image (car up) (cdr up) nil
+			      :ascent 'center
+			      (when (eq (cdr up) 'xpm)
+				xpm-props)))
+	      (if (or w3m-toolbar-use-single-image-per-icon
+		      (not (or down disabled)))
+		  (set icon up)
+		(when down
+		  (setq down (apply 'create-image (car down) (cdr down) nil
+				    :ascent 'center
+				    (when (eq (cdr up) 'xpm)
+				      xpm-props))))
+		(when disabled
+		  (setq disabled (apply 'create-image
+					(car disabled) (cdr disabled) nil
+					:ascent 'center
+					(when (eq (cdr disabled) 'xpm)
+					  xpm-props))))
+		(set icon (vector down up disabled disabled))))
+	  (error "Icon file %s-up.* not found" button))))))
+
+(defun w3m-toolbar-set-configurations (&optional curbuf)
+  "Set values of variables according to `w3m-toolbar-configurations'.
+If CURBUF is given, this function works only in the current buffer,
+otherwise works in all the emacs-w3m buffers."
+  (if curbuf
+      (dolist (config w3m-toolbar-configurations)
+	(if (eq (cdr config) 'global)
+	    (kill-local-variable (car config))
+	  (set (make-local-variable (car config)) (cdr config))))
+    (let ((cur (selected-frame))
+	  buffer buffers)
+      (walk-windows
+       (lambda (window)
+	 (setq buffer (window-buffer window))
+	 (unless (memq buffer buffers)
+	   (set-buffer buffer)
+	   (when (eq major-mode 'w3m-mode)
+	     (push buffer buffers)
+	     (select-frame (window-frame window))
+	     ;;(set-buffer buffer)
+	     (w3m-toolbar-set-configurations t))))
+       'ignore 'visible)
+      (select-frame-set-input-focus cur)
+      (save-current-buffer
+	(dolist (buffer (w3m-list-buffers t))
+	  (unless (memq buffer buffers)
+	    (set-buffer buffer)
+	    (w3m-toolbar-set-configurations t))))
+      (select-frame-set-input-focus cur))))
+
+(defun w3m-setup-toolbar ()
+  (when (and w3m-use-toolbar
+	     (w3m-find-image "antenna-up"))
+    (w3m-toolbar-make-buttons w3m-toolbar-buttons)
+    (w3m-toolbar-set-configurations t)
+    (w3m-toolbar-define-keys w3m-mode-map w3m-toolbar)))
+
+(defalias 'w3m-update-toolbar 'ignore)
+
+(defun w3m-update-toolbars ()
+  (when (and w3m-use-toolbar
+	     (w3m-find-image "antenna-up"))
+    (w3m-toolbar-make-buttons w3m-toolbar-buttons t)
+    (w3m-toolbar-set-configurations)
+    (w3m-toolbar-define-keys w3m-mode-map w3m-toolbar)))
+
+;;; Header line & Tabs
+(defcustom w3m-tab-width 16
+  "w3m tab width."
+  :group 'w3m
+  :set (lambda (symbol value)
+	 (custom-set-default symbol
+			     (if (and (numberp value) (> value 0))
+				 value
+			       16)))
+  :type '(integer :size 0))
+
+(defface w3m-tab-unselected
+  '((((type x w32 mac ns) (class color))
+     :background "Gray70" :foreground "Gray20"
+     :box (:line-width -1 :style released-button))
+    (((class color))
+     (:background "blue" :foreground "black")))
+  "*Face to fontify unselected tabs."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-tab-unselected-face 'face-alias 'w3m-tab-unselected)
+
+(defface w3m-tab-unselected-retrieving
+  '((((type x w32 mac ns) (class color))
+     :background "Gray70" :foreground "OrangeRed"
+     :box (:line-width -1 :style released-button))
+    (((class color))
+     (:background "blue" :foreground "OrangeRed")))
+  "*Face to fontify unselected tabs which are retrieving their pages."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-tab-unselected-retrieving-face
+     'face-alias 'w3m-tab-unselected-retrieving)
+
+(defface w3m-tab-unselected-unseen
+  '((((type x w32 mac ns) (class color))
+     :background "Gray70" :foreground "Gray20"
+     :box (:line-width -1 :style released-button))
+    (((class color))
+     (:background "blue" :foreground "gray60")))
+  "*Face to fontify unselected and unseen tabs."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-tab-unselected-unseen-face 'face-alias 'w3m-tab-unselected-unseen)
+
+(defface w3m-tab-selected
+  '((((type x w32 mac ns) (class color))
+     :background "Gray90" :foreground "black"
+     :box (:line-width -1 :style released-button))
+    (((class color))
+     (:background "cyan" :foreground "black"))
+    (t (:underline t)))
+  "*Face to fontify selected tab."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-tab-selected-face 'face-alias 'w3m-tab-selected)
+
+(defface w3m-tab-selected-retrieving
+  '((((type x w32 mac ns) (class color))
+     :background "Gray90" :foreground "red"
+     :box (:line-width -1 :style released-button))
+    (((class color))
+     (:background "cyan" :foreground "red"))
+    (t (:underline t)))
+  "*Face to fontify selected tab which is retrieving its page."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-tab-selected-retrieving-face
+     'face-alias 'w3m-tab-selected-retrieving)
+
+(defface w3m-tab-background
+  '((((type x w32 mac ns) (class color))
+     :background "LightSteelBlue" :foreground "black")
+    (((class color))
+     (:background "white" :foreground "black")))
+  "*Face to fontify background of tab line."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-tab-background-face 'face-alias 'w3m-tab-background)
+
+(defface w3m-tab-selected-background
+  '((((type x w32 mac ns) (class color))
+     :background "LightSteelBlue" :foreground "black")
+    (((class color))
+     (:background "white" :foreground "black")))
+  "*Face to fontify selected background tab."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-tab-selected-background-face
+     'face-alias 'w3m-tab-selected-background)
+
+(defface w3m-tab-mouse
+  '((((type x w32 mac ns) (class color))
+     :background "Gray75" :foreground "white"
+     :box (:line-width -1 :style released-button)))
+  "*Face used to highlight tabs under the mouse."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-tab-mouse-face 'face-alias 'w3m-tab-mouse)
+
+(defvar w3m-modeline-spinner-map nil
+  "Keymap used on the spinner in the mode-line.")
+
+(defvar w3m-spinner-map-help-echo "mouse-2 kills the current process"
+  "String used for the :help-echo property on the spinner.")
+
+(defun w3m-setup-header-line ()
+  (setq header-line-format
+	(cond (w3m-use-tab
+	       '(:eval (w3m-tab-line)))
+	      (w3m-use-header-line
+	       (list
+		(if w3m-use-header-line-title
+		    (list
+		     (propertize
+		      "Title: "
+		      'face (list 'w3m-header-line-location-title))
+		     `(:eval
+		       (propertize
+			(replace-regexp-in-string "%" "%%" (w3m-current-title))
+			'face (list 'w3m-header-line-location-content)
+			'mouse-face '(highlight :foreground
+						,(face-foreground 'default))
+			'local-map (let ((map (make-sparse-keymap)))
+				     (define-key map [header-line mouse-2]
+				       'w3m-goto-url)
+				     map)
+			'help-echo "mouse-2 prompts to input URL"))
+		     ", ")
+		  "")
+		 (propertize
+		  "Location: "
+		  'face (list 'w3m-header-line-location-title))
+		 `(:eval
+		  (propertize
+		   (if (stringp w3m-current-url)
+		       (replace-regexp-in-string "%" "%%" w3m-current-url)
+		     "")
+		   'face (list 'w3m-header-line-location-content)
+		   'mouse-face '(highlight :foreground
+					   ,(face-foreground 'default))
+		   'local-map (let ((map (make-sparse-keymap)))
+				(define-key map [header-line mouse-2]
+				  'w3m-goto-url)
+				map)
+		   'help-echo "mouse-2 prompts to input URL")))))))
+
+(eval-when-compile
+  ;; Shut up the byte-compiler for old Emacsen.
+  (unless (fboundp 'force-window-update)
+    (defalias 'force-window-update 'ignore)))
+
+(eval-and-compile
+  (defalias 'w3m-force-window-update
+    (if (and (fboundp 'force-window-update)
+	     (not (eq (symbol-function 'force-window-update) 'ignore)))
+	(lambda (&optional window) "\
+Force redisplay of WINDOW which defaults to the selected window."
+	  (force-window-update (or window (selected-window))))
+      (lambda (&optional ignore) "\
+Wobble the selected window to force redisplay of the header-line."
+	(save-window-excursion
+	  (split-window-vertically))))))
+
+(defun w3m-tab-drag-mouse-function (event buffer)
+  (let ((window (posn-window (event-end event)))
+	mpos)
+    (when (framep window) ; dropped at outside of the frame.
+      (setq window nil
+	    mpos (mouse-position))
+      (and (framep (car mpos))
+	   (car (cdr mpos))
+	   (cdr (cdr mpos))
+	   (setq window (window-at (car (cdr mpos))
+				   (cdr (cdr mpos))
+				   (car mpos))))
+      (unless window
+	(when (one-window-p 'nomini)
+	  (split-window))
+	(setq window (next-window))))
+    (unless (eq (window-buffer window) buffer)
+      (select-window window)
+      (switch-to-buffer buffer)
+      (w3m-force-window-update window))))
+
+(defun w3m-tab-click-mouse-function (event buffer)
+  (let ((window (posn-window (event-start event))))
+    (select-window window)
+    (switch-to-buffer buffer)
+    (w3m-force-window-update window)))
+
+(defun w3m-tab-double-click-mouse1-function (event buffer)
+  (let ((window (posn-window (event-start event))))
+    (when (eq major-mode 'w3m-mode)
+      (if w3m-new-session-in-background
+	  (save-window-excursion
+	    (w3m-copy-buffer))
+	(w3m-copy-buffer)))
+    (w3m-force-window-update window)))
+
+(defun w3m-tab-double-click-mouse2-function (event buffer)
+  (let ((window (posn-window (event-start event))))
+    (when (eq major-mode 'w3m-mode)
+      (w3m-delete-buffer))
+    (w3m-force-window-update window)))
+
+(defvar w3m-tab-line-format nil
+  "Internal variable used to keep contents to be shown in the header-line.
+This is a buffer-local variable.")
+(make-variable-buffer-local 'w3m-tab-line-format)
+
+(defvar w3m-tab-timer nil
+  "Internal variable used to say time has not gone by after the tab-line
+was updated last time.  It is used to control the `w3m-tab-line'
+function running too frequently, set by the function itself and
+cleared by a timer.")
+(make-variable-buffer-local 'w3m-tab-timer)
+
+(defcustom w3m-tab-track-mouse t
+  "Say whether to make the mouse track the selected tab.
+It controls the behavior of the commands `w3m-tab-previous-buffer',
+`w3m-tab-next-buffer', `w3m-tab-move-right', and `w3m-tab-move-left'
+invoked by the mouse.
+
+You may want to set this to nil if you use a proportional font for the
+tab faces.  See also `w3m-tab-mouse-position-adjuster'."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-tab-mouse-position-adjuster '(0.5 . -4)
+  "Values used to adjust the mouse position on tabs.
+It is used when the command `w3m-tab-previous-buffer',
+`w3m-tab-next-buffer', `w3m-tab-move-right', or `w3m-tab-move-left' is
+invoked by the mouse.  The value consists of the cons of a floating
+point number M and an integer N that are applied to calculating of the
+mouse position, which is given in pixel units, as follows:
+
+  (TAB_WIDTH + M) * ORDER + N
+
+Where TAB_WIDTH is the pixel width of a tab and ORDER is the order
+number in tabs.  The result is rounded towards zero.
+
+Note that the calculation will always fail if you use a proportional
+font for the tab faces.  See also `w3m-tab-track-mouse'."
+  :group 'w3m
+  :type '(cons (number :tag "M") (integer :tag "N")))
+
+(defun w3m-tab-mouse-track-selected-tab (event order
+					       &optional buffers decelerate)
+  "Make the mouse track the selected tab.
+EVENT is a command event.  ORDER is the order number in tabs.
+The optional BUFFERS is a list of emacs-w3m buffers, DECELERATE if it
+is non-nil means not to respond to too fast operation of mouse wheel."
+  (when (and w3m-use-tab window-system w3m-tab-track-mouse
+	     (consp event) (symbolp (car event)))
+    (let ((e (get (car event) 'event-symbol-elements))
+	  (len (* (car w3m-tab-mouse-position-adjuster) order))
+	  (fcw (frame-char-width))
+	  posn tab start end disp next)
+      (when (and (consp e) (symbolp (car e))
+		 (or (memq (car e) '(mouse-4 mouse-5 wheel-up wheel-down))
+		     (string-match "\\`mouse-" (symbol-name (car e)))))
+	;; Ignore values gotten by the mouse pointing to other frames.
+	;; It might happen if the frame in question gets out of focus
+	;; by a certain desktop tool such as unclutter.
+	(let ((frame (selected-frame)))
+	  (while (not (cadr (setq posn (mouse-pixel-position))))
+	    (select-frame-set-input-focus frame)))
+	;; Update the header line.
+	(setq w3m-tab-timer nil)
+	(sit-for 0)
+	(setq tab w3m-tab-line-format)
+	(with-temp-buffer
+	  (insert tab)
+	  (setq start (point-min)
+		end (point))
+	  (while (and (> order  0)
+		      (setq start (text-property-any start end
+						     'tab-separator t))
+		      (setq start (text-property-not-all start end
+							 'tab-separator t)))
+	    (setq order (1- order)))
+	  (setq end (1- start)
+		start (point-min)
+		next start
+		disp (get-text-property start 'display))
+	  (while (and (< next end)
+		      (setq next (next-single-property-change
+				  start 'display nil end)))
+	    (setq len (+ (cond
+			  ((eq (car disp) 'image)
+			   (or (car w3m-favicon-size) (frame-char-height)))
+			  ((eq (car disp) 'space)
+			   (* (or (plist-get (cdr disp) :width) 1) fcw))
+			  (t
+			   (* (string-width (buffer-substring start next))
+			      fcw)))
+			 len)
+		  start next
+		  disp (get-text-property start 'display))))
+	(set-mouse-pixel-position
+	 (car posn)
+	 (truncate (+ len (cdr w3m-tab-mouse-position-adjuster)))
+	 (cddr posn))
+	(when decelerate
+	  (sleep-for 0.1))
+	(discard-input)))))
+
+(defun w3m-tab-next-buffer (&optional n event)
+  "Turn N pages of emacs-w3m buffers ahead."
+  (interactive (list (prefix-numeric-value current-prefix-arg)
+		     last-command-event))
+  (unless n (setq n 1))
+  (when (and (/= n 0) (eq major-mode 'w3m-mode))
+    (let ((buffers (w3m-list-buffers)))
+      (switch-to-buffer
+       (nth (mod (+ n (w3m-buffer-number (current-buffer)) -1)
+		 (length buffers))
+	    buffers))
+      (run-hooks 'w3m-select-buffer-hook)
+      (w3m-select-buffer-update)
+      (w3m-tab-mouse-track-selected-tab
+       event (w3m-buffer-number (current-buffer)) buffers))))
+
+(defun w3m-tab-previous-buffer (&optional n event)
+  "Turn N pages of emacs-w3m buffers behind."
+  (interactive (list (prefix-numeric-value current-prefix-arg)
+		     last-command-event))
+  (w3m-tab-next-buffer (- n) event))
+
+(defun w3m-tab-move-right (&optional n event)
+  "Move this tab N times to the right (to the left if N is negative)."
+  (interactive (list (prefix-numeric-value current-prefix-arg)
+		     last-command-event))
+  (unless n (setq n 1))
+  (when (and (/= n 0) (eq major-mode 'w3m-mode))
+    (let* ((buffers (if (> n 0)
+			(w3m-list-buffers)
+		      (setq n (- n))
+		      (nreverse (w3m-list-buffers))))
+	   (dest (or (nth n (memq (current-buffer) buffers))
+		     (car (last buffers))))
+	   (next (w3m-buffer-number dest))
+	   (cur (w3m-buffer-number (current-buffer)))
+	   e posn start)
+      (rename-buffer "*w3m*<0>")
+      (w3m-buffer-set-number dest cur)
+      (w3m-buffer-set-number (current-buffer) next)
+      (w3m-select-buffer-update)
+      (w3m-tab-mouse-track-selected-tab event next buffers t))))
+
+(defun w3m-tab-move-left (&optional n event)
+  "Move this tab N times to the left (to the right if N is negative)."
+  (interactive (list (prefix-numeric-value current-prefix-arg)
+		     last-command-event))
+  (w3m-tab-move-right (- n) event))
+
+(defvar w3m-tab-map nil)
+(make-variable-buffer-local 'w3m-tab-map)
+
+(defvar w3m-tab-spinner-map nil)
+(make-variable-buffer-local 'w3m-tab-spinner-map)
+
+(defun w3m-tab-make-keymap ()
+  (unless w3m-tab-map
+    (setq w3m-tab-map (make-sparse-keymap))
+    (let* ((cur (current-buffer))
+	   (f1 (lambda (fn) `(lambda (e) (interactive "e") (,fn e ,cur))))
+	   (f2 (lambda (fn) `(lambda (e)
+			       (interactive "e")
+			       (select-window (posn-window (event-start e)))
+			       (switch-to-buffer ,cur)
+			       (setq this-command ',fn)
+			       (,fn 1 e))))
+	   (drag-action (funcall f1 'w3m-tab-drag-mouse-function))
+	   (single-action (funcall f1 'w3m-tab-click-mouse-function))
+	   (double-action1 (funcall f1 'w3m-tab-double-click-mouse1-function))
+	   (double-action2 (funcall f1 'w3m-tab-double-click-mouse2-function))
+	   (menu-action (funcall f1 'w3m-tab-button-menu))
+	   (menu-action2 (funcall f1 'w3m-tab-button-menu2))
+	   (next-buffer-action (funcall f2 'w3m-tab-next-buffer))
+	   (previous-buffer-action (funcall f2 'w3m-tab-previous-buffer))
+	   (move-left-action (funcall f2 'w3m-tab-move-left))
+	   (move-right-action (funcall f2 'w3m-tab-move-right)))
+      (define-key w3m-tab-map [header-line down-mouse-1] 'ignore)
+      (define-key w3m-tab-map [header-line down-mouse-2] 'ignore)
+      (define-key w3m-tab-map [header-line mouse-1] single-action)
+      (define-key w3m-tab-map [header-line mouse-2] single-action)
+      (define-key w3m-tab-map [header-line drag-mouse-1] drag-action)
+      (define-key w3m-tab-map [header-line drag-mouse-2] drag-action)
+      (define-key w3m-tab-map [header-line double-mouse-1] double-action1)
+      (define-key w3m-tab-map [header-line double-mouse-2] double-action2)
+      (define-key w3m-tab-map [header-line mouse-3] menu-action)
+      (define-key w3m-tab-map [header-line wheel-up] previous-buffer-action)
+      (define-key w3m-tab-map [header-line wheel-down] next-buffer-action)
+      (define-key w3m-tab-map [header-line mouse-4] previous-buffer-action)
+      (define-key w3m-tab-map [header-line mouse-5] next-buffer-action)
+      (define-key w3m-tab-map [header-line C-wheel-up] move-left-action)
+      (define-key w3m-tab-map [header-line C-wheel-down] move-right-action)
+      (define-key w3m-tab-map [header-line C-mouse-4] move-left-action)
+      (define-key w3m-tab-map [header-line C-mouse-5] move-right-action)
+      (define-key w3m-mode-map [header-line double-mouse-1]
+	'w3m-goto-new-session-url)
+      (define-key w3m-mode-map [header-line mouse-3] menu-action2)
+      ;; The following bindings in `w3m-mode-map', not `w3m-tab-map',
+      ;; are required for some platforms, in which mouse wheel events
+      ;; sometimes pass by `w3m-tab-map' for the unresolved reason and
+      ;; see `w3m-mode-map', or else the `undefined' errors will arise.
+      (define-key w3m-mode-map [header-line mouse-4] 'w3m-tab-previous-buffer)
+      (define-key w3m-mode-map [header-line mouse-5] 'w3m-tab-next-buffer)
+      (define-key w3m-mode-map [header-line wheel-up] 'w3m-tab-previous-buffer)
+      (define-key w3m-mode-map [header-line wheel-down] 'w3m-tab-next-buffer)
+      (define-key w3m-mode-map [header-line C-wheel-up] 'w3m-tab-move-left)
+      (define-key w3m-mode-map [header-line C-wheel-down] 'w3m-tab-move-right)
+      (define-key w3m-mode-map [header-line C-mouse-4] 'w3m-tab-move-left)
+      (define-key w3m-mode-map [header-line C-mouse-5] 'w3m-tab-move-right))
+    (unless w3m-tab-spinner-map
+      (setq w3m-tab-spinner-map (make-sparse-keymap))
+      (define-key w3m-tab-spinner-map [header-line mouse-2]
+	`(lambda (e)
+	   (interactive "e")
+	   (save-current-buffer
+	     ;; Why the `(w3m-process-stop BUFFER)' doesn't work?
+	     (set-buffer ,(current-buffer))
+	     (call-interactively 'w3m-process-stop)))))))
+
+(defvar w3m-tab-half-space
+  (propertize " " 'display '(space :width 0.5))
+  "The space of half width.")
+
+(defvar w3m-tab-separator-map nil)
+
+(unless w3m-tab-separator-map
+  (let ((map (make-sparse-keymap)))
+    (setq w3m-tab-separator-map map)
+    (define-key map [header-line wheel-up] 'w3m-tab-previous-buffer)
+    (define-key map [header-line wheel-down] 'w3m-tab-next-buffer)
+    (define-key map [header-line mouse-4] 'w3m-tab-previous-buffer)
+    (define-key map [header-line mouse-5] 'w3m-tab-next-buffer)
+    (define-key map [header-line C-wheel-up] 'w3m-tab-move-left)
+    (define-key map [header-line C-wheel-down] 'w3m-tab-move-right)
+    (define-key map [header-line C-mouse-4] 'w3m-tab-move-left)
+    (define-key map [header-line C-mouse-5] 'w3m-tab-move-right)))
+
+(defvar w3m-tab-separator
+  (propertize " "
+	      'face (list 'w3m-tab-background)
+	      'mouse-face 'w3m-tab-selected-background
+	      'display '(space :width 0.5)
+	      'tab-separator t
+	      'local-map w3m-tab-separator-map)
+  "String used to separate tabs.")
+
+(defun w3m-tab-line ()
+  (or (and w3m-tab-timer w3m-tab-line-format)
+      (let* ((current (current-buffer))
+	     (buffers (w3m-list-buffers))
+	     (breadth 1)
+	     (number 0)
+	     (fringes (window-fringes))
+	     (width (+ (window-width)
+		       (/ (float (+ (or (car fringes) 0)
+				    (or (nth 1 fringes) 0)))
+			  (frame-char-width))
+		       ;; Assume that the vertical scroll-bar has
+		       ;; the width of two space characters.
+		       (if (car (frame-current-scroll-bars)) 2 0)))
+	     (nbuf (length buffers))
+	     (graphic (and window-system
+			   w3m-show-graphic-icons-in-header-line))
+	     (margin (if window-system
+			 (+ (if graphic 3.0 0.5)
+			    ;; Right and left shadows.
+			    (/ 2.0 (frame-char-width)))
+		       1))
+	     (spinner (when w3m-process-queue
+			(w3m-make-spinner-image)))
+	     buffer title data datum process unseen favicon keymap face icon
+	     line)
+	(setq w3m-tab-timer t)
+	(run-at-time 0.1 nil
+		     (lambda (buffer)
+		       (when (buffer-live-p buffer)
+			 (with-current-buffer buffer
+			   (setq w3m-tab-timer nil)
+			   (when (and (eq (selected-window)
+					  (get-buffer-window buffer))
+				      w3m-process-queue)
+			     (inline (w3m-force-window-update))))))
+		     current)
+	(save-current-buffer
+	  (while buffers
+	    (set-buffer (setq buffer (pop buffers)))
+	    (setq number (1+ number))
+	    (setq title (if w3m-add-tab-number
+			    (format "%d.%s" number (w3m-current-title))
+			  (w3m-current-title)))
+	    (setq breadth
+		  (max breadth
+		       ;; There may be a wide character in the beginning of
+		       ;; the title.
+		       (if (> (length title) 0)
+			   (char-width (aref title 0))
+			 0)))
+	    (push (list (eq current buffer)
+			w3m-current-process
+			(w3m-unseen-buffer-p buffer)
+			title
+			(when w3m-use-favicon w3m-favicon-image)
+			w3m-tab-map)
+		  data)))
+	(setq width (if (> (* nbuf (+ margin w3m-tab-width)) width)
+			(max (truncate (- (/ width nbuf) margin)) breadth)
+		      w3m-tab-width))
+	(while data
+	  (setq datum (pop data)
+		current (car datum)
+		process (nth 1 datum)
+		unseen (nth 2 datum)
+		title (nth 3 datum)
+		favicon (nth 4 datum)
+		keymap (nth 5 datum)
+		face (list
+		      (if process
+			  (if current
+			      'w3m-tab-selected-retrieving
+			    'w3m-tab-unselected-retrieving)
+			(if current
+			    'w3m-tab-selected
+			  (if unseen
+			      'w3m-tab-unselected-unseen
+			    'w3m-tab-unselected))))
+		icon (when graphic
+		       (cond
+			(process
+			 (when spinner
+			   (propertize
+			    " "
+			    'display spinner
+			    'face face
+			    'local-map w3m-tab-spinner-map
+			    'help-echo w3m-spinner-map-help-echo)))
+			(favicon
+			 (propertize
+			  " "
+			  'display favicon
+			  'face face
+			  'local-map keymap
+			  'help-echo title))))
+		breadth (cond (icon width)
+			      (graphic (+ 2 width))
+			      (t width)))
+	  (push
+	   (list
+	    icon
+	    (propertize
+	     (concat
+	      (when graphic w3m-tab-half-space)
+	      (replace-regexp-in-string
+	       "%" "%%"
+	       (if (and (> (string-width title) breadth)
+			(> breadth 6))
+		   (truncate-string-to-width
+		    (concat (truncate-string-to-width title (- breadth 3))
+			    "...")
+		    breadth nil ?.)
+		 (truncate-string-to-width title breadth nil ?\ ))))
+	     'face face
+	     'mouse-face 'w3m-tab-mouse
+	     'local-map keymap
+	     'help-echo title)
+	    w3m-tab-separator)
+	   line))
+	(setq w3m-tab-line-format
+	      (concat (apply 'concat (apply 'nconc line))
+		      (propertize (make-string (window-width) ?\ )
+				  'face (list 'w3m-tab-background)
+				  'mouse-face 'w3m-tab-selected-background
+				  'local-map w3m-tab-separator-map))))))
+
+(add-hook 'w3m-mode-setup-functions 'w3m-tab-make-keymap)
+(add-hook 'w3m-mode-setup-functions 'w3m-setup-header-line)
+(add-hook 'w3m-mode-setup-functions 'w3m-setup-widget-faces)
+(add-hook 'w3m-select-buffer-hook 'w3m-force-window-update)
+
+;; Graphic icons.
+(defcustom w3m-space-before-modeline-icon ""
+  "String of space character(s) to be put in front of the mode-line icon.
+It may be better to use one or more spaces if you are using oblique or
+italic font in the modeline."
+  :group 'w3m
+  :type 'string)
+
+(defvar w3m-spinner-image-file nil
+  "Image file used to show a spinner in the header-line.")
+
+(defvar w3m-spinner-image-frames 3
+  "Number of frames which the spinner image contains.")
+
+(defvar w3m-spinner-image-index 0
+  "Counter used to rotate spinner images.  This is a buffer-local variable.")
+(make-variable-buffer-local 'w3m-spinner-image-index)
+
+;; Images to be displayed in the modeline.
+(defvar w3m-modeline-process-status-on-icon nil)
+(defvar w3m-modeline-image-status-on-icon nil)
+(defvar w3m-modeline-status-off-icon nil)
+(defvar w3m-modeline-ssl-image-status-on-icon nil)
+(defvar w3m-modeline-ssl-status-off-icon nil)
+
+(defun w3m-initialize-graphic-icons (&optional force)
+  "Make icon images which will be displayed in the mode-line."
+  (interactive "P")
+  (when (or (image-type-available-p 'xpm)
+	    (image-type-available-p 'png))
+    ;; Prefer xpm icons rather than png icons since Emacs doesn't display
+    ;; background colors of icon images other than xpm images transparently
+    ;; in the mode line.
+    (let* ((w3m-toolbar-icon-preferred-image-types
+	    (if (image-type-available-p 'xpm)
+		'(xpm)
+	      '(png)))
+	   (defs `((w3m-modeline-status-off-icon
+		    ,(w3m-find-image "state-00")
+		    w3m-modeline-status-off)
+		   (w3m-modeline-image-status-on-icon
+		    ,(w3m-find-image "state-01")
+		    w3m-modeline-image-status-on)
+		   (w3m-modeline-ssl-status-off-icon
+		    ,(w3m-find-image "state-10")
+		    w3m-modeline-ssl-status-off)
+		   (w3m-modeline-ssl-image-status-on-icon
+		    ,(w3m-find-image "state-11")
+		    w3m-modeline-ssl-image-status-on)))
+	   def icon file type status keymap)
+      (while defs
+	(setq def (car defs)
+	      defs (cdr defs)
+	      icon (car def)
+	      file (car (nth 1 def))
+	      type (cdr (nth 1 def))
+	      status (nth 2 def))
+	(if (and w3m-show-graphic-icons-in-mode-line file)
+	    (progn
+	      (when (or force (not (symbol-value icon)))
+		(unless keymap
+		  (setq keymap
+			(make-mode-line-mouse-map 'mouse-2
+						  'w3m-reload-this-page)))
+		(set icon (propertize
+			   "  "
+			   'display (create-image file type nil
+						  :ascent 'center)
+			   'local-map keymap
+			   'mouse-face 'mode-line-highlight
+			   'help-echo "mouse-2 reloads this page"))
+		(put icon 'risky-local-variable t)
+		(put status 'risky-local-variable t))
+	      (when (stringp (symbol-value status))
+		;; Save the original status strings as properties.
+		(put status 'string (symbol-value status)))
+	      (set status (list "" 'w3m-space-before-modeline-icon icon)))
+	  ;; Don't use graphic icons.
+	  (when (get status 'string)
+	    (set status (get status 'string)))))))
+    (let (file)
+      ;; Spinner
+      (when (and (or force (not w3m-spinner-image-file))
+		 (image-type-available-p 'gif)
+		 w3m-icon-directory
+		 (file-directory-p w3m-icon-directory)
+		 (file-exists-p
+		  (setq file (expand-file-name "spinner.gif"
+					       w3m-icon-directory))))
+	(setq w3m-spinner-image-file file)
+	(define-key (setq w3m-modeline-spinner-map (make-sparse-keymap))
+	  [mode-line mouse-2]
+	  'w3m-process-stop)
+	(put 'w3m-modeline-process-status-on 'risky-local-variable t)
+	(put 'w3m-modeline-process-status-on-icon 'risky-local-variable t))
+      (if (and window-system
+	       w3m-show-graphic-icons-in-mode-line
+	       w3m-spinner-image-file)
+	  (progn
+	    (when (stringp w3m-modeline-process-status-on)
+	      ;; Save the original status strings as properties.
+	      (put 'w3m-modeline-process-status-on 'string
+		   w3m-modeline-process-status-on))
+	    (setq w3m-modeline-process-status-on
+		  '(""
+		    w3m-space-before-modeline-icon
+		    w3m-modeline-process-status-on-icon)))
+	(when (get 'w3m-modeline-process-status-on 'string)
+	  (setq w3m-modeline-process-status-on
+		(get 'w3m-modeline-process-status-on 'string))))))
+
+(defun w3m-make-spinner-image ()
+  "Make an image used to show a spinner.
+It should be called periodically in order to spin the spinner."
+  (when w3m-spinner-image-file
+    (unless (< (incf w3m-spinner-image-index) w3m-spinner-image-frames)
+      (setq w3m-spinner-image-index 0))
+    (let ((image (create-image w3m-spinner-image-file 'gif nil
+			       :ascent 'center :mask 'heuristic
+			       :index w3m-spinner-image-index)))
+      (setq w3m-modeline-process-status-on-icon
+	    (propertize "  "
+			'display image
+			'local-map w3m-modeline-spinner-map
+			'help-echo w3m-spinner-map-help-echo))
+      image)))
+
+(defun w3m-decode-coding-string-with-priority (str coding)
+  "Decode the string STR which is encoded in CODING.
+If CODING is a list, look for the coding system using it as a priority
+list."
+  (setq str (string-make-unibyte str))
+  (when (listp coding)
+    (setq coding
+	  (with-temp-buffer
+	    (set-buffer-multibyte nil)
+	    (insert str)
+	    (w3m-detect-coding-region (point-min) (point-max) coding))))
+  (decode-coding-string str
+			(or coding
+			    w3m-default-coding-system
+			    w3m-coding-system
+			    'iso-2022-7bit)))
+
+(defun w3m-form-coding-system-accept-region-p (&optional from to coding-system)
+  "Check whether `coding-system' can encode specified region."
+  (let ((from (or from (point-min)))
+	(to (or to   (point-max)))
+	(coding-system (or coding-system
+			   w3m-form-input-textarea-coding-system)))
+    (if (fboundp 'unencodable-char-position)
+	(let ((pos (unencodable-char-position from to coding-system)))
+	  (or (not pos)
+	      (y-or-n-p (format "\"%c\" would not be accepted. Continue? "
+				(char-after pos)))))
+      (let ((select-safe-coding-system-accept-default-p nil))
+	(or (eq (select-safe-coding-system from to coding-system)
+		coding-system)
+	    (y-or-n-p
+	     "This text may cause coding-system problem. Continue? "))))))
+
+(provide 'w3m-ems)
+
+;;; w3m-ems.el ends here

=== added file 'share/emacs/site-lisp/w3m/w3m-favicon.el'
--- share/emacs/site-lisp/w3m/w3m-favicon.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-favicon.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,367 @@
+;;; w3m-favicon.el --- utilities for handling favicon in emacs-w3m
+
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2009
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Authors: Yuuichi Teranishi  <teranisi@gohome.org>,
+;;          TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
+;;          Katsumi Yamaoka    <yamaoka@jpl.org>
+;; Keywords: w3m, WWW, hypermedia
+
+;; This file is a part of emacs-w3m.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;;; Code:
+
+(eval-when-compile
+  (require 'cl))
+
+;;(require 'w3m-util)
+;;(require 'w3m-proc)
+(require 'w3m-image)
+
+(eval-when-compile
+  (defvar w3m-current-buffer)
+  (defvar w3m-current-url)
+  (defvar w3m-favicon-image)
+  (defvar w3m-icon-data)
+  (defvar w3m-modeline-favicon)
+  (defvar w3m-profile-directory)
+  (defvar w3m-use-favicon)
+  (defvar w3m-work-buffer-name)
+  (defvar w3m-work-buffer-list)
+  (autoload 'w3m-expand-url "w3m")
+  (autoload 'w3m-load-list "w3m")
+  (autoload 'w3m-message "w3m")
+  (autoload 'w3m-retrieve "w3m")
+  (autoload 'w3m-save-list "w3m")
+  (autoload 'w3m-url-readable-string "w3m"))
+
+(defcustom w3m-favicon-size nil
+  "Size of favicon.  The value should be `(WIDTH . HEIGHT)' or nil.
+Where WIDTH and HEIGHT are positive integers; both or any of them can
+be omitted."
+  :group 'w3m
+  :type '(radio (const :tag "Not specified" nil)
+		(cons :format "%v"
+		      (integer :format "Width: %v " :size 0 :value 16)
+		      (integer :format "Height: %v " :size 0 :value 16))))
+
+(defconst w3m-favicon-name "favicon.ico"
+  "The favicon name.")
+
+(add-hook 'w3m-display-functions 'w3m-favicon-setup)
+
+(defcustom w3m-favicon-use-cache-file nil
+  "*If non-nil, use favicon cache file."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-favicon-cache-file nil
+  "Filename of saving favicon cache.
+It defaults to the file named \".favicon\" under the directory specified
+by the `w3m-profile-directory' variable."
+  :group 'w3m
+  :type '(radio (const :format "Not specified\n")
+		(file :format "%t: %v\n" :size 0)))
+
+(defcustom w3m-favicon-cache-expire-wait (* 30 24 60 60)
+  "*The cache will be expired after specified seconds passed since retrieval.
+If this variable is nil, never expired."
+  :group 'w3m
+  :type '(integer :size 0))
+
+(defcustom w3m-favicon-type
+  (let ((types '(png gif pbm xpm bmp))
+	type)
+    (catch 'det
+      (while types
+	(setq type (car types)
+	      types (cdr types))
+	(if (if (featurep 'xemacs)
+		(featurep type)
+	      (image-type-available-p type))
+	    (throw 'det type)))))
+  "*Image type of display favicon."
+  :group 'w3m
+  :type (cons 'radio
+	      (let ((types (if (or
+				(featurep 'xemacs)
+				(not (fboundp 'image-types)))
+			       (delq nil
+				     (mapcar (lambda (type)
+					       (if (featurep type) type))
+					     '(gif jpeg png tiff xpm)))
+			     (delq 'postscript (copy-sequence image-types)))))
+		(nconc (mapcar (lambda (x)
+				 `(const :format "%v  " ,x))
+			       (butlast types))
+		       `((const ,(car (last types))))))))
+
+(defcustom w3m-space-before-favicon " "
+  "String of space char(s) to be put in front of favicon in the mode-line.
+It may be better to use two or more spaces if you are using oblique or
+italic font in the modeline."
+  :group 'w3m
+  :type 'string)
+
+(defcustom w3m-favicon-convert-args nil
+  "List of additional arguments passed to ImageMagick's convert program.
+Args that are always passed to convert in addition to this value are:
+
+\(\"-geometry\" \"WIDTHxHEIGHT\" \"fromTYPE:temp-file\" \"toTYPE:-\")
+
+Args might also contain (\"-transparent\" \"COLOR\") in the beginning.
+Note that this value is effective only with Emacs 22 and greater."
+  :group 'w3m
+  :type `(repeat (group :inline t
+			:match-inline
+			(lambda (widget vals)
+			  (if (and (eq (aref (car vals) 0) ?-)
+				   (cdr vals)
+				   (not (eq (aref (nth 1 vals) 0) ?-)))
+			      (cons (list (car vals) (nth 1 vals))
+				    (nthcdr 2 vals))
+			    (cons (list (car vals)) (cdr vals))))
+			(string :format "Arg: %v " :value "-" :size 0)
+			(checklist :inline t
+				   (string :format "Value: %v\n" :size 0)))))
+
+(defcustom w3m-favicon-default-background nil
+  "Color name used as transparent color of favicon image.
+Nil means to use the background color of the Emacs frame.  The null
+string \"\" is special, that will be replaced with the background color
+of the header line or the mode line on which the favicon is displayed.
+Note that this value is effective only with Emacs 22 and greater."
+  :group 'w3m
+  :type '(radio (string :format "Color: %v\n" :size 0
+			:match (lambda (widget value)
+				 (and (stringp value) (> (length value) 0))))
+		(const :tag "Use the background color of the Emacs frame" nil)
+		(const :tag "Null string" "")))
+
+(defvar w3m-favicon-type-alist '((pbm . ppm))
+  "A list of a difference type of image between Emacs and ImageMagick.
+ 0. Type of Emacs
+ 1. Type of ImageMagick")
+
+(defvar w3m-favicon-cache-data nil
+  "A list of favicon cache (internal variable).
+Each information is a list whose elements are:
+
+ 0. URL
+ 1. (RAW_DATA . TYPE)
+ 2. DATE when the RAW_DATA was retrieved
+ 3. IMAGE
+
+Where IMAGE highly depends on the Emacs version and is not saved in
+the cache file.")
+
+(w3m-static-if (featurep 'xemacs)
+    (set 'w3m-modeline-favicon
+	 '("" w3m-space-before-favicon w3m-favicon-image))
+  (put 'w3m-modeline-favicon 'risky-local-variable t))
+(make-variable-buffer-local 'w3m-modeline-favicon)
+(make-variable-buffer-local 'w3m-favicon-image)
+
+(defmacro w3m-favicon-cache-p (url)
+  "Say whether the favicon data for URL has been chached."
+  `(assoc ,url w3m-favicon-cache-data))
+
+(defmacro w3m-favicon-cache-favicon (url)
+  "Pull out the favicon image corresponding to URL from the cache."
+  `(nth 3 (assoc ,url w3m-favicon-cache-data)))
+
+(defmacro w3m-favicon-cache-retrieved (url)
+  "Return the time when the favicon data for URL was retrieved."
+  `(nth 2 (assoc ,url w3m-favicon-cache-data)))
+
+(defmacro w3m-favicon-set-image (image)
+  "Set IMAGE to `w3m-favicon-image' and `w3m-modeline-favicon'."
+  (if (featurep 'xemacs)
+      `(set 'w3m-favicon-image ,image)
+    `(when (setq w3m-favicon-image ,image)
+       (set 'w3m-modeline-favicon
+	    (list ""
+		  'w3m-space-before-favicon
+		  (propertize "  " 'display w3m-favicon-image)
+		  (propertize " " 'display '(space :width 0.5)))))))
+
+(defun w3m-favicon-setup (url)
+  "Set up the favicon data in the current buffer.  The buffer-local
+variable `w3m-favicon-image' will be set to non-nil value when the
+favicon is ready."
+  (w3m-favicon-set-image nil)
+  (when (and w3m-use-favicon
+	     w3m-current-url
+	     (w3m-static-if (featurep 'xemacs)
+		 (and (device-on-window-system-p)
+		      (featurep w3m-favicon-type))
+	       (and (display-images-p)
+		    (image-type-available-p w3m-favicon-type))))
+    (let (icon)
+      (cond
+       ((and (string-match "\\`about://\\([^/]+\\)/" url)
+	     (setq icon (intern-soft (concat "w3m-about-" (match-string 1 url)
+					     "-favicon"))))
+	(with-current-buffer w3m-current-buffer
+	  (w3m-favicon-set-image
+	   (w3m-favicon-convert
+	    (base64-decode-string (symbol-value icon)) 'ico))))
+       ((or (string-match "\\`https?://" url)
+	    (and (string-match "\\`about://\\(?:header\\|source\\)/https?://"
+			       url)
+		 (setq url (substring url 15))))
+	(if w3m-icon-data
+	    (w3m-favicon-retrieve (car w3m-icon-data) (cdr w3m-icon-data)
+				  w3m-current-buffer)
+	  (w3m-favicon-retrieve (w3m-expand-url (concat "/" w3m-favicon-name)
+						url)
+				'ico w3m-current-buffer)))))))
+
+(defun w3m-favicon-convert (data type)
+  "Convert the favicon DATA in TYPE to the favicon image and return it."
+  (when (or (not (eq type 'ico))
+	    ;; Since most of favicons are the `ico' types, we make sure
+	    ;; of the magic-numbers only as for them.
+	    (string-equal "\x00\x00\x01\x00" (substring data 0 4)))
+    (let ((height (or (cdr w3m-favicon-size)
+		      (w3m-static-if (featurep 'xemacs)
+			  (face-height 'default)
+			(frame-char-height))))
+	  (new (w3m-static-unless (featurep 'xemacs)
+		 (>= emacs-major-version 22)))
+	  bg args img)
+      ;; Examine the transparent color of the image.
+      (when (and w3m-imagick-identify-program
+		 (equal w3m-favicon-default-background ""))
+	(with-temp-buffer
+	  (set-buffer-multibyte nil)
+	  (insert data)
+	  (let ((coding-system-for-read 'raw-text)
+		(coding-system-for-write 'binary))
+	    (condition-case nil
+		(call-process-region (point-min) (point-max)
+				     w3m-imagick-identify-program
+				     t t nil "-verbose" (format "%s:-" type))
+	      (error)))
+	  (goto-char (point-min))
+	  (setq case-fold-search t)
+	  (while (and (not bg)
+		      (re-search-forward "^ *Transparent +color: *\
+\\([^\n ]+\\(?: +[^\n ]+\\)*\\)" nil t))
+	    (when (string-match "\\`none\\'" (setq bg (match-string 1)))
+	      (setq bg nil)))))
+      (setq args (list "-geometry"
+		       (format "%dx%d"
+			       (or (car w3m-favicon-size) height) height)))
+      (w3m-static-unless (featurep 'xemacs)
+	(when new
+	  ;; "-transparent" should precede the other arguments.
+	  (setq args (nconc (when bg (list "-transparent" bg))
+			    args
+			    w3m-favicon-convert-args))))
+      (setq img (apply
+		 #'w3m-imagick-convert-data
+		 data (symbol-name type)
+		 (symbol-name (or (cdr (assq w3m-favicon-type
+					     w3m-favicon-type-alist))
+				  w3m-favicon-type))
+		 args))
+      (when img
+	(w3m-static-if (featurep 'xemacs)
+	    (make-glyph
+	     (make-image-instance (vector w3m-favicon-type :data img)))
+	  (if new
+	      (create-image img w3m-favicon-type t
+			    :ascent 'center
+			    :background w3m-favicon-default-background)
+	    (create-image img w3m-favicon-type t :ascent 'center)))))))
+
+(defun w3m-favicon-retrieve (url type target)
+  "Retrieve favicon from URL and convert it to image as TYPE in TARGET.
+TYPE is a symbol like `ico' and TARGET is a buffer where the image is
+stored in the `w3m-favicon-image' buffer-local variable."
+  (if (and (w3m-favicon-cache-p url)
+	   (or (null w3m-favicon-cache-expire-wait)
+	       (< (- (w3m-float-time)
+		     (w3m-float-time (w3m-favicon-cache-retrieved url)))
+		  w3m-favicon-cache-expire-wait)))
+      (with-current-buffer target
+	(w3m-favicon-set-image (w3m-favicon-cache-favicon url)))
+    (lexical-let ((url url)
+		  (type type)
+		  (target target)
+		  (silent w3m-message-silent))
+      (w3m-process-with-null-handler
+	(w3m-process-do-with-temp-buffer
+	    (ok (w3m-retrieve url 'raw nil nil nil handler))
+	  (let ((w3m-message-silent silent)
+		idata image)
+	    (if (and ok
+		     ;; Some broken servers provides empty contents.
+		     (>= (buffer-size) 4))
+		(setq idata (buffer-string)
+		      image (w3m-favicon-convert idata type))
+	      (w3m-message "Reading %s...done (no favicon)"
+			   (w3m-url-readable-string url)))
+	    (with-current-buffer target
+	      (w3m-favicon-set-image image)
+	      (push (list url idata (current-time) w3m-favicon-image)
+		    w3m-favicon-cache-data)))))))
+  ;; Emacs frame needs to be redisplayed to make favicon come out.
+  (w3m-force-window-update-later target 1))
+
+(defun w3m-favicon-save-cache-file ()
+  "Save the cached favicon data into the local file."
+  (when w3m-favicon-use-cache-file
+    (w3m-save-list (or w3m-favicon-cache-file
+		       (expand-file-name ".favicon" w3m-profile-directory))
+		   (delq nil (mapcar (lambda (elem)
+				       (when (= (length elem) 4)
+					 (butlast elem)))
+				     w3m-favicon-cache-data))
+		   'binary)))
+
+(defun w3m-favicon-load-cache-file ()
+  "Load the cached favicon data from the local file."
+  (when (and w3m-favicon-use-cache-file
+	     (null w3m-favicon-cache-data))
+    (let ((cache (w3m-load-list
+		  (or w3m-favicon-cache-file
+		      (expand-file-name ".favicon" w3m-profile-directory))
+		  'binary))
+	  elem data image)
+      (while cache
+	(setq elem (car cache)
+	      cache (cdr cache)
+	      data (cadr elem))
+	(when (stringp data)
+	  (setcar (cdr elem) (setq data (cons data 'ico))))
+	(when (setq image (condition-case nil
+			      (w3m-favicon-convert (car data) (cdr data))
+			    (error nil)))
+	  (push (nconc elem (list image)) w3m-favicon-cache-data))))))
+
+(add-hook 'w3m-arrived-setup-functions 'w3m-favicon-load-cache-file)
+(add-hook 'w3m-arrived-shutdown-functions 'w3m-favicon-save-cache-file)
+
+(provide 'w3m-favicon)
+
+;;; w3m-favicon.el ends here

=== added file 'share/emacs/site-lisp/w3m/w3m-fb.el'
--- share/emacs/site-lisp/w3m/w3m-fb.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-fb.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,208 @@
+;;; w3m-fb.el --- frame-local buffers support for Emacs-w3m
+
+;;; Copyright (C) 2005, 2006 Matthew P. Hodges
+
+;; Author: Matthew P. Hodges <MPHodges@member.fsf.org>
+;; Version: $Id: w3m-fb.el,v 1.4 2006/09/20 09:26:42 yamaoka Exp $
+
+;; w3m-fb.el is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published
+;; by the Free Software Foundation; either version 2, or (at your
+;; option) any later version.
+
+;; w3m-fb.el is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;;; Commentary:
+;;
+;; With this mode switched on, W3M buffers are associated with the
+;; frame on which they were created.  Only tabs for the current
+;; frame's W3M buffers are shown (with non-nil w3m-use-tab); other
+;; affected commands are w3m-next-buffer w3m-previous-buffer,
+;; w3m-select-buffer and w3m-quit.
+;;
+;; Switch the mode on programmatically with:
+;;
+;;     (w3m-fb-mode 1)
+;;
+;; or toggle interactively with M-x w3m-fb-mode RET.
+
+;;; Code:
+
+(defconst w3m-fb-version "1.0.0"
+  "Version number of this package.")
+
+(eval-when-compile
+  (autoload 'w3m-delete-buffer "w3m" nil t)
+  (autoload 'w3m-list-buffers "w3m-util")
+  (autoload 'w3m-next-buffer "w3m" nil t)
+  (defvar w3m-pop-up-frames))
+
+(eval-and-compile
+  (defalias 'w3m-fb-frame-parameter
+    (cond
+     ((fboundp 'frame-parameter)
+      'frame-parameter)
+     ((fboundp 'frame-property)
+      'frame-property)
+     (t
+      (error "No frame parameter/property function")))))
+
+(defvar w3m-fb-delete-frame-functions
+  (cond
+   ((boundp 'delete-frame-functions)
+    'delete-frame-functions)
+   ((boundp 'delete-frame-hook)
+    'delete-frame-hook)
+   (t
+    (error "No delete-frame hook/functions variable found")))
+  "Symbol associated with `delete-frame' hooks.")
+
+(defvar w3m-fb-list-buffers-frame nil
+  "Frame to list buffers for in `w3m-list-buffers'.
+Bind this if the buffers associated with a frame other than the
+selected frame are required.")
+
+;; Customizable variables
+
+(defgroup w3m-fb nil
+  "Frame local buffers for Emacs-w3m."
+  :group 'w3m)
+
+(defcustom w3m-fb-delete-frame-kill-buffers t
+  "If non-nil, kill W3M buffers after deleting frames."
+  :group 'w3m-fb
+  :type 'boolean
+  :set (lambda (sym val)
+	 (set sym val)
+	 (when (boundp 'w3m-fb-mode)
+	   (if w3m-fb-mode
+	       (add-hook w3m-fb-delete-frame-functions
+			 'w3m-fb-delete-frame-buffers)
+	     (remove-hook w3m-fb-delete-frame-functions
+			  'w3m-fb-delete-frame-buffers)))))
+
+;; Internal variables
+
+(defvar w3m-fb-buffer-list nil
+  "List of w3m buffers associated with the selected frame.")
+
+(defvar w3m-fb-inhibit-buffer-selection nil
+  "Non-nil to inhibit selecting a suitable w3m buffer.")
+
+;; Internal functions
+
+(defun w3m-fb-delete-frame-buffers (&optional frame)
+  "Delete W3M buffers associated with frame FRAME."
+  (let* ((w3m-fb-list-buffers-frame frame)
+	 (buffers (w3m-list-buffers))
+	 ;; Now bind w3m-fb-mode to nil so that w3m-delete-buffer
+	 ;; doesn't call w3m-quit when there are w3m buffers belonging
+	 ;; to other frames.
+	 (w3m-fb-mode nil)
+	 (w3m-fb-inhibit-buffer-selection t))
+    (save-window-excursion
+      (dolist (b buffers)
+	(with-current-buffer b
+	  (w3m-delete-buffer))))))
+
+;; Could use set-frame-parameter here, but it isn't portable
+(defun w3m-fb-set-frame-parameter (frame parameter value)
+  "Set for frame FRAME parameter PARAMETER to VALUE."
+  (modify-frame-parameters frame (list (cons parameter value))))
+
+(defun w3m-fb-add ()
+  "Add current buffer to `w3m-fb-buffer-list'."
+  (let ((val (w3m-fb-frame-parameter nil 'w3m-fb-buffer-list)))
+    (w3m-fb-set-frame-parameter
+     nil 'w3m-fb-buffer-list (nconc val (list (current-buffer))))))
+
+(defun w3m-fb-remove ()
+  "Remove current buffer from `w3m-fb-buffer-list'.
+Applies to all frames."
+  (when (eq major-mode 'w3m-mode)
+    (let (val)
+      (dolist (f (frame-list))
+	(setq val (w3m-fb-frame-parameter f 'w3m-fb-buffer-list))
+	(w3m-fb-set-frame-parameter
+	 f 'w3m-fb-buffer-list (delq (current-buffer) val))))))
+
+(defun w3m-fb-associate ()
+  "Associate all `w3m-mode' buffers with a frame."
+  (let (buffers done rest)
+    ;; Buffers displayed in windows
+    (dolist (f (frame-list))
+      (setq buffers nil)
+      (dolist (w (window-list f nil (frame-selected-window f)))
+	(when (with-current-buffer (window-buffer w)
+		(eq major-mode 'w3m-mode))
+	  (setq buffers (nconc buffers (list (window-buffer w))))
+	  (setq done (nconc done (list (window-buffer w))))))
+      (w3m-fb-set-frame-parameter
+       f 'w3m-fb-buffer-list buffers))
+    ;; Buffers not displayed in windows; add to selected frame
+    (let ((w3m-fb-mode nil))
+      (setq rest (w3m-list-buffers)))
+    (dolist (b done)
+      (setq rest (delq b rest)))
+    (when rest
+      (w3m-fb-set-frame-parameter
+       nil 'w3m-fb-buffer-list
+       (nconc (w3m-fb-frame-parameter nil 'w3m-fb-buffer-list) rest)))))
+
+(defun w3m-fb-dissociate ()
+  "Disassociate `w3m-mode' buffers from frames."
+  (dolist (f (frame-list))
+    (w3m-fb-set-frame-parameter f 'w3m-fb-buffer-list nil)))
+
+(defun w3m-fb-select-buffer ()
+  "Select an appropriate W3M buffer to display."
+  ;; If there are w3m buffers belonging to this frame, ensure one is
+  ;; selected; if not make sure that we're not displaying a w3m
+  ;; buffer
+  (cond
+   ;; Select w3m buffer belonging to frame, if one is available
+   ((w3m-list-buffers)
+    (unless (memq (current-buffer) (w3m-list-buffers))
+      (w3m-next-buffer -1)))
+   (t
+    ;; If no w3m buffers belong to frame, don't display any w3m buffer
+    (while (eq major-mode 'w3m-mode)
+;;      (assert (eq (current-buffer)
+;;		  (window-buffer (selected-window))))
+      (bury-buffer)))))
+
+;; Minor mode setup
+
+;;;###autoload
+(define-minor-mode w3m-fb-mode
+  "Toggle W3M Frame Buffer mode.
+This allows frame-local lists of buffers (tabs)."
+  :init-value nil
+  :group 'w3m-fb
+  :global t
+  (if (and w3m-fb-mode
+	   (if w3m-pop-up-frames
+	       (prog1
+		   (setq w3m-fb-mode nil)
+		 (message "\
+W3M Frame Buffer mode not activated (non-nil w3m-pop-up-frames)")
+		 (sit-for 2))
+	     t))
+      (progn
+	(add-hook 'w3m-mode-hook 'w3m-fb-add)
+	(add-hook 'kill-buffer-hook 'w3m-fb-remove)
+	(when w3m-fb-delete-frame-kill-buffers
+	  (add-hook w3m-fb-delete-frame-functions
+		    'w3m-fb-delete-frame-buffers))
+	(w3m-fb-associate))
+    (remove-hook 'w3m-mode-hook 'w3m-fb-add)
+    (remove-hook 'kill-buffer-hook 'w3m-fb-remove)
+    (remove-hook w3m-fb-delete-frame-functions 'w3m-fb-delete-frame-buffers)
+    (w3m-fb-dissociate)))
+
+(provide 'w3m-fb)
+
+;;; w3m-fb.el ends here

=== added file 'share/emacs/site-lisp/w3m/w3m-filter.el'
--- share/emacs/site-lisp/w3m/w3m-filter.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-filter.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,367 @@
+;;; w3m-filter.el --- filtering utility of advertisements on WEB sites -*- coding: euc-japan -*-
+
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Keywords: w3m, WWW, hypermedia
+
+;; This file is a part of emacs-w3m.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+
+;;; Commentary:
+
+;; w3m-filter.el is the add-on utility to filter advertisements on WEB
+;; sites.
+
+
+;;; Code:
+
+(provide 'w3m-filter)
+
+(eval-when-compile
+  (require 'cl))
+
+(require 'w3m)
+
+(defcustom w3m-filter-rules
+  `(("\\`http://www\\.geocities\\.co\\.jp/"
+     w3m-filter-delete-regions
+     "<DIV ALIGN=CENTER>\n<!--*/GeoGuide/*-->" "<!--*/GeoGuide/*-->\n</DIV>")
+    ("\\`http://[a-z]+\\.hp\\.infoseek\\.co\\.jp/"
+     w3m-filter-delete-regions
+     "<!-- start AD -->" "<!-- end AD -->")
+    ("\\`http://linux\\.ascii24\\.com/linux/"
+     w3m-filter-delete-regions
+     "<!-- DAC CHANNEL AD START -->" "<!-- DAC CHANNEL AD END -->")
+    ("\\`http://\\(www\\|images\\|news\\|maps\\|groups\\)\\.google\\."
+     w3m-filter-google)
+    ("\\`https?://\\(?:www\\.\\)?amazon\\.\
+\\(?:com\\|co\\.\\(?:jp\\|uk\\)\\|fr\\|de\\)/"
+     w3m-filter-amazon)
+    ("\\`https?://mixi\\.jp" w3m-filter-mixi)
+    ("\\`http://eow\\.alc\\.co\\.jp/[^/]+/UTF-8" w3m-filter-alc)
+    ("\\`http://www\\.asahi\\.com/" w3m-filter-asahi-shimbun)
+    ("\\`http://imepita\\.jp/[0-9]+/[0-9]+" w3m-filter-imepita)
+    ("\\`http://allatanys\\.jp/" w3m-filter-allatanys)
+    ("\\`http://.*\\.wikipedia\\.org/" w3m-filter-wikipedia)
+    ("" w3m-filter-iframe))
+  "Rules to filter advertisements on WEB sites."
+  :group 'w3m
+  :type '(repeat
+	  (cons :format "%v" :indent 4
+		(regexp :format "Regexp: %v\n" :size 0)
+		(choice
+		 :tag "Filtering Rule"
+		 (list :tag "Delete regions surrounded with these patterns"
+		       (function-item :format "" w3m-filter-delete-region)
+		       (regexp :tag "Start")
+		       (regexp :tag "End"))
+		 (list :tag "Filter with a user defined function"
+		       function
+		       (repeat :tag "Arguments" sexp))))))
+
+(defcustom w3m-filter-google-use-utf8
+  (or (featurep 'un-define) (fboundp 'utf-translate-cjk-mode)
+      (and (not (equal "Japanese" w3m-language))
+	   (w3m-find-coding-system 'utf-8)))
+  "*Use the converting rule to UTF-8 on the site of Google."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-filter-google-use-ruled-line  t
+  "*Use the ruled line on the site of Google."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-filter-google-separator "<hr>"
+  "Field separator for Google's search results ."
+  :group 'w3m
+  :type 'string)
+
+(defcustom w3m-filter-amazon-regxp
+  (concat
+   "\\`\\(https?://\\(?:www\\.\\)?amazon\\."
+   "\\(?:com\\|co\\.\\(?:jp\\|uk\\)\\|fr\\|de\\)"
+   ;; "Joyo.com"
+   "\\)/"
+   "\\(?:"
+   "\\(?:exec/obidos\\|o\\)/ASIN"
+   "\\|"
+   "gp/product"
+   "\\|"
+   "\\(?:[^/]+/\\)?dp"
+   "\\)"
+   "/\\([0-9]+\\)")
+  "*Regexp to extract ASIN number for Amazon."
+  :group 'w3m
+  :type '(string :size 0))
+
+(defcustom w3m-filter-amazon-short-url-bottom nil
+  "*Amazon short URLs insert bottom position."
+  :group 'w3m
+  :type 'boolean)
+
+;;;###autoload
+(defun w3m-filter (url)
+  "Apply filtering rule of URL against a content in this buffer."
+  (save-match-data
+    (dolist (elem w3m-filter-rules)
+      (when (string-match (car elem) url)
+	(apply (cadr elem) url (cddr elem))))))
+
+(defun w3m-filter-delete-regions (url start end)
+  "Delete regions surrounded with a START pattern and an END pattern."
+  (goto-char (point-min))
+  (let (p (i 0))
+    (while (and (search-forward start nil t)
+		(setq p (match-beginning 0))
+		(search-forward end nil t))
+      (delete-region p (match-end 0))
+      (incf i))
+    (> i 0)))
+
+(defun w3m-filter-replace-regexp (url regexp to-string)
+  "Replace all occurrences of REGEXP with TO-STRING."
+  (goto-char (point-min))
+  (while (re-search-forward regexp nil t)
+    (replace-match to-string nil nil)))
+
+;; Filter functions:
+(defun w3m-filter-asahi-shimbun (url)
+  "Convert entity reference of UCS."
+  (when w3m-use-mule-ucs
+    (goto-char (point-min))
+    (let ((case-fold-search t)
+	  end ucs)
+      (while (re-search-forward "alt=\"\\([^\"]+\\)" nil t)
+	(goto-char (match-beginning 1))
+	(setq end (set-marker (make-marker) (match-end 1)))
+	(while (re-search-forward "&#\\([0-9]+\\);" (max end (point)) t)
+	  (setq ucs (string-to-number (match-string 1)))
+	  (delete-region (match-beginning 0) (match-end 0))
+	  (insert-char (w3m-ucs-to-char ucs) 1))))))
+
+(defun w3m-filter-google (url)
+  "Insert separator within items."
+  (goto-char (point-min))
+  (let ((endm (make-marker))
+	(case-fold-search t)
+	pos beg end)
+    (when (and w3m-filter-google-use-utf8
+	       (re-search-forward "\
+<a class=. href=\"http://\\(www\\|images\\|news\\|maps\\|groups\\)\\.google\\."
+				  nil t)
+	       (setq pos (match-beginning 0))
+	       (search-backward "<table" nil t)
+	       (setq beg (match-beginning 0))
+	       (search-forward "</table" nil t)
+	       (set-marker endm (match-end 0))
+	       (< pos (marker-position endm)))
+      (goto-char beg)
+      (while (re-search-forward "[?&][io]e=\\([^&]+\\)&" endm t)
+	(replace-match "UTF-8" nil nil nil 1))
+      (setq end (marker-position endm)))
+    (when (string-match "\\`http://www\\.google\\.[^/]+/search\\?" url)
+      (goto-char (point-max))
+      (when (and w3m-filter-google-use-ruled-line
+		 (search-backward "<div class=" end t)
+		 (search-forward "</div>" nil t))
+	(insert w3m-filter-google-separator))
+      (if w3m-filter-google-use-ruled-line
+	  (while (search-backward "<div class=" end t)
+	    (insert w3m-filter-google-separator))
+	(while (search-backward "<div class=" end t)
+	  (insert "<p>"))))))
+
+(defun w3m-filter-amazon (url)
+  "Insert Amazon short URIs."
+  (when (string-match w3m-filter-amazon-regxp url)
+    (let* ((base (match-string 1 url))
+	   (asin (match-string 2 url))
+	   (shorturls `(,(concat base "/dp/" asin "/")
+			,(concat base "/o/ASIN/" asin "/")
+			,(concat base "/gp/product/" asin "/")))
+	   (case-fold-search t)
+	   shorturl)
+      (goto-char (point-min))
+      (setq url (file-name-as-directory url))
+      (when (or (and (not w3m-filter-amazon-short-url-bottom)
+		     (search-forward "<body" nil t)
+		     (search-forward ">" nil t))
+		(and w3m-filter-amazon-short-url-bottom
+		     (search-forward "</body>" nil t)
+		     (goto-char (match-beginning 0))))
+	(insert "\n")
+	(while (setq shorturl (car shorturls))
+	  (setq shorturls (cdr shorturls))
+	  (unless (string= url shorturl)
+	    (insert (format "Amazon Short URL: <a href=\"%s\">%s</a><br>\n"
+			    shorturl shorturl))))
+	(insert "\n")))))
+
+(defun w3m-filter-mixi (url)
+  "Direct jump to the external diary."
+  (goto-char (point-min))
+  (let (newurl)
+    (while (re-search-forward "<a href=\"?view_diary\\.pl\\?url=\\([^>]+\\)>"
+			      nil t)
+      (setq newurl (match-string 1))
+      (when newurl
+	(delete-region (match-beginning 0) (match-end 0))
+	(when (string-match "&owner_id=[0-9]+\"?\\'" newurl)
+	  (setq newurl (substring newurl 0 (match-beginning 0))))
+	(insert (format "<a href=\"%s\">"
+			(w3m-url-readable-string newurl)))))))
+
+(defun w3m-filter-alc (url)
+  (let ((baseurl "http://eow.alc.co.jp/%s/UTF-8/")
+	curl cword beg tmp1)
+    (when (string-match "\\`http://eow\\.alc\\.co\\.jp/\\([^/]+\\)/UTF-8/" url)
+      (setq curl (match-string 0 url))
+      (setq cword (match-string 1 url))
+      (setq cword (car (split-string (w3m-url-decode-string cword 'utf-8)
+				     " ")))
+      (goto-char (point-min))
+      (while (search-forward "¥Ç¡¼¥¿¤ÎžºÜ¤Ï¶Ø¤¸¤é¤ì¤Æ¤¤¤Þ¤¹" nil t)
+	(delete-region (line-beginning-position) (line-end-position))
+	(insert "<br>"))
+      (goto-char (point-min))
+      (when (search-forward "<body" nil t)
+	(forward-line 1)
+	(insert "<h1>±Ñ¼­Ï¯ on the WEB<h1>\n")
+	(setq beg (point))
+	(when (search-forward "<!-- ¢§¸¡º÷ʸ»úÎó -->" nil t)
+	  (forward-line 1)
+	  (delete-region beg (point)))
+	(when (search-forward "<!-- ¢§¥ï¡¼¥É¥ê¥ó¥¯ ÍúÎò -->" nil t)
+	  (forward-line 1)
+	  (setq beg (point))
+	  (when (search-forward "</body>" nil t)
+	    (delete-region beg (match-beginning 0))))
+	(insert "<br>¡ö¥Ç¡¼¥¿¤ÎžºÜ¤Ï¶Ø¤¸¤é¤ì¤Æ¤¤¤Þ¤¹¡£")
+	;; next/previous page
+	(goto-char (point-min))
+	(while (re-search-forward
+		"<a href='javascript:goPage(\"\\([0-9]+\\)\")'>"
+		nil t)
+	  (setq tmp1 (match-string 1))
+	  (delete-region (match-beginning 0) (match-end 0))
+	  (insert (format "<a href=\"%s?pg=%s\">" curl tmp1)))
+	;; wordlink
+	(goto-char (point-min))
+	(while (re-search-forward
+		"<span class=\"wordlink\">\\([^<]+\\)</span>"
+		nil t)
+	  (setq tmp1 (match-string 1))
+	  (delete-region (match-beginning 0) (match-end 0))
+	  (insert (format "<a href=\"%s\">%s</a>" (format baseurl tmp1) tmp1)))
+	;; goGradable/goFairWord
+	(goto-char (point-min))
+	(while (re-search-forward
+		"<a href='javascript:\\(goGradable\\|goFairWord\\)(\"\\([^\"]+\\)\")'>"
+		nil t)
+	  (setq tmp1 (match-string 2))
+	  (delete-region (match-beginning 0) (match-end 0))
+	  (insert (format "<a href=\"%s\">" (format baseurl tmp1))))
+	;; remove spacer
+	(goto-char (point-min))
+	(while (search-forward "img/spacer.gif" nil t)
+	  (delete-region (line-beginning-position) (line-end-position)))
+	(goto-char (point-min))
+	;; remove ¥ï¡¼¥É¥ê¥ó¥¯
+	(when (search-forward "alt=\"¥ï¡¼¥É¥ê¥ó¥¯\"" nil t)
+	  (delete-region (line-beginning-position) (line-end-position)))
+	;; Á´Ê¸¤òɽ¼¨¤¹¤ë¤Ï̵Íý
+	(goto-char (point-min))
+	(while (re-search-forward
+		(concat "<br */> *¢Í<strong>"
+			"<a href='javascript:goFullText(\"[^\"]+\", \"[^\"]+\")'>"
+			"Á´Ê¸¤òɽ¼¨¤¹¤ë</a>")
+		nil t)
+	  (delete-region (match-beginning 0) (match-end 0)))
+	;; Java Document write... ;_;
+	;; (while (re-search-forward
+	;; 	"<a href='javascript:goFullText(\"\\([^\"]+\\)\", \"\\([^\"]+\\)\")'>"
+	;; 	nil t)
+	;;   (setq tmp1 (match-string 1))
+	;;   (setq tmp2 (match-string 2))
+	;;   (delete-region (match-beginning 0) (match-end 0))
+	;;   ;; &dk=JE, &dk=EJ
+	;;   (insert (format "<a href=\"%s?ref=ex&exp=%s&dn=%s&dk=%s\">"
+	;; 		  curl tmp1 tmp2
+	;; 		  (if (string-match "\\Cj" cword) "JE" "EJ"))))
+	))))
+
+(defun w3m-filter-imepita (url)
+  "JavaScript emulation."
+  (goto-char (point-min))
+  (let (tmp)
+    (when (re-search-forward
+	   (concat "<script><!--\ndocument.write('\\([^\n]*\\)');\r\n//--></script>\n"
+		   "<noscript>.*</noscript>")
+	   nil t)
+      (setq tmp (match-string 1))
+      (delete-region (match-beginning 0) (match-end 0))
+      (insert tmp))))
+
+(defun w3m-filter-iframe (url)
+  (goto-char (point-min))
+  (while (re-search-forward "<iframe [^>]*src=\"\\([^\"]*\\)\"[^>]*>" nil t)
+    (insert (concat "[iframe:<a href=\"" (match-string 1) "\">" (match-string 1) "</a>]"))))
+
+(defun w3m-filter-allatanys (url)
+  "JavaScript emulation."
+  (goto-char (point-min))
+  (let (aturl atexpurl)
+    (if (re-search-forward
+	 (concat "<body[ \t\r\f\n]+onload=\"window\\.top\\.location\\.replace('"
+		 w3m-html-string-regexp
+		 "');\">")
+	 nil t)
+	(progn
+	  (setq aturl (match-string 1))
+	  (setq atexpurl (w3m-expand-url aturl url))
+	  (delete-region (match-beginning 0) (match-end 0))
+	  (insert "<body>\n"
+		  "<hr>"
+		  "Body has a <b>url=window.top.location.replace()</b><br><br>\n"
+		  (format "Goto: <a href=%s>%s</a>\n" aturl atexpurl)
+		  "<hr>")
+	  (goto-char (point-min))
+	  (insert (format "<meta HTTP-EQUIV=\"Refresh\" CONTENT=\"0;URL=%s\">\n"
+			  aturl)))
+      (while (re-search-forward (concat "<a[ \t\r\l\n]+href=\"javascript:[^(]+('"
+					"\\([^']+\\)')\">")
+				nil t)
+	(setq aturl (match-string 1))
+	(delete-region (match-beginning 0) (match-end 0))
+	(insert (format "<a href=\"%s\">" aturl))))))
+
+(defun w3m-filter-wikipedia (url)
+  "Make anchor reference to work."
+  (goto-char (point-min))
+  (let (matched-text refid)
+    (while (re-search-forward 
+	    "<\\(?:sup\\|cite\\) id=\"\\([^\"]*\\)\"" nil t)
+      (setq matched-text (match-string 0)
+	    refid        (match-string 1))
+      (delete-region (match-beginning 0) (match-end 0))
+      (insert (format "<a name=\"%s\"></a>%s" refid matched-text)))))
+
+;;; w3m-filter.el ends here

=== added file 'share/emacs/site-lisp/w3m/w3m-form.el'
--- share/emacs/site-lisp/w3m/w3m-form.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-form.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,1897 @@
+;;; w3m-form.el --- Stuffs to handle <form> tag
+
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
+;;          Yuuichi Teranishi  <teranisi@gohome.org>,
+;;          Hideyuki SHIRAI    <shirai@meadowy.org>,
+;;          Shun-ichi GOTO     <gotoh@taiyo.co.jp>,
+;;          Akihiro Arisawa    <ari@mbf.sphere.ne.jp>
+;; Keywords: w3m, WWW, hypermedia
+
+;; This file is a part of emacs-w3m.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+
+;;; Commentary:
+
+;; This file contains the stuffs to handle <form> tag on emacs-w3m.
+;; For more detail about emacs-w3m, see:
+;;
+;;    http://emacs-w3m.namazu.org/
+
+
+;;; Code:
+
+(eval-when-compile
+  (require 'cl))
+
+(require 'w3m-util)
+(require 'w3m)
+
+(eval-when-compile
+  (defvar w3m-current-forms))
+
+(defcustom w3m-form-use-fancy-faces t
+  "*Use fancy faces to fontify <form> tags."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-form-treat-textarea-size t
+  "*Non-nil means to process textarea size (treat textarea rows)."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-form-use-textarea-backup t
+  "*Non-nil means save and restore text that you wrote last in the textarea.
+Files to save text are stored in the directory specified by the
+`w3m-form-textarea-directory' variable."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-form-textarea-file-expire-date 3
+  "*Date to expire of the file for textarea's backup."
+  :group 'w3m
+  :type '(choice (integer :tag "Expire date")
+		 (const :tag "Remove when emacs-w3m exit" t)
+		 (const :tag "No expire" nil)))
+
+(defcustom w3m-form-textarea-file-coding-system
+  (cond ((or (featurep 'un-define) 
+	     (fboundp 'utf-translate-cjk-mode))
+	 'utf-8)
+	((equal "Japanese" w3m-language)
+	 'iso-2022-7bit-ss2)
+	((w3m-find-coding-system 'utf-8)
+	 'utf-8)
+	(t
+	 'iso-2022-7bit-ss2))
+  "Coding system for textarea's backup file."
+  :group 'w3m
+  :type '(coding-system :size 0))
+
+(defcustom w3m-form-textarea-directory
+  (expand-file-name ".textarea" w3m-profile-directory)
+  "*Name of the directory to save the file of textarea input."
+  :group 'w3m
+  :type '(directory :size 0))
+
+(defcustom w3m-form-textarea-edit-mode 'text-mode
+  "*Major mode to edit textarea."
+  :group 'w3m
+  :type '(choice
+	  (function :tag "Major mode")
+	  (repeat :tag "Rules to select major modes for the current page"
+	   (cons (choice (regexp :tag "Regexp matches the current page")
+			 (function :tag "Predicate checks the current page")
+			 (sexp :tag "Expression checks the current page"))
+		 (function :tag "Major mode")))))
+
+(defface w3m-form
+  '((((class color) (background light)) (:foreground "cyan" :underline t))
+    (((class color) (background dark)) (:foreground "red" :underline t))
+    (t (:underline t)))
+  "*Face to fontify forms."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-form-face 'face-alias 'w3m-form)
+
+;;; Local variables
+(defvar w3m-form-input-textarea-buffer nil)
+(defvar w3m-form-input-textarea-form nil)
+(defvar w3m-form-input-textarea-hseq nil)
+(defvar w3m-form-input-textarea-point nil)
+(defvar w3m-form-input-textarea-wincfg nil)
+(defvar w3m-form-input-textarea-file nil)
+(defvar w3m-form-input-textarea-coding-system nil)
+(defvar w3m-form-use-textarea-backup-p nil)
+(make-variable-buffer-local 'w3m-form-input-textarea-buffer)
+(make-variable-buffer-local 'w3m-form-input-textarea-form)
+(make-variable-buffer-local 'w3m-form-input-textarea-hseq)
+(make-variable-buffer-local 'w3m-form-input-textarea-point)
+(make-variable-buffer-local 'w3m-form-input-textarea-wincfg)
+(make-variable-buffer-local 'w3m-form-input-textarea-file)
+(make-variable-buffer-local 'w3m-form-input-textarea-coding-system)
+(make-variable-buffer-local 'w3m-form-use-textarea-backup-p)
+
+(defvar w3m-form-textarea-files nil)
+(make-variable-buffer-local 'w3m-form-textarea-files)
+
+(defvar w3m-form-textarea-post-files nil)
+(make-variable-buffer-local 'w3m-form-textarea-post-files)
+
+(defvar w3m-form-input-textarea-mode nil
+  "Non-nil if w3m textarea minor mode is enabled.")
+(make-variable-buffer-local 'w3m-form-input-textarea-mode)
+
+(defvar w3m-form-input-select-buffer nil)
+(defvar w3m-form-input-select-form nil)
+(defvar w3m-form-input-select-name nil)
+(defvar w3m-form-input-select-id nil)
+(defvar w3m-form-input-select-point nil)
+(defvar w3m-form-input-select-candidates nil)
+(defvar w3m-form-input-select-wincfg nil)
+(defvar w3m-form-input-select-urlid nil)
+(make-variable-buffer-local 'w3m-form-input-select-buffer)
+(make-variable-buffer-local 'w3m-form-input-select-form)
+(make-variable-buffer-local 'w3m-form-input-select-name)
+(make-variable-buffer-local 'w3m-form-input-select-id)
+(make-variable-buffer-local 'w3m-form-input-select-point)
+(make-variable-buffer-local 'w3m-form-input-select-candidates)
+(make-variable-buffer-local 'w3m-form-input-select-wincfg)
+(make-variable-buffer-local 'w3m-form-input-select-urlid)
+
+(defvar w3m-form-input-map-buffer nil)
+(defvar w3m-form-input-map-wincfg nil)
+(defvar w3m-form-input-map-point nil)
+(defvar w3m-form-input-map-urlname nil)
+(make-variable-buffer-local 'w3m-form-input-map-buffer)
+(make-variable-buffer-local 'w3m-form-input-map-wincfg)
+(make-variable-buffer-local 'w3m-form-input-map-point)
+(make-variable-buffer-local 'w3m-form-input-map-urlname)
+
+(defvar w3m-form-new-session nil
+  "Specify non-nil value to create a new session after sending form.
+It is useful to bind this variable with `let', but do not set it globally.")
+
+(defvar w3m-form-download nil
+  "Specify non-nil value to download contents after sending form.
+It is useful to bind this variable with `let', but do not set it globally.")
+
+;;; w3m-form structure:
+
+(defun w3m-form-normalize-action (action url)
+  "Normalize the ACTION using URL as a current URL."
+  ;; "!CURRENT_URL!" is magic string of w3m.
+  (if (and action (not (string= action "!CURRENT_URL!")))
+      (w3m-expand-url action url)
+    (when url
+      (w3m-string-match-url-components url)
+      (substring url 0 (or (match-beginning 6)
+			   (match-beginning 8))))))
+
+(defun w3m-form-new (method action &optional baseurl charlst enctype)
+  "Return new form object."
+  (vector 'w3m-form-object
+	  (if (stringp method)
+	      (intern method)
+	    method)
+	  action
+	  charlst
+	  (or enctype 'application/x-www-form-urlencoded)
+	  nil))
+
+(defun w3m-form-p (obj)
+  "Return t if OBJ is a form object."
+  (and (vectorp obj)
+       (symbolp (aref 0 obj))
+       (eq (aref 0 obj) 'w3m-form-object)))
+
+(defun w3m-form-set-method (form method)
+  (aset form 1 (if (stringp method)
+		   (intern method)
+		 method)))
+(defsetf w3m-form-method w3m-form-set-method)
+
+(defmacro w3m-form-method (form)
+  `(aref ,form 1))
+(defmacro w3m-form-action (form)
+  `(aref ,form 2))
+(defmacro w3m-form-charlst (form)
+  `(aref ,form 3))
+(defmacro w3m-form-enctype (form)
+  `(aref ,form 4))
+(defmacro w3m-form-plist (form)
+  `(aref ,form 5))
+(defun w3m-form-put-property (form name property value)
+  (aset form 5
+	(plist-put (w3m-form-plist form)
+		   (setq name (if (stringp name) (intern name) name))
+		   (plist-put (plist-get (w3m-form-plist form) name)
+			      property value)))
+  value)
+(defmacro w3m-form-get-property (form name property)
+  `(plist-get (plist-get (w3m-form-plist ,form)
+			 (if (stringp ,name)
+			     (intern ,name)
+			   ,name))
+	      ,property))
+(defmacro w3m-form-put (form id name value)
+  `(w3m-form-put-property ,form ,id :value (cons ,name ,value)))
+(defmacro w3m-form-get (form id)
+  `(cdr (w3m-form-get-property ,form ,id :value)))
+(defun w3m-form-get-by-name (form name)
+  (let ((plist (w3m-form-plist form))
+	pair value)
+    (while plist
+      (setq pair (plist-get (cadr plist) :value))
+      (when (and pair
+		 (string= (car pair) name))
+	(setq value (cdr pair)
+	      plist nil))
+      (setq plist (cddr plist)))
+    value))
+(defun w3m-form-put-by-name (form id name value)
+  (let ((plist (w3m-form-plist form))
+	pair found)
+    (while plist
+      (setq pair (plist-get (cadr plist) :value))
+      (when (and pair
+		 (string= (car pair) name))
+	(setcar plist id)
+	(setcdr pair value)
+	(setq found t
+	      plist nil))
+      (setq plist (cddr plist)))
+    (unless found
+      (w3m-form-put form id name value))))
+
+(defun w3m-form-goto-next-field ()
+  "Move to next form field and return the point.
+If no field in forward, return nil without moving."
+  (let* ((id (get-text-property (point) 'w3m-form-field-id))
+	 (beg (if id
+		  (next-single-property-change (point) 'w3m-form-field-id)
+		(point)))
+	 (next (next-single-property-change beg 'w3m-form-field-id)))
+    (if next
+	(goto-char next)
+      nil)))
+
+(defun w3m-form-get-coding-system (coding)
+  (or (catch 'det
+	(while coding
+	  (if (w3m-charset-to-coding-system (car coding))
+	      (throw 'det (w3m-charset-to-coding-system (car coding)))
+	    (setq coding (cdr coding)))))
+      w3m-current-coding-system
+      (w3m-charset-to-coding-system
+       (w3m-content-charset w3m-current-url))
+      w3m-default-coding-system))
+
+(defun w3m-form-make-form-data (form)
+  (let ((plist (w3m-form-plist form))
+	(coding (w3m-form-charlst form))
+	buf bufs)
+    (setq coding (w3m-form-get-coding-system coding))
+    (while plist
+      (let* ((number (car plist))
+	     (pair (plist-get (cadr plist) :value))
+	     (name (car pair))
+	     (value (cdr pair)))
+	(cond
+	 ((and (consp value)
+	       (eq (car value) 'file))
+	  (setq bufs (cons (cons number (cons name value)) bufs)))
+	 ((and (consp value)
+	       (consp (cdr value))
+	       (consp (cadr value)))	; select.
+	  (setq bufs (cons (cons number (cons name (car value))) bufs)))
+	 ((consp value)			; checkbox
+	  (setq bufs (append (mapcar (lambda (x) (cons number (cons name x))) value)
+			     bufs)))
+	 (value
+	  (setq bufs (cons (cons number (cons name value)) bufs))))
+	(setq plist (cddr plist))))
+    (when bufs
+      (setq bufs (sort bufs (lambda (x y) (< (car x) (car y)))))
+      (if (eq (w3m-form-enctype form) 'multipart/form-data)
+	  (let ((boundary (apply 'format "--_%d_%d_%d" (current-time)))
+		file type)
+	    ;; (setq buf (nreverse buf))
+	    (cons
+	     (concat "multipart/form-data; boundary=" boundary)
+	     (with-temp-buffer
+	       (set-buffer-multibyte nil)
+	       (while (setq buf (cdr (car bufs)))
+		 (if (and (consp (cdr buf))
+			  (eq (car (cdr buf)) 'file))
+		     (progn
+		       (setq file (expand-file-name (cdr (cdr buf))))
+		       (if (string= (setq type (w3m-local-content-type file))
+				    "unknown")
+			   (setq type "application/octet-stream"))
+		       (insert "--" boundary "\r\n"
+			       "Content-Disposition: form-data; name=\""
+			       (car buf)
+			       "\"; filename=\"" file "\"\r\n"
+			       "Content-Type: " type "\r\n"
+			       "Content-Transfer-Encoding: binary\r\n\r\n")
+		       (when (file-exists-p file)
+			 (insert-file-contents-literally file)
+			 (goto-char (point-max)))
+		       (insert "\r\n"))
+		   (insert "--" boundary "\r\n"
+			   "Content-Disposition: form-data; name=\""
+			   (car buf)
+			   "\"\r\n\r\n"
+			   (encode-coding-string (cdr buf) coding)
+			   "\r\n"))
+		 (setq bufs (cdr bufs)))
+	       (insert "--" boundary "--\r\n")
+	       (buffer-string))))
+	(mapconcat (lambda (elem)
+		     (setq elem (cdr elem))
+		     (format "%s=%s"
+			     (w3m-url-encode-string (car elem) coding t)
+			     (w3m-url-encode-string (if (stringp (cdr elem))
+							(cdr elem)
+						      "")
+						    coding
+						    t)))
+		   bufs "&")))))
+
+(defun w3m-form-resume (forms)
+  "Resume content of all forms in the current buffer using FORMS."
+  (when forms
+    (if (eq (car forms) t)
+	(setq forms (cdr forms)))
+    (save-excursion
+      (goto-char (point-min))
+      (let (textareas)
+	(while (w3m-form-goto-next-field)
+	  (let ((fid (get-text-property (point) 'w3m-form-field-id)))
+	    (when (and fid
+		       (string-match "\
+fid=\\([^/]+\\)/type=\\([^/]+\\)/name=\\([^/]*\\)/id=\\(.*\\)$"
+				     fid))
+	      (let ((form (nth (string-to-number (match-string 1 fid))
+			       forms))
+		    (cform (nth (string-to-number (match-string 1 fid))
+				w3m-current-forms))
+		    (type (match-string 2 fid))
+		    (name (match-string 3 fid))
+		    (id (string-to-number (match-string 4 fid))))
+		(when form
+		  (cond
+		   ((or (string= type "submit")
+			(string= type "image"))
+		    ;; Remove status to support forms containing multiple
+		    ;; submit buttons.
+		    (w3m-form-put cform id name nil))
+		   ((or (string= type "reset")
+			(string= type "hidden")
+			;; Do nothing.
+			))
+		   ((string= type "password")
+		    (w3m-form-replace (w3m-form-get form id)
+				      'invisible)
+		    (unless (eq form cform)
+		      (w3m-form-put cform id name (w3m-form-get form id))))
+		   ((string= type "radio")
+		    (let ((value (w3m-form-get-by-name form name)))
+		      (when value
+			(w3m-form-replace
+			 (if (string= value (nth 4 (w3m-action (point))))
+			     "*" " ")))
+		      (unless (eq form cform)
+			(w3m-form-put-by-name cform id name value))))
+		   ((string= type "checkbox")
+		    (let ((value (w3m-form-get form id)))
+		      (when value
+			(w3m-form-replace
+			 (if (member (nth 4 (w3m-action (point))) value)
+			     "*" " ")))
+		      (unless (eq form cform)
+			(w3m-form-put cform id name value))))
+		   ((string= type "select")
+		    (let ((selects (w3m-form-get form id)))
+		      (when (and (consp selects) (car selects))
+			(w3m-form-replace (cdr (assoc (car selects)
+						      (cdr selects)))))
+		      (unless (eq form cform)
+			(w3m-form-put cform id name selects))))
+		   ((string= type "textarea")
+		    (let ((hseq (nth 2 (w3m-action (point))))
+			  (value (w3m-form-get form id)))
+		      (when (> hseq 0)
+			(setq textareas (cons (cons hseq value) textareas)))
+		      (unless (eq form cform)
+			(w3m-form-put cform id name value))))
+		   ((string= type "file")
+		    (let ((value (w3m-form-get form id)))
+		      (when (and value
+				 (consp value))
+			(w3m-form-replace (cdr value)))
+		      (unless (eq form cform)
+			(w3m-form-put cform id name value))))
+		   (t
+		    (let ((value (w3m-form-get form id)))
+		      (when (stringp value)
+			(w3m-form-replace value))
+		      (unless (eq form cform)
+			(w3m-form-put cform id name value))))))))))
+	(unless w3m-form-treat-textarea-size
+	  (dolist (textarea textareas)
+	    (when (cdr textarea)
+	      (w3m-form-textarea-replace (car textarea) (cdr textarea)))))))))
+
+;;;###autoload
+(defun w3m-fontify-forms ()
+  "Process half-dumped data and fontify forms in this buffer."
+  ;; If `w3m-current-forms' is resumed from history, reuse it.
+  (w3m-form-parse-and-fontify
+   (when (eq t (car w3m-current-forms))
+     (setq w3m-current-forms (cdr w3m-current-forms)))))
+
+(eval-and-compile
+  (unless (fboundp 'w3m-form-make-button)
+    (defun w3m-form-make-button (start end properties)
+      "Make button on the region from START to END with PROPERTIES."
+      (w3m-add-text-properties start end
+			       (append '(face w3m-form) properties)))))
+
+;;; w3mmee
+;;
+(eval-and-compile
+  (defalias 'w3m-char-to-int (if (fboundp 'char-to-int)
+				 'char-to-int
+			       'identity))
+  (defalias 'w3m-string-to-char-list (if (fboundp 'string-to-list)
+					 'string-to-list
+				       (lambda (str)
+					 (mapcar 'identity str))))
+  (defalias 'w3m-int-to-char (if (fboundp 'int-to-char)
+				 'int-to-char
+			       'identity)))
+
+(defmacro w3m-form-mee-attr-unquote (x)
+  "Unquote form attribute of w3mmee."
+  '(let (attr)
+     (when (eq (car x) ?T)
+       (setq x (cdr x))
+       (while (and x (not (eq (w3m-char-to-int (car x)) 0)))
+	 (setq attr (concat attr (char-to-string (car x))))
+	 (setq x (cdr x))))
+     attr))
+
+(defun w3m-form-mee-new (x)
+  "Decode form information of w3mmee."
+  (setq x (w3m-string-to-char-list
+	   (w3m-url-decode-string x w3m-current-coding-system)))
+  (let (method enctype action charset target name)
+    (setq method (case (/ (w3m-char-to-int (car x)) 16)
+		   (0 "get")
+		   (1 "post")
+		   (2 "internal")
+		   (3 "head"))
+	  enctype (case (% (w3m-char-to-int (car x)) 16)
+		    (0 'application/x-www-form-urlencoded)
+		    (1 'multipart/form-data)))
+    (setq x (cdr x))
+    (setq action (w3m-form-normalize-action (w3m-form-mee-attr-unquote x)
+					    w3m-current-url))
+    (setq x (cdr x))
+    (if (member "lang=many" w3m-compile-options)
+	(setq charset (w3m-form-mee-attr-unquote x))
+      (setq charset (case (car x)
+		      (?e "euc-jp")
+		      (?s "shift-jis")
+		      (?n "iso-2022-7bit"))))
+    (setq x (cdr x))
+    (setq target (w3m-form-mee-attr-unquote x))	; not used.
+    (setq x (cdr x))
+    (setq name (w3m-form-mee-attr-unquote x)) ; not used.
+    (w3m-form-new method action nil (and charset (list charset)) enctype)))
+
+(defun w3m-form-mee-select-value (value)
+  "Decode select form information of w3mmee."
+  (let ((clist (w3m-string-to-char-list
+		(w3m-url-decode-string value w3m-current-coding-system)))
+	label val s selected candidates)
+    (while clist
+      (setq s (eq (car clist) (w3m-int-to-char 1))
+	    label nil
+	    val nil)
+      (setq clist (cdr clist))
+      (while (not (eq (car clist) (w3m-int-to-char 0)))
+	(setq label (concat label (char-to-string (car clist))))
+	(setq clist (cdr clist)))
+      (if label
+	  (setq label (decode-coding-string label w3m-output-coding-system)))
+      (setq clist (cdr clist))
+      (while (not (eq (car clist) (w3m-int-to-char 0)))
+	(setq val (concat val (char-to-string (car clist))))
+	(setq clist (cdr clist)))
+      (if val
+	  (setq val (decode-coding-string val w3m-output-coding-system)))
+      (if s (setq selected val))
+      (push (cons val label) candidates)
+      (setq clist (cdr clist)))
+    (cons selected (nreverse candidates))))
+
+(defun w3m-fontify-textareas ()
+  "Process and fontify textareas in this buffer."
+  (when w3m-form-treat-textarea-size
+    (save-excursion
+      (goto-char (point-min))
+      (let ((inhibit-read-only t)
+	    form fid start end type name rows start-column end-column
+	    hseq abs-hseq text id filename readonly)
+	(while (w3m-form-goto-next-field)
+	  (setq fid (get-text-property (point) 'w3m-form-field-id))
+	  (setq filename (get-text-property (point) 'w3m-form-file-name))
+	  (when
+	      (and
+	       fid
+	       (string-match
+		"fid=\\([^/]+\\)/type=\\([^/]+\\)/name=\\([^/]*\\)/id=\\(.*\\)$"
+		fid))
+	    (setq form (nth (string-to-number (match-string 1 fid))
+			    w3m-current-forms)
+		  type (match-string 2 fid)
+		  name (match-string 3 fid)
+		  id (string-to-number (match-string 4 fid)))
+	    (when (string= type "textarea")
+	      (setq rows (get-text-property (point) 'w3m-textarea-rows)
+		    hseq (get-text-property (point) 'w3m-form-hseq)
+		    readonly (get-text-property (point) 'w3m-form-readonly)
+		    abs-hseq (w3m-anchor-sequence))
+	      (setq start-column (- (current-column) 1))
+	      (goto-char (next-single-property-change (point)
+						      'w3m-form-hseq))
+	      (setq end-column (current-column))
+	      (save-excursion
+		(dotimes (i (- rows 1))
+		  (forward-line -1)
+		  (save-excursion
+		    (move-to-column start-column)
+		    (delete-char 1)
+		    (insert "[")
+		    (setq start (point))
+		    (move-to-column end-column)
+		    (delete-char 1)
+		    (setq end (point))
+		    (insert "]"))
+		  (w3m-add-face-property start end 'w3m-form)
+		  (add-text-properties
+		   start end
+		   `(w3m-form-field-id
+		     ,(format "fid=%s/type=%s/name=%s/id=%d" fid type name id)
+		     w3m-action (w3m-form-input-textarea ,form ,hseq)
+		     w3m-submit (w3m-form-submit ,form ,id ,name
+						 (w3m-form-get ,form ,id)
+						 w3m-form-new-session
+						 w3m-form-download)
+		     w3m-form-hseq ,hseq
+		     w3m-anchor-sequence ,abs-hseq
+		     w3m-form-id ,id
+		     w3m-form-name ,name
+		     w3m-form-file-name ,filename
+		     w3m-form-readonly ,readonly)))
+		(when (setq text (w3m-form-get form id))
+		  (w3m-form-textarea-replace hseq text))))))))))
+
+(defun w3m-form-parse-and-fontify (&optional reuse-forms)
+  "Parse forms of the half-dumped data in this buffer and fontify them.
+Result form structure is saved to the local variable `w3m-current-forms'.
+If optional REUSE-FORMS is non-nil, reuse it as `w3m-current-form'."
+  (let ((case-fold-search t)
+	(id 0)
+	tag start end internal-start textareas selects forms maps mapval
+	form filename)
+    (setq w3m-form-textarea-files nil)
+    (setq w3m-form-use-textarea-backup-p nil)
+    (goto-char (point-min))
+    (while (if (eq w3m-type 'w3mmee)
+	       (w3m-search-tag "_f" "map" "img_alt" "input_alt"
+			       "/input_alt")
+	     (w3m-search-tag "form_int" "map" "img_alt" "input_alt"
+			     "/input_alt"))
+      (setq tag (downcase (match-string 1)))
+      (goto-char (match-end 1))
+      (setq start (match-end 0))
+      (cond
+       ((string= tag (if (eq w3m-type 'w3mmee) "_f" "form_int"))
+	(if (eq w3m-type 'w3mmee)
+	    (w3m-parse-attributes (_x)
+	      (setq forms (nconc forms (list (w3m-form-mee-new _x)))))
+	  (w3m-parse-attributes (action (method :case-ignore)
+					(fid :integer)
+					(accept-charset :case-ignore)
+					(enctype :case-ignore)
+					(charset :case-ignore))
+	    (when action
+	      (setq action (w3m-url-transfer-encode-string
+			    (w3m-decode-anchor-string action)
+			    (if charset
+				(w3m-charset-to-coding-system charset)
+			      w3m-current-coding-system))))
+	    (if (setq form (cdr (assq fid forms)))
+		(progn
+		  (setf (w3m-form-method form) (or method "get"))
+		  (setf (w3m-form-action form)
+			(w3m-form-normalize-action action w3m-current-url))
+		  (setf (w3m-form-charlst form)
+			(if accept-charset
+			    (setq accept-charset
+				  (split-string accept-charset ","))))
+		  (setf (w3m-form-enctype form)
+			(if enctype
+			    (intern enctype)
+			  'application/x-www-form-urlencoded)))
+	      (setq form (w3m-form-new
+			  (or method "get")
+			  (w3m-form-normalize-action action w3m-current-url)
+			  nil
+			  (if accept-charset
+			      (setq accept-charset
+				    (split-string accept-charset ",")))
+			  (if enctype
+			      (intern enctype)
+			    'application/x-www-form-urlencoded)))
+	      (setq forms (cons (cons fid form) forms))))))
+       ((string= tag "map")
+	(let (candidates)
+	  (w3m-parse-attributes (name)
+	    (while (and (w3m-search-tag "area" "/map")
+			(not (char-equal
+			      (char-after (match-beginning 1))
+			      ?/)))
+	      (goto-char (match-end 1))
+	      (w3m-parse-attributes (href alt)
+		(when href
+		  (setq candidates (cons (cons href (or alt href))
+					 candidates)))))
+	    (unless maps (setq maps (w3m-form-new "map" ".")))
+	    (when candidates
+	      (w3m-form-put maps
+			    (incf id)
+			    name
+			    (nreverse candidates))))))
+       ((string= tag "img_alt")
+	(w3m-parse-attributes (usemap)
+	  (w3m-search-tag "/img_alt")
+	  (when (or usemap mapval)
+	    (unless maps (setq maps (w3m-form-new "map" ".")))
+	    (unless usemap (setq usemap mapval))
+	    (when mapval (setq mapval nil))
+	    (w3m-add-face-property start end 'w3m-form)
+	    (add-text-properties
+	     start (match-beginning 0)
+	     `(w3m-action (w3m-form-input-map ,maps ,usemap))))))
+       ((string= tag "/input_alt")
+	(replace-match ""))
+       ((string= tag "input_alt")
+	(w3m-parse-attributes ((fid :integer)
+			       (type :case-ignore)
+			       (width :integer)
+			       (maxlength :integer)
+			       (hseq :integer)
+			       (selectnumber :integer)	 ; select
+			       (textareanumber :integer) ; textarea
+			       (size :integer)		 ; textarea
+			       (rows :integer)		 ; textarea
+			       (top_mergin :integer)	 ; textarea
+			       (checked :bool) ; checkbox, radio
+			       (readonly :bool)
+			       no_effect       ; map
+			       name value)
+	  (incf id)
+	  (when value
+	    (setq value (w3m-decode-entities-string value)))
+	  (save-excursion
+	    (search-forward "</input_alt>")
+	    (setq end (match-beginning 0)))
+	  (let ((abs-hseq (or (and (null hseq) 0) (abs hseq))))
+	    (setq w3m-max-anchor-sequence
+		  (max abs-hseq w3m-max-anchor-sequence))
+	    (if (eq w3m-type 'w3mmee)
+		(setq form (nth fid forms))
+	      (setq form (cdr (assq fid forms))))
+	    (unless form
+	      (setq forms (cons (cons fid (setq form
+						(w3m-form-new nil nil)))
+				forms)))
+	    (cond
+	     ((and (string= type "hidden")
+		   (string= name "link"))
+	      (setq mapval value))
+	     ((or (string= type "submit")
+		  (string= type "image"))
+	      (unless (string= no_effect "true")
+		(w3m-form-make-button
+		 start end
+		 `(w3m-form-field-id
+		   ,(format "fid=%d/type=%s/name=%s/id=%d" fid type name id)
+		   w3m-action (w3m-form-submit ,form ,id ,name ,value
+					       w3m-form-new-session
+					       w3m-form-download)
+		   w3m-submit (w3m-form-submit ,form ,id ,name
+					       (w3m-form-get ,form ,id)
+					       w3m-form-new-session
+					       w3m-form-download)
+		   w3m-anchor-sequence ,abs-hseq))))
+	     ((string= type "reset")
+	      (w3m-form-make-button
+	       start end
+	       `(w3m-form-field-id
+		 ,(format "fid=%d/type=%s/name=%s/id=%d" fid type name id)
+		 w3m-action (w3m-form-reset ,form)
+		 w3m-anchor-sequence ,abs-hseq)))
+	     ((string= type "textarea")
+	      (if (eq w3m-type 'w3mmee)
+		  (w3m-form-put form id
+				name
+				(decode-coding-string
+				 (w3m-url-decode-string value
+							w3m-current-coding-system)
+				 w3m-output-coding-system))
+		(setq textareas (cons (list textareanumber form id name readonly)
+				      textareas)))
+	      (when w3m-current-url
+		(setq filename (expand-file-name
+				(w3m-form-input-textarea-filename
+				 w3m-current-url
+				 (format "fid=%d/type=%s/name=%s/id=%d"
+					 fid type name id))
+				w3m-form-textarea-directory))
+		(setq w3m-form-textarea-files
+		      (cons filename w3m-form-textarea-files)))
+	      (w3m-add-face-property start end 'w3m-form)
+	      (add-text-properties
+	       start end
+	       `(w3m-form-field-id
+		 ,(format "fid=%d/type=%s/name=%s/id=%d" fid type name id)
+		 w3m-action (w3m-form-input-textarea ,form ,hseq)
+		 w3m-submit (w3m-form-submit ,form ,id ,name
+					     (w3m-form-get ,form ,id)
+					     w3m-form-new-session
+					     w3m-form-download)
+		 w3m-textarea-rows ,rows
+		 w3m-form-hseq ,hseq
+		 w3m-anchor-sequence ,abs-hseq
+		 w3m-form-id ,id
+		 w3m-form-name ,name
+		 w3m-form-file-name ,filename
+		 w3m-form-readonly ,readonly)))
+	     ((string= type "select")
+	      (when (if (eq w3m-type 'w3mmee)
+			(when value
+			  (w3m-form-put form id name
+					(w3m-form-mee-select-value value))
+			  t)
+		      (setq selects (cons (list selectnumber form id name)
+					  selects)))
+		(w3m-add-face-property start end 'w3m-form)
+		(add-text-properties
+		 start end
+		 `(w3m-form-field-id
+		   ,(format "fid=%d/type=%s/name=%s/id=%d" fid type name id)
+		   w3m-action (w3m-form-input-select ,form ,id ,name)
+		   w3m-submit (w3m-form-submit ,form ,id ,name
+					       (w3m-form-get ,form ,id)
+					       w3m-form-new-session
+					       w3m-form-download)
+		   w3m-anchor-sequence ,abs-hseq))))
+	     ((string= type "password")
+	      (w3m-add-face-property start end 'w3m-form)
+	      (add-text-properties
+	       start end
+	       `(w3m-form-field-id
+		 ,(format "fid=%d/type=%s/name=%s/id=%d" fid type name id)
+		 w3m-action (w3m-form-input-password ,form ,id ,name)
+		 w3m-submit (w3m-form-submit ,form ,id ,name
+					     (w3m-form-get ,form ,id)
+					     w3m-form-new-session
+					     w3m-form-download)
+		 w3m-anchor-sequence ,abs-hseq
+		 w3m-form-readonly ,readonly)))
+	     ((string= type "checkbox")
+	      (let ((cvalue (w3m-form-get form id)))
+		(w3m-form-put form id name
+			      (if checked
+				  (cons value cvalue)
+				cvalue)))
+	      (w3m-add-face-property start end 'w3m-form)
+	      (add-text-properties
+	       start end
+	       `(w3m-form-field-id
+		 ,(format "fid=%d/type=%s/name=%s/id=%d" fid type name id)
+		 w3m-action (w3m-form-input-checkbox ,form ,id ,name ,value)
+		 w3m-submit (w3m-form-submit ,form ,id ,name
+					     (w3m-form-get ,form ,id)
+					     w3m-form-new-session
+					     w3m-form-download)
+		 w3m-anchor-sequence ,abs-hseq)))
+	     ((string= type "radio")
+	      ;; Radio button input, one name has one value
+	      (if checked
+		  (w3m-form-put-by-name form id name value))
+	      (w3m-add-face-property start end 'w3m-form)
+	      (add-text-properties
+	       start end
+	       `(w3m-form-field-id
+		 ,(format "fid=%d/type=%s/name=%s/id=%d" fid type name id)
+		 w3m-action (w3m-form-input-radio ,form ,id ,name ,value)
+		 w3m-submit (w3m-form-submit ,form ,id ,name
+					     (w3m-form-get-by-name ,form ,name)
+					     w3m-form-new-session
+					     w3m-form-download)
+		 w3m-anchor-sequence ,abs-hseq)))
+	     ((string= type "file")
+	      (w3m-add-face-property start end 'w3m-form)
+	      (add-text-properties
+	       start end
+	       `(w3m-form-field-id
+		 ,(format "fid=%d/type=%s/name=%s/id=%d" fid type name id)
+		 w3m-action (w3m-form-input-file ,form ,id ,name ,value)
+		 w3m-submit (w3m-form-submit ,form ,id ,name
+					     (w3m-form-get ,form ,id)
+					     w3m-form-new-session
+					     w3m-form-download)
+		 w3m-anchor-sequence ,abs-hseq)))
+	     (t
+	      (w3m-form-put form
+			    id
+			    name
+			    (or value (w3m-form-get form id)))
+	      (w3m-add-face-property start end 'w3m-form)
+	      (add-text-properties
+	       start end
+	       `(w3m-form-field-id
+		 ,(format "fid=%d/type=%s/name=%s/id=%d" fid type name id)
+		 w3m-action (w3m-form-input ,form ,id ,name ,type
+					    ,width ,maxlength ,value)
+		 w3m-submit (w3m-form-submit ,form ,id ,name
+					     (w3m-form-get ,form ,id)
+					     w3m-form-new-session
+					     w3m-form-download)
+		 w3m-anchor-sequence ,abs-hseq
+		 w3m-form-readonly ,readonly)))))))))
+    ;; Process <internal> tag.
+    (when (search-forward "<internal>" nil t)
+      (setq internal-start (match-beginning 0))
+      (while (and (null reuse-forms)
+		  (re-search-forward "<\\([a-z]+\\)_int" nil t))
+	(incf id)
+	(cond
+	 ((string= (match-string 1) "select")
+	  (w3m-parse-attributes ((selectnumber :integer))
+	    (let ((selectinfo (cdr (assq selectnumber selects)))
+		  current candidates)
+	      (when selectinfo
+		;; Parse FORM SELECT fields until </SELECT> (or </FORM>)
+		(while (and (w3m-search-tag "option_int" "/select_int")
+			    (not (char-equal (char-after (match-beginning 1))
+					     ?/)))
+		  ;; <option_int> is found
+		  (goto-char (match-end 1))
+		  (w3m-parse-attributes ((value :decode-entity)
+					 (label :decode-entity)
+					 (selected :bool))
+		    (push (cons value label) candidates)
+		    (if selected (setq current value))
+		    (skip-chars-forward ">\n")))
+		(setq candidates (nreverse candidates))
+		(w3m-form-put (nth 0 selectinfo)
+			      (nth 1 selectinfo)
+			      (nth 2 selectinfo)
+			      (cons (or current	; current value
+					(caar candidates))
+				    candidates))))))
+	 ((string= (match-string 1) "textarea")
+	  (w3m-parse-attributes ((textareanumber :integer))
+	    (forward-char 1)		; skip newline character.
+	    (let ((textareainfo (cdr (assq textareanumber textareas)))
+		  (buffer (current-buffer))
+		  end text)
+	      (when textareainfo
+		(setq start (point))
+		(skip-chars-forward "^<")
+		(setq text (buffer-substring-no-properties start (point)))
+		(w3m-form-put
+		 (nth 0 textareainfo) (nth 1 textareainfo) (nth 2 textareainfo)
+		 (with-temp-buffer
+		   (insert text)
+		   (w3m-decode-entities)
+		   (goto-char (point-min))
+		   (while (search-forward "\r\n" nil t) (replace-match "\n"))
+		   (buffer-string)))))))))
+      (when (search-forward "</internal>" nil t)
+	(delete-region internal-start (match-end 0))))
+    (setq w3m-current-forms (if (eq w3m-type 'w3mmee)
+				forms
+			      (mapcar 'cdr
+				      (sort forms (lambda (x y)
+						    (< (car x)(car y)))))))
+    (w3m-form-resume (or reuse-forms w3m-current-forms))))
+
+(defun w3m-form-replace (string &optional invisible)
+  (let* ((start (text-property-any (point-min) (point-max)
+				   'w3m-action (w3m-action (point))))
+	 (width (string-width
+		 (buffer-substring
+		  start
+		  (next-single-property-change start 'w3m-action))))
+	 (prop (text-properties-at start))
+	 (p (point))
+	 (inhibit-read-only t))
+    (goto-char start)
+    (insert (setq string
+		  (if invisible
+		      (make-string (length string) ?.)
+		    (mapconcat 'identity
+			       (split-string
+				(w3m-truncate-string (or string "")
+						     width) "\n")
+			       "")))
+	    (make-string (max (- width (string-width string)) 0) ?\ ))
+    (delete-region (point)
+		   (next-single-property-change (point) 'w3m-action))
+    (add-text-properties start (point) prop)
+    (set-buffer-modified-p nil)
+    (prog1 (point)
+      (goto-char p))))
+
+(defun w3m-form-input (form id name type width maxlength value)
+  (let ((fvalue (w3m-form-get form id)))
+    (if (get-text-property (point) 'w3m-form-readonly)
+	(message "READONLY %s: %s" (upcase type) fvalue)
+      (save-excursion
+	(let ((input (save-excursion
+		       (read-from-minibuffer (concat (upcase type) ": ") fvalue)))
+	      (coding (w3m-form-get-coding-system (w3m-form-charlst form))))
+	  (when (with-temp-buffer
+		  (insert input)
+		  (w3m-form-coding-system-accept-region-p nil nil coding))
+	    (w3m-form-put form id name input)
+	    (w3m-form-replace input)))))))
+
+(defun w3m-form-input-password (form id name)
+  (if (get-text-property (point) 'w3m-form-readonly)
+      (message "This input box is read-only.")
+    (let* ((fvalue (w3m-form-get form id))
+	   (input (save-excursion
+		    (read-passwd (concat "PASSWORD"
+					 (if fvalue
+					     " (default is no change)")
+					 ": ")
+				 nil
+				 fvalue))))
+      (w3m-form-put form id name input)
+      (w3m-form-replace input 'invisible))))
+
+(defun w3m-form-input-checkbox (form id name value)
+  (let ((fvalue (w3m-form-get form id)))
+    (if (member value fvalue)		; already checked
+	(progn
+	  (w3m-form-put form id name (delete value fvalue))
+	  (w3m-form-replace " "))
+      (w3m-form-put form id name (cons value fvalue))
+      (w3m-form-replace "*"))))
+
+(defun w3m-form-field-parse (fid)
+  (when (and fid
+	     (string-match
+	      "fid=\\([^/]+\\)/type=\\([^/]+\\)/name=\\([^/]*\\)/id=\\(.*\\)$"
+	      fid))
+    (list (match-string 1 fid)
+	  (match-string 2 fid)
+	  (match-string 3 fid)
+	  (match-string 4 fid))))
+
+(defun w3m-form-input-radio (form id name value)
+  (save-excursion
+    (let ((fid (w3m-form-field-parse
+		(get-text-property (point) 'w3m-form-field-id)))
+	  cur-fid)
+      (when fid
+	;; Uncheck all RADIO input having same NAME
+	(goto-char 1)
+	(while (w3m-form-goto-next-field)
+	  (setq cur-fid (w3m-form-field-parse
+			 (get-text-property (point)
+					    'w3m-form-field-id)))
+	  (when (and (string= (nth 0 fid) (nth 0 cur-fid))
+		     (string= (nth 1 fid) (nth 1 cur-fid))
+		     (string= (nth 2 fid) (nth 2 cur-fid)))
+	    (w3m-form-put-by-name
+	     form (string-to-number (nth 3 fid)) (nth 2 fid) nil)
+	    (w3m-form-replace " ")))))) ; erase check
+  ;; Then set this field as checked.
+  (w3m-form-put-by-name form id name value)
+  (w3m-form-replace "*"))
+
+(defun w3m-form-input-file (form id name value)
+  (let ((input (save-excursion
+		 (read-file-name "File name: "
+				 (or (cdr (w3m-form-get form id))
+				     "~/")))))
+    (w3m-form-put form id name (cons 'file input))
+    (w3m-form-replace input)))
+
+;;; TEXTAREA
+
+(defcustom w3m-form-input-textarea-buffer-lines 10
+  "*Buffer lines for form textarea buffer."
+  :group 'w3m
+  :type '(integer :size 0))
+
+(defcustom w3m-form-input-textarea-mode-hook nil
+  "*A hook called after w3m-form-input-textarea-mode."
+  :group 'w3m
+  :type 'hook)
+
+(defcustom w3m-form-input-textarea-set-hook nil
+  "*A Hook called before w3m-form-input-textarea-set."
+  :group 'w3m
+  :type 'hook)
+
+(defun w3m-form-text-chop (text)
+  "Return a list of substrings of TEXT which are separated by newline
+character."
+  (when text
+    (let ((start 0) parts)
+      (while (string-match "\n" text start)
+	(setq parts (cons (substring text start (match-beginning 0)) parts)
+	      start (match-end 0)))
+      (nreverse (cons (substring text start) parts)))))
+
+(defun w3m-form-search-textarea (hseq direction)
+  (let ((point (point))
+	(next-single-property-change-function
+	 (if (eq direction 'forward)
+	     'next-single-property-change
+	   'previous-single-property-change))
+	found)
+    (if (get-text-property point 'w3m-form-hseq)
+	(setq point (funcall next-single-property-change-function point
+			     'w3m-form-hseq)))
+    (when point
+      (while (and (not found)
+		  (setq point (funcall next-single-property-change-function
+				       point 'w3m-form-hseq)))
+	(when (eq (get-text-property point 'w3m-form-hseq) hseq)
+	  (setq found t)))
+      (if point (goto-char point)))))
+
+(defun w3m-form-textarea-replace (hseq string)
+  (let ((chopped (w3m-form-text-chop string))
+	(p (point)))
+    (goto-char (point-min))
+    (while (w3m-form-search-textarea hseq 'forward)
+      (w3m-form-replace (or (car chopped) ""))
+      (setq chopped (cdr chopped)))
+    (goto-char p)))
+
+(defun w3m-form-textarea-info ()
+  "Return a list of (ID NAME LINE READONLY) for current text area."
+  (let ((s (get-text-property (point) 'w3m-form-hseq))
+	(lines 1))
+    (save-excursion
+      (while (w3m-form-search-textarea s 'backward)
+	(incf lines))
+      (list (get-text-property (point) 'w3m-form-id)
+	    (get-text-property (point) 'w3m-form-name)
+	    lines
+	    (get-text-property (point) 'w3m-form-readonly)))))
+
+(defvar w3m-form-input-textarea-map nil)
+(unless w3m-form-input-textarea-map
+  (setq w3m-form-input-textarea-map (make-sparse-keymap))
+  (define-key w3m-form-input-textarea-map "\C-c\C-c"
+    'w3m-form-input-textarea-set)
+  (define-key w3m-form-input-textarea-map "\C-c\C-q"
+    'w3m-form-input-textarea-exit)
+  (define-key w3m-form-input-textarea-map "\C-c\C-k"
+    'w3m-form-input-textarea-exit)
+  (define-key w3m-form-input-textarea-map "\C-x\C-s"
+    'w3m-form-input-textarea-save))
+
+(defun w3m-form-input-textarea-filename (url id)
+  (condition-case nil
+      (concat (md5 (concat url id) nil nil w3m-current-coding-system) ".txt")
+    (error
+     (let ((file "")
+	   ;; Interdit chars of Windows
+	   (replace (regexp-opt '("\\" "/" ":" "*" "?" "\"" "<" ">" "|")))
+	   (max-file-path 254))
+       (while (string-match replace url)
+	 (setq file (concat file (substring url 0 (match-beginning 0)) "_"))
+	 (setq url (substring url (match-end 0))))
+       (setq file (concat file url "-"))
+       (while (string-match replace id)
+	 (setq file (concat file (substring id 0 (match-beginning 0)) "_"))
+	 (setq id (substring id (match-end 0))))
+       (if (< (- max-file-path 4) (length file))
+	   (setq file (substring file 0 (- max-file-path 4 (length id)))))
+       (setq file (concat file id ".txt"))
+       (convert-standard-filename file)))))
+
+(defun w3m-form-input-textarea-save (&optional buffer file no-check)
+  "Save textarea buffer."
+  (interactive)
+  (setq buffer (or buffer (current-buffer)))
+  (setq file (or file w3m-form-input-textarea-file))
+  (with-current-buffer buffer
+    (if (/= (buffer-size) 0)
+	(when (and
+	       (or w3m-form-use-textarea-backup-p
+		   (and (eq this-command 'w3m-form-input-textarea-save)
+			(y-or-n-p "Really save this buffer? ")))
+	       (or no-check
+		   (w3m-form-coding-system-accept-region-p)))
+	  (let ((buffer-file-coding-system
+		 w3m-form-textarea-file-coding-system)
+		(coding-system-for-write
+		 w3m-form-textarea-file-coding-system))
+	    (write-region (point-min) (point-max) file nil 'nomsg)))
+      (when w3m-form-use-textarea-backup-p
+	(when (file-exists-p file)
+	  (delete-file file))
+	(when (file-exists-p (make-backup-file-name file))
+	  (delete-file (make-backup-file-name file)))
+	(set-buffer-modified-p nil)))))
+
+(defun w3m-form-input-textarea-set ()
+  "Save and exit from w3m form textarea mode."
+  (interactive)
+  (run-hooks 'w3m-form-input-textarea-set-hook)
+  (let ((input (buffer-string))
+	(buffer (current-buffer))
+	(hseq w3m-form-input-textarea-hseq)
+	(form w3m-form-input-textarea-form)
+	(point w3m-form-input-textarea-point)
+	(w3mbuffer w3m-form-input-textarea-buffer)
+	(wincfg w3m-form-input-textarea-wincfg)
+	(file w3m-form-input-textarea-file)
+	info)
+    (when (w3m-form-coding-system-accept-region-p)
+      (w3m-form-input-textarea-save buffer file t)
+      (or (one-window-p) (delete-window))
+      (kill-buffer buffer)
+      (if (not (buffer-live-p w3mbuffer))
+	  (and (eq this-command 'w3m-form-input-textarea-set)
+	       (message "No current w3m buffer"))
+	(pop-to-buffer w3mbuffer)
+	(set-window-configuration wincfg)
+	(when (and form point)
+	  (goto-char point)
+	  (setq info (w3m-form-textarea-info))
+	  (w3m-form-put form (nth 0 info) (nth 1 info) input)
+	  (w3m-form-textarea-replace hseq input))))))
+
+(defun w3m-form-input-textarea-exit ()
+  "Exit from w3m form textarea mode."
+  (interactive)
+  (let ((buffer (current-buffer))
+	(point w3m-form-input-textarea-point)
+	(w3mbuffer w3m-form-input-textarea-buffer)
+	(wincfg w3m-form-input-textarea-wincfg)
+	(file w3m-form-input-textarea-file))
+    (w3m-form-input-textarea-save buffer file)
+    (or (one-window-p) (delete-window))
+    (kill-buffer buffer)
+    (if (not (buffer-live-p w3mbuffer))
+	(and (eq this-command 'w3m-form-input-textarea-exit)
+	     (message "No current w3m buffer"))
+      (pop-to-buffer w3mbuffer)
+      (set-window-configuration wincfg)
+      (when point (goto-char point)))))
+
+(unless (assq 'w3m-form-input-textarea-mode minor-mode-alist)
+  (push (list 'w3m-form-input-textarea-mode " w3m form textarea")
+	minor-mode-alist))
+(unless (assq 'w3m-form-input-textarea-mode minor-mode-map-alist)
+  (push (cons 'w3m-form-input-textarea-mode w3m-form-input-textarea-map)
+	minor-mode-map-alist))
+
+(defun w3m-form-input-textarea-mode (&optional arg)
+  "\\<w3m-form-input-textarea-map>
+Minor mode to edit form textareas of w3m.
+
+\\[w3m-form-input-textarea-set]\
+	Set the value and exit from this textarea.
+\\[w3m-form-input-textarea-exit]\
+	Exit from this textarea without setting the value.
+\\[w3m-form-input-textarea-save]\
+	Save editing data in this textarea.
+"
+  (interactive "P")
+  (when (setq w3m-form-input-textarea-mode
+	      (if arg
+		  (> (prefix-numeric-value arg) 0)
+		(not w3m-form-input-textarea-mode)))
+    (run-hooks 'w3m-form-input-textarea-mode-hook)))
+
+(defun w3m-form-input-textarea-mode-setup (caller-buffer)
+  (funcall (if (functionp w3m-form-textarea-edit-mode)
+	       w3m-form-textarea-edit-mode
+	     (or (when (buffer-live-p caller-buffer)
+		   (with-current-buffer caller-buffer
+		     (save-match-data
+		       (catch 'found-mode
+			 (dolist (elem w3m-form-textarea-edit-mode)
+			   (when (if (stringp (car elem))
+				     (string-match (car elem)
+						   w3m-current-url)
+				   (if (functionp (car elem))
+				       (funcall (car elem))
+				     (eval (car elem))))
+			     (throw 'found-mode (cdr elem))))))))
+		 'text-mode)))
+  (w3m-form-input-textarea-mode 1)
+  (message "%s"
+	   (substitute-command-keys "Type \
+`\\<w3m-form-input-textarea-map>\\[w3m-form-input-textarea-set]' to exit \
+textarea, or type \
+`\\<w3m-form-input-textarea-map>\\[w3m-form-input-textarea-exit]' to quit \
+textarea")))
+
+(eval-and-compile
+  (defalias 'w3m-same-window-p
+    (if (featurep 'xemacs)
+	(lambda (buffer-name)
+	  "Return non-nil if a buffer named BUFFER-NAME would be shown in the \"same\" window.
+This function returns non-nil if `display-buffer' or
+`pop-to-buffer' would show a buffer named BUFFER-NAME in the
+selected rather than \(as usual\) some other window.  See
+`same-window-buffer-names' and `same-window-regexps'."
+	  (cond
+	   ((not (stringp buffer-name)))
+	   ;; The elements of `same-window-buffer-names' can be buffer
+	   ;; names or cons cells whose cars are buffer names.
+	   ((and (boundp 'same-window-buffer-names)
+		 (member buffer-name same-window-buffer-names)))
+	   ((and (boundp 'same-window-buffer-names)
+		 (assoc buffer-name same-window-buffer-names)))
+	   ((and (boundp 'same-window-regexps)
+		 (save-match-data
+		   (catch 'found
+		     (dolist (regexp same-window-regexps)
+		       ;; The elements of `same-window-regexps' can be regexps
+		       ;; or cons cells whose cars are regexps.
+		       (when (or (and (stringp regexp)
+				      (string-match regexp buffer-name))
+				 (and (consp regexp) (stringp (car regexp))
+				      (string-match (car regexp) buffer-name)))
+			 (throw 'found t)))))))))
+      'same-window-p)))
+
+(defun w3m-form-input-textarea (form hseq)
+  (let* ((info  (w3m-form-textarea-info))
+	 (value (w3m-form-get form (car info)))
+	 (cur-win (selected-window))
+	 (wincfg (current-window-configuration))
+	 (w3mbuffer (current-buffer))
+	 (point (point))
+	 (size (- (window-height cur-win)
+		  (1+ (max window-min-height
+			   w3m-form-input-textarea-buffer-lines))))
+	 (file (get-text-property (point) 'w3m-form-file-name))
+	 (coding (w3m-form-get-coding-system (w3m-form-charlst form)))
+	 (readonly (nth 3 info))
+	 (backup-p (and (not readonly)
+			(w3m-form-use-textarea-backup-p)))
+	 buffer)
+    (setq w3m-form-use-textarea-backup-p backup-p)
+    (when backup-p
+      (add-hook 'kill-emacs-hook 'w3m-form-textarea-file-cleanup)
+      (let ((dir (file-chase-links
+		  (expand-file-name w3m-form-textarea-directory))))
+	(unless (and (file-exists-p dir) (file-directory-p dir))
+	  (make-directory dir))))
+    (setq buffer
+	  (catch 'detect-buffer
+	    (save-current-buffer
+	      (dolist (buffer (buffer-list))
+		(set-buffer buffer)
+		(when (and w3m-form-input-textarea-mode
+			   (eq w3m-form-input-textarea-buffer w3mbuffer)
+			   (string= w3m-form-input-textarea-file file))
+		  (throw 'detect-buffer (cons t buffer)))))
+	    (generate-new-buffer "*w3m form textarea*")))
+    (unless (consp buffer)
+      (when (and backup-p (file-exists-p file) (file-readable-p file))
+	(with-temp-buffer
+	  (let ((buffer-file-coding-system w3m-form-textarea-file-coding-system)
+		(coding-system-for-read w3m-form-textarea-file-coding-system))
+	    (insert-file-contents file))
+	  (let ((before (buffer-string)))
+	    (when (unless (w3m-form-textarea-same-check value before)
+		    (save-window-excursion
+		      (set-window-buffer (selected-window) (current-buffer))
+		      (goto-char (abs (w3m-compare-strings
+				       before 0 (length before)
+				       value 0 (length value))))
+		      (condition-case nil
+			  (y-or-n-p
+			   "The saved text for this form exists. Use it? ")
+			(quit
+			 (kill-buffer buffer)
+			 (error "Abort textarea editing")))))
+	      (setq value before)))))
+      (with-current-buffer buffer
+	(insert value)
+	(set-buffer-modified-p nil)
+	(when readonly (setq buffer-read-only t))
+	(goto-char (point-min))
+	(forward-line (1- (nth 2 info)))
+	(w3m-form-input-textarea-mode-setup w3mbuffer)
+	(setq w3m-form-input-textarea-form form
+	      w3m-form-input-textarea-hseq hseq
+	      w3m-form-input-textarea-buffer w3mbuffer
+	      w3m-form-input-textarea-point point
+	      w3m-form-input-textarea-wincfg wincfg
+	      w3m-form-input-textarea-file file
+	      w3m-form-input-textarea-coding-system coding
+	      w3m-form-use-textarea-backup-p backup-p)))
+    (if (and (consp buffer)
+	     (get-buffer-window (cdr buffer)))
+	;; same frame only
+	(select-window (get-buffer-window (cdr buffer)))
+      ;; Use the whole current window for the textarea when a user added
+      ;; the buffer name "*w3m form textarea*" to `same-window-buffer-names'
+      ;; (that is available only in Emacs).
+      ;; cf. http://article.gmane.org/gmane.emacs.w3m/7797
+      (unless (w3m-same-window-p (buffer-name (if (consp buffer)
+						  (cdr buffer)
+						buffer)))
+	(condition-case nil
+	    (split-window cur-win (if (> size 0) size window-min-height))
+	  (error
+	   (delete-other-windows)
+	   (split-window cur-win (- (window-height cur-win)
+				    w3m-form-input-textarea-buffer-lines))))
+	(select-window (next-window)))
+      (let ((pop-up-windows nil))
+	(switch-to-buffer (if (consp buffer) (cdr buffer) buffer))))))
+
+(defun w3m-form-use-textarea-backup-p ()
+  (and w3m-form-use-textarea-backup
+       (let ((cbuf (current-buffer))
+	     (curl w3m-current-url))
+	 (catch 'loop
+	   (save-current-buffer
+	     (dolist (buf (w3m-list-buffers))
+	       (when (eq buf cbuf)
+		 (throw 'loop t))
+	       (set-buffer buf)
+	       (when (string= w3m-current-url curl)
+		 (throw 'loop nil)))
+	     t)))))
+
+(defun w3m-form-textarea-same-check (str1 str2)
+  "Compare STR1 and STR2 without tailed whitespace."
+  (when (string-match "[ \t\n\r]+$" str1)
+    (setq str1 (substring str1 0 (match-beginning 0))))
+  (when (string-match "[ \t\n\r]+$" str2)
+    (setq str2 (substring str2 0 (match-beginning 0))))
+  (string= str1 str2))
+
+(defun w3m-form-textarea-file-cleanup ()
+  "Remove all textarea files."
+  (remove-hook 'kill-emacs-hook 'w3m-form-textarea-file-cleanup)
+  (let ((dir (file-chase-links
+	      (expand-file-name w3m-form-textarea-directory)))
+	(checktime t)
+	files file time)
+    (when (and w3m-form-textarea-file-expire-date
+	       (file-directory-p dir))
+      (when (integerp w3m-form-textarea-file-expire-date)
+	(setq checktime (decode-time (current-time)))
+	(setq checktime (encode-time (nth 0 checktime) ;; seconds
+				     (nth 1 checktime) ;; minutes
+				     (nth 2 checktime) ;; hour
+				     (- (nth 3 checktime) ;; day
+					w3m-form-textarea-file-expire-date)
+				     (nth 4 checktime) ;; month
+				     (nth 5 checktime) ;; year
+				     (nth 6 checktime) ;; dow
+				     (nth 7 checktime) ;; dst
+				     (nth 8 checktime)))) ;; zone
+      (setq files (directory-files dir 'full "[^.]" 'nosort))
+      (while (setq file (car files))
+	(setq files (cdr files))
+	(when (file-writable-p file)
+	  (if (eq checktime t)
+	      (delete-file file)
+	    (setq time (nth 5 (file-attributes file)))
+	    (when (w3m-time-newer-p checktime time)
+	      (delete-file file))))))))
+
+(defun w3m-form-textarea-files-remove ()
+  "Remove used files of textarea."
+  (let (file)
+    (while (setq file (car w3m-form-textarea-post-files))
+      (setq w3m-form-textarea-post-files (cdr w3m-form-textarea-post-files))
+      (when (and (member file w3m-form-textarea-files)
+		 (file-exists-p file)
+		 (file-writable-p file))
+	(delete-file file)
+	(setq file (make-backup-file-name file))
+	(when (and (file-exists-p file)
+		   (file-writable-p file))
+	  (delete-file file))))))
+
+(defun w3m-form-set-number (w3mbuf newname)
+  "Change parent w3m buffer in form buffers"
+  (save-current-buffer
+    (let ((newbuff (get-buffer newname)))
+      (when newbuff
+	(dolist (buffer (buffer-list))
+	  (set-buffer buffer)
+	  (cond
+	   ((and w3m-form-input-textarea-mode
+		 (eq w3m-form-input-textarea-buffer w3mbuf))
+	    (setq w3m-form-input-textarea-buffer newbuff))
+	   ((and (eq major-mode 'w3m-form-input-select-mode)
+		 (eq w3m-form-input-select-buffer w3mbuf))
+	    (setq w3m-form-input-select-buffer newbuff))
+	   ((and (eq major-mode 'w3m-form-input-map-mode)
+		 (eq w3m-form-input-map-buffer w3mbuf))
+	    (setq w3m-form-input-map-buffer newbuff))))))))
+
+(defun w3m-form-kill-buffer (w3mbuf)
+  "Kill form buffers"
+  (save-current-buffer
+    (dolist (buffer (buffer-list))
+      (set-buffer buffer)
+      (cond
+       ((and w3m-form-input-textarea-mode
+	     (eq w3m-form-input-textarea-buffer w3mbuf))
+	(w3m-form-input-textarea-exit))
+       ((and (eq major-mode 'w3m-form-input-select-mode)
+	     (eq w3m-form-input-select-buffer w3mbuf))
+	(w3m-form-input-select-exit))
+       ((and (eq major-mode 'w3m-form-input-map-mode)
+	     (eq w3m-form-input-map-buffer w3mbuf))
+	(w3m-form-input-map-exit))))))
+
+;;; SELECT
+
+(defcustom w3m-form-input-select-buffer-lines 10
+  "*Buffer lines for form select buffer."
+  :group 'w3m
+  :type '(integer :size 0))
+
+(defcustom w3m-form-input-select-mode-hook nil
+  "*A hook called after w3m-form-input-select-mode."
+  :group 'w3m
+  :type 'hook)
+
+(defcustom w3m-form-input-select-set-hook nil
+  "*A Hook called before w3m-form-input-select-set."
+  :group 'w3m
+  :type 'hook)
+
+(defcustom w3m-form-mouse-face 'highlight
+  "*Mouse face to highlight selected value."
+  :group 'w3m
+  :type 'face)
+
+(defvar w3m-form-input-select-keymap nil)
+(unless w3m-form-input-select-keymap
+  (setq w3m-form-input-select-keymap (make-sparse-keymap))
+  (define-key w3m-form-input-select-keymap "\C-c\C-c"
+    'w3m-form-input-select-set)
+  (define-key w3m-form-input-select-keymap "\r"
+    'w3m-form-input-select-set)
+  (define-key w3m-form-input-select-keymap "\C-m"
+    'w3m-form-input-select-set)
+  (define-key w3m-form-input-select-keymap "\C-c\C-q"
+    'w3m-form-input-select-exit)
+  (define-key w3m-form-input-select-keymap "\C-c\C-k"
+    'w3m-form-input-select-exit)
+  (define-key w3m-form-input-select-keymap "q"
+    'w3m-form-input-select-exit)
+  (define-key w3m-form-input-select-keymap "\C-g"
+    'w3m-form-input-select-exit)
+  (define-key w3m-form-input-select-keymap "h" 'backward-char)
+  (define-key w3m-form-input-select-keymap "j" 'next-line)
+  (define-key w3m-form-input-select-keymap "k" 'previous-line)
+  (define-key w3m-form-input-select-keymap "l" 'forward-char)
+  (if (featurep 'xemacs)
+      (define-key w3m-form-input-select-keymap [(button2)]
+	'w3m-form-input-select-set-mouse)
+    (define-key w3m-form-input-select-keymap [mouse-2]
+      'w3m-form-input-select-set-mouse)))
+
+(defun w3m-form-input-select-set-mouse (event)
+  "Save and exit from w3m form select mode with mouse."
+  (interactive "e")
+  (mouse-set-point event)
+  (w3m-form-input-select-set))
+
+(defun w3m-form-input-select-set ()
+  "Save and exit from w3m form select mode."
+  (interactive)
+  (run-hooks 'w3m-form-input-select-set-hook)
+  (let* ((cur (get-text-property (point)
+				 'w3m-form-select-value))
+	 (buffer (current-buffer))
+	 (name w3m-form-input-select-name)
+	 (id w3m-form-input-select-id)
+	 (form w3m-form-input-select-form)
+	 (point w3m-form-input-select-point)
+	 (w3mbuffer w3m-form-input-select-buffer)
+	 (wincfg w3m-form-input-select-wincfg)
+	 input)
+    (setcar w3m-form-input-select-candidates cur)
+    (setq input w3m-form-input-select-candidates)
+    (or (one-window-p) (delete-window))
+    (kill-buffer buffer)
+    (when (buffer-live-p w3mbuffer)
+      (pop-to-buffer w3mbuffer)
+      (set-window-configuration wincfg)
+      (when (and form point)
+	(goto-char point)
+	(w3m-form-put form id name input)
+	(w3m-form-replace (cdr (assoc cur (cdr input))))))))
+
+(defun w3m-form-input-select-exit ()
+  "Exit from w3m form select mode."
+  (interactive)
+  (let* ((buffer (current-buffer))
+	 (point w3m-form-input-select-point)
+	 (w3mbuffer w3m-form-input-select-buffer)
+	 (wincfg w3m-form-input-select-wincfg))
+    (or (one-window-p) (delete-window))
+    (kill-buffer buffer)
+    (when (buffer-live-p w3mbuffer)
+      (pop-to-buffer w3mbuffer)
+      (set-window-configuration wincfg)
+      (when point (goto-char point)))))
+
+(defun w3m-form-input-select-mode ()
+  "\\<w3m-form-input-select-keymap>
+   Major mode for w3m form select.
+
+\\[w3m-form-input-select-set]\
+	Save and exit from w3m form select mode.
+\\[w3m-form-input-select-exit]\
+	Exit from w3m form select mode.
+\\[w3m-form-input-select-set-mouse]\
+	Save and exit from w3m form select mode with mouse.
+"
+  (setq mode-name "w3m form select"
+	major-mode 'w3m-form-input-select-mode)
+  (setq buffer-read-only t)
+  (use-local-map w3m-form-input-select-keymap)
+  (w3m-run-mode-hooks 'w3m-form-input-select-mode-hook))
+
+(defun w3m-form-input-select (form id name)
+  (let* ((value (w3m-form-get form id))
+	 (cur-win (selected-window))
+	 (wincfg (current-window-configuration))
+	 (urlid (format "%s:%s:%d" w3m-current-url name id))
+	 (w3mbuffer (current-buffer))
+	 (point (point))
+	 (size (min
+		(- (window-height cur-win)
+		   window-min-height 1)
+		(- (window-height cur-win)
+		   (max window-min-height
+			(1+ w3m-form-input-select-buffer-lines)))))
+	 buffer cur pos)
+    (setq buffer
+	  (catch 'detect-buffer
+	    (save-current-buffer
+	      (dolist (buffer (buffer-list))
+		(set-buffer buffer)
+		(when (and w3m-form-input-select-buffer
+			   (eq w3m-form-input-select-buffer w3mbuffer)
+			   (string= w3m-form-input-select-urlid urlid))
+		  (throw 'detect-buffer (cons t buffer)))))
+	    (generate-new-buffer "*w3m form select*")))
+    (unless (consp buffer)
+      (with-current-buffer buffer
+	(setq w3m-form-input-select-form form)
+	(setq w3m-form-input-select-name name)
+	(setq w3m-form-input-select-id id)
+	(setq w3m-form-input-select-buffer w3mbuffer)
+	(setq w3m-form-input-select-point point)
+	(setq w3m-form-input-select-candidates value)
+	(setq w3m-form-input-select-wincfg wincfg)
+	(setq w3m-form-input-select-urlid urlid)
+	(when value
+	  (setq cur (car value))
+	  (setq value (cdr value))
+	  (dolist (candidate value)
+	    (setq pos (point))
+	    (insert (if (zerop (length (cdr candidate)))
+			" "		; "" -> " "
+		      (cdr candidate)))
+	    (add-text-properties pos (point)
+				 (list 'w3m-form-select-value (car candidate)
+				       'mouse-face w3m-form-mouse-face))
+	    (insert "\n")))
+	(goto-char (point-min))
+	(while (and (not (eobp))
+		    (not (equal cur
+				(get-text-property (point)
+						   'w3m-form-select-value))))
+	  (goto-char (next-single-property-change (point)
+						  'w3m-form-select-value)))
+	(set-buffer-modified-p nil)
+	(beginning-of-line)
+	(w3m-form-input-select-mode)))
+    (if (and (consp buffer)
+	     (get-buffer-window (cdr buffer)))
+	;; same frame only
+	(select-window (get-buffer-window (cdr buffer)))
+      (condition-case nil
+	  (split-window cur-win (if (> size 0) size window-min-height))
+	(error
+	 (delete-other-windows)
+	 (split-window cur-win (- (window-height cur-win)
+				  w3m-form-input-select-buffer-lines))))
+      (select-window (next-window))
+      (let ((pop-up-windows nil))
+	(switch-to-buffer (if (consp buffer) (cdr buffer) buffer))))))
+
+;;; MAP
+
+(defcustom w3m-form-input-map-buffer-lines 10
+  "*Buffer lines for form select map buffer."
+  :group 'w3m
+  :type '(integer :size 0))
+
+(defcustom w3m-form-input-map-mode-hook nil
+  "*A hook called after w3m-form-input-map-mode."
+  :group 'w3m
+  :type 'hook)
+
+(defcustom w3m-form-input-map-set-hook nil
+  "*A Hook called before w3m-form-input-map-set."
+  :group 'w3m
+  :type 'hook)
+
+(defvar w3m-form-input-map-keymap nil)
+(unless w3m-form-input-map-keymap
+  (setq w3m-form-input-map-keymap (make-sparse-keymap))
+  (define-key w3m-form-input-map-keymap "\C-c\C-c"
+    'w3m-form-input-map-set)
+  (define-key w3m-form-input-map-keymap "\r"
+    'w3m-form-input-map-set)
+  (define-key w3m-form-input-map-keymap "\C-m"
+    'w3m-form-input-map-set)
+  (define-key w3m-form-input-map-keymap "\C-c\C-q"
+    'w3m-form-input-map-exit)
+  (define-key w3m-form-input-map-keymap "\C-c\C-k"
+    'w3m-form-input-map-exit)
+  (define-key w3m-form-input-map-keymap "q"
+    'w3m-form-input-map-exit)
+  (define-key w3m-form-input-map-keymap "\C-g"
+    'w3m-form-input-map-exit)
+  (define-key w3m-form-input-map-keymap "h" 'backward-char)
+  (define-key w3m-form-input-map-keymap "j" 'next-line)
+  (define-key w3m-form-input-map-keymap "k" 'previous-line)
+  (define-key w3m-form-input-map-keymap "l" 'forward-char)
+  (if (featurep 'xemacs)
+      (define-key w3m-form-input-map-keymap [(button2)]
+	'w3m-form-input-map-set-mouse)
+    (define-key w3m-form-input-map-keymap [mouse-2]
+      'w3m-form-input-map-set-mouse)))
+
+(defun w3m-form-input-map-set-mouse (event)
+  "Save and exit from w3m form select map mode with mouse."
+  (interactive "e")
+  (mouse-set-point event)
+  (w3m-form-input-map-set))
+
+(defun w3m-form-input-map-set ()
+  "Save and exit from w3m form select map mode."
+  (interactive)
+  (run-hooks 'w3m-form-input-map-set-hook)
+  (let* ((map (get-text-property (point) 'w3m-form-map-value))
+	 (buffer (current-buffer))
+	 (w3mbuffer w3m-form-input-map-buffer)
+	 (wincfg w3m-form-input-map-wincfg)
+	 (point w3m-form-input-map-point))
+    (or (one-window-p) (delete-window))
+    (kill-buffer buffer)
+    (when (buffer-live-p w3mbuffer)
+      (pop-to-buffer w3mbuffer)
+      (set-window-configuration wincfg)
+      (when point (goto-char point))
+      (w3m-goto-url (w3m-expand-url map)))))
+
+(defun w3m-form-input-map-exit ()
+  "Exit from w3m form select map mode."
+  (interactive)
+  (let* ((buffer (current-buffer))
+	 (w3mbuffer w3m-form-input-map-buffer)
+	 (wincfg w3m-form-input-map-wincfg)
+	 (point w3m-form-input-map-point))
+    (or (one-window-p) (delete-window))
+    (kill-buffer buffer)
+    (when (buffer-live-p w3mbuffer)
+      (pop-to-buffer w3mbuffer)
+      (set-window-configuration wincfg)
+      (when point (goto-char point)))))
+
+(defun w3m-form-input-map-mode ()
+  "\\<w3m-form-input-map-keymap>
+   Major mode for w3m map select.
+
+\\[w3m-form-input-map-set]\
+	Save and exit from w3m form select map mode.
+\\[w3m-form-input-map-exit]\
+	Exit from w3m form select map mode.
+\\[w3m-form-input-map-set-mouse]\
+	Save and exit from w3m form select map mode with mouse.
+"
+  (setq mode-name "w3m map select"
+	major-mode 'w3m-form-input-map-mode)
+  (setq buffer-read-only t)
+  (use-local-map w3m-form-input-map-keymap)
+  (w3m-run-mode-hooks 'w3m-form-input-map-mode-hook))
+
+(defun w3m-form-input-map (form name)
+  (let* ((value (w3m-form-get-by-name form name))
+	 (urlname (format "%s:%s" w3m-current-url name))
+	 (cur-win (selected-window))
+	 (wincfg (current-window-configuration))
+	 (w3mbuffer (current-buffer))
+	 (point (point))
+	 (size (min
+		(- (window-height cur-win)
+		   window-min-height 1)
+		(- (window-height cur-win)
+		   (max window-min-height
+			(1+ w3m-form-input-map-buffer-lines)))))
+	 buffer pos)
+    (setq buffer
+	  (catch 'detect-buffer
+	    (save-current-buffer
+	      (dolist (buffer (buffer-list))
+		(set-buffer buffer)
+		(when (and w3m-form-input-map-buffer
+			   (eq w3m-form-input-map-buffer w3mbuffer)
+			   (string= w3m-form-input-map-urlname urlname))
+		  (throw 'detect-buffer (cons t buffer)))))
+	    (generate-new-buffer "*w3m map select*")))
+    (unless (consp buffer)
+      (with-current-buffer buffer
+	(setq w3m-form-input-map-buffer w3mbuffer)
+	(setq w3m-form-input-map-wincfg wincfg)
+	(setq w3m-form-input-map-point point)
+	(setq w3m-form-input-map-urlname urlname)
+	(when value
+	  (dolist (candidate value)
+	    (setq pos (point))
+	    (insert (if (zerop (length (cdr candidate)))
+			(car candidate)
+		      (cdr candidate)))
+	    (add-text-properties pos (point)
+				 (list 'w3m-form-map-value (car candidate)
+				       'mouse-face w3m-form-mouse-face))
+	    (insert "\n")))
+	(goto-char (point-min))
+	(set-buffer-modified-p nil)
+	(beginning-of-line)
+	(w3m-form-input-map-mode)))
+    (if (and (consp buffer)
+	     (get-buffer-window (cdr buffer)))
+	;; same frame only
+	(select-window (get-buffer-window (cdr buffer)))
+      (condition-case nil
+	  (split-window cur-win (if (> size 0) size window-min-height))
+	(error
+	 (delete-other-windows)
+	 (split-window cur-win (- (window-height cur-win)
+				  w3m-form-input-map-buffer-lines))))
+      (select-window (next-window))
+      (let ((pop-up-windows nil))
+	(switch-to-buffer (if (consp buffer) (cdr buffer) buffer))))))
+
+;;;
+(defun w3m-form-submit-get-textarea-files (form)
+  (when w3m-form-use-textarea-backup-p
+    (let ((plist (w3m-form-plist form))
+	  pos id file files)
+      (while plist
+	(setq id (car plist))
+	(setq plist (cddr plist))
+	(setq pos (text-property-any (point-min) (point-max) 'w3m-form-id id))
+	(when (and pos
+		   (setq file (get-text-property pos 'w3m-form-file-name)))
+	  (setq files (cons file files))))
+      files)))
+
+(defun w3m-form-submit (form &optional id name value new-session download)
+  (if (w3m-anchor (point))
+      ;; cf SA17565
+      (w3m-goto-url (w3m-anchor (point)))
+    (when (and id name
+	       (> (length name) 0))
+      (w3m-form-put form id name value))
+    (let* ((orig-url w3m-current-url)
+	   (url (or (w3m-form-action form)
+		    (if (string-match "\\?" w3m-current-url)
+			(substring w3m-current-url 0 (match-beginning 0))
+		      w3m-current-url))))
+      (setq w3m-form-textarea-post-files
+	    (w3m-form-submit-get-textarea-files form))
+      (cond ((and (not (string= url orig-url))
+		  (string-match "^https://" orig-url)
+		  (string-match "^http://" url)
+		  (not (y-or-n-p (format "Send POST data to '%s'?" url))))
+	     (ding))
+	    ((or (eq 'post (w3m-form-method form))
+		 ;; While some sites, e.g., emacswiki.org, specify the
+		 ;; `get' method for the enctype `multipart/form-data',
+		 ;; we use the `post' method according to the proposal
+		 ;; of RFC2070.
+		 (eq 'multipart/form-data (w3m-form-enctype form)))
+	     (if download 
+		 (funcall 'w3m-download
+			  url nil nil nil
+			  (w3m-form-make-form-data form))
+	       (funcall (if new-session
+			    'w3m-goto-url-new-session
+			  'w3m-goto-url)
+			url 'reload nil
+			(w3m-form-make-form-data form)
+			w3m-current-url)))
+	    ((eq 'get (w3m-form-method form))
+	     (funcall (if download 
+			  'w3m-download
+			(if new-session
+			    'w3m-goto-url-new-session
+			  'w3m-goto-url))
+		      (concat (w3m-url-strip-query url) 
+			      "?" (w3m-form-make-form-data form))))
+	    (t
+	     (w3m-message "This form's method has not been supported: %s"
+			  (let (print-level print-length)
+			    (prin1-to-string (w3m-form-method form)))))))))
+
+(defun w3m-form-real-reset (form sexp)
+  (and (eq 'w3m-form-input (car sexp))
+       (eq form (nth 1 sexp))
+       (w3m-form-put form (nth 2 sexp) (nth 3 sexp) (nth 7 sexp))
+       (w3m-form-replace (nth 7 sexp))))
+
+(defun w3m-form-reset (form)
+  (save-excursion
+    (let (pos prop)
+      (when (setq prop (w3m-action (goto-char (point-min))))
+	(goto-char (or (w3m-form-real-reset form prop)
+		       (next-single-property-change pos 'w3m-action))))
+      (while (setq pos (next-single-property-change (point) 'w3m-action))
+	(goto-char pos)
+	(goto-char (or (w3m-form-real-reset form (w3m-action pos))
+		       (next-single-property-change pos 'w3m-action)))))))
+
+
+(provide 'w3m-form)
+
+;;; w3m-form.el ends here

=== added file 'share/emacs/site-lisp/w3m/w3m-hist.el'
--- share/emacs/site-lisp/w3m/w3m-hist.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-hist.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,740 @@
+;;; w3m-hist.el --- the history management system for emacs-w3m
+
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008, 2009, 2010
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Author: Katsumi Yamaoka <yamaoka@jpl.org>
+;; Keywords: w3m, WWW, hypermedia
+
+;; This file is a part of emacs-w3m.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; Emacs-w3m keeps history in the buffer-local variables `w3m-history'
+;; and `w3m-history-flat'.  Each variable contains a list of all the
+;; links you have visited.  The behavior tracing history backward or
+;; forward is controlled by the `w3m-history-reuse-history-elements'
+;; variable.  See the documentations for those variables for details.
+
+;;; Code:
+
+(eval-when-compile
+  (require 'cl))
+
+(defcustom w3m-history-reuse-history-elements nil
+  "Non-nil means reuse the history element when re-visiting the page.
+Otherwise, a new history element will be created even if there are
+elements for the same url in the history.
+
+Emacs-w3m used to operate as the case in which it is non-nil, however
+it sometimes brought about users' dissatisfaction.  For example, if a
+user visited the pages A -> B -> C -> B in order, performing BACK on
+the second B would let a user visit A.  The reason why a user was
+taken to A rather than C is that the `w3m-history' variable only had
+the list `(A B C)' as a history and B was the current position at that
+time.
+
+The default value for this variable is nil which allows the
+`w3m-history' variable to have the list `(A B C B)'.  Where contents
+of two B's are the identical Lisp objects.  So, too much wasting the
+Lisp resources will be avoided.
+
+See the documentation for the variables `w3m-history' and
+`w3m-history-flat' for more information."
+  :group 'w3m
+  :type '(boolean :format "%{%t%}: %[%v%]" :on "On" :off "Off"))
+
+(defcustom w3m-history-minimize-in-new-session nil
+  "Non-nil means minimize copied history so that there's only current page.
+This variable is effective when creating of the new session by copying
+\(i.e., `w3m-copy-buffer')."
+  :group 'w3m
+  :type '(boolean :format "%{%t%}: %[%v%]" :on "On" :off "Off"))
+
+(defvar w3m-history nil
+  "A tree-structured complex list of all the links which you have visited.
+This is a buffer-local variable.  For example, it will grow as follows:
+
+\[Branch-1.0.0.0]:                 +--> U1.0.0.0.0 --> U1.0.0.0.1
+                                  |
+    [Branch-1.0]:         +--> U1.0.0 --> U1.0.1 --> U1.0.2
+                          |
+         [Trunk]: U0 --> U1 --> U2 --> U3 --> U4 --> U5 --> U6
+                                 |
+    [Branch-2.0]:                +--> U2.0.0 --> U2.0.1
+                                 |
+    [Branch-2.1]:                +--> U2.1.0 --> U2.1.1 --> U2.1.2
+                                                    |
+\[Branch-2.1.1.0]:                                   +--> U2.1.1.0.0
+
+In this case, the U1.0.0.0.0 history element represents the first link
+of the first branch which is sprouted from the U1.0.0 history element.
+
+The trunk or each branch is a simple list which will contain some
+history elements.  History elements in the trunk or each branch will
+be arranged in increasing order (the newest history element will be
+the last element of the list).  Each history element represents a link
+which consists of the following records:
+
+	(URL PROPERTIES BRANCH BRANCH ...)
+
+Where URL is a string of an address of a link.  PROPERTIES is a plist
+which is able to contain any kind of data to supplement the URL as
+follows:
+
+	(KEYWORD VALUE KEYWORD VALUE ...)
+
+A note for programmers: PROPERTIES should always be a non-nil value in
+order to make it easy to share the value in every history element in
+every emacs-w3m buffer.
+
+The remaining BRANCHes are branches of the history element.  Branches
+will also be arranged in increasing order (the newest one will be the
+rightmost element).  Each BRANCH will also be a tree-structured
+complex list.  Therefore, the history structure will grow up
+infinitely.
+
+In order to save the Lisp resources, URL strings and PROPERTIES in the
+`w3m-history' variables are shared in every emacs-w3m buffer (it means
+each element in two `w3m-history' variables can be compared by `eq'
+rather than `equal').  If there is necessity to make buffer-local
+properties, in other words, to make properties of which values differ
+in every emacs-w3m buffer, use the `w3m-history-flat' variable instead.
+
+There are special rules on the emacs-w3m history management system.
+As you perhaps foresaw, the operation BACK on U2.0.0 brings you to U2,
+and one more BACK brings you to U1.  Well, where do you think we
+should go next when the operation FORWARD is performed on U1?  The
+rule is to go to the newest link you have ever visited.  So, that
+operation should take you to U1.0.0.
+
+Another rule is that the new U4 link should sprout from U1.0.1 if
+`w3m-history-reuse-history-elements' is nil when you visit the U4 link
+directly from U1.0.1.  In contrast, you should be taken to the
+existing U4 link instead of sprouting the new branch from U1.0.1 if
+`w3m-history-reuse-history-elements' is non-nil.
+
+In addition, the first element of `w3m-history' is special.  It is a
+list containing pointers which point to three history elements as
+shown below:
+
+	(PREV CURRENT NEXT)
+
+PREV points to the previous history element, CURRENT points to the
+current one and NEXT points to the next one.  Each of them is a list
+which contains an odd number of integers.  For example, `(0)' does
+point to U0 and `(2 1 0)' does point to U2.1.0.  Finally, the value of
+the `w3m-history' variable will be constructed as follows:
+
+\(((1) (2) (2 1 0))
+ (\"http://www.U0.org/\" (:title \"U0\" :foo \"bar\"))
+ (\"http://www.U1.org/\" (:title \"U1\" :foo \"bar\")
+  ((\"http://www.U100.org/\" (:title \"U100\" :foo \"bar\")
+    ((\"http://www.U10000.org/\" (:title \"U10000\" :foo \"bar\"))
+     (\"http://www.U10001.org/\" (:title \"U10001\" :foo \"bar\"))))
+   (\"http://www.U101.org/\" (:title \"U101\" :foo \"bar\"))
+   (\"http://www.U102.org/\" (:title \"U102\" :foo \"bar\"))))
+ (\"http://www.U2.org/\" (:title \"U2\" :foo \"bar\")
+  ((\"http://www.U200.org/\" (:title \"U200\" :foo \"bar\"))
+   (\"http://www.U201.org/\" (:title \"U201\" :foo \"bar\")))
+  ((\"http://www.U210.org/\" (:title \"U210\" :foo \"bar\"))
+   (\"http://www.U211.org/\" (:title \"U211\" :foo \"bar\")
+    ((\"http://www.U21100.org/\" (:title \"U21100\" :foo \"bar\"))))
+   (\"http://www.U212.org/\" (:title \"U212\" :foo \"bar\"))))
+ (\"http://www.U3.org/\" (:title \"U3\" :foo \"bar\"))
+ (\"http://www.U4.org/\" (:title \"U4\" :foo \"bar\"))
+ (\"http://www.U5.org/\" (:title \"U5\" :foo \"bar\"))
+ (\"http://www.U6.org/\" (:title \"U6\" :foo \"bar\")))")
+
+(defvar w3m-history-flat nil
+  "A flattened alist of all the links which you have visited.
+All history elements except for buffer-local properties are the same
+as ones of `w3m-history'.  Each element will contain the following
+records:
+
+    (URL PROPERTIES POSITION [KEYWORD VALUE [KEYWORD VALUE ...]])
+
+Where URL is a string of an address of a link, PROPERTIES is a plist
+which is able to contain any kind of data to supplement the URL.  Each
+PROPERTIES is the Lisp object identical with that corresponding
+element of `w3m-history'.  POSITION is a list of integers to designate
+the current position in the history.
+
+The remaining [KEYWORD VALUE [KEYWORD VALUE ...]] is a plist similar
+to PROPERTIES, but it is buffer-local.  You can manipulate
+buffer-local properties using the functions `w3m-history-plist-get',
+`w3m-history-plist-put', `w3m-history-add-properties' and
+`w3m-history-remove-properties'.  See the documentation for the
+`w3m-history' variable for more information.")
+
+(make-variable-buffer-local 'w3m-history)
+(make-variable-buffer-local 'w3m-history-flat)
+
+;; Inline functions.
+(defsubst w3m-history-assoc (url)
+  "Extract a history element associated with URL from `w3m-history-flat'."
+  (assoc url w3m-history-flat))
+
+;; Functions for internal use.
+(defun w3m-history-set-current (position)
+  "Modify `w3m-history' so that POSITION might be the current position.
+What is called the current position is the `cadar' of `w3m-history'.
+The previous position and the next position will be computed
+automatically."
+  (setcar w3m-history (w3m-history-regenerate-pointers position)))
+
+(defun w3m-history-element (position &optional flat)
+  "Return a history element located in the POSITION of the history.
+If FLAT is nil, the value will be extracted from `w3m-history' and
+represented with the `(URL PROPERTIES BRANCH BRANCH ...)' form.
+Otherwise, the value will be extracted from `w3m-history-flat' and
+represented with the `(URL PROPERTIES POSITION [KEYWORD VALUE ...])'
+form.  FYI, to know the current position, the `(cadar w3m-history)'
+form for example can be used."
+  (when position
+    (if flat
+	(let ((flat w3m-history-flat)
+	      element)
+	  (while flat
+	    (if (equal (caddr (setq element (pop flat))) position)
+		(setq flat nil)
+	      (setq element nil)))
+	  element)
+      (let ((element (nth (pop position) (cdr w3m-history))))
+	(while position
+	  (setq element (nth (pop position) (cddr element))
+		element (nth (pop position) element)))
+	element))))
+
+(defun w3m-history-previous-position (position)
+  "Return a history position of the previous location of POSITION.
+POSITION is a list of integers of the same form as being used in one
+of the elements of the `car' of `w3m-history' (which see)."
+  (let (class number previous)
+    (when position
+      (setq class (1- (length position))
+	    number (nth class position))
+      (if (zerop number)
+	  ;; This POSITION is the beginning of the branch.
+	  (unless (zerop class)
+	    ;; There's a parent.
+	    (setq previous (copy-sequence position))
+	    (setcdr (nthcdr (- class 2) previous) nil))
+	;; This POSITION is not the beginning of the branch.
+	(setq previous (copy-sequence position))
+	(setcar (nthcdr class previous) (1- number))))
+    previous))
+
+(defun w3m-history-next-position (position)
+  "Return a history position of the next location of POSITION.
+POSITION is a list of integers of the same form as being used in one
+of the elements of the `car' of `w3m-history' (which see)."
+  (let (next branch element number)
+    (when position
+      (setq next position
+	    branch (cdr w3m-history)
+	    element (nth (pop next) branch))
+      (while next
+	(setq branch (nth (pop next) (cddr element))
+	      element (nth (pop next) branch)))
+      (cond ((nth 2 element)
+	     ;; There're branches sprouted from the POSITION.
+	     (setq next (copy-sequence position))
+	     (setcdr (nthcdr (1- (length next)) next)
+		     (list (- (length element) 3) 0)))
+	    ((> (length branch)
+		(setq number (1+ (nth (1- (length position)) position))))
+	     ;; This POSITION is not the end of the branch.
+	     (setq next (copy-sequence position))
+	     (setcar (nthcdr (1- (length next)) next) number))))
+    next))
+
+(defun w3m-history-set-plist (plist property value)
+  "Similar to `plist-put' but PLIST is actually modified even in XEmacs.
+If VALUE is nil, the pair of PROPERTY and VALUE is removed from PLIST.
+Exceptionally, if PLIST is made empty because of removing, it will be
+instead set to `(nil nil)'.  Return PLIST itself."
+  (let ((pair (memq property plist)))
+    (if pair
+	(if value
+	    (setcar (cdr pair) value)
+	  (if (eq (car plist) property)
+	      (progn
+		(setcar plist (nth 2 plist))
+		(setcar (cdr plist) (nth 3 plist))
+		(setcdr (cdr plist) (nthcdr 4 plist)))
+	    (setcdr (nthcdr (- (length plist) (length pair) 1) plist)
+		    (nthcdr 2 pair))))
+      (when value
+	(setcdr (nthcdr (1- (length plist)) plist) (list property value)))))
+  plist)
+
+(defun w3m-history-modify-properties (old new &optional replace)
+  "Merge NEW plist into OLD plist and return a modified plist.
+If REPLACE is non-nil, OLD will be replaced with NEW.  OLD plist is
+modified and also the new value is shared in all the history
+elements containing OLD plist.  Properties whose values are nil are
+removed from OLD plist, but if OLD plist is made empty because of
+removing, it will be instead set to `(nil nil)'."
+  (prog1
+      old
+    (if replace
+	(progn
+	  (setcar old (car new))
+	  (setcdr old (or (cdr new) (list nil))))
+      (while new
+	(w3m-history-set-plist old (car new) (cadr new))
+	(setq new (cddr new))))
+    (setq new (copy-sequence old))
+    (while new
+      (w3m-history-set-plist old (car new) (cadr new))
+      (setq new (cddr new)))))
+
+(defun w3m-history-seek-element (url &optional newprops replace)
+  "Return a copy of history element corresponding to URL.
+Searching is performed in all emacs-w3m buffers and the first match
+found is returned.  If REPLACE is nil, NEPROPS will be merged into
+properties of an element.  Otherwise, properties of an element will be
+replaced with NEWPROPS."
+  (let* ((current (current-buffer))
+	 (buffers (cons current (delq current (buffer-list))))
+	 element)
+    (while buffers
+      (set-buffer (pop buffers))
+      (when (and (eq major-mode 'w3m-mode)
+		 (setq element (w3m-history-assoc url)))
+	(setq buffers nil)))
+    (set-buffer current)
+    (prog1
+	(copy-sequence element)
+      (when element
+	(w3m-history-modify-properties (cadr element) newprops replace)))))
+
+;; Generic functions.
+(defun w3m-history-previous-link-available-p ()
+  "Return non-nil if the previous history element is available."
+  (caar w3m-history))
+
+(defun w3m-history-next-link-available-p ()
+  "Return non-nil if the next history element is available."
+  (caddar w3m-history))
+
+(defun w3m-history-backward (&optional count)
+  "Move backward COUNT times in the history structure.
+Return a cons of a new history element and new position pointers of
+the history.  The position pointers of `w3m-history' will not change.
+If COUNT is omitted, it defaults to the number one.  If COUNT is
+negative, moving forward is performed.  Return nil if there is no
+previous element."
+  (when w3m-history
+    (let ((oposition (copy-sequence (car w3m-history)))
+	  position last)
+      (cond ((or (unless count
+		   (setq count 1))
+		 (> count 0))
+	     (while (and (> count 0)
+			 (setq position (caar w3m-history)))
+	       (w3m-history-set-current (setq last position))
+	       (decf count)))
+	    ((< count 0)
+	     (while (and (< count 0)
+			 (setq position (caddar w3m-history)))
+	       (w3m-history-set-current (setq last position))
+	       (incf count)))
+	    (t ;; Don't move.
+	     (setq last (cadar w3m-history))))
+      (prog1
+	  (when last
+	    (cons (w3m-history-element (cadar w3m-history))
+		  (car w3m-history)))
+	(setcar w3m-history oposition)))))
+
+(defun w3m-history-forward (&optional count)
+  "Move forward COUNT times in the history structure.
+Return a cons of a new history element and new position pointers of
+the history.  The position pointers of `w3m-history' will not change.
+If COUNT is omitted, it defaults to the number one.  If COUNT is
+negative, moving backward is performed.  If there is no room to move
+in the history, move as far as possible."
+  (w3m-history-backward (- (or count 1))))
+
+(defun w3m-history-regenerate-pointers (position)
+  "Regenerate the position pointers due to only the current POSITION.
+The history position pointers are made with the `(PREV CURRENT NEXT)'
+form which is mentioned in the documentation for `w3m-history'."
+  (list (w3m-history-previous-position position)
+	position
+	(w3m-history-next-position position)))
+
+(defun w3m-history-flat ()
+  "Set the value of `w3m-history-flat' due to the value of `w3m-history'.
+See also the documentations for those variables."
+  (setq w3m-history-flat nil)
+  (when w3m-history
+    (let ((history (cdr w3m-history))
+	  (position (list 0))
+	  element branches flag children)
+      (while (setq element (pop history))
+	(if (stringp (car element))
+	    (progn
+	      (push (list (car element) (cadr element) (reverse position))
+		    w3m-history-flat)
+	      (if (setq element (cddr element))
+		  (progn
+		    (setq history (append element history)
+			  position (append (list 0 0) position))
+		    (push (length element) branches))
+		(setcar position (1+ (car position)))
+		(setq flag t)
+		(while (and flag
+			    children
+			    (zerop (setcar children (1- (car children)))))
+		  (setq children (cdr children))
+		  (if (zerop (setcar branches (1- (car branches))))
+		      (progn
+			(setq branches (cdr branches)
+			      position (cddr position))
+			(setcar position (1+ (car position))))
+		    (setcar position 0)
+		    (setcar (cdr position) (1+ (cadr position)))
+		    (setq flag nil)))))
+	  (setq history (append element history))
+	  (push (length element) children))))
+    (setq w3m-history-flat (nreverse w3m-history-flat))))
+
+(defun w3m-history-tree (&optional newpos)
+  "Set the value of `w3m-history' due to the value of `w3m-history-flat'.
+See also the documentations for those variables.  NEWPOS specifies the
+current position of the history.  It defaults to the beginning
+position of the history."
+  (if w3m-history-flat
+      (let ((flat w3m-history-flat)
+	    element positions rest position)
+	(setq w3m-history (list (list nil nil)))
+	(while (setq element (pop flat))
+	  (setq positions (caddr element)
+		rest w3m-history)
+	  (while positions
+	    (setq position (pop positions))
+	    (unless (> (length rest) position)
+	      (setcdr (nthcdr (1- (length rest)) rest)
+		      (make-list (- position (length rest) -1)
+				 (list nil nil))))
+	    (setq rest (nth position rest))
+	    (when positions
+	      (setq position (pop positions))
+	      (unless (> (- (length rest) 2) position)
+		(setcdr (nthcdr (1- (length rest)) rest)
+			(make-list (- position (length rest) -3)
+				   (list (list nil nil)))))
+	      (setq rest (nth (+ position 2) rest))))
+	  (setcar rest (car element))
+	  (setcar (cdr rest) (cadr element)))
+	(push 'dummy w3m-history)
+	(w3m-history-set-current (or newpos (list 0)))
+	w3m-history)
+    (setq w3m-history nil)))
+
+(defun w3m-history-push (url &optional newprops replace)
+  "Push URL into the history structure.
+A history which corresponds to URL becomes the current one.  NEWPROPS
+is a plist which supplements URL.  Return a new history position
+pointers.  How this function behaves to the history structure (i.e.,
+`w3m-history' and `w3m-history-flat') is controlled by the value of
+`w3m-history-reuse-history-elements'.
+
+The case where `w3m-history-reuse-history-elements' is nil:
+  A new history element is always created.  If there is another
+  element corresponding to the same URL, its properties are inherited
+  into the new history element.
+
+The case where `w3m-history-reuse-history-elements' is non-nil:
+  If there is an element corresponding to URL in the history, it
+  becomes the current history element.  Otherwise, this function
+  behaves like the case where `w3m-history-reuse-history-elements' is
+  nil.
+
+If REPLACE is nil, NEWPROPS is merged into properties of the current
+history element.  Otherwise, properties of the current history element
+are replaced with NEWPROPS."
+  (let ((element (w3m-history-seek-element url newprops replace))
+	position class number branch)
+    (if element
+	(setcdr (cdr element) nil)
+      (setq element (list url (w3m-history-modify-properties newprops nil))))
+    (cond
+     ((null w3m-history)
+      ;; The dawn of the history.
+      (setq position (list nil (list 0) nil)
+	    w3m-history (list position element)
+	    w3m-history-flat (list (append element (list (list 0)))))
+      position)
+
+     ((and w3m-history-reuse-history-elements
+	   (setq position (caddr (w3m-history-assoc url))))
+      ;; Reuse the existing history element assigned to the current one.
+      ;; The position pointers will be fixed with correct values after
+      ;; visiting a page when moving back, moving forward or jumping from
+      ;; the about://history/ page.
+      (w3m-history-set-current position))
+
+     (t
+      ;; Sprout a new history element.
+      (setq position (copy-sequence (cadar w3m-history))
+	    class (1- (length position))
+	    number 0
+	    branch (nthcdr (car position) (cdr w3m-history)))
+      (while (> class number)
+	(setq number (1+ number)
+	      branch (nth (nth number position) (cddar branch))
+	      number (1+ number)
+	      branch (nthcdr (nth number position) branch)))
+      (if (cdr branch)
+	  ;; We should sprout a new branch.
+	  (progn
+	    (setq number (1- (length (car branch))))
+	    (setcdr (nthcdr class position) (list (1- number) 0))
+	    (setcdr (nthcdr number (car branch)) (list (list element))))
+	;; The current position is the last of the branch.
+	(setcar (nthcdr class position)
+		(1+ (car (nthcdr class position))))
+	(setcdr branch (list element)))
+      (setq w3m-history-flat (nconc w3m-history-flat
+				    (list (append element (list position)))))
+      (setcar w3m-history (list (cadar w3m-history) position nil))))))
+
+(defun w3m-history-copy (buffer)
+  "Copy the history structure from BUFFER to the current buffer.
+This function keeps corresponding elements identical Lisp objects
+between buffers while copying the frameworks of `w3m-history' and
+`w3m-history-flat'.  Exceptionally, buffer-local properties contained
+in `w3m-history-flat' will not be copied except for the positions.  If
+`w3m-history-minimize-in-new-session' is non-nil, the copied history
+structure will be shrunk so that it may contain only the current
+history element."
+  (let ((current (current-buffer))
+	position flat element props window-start rest)
+    (set-buffer buffer)
+    (when w3m-history
+      (setq position (copy-sequence (cadar w3m-history))
+	    flat w3m-history-flat))
+    (set-buffer current)
+    (when position
+      (if w3m-history-minimize-in-new-session
+	  (progn
+	    (setq w3m-history-flat flat
+		  element (copy-sequence (w3m-history-element position t)))
+	    (setcdr (cdr element) nil)
+	    (setq w3m-history (list (list nil (list 0) nil) element)
+		  w3m-history-flat (list (append element (list (list 0))))))
+	;; Remove buffer-local properties, except for the positions,
+	;; from the new `w3m-history-flat'.
+	(while flat
+	  (setq element (copy-sequence (car flat))
+		flat (cdr flat)
+		props (cdddr element)
+		window-start (plist-get props :window-start))
+	  (if window-start
+	      (setcdr (cddr element)
+		      (list :window-start window-start
+			    :position (plist-get props :position)
+			    :window-hscroll (plist-get props :window-hscroll)))
+	    (setcdr (cddr element) nil))
+	  (push element rest))
+	(setq w3m-history-flat (nreverse rest))
+	(w3m-history-tree position)))))
+
+(defun w3m-history-plist-get (keyword &optional not-buffer-local)
+  "Extract a value from the properties of the current history element.
+KEYWORD is usually a symbol.  This function returns the value
+corresponding to KEYWORD, but it returns nil if the properties don't
+contain KEYWORD.  If NOT-BUFFER-LOCAL is nil, this function searches a
+value in buffer-local properties, otherwise looks over the global
+properties instead."
+  (let ((element (w3m-history-element (cadar w3m-history) t)))
+    (plist-get (if not-buffer-local
+		   (cadr element)
+		 (cdddr element))
+	       keyword)))
+
+(defun w3m-history-add-properties (newprops &optional not-buffer-local)
+  "Add NEWPROPS to the properties of the current history element.
+NEWPROPS should be a plist, which is merged into the properties.
+Return new properties.  If NOT-BUFFER-LOCAL is nil, NEWPROPS will be
+added to the buffer-local properties.  Otherwise, NEWPROPS will be
+added to the global properties instead."
+  (if not-buffer-local
+      (cadr (w3m-history-seek-element
+	     (car (w3m-history-element (cadar w3m-history)))
+	     newprops))
+    (let ((element (w3m-history-element (cadar w3m-history) t))
+	  properties)
+      (if element
+	  (progn
+	    (setq properties (cdddr element)
+		  properties
+		  (if properties
+		      (w3m-history-modify-properties properties newprops)
+		    ;; Use `w3m-history-modify-properties' to remove
+		    ;; keyword-value pairs whose value is nil.
+		    (w3m-history-modify-properties newprops nil)))
+	    (unless (car properties) ;; check whether it is `(nil nil)'.
+	      (setq properties nil))
+	    (setcdr (cddr element) properties))
+	(message "\
+Warning: the history database in this session seems corrupted.")
+	(sit-for 1)
+	nil))))
+
+(defun w3m-history-plist-put (keyword value &optional not-buffer-local)
+  "Put KEYWORD and VALUE into the current history element.
+Return new properties.  If NOT-BUFFER-LOCAL is nil, KEYWORD and VALUE
+will be put into the buffer-local properties.  Otherwise, KEYWORD and
+VALUE will be put into the global properties instead."
+  (w3m-history-add-properties (list keyword value) not-buffer-local))
+
+(defun w3m-history-remove-properties (properties &optional not-buffer-local)
+  "Remove PROPERTIES from the current history element.
+PROPERTIES should be one or more keyword-value pairs (i.e., plist) but
+values are ignored (treated as nil).  Return new properties.  If
+NOT-BUFFER-LOCAL is nil, the buffer-local properties will be modified.
+Otherwise, the global properties will be modified instead."
+  (let (rest)
+    (while properties
+      (setq rest (cons nil (cons (car properties) rest))
+	    properties (cddr properties)))
+    (w3m-history-add-properties (nreverse rest) not-buffer-local)))
+
+(defun w3m-history-store-position ()
+  "Store the current cursor position into the current history element.
+Data consist of the position where the window starts and the cursor
+position.  Naturally, those should be treated as buffer-local."
+  (interactive)
+  (when (cadar w3m-history)
+    (w3m-history-add-properties
+     (list :window-start (window-start)
+	   :position (cons (count-lines (point-min) (point-at-bol))
+			   (current-column))
+	   :window-hscroll (window-hscroll)))
+    (when (interactive-p)
+      (message "The current cursor position saved"))))
+
+(defun w3m-history-restore-position ()
+  "Restore the saved cursor position in the page.
+Even if the page has been shrunk (by reloading, for example), somehow
+it works although it may not be perfect."
+  (interactive)
+  (when (cadar w3m-history)
+    (let ((start (w3m-history-plist-get :window-start))
+	  position window)
+      (cond ((and start
+		  (setq position (w3m-history-plist-get :position)))
+	     (when (<= start (point-max))
+	       (setq window (get-buffer-window (current-buffer) 'all-frames))
+	       (when window
+		 (set-window-start window start)
+		 (set-window-hscroll
+		  window (or (w3m-history-plist-get :window-hscroll) 0)))
+	       (goto-char (point-min))
+	       (forward-line (car position))
+	       (move-to-column (cdr position))
+	       (let ((deactivate-mark nil))
+		 (run-hooks 'w3m-after-cursor-move-hook))))
+	    ((interactive-p)
+	     (message "No cursor position saved"))))))
+
+(defun w3m-history-minimize ()
+  "Minimize the history so that there may be the current page only."
+  (interactive)
+  (let ((position (cadar w3m-history))
+	element)
+    (when position
+      (setq element (w3m-history-element position t))
+      (setcar (cddr element) (list 0))
+      (setq w3m-history-flat (list element)
+	    w3m-history (list (list nil (list 0) nil)
+			      (list (car element) (cadr element)))))))
+
+(defun w3m-history-slimmed-history-flat ()
+  "Return slimmed history."
+  (let ((position (cadar w3m-history))
+	flat-map new-flat)
+    (dolist (l w3m-history-flat)
+      (setq flat-map (cons (cons (nth 2 l) l)
+			   flat-map)))
+    (setq new-flat (cons (cdr (assoc position flat-map)) nil))
+    (let ((pos (w3m-history-previous-position position)))
+      (while pos
+	(setq new-flat (cons (cdr (assoc pos flat-map))
+			     new-flat))
+	(setq pos (w3m-history-previous-position pos))))
+    (let ((pos (w3m-history-next-position position)))
+      (while pos
+	(setq new-flat (cons (cdr (assoc pos flat-map))
+			     new-flat))
+	(setq pos (w3m-history-next-position pos))))
+    new-flat))
+
+(defun w3m-history-slim ()
+  "Slim the history.
+This makes the history slim so that it may have only the pages that
+are accessible by PREV and NEXT operations."
+  (interactive)
+  (let ((position (cadar w3m-history)))
+    (setq w3m-history-flat (w3m-history-slimmed-history-flat))
+    (w3m-history-tree position)))
+
+(eval-when-compile
+  (defvar w3m-arrived-db)
+  (autoload 'w3m-goto-url "w3m"))
+
+(defun w3m-history-add-arrived-db ()
+  "Add the arrived database to the history structure unreasonably.
+This function is useless normally, so you may not want to use it.
+\(The reason it is here is because it is useful once in a while when
+debugging w3m-hist.el.)"
+  (interactive)
+  (unless (eq 'w3m-mode major-mode)
+    (error "`%s' must be invoked from an emacs-w3m buffer" this-command))
+  (when (and w3m-arrived-db
+	     (prog1
+		 (yes-or-no-p
+		  "Are you sure you really want to destroy the history? ")
+	       (message "")))
+    (setq w3m-history nil
+	  w3m-history-flat nil)
+    (let ((w3m-history-reuse-history-elements t)
+	  url-title title)
+      (mapatoms (lambda (symbol)
+		  (when symbol
+		    (if (setq title (get symbol 'title))
+			(push (list (symbol-name symbol)
+				    (list :title title))
+			      url-title)
+		      (push (list (symbol-name symbol)) url-title))))
+		w3m-arrived-db)
+      (apply 'w3m-history-push (nth (random (length url-title)) url-title))
+      (while url-title
+	(w3m-history-push (car (nth (random (length w3m-history-flat))
+				    w3m-history-flat)))
+	(apply 'w3m-history-push (pop url-title))))
+    (w3m-goto-url "about://history/" t)))
+
+(provide 'w3m-hist)
+
+;;; w3m-hist.el ends here

=== added file 'share/emacs/site-lisp/w3m/w3m-image.el'
--- share/emacs/site-lisp/w3m/w3m-image.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-image.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,266 @@
+;;; w3m-image.el --- Image conversion routines.
+
+;; Copyright (C) 2001, 2002, 2003, 2005, 2007, 2008
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Authors: Yuuichi Teranishi  <teranisi@gohome.org>
+;; Keywords: w3m, WWW, hypermedia
+
+;; This file is a part of emacs-w3m.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+
+;;; Commentary:
+
+;; This file contains the stuffs to convert images for emacs-w3m.
+;; For more detail about emacs-w3m, see:
+;;
+;;    http://emacs-w3m.namazu.org/
+;;
+;; Routines in this file require ImageMagick's convert.
+;; For more detail about ImageMagick, see:
+;;
+;;    http://www.imagemagick.org/
+
+;;; Code:
+
+(eval-when-compile
+  (require 'cl))
+
+(require 'w3m-util)
+(require 'w3m-proc)
+
+(eval-when-compile
+  (if (not (fboundp 'defcustom))
+      (require 'pcustom)))
+
+;; Functions and variables which should be defined in the other module
+;; at run-time.
+(eval-when-compile
+  (defvar w3m-async-exec)
+  (defvar w3m-current-url)
+  (defvar w3m-profile-directory)
+  (defvar w3m-work-buffer-name)
+  (defvar w3m-work-buffer-list))
+
+(defcustom w3m-imagick-convert-program (if noninteractive
+					   nil
+					 (w3m-which-command "convert"))
+  "*Program name of ImageMagick's `convert'."
+  :group 'w3m
+  :set (lambda (symbol value)
+	 (custom-set-default symbol (if (and (not noninteractive)
+					     value)
+					(if (file-name-absolute-p value)
+					    (if (file-executable-p value)
+						value)
+					  (w3m-which-command value)))))
+  :type 'file)
+
+(defcustom w3m-imagick-identify-program (if noninteractive
+					    nil
+					  (w3m-which-command "identify"))
+  "*Program name of ImageMagick's `identify'."
+  :group 'w3m
+  :set (lambda (symbol value)
+	 (custom-set-default symbol (if (and (not noninteractive)
+					     value)
+					(if (file-name-absolute-p value)
+					    (if (file-executable-p value)
+						value)
+					  (w3m-which-command value)))))
+  :type 'file)
+
+;;; Image handling functions.
+(defcustom w3m-resize-images (and w3m-imagick-convert-program t)
+  "*If non-nil, resize images to the specified width and height."
+  :group 'w3m
+  :set (lambda (symbol value)
+	 (custom-set-default symbol (and w3m-imagick-convert-program value)))
+  :type 'boolean)
+
+(put 'w3m-imagick-convert-program 'available-p 'unknown)
+
+(defun w3m-imagick-convert-program-available-p ()
+  "Return non-nil if ImageMagick's `convert' program is available.
+If not, `w3m-imagick-convert-program' and `w3m-resize-images' are made
+nil forcibly."
+  (cond ((eq (get 'w3m-imagick-convert-program 'available-p) 'yes)
+	 t)
+	((eq (get 'w3m-imagick-convert-program 'available-p) 'no)
+	 nil)
+	((and (stringp w3m-imagick-convert-program)
+	      (file-executable-p w3m-imagick-convert-program))
+	 (put 'w3m-imagick-convert-program 'available-p 'yes)
+	 ;; Check whether convert supports png32.
+	 (put 'w3m-imagick-convert-program 'png32
+	      (unless (or (featurep 'xemacs)
+			  (< emacs-major-version 22))
+		(with-temp-buffer
+		  (set-buffer-multibyte nil)
+		  (insert "P1 1 1 1")
+		  (condition-case nil
+		      (call-process-region (point-min) (point-max)
+					   w3m-imagick-convert-program
+					   t t nil "pbm:-" "png32:-")
+		    (error))
+		  (goto-char (point-min))
+		  (looking-at "\211PNG\r\n"))))
+	 t)
+	(t
+	 (when w3m-imagick-convert-program
+	   (message "ImageMagick's `convert' program is not available")
+	   (sit-for 1))
+	 (setq w3m-imagick-convert-program nil
+	       w3m-resize-images nil)
+	 (put 'w3m-imagick-convert-program 'available-p 'no)
+	 nil)))
+
+;;; Synchronous image conversion.
+(defun w3m-imagick-convert-buffer (from-type to-type &rest args)
+  (when (w3m-imagick-convert-program-available-p)
+    (let* ((in-file (make-temp-name
+		     (expand-file-name "w3mel" w3m-profile-directory)))
+	   (buffer-file-coding-system 'binary)
+	   (coding-system-for-read 'binary)
+	   (coding-system-for-write 'binary)
+	   (default-process-coding-system (cons 'binary 'binary))
+	   return)
+      (write-region (point-min) (point-max) in-file nil 'nomsg)
+      (erase-buffer)
+      (setq return
+	    (apply 'call-process
+		   w3m-imagick-convert-program
+		   nil t nil
+		   (append args (list
+				 (concat
+				  (if from-type
+				      (concat from-type ":"))
+				  in-file)
+				 (if to-type
+				     (if (and (string-equal to-type "png")
+					      (get 'w3m-imagick-convert-program
+						   'png32))
+					 "png32:-"
+				       (concat to-type ":-"))
+				   "-")))))
+      (when (file-exists-p in-file) (delete-file in-file))
+      (if (and (numberp return)
+	       (zerop return))
+	  t
+	(message "Image conversion failed (code `%s')"
+		 (if (stringp return)
+		     (string-as-multibyte return)
+		   return))
+	nil))))
+
+(defun w3m-imagick-convert-data (data from-type to-type &rest args)
+  (with-temp-buffer
+    (set-buffer-multibyte nil)
+    (insert data)
+    (and (apply 'w3m-imagick-convert-buffer from-type to-type args)
+	 (not (zerop (buffer-size)))
+	 (buffer-string))))
+
+;;; Asynchronous image conversion.
+(defun w3m-imagick-start-convert-data (handler
+				       data from-type to-type &rest args)
+  (w3m-process-do-with-temp-buffer
+      (success (when (w3m-imagick-convert-program-available-p)
+		 (set-buffer-multibyte nil)
+		 (insert data)
+		 (apply 'w3m-imagick-start-convert-buffer
+			handler from-type to-type args)))
+    (if (and success
+	     (not (zerop (buffer-size))))
+	(buffer-string))))
+
+(defun w3m-imagick-start-convert-buffer (handler from-type to-type &rest args)
+  (lexical-let ((in-file (make-temp-name
+			  (expand-file-name "w3mel" w3m-profile-directory)))
+		(out-buffer (current-buffer)))
+    (setq w3m-current-url "non-existent")
+    (let ((coding-system-for-write 'binary)
+	  (buffer-file-coding-system 'binary)
+	  jka-compr-compression-info-list
+	  format-alist)
+      (write-region (point-min) (point-max) in-file nil 'nomsg))
+    (w3m-process-do
+	(success (with-current-buffer out-buffer
+		   (erase-buffer)
+		   (w3m-process-start
+		    handler
+		    w3m-imagick-convert-program
+		    (append args
+			    (list
+			     (concat
+			      (if from-type
+				  (concat from-type ":"))
+			      in-file)
+			     (if to-type
+				 (if (and (string-equal to-type "png")
+					  (get 'w3m-imagick-convert-program
+					       'png32))
+				     "png32:-"
+				   (concat to-type ":-"))
+			       "-"))))))
+      (when (file-exists-p in-file)
+	(delete-file in-file))
+      success)))
+
+(defun w3m-resize-image (data width height handler)
+  "Resize image DATA to WIDTH and HEIGHT asynchronously.
+HANDLER is called after conversion with resized data as an argument."
+  (w3m-process-do
+      (result (w3m-imagick-start-convert-data
+	       handler
+	       data nil nil "-geometry"
+	       (concat (number-to-string width)
+		       "x"
+		       (number-to-string height)
+		       "!")))
+    result))
+
+(defun w3m-resize-image-by-rate (data rate handler)
+  "Resize image DATA at RATE asynchronously.
+HANDLER is called after conversion with resized data as an argument.
+Note that this function requires that the `convert' program allows the
+`-resize' option."
+  (w3m-process-do
+      (result (w3m-imagick-start-convert-data
+	       handler
+	       data nil nil "-resize"
+	       (concat (number-to-string rate) "%")))
+    result))
+
+(defun w3m-favicon-usable-p ()
+  "Check whether ImageMagick's `convert' supports a Windoze ico format in
+a large number of bits per pixel."
+  (let ((xpm (condition-case nil
+		 (w3m-imagick-convert-data
+		  (string 0 0 1 0 1 0 2 1 0 0 1 0 24 0 52 0
+			  0 0 22 0 0 0 40 0 0 0 2 0 0 0 2 0
+			  0 0 1 0 24 0 0 0 0 0 0 0 0 0 0 0
+			  0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+			  0 255 255 255 0 0 0 0 0 0)
+		  "ico" "xpm")
+	       (error nil))))
+    (and xpm (string-match "\"2 1 2 1\"" xpm) t)))
+
+(provide 'w3m-image)
+
+;;; w3m-image.el ends here

=== added file 'share/emacs/site-lisp/w3m/w3m-lnum.el'
--- share/emacs/site-lisp/w3m/w3m-lnum.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-lnum.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,564 @@
+;;; w3m-lnum.el --- Operations using link numbers
+
+;; Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Modified by Andrey Kotlarski <m00naticus@gmail.com>
+;; Keywords: w3m, WWW, hypermedia
+
+;; This file is a part of emacs-w3m.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; This file provides a minor mode to enable Conkeror style operations
+;; using link numbers.  Mostly point operations are extended beyond
+;; current point but there are also new features like
+;; `w3m-go-to-linknum' for quickly navigating to links, form fields
+;; or buttons and `w3m-linknum-follow' for visiting links, activating
+;; form fields or pushing buttons.
+
+;;; Usage:
+
+;; Install this file to an appropriate directory, and add this
+;; expression to your ~/.emacs-w3m if you want automatically
+;; activating this minor mode
+;; (w3m-link-numbering-mode 1)
+;; or alternatively this to your .emacs file before loading w3m
+;; (add-hook 'w3m-mode-hook 'w3m-link-numbering-mode)
+;; or just use interactive command `w3m-link-numbering-mode' to toggle
+;; mode.
+
+;;; Code:
+
+(eval-when-compile
+  (require 'cl))
+
+(require 'w3m)
+
+(defface w3m-link-numbering
+  '((((class color) (background light)) (:foreground "gray60"))
+    (((class color) (background dark)) (:foreground "gray50")))
+  "Face used to highlight link numbers."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-link-numbering-face 'face-alias 'w3m-link-numbering)
+
+(defface w3m-linknum-minibuffer-prompt
+  '((((class color) (background light) (type tty)) (:foreground "blue"))
+    (((class color) (background dark)) (:foreground "cyan"))
+    (t (:foreground "medium blue")))
+  "Face for w3m linknum minibuffer prompt."
+  :group 'w3m-face)
+
+(defface w3m-linknum-match
+  '((((class color) (background light) (type tty))
+     (:background "yellow" :foreground "black"))
+    (((class color) (background dark) (type tty))
+     (:background "blue" :foreground "white"))
+    (((class color) (background light)) (:background "yellow1"))
+    (((class color) (background dark)) (:background "RoyalBlue3"))
+    (t (:background "gray")))
+  "Face used to highlight matches in `w3m-link-numbering-mode'."
+  :group 'w3m-face)
+
+(defcustom w3m-link-numbering-mode-hook nil
+  "*Hook run after `w3m-link-numbering-mode' initialization."
+  :group 'w3m
+  :type 'hook)
+
+(defmacro w3m-substitute-key-definitions (new-map old-map &rest keys)
+  "In NEW-MAP substitute cascade of OLD-MAP KEYS.
+KEYS is alternating list of key-value."
+  (let ((n-map new-map)
+	(o-map old-map))
+    `(progn
+       ,@(let ((res nil))
+	   (while keys
+	     (push `(substitute-key-definition
+		     ,(car keys) ,(cadr keys) ,n-map ,o-map)
+		   res)
+	     (setq keys (cddr keys)))
+	   (nreverse res)))))
+
+(defvar w3m-link-numbering-mode-map nil
+  "Keymap used when `w3m-link-numbering-mode' is active.")
+(unless w3m-link-numbering-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "f" 'w3m-linknum-follow)
+    (define-key map "F" 'w3m-go-to-linknum)
+    (w3m-substitute-key-definitions
+     map w3m-mode-map
+     'w3m-view-image 'w3m-linknum-view-image
+     'w3m-save-image 'w3m-linknum-save-image
+     'w3m-download-this-url 'w3m-linknum-download-this-url
+     'w3m-edit-this-url 'w3m-linknum-edit-this-url
+     'w3m-toggle-inline-image 'w3m-linknum-toggle-inline-image
+     'w3m-print-this-url 'w3m-linknum-print-this-url
+     'w3m-external-view-this-url 'w3m-linknum-external-view-this-url
+     'w3m-bookmark-add-this-url 'w3m-linknum-bookmark-add-this-url
+     'w3m-zoom-in-image 'w3m-linknum-zoom-in-image
+     'w3m-zoom-out-image 'w3m-linknum-zoom-out-image)
+    (setq w3m-link-numbering-mode-map map)))
+
+(defvar w3m-link-numbering-mode nil
+  "Non-nil if w3m operations using link numbers are enabled.")
+(make-variable-buffer-local 'w3m-link-numbering-mode)
+(unless (assq 'w3m-link-numbering-mode minor-mode-alist)
+  (push (list 'w3m-link-numbering-mode "[ln]") minor-mode-alist))
+(unless (assq 'w3m-link-numbering-mode minor-mode-map-alist)
+  (push (cons 'w3m-link-numbering-mode w3m-link-numbering-mode-map)
+	minor-mode-map-alist))
+
+(defun w3m-linknum-remove-overlays ()
+  "Remove numbering and match overlays."
+  (dolist (overlay (overlays-in (point-min) (point-max)))
+    (if (or (overlay-get overlay 'w3m-link-numbering-overlay)
+	    (overlay-get overlay 'w3m-linknum-match))
+	(delete-overlay overlay))))
+
+;;;###autoload
+(defun w3m-link-numbering-mode (&optional arg)
+  "Minor mode to extend point commands by using Conkeror style number selection.
+With prefix ARG 0 disable battery included point functions, otherwise
+enable them.  With no prefix ARG - toggle."
+  (interactive "P")
+  (let ((w3m-linknum-status w3m-link-numbering-mode))
+    ;; find current numbering status of w3m buffers
+    (or (eq major-mode 'w3m-mode)
+	(save-current-buffer
+	  (setq w3m-linknum-status
+		(catch 'found-w3m
+		  (dolist (buf (buffer-list))
+		    (set-buffer buf)
+		    (if (eq major-mode 'w3m-mode)
+			(throw 'found-w3m
+			       w3m-link-numbering-mode)))))))
+    (setq arg (not (if arg (zerop arg)
+		     w3m-linknum-status)))
+    (unless (eq arg w3m-linknum-status)	; if change of mode status
+      (if arg
+	  (progn (add-hook 'w3m-mode-hook 'w3m-link-numbering-mode)
+		 (run-hooks 'w3m-link-numbering-mode-hook)
+		 (w3m-message "Link numbering keys on"))
+	(remove-hook 'w3m-mode-hook 'w3m-link-numbering-mode)
+	(w3m-message "Link numbering keys off"))
+      ;; change numbering status of all w3m buffers
+      (save-current-buffer
+	(dolist (buf (buffer-list))
+	  (set-buffer buf)
+	  (if (eq major-mode 'w3m-mode)
+	      (setq w3m-link-numbering-mode arg)))))))
+
+(defun w3m-link-numbering (arg)
+  "Make overlays that display link numbers.
+With ARG 0 clear numbering overlay.  With ARG 2 index only images.
+With ARG 4 index form fields and buttons along links."
+  (if (zerop arg)
+      (w3m-linknum-remove-overlays)
+    (save-excursion
+      (goto-char (point-min))
+      (let ((i 0)
+	    (next-func 'w3m-goto-next-anchor)
+	    pos overlay num)
+	(if (= arg 2)
+	    (setq next-func (lambda () (if (w3m-goto-next-image)
+				      (point)))))
+	(catch 'already-numbered
+	  (while (setq pos (funcall next-func))
+	    (when (or (> arg 1)
+		      (get-char-property pos 'w3m-href-anchor))
+	      (if (get-char-property pos
+				     'w3m-link-numbering-overlay)
+		  (throw 'already-numbered nil))
+	      (setq overlay (make-overlay pos (1+ pos))
+		    num (format "[%d]" (incf i)))
+	      (overlay-put overlay 'before-string num)
+	      (w3m-static-if (featurep 'xemacs)
+		  (set-glyph-face (extent-begin-glyph overlay)
+				  'w3m-link-numbering)
+		(w3m-add-face-property 0 (length num)
+				       'w3m-link-numbering num)
+		(overlay-put overlay 'evaporate t))
+	      (overlay-put overlay
+			   'w3m-link-numbering-overlay i))))))))
+
+(defun w3m-read-int-interactive (prompt fun &optional default)
+  "Interactively read a valid integer from minubuffer with PROMPT.
+Execute a one argument function FUN with every current valid integer.
+Initial value is DEFAULT if specified or 0.
+Use <return> to submit current value, <backspace> for correction
+and <C-g> or <escape> to quit action."
+  (let ((prompt (propertize prompt 'face
+			    'w3m-linknum-minibuffer-prompt))
+	(num (or default 0))
+	(min-len (length prompt))
+	ch)
+    (let ((temp-prompt (format "%s%d" prompt num)))
+      (while (not (memq
+		   (setq ch (w3m-static-if (featurep 'xemacs)
+				(let (event key)
+				  (display-message 'no-log temp-prompt)
+				  (setq event (next-command-event))
+				  (and (key-press-event-p event)
+				       (or (event-to-character event)
+					   (characterp
+					    (setq key (event-key event)))
+					   key)))
+			      (read-event temp-prompt)))
+		   '(return 10 13 ?\n ?\r ?\C-g escape 27 ?\e)))
+	(cond ((and (memq ch '(backspace 8 ?\C-h))
+		    (> (length temp-prompt) min-len))
+	       (setq num (/ num 10)
+		     temp-prompt (format "%s%d" prompt num))
+	       (funcall fun num))
+	      ((memq ch '(32 ?\ )) (w3m-scroll-up-or-next-url nil))
+	      ((eq ch 'delete)
+	       (w3m-scroll-down-or-previous-url nil))
+	      ((memq ch '(60 ?<)) (w3m-scroll-right nil))
+	      ((memq ch '(62 ?>)) (w3m-scroll-left nil))
+	      ((and (w3m-static-if (featurep 'xemacs)
+			(characterp ch)
+		      (numberp ch))
+		    (> ch 47) (< ch 58))
+	       (setq num (+ (* num 10) (- ch 48))
+		     temp-prompt (format "%s%d" prompt num))
+	       (funcall fun num))))
+      (if (memq ch '(?\C-g escape 27 ?\e))
+	  (keyboard-quit))
+      num)))
+
+(defmacro w3m-with-linknum (type &rest body)
+  "Within TYPE anchor numbering execute BODY.
+Types are: 0 no numbering, 1 links, 2 images,
+4 links, form fields and buttons.
+Then restore previous numbering condition."
+  `(progn (w3m-link-numbering ,type)
+	  (unwind-protect (progn ,@body)
+	    (w3m-linknum-remove-overlays))))
+
+(defun w3m-highlight-numbered-anchor (arg)
+  "Highlight specified by ARG number anchor."
+  (catch 'done
+    (let (found-prev marked-new)
+      (dolist (overlay (overlays-in (point-min) (point-max)))
+	(cond
+	 ((overlay-get overlay 'w3m-linknum-match)
+	  (delete-overlay overlay)
+	  (setq found-prev t))
+	 ((eq arg (overlay-get overlay 'w3m-link-numbering-overlay))
+	  (let* ((start (overlay-start overlay))
+		 (match-overlay
+		  (make-overlay
+		   start
+		   (next-single-property-change
+		    start
+		    (cond ((get-text-property start 'w3m-href-anchor)
+			   'w3m-href-anchor)
+			  ((get-text-property start 'w3m-image)
+			   'w3m-image)
+			  (t 'w3m-action))))))
+	    (overlay-put match-overlay 'w3m-linknum-match t)
+	    (overlay-put match-overlay 'face 'w3m-linknum-match))
+	  (setq marked-new t)))
+	(and found-prev marked-new (throw 'done nil))))))
+
+(defun w3m-get-anchor-info (&optional num)
+  "Get info (url/action position [image image-alt]) of anchor numbered as NUM.
+If NUM is not specified, use currently highlighted anchor."
+  (macrolet
+      ((get-match-info
+	(condition)
+	`(dolist (overlay (overlays-in (point-min) (point-max)))
+	   (if ,condition
+	       (let* ((pos (overlay-start overlay))
+		      (href (get-text-property pos 'w3m-href-anchor)))
+		 (throw
+		  'found
+		  (if href (list href pos
+				 (get-text-property pos 'w3m-image)
+				 (get-text-property pos 'w3m-image-alt))
+		    (list (get-text-property pos 'w3m-action)
+			  pos))))))))
+    (catch 'found
+      (if num (get-match-info
+	       (eq num (overlay-get
+			overlay 'w3m-link-numbering-overlay)))
+	(get-match-info (overlay-get overlay 'w3m-linknum-match))))))
+
+;;;###autoload
+(defun w3m-go-to-linknum (arg)
+  "Turn on link and form numbers and ask for one to go to.
+With prefix ARG don't highlight current link.
+0 corresponds to location url."
+  (interactive "P")
+  (w3m-with-linknum
+   4
+   (let ((info (if arg
+		   (let ((num (w3m-read-number "Anchor number: ")))
+		     (if (zerop num)
+			 (list nil 16)
+		       (w3m-get-anchor-info num)))
+		 (if (zerop (w3m-read-int-interactive
+			     "Anchor number: "
+			     'w3m-highlight-numbered-anchor))
+		     (list nil 16)
+		   (w3m-get-anchor-info)))))
+     (if info
+	 (progn
+	   (push-mark (point))
+	   (goto-char (cadr info)))
+       (w3m-message "No valid anchor selected")))))
+
+(defun w3m-linknum-get-action (&optional prompt type)
+  "Turn on link numbers and return list of url or action, position
+and image url if such of  PROMPT selected anchor.
+TYPE sets types of anchors to be numbered, if nil or 4, number urls,
+form fields and buttons. 1 - only links, 2 - only images.
+Highlight every intermediate result anchor.
+Input 0 corresponds to current page url."
+  (w3m-with-linknum
+   (or type 4)
+   (if (and (zerop (w3m-read-int-interactive
+		    (or prompt "Anchor number: ")
+		    'w3m-highlight-numbered-anchor))
+	    (not (eq type 2)))
+       (list w3m-current-url 16 nil nil)
+     (w3m-get-anchor-info))))
+
+;;;###autoload
+(defun w3m-linknum-follow (arg)
+  "Turn on link numbers, ask for one and execute appropriate action on it.
+When link - visit it, when button - press, when input - activate it.
+With prefix ARG visit link in new session or move over field/button
+before activate/press."
+  (interactive "P")
+  (let ((info (w3m-linknum-get-action
+	       (concat "Follow " (if arg "in new session ")
+		       "(select anchor): "))))
+    (if info
+	(let ((action (car info)))
+	  (cond ((stringp action)	; url
+		 (if arg (w3m-goto-url-new-session action)
+		   (push-mark (point))
+		   (goto-char (cadr info))
+		   (w3m-history-store-position)
+		   (w3m-goto-url action)))
+		((eq (car action) 'w3m-form-submit) ; button
+		 (when arg
+		   (push-mark (point))
+		   (goto-char (cadr info)))
+		 (widget-button-press (cadr info) action))
+		(t (if arg		; form field
+		       (progn (push-mark (point))
+			      (goto-char (cadr info))
+			      (let ((w3m-form-new-session t)
+				    (w3m-form-download nil))
+				(eval action)))
+		     (save-excursion
+		       (goto-char (cadr info))
+		       (let ((w3m-form-new-session nil)
+			     (w3m-form-download nil))
+			 (eval action)))))))
+      (w3m-message "No valid anchor selected"))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; linknum alternatives to w3m user commands on point
+
+;;;###autoload
+(defun w3m-linknum-toggle-inline-image (&optional arg)
+  "If image at point, toggle it.
+Otherwise turn on link numbers and toggle selected image.
+With prefix ARG open url under image in new session.
+If no such url, move over image and toggle it."
+  (interactive "P")
+  (if (w3m-image)
+      (let ((url (get-char-property (point) 'w3m-href-anchor)))
+	(if (and arg url)
+	    (w3m-goto-url-new-session url)
+	  (w3m-toggle-inline-image)))
+    (let ((im (w3m-linknum-get-action
+	       (if arg
+		   "Open image url in new session: "
+		 "Toggle image: ")
+	       2)))
+      (if im
+	  (if arg
+	      (if (car im)
+		  (w3m-goto-url-new-session (car im))
+		(push-mark (point))
+		(goto-char (cadr im))
+		(w3m-toggle-inline-image))
+	    (save-excursion (goto-char (cadr im))
+			    (w3m-toggle-inline-image)))
+	(w3m-message "No image selected")))))
+
+;;;###autoload
+(defun w3m-linknum-view-image ()
+  "Display the image under point in the external viewer.
+If no image at poing, turn on image numbers and display selected.
+The viewer is defined in `w3m-content-type-alist' for every type of an
+image."
+  (interactive)
+  (let ((im (w3m-url-valid (w3m-image))))
+    (cond (im (w3m-external-view im))
+	  ((setq im (w3m-linknum-get-action
+		     "Open image url in external viewer: " 2))
+	   (w3m-external-view (caddr im)))
+	  (t (w3m-message "No image selected")))))
+
+;;;###autoload
+(defun w3m-linknum-save-image ()
+  "Save the image under point to a file.
+If no image at poing, turn on image numbers and save selected.
+The default name will be the original name of the image."
+  (interactive)
+  (let ((im (w3m-url-valid (w3m-image))))
+    (cond (im (w3m-download im))
+	  ((setq im (w3m-linknum-get-action "Save image: " 2))
+	   (w3m-download (caddr im)))
+	  (t (w3m-message "No image selected")))))
+
+(defmacro w3m-linknum-zoom-image (rate &optional in)
+  "Zoom image under the point.
+Numeric prefix RATE specifies how many percent the image is
+changed by.  Default is the value of the `w3m-resize-image-scale'
+variable.  If no image under point, activate numbering and ask
+for one.  When IN zoom in, otherwise zoom out."
+  `(progn
+     (or (w3m-display-graphic-p)
+	 (error "Can't display images in this environment"))
+     (or (w3m-imagick-convert-program-available-p)
+	 (error "ImageMagick's `convert' program is required"))
+     (let ((im (w3m-image)))
+       (cond
+	(im (w3m-resize-inline-image-internal
+	     im
+	     (,(if in '+ '-) 100 (or ,rate w3m-resize-image-scale))))
+	((setq im (w3m-linknum-get-action
+		   ,(concat "Zoom " (if in "in" "out") " image: ") 2))
+	 (save-excursion
+	   (goto-char (cadr im))
+	   (w3m-resize-inline-image-internal
+	    (car im)
+	    (,(if in '+ '-) 100 (or ,rate w3m-resize-image-scale)))))
+	(t (w3m-message "No image at point"))))))
+
+(defun w3m-linknum-zoom-in-image (&optional rate)
+  "Zoom in an image on the point.
+Numeric prefix RATE specifies how many percent the image is
+enlarged by \(30 means enlarging the image by 130%).  The default
+is the value of the `w3m-resize-image-scale' variable.  If no
+image under point, activate numbering and ask for one."
+  (interactive "P")
+  (w3m-linknum-zoom-image rate t))
+
+(defun w3m-linknum-zoom-out-image (&optional rate)
+  "Zoom out an image on the point.
+Numeric prefix RATE specifies how many percent the image is shrunk by
+\(30 means shrinking the image by 70%).  The default is the value of
+the `w3m-resize-image-scale' variable.
+If no image under point, activate numbering and ask for one."
+  (interactive "P")
+  (w3m-linknum-zoom-image rate))
+
+;;;###autoload
+(defun w3m-linknum-external-view-this-url ()
+  "Launch the external browser and display the link at point.
+If no link at point, turn on link numbers and open selected externally."
+  (interactive)
+  (let ((url (w3m-url-valid (or (w3m-anchor) (w3m-image)
+				(car
+				 (w3m-linknum-get-action
+				  "Open in external browser: " 1))))))
+    (if url
+	(w3m-external-view url)
+      (w3m-message "No URL selected"))))
+
+;;;###autoload
+(defun w3m-linknum-edit-this-url ()
+  "Edit the page linked from the anchor under the cursor.
+If no such, turn on link numbers and edit selected."
+  (interactive)
+  (let ((url (or (w3m-url-valid (w3m-anchor))
+		 (car (w3m-linknum-get-action
+		       "Select link to edit: " 1)))))
+    (if url
+	(w3m-edit-url url)
+      (w3m-message "No URL selected"))))
+
+;;;###autoload
+(defun w3m-linknum-print-this-url ()
+  "Display the url under point in the echo area and put it into `kill-ring'.
+If no url under point, activate numbering and select one."
+  (interactive)
+  (if (or (w3m-anchor) (w3m-image))
+      (w3m-print-this-url t)
+    (let ((link (w3m-linknum-get-action "Select URL to copy: " 1)))
+      (if link
+	  (let ((url (car link)))
+	    (kill-new url)
+	    (w3m-message "%s%s" (let ((im-alt (cadddr link)))
+				  (if (zerop (length im-alt))
+				      ""
+				    (concat im-alt ": ")))
+			 url))
+	(w3m-message "No URL selected")))))
+
+;;;###autoload
+(defun w3m-linknum-download-this-url ()
+  "Download the file or the page pointed to by the link under point.
+If no point, activate numbering and select andchor to download."
+  (interactive)
+  (if (or (w3m-anchor) (w3m-image) (w3m-action))
+      (w3m-download-this-url)
+    (let ((info (w3m-linknum-get-action
+		 "Select anchor to download: ")))
+      (if info
+	  (save-excursion
+	    (goto-char (cadr info))
+	    (w3m-download-this-url))
+	(w3m-message "No anchor selected")))))
+
+;;;###autoload
+(defun w3m-linknum-bookmark-add-this-url ()
+  "Add link under cursor to bookmark.
+If no link under point, activate numbering and ask for one."
+  (interactive)
+  (let ((url (w3m-anchor)))
+    (cond
+     (url (w3m-bookmark-add
+	   url
+	   (buffer-substring-no-properties
+	    (previous-single-property-change (+ 1 (point))
+					     'w3m-href-anchor)
+	    (next-single-property-change (point) 'w3m-href-anchor)))
+	  (message "Added"))
+     ((setq url (w3m-linknum-get-action "Select URL to bookmark: " 1))
+      (w3m-bookmark-add
+       (car url)
+       (buffer-substring-no-properties
+	(previous-single-property-change (+ 1 (cadr url))
+					 'w3m-href-anchor)
+	(next-single-property-change (cadr url) 'w3m-href-anchor)))
+      (w3m-message "added"))
+     (t (w3m-message "No url selected")))))
+
+(provide 'w3m-lnum)
+
+;;; w3m-lnum.el ends here

=== added file 'share/emacs/site-lisp/w3m/w3m-load.el'
--- share/emacs/site-lisp/w3m/w3m-load.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-load.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,520 @@
+;;; w3m-load.el --- automatically extracted autoload
+;;
+;; This file should be generated by make in emacs-w3m source directory.
+;;
+;;; Code:
+
+(provide 'w3m-load)
+
+;;;### (autoloads (w3m-buffer w3m-region w3m-find-file w3m-browse-url
+;;;;;;  w3m w3m-gohome w3m-goto-url-new-session w3m-goto-url w3m-download
+;;;;;;  w3m-retrieve) "w3m" "w3m.el" (19594 1591))
+;;; Generated autoloads from w3m.el
+
+(autoload 'w3m-retrieve "w3m" "\
+Retrieve web contents pointed to by URL.
+It will put the retrieved contents into the current buffer.
+
+If HANDLER is nil, this function will retrieve web contents, return
+the content type of the retrieved data, and then come to an end.  This
+behavior is what is called a synchronous operation.  You have to
+specify HANDLER in order to make this function show its real ability,
+which is called an asynchronous operation.
+
+If HANDLER is a function, this function will come to an end in no time.
+In this case, contents will be retrieved by the asynchronous process
+after a while.  And after finishing retrieving contents successfully,
+HANDLER will be called on the buffer where this function starts.  The
+content type of the retrieved data will be passed to HANDLER as a
+string argument.
+
+NO-UNCOMPRESS specifies whether this function should not uncompress contents.
+NO-CACHE specifies whether this function should not use cached contents.
+POST-DATA and REFERER will be sent to the web server with a request.
+
+\(fn URL &optional NO-UNCOMPRESS NO-CACHE POST-DATA REFERER HANDLER)" nil nil)
+
+(autoload 'w3m-download "w3m" "\
+Download contents of URL to a file named FILENAME.
+NO-CHACHE (which the prefix argument gives when called interactively)
+specifies not using the cached data.
+
+\(fn URL &optional FILENAME NO-CACHE HANDLER POST-DATA)" t nil)
+
+(autoload 'w3m-goto-url "w3m" "\
+Visit World Wide Web pages.  This is the primitive function of `w3m'.
+If the second argument RELOAD is non-nil, reload a content of URL.
+Except that if it is 'redisplay, re-display the page without reloading.
+The third argument CHARSET specifies a charset to be used for decoding
+a content.
+The fourth argument POST-DATA should be a string or a cons cell.  If
+it is a string, it makes this function request a body as if the
+content-type is \"x-www-form-urlencoded\".  If it is a cons cell, the
+car of a cell is used as the content-type and the cdr of a cell is
+used as the body.
+If the fifth argument REFERER is specified, it is used for a Referer:
+field for this request.
+The remaining HANDLER, ELEMENT[1], and NO-POPUP are for the
+internal operations of emacs-w3m.
+You can also use \"quicksearch\" url schemes such as \"gg:emacs\" which
+would search for the term \"emacs\" with the Google search engine.  See
+the `w3m-search' function and the variable `w3m-uri-replace-alist'.
+
+\[1] A note for the developers: ELEMENT is a history element which has
+already been registered in the `w3m-history-flat' variable.  It is
+corresponding to URL to be retrieved at this time, not for the url of
+the current page.
+
+\(fn URL &optional RELOAD CHARSET POST-DATA REFERER HANDLER ELEMENT NO-POPUP)" t nil)
+
+(autoload 'w3m-goto-url-new-session "w3m" "\
+Visit World Wide Web pages in a new session.
+If you invoke this command in the emacs-w3m buffer, the new session
+will be created by copying the current session.  Otherwise, the new
+session will start afresh.
+
+\(fn URL &optional RELOAD CHARSET POST-DATA REFERER)" t nil)
+
+(autoload 'w3m-gohome "w3m" "\
+Go to the Home page.
+
+\(fn)" t nil)
+
+(autoload 'w3m "w3m" "\
+Visit World Wide Web pages using the external w3m command.
+
+When you invoke this command interactively for the first time, it will
+visit a page which is pointed to by a string like url around the
+cursor position or the home page specified by the `w3m-home-page'
+variable, but you will be prompted for a URL if `w3m-quick-start' is
+nil (default t) or `w3m-home-page' is nil.
+
+The variables `w3m-pop-up-windows' and `w3m-pop-up-frames' control
+whether this command should pop to a window or a frame up for the
+session.
+
+When emacs-w3m sessions have already been opened, this command will
+pop to the existing window or frame up, but if `w3m-quick-start' is
+nil, (default t), you will be prompted for a URL (which defaults to
+`popup' meaning to pop to an existing emacs-w3m buffer up).
+
+In addition, if the prefix argument is given or you enter the empty
+string for the prompt, it will visit the home page specified by the
+`w3m-home-page' variable or the \"about:\" page.
+
+You can also run this command in the batch mode as follows:
+
+  emacs -f w3m http://emacs-w3m.namazu.org/ &
+
+In that case, or if this command is called non-interactively, the
+variables `w3m-pop-up-windows' and `w3m-pop-up-frames' will be ignored
+\(treated as nil) and it will run emacs-w3m at the current (or the
+initial) window.
+
+If the optional NEW-SESSION is non-nil, this function makes a new
+emacs-w3m buffer.  Besides that, it also makes a new emacs-w3m buffer
+if `w3m-make-new-session' is non-nil and a user specifies a url string.
+
+The optional INTERACTIVE-P is for the internal use; it is mainly used
+to check whether Emacs 22 or later calls this function as an
+interactive command in the batch mode.
+
+\(fn &optional URL NEW-SESSION INTERACTIVE-P)" t nil)
+
+(autoload 'w3m-browse-url "w3m" "\
+Ask emacs-w3m to browse URL.
+NEW-SESSION specifies whether to create a new emacs-w3m session.  URL
+defaults to the string looking like a url around the cursor position.
+Pop to a window or a frame up according to `w3m-pop-up-windows' and
+`w3m-pop-up-frames'.
+
+\(fn URL &optional NEW-SESSION)" t nil)
+
+(autoload 'w3m-find-file "w3m" "\
+Function used to open FILE whose name is expressed in ordinary format.
+The file name will be converted into the file: scheme.
+
+\(fn FILE)" t nil)
+
+(autoload 'w3m-region "w3m" "\
+Render the region of the current buffer between START and END.
+URL specifies the address where the contents come from.  It can be
+omitted or nil when the address is not identified.  CHARSET is used
+for decoding the contents.  If it is nil, this function attempts to
+parse the meta tag to extract the charset.
+
+\(fn START END &optional URL CHARSET)" t nil)
+
+(autoload 'w3m-buffer "w3m" "\
+Render the current buffer.
+See `w3m-region' for the optional arguments.
+
+\(fn &optional URL CHARSET)" t nil)
+
+;;;***
+
+;;;### (autoloads (w3m-antenna w3m-about-antenna) "w3m-antenna" "w3m-antenna.el"
+;;;;;;  (19188 5056))
+;;; Generated autoloads from w3m-antenna.el
+
+(autoload 'w3m-about-antenna "w3m-antenna" "\
+Not documented
+
+\(fn URL &optional NO-DECODE NO-CACHE POST-DATA REFERER HANDLER)" nil nil)
+
+(autoload 'w3m-antenna "w3m-antenna" "\
+Report changes of WEB sites, which is specified in `w3m-antenna-sites'.
+
+\(fn &optional NO-CACHE)" t nil)
+
+;;;***
+
+;;;### (autoloads (w3m-setup-bookmark-menu w3m-about-bookmark w3m-bookmark-view-new-session
+;;;;;;  w3m-bookmark-view w3m-bookmark-add-current-url-group w3m-bookmark-add-all-urls
+;;;;;;  w3m-bookmark-add-current-url w3m-bookmark-add-this-url) "w3m-bookmark"
+;;;;;;  "w3m-bookmark.el" (19529 31699))
+;;; Generated autoloads from w3m-bookmark.el
+
+(autoload 'w3m-bookmark-add-this-url "w3m-bookmark" "\
+Add link under cursor to bookmark.
+
+\(fn)" t nil)
+
+(autoload 'w3m-bookmark-add-current-url "w3m-bookmark" "\
+Add a url of the current page to the bookmark.
+With prefix, ask for a new url instead of the present one.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'w3m-bookmark-add-all-urls "w3m-bookmark" "\
+Add urls of all pages being visited to the bookmark.
+
+\(fn)" t nil)
+
+(autoload 'w3m-bookmark-add-current-url-group "w3m-bookmark" "\
+Add link of the group of current urls to the bookmark.
+
+\(fn)" t nil)
+
+(autoload 'w3m-bookmark-view "w3m-bookmark" "\
+Display the bookmark.
+
+\(fn &optional RELOAD)" t nil)
+
+(autoload 'w3m-bookmark-view-new-session "w3m-bookmark" "\
+Display the bookmark on a new session.
+
+\(fn &optional RELOAD)" t nil)
+
+(autoload 'w3m-about-bookmark "w3m-bookmark" "\
+Not documented
+
+\(fn &rest ARGS)" nil nil)
+
+(autoload 'w3m-setup-bookmark-menu "w3m-bookmark" "\
+Setup w3m bookmark items in menubar.
+
+\(fn)" nil nil)
+
+;;;***
+
+;;;### (autoloads (w3m-about-cookie w3m-cookie w3m-cookie-get w3m-cookie-set
+;;;;;;  w3m-cookie-shutdown) "w3m-cookie" "w3m-cookie.el" (19450
+;;;;;;  19230))
+;;; Generated autoloads from w3m-cookie.el
+
+(autoload 'w3m-cookie-shutdown "w3m-cookie" "\
+Save cookies, and reset cookies' data.
+
+\(fn)" t nil)
+
+(autoload 'w3m-cookie-set "w3m-cookie" "\
+Register cookies which correspond to URL.
+BEG and END should be an HTTP response header region on current buffer.
+
+\(fn URL BEG END)" nil nil)
+
+(autoload 'w3m-cookie-get "w3m-cookie" "\
+Get a cookie field string which corresponds to the URL.
+
+\(fn URL)" nil nil)
+
+(autoload 'w3m-cookie "w3m-cookie" "\
+Display cookies and enable you to manage them.
+
+\(fn &optional NO-CACHE)" t nil)
+
+(autoload 'w3m-about-cookie "w3m-cookie" "\
+Make the html contents to display and to enable you to manage cookies.
+
+\(fn URL &optional NO-DECODE NO-CACHE POST-DATA &rest ARGS)" nil nil)
+
+;;;***
+
+;;;### (autoloads (w3m-dtree w3m-about-dtree) "w3m-dtree" "w3m-dtree.el"
+;;;;;;  (18965 10114))
+;;; Generated autoloads from w3m-dtree.el
+
+(autoload 'w3m-about-dtree "w3m-dtree" "\
+Not documented
+
+\(fn URL &optional NODECODE ALLFILES &rest ARGS)" nil nil)
+
+(autoload 'w3m-dtree "w3m-dtree" "\
+Display directory tree on local file system.
+If called with 'prefix argument', display all directorys and files.
+
+\(fn ALLFILES PATH)" t nil)
+
+;;;***
+
+;;;### (autoloads (w3m-fb-mode) "w3m-fb" "w3m-fb.el" (17681 2386))
+;;; Generated autoloads from w3m-fb.el
+
+(defvar w3m-fb-mode nil "\
+Non-nil if W3m-Fb mode is enabled.
+See the command `w3m-fb-mode' for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `w3m-fb-mode'.")
+
+(custom-autoload 'w3m-fb-mode "w3m-fb" nil)
+
+(autoload 'w3m-fb-mode "w3m-fb" "\
+Toggle W3M Frame Buffer mode.
+This allows frame-local lists of buffers (tabs).
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads (w3m-filter) "w3m-filter" "w3m-filter.el" (18560
+;;;;;;  26042))
+;;; Generated autoloads from w3m-filter.el
+
+(autoload 'w3m-filter "w3m-filter" "\
+Apply filtering rule of URL against a content in this buffer.
+
+\(fn URL)" nil nil)
+
+;;;***
+
+;;;### (autoloads (w3m-fontify-forms) "w3m-form" "w3m-form.el" (19563
+;;;;;;  45473))
+;;; Generated autoloads from w3m-form.el
+
+(autoload 'w3m-fontify-forms "w3m-form" "\
+Process half-dumped data and fontify forms in this buffer.
+
+\(fn)" nil nil)
+
+;;;***
+
+;;;### (autoloads (w3m-linknum-bookmark-add-this-url w3m-linknum-download-this-url
+;;;;;;  w3m-linknum-print-this-url w3m-linknum-edit-this-url w3m-linknum-external-view-this-url
+;;;;;;  w3m-linknum-save-image w3m-linknum-view-image w3m-linknum-toggle-inline-image
+;;;;;;  w3m-linknum-follow w3m-go-to-linknum w3m-link-numbering-mode)
+;;;;;;  "w3m-lnum" "w3m-lnum.el" (19590 4486))
+;;; Generated autoloads from w3m-lnum.el
+
+(autoload 'w3m-link-numbering-mode "w3m-lnum" "\
+Minor mode to extend point commands by using Conkeror style number selection.
+With prefix ARG 0 disable battery included point functions, otherwise
+enable them.  With no prefix ARG - toggle.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'w3m-go-to-linknum "w3m-lnum" "\
+Turn on link and form numbers and ask for one to go to.
+With prefix ARG don't highlight current link.
+0 corresponds to location url.
+
+\(fn ARG)" t nil)
+
+(autoload 'w3m-linknum-follow "w3m-lnum" "\
+Turn on link numbers, ask for one and execute appropriate action on it.
+When link - visit it, when button - press, when input - activate it.
+With prefix ARG visit link in new session or move over field/button
+before activate/press.
+
+\(fn ARG)" t nil)
+
+(autoload 'w3m-linknum-toggle-inline-image "w3m-lnum" "\
+If image at point, toggle it.
+Otherwise turn on link numbers and toggle selected image.
+With prefix ARG open url under image in new session.
+If no such url, move over image and toggle it.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'w3m-linknum-view-image "w3m-lnum" "\
+Display the image under point in the external viewer.
+If no image at poing, turn on image numbers and display selected.
+The viewer is defined in `w3m-content-type-alist' for every type of an
+image.
+
+\(fn)" t nil)
+
+(autoload 'w3m-linknum-save-image "w3m-lnum" "\
+Save the image under point to a file.
+If no image at poing, turn on image numbers and save selected.
+The default name will be the original name of the image.
+
+\(fn)" t nil)
+
+(autoload 'w3m-linknum-external-view-this-url "w3m-lnum" "\
+Launch the external browser and display the link at point.
+If no link at point, turn on link numbers and open selected externally.
+
+\(fn)" t nil)
+
+(autoload 'w3m-linknum-edit-this-url "w3m-lnum" "\
+Edit the page linked from the anchor under the cursor.
+If no such, turn on link numbers and edit selected.
+
+\(fn)" t nil)
+
+(autoload 'w3m-linknum-print-this-url "w3m-lnum" "\
+Display the url under point in the echo area and put it into `kill-ring'.
+If no url under point, activate numbering and select one.
+
+\(fn)" t nil)
+
+(autoload 'w3m-linknum-download-this-url "w3m-lnum" "\
+Download the file or the page pointed to by the link under point.
+If no point, activate numbering and select andchor to download.
+
+\(fn)" t nil)
+
+(autoload 'w3m-linknum-bookmark-add-this-url "w3m-lnum" "\
+Add link under cursor to bookmark.
+If no link under point, activate numbering and ask for one.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (w3m-namazu w3m-about-namazu) "w3m-namazu" "w3m-namazu.el"
+;;;;;;  (18965 10114))
+;;; Generated autoloads from w3m-namazu.el
+
+(autoload 'w3m-about-namazu "w3m-namazu" "\
+Not documented
+
+\(fn URL &optional NO-DECODE NO-CACHE &rest ARGS)" nil nil)
+
+(autoload 'w3m-namazu "w3m-namazu" "\
+Search indexed files with Namazu.
+
+\(fn INDEX QUERY &optional RELOAD)" t nil)
+
+;;;***
+
+;;;### (autoloads (w3m-perldoc w3m-about-perldoc) "w3m-perldoc" "w3m-perldoc.el"
+;;;;;;  (18199 13480))
+;;; Generated autoloads from w3m-perldoc.el
+
+(autoload 'w3m-about-perldoc "w3m-perldoc" "\
+Not documented
+
+\(fn URL &optional NO-DECODE NO-CACHE &rest ARGS)" nil nil)
+
+(autoload 'w3m-perldoc "w3m-perldoc" "\
+View Perl documents.
+
+\(fn DOCNAME)" t nil)
+
+;;;***
+
+;;;### (autoloads (w3m-search-uri-replace w3m-search-new-session
+;;;;;;  w3m-search) "w3m-search" "w3m-search.el" (19563 45473))
+;;; Generated autoloads from w3m-search.el
+
+(autoload 'w3m-search "w3m-search" "\
+Search QUERY using SEARCH-ENGINE.
+When called interactively with a prefix argument, you can choose one of
+the search engines defined in `w3m-search-engine-alist'.  Otherwise use
+`w3m-search-default-engine'.
+If Transient Mark mode, use the region as an initial string of query
+and deactivate the mark.
+
+\(fn SEARCH-ENGINE QUERY)" t nil)
+
+(autoload 'w3m-search-new-session "w3m-search" "\
+Like `w3m-search', but do the search in a new session.
+
+\(fn SEARCH-ENGINE QUERY)" t nil)
+
+(autoload 'w3m-search-uri-replace "w3m-search" "\
+Generate query string for ENGINE from URI matched by last search.
+
+\(fn URI ENGINE)" nil nil)
+
+;;;***
+
+;;;### (autoloads (w3m-session-last-crashed-session w3m-session-last-autosave-session
+;;;;;;  w3m-setup-session-menu w3m-session-select w3m-session-save)
+;;;;;;  "w3m-session" "w3m-session.el" (19563 45473))
+;;; Generated autoloads from w3m-session.el
+
+(autoload 'w3m-session-save "w3m-session" "\
+Save list of displayed session.
+
+\(fn)" t nil)
+
+(autoload 'w3m-session-select "w3m-session" "\
+Select session from session list.
+
+\(fn)" t nil)
+
+(autoload 'w3m-setup-session-menu "w3m-session" "\
+Setup w3m session items in menubar.
+
+\(fn)" nil nil)
+
+(autoload 'w3m-session-last-autosave-session "w3m-session" "\
+Not documented
+
+\(fn)" nil nil)
+
+(autoload 'w3m-session-last-crashed-session "w3m-session" "\
+Not documented
+
+\(fn)" nil nil)
+
+;;;***
+
+;;;### (autoloads (w3m-replace-symbol) "w3m-symbol" "w3m-symbol.el"
+;;;;;;  (18791 12168))
+;;; Generated autoloads from w3m-symbol.el
+
+(autoload 'w3m-replace-symbol "w3m-symbol" "\
+Not documented
+
+\(fn)" nil nil)
+
+;;;***
+
+;;;### (autoloads (w3m-about-weather w3m-weather) "w3m-weather" "w3m-weather.el"
+;;;;;;  (18199 13480))
+;;; Generated autoloads from w3m-weather.el
+
+(autoload 'w3m-weather "w3m-weather" "\
+Display weather report.
+
+\(fn AREA)" t nil)
+
+(autoload 'w3m-about-weather "w3m-weather" "\
+Not documented
+
+\(fn URL NO-DECODE NO-CACHE POST-DATA REFERER HANDLER)" nil nil)
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; w3m-load.el ends here

=== added file 'share/emacs/site-lisp/w3m/w3m-mail.el'
--- share/emacs/site-lisp/w3m/w3m-mail.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-mail.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,396 @@
+;;; w3m-mail.el --- an interface to mail-user-agent for sending web pages
+
+;; Copyright (C) 2006, 2009 TSUCHIYA Masatoshi
+
+;; Author: Katsumi Yamaoka <yamaoka@jpl.org>
+;; Keywords: w3m, WWW, hypermedia
+
+;; This file is a part of emacs-w3m.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; This module provides the `w3m-mail' command which enables you to
+;; send web pages as mails respecting those content types (typically
+;; text/html).  Currently this program works if and only if you set
+;; the `mail-user-agent' variable to one of the following agents:
+;;      `gnus-user-agent'
+;;      `message-user-agent'
+;;      `mew-user-agent'
+;;      `vm-user-agent'
+;;      `wl-user-agent'
+;; To send the page you are looking at, type `M-x w3m-mail' or click
+;; the menu button, fill message headers properly, and type `C-c C-c'.
+
+;;; Code:
+
+(require 'w3m)
+
+(defcustom w3m-mail-subject '("Emailing:" url)
+  "A list of strings and symbols used to generate the subject header.
+Valid symbols include `url' which is replaced with the url of the page
+and `title' which is replaced with the page title.  You can also use
+just a string for this variable."
+  :group 'w3m
+  :type '(radio (editable-list :format "\n%v%i\n"
+			       (radio-button-choice
+				(const :format "%v " url)
+				(const :format "%v " title)
+				string))
+		string
+		(const :format "no subject" nil)))
+
+(defvar w3m-mail-user-agent-compose-function-alist
+  (let ((alist '((gnus-user-agent . w3m-mail-compose-with-mml)
+		 (message-user-agent . w3m-mail-compose-with-mml)
+		 (mew-user-agent . w3m-mail-compose-with-mew)
+		 (vm-user-agent . w3m-mail-compose-with-vm)
+		 (wl-user-agent . w3m-mail-compose-with-semi)))
+	composer)
+    (delq nil (mapcar (lambda (agent)
+			(if (setq composer (cdr (assq agent alist)))
+			    (cons agent composer)))
+		      w3m-mail-user-agents)))
+  "Alist of mail user agents and functions to compose a mail.
+The function will be called with the arguments `source', `url',
+`charset', `content-type', `to', `subject', and `other-headers'; where
+`source' is a string containing the page source, `url' is the url of
+the page, `charset' is a charset that the page uses, `content-type' is
+the one such as \"text/html\", and the rest are the same as those of
+`compose-mail'.")
+
+(eval-when-compile
+  (autoload 'message-add-action "message")
+  (autoload 'mml-insert-empty-tag "mml")
+  (autoload 'vm-mime-attach-buffer "vm-mime")
+  (condition-case nil
+      (require 'mime-edit)
+    (error
+     (dolist (symbol '(encode-mime-charset-region
+		       detect-mime-charset-region
+		       std11-wrap-as-quoted-string
+		       mime-find-file-type
+		       mime-edit-insert-tag
+		       mime-edit-define-encoding
+		       mime-encode-region))
+       (defalias symbol 'ignore)))))
+
+(eval-and-compile
+  (autoload 'mm-find-mime-charset-region "mm-util")
+  (autoload 'w3m-mail-compose-with-mew "mew-w3m"
+    "Compose a mail using Mew." t))
+
+(defun w3m-mail-make-subject ()
+  "Return a string used for the Subject header."
+  (cond ((consp w3m-mail-subject)
+	 (w3m-replace-in-string
+	  (w3m-replace-in-string
+	   (mapconcat (lambda (elem)
+			(cond ((eq elem 'url) w3m-current-url)
+			      ((eq elem 'title) w3m-current-title)
+			      ((stringp elem) elem)
+			      (t (format "%s" elem))))
+		      w3m-mail-subject
+		      " ")
+	   "[\t\n ]+" " ")
+	  "\\(?:\\` \\| \\'\\)" ""))
+	((stringp w3m-mail-subject) w3m-mail-subject)
+	(t "(no subject)")))
+
+(defun w3m-mail-compute-base-url ()
+  "Compute a base url of the page if it is not provided."
+  (let ((url (substring w3m-current-url 15)))
+    (unless (string-match "\\`about:" url)
+      (save-excursion
+	(goto-char (point-min))
+	(let ((case-fold-search t)
+	      start end)
+	  (unless (and (setq start (search-forward "<head>" nil t))
+		       (setq end (search-forward "</head>" nil t))
+		       (progn
+			 (goto-char start)
+			 (re-search-forward "<base[\t\n\r ]+" end t))
+		       (w3m-parse-attributes (href) (> (length href) 0)))
+	    (substring (w3m-expand-url "x" url) 0 -1)))))))
+
+(defun w3m-mail-embed-base-url (source base-url)
+  "Embed BASE-URL in SOURCE."
+  (with-temp-buffer
+    (w3m-static-unless (featurep 'xemacs)
+      (set-buffer-multibyte t))
+    (setq case-fold-search t)
+    (insert source)
+    (goto-char (point-min))
+    (while (search-forward "\r\n" nil t)
+      (replace-match "\n"))
+    (goto-char (point-min))
+    (let ((nohead t)
+	  (points (list (point-min) (point-min)))
+	  (margin 0))
+      (when (re-search-forward "\\(<html>\\)[\t\n ]*" nil t)
+	(setq points (list (match-end 1) (match-end 0))
+	      margin (current-column)))
+      (when (re-search-forward "\\(<head>\\)[\t\n ]*" nil t)
+	(setq nohead nil
+	      points (list (match-end 1) (match-end 0))
+	      margin (current-column)))
+      (setq margin (make-string margin ? ))
+      (goto-char (car points))
+      (apply 'delete-region points)
+      (if nohead
+	  (insert "\n" margin "<head><base href=\"" base-url "\"></head>\n"
+		  margin)
+	(insert "\n" margin "<base href=\"" base-url "\">\n" margin)))
+    (buffer-string)))
+
+(defun w3m-mail-goto-body-and-clear-body ()
+  "Go to the beginning of the body and clear the body."
+  (goto-char (point-min))
+  (if (re-search-forward (concat "^\\(?:"
+				 (regexp-quote mail-header-separator)
+				 "\\)?\n")
+			 nil 'move)
+      (delete-region (point) (point-max))
+    (insert (if (bolp) "\n" "\n\n"))))
+
+(defun w3m-mail-position-point (bob)
+  "Go to empty or bogus header, otherwise the beginning of the body BOB."
+  (goto-char (point-min))
+  (when (re-search-forward "^\\(Subject: \\)(no subject)\\|\
+^\\([0-9A-Za-z-]+: ?\\)[\t ]*\n\\(?:[\t ]+\n\\)*[^\t ]"
+			   bob 'move)
+    (goto-char (or (match-end 1) (match-end 2)))))
+
+(defun w3m-mail-compose-with-mml (source url charset content-type
+					 to subject other-headers)
+  "Compose a mail using MML."
+  (let ((buffer (generate-new-buffer " *w3m-mail*")))
+    (with-current-buffer buffer
+      (w3m-static-unless (featurep 'xemacs)
+	(set-buffer-multibyte (not (string-match "\\`image/" content-type))))
+      (insert source))
+    (if (eq mail-user-agent 'gnus-user-agent)
+	(progn
+	  (require 'gnus)
+	  (let (gnus-newsgroup-name)
+	    (compose-mail to subject other-headers)))
+      (compose-mail to subject other-headers))
+    (message-add-action `(kill-buffer ,buffer) 'exit 'kill 'postpone 'send)
+    (w3m-mail-goto-body-and-clear-body)
+    (w3m-mail-position-point
+     (prog1
+	 (point)
+       (mml-insert-empty-tag
+	'part
+	'type content-type
+	'buffer (buffer-name buffer)
+	;; Use the base64 encoding if the body contains non-ASCII text
+	;; or very long lines which might be broken by MTAs.
+	'encoding "base64"
+	'charset (when charset (symbol-name charset))
+	'disposition "inline"
+	'description url)))))
+
+;; This function is implemented in mew-w3m.el.
+;; (defun w3m-mail-compose-with-mew (source url charset content-type
+;;                                         to subject other-headers)
+;;   "Compose a mail using Mew.")
+
+(defun w3m-mail-compose-with-vm (source url charset content-type
+					to subject other-headers)
+  "Compose a mail using VM."
+  (let* ((coding (and charset (w3m-charset-to-coding-system charset)))
+	 (multibytep (and (not coding)
+			  (or charset
+			      (and (not (string-match "\\`image/"
+						      content-type))
+				   (w3m-static-if (featurep 'xemacs)
+				       (string-match "[^\000-\177]" source)
+				     (multibyte-string-p source))))))
+	 (buffer (generate-new-buffer " *w3m-mail*")))
+    (with-current-buffer buffer
+      (w3m-static-unless (featurep 'xemacs)
+	(set-buffer-multibyte (and (not coding) multibytep)))
+      (cond (coding
+	     (insert (encode-coding-string source coding)))
+	    (multibytep
+	     (insert source)
+	     (when (and (setq charset (car (mm-find-mime-charset-region
+					    (point-min) (point-max))))
+			(setq coding (w3m-charset-to-coding-system charset)))
+	       (w3m-static-if (featurep 'xemacs)
+		   (encode-coding-region (point-min) (point-max) coding)
+		 (insert (prog1
+			     (encode-coding-string (buffer-string) coding)
+			   (erase-buffer)
+			   (set-buffer-multibyte nil))))))
+	    (t
+	     (insert source))))
+    (require 'vm-startup)
+    (compose-mail to subject other-headers)
+    (add-to-list 'mail-send-actions `(kill-buffer ,buffer))
+    (w3m-add-local-hook 'kill-buffer-hook `(lambda nil (kill-buffer ,buffer)))
+    (w3m-mail-goto-body-and-clear-body)
+    (w3m-mail-position-point
+     (prog1
+	 (point)
+       (vm-mime-attach-buffer buffer content-type
+			      (when charset (symbol-name charset))
+			      url)))))
+
+(defun w3m-mail-compose-with-semi (source url charset content-type
+					  to subject other-headers)
+  "Compose a mail using SEMI."
+  (require 'mime-edit)
+  (let* ((content-type (and content-type
+			    (split-string (downcase content-type) "/")))
+	 (basename (file-name-nondirectory (w3m-url-strip-query url)))
+	 (filename (cond
+		    ((and (string-match "^[\t ]*$" basename)
+			  (equal content-type '("text" "html")))
+		     "index.html")
+		    ((string-match "^[\t ]*$" basename)
+		     "dummy")
+		    (t
+		     basename)))
+	 (type (or (nth 0 content-type) "text"))
+	 (subtype (or (nth 1 content-type) "html"))
+	 parameters
+	 (encoding "base64")
+	 (disposition-type "inline")
+	 disposition-params
+	 (guess (mime-find-file-type filename))
+	 (textp (string= type "text")))
+    (when (and guess
+	       (string= (nth 0 guess) type)
+	       (string= (nth 1 guess) subtype))
+      (setq parameters (nth 2 guess)
+	    encoding (or (nth 3 guess) encoding)
+	    disposition-type (or (nth 4 guess) disposition-type)
+	    disposition-params (nth 5 guess)))
+    (compose-mail to subject other-headers)
+    (w3m-mail-goto-body-and-clear-body)
+    (let ((parameters-to-string
+	   (lambda (parameters)
+	     (when parameters
+	       (mapconcat
+		(lambda (parameter)
+		  (concat "; " (car parameter)
+			  "=" (if (eq (cdr parameter) 'file)
+				  (std11-wrap-as-quoted-string filename)
+				(cdr parameter))))
+		parameters
+		""))))
+	  (body (point))
+	  (edit-buffer (current-buffer))
+	  work-buffer)
+      (with-temp-buffer
+	(if textp
+	    (progn
+	      (insert source)
+	      (unless charset
+		(setq charset (detect-mime-charset-region (point-min)
+							  (point-max))))
+	      (when charset
+		(setq parameters (cons (cons "charset" (symbol-name charset))
+				       parameters))
+		(encode-mime-charset-region (point-min) (point-max) charset)))
+	  (set-buffer-multibyte nil)
+	  (insert source))
+	(mime-encode-region (point-min) (point-max) encoding)
+	(setq work-buffer (current-buffer))
+	(set-buffer edit-buffer)
+	(mime-edit-insert-tag
+	 type subtype
+	 (concat (funcall parameters-to-string parameters)
+		 "\nContent-Disposition: " disposition-type
+		 (funcall parameters-to-string disposition-params)
+		 "\nContent-Description: " url))
+	(mime-edit-define-encoding encoding)
+	(save-restriction
+	  (narrow-to-region (point) (point))
+	  (insert-buffer-substring work-buffer)
+	  (unless (bolp)
+	    (insert "\n"))
+	  (when (or (string= disposition-type "attachment")
+		    (not (member encoding '("7bit" "8bit" "binary"))))
+	    (add-text-properties
+	     (point-min) (point-max) '(invisible t mime-edit-invisible t)))))
+      (w3m-mail-position-point body))))
+
+(defun w3m-mail (&optional headers)
+  "Send a web page as a mail.
+By default the subject is generated according to `w3m-mail-subject'.
+The optional HEADERS is a list in which each element is a cons of the
+symbol of a header name and a string.  Here is an example to use this
+function:
+
+\(w3m-mail '((To . \"foo@bar\") (Subject . \"The emacs-w3m home page\")))"
+  (interactive (unless (eq major-mode 'w3m-mode)
+		 (error "`%s' must be invoked from an emacs-w3m buffer"
+			this-command)))
+  (let ((composer (cdr (assq mail-user-agent
+			     w3m-mail-user-agent-compose-function-alist)))
+	;; Don't move the history position.
+	(w3m-history-reuse-history-elements t)
+	source base url charset content-type to subject)
+    (cond
+     ((not composer)
+      (error "`%s' is not supported (yet) by `w3m-mail'" mail-user-agent))
+     ((not w3m-current-url)
+      (error "The source for this page is not available"))
+     ((string-match "\\`about://source/" w3m-current-url)
+      (setq source (buffer-string)
+	    base (w3m-mail-compute-base-url))
+      (w3m-view-source)
+      (setq url w3m-current-url
+	    charset (w3m-coding-system-to-charset w3m-current-coding-system)
+	    content-type (or (w3m-arrived-content-type w3m-current-url)
+			     (w3m-content-type w3m-current-url)))
+      (w3m-view-source))
+     ((string-match "\\`about://header/" w3m-current-url)
+      (w3m-view-source)
+      (setq source (buffer-string)
+	    base (w3m-mail-compute-base-url))
+      (w3m-view-source)
+      (setq url w3m-current-url
+	    charset (w3m-coding-system-to-charset w3m-current-coding-system)
+	    content-type (or (w3m-arrived-content-type w3m-current-url)
+			     (w3m-content-type w3m-current-url)))
+      (w3m-view-header))
+     (t
+      (setq url w3m-current-url
+	    charset (w3m-coding-system-to-charset w3m-current-coding-system)
+	    content-type (or (w3m-arrived-content-type w3m-current-url)
+			     (w3m-content-type w3m-current-url)))
+      (w3m-view-source)
+      (setq source (buffer-string)
+	    base (w3m-mail-compute-base-url))
+      (w3m-view-source)))
+    (when (and base (string= "text/html" content-type))
+      (setq source (w3m-mail-embed-base-url source base)))
+    (setq to (or (assq 'To headers) (assq 'to headers))
+	  subject (or (assq 'Subject headers) (assq 'subject headers)))
+    (when (or to subject)
+      (setq headers (delq to (delq subject (copy-sequence headers)))
+	    to (cdr to)
+	    subject (cdr subject)))
+    (unless subject
+      (setq subject (let ((w3m-current-url url)) (w3m-mail-make-subject))))
+    (funcall composer source url charset content-type to subject headers)))
+
+;;; w3m-mail.el ends here

=== added file 'share/emacs/site-lisp/w3m/w3m-namazu.el'
--- share/emacs/site-lisp/w3m/w3m-namazu.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-namazu.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,278 @@
+;;; w3m-namazu.el --- The add-on program to search files with Namazu.
+
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2009
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Author: TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Keywords: w3m, WWW, hypermedia, namazu
+
+;; This file is a part of emacs-w3m.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+
+;;; Commentary:
+
+;; w3m-namazu.el is the add-on program of emacs-w3m to search files
+;; with Namazu.  For more detail about emacs-w3m, see:
+;;
+;;    http://emacs-w3m.namazu.org/
+
+
+;;; History:
+
+;; Original program was posted by
+;; Takayuki Arakawa <takayu@pop02.odn.ne.jp> in [emacs-w3m:01340] at
+;; Jul 31, 2001.
+
+;; Many codes are imported from namazu.el written by
+;; Yukihiro Matsumoto <matz@netlab.co.jp> et al.
+
+;; All stuffs are rewritten by
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org> at Aug 2, 2001.
+
+
+;;; Code:
+
+(eval-when-compile
+  (require 'cl))
+
+(require 'w3m)
+
+(eval-and-compile
+  (autoload 'w3m-search-read-query "w3m-search"))
+
+(defgroup w3m-namazu nil
+  "w3m-namazu front-end for Emacs."
+  :group 'w3m
+  :prefix "w3m-namazu-")
+
+(defcustom w3m-namazu-command "namazu"
+  "*Name of the executable file of Namazu."
+  :group 'w3m-namazu
+  :type '(string :size 0))
+
+(defcustom w3m-namazu-arguments
+  '("-h"			; print in HTML format.
+    "-H"			; print further result links.
+    "-n" w3m-namazu-page-max	; set number of documents shown to NUM.
+    "-w" whence)		; set first number of documents shown to NUM.
+  "*Arguments of Namazu."
+  :group 'w3m-namazu
+  :type '(repeat
+	  (restricted-sexp :format "Argument: %v\n"
+			   :match-alternatives
+			   (stringp 'w3m-namazu-page-max 'whence)
+			   :size 0)))
+
+(defcustom w3m-namazu-page-max
+  (if (boundp 'namazu-search-num)
+      (symbol-value 'namazu-search-num)
+    30)
+  "*A maximum number of documents which are retrieved by one-time search."
+  :group 'w3m-namazu
+  :type '(integer :size 0))
+
+(defconst w3m-namazu-default-index-customize-spec
+  '`(choice
+     (const :tag "No default index" nil)
+     ,@(mapcar (lambda (x) (list 'const (car x)))
+	       w3m-namazu-index-alist)
+     (directory :format "Index directory: %v\n" :size 0)))
+
+(defcustom w3m-namazu-index-alist
+  (when (boundp 'namazu-dir-alist)
+    (mapcar (lambda (pair)
+	      (cons (car pair)
+		    (split-string (cdr pair))))
+	    (symbol-value 'namazu-dir-alist)))
+  "*Alist of alias and index directories."
+  :group 'w3m-namazu
+  :type '(repeat
+	  (group
+	   :indent 0 :inline t
+	   (cons :format "%v"
+		 (string :format "Alias: %v\n" :size 0)
+		 (repeat
+		  :format "%v%i\n" :indent 8
+		  (directory :format "Index directory: %v\n" :size 0)))))
+  :set (lambda (symbol value)
+	 (custom-set-default symbol value)
+	 (put 'w3m-namazu-default-index 'custom-type
+	      (eval w3m-namazu-default-index-customize-spec))))
+
+(defcustom w3m-namazu-default-index
+  (unless (and (boundp 'namazu-always-query-index-directory)
+	       (symbol-value 'namazu-always-query-index-directory))
+    (when (boundp 'namazu-default-dir)
+      (symbol-value 'namazu-default-dir)))
+  "*Alias or directory of the default index.
+If this variable equals nil, it is required to input an index path
+whenever `w3m-namazu' is called interactively without prefix
+argument."
+  :group 'w3m-namazu
+  :type (eval w3m-namazu-default-index-customize-spec))
+
+(defcustom w3m-namazu-output-coding-system
+  (if (boundp 'namazu-cs-write)
+      (symbol-value 'namazu-cs-write)
+    (if (memq system-type '(OS/2 emx windows-nt))
+	'shift_jis-dos
+      'euc-japan-unix))
+  "*Coding system for namazu process."
+  :group 'w3m-namazu
+  :type '(coding-system :size 0))
+
+(defcustom w3m-namazu-input-coding-system
+  (if (boundp 'namazu-cs-read)
+      (symbol-value 'namazu-cs-read)
+    'undecided)
+  "*Coding system for namazu process."
+  :group 'w3m-namazu
+  :type '(coding-system :size 0))
+
+
+(defun w3m-namazu-call-process (index query whence)
+  (setq index (if (assoc index w3m-namazu-index-alist)
+		  (mapcar 'expand-file-name
+			  (cdr (assoc index w3m-namazu-index-alist)))
+		(list (expand-file-name index))))
+  (let ((file-name-coding-system w3m-file-name-coding-system)
+	(coding-system-for-read w3m-namazu-input-coding-system)
+	(coding-system-for-write w3m-namazu-output-coding-system)
+	(default-process-coding-system
+	  (cons w3m-namazu-input-coding-system
+		w3m-namazu-output-coding-system)))
+    (apply 'call-process w3m-namazu-command nil t nil
+	   (let ((w3m-namazu-page-max
+		  (number-to-string w3m-namazu-page-max)))
+	     (nconc (mapcar 'eval w3m-namazu-arguments)
+		    (list query)
+		    index)))))
+
+;;;###autoload
+(defun w3m-about-namazu (url &optional no-decode no-cache &rest args)
+  (let (index query (whence "0"))
+    (when (string-match "\\`about://namazu/\\?" url)
+      (dolist (s (split-string (substring url (match-end 0)) "&"))
+	(when (string-match "\\`\\(?:index\\|\\(query\\)\\|\\(whence\\)\\)=" s)
+	  (set (cond
+		((match-beginning 1) 'query)
+		((match-beginning 2) 'whence)
+		(t 'index))
+	       (substring s (match-end 0)))))
+      (when (zerop (w3m-namazu-call-process (w3m-url-decode-string index)
+					    (w3m-url-decode-string query)
+					    whence))
+	(let ((case-fold-search t))
+	  (goto-char (point-min))
+	  (let ((max (if (re-search-forward
+			  "<!-- HIT -->\\([0-9]+\\)<!-- HIT -->" nil t)
+			 (string-to-number (match-string 1))
+		       0))
+		(cur (string-to-number whence)))
+	    (goto-char (point-min))
+	    (when (search-forward "<head>" nil t)
+	      (when (> cur 0)
+		(insert
+		 (format "
+<link rel=\"prev\" href=\"about://namazu/?index=%s&query=%s&whence=%d\">"
+			 index
+			 query
+			 (max (- cur w3m-namazu-page-max) 0))))
+	      (when (> max (+ cur w3m-namazu-page-max))
+		(insert
+		 (format "
+<link rel=\"next\" href=\"about://namazu/?index=%s&query=%s&whence=%d\">"
+			 index
+			 query
+			 (+ cur w3m-namazu-page-max))))))
+	  (goto-char (point-min))
+	  (while (search-forward "<a href=\"/" nil t)
+	    (forward-char -1)
+	    (insert "file://"))
+	  (goto-char (point-min))
+	  (while (re-search-forward "<a href=\"\\(\\?\\)&\\(?:amp;\\)?whence="
+				    nil t)
+	    (goto-char (match-beginning 1))
+	    (delete-char 1)
+	    (insert (format "about://namazu/?index=%s&query=%s" index query))))
+	"text/html"))))
+
+(defun w3m-namazu-complete-index (index predicate flag)
+  "Function to complete index name"
+  (if (eq flag 'lambda)
+      (and (or (and (assoc index w3m-namazu-index-alist) t)
+	       (file-directory-p index))
+	   (or (not predicate)
+	       (funcall predicate index)))
+    (let ((alist
+	   (mapcar
+	    'list
+	    (nconc
+	     (all-completions index w3m-namazu-index-alist)
+	     (let ((partial (file-name-nondirectory index))
+		   (dir (file-name-as-directory
+			 (or (file-name-directory index)
+			     default-directory))))
+	       (delq nil
+		     (mapcar
+		      (lambda (file)
+			(when (file-directory-p (expand-file-name file dir))
+			  (concat dir file)))
+		      (file-name-all-completions partial dir))))))))
+      (cond
+       ((not flag) (try-completion index alist predicate))
+       ((eq flag t) (all-completions index alist predicate))))))
+
+(defvar w3m-namazu-index-history nil)
+(defvar w3m-namazu-query-history nil)
+
+;;;###autoload
+(defun w3m-namazu (index query &optional reload)
+  "Search indexed files with Namazu."
+  (interactive
+   (list
+    (if (if w3m-namazu-default-index
+	    current-prefix-arg
+	  (not (and current-prefix-arg
+		    w3m-namazu-index-history)))
+	(let* ((default (or (car w3m-namazu-index-history)
+			    w3m-namazu-default-index))
+	       (s (completing-read
+		   (if default
+		       (format "Namazu index (default %s): " default)
+		     "Namazu index: ")
+		   'w3m-namazu-complete-index nil t nil
+		   'w3m-namazu-index-history)))
+	  (if (string= s "") default s))
+      (or w3m-namazu-default-index
+	  (car w3m-namazu-index-history)))
+    (w3m-search-read-query "Namazu query: " "Namazu query (default %s): "
+			   'w3m-namazu-query-history)
+    current-prefix-arg))
+  (unless (stringp index)
+    (error "%s" "Index is required"))
+  (unless (stringp query)
+    (error "%s" "Query is required"))
+  (w3m-goto-url (format "about://namazu/?index=%s&query=%s&whence=0"
+			(w3m-url-encode-string index)
+			(w3m-url-encode-string query))
+		reload))
+
+(provide 'w3m-namazu)
+
+;;; w3m-namazu.el ends here

=== added file 'share/emacs/site-lisp/w3m/w3m-perldoc.el'
--- share/emacs/site-lisp/w3m/w3m-perldoc.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-perldoc.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,124 @@
+;;; w3m-perldoc.el --- The add-on program to view Perl documents.
+
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Author: TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Keywords: w3m, perldoc
+
+;; This file is a part of emacs-w3m.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+
+;;; Commentary:
+
+;; w3m-perldoc.el is the add-on program of emacs-w3m to view Perl
+;; documents.  For more detail about emacs-w3m, see:
+;;
+;;    http://emacs-w3m.namazu.org/
+
+;;; Code:
+(require 'w3m)
+
+(defgroup w3m-perldoc nil
+  "Perldoc front-end for emacs-w3m."
+  :group 'w3m
+  :prefix "w3m-perldoc-")
+
+(defcustom w3m-perldoc-command "perldoc"
+  "*Name of the executable file of perldoc."
+  :group 'w3m-perldoc
+  :type '(string :size 0))
+
+(defcustom w3m-perldoc-pod2html-command "pod2html"
+  "*Name of the executable file of pod2html."
+  :group 'w3m-perldoc
+  :type '(string :size 0))
+
+(defcustom w3m-perldoc-pod2html-arguments
+  '("--noindex")
+  "*Arguments of pod2html."
+  :group 'w3m-perldoc
+  :type '(repeat (string :format "Argument: %v\n" :size 0))
+  :get (lambda (symbol)
+	 (delq nil (delete "" (mapcar (lambda (x) (if (stringp x) x))
+				      (default-value symbol)))))
+  :set (lambda (symbol value)
+	 (custom-set-default
+	  symbol
+	  (delq nil (delete "" (mapcar (lambda (x) (if (stringp x) x))
+				       value))))))
+
+(defcustom w3m-perldoc-input-coding-system
+  (if (string= "Japanese" w3m-language)
+      'euc-japan
+    (if (w3m-find-coding-system 'utf-8)
+	'utf-8
+      'iso-latin-1))
+  "*Coding system used when writing to `w3m-perldoc-command'."
+  :group 'w3m-perldoc
+  :type '(coding-system :size 0))
+
+(defcustom w3m-perldoc-output-coding-system
+  'undecided
+  "*Coding system used when reading from `w3m-perldoc-command'."
+  :group 'w3m-perldoc
+  :type '(coding-system :size 0))
+
+;;;###autoload
+(defun w3m-about-perldoc (url &optional no-decode no-cache &rest args)
+  (when (string-match "\\`about://perldoc/" url)
+    (let ((docname (if (= (length url) (match-end 0))
+		       "perl"
+		     (w3m-url-decode-string (substring url (match-end 0)))))
+	  (default-directory w3m-profile-directory)
+	  (process-environment (copy-sequence process-environment)))
+      ;; To specify the place in which pod2html generates its cache files.
+      (setenv "HOME" (expand-file-name w3m-profile-directory))
+      (and (let ((coding-system-for-read w3m-perldoc-output-coding-system))
+	     (zerop (call-process w3m-perldoc-command
+				  nil t nil "-u" docname)))
+	   (let ((coding-system-for-write w3m-perldoc-input-coding-system)
+		 (coding-system-for-read w3m-perldoc-input-coding-system))
+	     (zerop (apply (function call-process-region)
+			   (point-min) (point-max)
+			   w3m-perldoc-pod2html-command
+			   t '(t nil) nil
+			   (append w3m-perldoc-pod2html-arguments
+				   '("--htmlroot=about://perldoc")))))
+	   (let ((case-fold-search t))
+	     (goto-char (point-min))
+	     (while (re-search-forward
+		     "<a href=\"about://perldoc/\\([^\"]*\\)\\(\\.html\\)\">" nil t)
+	       (delete-region (match-beginning 2) (match-end 2))
+	       (save-restriction
+		 (narrow-to-region (match-beginning 1) (match-end 1))
+		 (while (search-backward "/" nil t)
+		   (delete-char 1)
+		   (insert "::"))
+		 (goto-char (point-max))))
+	     "text/html")))))
+
+;;;###autoload
+(defun w3m-perldoc (docname)
+  "View Perl documents."
+  (interactive "sDocument: ")
+  (w3m-goto-url (concat "about://perldoc/" (w3m-url-encode-string docname))))
+
+(provide 'w3m-perldoc)
+
+;;; w3m-perldoc.el ends here.

=== added file 'share/emacs/site-lisp/w3m/w3m-proc.el'
--- share/emacs/site-lisp/w3m/w3m-proc.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-proc.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,801 @@
+;;; w3m-proc.el --- Functions and macros to control sub-processes
+
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
+;;          Shun-ichi GOTO     <gotoh@taiyo.co.jp>,
+;;          Satoru Takabayashi <satoru-t@is.aist-nara.ac.jp>,
+;;          Hideyuki SHIRAI    <shirai@meadowy.org>,
+;;          Keisuke Nishida    <kxn30@po.cwru.edu>,
+;;          Yuuichi Teranishi  <teranisi@gohome.org>,
+;;          Akihiro Arisawa    <ari@mbf.sphere.ne.jp>,
+;;          Katsumi Yamaoka    <yamaoka@jpl.org>
+;; Keywords: w3m, WWW, hypermedia
+
+;; This file is a part of emacs-w3m.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; This module is a part of emacs-w3m which provides functions and
+;; macros to control sub-processes.  Visit
+;; <URL:http://emacs-w3m.namazu.org/> for more details of emacs-w3m.
+
+;;; Code:
+
+(eval-when-compile
+  (require 'cl))
+
+(require 'w3m-util)
+
+(eval-when-compile
+  ;; Variable(s) which are used in the following inline functions.
+  ;; They should be defined in the other module at run-time.
+  (defvar w3m-current-url)
+  (defvar w3m-current-buffer)
+  (defvar w3m-current-process)
+  (defvar w3m-profile-directory)
+  (defvar w3m-terminal-coding-system)
+  (defvar w3m-command)
+  (defvar w3m-command-arguments)
+  (defvar w3m-command-environment)
+  (defvar w3m-async-exec)
+  (defvar w3m-process-connection-type)
+  (defvar w3m-process-modeline-format)
+  (defvar w3m-work-buffer-list)
+  (autoload 'w3m-idle-images-show-unqueue "w3m"))
+
+;; Silence the Emacs' byte-compiler that says ``might not be defined''.
+(eval-when-compile
+  (defun w3m-decode-coding-string-with-priority (str coding)
+    ()))
+
+(defvar w3m-process-inhibit-quit t
+  "`w3m-process-sentinel' binds `inhibit-quit' according to this variable.")
+(defvar w3m-process-timeout 300
+  "Number of seconds idle time waiting for processes to terminate.")
+(defvar w3m-process-kill-surely (featurep 'meadow)
+  "If non-nil, kill the process surely.")
+
+(defconst w3m-process-max 5 "The maximum limit of the working processes.")
+(defvar w3m-process-queue nil "Queue of processes.")
+
+(defvar w3m-process-exit-status nil "The last exit status of a process.")
+(defvar w3m-process-authinfo-alist nil)
+(defvar w3m-process-accept-alist nil)
+
+(defvar w3m-process-user nil)
+(defvar w3m-process-passwd nil)
+(defvar w3m-process-realm nil)
+(defvar w3m-process-object nil)
+(make-variable-buffer-local 'w3m-process-user)
+(make-variable-buffer-local 'w3m-process-passwd)
+(make-variable-buffer-local 'w3m-process-realm)
+(make-variable-buffer-local 'w3m-process-object)
+
+(defvar w3m-process-modeline-string nil
+  "Modeline string to show status of retrieving process.")
+(make-variable-buffer-local 'w3m-process-modeline-string)
+
+(defvar w3m-process-proxy-user nil "User name of the proxy server.")
+(defvar w3m-process-proxy-passwd nil "Password of the proxy server.")
+(defvar w3m-process-ssl-passphrase nil
+  "Passphrase for the client certificate.")
+
+(defmacro w3m-process-with-coding-system (&rest body)
+  "Set coding systems for `w3m-command', and evaluate BODY."
+  `(let ((coding-system-for-read 'binary)
+	 (coding-system-for-write w3m-terminal-coding-system)
+	 (default-process-coding-system
+	   (cons 'binary w3m-terminal-coding-system))
+	 (process-connection-type w3m-process-connection-type))
+     ,@body))
+(put 'w3m-process-with-coding-system 'lisp-indent-function 0)
+(put 'w3m-process-with-coding-system 'edebug-form-spec '(body))
+
+(defmacro w3m-process-with-environment (alist &rest body)
+  "Set the environment variables according to ALIST, and evaluate BODY."
+  `(let ((process-environment (copy-sequence process-environment))
+	 (temporary-file-directory
+	  (if (file-directory-p w3m-profile-directory)
+	      (file-name-as-directory w3m-profile-directory)
+	    ,(if (featurep 'xemacs)
+		 ;; Though `temporary-file-directory' exists even in XEmacs,
+		 ;; that's only an imitation provided by APEL.
+		 '(temp-directory)
+	       'temporary-file-directory)))
+	 (default-directory
+	   (cond ((file-directory-p w3m-profile-directory)
+		  (file-name-as-directory w3m-profile-directory))
+		 ((file-directory-p (expand-file-name "~/"))
+		  (expand-file-name "~/"))
+		 (t temporary-file-directory))))
+     ;; XEmacs obtains tmp-dir from the `temp-directory' function of which
+     ;; return value can only be modified by the following env vars.
+     ,@(if (featurep 'xemacs)
+	   '((setenv "TEMP" temporary-file-directory) ;; Windoze
+	     (setenv "TMPDIR" temporary-file-directory))) ;; Un|x
+     (dolist (pair ,alist)
+       (setenv (car pair) (cdr pair)))
+     ,@body))
+(put 'w3m-process-with-environment 'lisp-indent-function 1)
+(put 'w3m-process-with-environment 'edebug-form-spec '(form body))
+
+(defun w3m-process-p (object)
+  "Return t if OBJECT is a `w3m-process' object."
+  (and (consp object)
+       (vectorp (cdr object))
+       (eq 'w3m-process-object (aref (cdr object) 0))))
+
+(put 'w3m-process-new 'edebug-form-spec '(form form form &optional form form))
+(defmacro w3m-process-new (command arguments buffer &optional process handlers)
+  "Return a new `w3m-process' object."
+  `(cons (cons ,command ,arguments)
+	 (vector 'w3m-process-object
+		 ,buffer
+		 ,process
+		 ,handlers)))
+
+(defmacro w3m-process-command (object)
+  `(car (car ,object)))
+(defmacro w3m-process-arguments (object)
+  `(cdr (car ,object)))
+(defmacro w3m-process-buffer (object)
+  `(aref (cdr ,object) 1))
+(defmacro w3m-process-process (object)
+  `(aref (cdr ,object) 2))
+(defmacro w3m-process-handlers (object)
+  `(aref (cdr ,object) 3))
+
+(put 'w3m-process-handler-new 'edebug-form-spec '(form form form))
+(defmacro w3m-process-handler-new (buffer parent-buffer functions)
+  `(vector ,buffer ,parent-buffer ,functions nil))
+(defmacro w3m-process-handler-buffer (handler)
+  `(aref ,handler 0))
+(defmacro w3m-process-handler-parent-buffer (handler)
+  `(aref ,handler 1))
+(defmacro w3m-process-handler-functions (handler)
+  `(aref ,handler 2))
+(defmacro w3m-process-handler-result (handler)
+  `(aref ,handler 3))
+
+(defun w3m-process-push (handler command arguments)
+  "Generate a new `w3m-process' object which is provided by HANDLER,
+ARGUMENTS and this buffer, regist it to `w3m-process-queue', and
+return it."
+  (let ((x (assoc (cons command arguments) w3m-process-queue)))
+    (unless x
+      (setq x (w3m-process-new command arguments (current-buffer)))
+      (push x w3m-process-queue))
+    (push (w3m-process-handler-new (current-buffer) w3m-current-buffer handler)
+	  (w3m-process-handlers x))
+    (with-current-buffer (w3m-process-buffer x)
+      (setq w3m-process-object x))))
+
+(defun w3m-process-kill-process (process)
+  "Kill process PROCESS safely."
+  (when (processp process)
+    (set-process-filter process 'ignore)
+    (set-process-sentinel process 'ignore)
+    (when (memq (process-status process) '(run stop))
+      (kill-process process)
+      (when w3m-process-kill-surely
+	(while (memq (process-status process) '(run stop))
+	  (sit-for 0.1))))))
+
+(defun w3m-process-start-process (object &optional no-sentinel)
+  "Start a process specified by the OBJECT, return always nil.
+When NO-SENTINEL is not equal to nil, all status changes of the
+generated asynchronous process is ignored.  Otherwise,
+`w3m-process-sentinel' is given to the process as the sentinel."
+  (if (w3m-process-process object)
+      (when no-sentinel
+	(set-process-sentinel (w3m-process-process object) 'ignore))
+    (with-current-buffer (w3m-process-buffer object)
+      (w3m-process-with-coding-system
+	(w3m-process-with-environment w3m-command-environment
+	  (let* ((command (w3m-process-command object))
+		 (proc (apply 'start-process command
+			      (current-buffer) command
+			      (w3m-process-arguments object)))
+		 (authinfo (when w3m-current-url
+			     (w3m-url-authinfo w3m-current-url)))
+		 (set-process-query-on-exit-flag
+		  (if (fboundp 'set-process-query-on-exit-flag)
+		      'set-process-query-on-exit-flag
+		    'process-kill-without-query)))
+	    (setq w3m-process-user (car authinfo)
+		  w3m-process-passwd (cdr authinfo)
+		  w3m-process-realm nil)
+	    (setf (w3m-process-process object) proc)
+	    (set-process-filter proc 'w3m-process-filter)
+	    (set-process-sentinel proc (if no-sentinel
+					   'ignore
+					 'w3m-process-sentinel))
+	    (funcall set-process-query-on-exit-flag proc nil))))))
+  nil)	;; The return value of `w3m-process-start-process'.
+
+(defun w3m-process-kill-stray-processes ()
+  "Kill stray processes."
+  (dolist (obj w3m-process-queue)
+    (unless (buffer-name (w3m-process-buffer obj))
+      (setq w3m-process-queue (delq obj w3m-process-queue))
+      (when (w3m-process-process obj)
+	(w3m-process-kill-process (w3m-process-process obj))))))
+
+(defun w3m-process-start-queued-processes ()
+  "Start a process which is registerd in `w3m-process-queue' if the
+number of current working processes is less than `w3m-process-max'."
+  (w3m-process-kill-stray-processes)
+  (let ((num 0))
+    (catch 'last
+      (dolist (obj (reverse w3m-process-queue))
+	(when (buffer-name (w3m-process-buffer obj))
+	  (if (> (incf num) w3m-process-max)
+	      (throw 'last nil)
+	    (w3m-process-start-process obj)))))))
+
+(defun w3m-process-stop (buffer)
+  "Remove handlers related to the buffer BUFFER, and stop processes
+which have no handler."
+  (interactive (list (current-buffer)))
+  (w3m-cancel-refresh-timer buffer)
+  (setq w3m-process-queue
+	(delq nil
+	      (mapcar
+	       (lambda (obj)
+		 (let ((handlers
+			;; List up handlers related to other buffer
+			;; than the buffer BUFFER.
+			(delq nil
+			      (mapcar
+			       (lambda (handler)
+				 (unless (eq buffer
+					     (w3m-process-handler-parent-buffer
+					      handler))
+				   handler))
+			       (w3m-process-handlers obj)))))
+		   (if handlers
+		       (w3m-process-new
+			(w3m-process-command obj)
+			(w3m-process-arguments obj)
+			(w3m-process-buffer obj)
+			(w3m-process-process obj)
+			(if (memq (w3m-process-buffer obj)
+				  (mapcar (lambda (x)
+					    (w3m-process-handler-buffer x))
+					  handlers))
+			    handlers
+			  (cons
+			   ;; Dummy handler to remove buffer.
+			   (w3m-process-handler-new
+			    (w3m-process-buffer obj)
+			    (w3m-process-handler-parent-buffer (car handlers))
+			    (lambda (x) (w3m-kill-buffer (current-buffer))))
+			   handlers)))
+		     (when (w3m-process-process obj)
+		       (w3m-process-kill-process (w3m-process-process obj)))
+		     (dolist (handler (w3m-process-handlers obj))
+		       (w3m-kill-buffer (w3m-process-handler-buffer handler)))
+		     nil)))
+	       w3m-process-queue)))
+  (when (buffer-name buffer)
+    (with-current-buffer buffer
+      (setq w3m-current-process nil)))
+  (w3m-process-start-queued-processes)
+  (w3m-force-window-update-later buffer))
+
+(defun w3m-process-shutdown ()
+  (let ((list w3m-process-queue))
+    (setq w3m-process-queue nil
+	  w3m-process-authinfo-alist nil
+	  w3m-process-accept-alist nil)
+    (dolist (obj list)
+      (when (buffer-name (w3m-process-buffer obj))
+	(when (w3m-process-process obj)
+	  (w3m-process-kill-process (w3m-process-process obj))))
+      (w3m-kill-buffer (w3m-process-buffer obj)))))
+
+(defmacro w3m-process-with-null-handler (&rest body)
+  "Generate the null handler, and evaluate BODY.
+When BODY is evaluated, the local variable `handler' keeps the null
+handler."
+  (let ((var (gensym "--tempvar--")))
+    `(let ((,var (let (handler) ,@body)))
+       (when (w3m-process-p ,var)
+	 (w3m-process-start-process ,var))
+       ,var)))
+(put 'w3m-process-with-null-handler 'lisp-indent-function 0)
+(put 'w3m-process-with-null-handler 'edebug-form-spec '(body))
+
+;; Error symbol:
+(put 'w3m-process-timeout 'error-conditions '(error w3m-process-timeout))
+(put 'w3m-process-timeout 'error-message "Time out")
+
+(defun w3m-process-error-handler (error-data process)
+  (setq w3m-process-queue (delq process w3m-process-queue))
+  (w3m-process-kill-process (w3m-process-process process))
+  (signal (car error-data) (cdr error-data)))
+
+(defvar w3m-process-waited nil
+  "Non-nil means that `w3m-process-with-wait-handler' is being evaluated.")
+
+(defun w3m-process-wait-process (process seconds)
+  "Wait for SECONDS seconds or until PROCESS will exit.
+Returns the exit status of the PROCESS when it exit normally,
+otherwise returns nil."
+  (catch 'timeout
+    (let ((start (current-time)))
+      (while (or (and (prog2
+			  (discard-input)
+			  (not (save-current-buffer (sit-for 0.1)))
+			(discard-input))
+		      ;; Some input is detected but it may be a key
+		      ;; press event which should be ignored when the
+		      ;; process is not running.
+		      (memq (process-status process) '(open run)))
+		 (memq (process-status process) '(open run stop)))
+	(and seconds
+	     (< seconds (w3m-time-lapse-seconds start (current-time)))
+	     (throw 'timeout nil)))
+      (process-exit-status process))))
+
+(defmacro w3m-process-with-wait-handler (&rest body)
+  "Generate the waiting handler, and evaluate BODY.
+When BODY is evaluated, the local variable `handler' keeps the handler
+which will wait for the end of the evaluation."
+  (let ((result (gensym "--result--"))
+	(wait-function (gensym "--wait-function--")))
+    `(let ((w3m-process-waited t)
+	   (,result)
+	   (,wait-function (make-symbol "wait-function")))
+       (fset ,wait-function 'identity)
+       (setq ,result (let ((handler (list ,wait-function))) ,@body))
+       (while (w3m-process-p ,result)
+	 (condition-case error
+	     (let (w3m-process-inhibit-quit inhibit-quit)
+	       ;; No sentinel function is registered and the process
+	       ;; sentinel function is called from this macro, in
+	       ;; order to avoid the dead-locking which occurs when
+	       ;; this macro is called in the environment that
+	       ;; `w3m-process-sentinel' is evaluated.
+	       (w3m-process-start-process ,result t)
+	       (unless (w3m-process-wait-process (w3m-process-process ,result)
+						 w3m-process-timeout)
+		 (w3m-process-error-handler (cons 'w3m-process-timeout nil)
+					    ,result)))
+	   (quit (w3m-process-error-handler error ,result)))
+	 (w3m-process-sentinel (w3m-process-process ,result) "finished\n" t)
+	 (setq ,result
+	       (catch 'result
+		 (dolist (handler (w3m-process-handlers ,result))
+		   (when (memq ,wait-function
+			       (w3m-process-handler-functions handler))
+		     (throw 'result (w3m-process-handler-result handler))))
+		 (w3m-process-error-handler (cons 'error
+						  "Can't find wait handler")
+					    ,result))))
+       ,result)))
+(put 'w3m-process-with-wait-handler 'lisp-indent-function 0)
+(put 'w3m-process-with-wait-handler 'edebug-form-spec '(body))
+
+;;; Explanation of w3m-process-do in Japanese:
+;;
+;; w3m-process-do $B$O!"HsF14|=hM}$r4JC1$K=q$/$?$a$N%^%/%m$G$"$k!#Nc$($P!"(B
+;;
+;;    (w3m-process-do
+;;        (var (async-form...))
+;;      post-body...)
+;;
+;; $B$H$$$&$h$&$K=q$/$H!"0J2<$N=g=x$G=hM}$,9T$o$l$k!#(B
+;;
+;;   (1) async-form $B$rI>2A(B
+;;       --> async-form $BFb$GHsF14|%W%m%;%9$,@8@.$5$l$?>l9g$O!"$=$NHsF1(B
+;;           $B4|%W%m%;%9=*N;8e$K(B post-body $B$,I>2A$5$l$k$h$&$K!"%O%s%I%i(B
+;;           $B$KDI2C(B
+;;       --> $BHsF14|%W%m%;%9$,@8@.$5$l$J$+$C$?>l9g$O!"C1$K<!$N%9%F%C%W(B
+;;           $B$K?J$`(B(= post-body $B$rI>2A$9$k(B)$B!#(B
+;;   (2) post-body $B$rI>2A(B
+;;
+;; $B$J$*!"(Basync-form / post-body $B$,I>2A$5$l$k;~!"$=$NFbIt$GHsF14|%W%m%;(B
+;; $B%9$,@8@.$5$l$?>l9g$K!"$=$NJV$jCM$r=hM}$9$k$?$a$N%O%s%I%i$,!"JQ?t(B
+;; handler $B$K@_Dj$5$l$F$$$k!#HsF14|$J=hM}$r9T$&4X?t$r8F$S=P$9>l9g$K$O!"(B
+;; $B$=$N4X?t$N0z?t$H$7$FI,$:(B handler $B$rEO$5$J$1$l$P$J$i$J$$!#(B
+;;
+;; $B$^$?!"(Bw3m-process-do $B$O!"8=:_$N%O%s%I%i$NFbMF$rD4$Y$k$?$a!"$=$N%^%/(B
+;; $B%m$,8F$S=P$5$l$F$$$k4D6-$NJQ?t(B handler $B$r;2>H$9$k!#Nc$($P!"(B
+;;
+;;    (let (handler) (w3m-process-do ...))
+;;
+;; $B$HJQ?t(B handler $B$r(B nil $B$KB+G{$7$F$*$/$H!"!V8=;~E@$N%O%s%I%i$O6u$G$"(B
+;; $B$k(B = $BHsF14|%W%m%;%9<B9T8e$KI,MW$J=hM}$OB8:_$7$J$$!W$H$$$&0UL#$K$J$j!"(B
+;; w3m-process-do() $B$O!"HsF14|%W%m%;%9$,@8@.$5$l$?>l9g$K$OC1$K(B nil $B$r(B
+;; $BJV$7!"$=$l0J30$N>l9g$O(B post-body $B$NCM$rJV$9!#(B
+;;
+(defmacro w3m-process-do (spec &rest body)
+  "(w3m-process-do (VAR FORM) BODY...): Eval the body BODY asynchronously.
+If an asynchronous process is generated in the evaluation of the form
+FORM, this macro returns its object immdiately, and the body BODY will
+be evaluated after the end of the process with the variable VAR which
+is set to the result of the form FORM.  Otherwise, the body BODY is
+evaluated at the same time, and this macro returns the result of the
+body BODY."
+  (let ((var (or (car spec) (gensym "--tempvar--")))
+	(form (cdr spec))
+	(post-function (gensym "--post-function--")))
+    `(let ((,post-function (lambda (,var) ,@body)))
+       (let ((,var (let ((handler (cons ,post-function handler)))
+		     ,@form)))
+	 (if (w3m-process-p ,var)
+	     (if handler
+		 ,var
+	       (w3m-process-start-process ,var))
+	   (if (w3m-process-p (setq ,var (funcall ,post-function ,var)))
+	       (if handler
+		   ,var
+		 (w3m-process-start-process ,var))
+	     ,var))))))
+(put 'w3m-process-do 'lisp-indent-function 1)
+(put 'w3m-process-do 'edebug-form-spec '((symbolp form) def-body))
+
+(defmacro w3m-process-do-with-temp-buffer (spec &rest body)
+  "(w3m-process-do-with-temp-buffer (VAR FORM) BODY...):
+Like `w3m-process-do', but the form FORM and the body BODY are
+evaluated in a temporary buffer."
+  (let ((var (or (car spec) (gensym "--tempvar--")))
+	(form (cdr spec))
+	(post-body (gensym "--post-body--"))
+	(post-handler (gensym "--post-handler--"))
+	(temp-buffer (gensym "--temp-buffer--"))
+	(current-buffer (gensym "--current-buffer--")))
+    `(lexical-let ((,temp-buffer
+		    (w3m-get-buffer-create
+		     (generate-new-buffer-name w3m-work-buffer-name)))
+		   (,current-buffer (current-buffer)))
+       (labels ((,post-body (,var)
+			    (when (buffer-name ,temp-buffer)
+			      (set-buffer ,temp-buffer))
+			    ,@body)
+		(,post-handler (,var)
+			       (w3m-kill-buffer ,temp-buffer)
+			       (when (buffer-name ,current-buffer)
+				 (set-buffer ,current-buffer))
+			       ,var))
+	 (let ((,var (let ((handler
+			    (cons ',post-body (cons ',post-handler handler))))
+		       (with-current-buffer ,temp-buffer ,@form))))
+	   (if (w3m-process-p ,var)
+	       (if handler
+		   ,var
+		 (w3m-process-start-process ,var))
+	     (if (w3m-process-p
+		  (setq ,var (save-current-buffer
+			       (let ((handler (cons ',post-handler handler)))
+				 (,post-body ,var)))))
+		 (if handler
+		     ,var
+		   (w3m-process-start-process ,var))
+	       (,post-handler ,var))))))))
+(put 'w3m-process-do-with-temp-buffer 'lisp-indent-function 1)
+(put 'w3m-process-do-with-temp-buffer 'edebug-form-spec
+     '((symbolp form) def-body))
+
+
+(defun w3m-process-start (handler command arguments)
+  "Run COMMAND with ARGUMENTS, and eval HANDLER asynchronously."
+  (if w3m-async-exec
+      (w3m-process-do
+	  (exit-status (w3m-process-push handler command arguments))
+	(w3m-process-start-after exit-status))
+    (w3m-process-start-after
+     (w3m-process-with-coding-system
+       (w3m-process-with-environment w3m-command-environment
+	 (apply 'call-process command nil t nil arguments))))))
+
+(defun w3m-process-start-after (exit-status)
+  (when w3m-current-buffer
+    (with-current-buffer w3m-current-buffer
+      (setq w3m-process-modeline-string nil)))
+  (cond
+   ((numberp exit-status)
+    (zerop (setq w3m-process-exit-status exit-status)))
+   ((not exit-status)
+    (setq w3m-process-exit-status nil))
+   (t
+    (setq w3m-process-exit-status
+	  (string-as-multibyte (format "%s" exit-status)))
+    nil)))
+
+(defvar w3m-process-background nil
+  "Non-nil means that an after handler is being evaluated.")
+
+(defun w3m-process-sentinel (process event &optional ignore-queue)
+  ;; Ensure that this function will be never called repeatedly.
+  (set-process-sentinel process 'ignore)
+  (let ((inhibit-quit w3m-process-inhibit-quit)
+	(w3m-process-background t))
+    (unwind-protect
+	(if (buffer-name (process-buffer process))
+	    (with-current-buffer (process-buffer process)
+	      (w3m-static-unless (featurep 'xemacs)
+		(accept-process-output process 1))
+	      (setq w3m-process-queue
+		    (delq w3m-process-object w3m-process-queue))
+	      (let ((exit-status (process-exit-status process))
+		    (buffer (current-buffer))
+		    (realm  w3m-process-realm)
+		    (user   w3m-process-user)
+		    (passwd w3m-process-passwd)
+		    (obj    w3m-process-object))
+		(setq w3m-process-object nil)
+		(dolist (x (w3m-process-handlers obj))
+		  (when (and
+			 (buffer-name (w3m-process-handler-buffer x))
+			 (buffer-name (w3m-process-handler-parent-buffer x)))
+		    (set-buffer (w3m-process-handler-buffer x))
+		    (unless (eq buffer (current-buffer))
+		      (insert-buffer-substring buffer))))
+		(dolist (x (w3m-process-handlers obj))
+		  (when (and
+			 (buffer-name (w3m-process-handler-buffer x))
+			 (buffer-name (w3m-process-handler-parent-buffer x)))
+		    (set-buffer (w3m-process-handler-buffer x))
+		    (let ((w3m-process-exit-status)
+			  (w3m-current-buffer
+			   (w3m-process-handler-parent-buffer x))
+			  (handler
+			   (w3m-process-handler-functions x))
+			  (exit-status exit-status))
+		      (when realm
+			(w3m-process-set-authinfo w3m-current-url
+						  realm user passwd))
+		      (while (and handler
+				  (not (w3m-process-p
+					(setq exit-status
+					      (funcall (pop handler)
+						       exit-status))))))
+		      (setf (w3m-process-handler-result x) exit-status))))))
+	  ;; Something wrong has been occured.
+	  (catch 'last
+	    (dolist (obj w3m-process-queue)
+	      (when (eq process (w3m-process-process obj))
+		(setq w3m-process-queue (delq obj w3m-process-queue))
+		(throw 'last nil)))))
+      (delete-process process)
+      (unless ignore-queue
+	(w3m-process-start-queued-processes)))))
+
+(defun w3m-process-filter (process string)
+  (when (buffer-name (process-buffer process))
+    (with-current-buffer (process-buffer process)
+      (let ((inhibit-read-only t)
+	    (case-fold-search nil))
+	(goto-char (process-mark process))
+	(insert string)
+	(set-marker (process-mark process) (point))
+	(unless (string= "" string)
+	  (goto-char (point-min))
+	  (cond
+	   ((and (looking-at
+		  "\\(?:Accept [^\n]+\n\\)*\\([^\n]+: accept\\? \\)(y/n)")
+		 (= (match-end 0) (point-max)))
+	    ;; SSL certificate
+	    (message "")
+	    (let ((yn (w3m-process-y-or-n-p w3m-current-url (match-string 1))))
+	      (ignore-errors
+		(process-send-string process (if yn "y\n" "n\n"))
+		(delete-region (point-min) (point-max)))))
+	   ((and (looking-at "\n?Accept unsecure SSL session:.*\n")
+		 (= (match-end 0) (point-max)))
+	    (delete-region (point-min) (point-max)))
+	   ((and (looking-at "\\(\n?Wrong username or password\n\\)?\
+Proxy Username for \\(?:.*\\): Proxy Password: ")
+		 (= (match-end 0) (point-max)))
+	    (when (or (match-beginning 1)
+		      (not (stringp w3m-process-proxy-passwd)))
+	      (setq w3m-process-proxy-passwd
+		    (read-passwd "Proxy Password: ")))
+	    (ignore-errors
+	      (process-send-string process
+				   (concat w3m-process-proxy-passwd "\n"))
+	      (delete-region (point-min) (point-max))))
+	   ((and (looking-at "\\(\n?Wrong username or password\n\\)?\
+Proxy Username for \\(.*\\): ")
+		 (= (match-end 0) (point-max)))
+	    (when (or (match-beginning 1)
+		      (not (stringp w3m-process-proxy-user)))
+	      (setq w3m-process-proxy-user
+		    (read-from-minibuffer (concat
+					   "Proxy Username for "
+					   (match-string 2) ": "))))
+	    (ignore-errors
+	      (process-send-string process
+				   (concat w3m-process-proxy-user "\n"))))
+	   ((and (looking-at "\\(\n?Wrong username or password\n\\)?\
+Username for [^\n]*\n?: Password: ")
+		 (= (match-end 0) (point-max)))
+	    (when (or (match-beginning 1)
+		      (not (stringp w3m-process-passwd)))
+	      (setq w3m-process-passwd
+		    (w3m-process-read-passwd w3m-current-url
+					     w3m-process-realm
+					     w3m-process-user
+					     (match-beginning 1))))
+	    (ignore-errors
+	      (process-send-string process
+				   (concat w3m-process-passwd "\n"))
+	      (delete-region (point-min) (point-max))))
+	   ((and (looking-at "\\(\n?Wrong username or password\n\\)?\
+Username for \\(.*\\)\n?: ")
+		 (= (match-end 0) (point-max)))
+	    (setq w3m-process-realm (w3m-decode-coding-string-with-priority
+				     (match-string 2) nil))
+	    (when (or (match-beginning 1)
+		      (not (stringp w3m-process-user)))
+	      (setq w3m-process-user
+		    (w3m-process-read-user w3m-current-url
+					   w3m-process-realm
+					   (match-beginning 1))))
+	    (ignore-errors
+	      (process-send-string process
+				   (concat w3m-process-user "\n"))))
+	   ((and (looking-at "Enter PEM pass phrase:")
+		 (= (match-end 0) (point-max)))
+	    (unless (stringp w3m-process-ssl-passphrase)
+	      (setq w3m-process-ssl-passphrase
+		    (read-passwd "PEM pass phrase: ")))
+	    (ignore-errors
+	      (process-send-string process
+				   (concat w3m-process-ssl-passphrase "\n"))
+	      (delete-region (point-min) (point-max))))
+	   ((progn
+	      (or (search-forward "\nW3m-current-url:" nil t)
+		  (goto-char (process-mark process)))
+	      (re-search-backward
+	       "^W3m-\\(?:in-\\)?progress: \\([.0-9]+/[.0-9]+[a-zA-Z]?b\\)$"
+	       nil t))
+	    (let ((str (w3m-process-modeline-format (match-string 1)))
+		  (buf))
+	      (save-current-buffer
+		(dolist (handler (w3m-process-handlers w3m-process-object))
+		  (when (setq buf (w3m-process-handler-parent-buffer handler))
+		    (if (buffer-name buf)
+			(progn
+			  (set-buffer buf)
+			  (setq w3m-process-modeline-string str))
+		      (w3m-process-kill-stray-processes)))))))))))))
+
+(defun w3m-process-modeline-format (str)
+  (ignore-errors
+    (cond
+     ((stringp w3m-process-modeline-format)
+      (format w3m-process-modeline-format
+	      (if (string-match "/0\\([a-zA-Z]?b\\)\\'" str)
+		  (replace-match "\\1" t nil str)
+		str)))
+     ((functionp w3m-process-modeline-format)
+      (funcall w3m-process-modeline-format str)))))
+
+;; w3m-process-authinfo-alist has an association list as below format.
+;; (("root1" ("realm11" ("user11" . "pass11")
+;;                      ("user12" . "pass12"))
+;;           ("realm12" ("user13" . "pass13")))
+;;  ("root2" ("realm21" ("user21" . "pass21"))))
+(defun w3m-process-set-authinfo (url realm username password)
+  (let (x y z (root (w3m-get-server-hostname url)))
+    (if (setq x (assoc root w3m-process-authinfo-alist))
+	(if (setq y (assoc realm x))
+	    (if (setq z (assoc username y))
+		;; Change a password only.
+		(setcdr z password)
+	      ;; Add a pair of a username and a password.
+	      (setcdr y (cons (cons username password) (cdr y))))
+	  ;; Add a 3-tuple of a realm, a username and a password.
+	  (setcdr x (cons (cons realm (list (cons username password)))
+			  (cdr x))))
+      ;; Add a 4-tuple of a server root, a realm, a username and a password.
+      (push (cons root (list (cons realm (list (cons username password)))))
+	    w3m-process-authinfo-alist))))
+
+(defun w3m-process-read-user (url &optional realm ignore-history)
+  "Read a user name for URL and REALM."
+  (let* ((root (when (stringp url) (w3m-get-server-hostname url)))
+	 (ident (or realm root))
+	 (alist))
+    (if (and (not ignore-history)
+	     (setq alist
+		   (cdr (assoc realm
+			       (cdr (assoc root
+					   w3m-process-authinfo-alist))))))
+	(if (= 1 (length alist))
+	    (caar alist)
+	  (completing-read (if ident
+			       (format "Select username for %s: " ident)
+			     "Select username: ")
+			   (mapcar (lambda (x) (cons (car x) (car x))) alist)
+			   nil t))
+      (read-from-minibuffer (if ident
+				(format "Username for %s: " ident)
+			      "Username: ")))))
+
+(defun w3m-process-read-passwd (url &optional realm username ignore-history)
+  "Read a password for URL, REALM, and USERNAME."
+  (let* ((root (when (stringp url) (w3m-get-server-hostname url)))
+	 (ident (or realm root))
+	 (pass (cdr (assoc username
+			   (cdr (assoc realm
+				       (cdr (assoc root
+						   w3m-process-authinfo-alist))))))))
+    (if (and pass (not ignore-history))
+	pass
+      (read-passwd (format (if ident
+			       (format "Password for %s%%s: " ident)
+			     "Password%s: ")
+			   (if (and (stringp pass)
+				    (> (length pass) 0)
+				    (not (featurep 'xemacs)))
+			       (concat " (default "
+				       (make-string (length pass) ?\*)
+				       ")")
+			     ""))
+		   nil pass))))
+
+(defun w3m-process-y-or-n-p (url prompt)
+  "Ask user a \"y or n\" question.  Return t if answer is \"y\".
+NOTE: This function is designed to avoid annoying questions.  So when
+the same questions is reasked, its previous answer is reused without
+prompt."
+  (let ((root (w3m-get-server-hostname url))
+	(map (copy-keymap query-replace-map))
+	elem answer)
+    ;; ignore [space] to avoid answering y without intention.
+    (define-key map " " 'ignore)
+    (let ((query-replace-map map))
+      (if (setq elem (assoc root w3m-process-accept-alist))
+	  (if (member prompt (cdr elem))
+	      ;; When the same question has been asked, the previous
+	      ;; answer is reused.
+	      (setq answer t)
+	    ;; When any question for the same server has been asked,
+	    ;; regist the pair of this question and its answer to
+	    ;; `w3m-process-accept-alist'.
+	    (when (setq answer (y-or-n-p prompt))
+	      (setcdr elem (cons prompt (cdr elem)))))
+	;; When no question for the same server has been asked, regist
+	;; the 3-tuple of the server, the question and its answer to
+	;; `w3m-process-accept-alist'.
+	(when (setq answer (y-or-n-p prompt))
+	  (push (cons root (list prompt)) w3m-process-accept-alist)))
+      answer)))
+
+;; Silence the byte compiler complaining against `gensym' like:
+;; "Warning: the function `gensym' might not be defined at runtime."
+(eval-when-compile
+  (and (boundp 'byte-compile-unresolved-functions)
+       (fboundp 'gensym)
+       (symbol-file 'gensym)
+       (string-match "/cl-macs\\.el[^/]*\\'" (symbol-file 'gensym))
+       (condition-case nil
+	   (setq byte-compile-unresolved-functions
+		 (delq (assq 'gensym byte-compile-unresolved-functions)
+		       byte-compile-unresolved-functions))
+	 (error))))
+
+(provide 'w3m-proc)
+
+;;; w3m-proc.el ends here

=== added file 'share/emacs/site-lisp/w3m/w3m-rss.el'
--- share/emacs/site-lisp/w3m/w3m-rss.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-rss.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,169 @@
+;;; w3m-rss.el --- RSS functions
+
+;; Copyright (C) 2004, 2005 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Keywords: w3m, WWW, hypermedia
+
+;; This file is a part of emacs-w3m.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+
+;;; Commentary:
+
+;; w3m-rss.el provides RSS-related functions for emacs-w3m.  For more
+;; detail about emacs-w3m, see:
+;;
+;;    http://emacs-w3m.namazu.org/
+
+
+;;; Acknowledgment:
+
+;; I refered functions in `sb-rss.el' to implement this module.
+;; Thanks to Koichiro Ohba and NAKAJIMA Mikio.
+
+
+;;; Code:
+
+(eval-when-compile (require 'cl))
+(autoload 'xml-parse-region "xml")
+
+(eval-and-compile
+  (autoload 'timezone-parse-date "timezone")
+  (autoload 'timezone-parse-time "timezone"))
+
+(eval-when-compile
+  ;; Avoid warning for Emacs 19 and XEmacs.
+  (unless (fboundp 'match-string-no-properties)
+    (autoload 'match-string-no-properties "poe"))
+  ;; Avoid warning for Emacs 19.
+  (unless (fboundp 'split-string)
+    (autoload 'split-string "poe")))
+
+(defun w3m-rss-parse-date-string (date)
+  "Decode DATE string written in the ISO 8601 format or the RFC822 style.
+Return a list of numbers which conforms to the Emacs internal format.
+Valid types in the ISO 8601 format include:
+
+    Year:
+       YYYY (eg 1997)
+    Year and month:
+       YYYY-MM (eg 1997-07)
+    Complete date:
+       YYYY-MM-DD (eg 1997-07-16)
+    Complete date plus hours and minutes:
+       YYYY-MM-DDThh:mmTZD (eg 1997-07-16T19:20+01:00)
+    Complete date plus hours, minutes and seconds:
+       YYYY-MM-DDThh:mm:ssTZD (eg 1997-07-16T19:20:30+01:00)
+    Complete date plus hours, minutes, seconds and a decimal fraction
+    of a second
+       YYYY-MM-DDThh:mm:ss.sTZD (eg 1997-07-16T19:20:30.45+01:00)
+
+where:
+  YYYY = four-digit year
+  MM   = two-digit month (01=January, etc.)
+  DD   = two-digit day of month (01 through 31)
+  hh   = two digits of hour (00 through 23) (am/pm NOT allowed)
+  mm   = two digits of minute (00 through 59)
+  ss   = two digits of second (00 through 59)
+  s    = one or more digits representing a decimal fraction of a second
+  TZD  = time zone designator (Z or +hh:mm or -hh:mm)
+
+For more detail about ISO 8601 date format, see
+<URL:http://www.w3.org/TR/NOTE-datetime>.
+
+In addition to the above, it also supports the date format in the
+RFC822 style which RSS 2.0 allows.  Valid types are the same as ones
+which are supported by the `timezone-parse-date' function (which see)."
+  (cond ((not date) nil)
+	((string-match " [0-9]+ " date)
+	 (let* ((vector (timezone-parse-date date))
+		(year (string-to-number (aref vector 0)))
+		time)
+	   (when (>= year 1970)
+	     (setq time (timezone-parse-time (aref vector 3)))
+	     (encode-time
+	      (string-to-number (aref time 2))
+	      (string-to-number (aref time 1))
+	      (string-to-number (aref time 0))
+	      (string-to-number (aref vector 2))
+	      (string-to-number (aref vector 1))
+	      year
+	      (aref vector 4)))))
+	((string-match "\
+\\([0-9][0-9][0-9][0-9]\\)\\(?:-\\([0-9][0-9]\\)\\)?\\(?:-\\([0-9][0-9]\\)\\)?\
+T?\\(?:\\([0-9][0-9]\\):\\([0-9][0-9]\\)\\(?::\\([.0-9]+\\)\\)?\\)?\
+\\(?:\\([-+]\\)\\([0-9][0-9]\\):?\\([0-9][0-9]\\)\\|Z\\)?"
+		       date)
+	 (labels ((substr (n default)
+			  (if (match-beginning n)
+			      (string-to-number
+			       (match-string-no-properties n date))
+			    default)))
+	   (encode-time
+	    (substr 6 0) ;; seconds
+	    (substr 5 0) ;; minitue
+	    (substr 4 0) ;; hour
+	    (substr 3 1) ;; day
+	    (substr 2 1) ;; month
+	    (substr 1 0) ;; year
+	    (if (match-beginning 7)
+		(funcall (intern (match-string-no-properties 7 date))
+			 0
+			 (* 3600 (substr 8 0))
+			 (* 60 (substr 9 0)))
+	      0))))))
+
+(defun w3m-rss-find-el (tag data)
+  "Find the all matching elements in the data.  Careful with this on
+large documents!"
+  (let (found)
+    (when (listp data)
+      (dolist (bit data)
+	(when (car-safe bit)
+	  (when (equal tag (car bit))
+	    (setq found (nconc found (list bit))))
+	  (setq found
+		(nconc found
+		       (w3m-rss-find-el
+			tag
+			(if (and (listp (car-safe (caddr bit)))
+				 (not (stringp (caddr bit))))
+			    (caddr bit)
+			  (cddr bit))))))))
+    found))
+
+(defun w3m-rss-get-namespace-prefix (el uri)
+  "Given EL (containing a parsed element) and URI (containing a string
+that gives the URI for which you want to retrieve the namespace
+prefix), return the prefix.
+See http://feeds.archive.org/validator/docs/howto/declare_namespaces.html
+for more RSS namespaces."
+  (let* ((prefix (car (rassoc uri (cadar el))))
+	 (nslist (when prefix
+		   (split-string (symbol-name prefix) ":")))
+	 (ns (cond ((eq (length nslist) 1) ; no prefix given
+		    "")
+		   ((eq (length nslist) 2) ; extract prefix
+		    (cadr nslist)))))
+    (if (and ns (not (equal ns "")))
+	(concat ns ":")
+      ns)))
+
+(provide 'w3m-rss)
+
+;;; w3m-rss.el ends here

=== added file 'share/emacs/site-lisp/w3m/w3m-search.el'
--- share/emacs/site-lisp/w3m/w3m-search.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-search.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,365 @@
+;;; w3m-search.el --- functions convenient to access web search engines
+
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Authors: Keisuke Nishida    <kxn30@po.cwru.edu>,
+;;          Shun-ichi GOTO     <gotoh@taiyo.co.jp>,
+;;          TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
+;;          Romain FRANCOISE   <romain@orebokech.com>
+;; Keywords: w3m, WWW, hypermedia
+
+;; This file is a part of emacs-w3m.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; This module contains the `w3m-search' command and some utilities
+;; to improve your cyberlife.  For more detail about emacs-w3m, see:
+;;
+;;    http://emacs-w3m.namazu.org/
+
+;;; Code:
+
+(eval-when-compile
+  (require 'cl))
+
+(require 'w3m)
+
+(defcustom w3m-search-engine-alist
+  (let* ((ja (equal "Japanese" w3m-language))
+	 (utf-8 (or (and (boundp 'mule-version)
+			 (not (string< (symbol-value 'mule-version) "6.0")))
+		    (featurep 'un-define)
+		    (fboundp 'utf-translate-cjk-mode)
+		    (and (not ja) (w3m-find-coding-system 'utf-8)))))
+    `(,@(if ja
+	    '(("yahoo"
+	       "http://search.yahoo.co.jp/bin/search?p=%s"
+	       euc-japan)
+	      ("yahoo-en"
+	       "http://search.yahoo.com/bin/search?p=%s"))
+	  '(("yahoo"
+	     "http://search.yahoo.com/bin/search?p=%s")
+	    ("yahoo-ja"
+	     "http://search.yahoo.co.jp/bin/search?p=%s"
+	     euc-japan)))
+      ("alc" "http://eow.alc.co.jp/%s/UTF-8/" utf-8)
+      ,@(cond
+	 ((and ja utf-8)
+	  '(("blog"
+	     "http://blogsearch.google.com/blogsearch?q=%s&hl=ja&lr=lang_ja&oe=utf-8&ie=utf-8"
+	     utf-8)
+	    ("blog-en"
+	     "http://blogsearch.google.com/blogsearch?q=%s&hl=en&oe=utf-8&ie=utf-8"
+	     utf-8)))
+	 (ja
+	  '(("blog"
+	     "http://blogsearch.google.com/blogsearch?q=%s&hl=ja&lr=lang_ja&ie=Shift_JIS&oe=Shift_JIS"
+	     shift_jis)
+	    ("blog-en"
+	     "http://blogsearch.google.com/blogsearch?q=%s&hl=en")))
+	 (utf-8
+	  '(("blog"
+	     "http://blogsearch.google.com/blogsearch?q=%s&oe=utf-8&ie=utf-8"
+	     utf-8)
+	    ("blog-en"
+	     "http://blogsearch.google.com/blogsearch?q=%s&hl=en&oe=utf-8&ie=utf-8"
+	     utf-8)))
+	 (t
+	  '(("blog"
+	     "http://blogsearch.google.com/blogsearch?q=%s")
+	    ("blog-ja"
+	     "http://blogsearch.google.com/blogsearch?q=%s&lr=lang_ja&ie=Shift_JIS&oe=Shift_JIS"
+	     shift_jis))))
+      ,@(cond
+	 ((and ja utf-8)
+	  '(("google"
+	     "http://www.google.com/search?q=%s&hl=ja&lr=lang_ja&ie=utf-8&oe=utf-8"
+	     utf-8)
+	    ("google-en"
+	     "http://www.google.com/search?q=%s&hl=en&ie=utf-8&oe=utf-8"
+	     utf-8)))
+	 (ja
+	  '(("google"
+	     "http://www.google.com/search?q=%s&hl=ja&lr=lang_ja&ie=Shift_JIS&oe=Shift_JIS"
+	     shift_jis)
+	    ("google-en"
+	     "http://www.google.com/search?q=%s&hl=en")))
+	 (utf-8
+	  '(("google"
+	     "http://www.google.com/search?q=%s&ie=utf-8&oe=utf-8"
+	     utf-8)
+	    ("google-en"
+	     "http://www.google.com/search?q=%s&hl=en&ie=utf-8&oe=utf-8"
+	     utf-8)))
+	 (t
+	  '(("google"
+	     "http://www.google.com/search?q=%s")
+	    ("google-ja"
+	     "http://www.google.com/search?q=%s&hl=ja&lr=lang_ja&ie=Shift_JIS&oe=Shift_JIS"
+	     shift_jis))))
+      ,@(cond
+	 ((and ja utf-8)
+	  '(("google news"
+	     "http://news.google.co.jp/news?hl=ja&ie=utf-8&q=%s&oe=utf-8"
+	     utf-8)
+	    ("google news-en"
+	     "http://news.google.com/news?hl=en&q=%s")))
+	 (ja
+	  '(("google news"
+	     "http://news.google.co.jp/news?hl=ja&ie=Shift_JIS&q=%s&oe=Shift_JIS"
+	     shift_jis)
+	    ("google news-en"
+	     "http://news.google.com/news?hl=en&q=%s")))
+	 (utf-8
+	  '(("google news"
+	     "http://news.google.com/news?ie=utf-8&q=%s&oe=utf-8"
+	     utf-8)
+	    ("google news-en"
+	     "http://news.google.com/news?hl=en&ie=utf-8&q=%s&oe=utf-8")))
+	 (t
+	  '(("google news"
+	     "http://news.google.com/news?q=%s")
+	    ("google news-ja"
+	     "http://news.google.co.jp/news?hl=ja&ie=Shift_JIS&q=%s&oe=Shift_JIS"
+	     shift_jis))))
+      ("google groups"
+       "http://groups.google.com/groups?q=%s")
+      ,@(if ja
+	    '(("All the Web"
+	       "http://www.alltheweb.com/search?web&_sb_lang=ja&cs=euc-jp\
+&q=%s"
+	       euc-japan)
+	      ("All the Web-en"
+	       "http://www.alltheweb.com/search?web&_sb_lang=en&q=%s"))
+	  '(("All the Web"
+	     "http://www.alltheweb.com/search?web&_sb_lang=en&q=%s")
+	    ("All the Web-ja"
+	     "http://www.alltheweb.com/search?web&_sb_lang=ja&cs=euc-jp&q=%s"
+	     euc-japan)))
+      ,@(if ja
+	    '(("technorati"
+	       "http://www.technorati.jp/search/search.html?query=%s&language=ja"
+	       utf-8)
+	      ("technorati-en"
+	       "http://www.technorati.com/search/%s"
+	       utf-8))
+	  '(("technorati"
+	     "http://www.technorati.com/search/%s"
+	     utf-8)
+	    ("technorati-ja"
+	     "http://www.technorati.jp/search/search.html?query=%s&language=ja"
+	     utf-8)))
+      ("technorati-tag"
+       "http://www.technorati.com/tag/%s"
+       utf-8)
+      ("goo-ja"
+       "http://search.goo.ne.jp/web.jsp?MT=%s"
+       euc-japan)
+      ("excite-ja"
+       "http://www.excite.co.jp/search.gw?target=combined&look=excite_jp\
+&lang=jp&tsug=-1&csug=-1&search=%s"
+       shift_jis)
+      ("altavista"
+       "http://altavista.com/sites/search/web?q=\"%s\"&kl=ja&search=Search")
+      ("rpmfind"
+       "http://rpmfind.net/linux/rpm2html/search.php?query=%s"
+       nil)
+      ("debian-pkg"
+       "http://packages.debian.org/cgi-bin/search_contents.pl\
+?directories=yes&arch=i386&version=unstable&case=insensitive&word=%s")
+      ("debian-bts"
+       "http://bugs.debian.org/cgi-bin/pkgreport.cgi?archive=yes&pkg=%s")
+      ("freebsd-users-jp"
+       "http://home.jp.FreeBSD.org/cgi-bin/namazu.cgi?key=\"%s\"&whence=0\
+&max=50&format=long&sort=score&dbname=FreeBSD-users-jp"
+       euc-japan)
+      ("iij-archie"
+       "http://www.iij.ad.jp/cgi-bin/archieplexform?query=%s\
+&type=Case+Insensitive+Substring+Match&order=host&server=archie1.iij.ad.jp\
+&hits=95&nice=Nice")
+      ("waei"
+       "http://dictionary.goo.ne.jp/search.php?MT=%s&kind=je"
+       euc-japan)
+      ("eiwa"
+       "http://dictionary.goo.ne.jp/search.php?MT=%s&kind=ej")
+      ("kokugo"
+       "http://dictionary.goo.ne.jp/search.php?MT=%s&kind=jn"
+       euc-japan)
+      ("eiei"
+       "http://www.dictionary.com/cgi-bin/dict.pl?term=%s&r=67")
+      ,@(if ja
+	    '(("amazon"
+	       "http://www.amazon.co.jp/gp/search?\
+__mk_ja_JP=%%83J%%83%%5E%%83J%%83i&url=search-alias%%3Daps&field-keywords=%s"
+	       shift_jis)
+	      ("amazon-en"
+	       "http://www.amazon.com/exec/obidos/search-handle-form/\
+250-7496892-7797857"
+	       iso-8859-1
+	       "url=index=blended&field-keywords=%s"))
+	  '(("amazon"
+	     "http://www.amazon.com/exec/obidos/search-handle-form/\
+250-7496892-7797857"
+	     iso-8859-1
+	     "url=index=blended&field-keywords=%s")
+	    ("amazon-ja"
+	       "http://www.amazon.co.jp/gp/search?\
+__mk_ja_JP=%%83J%%83%%5E%%83J%%83i&url=search-alias%%3Daps&field-keywords=%s"
+	       shift_jis)))
+      ("emacswiki" "http://www.emacswiki.org/cgi-bin/wiki?search=%s")
+      ("en.wikipedia" "http://en.wikipedia.org/wiki/Special:Search?search=%s")
+      ("de.wikipedia" "http://de.wikipedia.org/wiki/Spezial:Search?search=%s"
+       utf-8)
+      ("ja.wikipedia" "http://ja.wikipedia.org/wiki/Special:Search?search=%s"
+       utf-8)
+      ("msdn" "http://search.msdn.microsoft.com/search/default.aspx?query=%s")
+      ("freshmeat" "http://freshmeat.net/search/?q=%s&section=projects")))
+  "*An alist of search engines.
+Each element looks like (ENGINE ACTION CODING POST-DATA)
+ENGINE is a string, the name of the search engine.
+ACTION is a string, the URL that performs a search.
+ACTION must contain a \"%s\", which is substituted by a query string.
+CODING is optional value which is coding system for query string.
+POST-DATA is optional value which is a string for POST method search engine.
+If CODING is omitted, it defaults to `w3m-default-coding-system'."
+  :group 'w3m
+  :type `(repeat
+	  (group :indent 2
+		 (string :format "Engine: %v\n" :size 0)
+		 (string :format "       Action: %v\n" :size 0)
+		 (coding-system :format "%t: %v\n" :size 0)
+		 (checklist :inline t
+			    :entry-format ,(if (w3m-device-on-window-system-p)
+					       "%b   %v"
+					     "%b  %v")
+			    (string :format "PostData: %v\n" :size 0)))))
+
+(defcustom w3m-search-default-engine "google"
+  "*Name of the default search engine.
+See also `w3m-search-engine-alist'."
+  :group 'w3m
+  :type '(string :size 0))
+
+(defcustom w3m-search-word-at-point t
+  "*Non-nil means that the word at point is used as an initial string.
+If Transient Mark mode, this option is ignored and the region is used
+as an initial string."
+  :group 'w3m
+  :type 'boolean)
+
+(defvar w3m-search-engine-history nil
+  "History variable used by `w3m-search' for prompting a search engine.")
+
+(defvar w3m-search-thing-at-point-arg 'word
+  "Argument for `thing-at-point' used in `w3m-search-read-query'")
+
+(defun w3m-search-escape-query-string (str &optional coding)
+  (mapconcat
+   (lambda (s)
+     (w3m-url-encode-string s (or coding w3m-default-coding-system)))
+   (split-string str)
+   "+"))
+
+(defun w3m-search-read-query (prompt prompt-with-default &optional history)
+  "Read a query from the minibuffer, prompting with string PROMPT.
+When a default value for the query is discovered, prompt with string
+PROMPT-WITH-DEFAULT instead of string PROMPT."
+  (let ((default
+	  (if (w3m-region-active-p)
+	      (buffer-substring (region-beginning) (region-end))
+	    (unless (and (eq major-mode 'w3m-mode)
+			 (listp (get-text-property (point-at-bol) 'face))
+			 (memq 'w3m-header-line-location-title
+			       (get-text-property (point-at-bol) 'face)))
+	      (thing-at-point w3m-search-thing-at-point-arg))))
+	initial)
+    (when default
+      (set-text-properties 0 (length default) nil default)
+      (when (or w3m-search-word-at-point (w3m-region-active-p))
+	(setq initial default
+	      default nil))
+      (when (w3m-region-active-p)
+	(w3m-deactivate-region)))
+    (read-string (if default
+		     (format prompt-with-default default)
+		   prompt)
+		 initial history default)))
+
+(defun w3m-search-read-variables ()
+  "Ask for a search engine and words to query and return them as a list."
+  (let* ((search-engine
+	  (if current-prefix-arg
+	      (let ((default (or (car w3m-search-engine-history)
+				 w3m-search-default-engine))
+		    (completion-ignore-case t))
+		(completing-read (format "Which engine? (default %s): "
+					 default)
+				 w3m-search-engine-alist nil t nil
+				 'w3m-search-engine-history default))
+	    w3m-search-default-engine))
+	 (query
+	  (w3m-search-read-query
+	   (format "%s search: " search-engine)
+	   (format "%s search (default %%s): " search-engine))))
+    (list search-engine query)))
+
+(defun w3m-search-do-search (w3m-goto-function search-engine query)
+  "Call W3M-GOTO-FUNCTION with the URL for the search."
+  (unless (string= query "")
+    (let ((info (assoc search-engine w3m-search-engine-alist)))
+      (if info
+	  (let ((query-string (w3m-search-escape-query-string query
+							      (caddr info)))
+		(post-data (cadddr info)))
+	    (funcall w3m-goto-function
+		     (format (cadr info) query-string)
+		     post-data
+		     nil
+		     (and post-data (format post-data query-string))))
+	(error "Unknown search engine: %s" search-engine)))))
+
+;;;###autoload
+(defun w3m-search (search-engine query)
+  "Search QUERY using SEARCH-ENGINE.
+When called interactively with a prefix argument, you can choose one of
+the search engines defined in `w3m-search-engine-alist'.  Otherwise use
+`w3m-search-default-engine'.
+If Transient Mark mode, use the region as an initial string of query
+and deactivate the mark."
+  (interactive (w3m-search-read-variables))
+  (w3m-search-do-search 'w3m-goto-url search-engine query))
+
+;;;###autoload
+(defun w3m-search-new-session (search-engine query)
+  "Like `w3m-search', but do the search in a new session."
+  (interactive (w3m-search-read-variables))
+  (w3m-search-do-search 'w3m-goto-url-new-session search-engine query))
+
+;;;###autoload
+(defun w3m-search-uri-replace (uri engine)
+  "Generate query string for ENGINE from URI matched by last search."
+  (let ((query (substring uri (match-end 0)))
+	(info (assoc engine w3m-search-engine-alist)))
+    (when info
+      (format (cadr info)
+	      (w3m-search-escape-query-string query (caddr info))))))
+
+(provide 'w3m-search)
+
+;;; w3m-search.el ends here

=== added file 'share/emacs/site-lisp/w3m/w3m-session.el'
--- share/emacs/site-lisp/w3m/w3m-session.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-session.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,909 @@
+;;; w3m-session.el --- Functions to operate session of w3m -*- coding: iso-2022-7bit; -*-
+
+;; Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Author: Hideyuki SHIRAI <shirai@meadowy.org>
+;; Keywords: w3m, WWW, hypermedia
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; w3m-session.el is the add-on program of emacs-w3m to save and load
+;; sessions.   For more detail about emacs-w3m, see:
+;;
+;;    http://emacs-w3m.namazu.org/
+
+
+;;; Code:
+(eval-when-compile (require 'cl))
+(require 'w3m-util)
+
+(eval-when-compile
+  (defvar w3m-async-exec)
+  (defvar w3m-async-exec-with-many-urls)
+  (defvar w3m-current-title)
+  (defvar w3m-current-url)
+  (defvar w3m-history)
+  (defvar w3m-history-flat)
+  (defvar w3m-language)
+  (defvar w3m-mode-map)
+  (defvar w3m-profile-directory)
+  (autoload 'w3m-goto-url-new-session "w3m")
+  (autoload 'w3m-history-tree "w3m-hist")
+  (autoload 'w3m-load-list "w3m")
+  (autoload 'w3m-save-list "w3m"))
+
+(defcustom w3m-session-file
+  (expand-file-name ".sessions" w3m-profile-directory)
+  "*File name to keep sessions."
+  :group 'w3m
+  :type '(file :size 0))
+
+(defcustom w3m-session-autosave t
+  "*Non-nil means save automatically when w3m quit."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-session-deleted-save t
+  "*Non-nil means save deleted sessions."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-session-crash-recovery t
+  "*Non-nil means emacs-w3m save session set automatically, and recover it when emacs-w3m crash."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-session-time-format
+  (if (and (equal "Japanese" w3m-language)
+	   (not (featurep 'xemacs)))
+      "%Y$BG/(B%m$B7n(B%d$BF|(B(%a) %H:%M"
+    "%Y-%m-%d (%a) %H:%M")
+  "*Format of saved time."
+  :group 'w3m
+  :type '(string :size 0))
+
+(defcustom w3m-session-automatic-title
+  (if (equal "Japanese" w3m-language)
+      "$B<+F0J]B8(B"
+    "Automatic saved sessions")
+  "*String of title to save session automatically."
+  :group 'w3m
+  :type '(string :size 0))
+
+(defcustom w3m-session-deleted-title
+  (if (equal "Japanese" w3m-language)
+      "$B:o=|%;%C%7%g%s(B"
+    "Removed sessions")
+  "*String of title to save session when buffer delete."
+  :group 'w3m
+  :type '(string :size 0))
+
+(defcustom w3m-session-crash-recovery-title
+  (if (equal "Japanese" w3m-language)
+      "$B%/%i%C%7%e2sI|(B"
+    "Crash recovery sessions")
+  "*String of title to save session to use for crash recovering."
+  :group 'w3m
+  :type '(string :size 0))
+
+(defcustom w3m-session-deleted-keep-number 5
+  "*Number to keep sessions when buffers delete."
+  :group 'w3m
+  :type '(integer :size 0))
+
+(defcustom w3m-session-automatic-keep-number 5
+  "*Number to keep sessions automatically."
+  :group 'w3m
+  :type '(integer :size 0))
+
+(defcustom w3m-session-unknown-title "<Unknown Title>"
+  "*String of title to use when title is not specified."
+  :group 'w3m
+  :type '(string :size 0))
+
+(defcustom w3m-session-load-last-sessions nil
+  "*Whether to load the last sessions when emacs-w3m starts."
+  :group 'w3m
+  :type '(radio (const :format "Load the last sessions automatically." t)
+		(const :format "Ask whether to load the last sessions." ask)
+		(const :format "Never load the last sessions automatically." nil)))
+
+(defcustom w3m-session-load-crashed-sessions 'ask
+  "*Whether to load the crashed sessions when emacs-w3m starts."
+  :group 'w3m
+  :type '(radio (const :format "Load the crashed sessions automatically." t)
+		(const :format "Ask whether to load the crashed sessions." ask)
+		(const :format "Never load the crashed sessions automatically." nil)))
+
+(defface w3m-session-select
+  `((((class color) (background light) (type tty))
+     (:foreground "black"))
+    (((class color) (background dark) (type tty))
+     (:foreground "cyan"))
+    (((class color) (background light))
+     (:foreground "dark blue"))
+    (((class color) (background dark))
+     (:foreground "white"))
+    (t nil))
+  "Face of w3m-session."
+  :group 'w3m)
+;; backward-compatibility alias
+(put 'w3m-session-select-face 'face-alias 'w3m-session-select)
+
+(defface w3m-session-selected
+  `((((class color) (background light) (type tty))
+     (:foreground "blue" :bold t :underline t))
+    (((class color) (background dark) (type tty))
+     (:foreground "cyan" :bold t :underline t))
+    (((class color) (background light))
+     (:foreground "dark blue" :bold t :underline t))
+    (((class color) (background dark))
+     (:foreground "white" :bold t :underline t))
+    (t (:bold t :underline t)))
+  "Face of selected w3m-session."
+  :group 'w3m)
+;; backward-compatibility alias
+(put 'w3m-session-selected-face 'face-alias 'w3m-session-selected)
+
+(defun w3m-session-history-to-save ()
+  "Return a copy of `w3m-history-flat' without current page data."
+  (let ((pos (cadar w3m-history)))
+    (apply
+     'append
+     (mapcar (lambda (x)
+	       (unless (equal (nth 2 x) pos)
+		 (list x)))
+	     (copy-sequence (w3m-history-slimmed-history-flat))))))
+
+;; format of sessin file.
+;; '((sessiontitle1 time1 ((url11 pos11 hflat11 urltitle11)
+;;                         (url12 pos12 hflat12 urltitle12) ...) current1)
+;;   ...
+
+(defmacro w3m-session-ignore-errors (&rest forms)
+  "Run FORMS.  Remove `w3m-session-file' and quit if any error happens."
+  `(condition-case err
+       (progn ,@forms)
+     (error
+      (if (and (file-exists-p w3m-session-file)
+	       (yes-or-no-p (format
+			     "\
+Sorry, an error found in \"%s\"; may we remove it? "
+			     ,(if (featurep 'xemacs)
+				  '(abbreviate-file-name w3m-session-file t)
+				'(abbreviate-file-name w3m-session-file)))))
+	  (progn
+	    (delete-file w3m-session-file)
+	    (run-at-time 0.1 nil #'message
+			 "\"%s\" has been removed; try again"
+			 (abbreviate-file-name w3m-session-file))
+	    (keyboard-quit))
+	(signal (car err) (cdr err))))))
+
+;;;###autoload
+(defun w3m-session-save ()
+  "Save list of displayed session."
+  (interactive)
+  (w3m-session-ignore-errors
+   (let ((sessions (w3m-load-list w3m-session-file))
+	 (bufs (w3m-list-buffers))
+	 (prompt "New session title: ")
+	 (cnum 0)
+	 (i 0)
+	 title titles urls len buf cbuf)
+     (mapc (lambda (x)
+	     (setq titles (cons (cons (car x) (car x)) titles)))
+	   sessions)
+     (setq title (or w3m-current-title
+		     (with-current-buffer (car bufs)
+		       w3m-current-title)))
+     (setq titles (cons (cons title title) titles))
+     (catch 'loop
+       (while t
+	 (setq title (completing-read prompt titles nil nil title))
+	 (if (or (string= title "")
+		 (and (assoc title sessions)
+		      (not (y-or-n-p (format "\"%s\" is exist. Overwrite? "
+					     title)))))
+	     (setq prompt "Again New session title: ")
+	   (throw 'loop t))))
+     (setq cbuf (current-buffer))
+     (save-current-buffer
+       (while (setq buf (car bufs))
+	 (setq bufs (cdr bufs))
+	 (set-buffer buf)
+	 (when w3m-current-url
+	   (when (eq cbuf (current-buffer))
+	     (setq cnum i))
+	   (setq i (1+ i))
+	   (setq urls (cons (list w3m-current-url
+				  (copy-sequence (caar w3m-history))
+				  (w3m-session-history-to-save)
+				  w3m-current-title)
+			    urls)))))
+     (if (not urls)
+	 (message "%s: no session save...done" title)
+       (setq len (length urls))
+       (setq urls (nreverse urls))
+       (when (assoc title sessions)
+	 (setq sessions (delete (assoc title sessions) sessions)))
+       (setq sessions (cons (list title (current-time) urls cnum) sessions))
+       (w3m-save-list w3m-session-file sessions)
+       (if (= len 1)
+	   (message "%s: 1 session save...done" title)
+	 (message "%s: %d sessions save...done" title len))))))
+
+(defun w3m-session-automatic-save ()
+  "Save list of displayed session automatically."
+  (when w3m-session-autosave
+    (w3m-session-ignore-errors
+     (let ((sessions (w3m-load-list w3m-session-file))
+	   (bufs (w3m-list-buffers))
+	   (title (concat w3m-session-automatic-title "-1"))
+	   (titleregex (concat "^"
+			       (regexp-quote w3m-session-automatic-title)
+			       "-[0-9]+$"))
+	   (cnum 0)
+	   (i 0)
+	   urls buf cbuf session
+	   tmp tmptitle tmptime tmpurls)
+       (when bufs
+	 (setq cbuf (current-buffer))
+	 (save-current-buffer
+	   (while (setq buf (car bufs))
+	     (setq bufs (cdr bufs))
+	     (set-buffer buf)
+	     (when w3m-current-url
+	       (when (eq cbuf (current-buffer))
+		 (setq cnum i))
+	       (setq i (1+ i))
+	       (setq urls (cons (list w3m-current-url
+				      (copy-sequence (caar w3m-history))
+				      (w3m-session-history-to-save)
+				      w3m-current-title)
+				urls)))))
+	 (when urls
+	   (setq i 2)
+	   (while (setq session (car sessions))
+	     (setq sessions (cdr sessions))
+	     (if (string-match titleregex (nth 0 session))
+		 (when (<= i w3m-session-automatic-keep-number)
+		   (setq tmptitle (format (concat w3m-session-automatic-title
+						  "-%d") i))
+		   (setq tmptime (nth 1 session))
+		   (setq tmpurls (nth 2 session))
+		   (setq tmp (cons (list tmptitle tmptime tmpurls nil) tmp))
+		   (setq i (1+ i)))
+	       (setq tmp (cons session tmp))))
+	   (setq sessions (nreverse tmp))
+	   (setq urls (nreverse urls))
+	   (setq sessions (cons (list title (current-time) urls cnum)
+				sessions))
+	   (w3m-save-list w3m-session-file sessions)))))))
+
+(defun w3m-session-deleted-save (buffers)
+  "Save list of deleted session."
+  (when w3m-session-deleted-save
+    (w3m-session-ignore-errors
+     (let ((sessions (w3m-load-list w3m-session-file))
+	   (title (concat w3m-session-deleted-title "-1"))
+	   (titleregex (concat "^"
+			       (regexp-quote w3m-session-deleted-title)
+			       "-[0-9]+$"))
+	   (bufs (copy-sequence buffers))
+	   (i 2)
+	   urls buf session
+	   tmp tmptitle tmptime tmpurls)
+       (when bufs
+	 (setq bufs (sort bufs 'w3m-buffer-name-lessp))
+	 (save-current-buffer
+	   (while (setq buf (car bufs))
+	     (setq bufs (cdr bufs))
+	     (set-buffer buf)
+	     (when w3m-current-url
+	       (setq urls (cons (list w3m-current-url
+				      (copy-sequence (caar w3m-history))
+				      (w3m-session-history-to-save)
+				      w3m-current-title)
+				urls)))))
+	 (when urls
+	   (while (setq session (car sessions))
+	     (setq sessions (cdr sessions))
+	     (if (string-match titleregex (nth 0 session))
+		 (when (<= i w3m-session-deleted-keep-number)
+		   (setq tmptitle (format (concat w3m-session-deleted-title
+						  "-%d") i))
+		   (setq tmptime (nth 1 session))
+		   (setq tmpurls (nth 2 session))
+		   (setq tmp (cons (list tmptitle tmptime tmpurls nil) tmp))
+		   (setq i (1+ i)))
+	       (setq tmp (cons session tmp))))
+	   (setq sessions (nreverse tmp))
+	   (setq urls (nreverse urls))
+	   (setq sessions (cons (list title (current-time) urls nil) sessions))
+	   (w3m-save-list w3m-session-file sessions)))))))
+
+(defun w3m-session-crash-recovery-save ()
+  "Save list of displayed session."
+  (when w3m-session-crash-recovery
+    (w3m-session-ignore-errors
+     (let ((sessions (w3m-load-list w3m-session-file))
+	   (bufs (w3m-list-buffers))
+	   (title w3m-session-crash-recovery-title)
+	   urls buf tmp)
+       (when bufs
+	 (save-current-buffer
+	   (while (setq buf (car bufs))
+	     (setq bufs (cdr bufs))
+	     (set-buffer buf)
+	     (when w3m-current-url
+	       (setq urls (cons (list w3m-current-url
+				      (copy-sequence (caar w3m-history))
+				      (w3m-session-history-to-save)
+				      w3m-current-title)
+				urls)))))
+	 (when urls
+	   (setq urls (nreverse urls))
+	   (setq tmp (assoc title sessions))
+	   (when tmp (setq sessions (delete tmp sessions)))
+	   (setq sessions (cons (list title (current-time) urls nil) sessions))
+	   (w3m-save-list w3m-session-file sessions)))))))
+
+(defun w3m-session-crash-recovery-remove ()
+  "Remove crash recovery session set."
+  (when w3m-session-crash-recovery
+    (w3m-session-ignore-errors
+     (let* ((sessions (w3m-load-list w3m-session-file))
+	    (item (assoc w3m-session-crash-recovery-title sessions)))
+       (when item
+	 (setq sessions (delete item sessions))
+	 (w3m-save-list w3m-session-file sessions))))))
+
+(defvar w3m-session-select-mode-map nil)
+(unless w3m-session-select-mode-map
+  (let ((map (make-keymap)))
+    (suppress-keymap map)
+    (define-key map "q" 'w3m-session-select-quit)
+    (define-key map "Q" 'w3m-session-select-quit)
+    (define-key map "\C-g" 'w3m-session-select-quit)
+    (define-key map "\C-m" 'w3m-session-select-select)
+    (define-key map "\M-s" 'w3m-session-select-open-session-group)
+    (define-key map "d" 'w3m-session-select-delete)
+    (define-key map "D" 'w3m-session-select-delete)
+    (define-key map "s" 'w3m-session-select-save)
+    (define-key map "S" 'w3m-session-select-save)
+    (define-key map "r" 'w3m-session-select-rename)
+    (define-key map "R" 'w3m-session-select-rename)
+    (define-key map "n" 'w3m-session-select-next)
+    (define-key map "j" 'w3m-session-select-next)
+    (define-key map "\C-n" 'w3m-session-select-next)
+    (define-key map [down] 'w3m-session-select-next)
+    (define-key map "p" 'w3m-session-select-previous)
+    (define-key map "k" 'w3m-session-select-previous)
+    (define-key map "\C-p" 'w3m-session-select-previous)
+    (define-key map [up] 'w3m-session-select-previous)
+    (setq w3m-session-select-mode-map map)))
+
+;;; Local variables
+(defvar w3m-session-select-wincfg nil)
+(defvar w3m-session-select-sessions nil)
+(make-variable-buffer-local 'w3m-session-select-wincfg)
+(make-variable-buffer-local 'w3m-session-select-sessions)
+
+(defun w3m-session-select-mode (&optional sessions)
+  "Major mode for selecting emacs-w3m session.
+
+\\<w3m-session-select-mode-map>
+\\[w3m-session-select-select]	Select the session.
+\\[w3m-session-select-open-session-group]	Open the session group.
+\\[w3m-session-select-delete]	Delete the session.
+\\[w3m-session-select-rename]	Rename the session.
+\\[w3m-session-select-save]	Save the session.
+\\[w3m-session-select-next]	Move the point to the next session.
+\\[w3m-session-select-previous]	Move the point to the previous session.
+\\[w3m-session-select-quit]	Exit selecting session.
+"
+  (w3m-session-ignore-errors
+   (let ((sessions (or sessions
+		       (w3m-load-list w3m-session-file))))
+     (buffer-disable-undo)
+     (setq mode-name "w3m session"
+	   truncate-lines t
+	   buffer-read-only nil
+	   major-mode 'w3m-session-select-mode
+	   w3m-session-select-sessions sessions
+	   buffer-read-only t)
+     (use-local-map w3m-session-select-mode-map)
+     (w3m-session-select-list-all-sessions))))
+
+(defun w3m-session-select-list-all-sessions ()
+  "List up all saved sessions."
+  (let ((sessions w3m-session-select-sessions)
+	(num 0)
+	(max 0)
+	(inhibit-read-only t)
+	title titles time times url urls wid pos)
+    (if (not sessions)
+	(progn
+	  (message "No saved session")
+	  (w3m-session-select-quit))
+      (mapc (lambda (x)
+	      (setq title (format "%s[%d]" (nth 0 x) (length (nth 2 x))))
+	      (setq wid (string-width title))
+	      (when (> wid max)
+		(setq max wid))
+	      (setq titles (cons title titles))
+	      (setq times (cons (format-time-string w3m-session-time-format
+						    (nth 1 x))
+				times))
+	      (setq urls (cons (mapconcat (lambda (url)
+					    (if (stringp url)
+						url
+					      (car url)))
+					  (nth 2 x) ", ")
+			       urls)))
+	    sessions)
+      (setq titles (nreverse titles))
+      (setq times (nreverse times))
+      (setq urls (nreverse urls))
+      (setq max (+ max 2))
+      (erase-buffer)
+      (insert "Select session:\n\n")
+      (while (and (setq title (car titles))
+		  (setq time (car times))
+		  (setq url (car urls)))
+	(setq titles (cdr titles))
+	(setq times (cdr times))
+	(setq urls (cdr urls))
+	(setq pos (point))
+	(insert title)
+	(add-text-properties pos (point)
+			     `(face w3m-session-select
+				    w3m-session-number ,num))
+	(setq num (1+ num))
+	(insert (make-string (- max (string-width title)) ?\ ))
+	(insert time "  " url "\n"))
+      (goto-char (point-min))
+      (goto-char (next-single-property-change
+		  (point) 'w3m-session-number))
+      (put-text-property (point)
+			 (next-single-property-change
+			  (point) 'w3m-session-number)
+			 'face 'w3m-session-selected)
+      (set-buffer-modified-p nil)
+      (setq buffer-read-only t))))
+
+(defun w3m-session-select-list-session-group (arg)
+  (let ((session (nth 2 (nth arg w3m-session-select-sessions)))
+	(num 0)
+	(max 0)
+	(inhibit-read-only t)
+	title url wid
+	titles urls pos)
+    (when session
+      (mapc (lambda (x)
+	      (setq title (format "%s" (or (nth 3 x) w3m-session-unknown-title)))
+	      (setq wid (string-width title))
+	      (when (> wid max)
+		(setq max wid))
+	      (setq titles (cons title titles))
+	      (setq urls (cons (nth 0 x)
+			       urls)))
+	    session)
+      (setq titles (nreverse titles))
+      (setq urls (nreverse urls))
+      (setq max (+ max 2))
+      (erase-buffer)
+      (insert "Select session:\n\n")
+      (setq pos (point))
+      (insert "Open all sessions")
+      (add-text-properties pos (point)
+			   `(face w3m-session-selected
+				  w3m-session-number ,arg))
+      (insert "\n")
+      (while (and (setq title (car titles))
+		  (setq url (car urls)))
+	(setq titles (cdr titles))
+	(setq urls (cdr urls))
+	(setq pos (point))
+	(insert title)
+	(add-text-properties pos (point)
+			     `(face w3m-session-select
+				    w3m-session-number ,(cons arg num)))
+	(setq num (1+ num))
+	(insert (make-string (- max (string-width title)) ?\ ))
+	(insert url "\n"))
+      (goto-char (point-min))
+      (goto-char (next-single-property-change
+		  (point) 'w3m-session-number)))
+    (set-buffer-modified-p nil)
+    (setq buffer-read-only t)))
+
+(defun w3m-session-select-next (&optional arg)
+  "Move the point to the next session."
+  (interactive "p")
+  (unless arg (setq arg 1))
+  (let ((positive (< 0 arg))
+	(inhibit-read-only t))
+    (beginning-of-line)
+    (put-text-property (point)
+		       (next-single-property-change
+			(point) 'w3m-session-number)
+		       'face 'w3m-session-select)
+    (while (not (zerop arg))
+      (forward-line (if positive 1 -1))
+      (unless (get-text-property (point) 'w3m-session-number)
+	(if positive
+	    (goto-char (next-single-property-change
+			(point-min) 'w3m-session-number))
+	  (goto-char (previous-single-property-change
+		      (point-max) 'w3m-session-number))))
+      (setq arg (if positive
+		    (1- arg)
+		  (1+ arg))))
+    (beginning-of-line)
+    (put-text-property (point)
+		       (next-single-property-change
+			(point) 'w3m-session-number)
+		       'face 'w3m-session-selected)
+    (set-buffer-modified-p nil)))
+
+(defun w3m-session-select-previous (&optional arg)
+  "the point to the previous session."
+  (interactive "p")
+  (w3m-session-select-next (- arg)))
+
+(defun w3m-session-select-quit ()
+  "Exit from w3m session select mode."
+  (interactive)
+  (let ((buffer (current-buffer))
+	(wincfg w3m-session-select-wincfg))
+    (or (one-window-p) (delete-window))
+    (kill-buffer buffer)
+    (set-window-configuration wincfg)))
+
+(defun w3m-session-select-select ()
+  "Select the session."
+  (interactive)
+  (beginning-of-line)
+  (let* ((num (get-text-property
+	       (point) 'w3m-session-number))
+	 (item (if (consp num) 
+		   (nth (cdr num)
+			(caddr (nth (car num) 
+				    w3m-session-select-sessions)))
+		 (nth num w3m-session-select-sessions)))
+	 (session (if (consp num)
+		      (list (or (cadddr item) w3m-session-unknown-title)
+			    nil
+			    (list item) 
+			    nil)
+		    item)))
+    (w3m-session-select-quit)
+    (w3m-session-goto-session session)))
+
+(defun w3m-session-select-open-session-group ()
+  "Open the session group."
+  (interactive)
+  (beginning-of-line)
+  (let ((num (get-text-property
+	      (point) 'w3m-session-number))
+	wheight)
+    (if (consp num)
+	(message "There is no session group.")
+      (setq wheight 
+	    (max (+ (length (caddr (nth num w3m-session-select-sessions))) 6)
+		 window-min-height))
+      (condition-case nil
+	  (enlarge-window (- wheight (window-height)))
+	(error nil))
+      (w3m-session-select-list-session-group num))))
+
+(defun w3m-session-select-save ()
+  "Save the session."
+  (interactive)
+  (when (y-or-n-p "Save this sessions? ")
+    (w3m-session-select-quit)
+    (w3m-session-save)
+    (w3m-session-select)))
+
+(defun w3m-session-select-rename ()
+  "Rename this session."
+  (interactive)
+  (beginning-of-line)
+  (let ((num (get-text-property
+	      (point) 'w3m-session-number))
+	(sessions w3m-session-select-sessions))
+    (w3m-session-select-quit)
+    (w3m-session-rename sessions num)
+    (w3m-session-select)))
+
+(defun w3m-session-select-delete ()
+  "Delete the session."
+  (interactive)
+  (when (y-or-n-p "Delete this session? ")
+    (beginning-of-line)
+    (let ((num (get-text-property
+		(point) 'w3m-session-number))
+	  (sessions w3m-session-select-sessions))
+      (w3m-session-select-quit)
+      (w3m-session-delete sessions num)
+      (w3m-session-select))))
+
+;;;###autoload
+(defun w3m-session-select ()
+  "Select session from session list."
+  (interactive)
+  (w3m-session-ignore-errors
+   (let* ((sessions (w3m-load-list w3m-session-file))
+	  (showbuf (w3m-get-buffer-create " *w3m-session select*"))
+	  (wheight (max (+ (length sessions) 5) window-min-height))
+	  (wincfg (current-window-configuration))
+	  window last-window)
+     (setq last-window (previous-window
+			(w3m-static-if (fboundp 'frame-highest-window)
+			    (frame-highest-window)
+			  (frame-first-window))))
+     (while (minibuffer-window-active-p last-window)
+       (setq last-window (previous-window last-window)))
+     (while (and
+	     (not (one-window-p))
+	     (or (< (window-width last-window)
+		    (frame-width))
+		 (< (window-height last-window)
+		    (+ wheight window-min-height))))
+       (setq window last-window)
+       (setq last-window (previous-window window))
+       (delete-window window))
+     (select-window (split-window last-window))
+     (condition-case nil
+	 (shrink-window (- (window-height) wheight))
+       (error nil))
+     (switch-to-buffer showbuf)
+     (setq w3m-session-select-wincfg wincfg)
+     (w3m-session-select-mode sessions))))
+
+(defun w3m-session-goto-session (session)
+  "Goto URLs."
+  (let ((title (nth 0 session))
+	(urls (nth 2 session))
+	(cnum (nth 3 session))
+	(i 0)
+	(w3m-async-exec (and w3m-async-exec-with-many-urls w3m-async-exec))
+	url cbuf buf pos history)
+    (message "Session goto(%s)..." title)
+    (while (setq url (car urls))
+      (setq urls (cdr urls))
+      (unless (stringp url)
+	(setq pos     (nth 1 url)
+	      history (nth 2 url)
+	      url     (nth 0 url)))
+      (w3m-goto-url-new-session url)
+      (setq buf (car (nreverse (w3m-list-buffers))))
+      (when (or (and (numberp cnum) (= cnum i))
+		(and (not cnum) (= i 0)))
+	(setq cbuf buf))
+      (when (and buf pos history)
+	(set-buffer buf)
+	(setq w3m-history-flat history)
+	(w3m-history-tree pos))
+      (setq i (1+ i)))
+    (when (and cbuf (eq major-mode 'w3m-mode))
+      (set-window-buffer (selected-window) cbuf))
+    (message "Session goto(%s)...done" title)))
+
+(defun w3m-session-rename (sessions num)
+    (if (consp num)
+	(message "This command can execute in Main session area")
+      (let ((prompt "New session title: ")
+	    (overwrite nil)
+	    tmp title otitle)
+	(setq tmp (nth num sessions))
+	(setq otitle (car tmp))
+	(setq title otitle)
+	(catch 'loop
+	  (while t
+	    (setq title (read-from-minibuffer prompt otitle))
+	    (cond
+	     ((string= title "")
+	      nil)
+	     ((string= title otitle)
+	      (when (y-or-n-p
+		     (format "\"%s\" is same as original title. Do not rename? "
+			     title))
+		(throw 'loop t)))
+	     ((assoc title sessions)
+	      (when (y-or-n-p (format "\"%s\" is exist. Overwrite? " title))
+		(setq overwrite t)
+		(throw 'loop t))))
+	    (setq prompt "Again New session title: ")))
+	(when overwrite
+	  (setq sessions (delete (assoc title sessions) sessions)))
+	(unless (string= title otitle)
+	  (setq sessions (delete tmp sessions))
+	  (setcar tmp title)
+	  (setq sessions (cons tmp sessions))
+	  (w3m-save-list w3m-session-file sessions)))))
+
+(defun w3m-session-delete (sessions num)
+  (let (tmp)
+    (if (consp num)
+	(let ((item (nth 2 (nth (car num) sessions))))
+	  (setq tmp (delete (nth (cdr num) item)
+			    item))
+	  (setf (nth 2 (nth (car num) sessions))
+		tmp))
+      (setq tmp (nth num sessions))
+      (setq sessions (delete tmp sessions)))
+    (if sessions
+	(w3m-save-list w3m-session-file sessions)
+      (let ((file (expand-file-name w3m-session-file)))
+	(when (and (file-exists-p file)
+		   (file-writable-p file))
+	  (delete-file file))))))
+
+(defvar w3m-session-menu-items
+  `([,(w3m-make-menu-item "$B?7$7$$%;%C%7%g%s$r:n$k(B..."
+			  "Create New Session...")
+     w3m-goto-new-session-url t]
+    [,(w3m-make-menu-item "$B$3$N%;%C%7%g%s$rJ#@=$9$k(B" "Copy This Session")
+     w3m-copy-buffer w3m-current-url]
+    "----" ;; separator
+    [,(w3m-make-menu-item "$BA0$N%;%C%7%g%s$K0\F0$9$k(B"
+			  "Move Previous Session")
+     w3m-previous-buffer
+     (> (safe-length (w3m-list-buffers)) 1)]
+    [,(w3m-make-menu-item "$B<!$N%;%C%7%g%s$K0\F0$9$k(B" "Move Next Session")
+     w3m-next-buffer
+     (> (safe-length (w3m-list-buffers)) 1)]
+    "----" ;; separator
+    [,(w3m-make-menu-item "$B$3$N%;%C%7%g%s$rJD$8$k(B" "Close This Session")
+     w3m-delete-buffer
+     (> (safe-length (w3m-list-buffers)) 1)]
+    [,(w3m-make-menu-item "$BB>$N%;%C%7%g%s$rJD$8$k(B" "Close Other Sessions")
+     w3m-delete-other-buffers
+     (> (safe-length (w3m-list-buffers)) 1)]
+    [,(w3m-make-menu-item "$B8=:_$N%;%C%7%g%s$rJ]B8$9$k(B"
+			  "Save Displayed Sessions")
+     w3m-session-save t]
+    [,(w3m-make-menu-item "$B%;%C%7%g%s$rA*Br$9$k(B" "Select Sessions")
+     w3m-session-select t])
+    "*List of the session menu items.")
+
+;;;###autoload
+(defun w3m-setup-session-menu ()
+  "Setup w3m session items in menubar."
+  (w3m-static-if (featurep 'xemacs)
+      (unless (car (find-menu-item current-menubar '("Session")))
+	(easy-menu-define w3m-session-menu w3m-mode-map
+	  "" '("Session" ["(empty)" ignore nil]))
+	(easy-menu-add w3m-session-menu)
+	(add-hook 'activate-menubar-hook 'w3m-session-menubar-update))
+    (unless (lookup-key w3m-mode-map [menu-bar Session])
+      (easy-menu-define w3m-session-menu w3m-mode-map "" '("Session"))
+      (easy-menu-add w3m-session-menu)
+      (add-hook 'menu-bar-update-hook 'w3m-session-menubar-update))))
+
+(defvar w3m-session-menu-items-pre nil)
+(defvar w3m-session-menu-items-time nil)
+
+(defun w3m-session-menubar-update ()
+  "Update w3m session menubar."
+  (when (and (eq major-mode 'w3m-mode)
+	     (w3m-static-if (featurep 'xemacs)
+		 (frame-property (selected-frame) 'menubar-visible-p)
+	       menu-bar-mode))
+    (let ((items w3m-session-menu-items)
+	  (pages (w3m-session-make-menu-items)))
+      (easy-menu-define w3m-session-menu w3m-mode-map
+	"The menu kepmap for the emacs-w3m session."
+	(cons "Session" (if pages
+			     (append items '("----") pages)
+			   items)))
+      (w3m-static-when (featurep 'xemacs)
+	(when (setq items (car (find-menu-item current-menubar '("Session"))))
+	  (setcdr items (cdr w3m-session-menu))
+	  (set-buffer-menubar current-menubar))))))
+
+(defun w3m-session-file-modtime ()
+  "Return the modification time of the session file `w3m-session-file'.
+The value is a list of two time values `(HIGH LOW)' if the session
+file exists, otherwise nil."
+  (nth 5 (file-attributes w3m-session-file)))
+
+(defvar w3m-session-make-item-xmas
+  (and (equal "Japanese" w3m-language) (featurep 'xemacs)))
+
+(defun w3m-session-make-item (item)
+  (if w3m-session-make-item-xmas
+      (concat item "%_ ")
+    item))
+
+(defun w3m-session-make-menu-items ()
+  "Create w3m session menu items."
+  (if (and w3m-session-menu-items-pre
+	   w3m-session-menu-items-time
+	   (equal w3m-session-menu-items-time
+		  (w3m-session-file-modtime)))
+      w3m-session-menu-items-pre
+    (w3m-session-ignore-errors
+     (let ((sessions (w3m-load-list w3m-session-file)))
+       (setq w3m-session-menu-items-time (w3m-session-file-modtime))
+       (setq w3m-session-menu-items-pre
+	     (and sessions
+		  (mapcar
+		   (lambda (entry)
+		     (cons (w3m-session-make-item (car entry))
+			   (cons (vector "Open all sessions"
+					 `(w3m-session-goto-session
+					   (quote ,entry)))
+				 (mapcar
+				  (lambda (item)
+				    (let ((title
+					   (w3m-session-make-item
+					    (or (nth 3 item)
+						w3m-session-unknown-title))))
+				      (vector
+				       title
+				       `(w3m-session-goto-session
+					 (quote
+					  ,(list title
+						 nil
+						 (list item)
+						 nil))))))
+				  (nth 2 entry)))))
+		   sessions)))))))
+
+;;;###autoload
+(defun w3m-session-last-autosave-session ()
+  (when w3m-session-load-last-sessions
+    (w3m-session-ignore-errors
+     (let ((item
+	    (let ((sessions (w3m-load-list w3m-session-file))
+		  (n 1) x)
+	      (catch 'loop
+		(while t
+		  (if (< w3m-session-automatic-keep-number n)
+		      (throw 'loop nil)
+		    (setq x (assoc (format "%s-%d"
+					   w3m-session-automatic-title n)
+				   sessions))
+		    (when x (throw 'loop x)))
+		  (setq n (1+ n)))))))
+       (when (and item
+		  (or (and (eq w3m-session-load-last-sessions 'ask)
+			   (y-or-n-p "Load the last sessions? "))
+		      w3m-session-load-last-sessions))
+	 item)))))
+
+;;;###autoload
+(defun w3m-session-last-crashed-session ()
+  (when (and w3m-session-crash-recovery w3m-session-load-crashed-sessions)
+    (w3m-session-ignore-errors
+     (let ((item (assoc w3m-session-crash-recovery-title
+			(w3m-load-list w3m-session-file))))
+       (when (and item
+		  (or (and (eq w3m-session-load-crashed-sessions 'ask)
+			   (y-or-n-p "Load the crashed sessions? "))
+		      (eq w3m-session-load-crashed-sessions t)))
+	 item)))))
+
+(provide 'w3m-session)
+
+;;; w3m-session.el ends here

=== added file 'share/emacs/site-lisp/w3m/w3m-symbol.el'
--- share/emacs/site-lisp/w3m/w3m-symbol.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-symbol.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,230 @@
+;;; w3m-symbol.el --- Stuffs to replace symbols for emacs-w3m -*- coding: iso-2022-7bit; -*-
+
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009
+;; ARISAWA Akihiro <ari@mbf.sphere.ne.jp>
+
+;; Author: ARISAWA Akihiro <ari@mbf.sphere.ne.jp>
+;; Keywords: w3m, WWW, hypermedia, i18n
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;;
+
+;;; Code:
+
+(eval-when-compile
+  (require 'cl))
+
+(eval-when-compile
+  (defvar w3m-output-coding-system)
+  (defvar w3m-language)
+  (defvar w3m-use-symbol)
+  (autoload 'w3m-mule-unicode-p "w3m"))
+
+(defgroup w3m-symbol nil
+  "Symbols for w3m"
+  :group 'w3m)
+
+(defvar w3m-symbol-custom-type
+  '(list
+    :convert-widget w3m-widget-type-convert-widget
+    (let* ((w `(sexp :match (lambda (widget value) (stringp value))
+		     :size 4 :value ""
+		     ,@(if (not (widget-get widget :copy))
+			   ;; Emacs versions prior to 22.
+			   '(:value-to-internal
+			     (lambda (widget value)
+			       (if (string-match "\\`\".*\"\\'" value)
+				   value
+				 (prin1-to-string value)))))))
+	   (a `(,@w :format "%v "))
+	   (b `(,@w :format "%v\n"))
+	   (c (list a a a a a a a b))
+	   (d (list a a a a a b)))
+      `(:indent 4 :tag "Customize"
+		,@c ,@c ,@c ,@c ,@d ,@d ,b ,b))))
+
+(defcustom w3m-default-symbol
+  '("-+" " |" "--" " +" "-|" " |" "-+" ""
+    "--" " +" "--" ""   "-+" ""   ""   ""
+    "-+" " |" "--" " +" "-|" " |" "-+" ""
+    "--" " +" "--" ""   "-+" ""   ""   ""
+    " *" " +" " o" " #" " @" " -"
+    " =" " x" " %" " *" " o" " #"
+    " #"
+    "<=UpDn ")
+  "List of symbol string, used by defaultly."
+  :group 'w3m-symbol
+  :type w3m-symbol-custom-type)
+
+(defcustom w3m-Chinese-BIG5-symbol
+  '("$(0#3(B" "$(0#7(B" "$(0#5(B" "$(0#<(B" "$(0#6(B" "$(0#:(B" "$(0#=(B" ""
+    "$(0#4(B" "$(0#>(B" "$(0#9(B" ""   "$(0#?(B" ""   ""   ""
+    "$(0#3(B" "$(0#7(B" "$(0#5(B" "$(0#<(B" "$(0#6(B" "$(0#:(B" "$(0#=(B" ""
+    "$(0#4(B" "$(0#>(B" "$(0#9(B" ""   "$(0#?(B" ""   ""   ""
+    "$(0!&(B" "$(0!{(B" "$(0!w(B" "$(0!r(B" "$(0!|(B" "$(0!x(B"
+    "$(0!v(B" "$(0!s(B" "$(0!t(B" "$(0!s(B" "$(0!r(B" "$(0!{(B"
+    "$(0!s(B"
+    "$(0!N"U"V(B")
+  "List of symbol string, used in Chienese-BIG5 environment."
+  :group 'w3m-symbol
+  :type w3m-symbol-custom-type)
+
+(defcustom w3m-Chinese-CNS-symbol
+  '("$(G#3(B" "$(G#7(B" "$(G#5(B" "$(G#<(B" "$(G#6(B" "$(G#:(B" "$(G#=(B" ""
+    "$(G#4(B" "$(G#>(B" "$(G#9(B" ""   "$(G#?(B" ""   ""   ""
+    "$(G#3(B" "$(G#7(B" "$(G#5(B" "$(G#<(B" "$(G#6(B" "$(G#:(B" "$(G#=(B" ""
+    "$(G#4(B" "$(G#>(B" "$(G#9(B" ""   "$(G#?(B" ""   ""   ""
+    "$(G!&(B" "$(G!{(B" "$(G!w(B" "$(G!r(B" "$(G!|(B" "$(G!x(B"
+    "$(G!v(B" "$(G!s(B" "$(G!t(B" "$(G!s(B" "$(G!r(B" "$(G!{(B"
+    "$(G!s(B"
+    "$(G!N"U"V(B")
+  "List of symbol string, used in Chienese-CNS environment."
+  :group 'w3m-symbol
+  :type w3m-symbol-custom-type)
+
+(defcustom w3m-Chinese-GB-symbol
+  '("$A)`(B" "$A)@(B" "$A)P(B" "$A)0(B" "$A)H(B" "$A)&(B" "$A)4(B" ""
+    "$A)X(B" "$A)8(B" "$A)$(B" ""   "$A)<(B" ""   ""   ""
+    "$A)`(B" "$A)D(B" "$A)S(B" "$A)3(B" "$A)L(B" "$A)'(B" "$A)7(B" ""
+    "$A)[(B" "$A);(B" "$A)%(B" ""   "$A)?(B" ""   ""   ""
+    "$A!$(B" "$A!u(B" "$A!n(B" "$A!p(B" "$A!v(B" "$A!o(B"
+    "$A!r(B" "$A!q(B" "$A!w(B" "$A!q(B" "$A!p(B" "$A!u(B"
+    "$A!q(B"
+    "$A!6!|!}(B")
+  "List of symbol string, used in Chienese-GB environment."
+  :group 'w3m-symbol
+  :type w3m-symbol-custom-type)
+
+(defcustom w3m-Japanese-symbol
+  '("$B(+(B" "$B('(B" "$B(((B" "$B(#(B" "$B()(B" "$B("(B" "$B($(B" ""
+    "$B(*(B" "$B(&(B" "$B(!(B" ""   "$B(%(B" ""   ""   ""
+    "$B(+(B" "$B(7(B" "$B(8(B" "$B(.(B" "$B(9(B" "$B(-(B" "$B(/(B" ""
+    "$B(:(B" "$B(1(B" "$B(,(B" ""   "$B(0(B" ""   ""   ""
+    "$B!&(B" "$B""(B" "$B!y(B" "$B!{(B" "$B"#(B" "$B!z(B"
+    "$B!}(B" "$B!|(B" "$B"$(B" "$B!|(B" "$B!{(B" "$B""(B"
+    "$B!|(B"
+    "$B"c","-(B")
+  "List of symbol string, used in Japanese environment."
+  :group 'w3m-symbol
+  :type w3m-symbol-custom-type)
+
+(defcustom w3m-Korean-symbol
+  '("$(C&+(B" "$(C&'(B" "$(C&((B" "$(C&#(B" "$(C&)(B" "$(C&"(B" "$(C&$(B" ""
+    "$(C&*(B" "$(C&&(B" "$(C&!(B" ""   "$(C&%(B" ""   ""   ""
+    "$(C&+(B" "$(C&7(B" "$(C&8(B" "$(C&.(B" "$(C&9(B" "$(C&-(B" "$(C&/(B" ""
+    "$(C&:(B" "$(C&1(B" "$(C&,(B" ""   "$(C&0(B" ""   ""   ""
+    "$(C!$(B" "$(C!`(B" "$(C!Y(B" "$(C![(B" "$(C!a(B" "$(C!Z(B"
+    "$(C!](B" "$(C!\(B" "$(C!b(B" "$(C!\(B" "$(C![(B" "$(C!`(B"
+    "$(C!\(B"
+    "$(C!l!h!i(B")
+  "List of symbol string, used in Korean environment."
+  :group 'w3m-symbol
+  :type w3m-symbol-custom-type)
+
+(defcustom w3m-mule-unicode-symbol
+  (when (w3m-mule-unicode-p)
+    (append
+     (mapcar (lambda (p)
+	       (if p
+		   (char-to-string
+		    (make-char (or (nth 2 p) 'mule-unicode-2500-33ff)
+			       (car p) (cadr p)))
+		 ""))
+	     '((32 92) (32 60) (32 76) (32 44) (32 68) (32 34) (32 48) nil
+	       (32 84) (32 52) (32 32) nil     (32 56) nil     nil     nil
+	       (32 92) (32 64) (32 79) (32 47) (32 72) (32 35) (32 51) nil
+	       (32 87) (32 55) (32 33) nil     (32 59) nil     nil     nil
+	       (115 34 mule-unicode-0100-24ff) (33 97) (34 102) (34 43) (33 96) (34 101)
+	       (34 46) (34 47) (33 115) (34 47) (34 43) (33 97)
+	       (34 47)))
+     (list (format "%c %c %c "
+		   (make-char 'mule-unicode-0100-24ff 121 42)
+		   (make-char 'mule-unicode-0100-24ff 118 113)
+		   (make-char 'mule-unicode-0100-24ff 118 115)))))
+  "List of symbol string, using mule-unicode characters."
+  :group 'w3m-symbol
+  :type (if (w3m-mule-unicode-p)
+	    w3m-symbol-custom-type
+	  '(const :format "%{%t%}: %v")))
+
+(defcustom w3m-symbol nil
+  "List of symbol string."
+  :group 'w3m-symbol
+  :type `(radio (const :format "Auto detect  " nil)
+		(const :tag "Default" w3m-default-symbol)
+		(const :format "Chinese BIG5 " w3m-Chinese-BIG5-symbol)
+		(const :format "Chinese CNS " w3m-Chinese-CNS-symbol)
+		(const :tag "Chinese GB" w3m-Chinese-GB-symbol)
+		(const :format "Japanese     " w3m-Japanese-symbol)
+		(const :format "Korean      " w3m-Korean-symbol)
+		,@(when w3m-mule-unicode-symbol
+		   '((const :tag "Mule-Unicode" w3m-mule-unicode-symbol)))
+		(variable :format "%t symbol: %v\n" :size 0
+			  :value w3m-default-symbol)
+		,w3m-symbol-custom-type))
+
+(defun w3m-use-symbol ()
+  (cond ((functionp w3m-use-symbol)
+	 (funcall w3m-use-symbol))
+	(t w3m-use-symbol)))
+
+(eval-when-compile (defvar current-language-environment))
+
+(defun w3m-symbol ()
+  (cond (w3m-symbol
+	 (if (symbolp w3m-symbol)
+	     (symbol-value w3m-symbol)
+	   w3m-symbol))
+	((and (eq w3m-output-coding-system 'utf-8)
+	      w3m-mule-unicode-symbol))
+	((let ((lang (or w3m-language
+			 (and (boundp 'current-language-environment)
+			      current-language-environment
+			      ;; In XEmacs 21.5 it may be the one like
+			      ;; "Japanese (UTF-8)".
+			      (if (string-match "[\t ]+("
+						current-language-environment)
+				  (substring current-language-environment
+					     0 (match-beginning 0))
+				current-language-environment)))))
+	   (when (boundp (intern (format "w3m-%s-symbol" lang)))
+	     (symbol-value (intern (format "w3m-%s-symbol" lang))))))
+	(t w3m-default-symbol)))
+
+;;;###autoload
+(defun w3m-replace-symbol ()
+  (when (w3m-use-symbol)
+    (let ((symbol-list (w3m-symbol)))
+      (save-excursion
+	(goto-char (point-min))
+	(while (re-search-forward "<_SYMBOL TYPE=\\([0-9]+\\)>" nil t)
+	  (let ((symbol (nth (string-to-number (match-string 1)) symbol-list))
+		(start (point))
+		end symbol-cnt)
+	    (search-forward "</_SYMBOL>" nil t)
+	    (setq end (match-beginning 0)
+		  symbol-cnt (/ (string-width (buffer-substring start end))
+				(string-width symbol)))
+	    (goto-char start)
+	    (delete-region start end)
+	    (insert (apply 'concat (make-list symbol-cnt symbol)))))))))
+
+(provide 'w3m-symbol)
+
+;;; w3m-symbol.el ends here

=== added file 'share/emacs/site-lisp/w3m/w3m-tabmenu.el'
--- share/emacs/site-lisp/w3m/w3m-tabmenu.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-tabmenu.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,188 @@
+;;; w3m-tabmenu.el --- Functions for TAB menu browsing
+
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Authors: Hideyuki SHIRAI    <shirai@meadowy.org>,
+;;          TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Keywords: w3m, WWW, hypermedia
+
+;; This file is a part of emacs-w3m.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; This file contains the functions for TAB browsing.  For more detail
+;; about emacs-w3m, see:
+;;
+;;    http://emacs-w3m.namazu.org/
+
+;;; Code:
+
+(eval-when-compile
+  (require 'cl))
+
+(require 'w3m-util)
+(require 'w3m)
+(require 'easymenu)
+
+(defun w3m-setup-tab-menu ()
+  "Setup w3m tab menubar."
+  (when w3m-use-tab-menubar
+    (w3m-static-if (featurep 'xemacs)
+	(unless (car (find-menu-item current-menubar '("Tab")))
+	  (easy-menu-define w3m-tab-menu w3m-mode-map
+	    "" '("Tab" ["dummy" w3m-switch-buffer t]))
+	  (easy-menu-add w3m-tab-menu)
+	  (add-hook 'activate-menubar-hook 'w3m-tab-menubar-update))
+      (unless (lookup-key w3m-mode-map [menu-bar Tab])
+	(easy-menu-define w3m-tab-menu w3m-mode-map "" '("Tab"))
+	(easy-menu-add w3m-tab-menu)
+	(add-hook 'menu-bar-update-hook 'w3m-tab-menubar-update)))))
+
+(defun w3m-switch-buffer ()
+  "Switch `w3m-mode' buffer in the current window."
+  (interactive)
+  (let ((items (w3m-tab-menubar-make-items 'nomenu))
+	(minibuffer-setup-hook
+	 (append minibuffer-setup-hook '(beginning-of-line)))
+	(count 1)
+	(form "%s [%s]")
+	(completion-ignore-case t)
+	comp hist histlen default buf)
+    (dolist (item items)
+      (when (nth 2 item)	;; current-buffer
+	(setq default count))
+      (setq comp (cons
+		  (cons
+		   (format form (nth 1 item) (nth 0 item)) (nth 0 item))
+		  comp))
+      (setq hist (cons (format form (nth 1 item) (nth 0 item)) hist))
+      (setq count (1+ count)))
+    (setq comp (nreverse comp))
+    (setq histlen (length hist))
+    (setq hist (append hist hist hist hist hist)) ;; STARTPOS at 3rd hist
+    (setq buf
+	  (completing-read
+	   "Switch to w3m buffer: "
+	   comp nil t (car (nth (1- default) comp))
+	   (cons 'hist (+ (* 3 histlen) (- histlen default -1)))
+	   (car (nth (1- default) comp))))
+    (setq buf (cdr (assoc buf comp)))
+    (when (get-buffer buf)
+      (switch-to-buffer buf))))
+
+(defun w3m-tab-menubar-open-item (buf)
+  "Open w3m buffer from tab menubar."
+  (interactive)
+  (when (get-buffer buf)
+    (switch-to-buffer buf)))
+
+(defun w3m-tab-menubar-update ()
+  "Update w3m tab menubar."
+  (when (and (eq major-mode 'w3m-mode)
+	     (w3m-static-if (featurep 'xemacs)
+		 (frame-property (selected-frame) 'menubar-visible-p)
+	       menu-bar-mode))
+    (easy-menu-define w3m-tab-menu w3m-mode-map
+      "The menu kepmap for the emacs-w3m tab."
+      (cons "Tab" (w3m-tab-menubar-make-items)))
+    (w3m-static-when (featurep 'xemacs)
+      (let ((items (car (find-menu-item current-menubar '("Tab")))))
+	(when items
+	  (setcdr items (cdr w3m-tab-menu))
+	  (set-buffer-menubar current-menubar))))))
+
+(defvar w3m-tab-menubar-items-sub-coeff 30) ;; 30?
+(defvar w3m-tab-menubar-items-width 50) ;; 50?
+
+(defun w3m-tab-menubar-make-items-1 (buffers &optional nomenu)
+  (let ((i 0)
+	(current (current-buffer))
+	(width w3m-tab-menubar-items-width)
+	title unseen)
+    (mapcar
+     (lambda (buffer)
+       (if nomenu
+	   (list (buffer-name buffer)
+		 (format "%s%s"
+			 (if (w3m-unseen-buffer-p buffer) "(u)" "")
+			 (w3m-buffer-title buffer))
+		 (eq buffer current))
+	 (setq title (w3m-buffer-title buffer))
+	 (setq unseen (w3m-unseen-buffer-p buffer))
+	 (when (>= (string-width title) width)
+	   (setq title
+		 (concat (w3m-truncate-string title
+					      (- width 3))
+			 "...")))
+	 (vector (format "%d:%s%s"
+			 (incf i)
+			 (cond ((eq buffer current) "* ")
+			       (unseen "u ")
+			       (t "  "))
+			 title)
+		 `(w3m-tab-menubar-open-item ,(buffer-name buffer))
+		 buffer)))
+     buffers)))
+
+(defvar w3m-tab-menubar-make-items-precbuf nil)
+(defvar w3m-tab-menubar-make-items-prebuflst nil)
+(defvar w3m-tab-menubar-make-items-preurl nil)
+(defvar w3m-tab-menubar-make-items-preitems nil)
+
+(defun w3m-tab-menubar-force-update (&rest args)
+  (setq w3m-tab-menubar-make-items-preitems nil)
+  (w3m-tab-menubar-update))
+
+(add-hook 'w3m-display-functions 'w3m-tab-menubar-force-update)
+
+(defun w3m-tab-menubar-make-items (&optional nomenu)
+  "Create w3m tab menu items."
+  (let (menu buflst total max)
+    (if nomenu
+	(w3m-tab-menubar-make-items-1 (w3m-list-buffers) t)
+      (setq w3m-tab-button-menu-current-buffer (current-buffer))
+      (setq buflst (w3m-list-buffers))
+      (if (and w3m-tab-menubar-make-items-preitems
+	       (eq w3m-tab-button-menu-current-buffer
+		   w3m-tab-menubar-make-items-precbuf)
+	       (equal w3m-tab-menubar-make-items-prebuflst buflst)
+	       (equal w3m-tab-menubar-make-items-preurl w3m-current-url))
+	  w3m-tab-menubar-make-items-preitems
+	(setq w3m-tab-menubar-make-items-precbuf
+	      w3m-tab-button-menu-current-buffer)
+	(setq w3m-tab-menubar-make-items-prebuflst buflst)
+	(setq w3m-tab-menubar-make-items-preurl w3m-current-url)
+	(setq total (length buflst))
+	(setq max (- (frame-height (selected-frame))
+		     w3m-tab-menubar-items-sub-coeff))
+	(if (< total max)
+	    (setq menu (w3m-tab-menubar-make-items-1 buflst))
+	  (setq menu (list `(,(w3m-make-menu-item "¥¿¥Ö¤ÎÁªÂò"
+						  "Select TAB")
+			     ,@(w3m-tab-menubar-make-items-1 buflst)))))
+	(setq w3m-tab-menubar-make-items-preitems
+	      (append menu
+		      '("-")
+		      '("-")
+		      (w3m-make-menu-commands
+		       w3m-tab-button-menu-commands)))))))
+
+(provide 'w3m-tabmenu)
+
+;;; w3m-tabmenu.el ends here

=== added file 'share/emacs/site-lisp/w3m/w3m-ucs.el'
--- share/emacs/site-lisp/w3m/w3m-ucs.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-ucs.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,109 @@
+;;; w3m-ucs.el --- CCL programs to process Unicode.
+
+;; Copyright (C) 2001, 2005, 2007 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
+;;          ARISAWA Akihiro <ari@mbf.sphere.ne.jp>
+;; Keywords: w3m, WWW, hypermedia
+
+;; This file is a part of emacs-w3m.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; This file contains CCL codes to handle UCS characters in emacs-w3m.
+;; For more detail about emacs-w3m, see:
+;;
+;;    http://emacs-w3m.namazu.org/
+
+;; This module requires `Mule-UCS' package.  It can be downloaded from:
+;;
+;;    ftp://ftp.m17n.org/pub/mule/Mule-UCS/
+
+;;; Code:
+
+;; Enable XEmacs 21.5-Mule to compile this module anyway.
+(eval-when-compile
+  (if (featurep 'xemacs)
+      (let ((mucs-ignore-version-incompatibilities t))
+	(defvar font-ccl-encoder-alist nil)
+	(require 'un-define))))
+
+(require 'un-define)
+(require 'w3m-ccl)
+
+(eval-and-compile
+  (autoload 'w3m-make-ccl-coding-system "w3m"))
+
+(defun w3m-ucs-to-char (codepoint)
+  (condition-case nil
+      (or (ucs-to-char codepoint) ?~)
+    (error ?~)))
+
+(eval-and-compile
+  (defconst w3m-ccl-get-ucs-codepoint-with-mule-ucs
+    '(;; (1) Convert a set of r1 (charset-id) and r0 (codepoint) to a
+      ;; character in Emacs internal representation.
+      (if (r0 > 255)
+	  ((r4 = (r0 & 127))
+	   (r0 = (((r0 >> 7) * 96) + r4))
+	   (r0 |= (r1 << 16)))
+	((r0 |= (r1 << 16))))
+      ;; (2) Convert a character in Emacs to a UCS codepoint.
+      (call emacs-char-to-ucs-codepoint-conversion)
+      (if (r0 <= 0)
+	  (write-repeat ?~)))		; unknown character.
+    "CCL program to convert multibyte char to ucs with Mule-UCS."))
+
+(define-ccl-program w3m-euc-japan-mule-ucs-encoder
+  `(4
+    (loop
+     ,@w3m-ccl-write-euc-japan-character
+     ,@w3m-ccl-get-ucs-codepoint-with-mule-ucs
+     ,@w3m-ccl-generate-ncr)))
+
+(w3m-make-ccl-coding-system
+ 'w3m-euc-japan-mule-ucs ?E
+ "ISO 2022 based EUC encoding for Japanese with w3m internal characters.
+A character that can not be encoded with `euc-japan' is converted to a
+UCS codepoint with Mule-UCS, and the codepoint is represented as a
+string which represents the character in Numeric Character
+References (NCR).
+  (generated by `w3m')"
+ 'w3m-euc-japan-decoder
+ 'w3m-euc-japan-mule-ucs-encoder)
+
+(define-ccl-program w3m-iso-latin-1-mule-ucs-encoder
+  `(4
+    (loop
+     ,@w3m-ccl-write-iso-latin-1-character
+     ,@w3m-ccl-get-ucs-codepoint-with-mule-ucs
+     ,@w3m-ccl-generate-ncr)))
+
+(w3m-make-ccl-coding-system
+ 'w3m-iso-latin-1-mule-ucs ?1
+ "ISO 2022 based 8-bit encoding for Latin-1 with w3m internal characters.
+A character that can not be encoded with `iso-latin-1' is converted to
+a UCS codepoint with Mule-UCS, and the codepoint is represented as a
+string which represents the character in Numeric Character
+References (NCR).
+  (generated by `w3m')"
+ 'w3m-iso-latin-1-decoder
+ 'w3m-iso-latin-1-mule-ucs-encoder)
+
+(provide 'w3m-ucs)
+;;; w3m-ucs.el ends here.

=== added file 'share/emacs/site-lisp/w3m/w3m-util.el'
--- share/emacs/site-lisp/w3m/w3m-util.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-util.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,1421 @@
+;;; w3m-util.el --- Utility macros and functions for emacs-w3m
+
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
+;;          Shun-ichi GOTO     <gotoh@taiyo.co.jp>,
+;;          Satoru Takabayashi <satoru-t@is.aist-nara.ac.jp>,
+;;          Hideyuki SHIRAI    <shirai@meadowy.org>,
+;;          Keisuke Nishida    <kxn30@po.cwru.edu>,
+;;          Yuuichi Teranishi  <teranisi@gohome.org>,
+;;          Akihiro Arisawa    <ari@mbf.sphere.ne.jp>,
+;;          Katsumi Yamaoka    <yamaoka@jpl.org>
+;; Keywords: w3m, WWW, hypermedia
+
+;; This file is a part of emacs-w3m.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; This module is a part of emacs-w3m which provides utility macros
+;; and inline functions.  Visit <URL:http://emacs-w3m.namazu.org/> for
+;; more details of emacs-w3m.
+
+;;; Code:
+
+(eval-when-compile
+  (require 'cl))
+
+;; Variables and functions which are used in the following inline
+;; functions.  They should be defined in the other module at run-time.
+(eval-when-compile
+  (defvar w3m-current-process)
+  (defvar w3m-current-refresh)
+  (defvar w3m-current-title)
+  (defvar w3m-current-url)
+  (defvar w3m-fb-list-buffers-frame)
+  (defvar w3m-fb-mode)
+  (defvar w3m-mode-hook)
+  (defvar w3m-pop-up-frames)
+  (defvar w3m-pop-up-windows)
+  (defvar w3m-popup-frame-parameters)
+  (defvar w3m-refresh-timer)
+  (defvar w3m-select-buffer-name)
+  (defvar w3m-use-refresh)
+  (defvar w3m-use-tab)
+  (defvar w3m-work-buffer-list)
+  (defvar w3m-use-japanese-menu)
+  (defvar w3m-mode-map)
+  (defvar w3m-use-title-buffer-name)
+  (defvar w3m-buffer-unseen)
+  (defvar w3m-puny-utf-16be)
+  (unless (fboundp 'select-frame-set-input-focus)
+    (defalias 'select-frame-set-input-focus 'ignore)))
+
+(eval-and-compile
+  (when (featurep 'xemacs)
+    (require 'poe)
+    (require 'poem)))
+
+;;; Things should be defined in advance:
+(eval-when-compile
+  (autoload 'w3m-fb-frame-parameter "w3m-fb")
+  (autoload 'w3m-history-restore-position "w3m-hist" nil t))
+
+;;; Control structures:
+
+(defmacro w3m-static-if (cond then &rest else)
+  "Like `if', except that it evaluates COND at compile-time."
+  (if (eval cond) then `(progn  ,@else)))
+(put 'w3m-static-if 'lisp-indent-function 2)
+
+(put 'w3m-static-when 'lisp-indent-function 1)
+(defmacro w3m-static-when (cond &rest body)
+  "Like `when', but evaluate COND at compile time."
+  (if (eval cond)
+      `(progn ,@body)))
+
+(put 'w3m-static-unless 'lisp-indent-function 1)
+(defmacro w3m-static-unless (cond &rest body)
+  "Like `unless', but evaluate COND at compile time."
+  (if (eval cond)
+      nil
+    `(progn ,@body)))
+
+(defmacro w3m-static-cond (&rest clauses)
+  "Like `cond', except that it evaluates CONDITION part of each clause at
+compile-time."
+  (while (and clauses
+	      (not (eval (car (car clauses)))))
+    (setq clauses (cdr clauses)))
+  (if clauses
+      (cons 'progn (cdr (car clauses)))))
+
+(put 'w3m-condition-case lisp-indent-function 2)
+(defmacro w3m-condition-case (var bodyform &rest handlers)
+  "Like `condition-case', except that signal an error if `debug-on-error'
+or `debug-on-quit' is non-nil."
+  `(if (or debug-on-error debug-on-quit)
+       ,bodyform
+     (condition-case ,var
+	 ,bodyform
+       ,@handlers)))
+
+
+;;; Text props:
+
+(defmacro w3m-add-text-properties (start end props &optional object)
+  "Like `add-text-properties' but always add non-sticky properties."
+  (let ((non-stickies
+	 (if (featurep 'xemacs)
+	     ;; Default to start-closed and end-open in XEmacsen.
+	     '(list 'start-open t)
+	   ;; Default to front-nonsticky and rear-sticky in Emacsen.
+	   '(list 'rear-nonsticky t))))
+    `(add-text-properties ,start ,end
+			  (append ,non-stickies ,props)
+			  ,object)))
+
+(defun w3m-add-face-property (start end name &optional object)
+  "Add face NAME to the face text property of the text from START to END.
+The value of the existing text property should be a list.
+If the optional fourth argument OBJECT is a buffer (or nil, which means
+the current buffer), START and END are buffer positions (integers or
+markers).  If OBJECT is a string, START and END are 0-based indices
+into it."
+  (let ((pos start)
+	next prop)
+    (while (< pos end)
+      (setq prop (get-text-property pos 'face object)
+	    next (next-single-property-change pos 'face object end))
+      (w3m-add-text-properties pos next (list 'face (cons name prop)) object)
+      (setq pos next))))
+
+(defun w3m-remove-face-property (start end name &optional object)
+  "Remove face NAME from the face text property of text from START to END.
+The value of the existing text property should be a list.
+If the optional fourth argument OBJECT is a buffer (or nil, which means
+the current buffer), START and END are buffer positions (integers or
+markers).  If OBJECT is a string, START and END are 0-based indices
+into it."
+  (let ((pos start)
+	next prop new-prop elem)
+    (while (< pos end)
+      (setq prop (get-text-property pos 'face object))
+      (setq next (next-single-property-change pos 'face object end))
+      (setq new-prop nil)
+      (while prop
+	(setq elem (pop prop))
+	(unless (eq elem name)
+	  (push elem new-prop)))
+      (when new-prop
+	(w3m-add-text-properties pos next
+				 (list 'face new-prop)))
+      (setq pos next))))
+
+(defmacro w3m-get-text-property-around (prop)
+  "Search for the text property PROP in one character before and behind
+the current position.  Return the value corresponding to PROP or nil.
+If PROP is not found at the current position, point will move to the
+position where PROP exists."
+  `(let ((position (point))
+	 value)
+     (or (get-text-property position ,prop)
+	 (and (not (bolp))
+	      (setq value (get-text-property (1- position) ,prop))
+	      (goto-char (1- position))
+	      value)
+	 (and (not (eolp))
+	      (setq value (get-text-property (1+ position) ,prop))
+	      (goto-char (1+ position))
+	      value))))
+
+(defmacro w3m-action (&optional position)
+  "Return the value of the `w3m-action' property at the given POSITION.
+NOTE: If POSITION is omitted, it searches for the property in one
+character before and behind the current position, and point will move
+to the position where the property exists."
+  (if position
+      `(get-text-property ,position 'w3m-action)
+    `(w3m-get-text-property-around 'w3m-action)))
+
+(defmacro w3m-anchor (&optional position)
+  "Return the value of the `w3m-href-anchor' property at the given POSITION.
+NOTE: If POSITION is omitted, it searches for the property in one
+character before and behind the current position, and point will move
+to the position where the property exists."
+  (if position
+      `(get-text-property ,position 'w3m-href-anchor)
+    `(w3m-get-text-property-around 'w3m-href-anchor)))
+
+(defmacro w3m-image (&optional position)
+  "Return the value of the `w3m-image' property at the given POSITION.
+NOTE: If POSITION is omitted, it searches for the property in one
+character before and behind the current position, and point will move
+to the position where the property exists."
+  (if position
+      `(get-text-property ,position 'w3m-image)
+    `(w3m-get-text-property-around 'w3m-image)))
+
+(defmacro w3m-image-alt (&optional position)
+  "Return the value of the `w3m-image-alt' property at the given POSITION.
+NOTE: If POSITION is omitted, it searches for the property in one
+character before and behind the current position, and point will move
+to the position where the property exists."
+  (if position
+      `(get-text-property ,position 'w3m-image-alt)
+    `(w3m-get-text-property-around 'w3m-image-alt)))
+
+(defmacro w3m-submit (&optional position)
+  "Return the value of the `w3m-submit' property at the given POSITION.
+NOTE: If POSITION is omitted, it searches for the property in one
+character before and behind the current position, and point will move
+to the position where the property exists."
+  (if position
+      `(get-text-property ,position 'w3m-submit)
+    `(w3m-get-text-property-around 'w3m-submit)))
+
+(defmacro w3m-anchor-sequence (&optional position)
+  "Return the value of the `w3m-anchor-sequence' property at POSITION.
+If POSITION is omitted, the current position is assumed."
+  (if position
+      `(get-text-property ,position 'w3m-anchor-sequence)
+    '(get-text-property (point) 'w3m-anchor-sequence)))
+
+
+;;; Attributes:
+
+(eval-and-compile
+  ;; `eval-and-compile' is necessary since the value of the constant
+  ;; is referred to at the compile time.
+  (defconst w3m-html-string-regexp
+    "\\(\"\\([^\"]+\\)\"\\|'\\([^']+\\)'\\|[^\"'<> \t\r\f\n]*\\)"
+    "Regexp matching a string of the field-value like <a href=\"VALUE\">."))
+
+(put 'w3m-parse-attributes 'lisp-indent-function '1)
+(def-edebug-spec w3m-parse-attributes
+  ((&rest &or (symbolp &optional symbolp) symbolp) body))
+(defmacro w3m-parse-attributes (attributes &rest forms)
+  "Extract ATTRIBUTES, KEYWORD=\"VALUE\" pairs, in a tag and run FORMS.
+ATTRIBUTES is a list of symbols that looks like `(KEYWORD KEYWORD...)'.
+A symbol KEYWORD, that will express a value extracted from a tag, can
+be used as a Lisp variable within FORMS.  The point has to be within
+a tag initially, and only attributes that follow the point will be
+extracted.
+
+The value of KEYWORD is a string by default, or is nil if the KEYWORD
+is not found in a tag.  KEYWORD can be `(KEYWORD TYPE)', where TYPE is
+one of `:case-ignore', `:integer', `:bool', and `:decode-entity'.
+Those types mean converting the value into a lower-case string,
+an integer, a boolean (t or nil), and a decoded string respectively."
+  `(let (,@(mapcar (lambda (attr)
+		     (if (listp attr)
+			 (car attr)
+		       attr))
+		   attributes))
+     (skip-chars-forward " \t\r\f\n")
+     (while
+	 (cond
+	  ,@(mapcar
+	     (lambda (attr)
+	       (or (symbolp attr)
+		   (and (listp attr)
+			(<= (length attr) 2)
+			(symbolp (car attr)))
+		   (error "Internal error, type mismatch"))
+	       (let ((sexp (quote
+			    (w3m-remove-redundant-spaces
+			     (or (match-string-no-properties 2)
+				 (match-string-no-properties 3)
+				 (match-string-no-properties 1)))))
+		     type)
+		 (when (listp attr)
+		   (setq type (nth 1 attr))
+		   (cond
+		    ((eq type :case-ignore)
+		     (setq sexp (list 'downcase sexp)))
+		    ((eq type :integer)
+		     (setq sexp (list 'string-to-number sexp)))
+		    ((eq type :bool)
+		     (setq sexp t))
+		    ((eq type :decode-entity)
+		     (setq sexp (list 'w3m-decode-entities-string sexp)))
+		    ((nth 1 attr)
+		     (error "Internal error, unknown modifier")))
+		   (setq attr (car attr)))
+		 `((looking-at
+		    ,(if (eq type :bool)
+			 (format "%s\\(?:[ \t\r\f\n]*=[ \t\r\f\n]*%s\\)?"
+				 (symbol-name attr)
+				 w3m-html-string-regexp)
+		       (format "%s[ \t\r\f\n]*=[ \t\r\f\n]*%s"
+			       (symbol-name attr)
+			       w3m-html-string-regexp)))
+		   (setq ,attr ,sexp))))
+	     attributes)
+	  ((looking-at ,(concat "[A-Za-z]*[ \t\r\f\n]*=[ \t\r\f\n]*"
+				w3m-html-string-regexp)))
+	  ((looking-at "[^<> \t\r\f\n]+")))
+       (goto-char (match-end 0))
+       (skip-chars-forward " \t\r\f\n"))
+     (skip-chars-forward "^>")
+     (forward-char)
+     ,@forms))
+
+
+;;; Working buffers:
+
+(defun w3m-get-buffer-create (name)
+  "Return the buffer named NAME, or create such a buffer and return it."
+  (or (get-buffer name)
+      (let ((buf (get-buffer-create name)))
+	(setq w3m-work-buffer-list (cons buf w3m-work-buffer-list))
+	(buffer-disable-undo buf)
+	buf)))
+
+(defun w3m-kill-buffer (buffer)
+  "Kill the buffer BUFFER and remove it from `w3m-work-buffer-list'.
+The argument may be a buffer or may be the name of a buffer.
+An argument of nil means kill the current buffer."
+  (unless buffer
+    (setq buffer (current-buffer)))
+  (when (stringp buffer)
+    (setq buffer (get-buffer buffer)))
+  (when (buffer-live-p buffer)
+    (kill-buffer buffer))
+  (setq w3m-work-buffer-list (delq buffer w3m-work-buffer-list))
+  nil)
+
+(defun w3m-kill-all-buffer ()
+  "Kill all working buffer."
+  (dolist (buf w3m-work-buffer-list)
+    (when (buffer-live-p buf)
+      (kill-buffer buf)))
+  (setq w3m-work-buffer-list nil))
+
+(defun w3m-current-title ()
+  "Return the title of the current buffer."
+  (cond
+   (w3m-current-process
+     "<retrieving>")
+   ((and (stringp w3m-current-title)
+	 (not (string= w3m-current-title "<no-title>")))
+    w3m-current-title)
+   ((stringp w3m-current-url)
+    (directory-file-name
+     (if (string-match "^[^/:]+:/+" w3m-current-url)
+	 (substring w3m-current-url (match-end 0))
+       w3m-current-url)))
+   (t "<no-title>")))
+
+(defun w3m-buffer-title (buffer)
+  "Return the title of the buffer BUFFER."
+  (with-current-buffer buffer
+    (w3m-current-title)))
+
+(defun w3m-buffer-number (buffer)
+  (when (and (bufferp buffer)
+	     (string-match "\\*w3m\\*\\(<\\([0-9]+\\)>\\)?\\'"
+			   (buffer-name buffer)))
+    (if (match-beginning 1)
+	(string-to-number (match-string 2 (buffer-name buffer)))
+      1))) ;; `1' should not be represented in the buffer name.
+
+(defun w3m-buffer-set-number (buffer number)
+  (with-current-buffer buffer
+    (let ((newname (if w3m-use-title-buffer-name
+		       (if (= number 1)
+			   (format "%s *w3m*" (w3m-current-title))
+			 (format "%s *w3m*<%d>" (w3m-current-title) number))
+		     (if (= number 1)
+			 "*w3m*"
+		       (format "*w3m*<%d>" number)))))
+      (if (eq (w3m-buffer-number buffer) number)
+	  (when w3m-use-title-buffer-name
+	    (unless (get-buffer newname)
+	      (rename-buffer newname)))
+	(unless (get-buffer newname)
+	  (rename-buffer newname))))))
+
+(defun w3m-buffer-name-add-title ()
+  "Add current tile to buffer name."
+  (when w3m-use-title-buffer-name
+    (let ((number (w3m-buffer-number (current-buffer)))
+	  newname)
+      (if (= number 1)
+	  (setq newname (format "%s *w3m*" (w3m-current-title)))
+	(setq newname (format "%s *w3m*<%d>" (w3m-current-title) number)))
+      (rename-buffer newname))))
+
+(defun w3m-generate-new-buffer (name)
+  (if w3m-use-title-buffer-name
+      (let* ((maxbuf (let ((w3m-fb-mode nil))
+		       (car (nreverse (w3m-list-buffers)))))
+	     (number (w3m-buffer-number maxbuf)))
+	(when (string-match "\\*w3m\\*\\(<\\([0-9]+\\)>\\)?\\'" name)
+	  (setq name "*w3m*"))
+	(if (and maxbuf number)
+	    (generate-new-buffer (format "%s<%d>" name (1+ number)))
+	  (generate-new-buffer name)))
+    (generate-new-buffer name)))
+
+(defun w3m-buffer-name-lessp (x y)
+  "Return t if first arg buffer's name is less than second."
+  (when (bufferp x)
+    (setq x (buffer-name x)))
+  (when (bufferp y)
+    (setq y (buffer-name y)))
+  (if (and (string-match "\\*w3m\\*\\(<\\([0-9]+\\)>\\)?\\'" x)
+	   (setq x (cons x
+			 (if (match-beginning 1)
+			     (string-to-number (match-string 2 x))
+			   1))))
+      (if (string-match "\\*w3m\\*\\(<\\([0-9]+\\)>\\)?\\'" y)
+	  (< (cdr x)
+	     (if (match-beginning 1)
+		 (string-to-number (match-string 2 y))
+	       1))
+	(string< (car x) y))
+    (string< x y)))
+
+(defun w3m-list-buffers (&optional nosort)
+  "Return a list of buffers in which emacs-w3m sessions are open.
+If the optional NOSORT is nil, the list is sorted in the order of
+buffer names."
+  (let ((buffers (buffer-list))
+	buffer rest)
+    (save-current-buffer
+      (while buffers
+	(set-buffer (setq buffer (pop buffers)))
+	(when (eq major-mode 'w3m-mode)
+	  (push buffer rest))))
+    (setq buffers (if nosort
+		      (nreverse rest)
+		    (sort rest #'w3m-buffer-name-lessp)))
+    (when (and (boundp 'w3m-fb-mode)
+	       w3m-fb-mode
+	       (if (or w3m-pop-up-frames
+		       (not (memq 'w3m-fb-add w3m-mode-hook)))
+		   ;; `w3m-fb-mode' might have been set by something
+		   ;; other than the `w3m-fb-mode' function.
+		   (setq w3m-fb-mode nil)
+		 t))
+      ;; Don't just return `w3m-fb-buffer-list' for the selected frame
+      ;; because `buffers' may have been sorted.
+      (let ((fbs (w3m-fb-frame-parameter w3m-fb-list-buffers-frame
+					 'w3m-fb-buffer-list)))
+	(setq rest buffers)
+	(while rest
+	  (unless (memq (setq buffer (pop rest)) fbs)
+	    (setq buffers (delq buffer buffers))))))
+    buffers))
+
+
+;;; Pop up and delete buffers, windows or frames:
+
+(defmacro w3m-popup-frame-parameters ()
+  "Return a pop-up frame plist if this file is compiled for XEmacs,
+otherwise return an alist."
+  (if (featurep 'xemacs)
+      '(let ((params (or w3m-popup-frame-parameters pop-up-frame-plist)))
+	 (if (consp (car-safe params))
+	     (alist-to-plist params)
+	   params))
+    '(let ((params (or w3m-popup-frame-parameters pop-up-frame-alist))
+	   alist)
+       (if (consp (car-safe params))
+	   params
+	 (while params
+	   (push (cons (car params) (cdr params)) alist)
+	   (setq params (cddr params)))
+	 (nreverse alist)))))
+
+(defun w3m-device-on-window-system-p ()
+  "Return non-nil if the selected frame is on a widnow system"
+  (w3m-static-if (featurep 'xemacs)
+      (device-on-window-system-p)
+    window-system))
+
+(defmacro w3m-popup-frame-p ()
+  "Return non-nil if `w3m-pop-up-frames' is non-nil and Emacs really
+supports separate frames."
+  '(and w3m-pop-up-frames (w3m-device-on-window-system-p)))
+
+(defmacro w3m-use-tab-p ()
+  "Return non-nil if `w3m-use-tab' is non-nil and Emacs really supports
+the tabs line."
+  (cond ((featurep 'xemacs)
+	 '(and w3m-use-tab (device-on-window-system-p)))
+	(t
+	 'w3m-use-tab)))
+
+(defun w3m-lefttab-exist-p (&optional buffer)
+  (not (eq (or buffer (current-buffer)) (car (w3m-list-buffers)))))
+
+(defun w3m-righttab-exist-p (&optional buffer)
+  (let ((bufs (w3m-list-buffers))
+	(cbuf (or buffer (current-buffer)))
+	buf)
+    (catch 'exist
+      (while (setq buf (car bufs))
+	(setq bufs (cdr bufs))
+	(when (eq cbuf buf)
+	  (throw 'exist bufs))))))
+
+(defmacro w3m-popup-window-p ()
+  "Return non-nil if `w3m-pop-up-windows' is non-nil and the present
+situation allows it."
+  '(and w3m-pop-up-windows
+	(not (w3m-use-tab-p))
+	(not (get-buffer-window w3m-select-buffer-name))))
+
+(defvar w3m-initial-frames nil
+  "Variable used to keep a list of the frame-IDs when emacs-w3m sessions
+are popped-up as new frames.  This variable is used for the control
+for not deleting frames made for aims other than emacs-w3m sessions.")
+(make-variable-buffer-local 'w3m-initial-frames)
+
+(defun w3m-popup-buffer (buffer)
+  "Pop up BUFFER as a new window or a new frame
+according to `w3m-pop-up-windows' and `w3m-pop-up-frames' (which see)."
+  (let ((window (get-buffer-window buffer t))
+	(oframe (selected-frame))
+	(popup-frame-p (w3m-popup-frame-p))
+	frame pop-up-frames buffers other)
+    (if (setq
+	 pop-up-frames
+	 (if window ;; The window showing BUFFER already exists.
+	     ;; Don't pop up a new frame if it is just the current frame.
+	     (not (eq (setq frame (window-frame window)) oframe))
+	   ;; There is no window for BUFFER, so look for the existing
+	   ;; emacs-w3m window if the tabs line is enabled or the
+	   ;; selection window exists (i.e., we can reuse it).
+	   (if (or (w3m-use-tab-p)
+		   (get-buffer-window w3m-select-buffer-name t))
+	       (progn
+		 (setq buffers (delq buffer (w3m-list-buffers t)))
+		 (while (and (not window)
+			     buffers)
+		   (setq window
+			 (get-buffer-window (setq other (pop buffers)) t)))
+		 (if window ;; The window showing another buffer exists.
+		     (not (eq (setq frame (window-frame window)) oframe))
+		   (setq other nil)
+		   ;; There is no window after all, so leave to the value
+		   ;; of `w3m-pop-up-frames' whether to pop up a new frame.
+		   popup-frame-p))
+	     ;; Ditto.
+	     popup-frame-p)))
+	(progn
+	  (cond (other
+		 ;; Pop up another emacs-w3m buffer and switch to BUFFER.
+		 (pop-to-buffer other)
+		 ;; Change the value for BUFFER's `w3m-initial-frames'.
+		 (setq w3m-initial-frames
+		       (prog1
+			   (copy-sequence w3m-initial-frames)
+			 (switch-to-buffer buffer))))
+		(frame
+		 ;; Pop up the existing frame which shows BUFFER.
+		 (pop-to-buffer buffer))
+		(t
+		 ;; Pop up a new frame.
+		 (let* ((pop-up-frame-alist (w3m-popup-frame-parameters))
+			(pop-up-frame-plist pop-up-frame-alist))
+		   (pop-to-buffer buffer))
+		 (setq frame (window-frame (get-buffer-window buffer t)))))
+	  ;; Raise, select and focus the frame.
+	  (if (fboundp 'select-frame-set-input-focus)
+	      (select-frame-set-input-focus frame)
+	    (raise-frame frame)
+	    (select-frame frame)
+	    (w3m-static-when (featurep 'xemacs)
+	      (focus-frame frame)))
+	  (w3m-history-restore-position))
+      (unless (prog1
+		  (eq buffer (current-buffer))
+		;; Simply switch to BUFFER in the current frame.
+		(if (w3m-popup-window-p)
+		    (let ((pop-up-windows t))
+		      (pop-to-buffer buffer))
+		  (switch-to-buffer buffer)))
+	(w3m-history-restore-position)))))
+
+(eval-when-compile
+  (when (and (fboundp 'select-frame-set-input-focus)
+	     (eq (symbol-function 'select-frame-set-input-focus) 'ignore))
+    (fmakunbound 'select-frame-set-input-focus)))
+
+(defun w3m-add-w3m-initial-frames (&optional frame)
+  "Add FRAME into `w3m-initial-frames', the buffer-local variable.
+It is done when FRAME is newly created for the emacs-w3m session.
+This function is added to the hook which is different with the Emacs
+version as follows:
+
+XEmacs          `create-frame-hook'
+Emacs 21,22     `after-make-frame-functions'
+Emacs 19        `after-make-frame-hook'
+
+Note that `after-make-frame-hook' doesn't take an argument."
+  (unless frame
+    (setq frame (selected-frame)))
+  ;; Share the opened frame in `w3m-initial-frames' over all emacs-w3m
+  ;; buffers if `w3m-use-tab' is non-nil.  Otherwise, the frame is
+  ;; appended into `w3m-initial-frames' only in the current buffer.
+  (with-current-buffer (window-buffer (frame-first-window frame))
+    (when (eq major-mode 'w3m-mode)
+      (unless (memq frame w3m-initial-frames)
+	(push frame w3m-initial-frames))
+      (when w3m-use-tab
+	(dolist (buffer (delq (current-buffer) (w3m-list-buffers t)))
+	  (set-buffer buffer)
+	  (unless (memq frame w3m-initial-frames)
+	    (push frame w3m-initial-frames)))))))
+
+(add-hook (if (featurep 'xemacs)
+	      'create-frame-hook
+	    'after-make-frame-functions)
+	  'w3m-add-w3m-initial-frames)
+
+(defun w3m-delete-w3m-initial-frames (frame)
+  "Delete FRAME from `w3m-initial-frames', the buffer-local variable.
+It is done when the FRAME in which emacs-w3m is running is deleted.
+This function is added to `delete-frame-hook' (`delete-frame-functions'
+is used instead in Emacs 22) or merged into the `delete-frame' function
+using `defadvice'."
+  (save-current-buffer
+    (dolist (buffer (w3m-list-buffers t))
+      (set-buffer buffer)
+      (setq w3m-initial-frames (delq frame w3m-initial-frames)))))
+
+(cond ((boundp 'delete-frame-functions)
+       (add-hook 'delete-frame-functions 'w3m-delete-w3m-initial-frames))
+      (t
+       (add-hook 'delete-frame-hook 'w3m-delete-w3m-initial-frames)))
+
+(defun w3m-delete-frames-and-windows (&optional exception)
+  "Delete all frames and windows related to emacs-w3m buffers.
+If EXCEPTION is a buffer, a window or a frame, it and related visible
+objects will not be deleted.  There are special cases; the following
+objects will not be deleted:
+
+1. The sole frame in the display device.
+2. Frames created not for emacs-w3m sessions.
+3. Frames showing not only emacs-w3m sessions but also other windows.\
+"
+  (let ((buffers (delq exception (w3m-list-buffers t)))
+	buffer windows window frame one-window-p flag)
+    (save-current-buffer
+      (while buffers
+	(setq buffer (pop buffers)
+	      windows (delq exception
+			    (get-buffer-window-list buffer 'no-minibuf t)))
+	(set-buffer buffer)
+	(while windows
+	  (setq window (pop windows)
+		frame (window-frame window))
+	  (when (and frame
+		     (not (eq frame exception)))
+	    (setq one-window-p
+		  (w3m-static-if (featurep 'xemacs)
+		      (one-window-p t frame)
+		    ;; Emulate XEmacs version's `one-window-p'.
+		    (prog2
+			(setq flag nil)
+			(catch 'exceeded
+			  (walk-windows (lambda (w)
+					  (when (eq (window-frame w) frame)
+					    (if flag
+						(throw 'exceeded nil)
+					      (setq flag t))))
+					'no-minibuf t)
+			  flag)
+		      (set-buffer buffer))))
+	    (if (and (memq frame w3m-initial-frames)
+		     (not (eq (next-frame frame) frame)))
+		(if (or
+		     ;; A frame having the sole window can be deleted.
+		     one-window-p
+		     ;; Also a frame having only windows for emacs-w3m
+		     ;; sessions or the buffer selection can be deleted.
+		     (progn
+		       (setq flag t)
+		       (walk-windows
+			(lambda (w)
+			  (when flag
+			    (if (eq w exception)
+				(setq flag nil)
+			      (set-buffer (window-buffer w))
+			      (setq flag (or (memq major-mode
+						   '(w3m-mode
+						     w3m-select-buffer-mode
+						     w3m-session-select-mode))
+					     (string-match "\\` ?\\*w3m[ -]"
+							   (buffer-name)))))))
+			'no-minibuf)
+		       (set-buffer buffer)
+		       flag))
+		    (delete-frame frame)
+		  (delete-window window))
+	      (unless one-window-p
+		(delete-window window)))))))))
+
+
+;;; Miscellaneous:
+
+(defconst w3m-url-fallback-base "http:///")
+(defconst w3m-url-invalid-regexp "\\`http:///")
+
+(defun w3m-url-valid (url)
+  (and url (not (string-match w3m-url-invalid-regexp url))
+       url))
+
+(defmacro w3m-set-match-data (list)
+  "Same as the `set-match-data'; convert points into markers under XEmacs."
+  (if (featurep 'xemacs)
+      `(let ((list ,list))
+	 (store-match-data (dolist (pt (prog1 list (setq list nil))
+				       (nreverse list))
+			     (push (if (markerp pt)
+				       pt
+				     (set-marker (make-marker) pt))
+				   list))))
+    `(set-match-data ,list)))
+
+(defun w3m-search-tag-1 (regexp)
+  "Subroutine used by `w3m-search-tag'."
+  (let ((start (point))
+	begin end)
+    (if (and (re-search-forward regexp nil t)
+	     (setq begin (match-beginning 0)
+		   end (match-end 0))
+	     (or (looking-at "/?>")
+		 (and (looking-at "[ \t\f\n]")
+		      (search-forward ">" nil t))))
+	(prog1
+	    (goto-char (match-end 0))
+	  (w3m-set-match-data
+	   (cond ((= end (match-beginning 0))
+		  (list begin (match-end 0)
+			(1+ begin) end))
+		 ((eq (char-before (match-beginning 0)) ?/)
+		  (if (= end (1- (match-beginning 0)))
+		      (list begin (match-end 0)
+			    (1+ begin) end)
+		    (list begin (match-end 0)
+			  (1+ begin) end
+			  end (- (match-end 0) 2))))
+		 (t
+		  (list begin (match-end 0)
+			(1+ begin) end
+			end (1- (match-end 0)))))))
+      (set-match-data nil)
+      (goto-char start)
+      nil)))
+
+(defmacro w3m-search-tag (&rest names)
+  "Search forward for a tag which begins with one of NAMES.
+This macro generates the form equivalent to:
+
+\(re-search-forward \"<\\\\(NAMES\\\\)\\\\([ \\t\\f\\n]+[^>]*\\\\)?/?>\" nil t)
+
+but it works even if the tag is considerably large.
+
+Note: this macro allows only strings for NAMES, that is, a form
+something like `(if foo \"bar\" \"baz\")' cannot be used."
+  `(w3m-search-tag-1 ,(concat "<" (regexp-opt names t))))
+
+(defun w3m-string-match-url-components-1 (string)
+  "Subroutine used by `w3m-string-match-url-components'."
+
+  ;; ^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?
+  ;;  12            3  4          5       6  7        8 9
+
+  (let ((md (make-vector 20 nil))
+	pt)
+    (with-temp-buffer
+      (w3m-static-unless (featurep 'xemacs)
+	(set-buffer-multibyte (multibyte-string-p string)))
+      (insert string)
+      (goto-char (point-min))
+      (aset md 0 0)
+      (aset md 1 (1- (point-max)))
+      (when (looking-at "[^:/?#]+:")
+	(aset md 2 0)
+	(aset md 4 0)
+	(goto-char (match-end 0))
+	(aset md 3 (setq pt (1- (point))))
+	(aset md 5 (1- pt)))
+      (when (looking-at "//")
+	(aset md 6 (1- (point)))
+	(forward-char 2)
+	(aset md 8 (1- (point)))
+	(skip-chars-forward "^/?#")
+	(aset md 7 (setq pt (1- (point))))
+	(aset md 9 pt))
+      (aset md 10 (1- (point)))
+      (skip-chars-forward "^?#")
+      (aset md 11 (setq pt (1- (point))))
+      (when (eq (char-after) ??)
+	(aset md 12 pt)
+	(forward-char 1)
+	(aset md 14 (1- (point)))
+	(skip-chars-forward "^#")
+	(aset md 13 (setq pt (1- (point))))
+	(aset md 15 pt))
+      (unless (eobp)
+	(aset md 16 (1- (point)))
+	(aset md 18 (point))
+	(aset md 17 (setq pt (1- (point-max))))
+	(aset md 19 pt)))
+    (set-match-data (append md nil)))
+  0)
+
+(defconst w3m-url-components-regexp
+  "\\`\\(\\([^:/?#]+\\):\\)?\\(//\\([^/?#]*\\)\\)?\
+\\([^?#]*\\)\\(\\?\\([^#]*\\)\\)?\\(#\\(.*\\)\\)?\\'"
+  "Regexp used for parsing a URI Reference.
+It matches the potential four components and fragment identifier of a
+URI reference.  See RFC2396, Appendix B for details.")
+
+(defmacro w3m-string-match-url-components (string)
+  "Do the same thing as `(string-match w3m-url-components-regexp STRING)'.
+But this function should work even if STRING is considerably long."
+  `(let ((string ,string))
+     (condition-case nil
+	 (string-match w3m-url-components-regexp string)
+       (error ;; Stack overflow in regexp matcher
+	(w3m-string-match-url-components-1 string)))))
+
+(defun w3m-time-newer-p (a b)
+  "Return t, if A is newer than B.  Otherwise return nil.
+A and B are lists which represent time in Emacs-style.  If value is
+nil, it is regarded as the oldest time."
+  (and a
+       (or (not b)
+	   (or (> (car a) (car b))
+	       (and (= (car a) (car b))
+		    (> (nth 1 a) (nth 1 b)))))))
+
+(defun w3m-time-lapse-seconds (start end)
+  "Return lapse seconds from START to END.
+START and END are lists which represent time in Emacs-style."
+  (+ (* (- (car end) (car start)) 65536)
+     (cadr end)
+     (- (cadr start))))
+
+(defalias 'w3m-float-time
+  (if (fboundp 'float-time)
+      'float-time
+    (lambda (&optional specified-time)
+      "Return the current time, as a float number of seconds since the epoch.
+If an argument is given, it specifies a time to convert to float
+instead of the current time.  The argument should have the forms:
+ (HIGH . LOW) or (HIGH LOW USEC) or (HIGH LOW . USEC).
+
+WARNING: Since the result is floating point, it may not be exact.
+Do not use this function if precise time stamps are required."
+      (let ((time (or specified-time (current-time))))
+	(+ (* (car time) 65536.0)
+	   (cadr time)
+	   (cond ((consp (setq time (cddr time)))
+		  (/ (car time) 1000000.0))
+		 (time
+		  (/ time 1000000.0))
+		 (t
+		  0)))))))
+
+(defun w3m-url-local-p (url)
+  "If URL points a file on the local system, return non-nil value.
+Otherwise return nil."
+  (string-match "\\`file:" url))
+
+(defconst w3m-url-authinfo-regexp
+  "\\`\\([^:/?#]+:\\)?//\\([^/?#:]+\\)\\(?::\\([^/?#@]+\\)\\)?@"
+  "Regular expression for parsing the authentication part of a URI reference")
+
+(defun w3m-url-authinfo (url)
+  "Return a user name and a password to authenticate URL."
+  (when (string-match w3m-url-authinfo-regexp url)
+    (cons (match-string 2 url)
+	  (match-string 3 url))))
+
+(defun w3m-url-strip-authinfo (url)
+  "Remove the authentication part from the URL."
+  (if (string-match w3m-url-authinfo-regexp url)
+      (concat (match-string 1 url)
+	      "//"
+	      (substring url (match-end 0)))
+    url))
+
+(defun w3m-url-strip-fragment (url)
+  "Remove the fragment identifier from the URL."
+  (if (string-match "\\`\\([^#]*\\)#" url)
+      (match-string 1 url)
+    url))
+
+(defun w3m-url-strip-query (url)
+  "Remove the query part and the fragment identifier from the URL."
+  (if (string-match "\\`\\([^?#]*\\)[?#]" url)
+      (match-string 1 url)
+    url))
+
+(defun w3m-get-server-hostname (url)
+  "Extract a server root from URL."
+  (when (string-match "\\`about://[^/?#]+/" url)
+    (setq url (substring url (match-end 0))))
+  (setq url (w3m-url-strip-authinfo url))
+  (if (string-match "\\`[^:/?#]+://\\([^/?#]+\\)" url)
+      (downcase (match-string 1 url))
+    url))
+
+(defun w3m-which-command (command)
+  (when (stringp command)
+    (if (and (file-name-absolute-p command)
+	     (file-executable-p command))
+	command
+      (setq command (file-name-nondirectory command))
+      (catch 'found-command
+	(let (bin)
+	  (dolist (dir exec-path)
+	    (setq bin (expand-file-name command dir))
+	    (when (or (and (file-executable-p bin)
+			   (not (file-directory-p bin)))
+		      (and (file-executable-p (setq bin (concat bin ".exe")))
+			   (not (file-directory-p bin))))
+	      (throw 'found-command bin))))))))
+
+(defun w3m-cancel-refresh-timer (&optional buffer)
+  "Cancel the timer for REFRESH attribute in META tag."
+  (when w3m-use-refresh
+    (with-current-buffer (or buffer (current-buffer))
+      (setq w3m-current-refresh nil)
+      (when w3m-refresh-timer
+	(w3m-static-if (featurep 'xemacs)
+	    (delete-itimer w3m-refresh-timer)
+	  (cancel-timer w3m-refresh-timer))
+	(setq w3m-refresh-timer nil)))))
+
+(cond ((featurep 'xemacs)
+       ;; The function of the XEmacs version doesn't work correctly
+       ;; for wide characters.
+       (defun w3m-truncate-string (str end-column)
+	 "Truncate string STR to end at column END-COLUMN."
+	 (let ((len (length str))
+	       (column 0)
+	       (idx 0))
+	   (condition-case nil
+	       (while (< column end-column)
+		 (setq column (+ column (char-width (aref str idx)))
+		       idx (1+ idx)))
+	     (args-out-of-range (setq idx len)))
+	   (when (> column end-column)
+	     (setq idx (1- idx)))
+	   (substring str 0 idx))))
+      (t
+       (defalias 'w3m-truncate-string 'truncate-string-to-width)))
+
+(defun w3m-assoc-ignore-case (name alist)
+  "Return the element of ALIST whose car equals NAME ignoring its case."
+  (let ((dname (downcase name))
+	match)
+    (while alist
+      (when (and (consp (car alist))
+		 (string= dname (downcase (car (car alist)))))
+	(setq match (car alist)
+	      alist nil))
+      (setq alist (cdr alist)))
+    match))
+
+(defun w3m-prin1 (object &optional stream)
+  "Like `prin1', except that control chars will be represented with ^ as
+`cat -v' does."
+  (if (stringp object)
+      (let (rest)
+	(dolist (char (append object nil) rest)
+	  (cond ((eq char ?\C-?)
+		 (push "^?" rest))
+		((or (memq char '(?\t ?\n))
+		     (>= char ?\ ))
+		 (push (char-to-string char) rest))
+		(t
+		 (push (concat "^" (char-to-string (+ 64 char))) rest))))
+	(prin1 (apply 'concat (nreverse rest)) stream))
+    (prin1 object stream)))
+
+(defun w3m-modify-plist (plist &rest properties)
+  "Change values in PLIST corresponding to PROPERTIES.  This is similar
+to `plist-put', but handles plural symbol and value pairs and remove
+pairs from PLIST whose value is nil."
+  (while properties
+    (setq plist (plist-put plist (car properties) (cadr properties))
+	  properties (cddr properties)))
+  (while plist
+    (if (cadr plist)
+	(setq properties (nconc properties (list (car plist) (cadr plist)))))
+    (setq plist (cddr plist)))
+  properties)
+
+(def-edebug-spec w3m-insert-string (form))
+(defmacro w3m-insert-string (string)
+  "Insert STRING at point without conversions in either case the
+multibyteness of the buffer."
+  (if (and (fboundp 'string-as-multibyte)
+	   (subrp (symbol-function 'string-as-multibyte)))
+      `(let ((string ,string))
+	 (insert (if enable-multibyte-characters
+		     (string-as-multibyte string)
+		   (string-as-unibyte string))))
+    `(insert ,string)))
+
+(defun w3m-custom-hook-initialize (symbol value)
+  "Initialize the hook option pointed by the SYMBOL with the default VALUE."
+  (if (boundp symbol)
+      (progn
+	(setq value (eval value))
+	(while value
+	  (add-hook symbol (car value))
+	  (setq value (cdr value))))
+    (custom-initialize-set symbol value)))
+
+(defun w3m-run-mode-hooks (&rest funcs)
+  "Run `run-mode-hooks' if it is available, otherwise `run-hooks'."
+  (if (fboundp 'run-mode-hooks)
+      (apply 'run-mode-hooks funcs)
+    (apply 'run-hooks funcs)))
+
+(defmacro w3m-keep-region-active ()
+  "Keep the region active after evaluating this current command.
+In XEmacs, `zmacs-region-stays' is set to nil everywhen a command is
+evaluated.  This means that the region is always deactivated after
+evaluating the current command.  This macro sets t to it, and keeps
+the region active."
+  (when (featurep 'xemacs)
+    '(if (interactive-p)
+	 (setq zmacs-region-stays t))))
+
+(defmacro w3m-deactivate-region ()
+  "Deactivate the region."
+  (if (featurep 'xemacs)
+      '(zmacs-deactivate-region)
+    '(deactivate-mark)))
+
+(defmacro w3m-region-active-p ()
+  "Say whether the region is active."
+  (if (fboundp 'region-active-p)
+      (list 'region-active-p)
+    (list 'and 'transient-mark-mode 'mark-active)))
+
+(eval-and-compile
+  (cond
+   ((fboundp 'replace-regexp-in-string)
+    (defun w3m-replace-in-string  (string regexp newtext &optional literal)
+      ;;(replace-regexp-in-string regexp newtext string nil literal)))
+      ;;
+      ;; Don't call the symbol function `replace-regexp-in-string' directly
+      ;; in order to silence the byte-compiler when an Emacs which doesn't
+      ;; provide it is used.  The following form generates exactly the same
+      ;; byte-code.
+      (funcall (symbol-function 'replace-regexp-in-string)
+	       regexp newtext string nil literal)))
+   (t
+    (defalias 'w3m-replace-in-string 'replace-in-string))))
+
+(if (fboundp 'compare-strings)
+    (defalias 'w3m-compare-strings 'compare-strings)
+  (defun w3m-compare-strings (string1 start1 end1 string2 start2 end2)
+    "Compare the contents of two strings."
+    (let* ((str1 (substring string1 start1 end1))
+	   (str2 (substring string2 start2 end2))
+	   (len (min (length str1) (length str2)))
+	   (i 0))
+      (if (string= str1 str2)
+	  t
+	(setq i (catch 'ignore
+		  (while (< i len)
+		    (when (not (eq (aref str1 i) (aref str2 i)))
+		      (throw 'ignore i))
+		    (setq i (1+ i)))
+		  i))
+	(1+ i)))))
+
+(eval-and-compile
+  ;; This function will be redefined in w3m-ems.el.
+  (unless (fboundp 'w3m-force-window-update)
+    (defalias 'w3m-force-window-update 'ignore)))
+
+(if (boundp 'header-line-format)
+    (defun w3m-force-window-update-later (buffer &optional seconds)
+      "Update the header-line appearance in BUFFER after SECONDS.
+If SECONDS is omitted, it defaults to 0.5."
+      (run-at-time (or seconds 0.5) nil
+		   (lambda (buffer)
+		     (when (and (buffer-live-p buffer)
+				(eq (get-buffer-window buffer t)
+				    (selected-window)))
+		       (w3m-force-window-update)))
+		   buffer))
+  (defalias 'w3m-force-window-update-later 'ignore))
+
+(if (fboundp 'read-number)
+    (defalias 'w3m-read-number 'read-number)
+  (defun w3m-read-number (prompt &optional default)
+    "Read a numeric value in the minibuffer, prompting with PROMPT.
+DEFAULT specifies a default value to return if the user just types RET.
+The value of DEFAULT is inserted into PROMPT."
+    (let ((n nil))
+      (when default
+	(setq prompt
+	      (if (string-match "\\(\\):[ \t]*\\'" prompt)
+		  (replace-match (format " (default %s)" default) t t prompt 1)
+		(w3m-replace-in-string prompt "[ \t]*\\'"
+				       (format " (default %s) " default)
+				       t))))
+      (while
+	  (progn
+	    (let ((str (read-from-minibuffer
+			prompt nil nil nil nil
+			(and default (number-to-string default)))))
+	      (condition-case nil
+		  (setq n (cond
+			   ((zerop (length str)) default)
+			   ((stringp str) (read str))))
+		(error nil)))
+	    (unless (numberp n)
+	      (message "Please enter a number.")
+	      (sit-for 1)
+	      t)))
+      n)))
+
+(defun w3m-make-menu-item (japan english)
+  "Make menu item."
+  (cond
+   ((and w3m-use-japanese-menu (featurep 'xemacs))
+    (concat japan "%_ "))
+   (w3m-use-japanese-menu
+    japan)
+   (t
+    english)))
+
+(defvar w3m-make-menu-commands-keys nil)
+
+(defun w3m-make-menu-commands (menu-commands)
+  "Make menu items."
+  (mapcar
+   (lambda (c)
+     (if (consp c)
+	 (vector
+	  (cadr c)
+	  (if (nth 3 c)
+	      `(progn
+		 (switch-to-buffer w3m-tab-button-menu-current-buffer)
+		 (funcall (function ,(car c)) ,@(nthcdr 4 c)))
+	    `(save-window-excursion
+	       (switch-to-buffer w3m-tab-button-menu-current-buffer)
+	       (funcall (function ,(car c)) ,@(nthcdr 4 c))))
+	  :active (nth 2 c)
+	  :keys (or (and (assq (car c) w3m-make-menu-commands-keys)
+			 (cdr (assq (car c) w3m-make-menu-commands-keys)))
+		    (let ((key (where-is-internal (car c) w3m-mode-map)))
+		      (when key
+			(setq w3m-make-menu-commands-keys
+			      (cons (cons (car c)
+					  (key-description (car key)))
+				    w3m-make-menu-commands-keys))
+			(cdr (car w3m-make-menu-commands-keys))))))
+       (symbol-name c)))
+   menu-commands))
+
+(eval-when-compile (require 'wid-edit))
+(defun w3m-widget-type-convert-widget (widget)
+  "Convert the car of `:args' as a widget type in WIDGET."
+  (apply 'widget-convert (widget-type widget)
+	 (eval (car (widget-get widget :args)))))
+
+(defun w3m-unseen-buffer-p (buffer)
+  "Return t if buffer unseen."
+  (with-current-buffer buffer
+    w3m-buffer-unseen))
+
+(defun w3m-visited-file-modtime ()
+  "Replacement of `visited-file-modtime'.
+It returns a list of two integers if the current buffer visits a file,
+otherwise returns the number 0.  In modern Emacsen, this function will
+get to be the alias to `visited-file-modtime'."
+  (let ((modtime (visited-file-modtime)))
+    (cond ((consp (cdr-safe modtime))
+	   (defalias 'w3m-visited-file-modtime 'visited-file-modtime)
+	   modtime)
+	  ((integerp (cdr-safe modtime))
+	   ;; XEmacs version returns `(0 . 0)' if no file is visited.
+	   (if (and (= (car modtime) 0) (= (cdr modtime) 0))
+	       0
+	     (list (car modtime) (cdr modtime))))
+	  (t
+	   modtime))))
+
+;;; Punycode RFC 3492:
+
+(defconst w3m-puny-code-regex "xn--\\([-0-9a-zA-z]+\\)")
+(defconst w3m-puny-code-nonascii "[^\000-\177]")
+
+(defconst w3m-puny-base 36)
+(defconst w3m-puny-tmin 1)
+(defconst w3m-puny-tmax 26)
+(defconst w3m-puny-damp 700)
+(defconst w3m-puny-skew 38)
+(defconst w3m-puny-initial-bias 72)
+(defconst w3m-puny-initial-n 128)
+(defconst w3m-puny-delimiter ?-)
+
+(defun w3m-puny-adapt (delta numpoints firsttime)
+  (let ((k 0))
+    (if firsttime
+	(setq delta (/ delta w3m-puny-damp))
+      (setq delta (/ delta 2)))
+    (setq delta (+ delta (/ delta numpoints)))
+    (while (> delta (/ (* (- w3m-puny-base w3m-puny-tmin) w3m-puny-tmax) 2))
+      (setq delta (/ delta (- w3m-puny-base w3m-puny-tmin)))
+      (setq k (+ k w3m-puny-base)))
+    (+ k (/ (* (1+ (- w3m-puny-base w3m-puny-tmin)) delta) (+ delta w3m-puny-skew)))))
+
+(defun w3m-puny-decode-digit (cp)
+  (if (< (- cp 48) 10)
+      (- cp 22)
+    (if (< (- cp 65) 26)
+	(- cp 65)
+      (if (< (- cp 97) 26)
+	  (- cp 97)
+	w3m-puny-base))))
+
+(defun w3m-puny-encode-digit (d)
+  (if (< d 26)
+      (+ d 22 75) ;; a-z
+    (+ d 22))) ;; 0-9
+
+(defun w3m-puny-decode1 (input)
+  (let* ((n w3m-puny-initial-n)
+	 (bias w3m-puny-initial-bias)
+	 (len (length input))
+	 (in 0) (out 0)
+	 (i 0) (b 0)
+	 digit thr oldi w k output ret)
+    (dotimes (j len)
+      (if (= (aref input j) w3m-puny-delimiter) (setq b j)))
+    (dotimes (j b)
+      (setq output (cons (aref input j) output))
+      (setq out (1+ out)))
+    (setq output (nreverse output))
+    (if (> b 0) (setq in (1+ b)) (setq in 0))
+    (while (< in len)
+      (setq oldi i)
+      (setq w 1)
+      (setq k w3m-puny-base)
+      (catch 'loop
+	(while t
+	  (if (>= in len) (error "punycode bad input"))
+	  (setq digit (w3m-puny-decode-digit (aref input in)))
+	  (if (>= digit w3m-puny-base) (error "punycode bad input"))
+	  (setq in (1+ in))
+	  (setq i (+ i (* digit w)))
+	  (if (<= k bias)
+	      (setq thr w3m-puny-tmin)
+	    (if (>= k (+ bias w3m-puny-tmax))
+		(setq thr w3m-puny-tmax)
+	      (setq thr (- k bias))))
+	  (if (< digit thr) (throw 'loop nil))
+	  (setq w (* w (- w3m-puny-base thr)))
+	  (setq k (+ k w3m-puny-base))))
+      (setq out (1+ out))
+      (setq bias (w3m-puny-adapt (- i oldi) out (= oldi 0)))
+      (setq n (+ n (/ i out)))
+      (setq i (% i out))
+      (if (= i 0)
+	  (setq output (cons n (nthcdr i output)))
+	(setcdr (nthcdr (1- i) output) (cons n (nthcdr i output))))
+      (setq i (1+ i)))
+    (setq ret (make-string (* out 2) ?a))
+    (let ((j 0))
+      (dolist (op output)
+	(aset ret j (/ op 256))
+	(setq j (1+ j))
+	(aset ret j (% op 256))
+	(setq j (1+ j))))
+    ret))
+
+(defun w3m-puny-decode (input)
+  (condition-case nil
+      (save-match-data
+	(decode-coding-string
+	 (w3m-puny-decode1 (substring input 4)) ;; xn--
+	 w3m-puny-utf-16be))
+    (error input)))
+
+(defun w3m-puny-decode-url (url)
+  "Decode URL from punycode."
+  (let ((case-fold-search t)
+	prot host after)
+    (when (and w3m-puny-utf-16be
+	       (string-match w3m-puny-code-regex url))
+      (when (string-match "\\`[^:/]+://\\([^/]+\\)" url)
+	(setq prot (substring url 0 (match-beginning 1)))
+	(setq host (substring url (match-beginning 1) (match-end 1)))
+	(setq after (substring url (match-end 0)))
+	(while (string-match w3m-puny-code-regex host)
+	  (setq host
+		(concat (substring host 0 (match-beginning 0))
+			(w3m-puny-decode
+			 (substring host (match-beginning 0) (match-end 0)))
+			(substring host (match-end 0)))))
+	(setq url (concat prot host after))))
+    url))
+
+(defun w3m-puny-encode1 (input)
+  (let* ((len (length input))
+	 (h-len (/ len 2))
+	 (n w3m-puny-initial-n)
+	 (bias w3m-puny-initial-bias)
+	 (delta 0) (out 0)
+	 (output (make-string (* len 4) ?a))
+	 h b m q k thr uni)
+    (dotimes (j len)
+      (setq uni (aref input j))
+      (setq j (1+ j))
+      (setq uni (+ (* uni 256) (aref input j)))
+      (when (< uni 128) ;; basic
+	(aset output out uni)
+	(setq out (1+ out))))
+    (setq h out)
+    (setq b out)
+    (when (> b 0)
+      (aset output out w3m-puny-delimiter)
+      (setq out (1+ out)))
+    (while (< h h-len)
+      (setq m 65536) ;; 17bits
+      (dotimes (j len)
+	(setq uni (aref input j))
+	(setq j (1+ j))
+	(setq uni (+ (* uni 256) (aref input j)))
+	(if (and (>= uni n) (< uni m)) (setq m uni)))
+      (setq delta (+ delta (* (- m n) (1+ h))))
+      (setq n m)
+      (dotimes (j len)
+	(setq uni (aref input j))
+	(setq j (1+ j))
+	(setq uni (+ (* uni 256) (aref input j)))
+	(when (< uni n)
+	  (setq delta (1+ delta))
+	  (if (= delta 0) (error "punycode overflow")))
+	(when (= uni n)
+	  (setq q delta)
+	  (setq k w3m-puny-base)
+	  (catch 'loop
+	    (while t
+	      (if (<= k bias)
+		  (setq thr w3m-puny-tmin)
+		(if (>= k (+ bias w3m-puny-tmax))
+		    (setq thr w3m-puny-tmax)
+		  (setq thr (- k bias))))
+	      (if (< q thr) (throw 'loop nil))
+	      (aset output out (w3m-puny-encode-digit (+ thr (% (- q thr) (- w3m-puny-base thr)))))
+	      (setq out (1+ out))
+	      (setq q (/ (- q thr) (- w3m-puny-base thr)))
+	      (setq k (+ k w3m-puny-base))))
+	  (aset output out (w3m-puny-encode-digit q))
+	  (setq out (1+ out))
+	  (setq bias (w3m-puny-adapt delta (1+ h) (= h b)))
+	  (setq delta 0)
+	  (setq h (1+ h))))
+      (setq delta (1+ delta))
+      (setq n (1+ n)))
+    (substring output 0 out)))
+
+(defun w3m-puny-encode (input)
+  (condition-case nil
+      (concat "xn--" (w3m-puny-encode1
+		      (encode-coding-string input w3m-puny-utf-16be)))
+    (error input)))
+
+(defun w3m-puny-encode-url (url)
+  "Encode URL to punycode."
+  (if (and w3m-puny-utf-16be
+	   (not (w3m-url-local-p url))
+	   (string-match w3m-puny-code-nonascii url))
+      (let (beg end idn)
+	(with-temp-buffer
+	  (insert url)
+	  (goto-char (point-min))
+	  (if (search-forward "://" nil t)
+	      (setq beg (point))
+	    (setq beg (point-min)))
+	  (if (search-forward "/" nil t)
+	      (setq end (1- (point)))
+	    (setq end (point-max)))
+	  (save-restriction
+	    (narrow-to-region beg end)
+	    (goto-char (point-min))
+	    (while (re-search-forward "[^.]?[^.\000-\177][^.]*" nil t)
+	      (setq idn (match-string-no-properties 0))
+	      (delete-region (match-beginning 0) (match-end 0))
+	      (insert (w3m-puny-encode idn))))
+	  (buffer-substring-no-properties (point-min) (point-max))))
+    url))
+
+(provide 'w3m-util)
+
+;;; w3m-util.el ends here

=== added file 'share/emacs/site-lisp/w3m/w3m-weather.el'
--- share/emacs/site-lisp/w3m/w3m-weather.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m-weather.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,510 @@
+;;; w3m-weather.el --- Look weather forecast -*- coding: iso-2022-7bit; -*-
+
+;; Copyright (C) 2001, 2002, 2003, 2005
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Keywords: w3m, WWW, hypermedia
+
+;; This file is a part of emacs-w3m.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+
+;;; Commentary:
+
+;; w3m-weather.el is the add-on program of emacs-w3m to look weather
+;; foracast.  For more detail about emacs-w3m, see:
+;;
+;;    http://emacs-w3m.namazu.org/
+
+
+;;; How to install:
+
+;; Please put this file to appropriate directory, and if you want
+;; byte-compile it.  And add following lisp expressions to your
+;; ~/.emacs.
+;;
+;;     (autoload 'w3m-weather "w3m-weather" "Display weather report." t)
+
+
+;;; Code:
+
+(eval-when-compile (require 'cl))
+(require 'w3m)
+
+(defconst w3m-weather-completion-table
+  (eval-when-compile
+    (let* ((format "http://weather.yahoo.co.jp/weather/jp/%s.html")
+	   (alist
+	    '(;; URL$B$N0lIt(B, $B4A;zI=5-(B, $B%m!<%^;zI=5-(B, $BJLL>(B
+	      ;; ($B%m!<%^;zI=5-$G$OD92;$r>JN,$7$J$$$3$H(B)
+	      ("1a/1100" "$BF;KL!&=!C+(B" "douhokusouya" "souya")
+	      ("1a/1200" "$BF;KL!&>e@n(B" "douhokukamikawa" "kamikawa")
+	      ("1a/1300" "$BF;KL!&N1K((B" "douhokurumoi" "rumoi")
+	      ("1c/1710" "$BF;El!&LVAv(B" "doutouabashiri" "abashiri")
+	      ("1c/1720" "$BF;El!&KL8+(B" "doutoukitami" "kitami")
+	      ("1c/1730" "$BF;El!&LfJL(B" "doutoumonbetsu" "monbetsu")
+	      ("1c/1800" "$BF;El!&:,<<(B" "doutounemuro" "nemuro")
+	      ("1c/1900" "$BF;El!&6|O)(B" "doutoukushiro" "kushiro")
+	      ("1c/2000" "$BF;El!&==>!(B" "doutoutokachi" "tokachi")
+	      ("1b/1400" "$BF;1{!&@P<m(B" "dououishikari" "ishikari")
+	      ("1b/1500" "$BF;1{!&6uCN(B" "douousorachi" "sorachi")
+	      ("1b/1600" "$BF;1{!&8e;V(B" "dououshiribeshi" "shiribeshi")
+	      ("1d/2400" "$BF;Fn!&I0;3(B" "dounanhiyama" "hiyama")
+	      ("1d/2100" "$BF;Fn!&C@?6(B" "dounaniburi" "iburi")
+	      ("1d/2200" "$BF;Fn!&F|9b(B" "dounanhidaka" "hidaka")
+	      ("1d/2300" "$BF;Fn!&EOEg(B" "dounanoshima" "oshima")
+	      ("1d/2400" "$BF;Fn!&[X;3(B" "dounanhiyama" "hiyama")
+	      ("2/3110" "$B@D?98)!&DE7Z(B" "aomorikentsugaru" "tsugaru")
+	      ("2/3120" "$B@D?98)!&2<KL(B" "aomorikenshimokita" "shimokita")
+	      ("2/3130" "$B@D?98)!&;0H,>eKL(B"
+	       "aomorikensanpachikamikita" "sanpachikamikita")
+	      ("3/3310" "$B4d<j8)!&FbN&It(B" "iwatekennairikubu")
+	      ("3/3320" "$B4d<j8)!&1h4_KLIt(B" "iwatekenenganhokubu")
+	      ("3/3330" "$B4d<j8)!&1h4_FnIt(B" "iwatekenengannanbu")
+	      ("5/3210" "$B=)ED8)!&1h4_It(B" "akitakenenganbu")
+	      ("5/3220" "$B=)ED8)!&FbN&It(B" "akitakennairikubu")
+	      ("4/3410" "$B5\>k8)!&ElIt(B" "miyagikentoubu")
+	      ("4/3420" "$B5\>k8)!&@>It(B" "miyagikenseibu")
+	      ("6/3510" "$B;37A8)!&B<;3(B" "yamagatakenmurayama" "murayama")
+	      ("6/3520" "$B;37A8)!&CV;r(B" "yamagatakenokitama" "okitama")
+	      ("6/3530" "$B;37A8)!&>1Fb(B" "yamagatakenshonai" "shounai")
+	      ("6/3540" "$B;37A8)!&:G>e(B" "yamagatakenmogami" "mogami")
+	      ("7/3610" "$BJ!Eg8)!&CfDL$j(B" "hukushimakennakadoori" "nakadoori")
+	      ("7/3620" "$BJ!Eg8)!&IMDL$j(B" "hukushimakenhamadoori" "hamadoori")
+	      ("7/3630" "$BJ!Eg8)!&2qDE(B" "hukushimakenaidu" "aidu")
+	      ("8/4010" "$B0q>k8)!&KLIt(B" "ibaragikenhokubu")
+	      ("8/4020" "$B0q>k8)!&FnIt(B" "ibaragikennanbu")
+	      ("9/4110" "$BFJLZ8)!&FnIt(B" "tochigikennanbu")
+	      ("9/4120" "$BFJLZ8)!&KLIt(B" "tochigikenhokubu")
+	      ("10/4210" "$B72GO8)!&FnIt(B" "gunmakennanbu")
+	      ("10/4220" "$B72GO8)!&KLIt(B" "gunmakenhokubu")
+	      ("11/4310" "$B:k6L8)!&FnIt(B" "saitamakennanbu")
+	      ("11/4320" "$B:k6L8)!&KLIt(B" "saitamakenhokubu")
+	      ("11/4330" "$B:k6L8)!&CaIc(B" "saitamakenchichibu")
+	      ("12/4510" "$B@iMU8)!&KL@>It(B" "chibakenhokuseibu")
+	      ("12/4520" "$B@iMU8)!&KLElIt(B" "chibakenhokutoubu")
+	      ("12/4530" "$B@iMU8)!&FnIt(B" "chibakennanbu")
+	      ("13/4410" "$BEl5~ET!&El5~(B" "toukyoutotoukyou" "toukyou")
+	      ("13/4420" "$BEl5~ET!&0KF&=tEgKLIt(B"
+	       "toukyoutoizushotouhokubu" "izushotouhokubu")
+	      ("13/100" "$BEl5~ET!&0KF&=tEgFnIt(B"
+	       "toukyoutoizushotounanbu" "izushotounanbu")
+	      ("13/9600" "$BEl5~ET!&>.3^86=tEg(B"
+	       "toukyoutoogasawarashotou" "ogasawarashotou")
+	      ("14/4610" "$B?@F`@n8)!&ElIt(B" "kanagawakentoubu")
+	      ("14/4620" "$B?@F`@n8)!&@>It(B" "kanagawakenseibu")
+	      ("15/5410" "$B?73c8)!&2<1[(B" "niigatakenkaetsu" "kaetsu")
+	      ("15/5420" "$B?73c8)!&Cf1[(B" "niigatakenchuuetsu" "chuuetsu")
+	      ("15/5430" "$B?73c8)!&>e1[(B" "niigatakenjouetsu" "jouetsu")
+	      ("15/5440" "$B?73c8)!&:4EO(B" "niigatakensado" "sado")
+	      ("16/5510" "$BIY;38)!&ElIt(B" "toyamakentoubu")
+	      ("16/5520" "$BIY;38)!&@>It(B" "toyamakenseibu")
+	      ("17/5610" "$B@P@n8)!&2C2l(B" "ishikawakenkaga" "kaga")
+	      ("17/5620" "$B@P@n8)!&G=EP(B" "ishikawakennoto" "noto")
+	      ("18/5710" "$BJ!0f8)!&NfKL(B" "hukuikenreihoku" "reihoku")
+	      ("18/5720" "$BJ!0f8)!&NfFn(B" "hukuikenreinan" "reinan")
+	      ("19/4910" "$B;3M|8)!&Cf@>It(B" "yamanashikenchuuseibu")
+	      ("19/4920" "$B;3M|8)!&IY;N8^8P(B" "yamanashikenhujigoko" "hujigoko")
+	      ("20/4810" "$BD9Ln8)!&KLIt(B" "naganokenhokubu")
+	      ("20/4820" "$BD9Ln8)!&CfIt(B" "naganokenchuubu")
+	      ("20/4830" "$BD9Ln8)!&FnIt(B" "naganokennanbu")
+	      ("21/5210" "$B4tIl8)!&H~G;(B" "gihukenmino" "mino")
+	      ("21/5220" "$B4tIl8)!&HtBM(B" "gihukenhida" "hida")
+	      ("22/5010" "$B@E2,8)!&CfIt(B" "shizuokakenchuubu")
+	      ("22/5020" "$B@E2,8)!&0KF&(B" "shizuokakenizu" "izu")
+	      ("22/5030" "$B@E2,8)!&ElIt(B" "shizuokakentoubu")
+	      ("22/5040" "$B@E2,8)!&@>It(B" "shizuokakenseibu")
+	      ("23/5110" "$B0&CN8)!&@>It(B" "aichikenseibu")
+	      ("23/5120" "$B0&CN8)!&ElIt(B" "aichikentoubu")
+	      ("24/5310" "$B;0=E8)!&KLCfIt(B" "miekenhokuchuubu")
+	      ("24/5320" "$B;0=E8)!&FnIt(B" "miekennanbu")
+	      ("25/6010" "$B<"2l8)!&FnIt(B" "shigakennanbu")
+	      ("25/6020" "$B<"2l8)!&KLIt(B" "shigakenhokubu")
+	      ("26/400" "$B5~ETI\!&KLIt(B" "kyoutohuhokubu")
+	      ("26/6100" "$B5~ETI\!&FnIt(B" "kyoutohunanbu")
+	      ("27/6200" "$BBg:eI\(B" "oosakahu" "oosaka")
+	      ("28/500" "$BJ<8K8)!&KLIt(B" "hyougokenhokubu")
+	      ("28/6300" "$BJ<8K8)!&FnIt(B" "hyougokennanbu")
+	      ("29/6410" "$BF`NI8)!&KLIt(B" "narakenhokubu")
+	      ("29/6420" "$BF`NI8)!&FnIt(B" "narakennanbu")
+	      ("30/6510" "$BOB2N;38)!&KLIt(B" "wakayamakenhokubu")
+	      ("30/6520" "$BOB2N;38)!&FnIt(B" "wakayamakennanbu")
+	      ("31/6910" "$BD;<h8)!&ElIt(B" "tottorikentoubu")
+	      ("31/6920" "$BD;<h8)!&@>It(B" "tottorikenseibu")
+	      ("32/600" "$BEg:,8)!&1#4t(B" "shimanekenoki" "oki")
+	      ("32/6810" "$BEg:,8)!&ElIt(B" "shimanekentoubu")
+	      ("32/6820" "$BEg:,8)!&@>It(B" "shimanekenseibu")
+	      ("33/6610" "$B2,;38)!&FnIt(B" "okayamakennanbu")
+	      ("33/6620" "$B2,;38)!&KLIt(B" "okayamakenhokubu")
+	      ("34/6710" "$B9-Eg8)!&FnIt(B" "hiroshimakennanbu")
+	      ("34/6720" "$B9-Eg8)!&KLIt(B" "hiroshimakenhokubu")
+	      ("35/8110" "$B;38}8)!&@>It(B" "yamaguchikenseibu")
+	      ("35/8120" "$B;38}8)!&CfIt(B" "yamaguchikenchuubu")
+	      ("35/8140" "$B;38}8)!&KLIt(B" "yamaguchikenhokubu")
+	      ("35/8130" "$B;38}8)!&ElIt(B" "yamaguchikentoubu")
+	      ("36/7110" "$BFAEg8)!&KLIt(B" "tokushimakenhokubu")
+	      ("36/7120" "$BFAEg8)!&FnIt(B" "tokushimakennanbu")
+	      ("37/7200" "$B9a@n8)(B" "kagawaken" "kagawa")
+	      ("38/7320" "$B0&I28)!&ElM=(B" "ehimekentouyo" "touyo")
+	      ("38/7330" "$B0&I28)!&FnM=(B" "ehimekennanyo" "nanyo")
+	      ("38/7310" "$B0&I28)!&CfM=(B" "ehimekenchuuyo" "chuuyo")
+	      ("39/7410" "$B9bCN8)!&CfIt(B" "kouchikenchuubu")
+	      ("39/7420" "$B9bCN8)!&ElIt(B" "kouchikentoubu")
+	      ("39/7430" "$B9bCN8)!&@>It(B" "kouchikenseibu")
+	      ("40/8210" "$BJ!2,8)!&J!2,(B" "hukuokakenhukuoka" "hukuoka")
+	      ("40/8220" "$BJ!2,8)!&KL6e=#(B" "hukuokakenkitakyushu" "kitakyuushu")
+	      ("40/8230" "$BJ!2,8)!&C^K-(B" "hukuokakenchikuhou" "chikuhou")
+	      ("40/8240" "$BJ!2,8)!&C^8e(B" "hukuokakenchikugo" "chikugo")
+	      ("41/8510" "$B:42l8)!&FnIt(B" "sagakennanbu")
+	      ("41/8520" "$B:42l8)!&KLIt(B" "sagakenhokubu")
+	      ("42/700" "$BD9:j8)!&0m4tBPGO(B"
+	       "nagasakikenikitsushima" "iki" "tsushima" "ikitsushima")
+	      ("42/800" "$BD9:j8)!&8^Eg(B" "nagasakikengotou" "gotou")
+	      ("42/8410" "$BD9:j8)!&FnIt(B" "nagasakikennanbu")
+	      ("42/8420" "$BD9:j8)!&KLIt(B" "nagasakikenhokubu")
+	      ("43/8610" "$B7'K\8)!&7'K\(B" "kumamotokenkumamoto" "kumamoto")
+	      ("43/8620" "$B7'K\8)!&0$AI(B" "kumamotokenaso" "aso")
+	      ("43/8630" "$B7'K\8)!&E7Ap02KL(B"
+	       "kumamotokenamakusaashikita" "amakusa" "ashikita" "amakusaashikita")
+	      ("43/8640" "$B7'K\8)!&5eKa(B" "kumamotokenkuma" "kuma")
+	      ("44/8310" "$BBgJ,8)!&CfIt(B" "ooitakenchuubu")
+	      ("44/8320" "$BBgJ,8)!&KLIt(B" "ooitakenhokubu")
+	      ("44/8330" "$BBgJ,8)!&@>It(B" "ooitakenseibu")
+	      ("44/8340" "$BBgJ,8)!&FnIt(B" "ooitakennanbu")
+	      ("45/8710" "$B5\:j8)!&FnItJ?LnIt(B" "miyazakikennanbuheiyabu")
+	      ("45/8720" "$B5\:j8)!&KLItJ?LnIt(B" "miyazakikenhokubuheiyabu")
+	      ("45/8730" "$B5\:j8)!&FnIt;31h$$(B" "miyazakikennanbuyamazoi")
+	      ("45/8740" "$B5\:j8)!&KLIt;31h$$(B" "miyazakikenhokubuyamazoi")
+	      ("46/8810" "$B</;yEg8)!&;'K`(B" "kagoshimakensatsuma" "satsuma")
+	      ("46/8820" "$B</;yEg8)!&Bg6y(B" "kagoshimakenoosumi" "oosumi")
+	      ("46/900" "$B</;yEg8)!&<o;REg!&205WEg(B"
+	       "kagoshimakentanegashimayakushima" "tanegashima" "yakushima" "tanegashimayakushima")
+	      ("46/1000" "$B</;yEg8)!&1bH~(B" "kagoshimakenamami" "amami")
+	      ("47/9110" "$B2-Fl8)!&K\EgCfFnIt(B"
+	       "okinawakenhontouchuunanbu" "hontouchuunanbu")
+	      ("47/9120" "$B2-Fl8)!&K\EgKLIt(B"
+	       "okinawakenhontouhokubu" "hontouhokubu")
+	      ("47/9130" "$B2-Fl8)!&5WJFEg(B" "okinawakenkumejima" "kumejima")
+	      ("47/9200" "$B2-Fl8)!&BgElEg(B" "okinawakendaitoujima" "daitoujima")
+	      ("47/9300" "$B2-Fl8)!&5\8EEg(B" "okinawakenmiyakojima" "miyakojima")
+	      ("47/9400" "$B2-Fl8)!&@P3@Eg(B"
+	       "okinawakenishigakijima" "ishigakijima")
+	      ("47/9500" "$B2-Fl8)!&M?Fa9qEg(B"
+	       "okinawakenyonagunijima" "yonagunijima")))
+	   (table)
+	   ;; $B%X%\%s<0$H71Na<0$NBP1~I=(B
+	   (hepburn-table
+	    (let (table)
+	      (dolist (x '(("si" "shi")
+			   ("zi" "ji")
+			   ("zu" "du")
+			   ("ti" "chi")
+			   ("tu" "tsu")
+			   ("hu" "fu")))
+		(push x table)
+		(push (reverse x)table))
+	      (dolist (x '(("sy" . "sh")
+			   ("zy" . "j")
+			   ("ty" . "ch")))
+		(dolist (y '("a" "u" "o"))
+		  (push (list (concat (car x) y) (concat (cdr x) y)) table)
+		  (push (list (concat (cdr x) y) (concat (car x) y)) table)))
+	      table))
+	   ;; $BBP1~I=$K>h$C$F$$$kJ8;zNs$rC5$9@55,I=8=(B
+	   (hepburn-regexp
+	    (format "\\(?:\\`\\|[aiueo]\\)\\(n\\([^aiueoy]\\)\\|%s\\)"
+		    (regexp-opt (mapcar (function car) hepburn-table))))
+	   ;; $BD92;$NM-L5$K$h$kGI@87A$NI=(B
+	   (prolonged-table
+	    (let (table)
+	      (dolist (x '("k" "ky"
+			   "s" "sy" "sh"
+			   "t" "ty" "ch"
+			   "n" "ny"
+			   "h" "hy"
+			   "m" "my"
+			   "y"
+			   "r" "ry"
+			   "w"
+			   "g" "gy"
+			   "z" "zy" "j"
+			   "d" "dy"
+			   "b" "by"
+			   "p" "py"))
+		(let ((long-vowels '("ou" "oo" "o-")))
+		  (dolist (y long-vowels)
+		    (push (cons (concat x y)
+				(append
+				 (mapcar
+				  (lambda (z) (concat x z))
+				  (delete y (copy-sequence long-vowels)))
+				 (list (concat x "o"))))
+			  table)))
+		(push (list (concat x "uu") (concat x "u"))
+		      table))
+	      table))
+	   ;; $BGI@87A$NI=$K>h$C$F$$$kJ8;zNs$rC5$9@55,I=8=(B
+	   (prolonged-regexp (format "\\(?:\\`\\|[aiueo]\\)\\(%s\\)"
+				     (regexp-opt (mapcar (function car)
+							 prolonged-table)))))
+      (labels ((hepburn-candidates
+		(str)
+		"$B%X%\%s<0$H71Na<0$N:9$K$h$C$F@8$8$kGI@87A$rF@$k(B"
+		(if (string-match hepburn-regexp str)
+		    (let ((prefix (substring str 0 (match-beginning 1)))
+			  (candidates (if (match-beginning 2)
+					  '("n" "nn")
+					(assoc (match-string 1 str)
+					       hepburn-table)))
+			  (suffixes
+			   (hepburn-candidates
+			    (substring str (or (match-beginning 2)
+					       (match-end 0)))))
+			  (buf))
+		      (dolist (x candidates)
+			(dolist (y suffixes)
+			  (push (concat prefix x y) buf)))
+		      buf)
+		  (list str)))
+	       (prolonged-candidates
+		(str)
+		"$BD92;$NM-L5$K$h$C$F@8$8$kGI@87A$rF@$k(B"
+		(let (buf)
+		  (if (string-match prolonged-regexp str)
+		      (let ((prefix (substring str 0 (match-beginning 1)))
+			    (candidates (assoc (match-string 1 str)
+					       prolonged-table))
+			    (suffixes (prolonged-candidates
+				       (substring str (match-end 0)))))
+			(dolist (x candidates)
+			  (dolist (y suffixes)
+			    (push (concat prefix x y) buf))))
+		    (setq buf (list str)))
+		  (dolist (x buf)
+		    (when (string-match "\\(\\`\\|[aiue]\\)oo" x)
+		      (let ((prefix (substring x 0 (match-end 1)))
+			    (suffix (substring x (match-end 0))))
+			(dolist (y '("o" "oh" "o-"))
+			  (push (concat prefix y suffix) buf)))))
+		  buf))
+	       (romaji-candidates
+		(str)
+		"$BA4$F$NGI@87A$rF@$k(B"
+		(let (buf)
+		  (dolist (x (hepburn-candidates str))
+		    (dolist (y (prolonged-candidates x))
+		      (push y buf)))
+		  buf)))
+	(dolist (area alist)
+	  (let ((url (format format (car area)))
+		(kanji (cadr area)))
+	    (push (list kanji (nth 2 area) url) table)
+	    (dolist (romaji (cddr area))
+	      (dolist (x (romaji-candidates romaji))
+		(push (list x kanji) table)))))
+	(nreverse table))))
+  "Completion table of areas and urls.")
+
+(defcustom w3m-weather-default-area
+  "$B5~ETI\!&FnIt(B"
+  "Default region to check weather."
+  :group 'w3m
+  :type (cons 'radio
+	      (delq nil
+		    (mapcar (lambda (area)
+			      (when (nth 2 area)
+				(list 'const (car area))))
+			    w3m-weather-completion-table))))
+
+(defcustom w3m-weather-filter-functions
+  '(w3m-weather-extract-contents
+    w3m-weather-adjust-contents
+    w3m-weather-expand-anchors
+    w3m-weather-insert-title)
+  "Filter functions to remove useless tags."
+  :group 'w3m
+  :type 'hook)
+
+(defvar w3m-weather-input-history nil)
+
+(defun w3m-weather-input-area ()
+  (let* ((str
+	  (completing-read (format "Input area (default %s): "
+				   w3m-weather-default-area)
+			   'w3m-weather-area-completion nil t nil
+			   'w3m-weather-input-history))
+	 (area
+	  (cond
+	   ((string= "" str) w3m-weather-default-area)
+	   ((string-match "[^-a-zA-Z]" str) str)
+	   (t (cadr (assoc str w3m-weather-completion-table))))))
+    (setq w3m-weather-input-history
+	  (cons area
+		(delete area
+			(delete str w3m-weather-input-history))))
+    area))
+
+(defun w3m-weather-area-completion (partial predicate flag)
+  (if (eq flag 'lambda)
+      (and (assoc partial w3m-weather-completion-table)
+	   (or (not predicate)
+	       (funcall predicate partial))
+	   t)
+    (let ((kanji "")
+	  (romaji "")
+	  (romaji-partial partial))
+      (when (string-match "\\`\\(?:[^-a-zA-Z]+\\)" partial)
+	(let ((suffix (substring partial (match-end 0))))
+	  (setq kanji (substring partial 0 (match-end 0))
+		romaji (try-completion
+			""
+			(mapcar
+			 (lambda (x)
+			   (list (cadr (assoc x w3m-weather-completion-table))))
+			 (all-completions kanji w3m-weather-completion-table)))
+		romaji-partial (concat romaji suffix))))
+      (let ((collection)
+	    (regexp
+	     (and (string-match "$B!&(B\\'" kanji)
+		  (string-match "[aiueo]n\\'" romaji)
+		  (concat "\\`" romaji "n[^aiueoy]"))))
+	(dolist (x (all-completions romaji-partial w3m-weather-completion-table))
+	  (unless (and regexp (string-match regexp x))
+	    (setq x (assoc x w3m-weather-completion-table))
+	    (unless (assoc (cadr x) collection)
+	      (push (cons (cadr x) (car x)) collection))))
+	(cond
+	 ((not flag)
+	  (let ((s (try-completion kanji collection predicate)))
+	    (if (and (stringp s) (string< s partial))
+		(when (setq s (try-completion romaji-partial
+					      (mapcar (lambda (x) (list (cdr x)))
+						      collection)
+					      predicate))
+		  (concat kanji (substring s (if romaji (length romaji) 0))))
+	      s)))
+	 ((eq flag t)
+	  (all-completions kanji collection predicate)))))))
+
+;;;###autoload
+(defun w3m-weather (area)
+  "Display weather report."
+  (interactive
+   (list (if current-prefix-arg
+	     (w3m-weather-input-area)
+	   w3m-weather-default-area)))
+  (w3m-goto-url (format "about://weather/%s" area)))
+
+;;;###autoload
+(defun w3m-about-weather (url no-decode no-cache post-data referer handler)
+  (if (string-match "\\`about://weather/" url)
+      (lexical-let* ((url url)
+		     (no-cache no-cache)
+		     (area (substring url (match-end 0)))
+		     (furl (nth 2 (assoc area w3m-weather-completion-table))))
+	(w3m-process-do
+	    (type (w3m-retrieve furl nil no-cache nil nil handler))
+	  (when type
+	    (w3m-decode-buffer furl)
+	    (w3m-weather-run-filter-functions w3m-weather-filter-functions
+					      area furl no-cache handler))))
+    (w3m-message "Unknown URL: %s" url)
+    nil))
+
+(defun w3m-weather-run-filter-functions (functions area url no-cache handler)
+  (if functions
+      (lexical-let ((functions functions)
+		    (area area)
+		    (url url)
+		    (no-cache no-cache))
+	(w3m-process-do
+	    (nil (funcall (pop functions) area url no-cache handler))
+	  (w3m-weather-run-filter-functions functions area url
+					    no-cache handler)))
+    "text/html"))
+
+(defun w3m-weather-extract-contents (&rest args)
+  "Remove both header and footer in the weather forecast pages."
+  (goto-char (point-min))
+  (when (search-forward "<!---MAIN_CONTENTS_table--->" nil t)
+    (delete-region (point-min) (match-beginning 0)))
+  (goto-char (point-max))
+  (when (search-backward "<!---Local_Link--->" nil t)
+    (delete-region (match-beginning 0) (point-max))))
+
+(defun w3m-weather-adjust-contents (&rest args)
+  ;; Remove spacers.
+  (goto-char (point-min))
+  (while (search-forward "<tr><td>\
+<img src=\"http://img.yahoo.co.jp/images/clear.gif\" width=1>\
+</td></tr>" nil t)
+    (delete-region (match-beginning 0) (match-end 0)))
+  ;; Remove execessive tables.
+  (goto-char (point-min))
+  (while (re-search-forward "<table[^>]*>[ \t\r\f\n]*</table>" nil t)
+    (delete-region (match-beginning 0) (match-end 0)))
+  (goto-char (point-min))
+  ;; Remove too narrow width parameters.
+  (while (re-search-forward "<td[^>]*\\(width=1%\\)" nil t)
+    (delete-region (match-beginning 1) (match-end 1)))
+  ;; Display border lines.
+  (goto-char (point-min))
+  (while (re-search-forward "\
+<table border=\\(0\\) cellpadding=[1-9][0-9]* cellspacing=[1-9][0-9]*" nil t)
+    (goto-char (match-beginning 1))
+    (delete-char 1)
+    (insert "1"))
+  (goto-char (point-min))
+  (while (re-search-forward
+	  "<td align=center width=25%>[ \t\r\f\n]*<table border=1" nil t)
+    (delete-char -1)
+    (insert "0")))
+
+(defun w3m-weather-insert-title (area url &rest args)
+  "Insert title."
+  (goto-char (point-min))
+  (insert "<head><title>Weather forecast of "
+	  area
+	  "</title></head>\n"
+	  "<body><p align=left><a href=\""
+	  url
+	  "\">[Yahoo!]</a></p>\n")
+  (goto-char (point-max))
+  (insert "</body>"))
+
+(defun w3m-weather-expand-anchors (area url &rest args)
+  ;; FIXME: $BE75$M=Js%Z!<%8$K4^$^$l$F$$$kAjBP%j%s%/$r@dBP%j%s%/$K=q$-49(B
+  ;; $B$($k$?$a$N4X?t!%$3$l$i$NAjBP%j%s%/$r0BA4$K<h$j07$&$?$a$K$O!$(Bbase
+  ;; URL $B$rJV$;$k$h$&$K!$(Babout:// $B$N9=B$$r=q$-D>$9I,MW$,$"$k$H9M$($i$l(B
+  ;; $B$k$,!$$H$j$"$($:8e2s$7!%(B
+  (goto-char (point-min))
+  (while (re-search-forward
+	  (eval-when-compile
+	    (concat "<a[ \t\r\f\n]+href=" w3m-html-string-regexp))
+	  nil t)
+    (replace-match (format
+		    "<a href=\"%s\""
+		    (w3m-expand-url (w3m-remove-redundant-spaces
+				     (or (match-string-no-properties 2)
+					 (match-string-no-properties 3)
+					 (match-string-no-properties 1)))
+				    url)))))
+
+(provide 'w3m-weather)
+
+;;; w3m-weather.el ends here.

=== added file 'share/emacs/site-lisp/w3m/w3m.el'
--- share/emacs/site-lisp/w3m/w3m.el	1970-01-01 00:00:00 +0000
+++ share/emacs/site-lisp/w3m/w3m.el	2010-09-13 10:14:52 +0000
@@ -0,0 +1,10807 @@
+;;; w3m.el --- an Emacs interface to w3m -*- coding: iso-2022-7bit; -*-
+
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+;; 2010 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
+;;          Shun-ichi GOTO     <gotoh@taiyo.co.jp>,
+;;          Satoru Takabayashi <satoru-t@is.aist-nara.ac.jp>,
+;;          Hideyuki SHIRAI    <shirai@meadowy.org>,
+;;          Keisuke Nishida    <kxn30@po.cwru.edu>,
+;;          Yuuichi Teranishi  <teranisi@gohome.org>,
+;;          Akihiro Arisawa    <ari@mbf.sphere.ne.jp>,
+;;          Katsumi Yamaoka    <yamaoka@jpl.org>,
+;;          Tsuyoshi CHO       <tsuyoshi_cho@ybb.ne.jp>
+;; Keywords: w3m, WWW, hypermedia
+
+;; This file is the main part of emacs-w3m.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+
+;;; Commentary:
+
+;; Emacs-w3m is an Emacs interface to the w3m program.  For more
+;; detail about w3m, see:
+;;
+;;    http://w3m.sourceforge.net/
+
+
+;;; How to install:
+
+;; See the README file in any case.  We also recommend you check
+;; whether a newer version of w3m is released.
+;;
+;; The outline of installation is: run the `configure' script and type
+;; `make install' in the top directory of the emacs-w3m distribution.
+
+
+;;; Code:
+
+;; Developers, you must not use the cl functions (e.g., `coerce',
+;; `equalp', `merge', etc.) in any emacs-w3m or shimbun modules.  To
+;; exclude run-time cl is the policy of emacs-w3m.  However, XEmacs
+;; employs the cl package for all time, or those functions are
+;; possibly provided in the other modules like APEL, so you may use
+;; them only in w3m-xmas.el.  Note that `caaaar', for example, is not
+;; a cl function if it is byte compiled; see cl-macs.el.
+(eval-when-compile
+  (require 'cl))
+
+(eval-when-compile
+  (unless (dolist (var nil t))
+    ;; Override the `dolist' macro which may be faultily provided by
+    ;; old egg.el.
+    (load "cl-macs" nil t)))
+
+;; The following variables will be referred to by the external modules
+;; which bind such variables only when compiling themselves.  And also
+;; some modules have the `defadvice' forms including them and run
+;; `byte-compile' at run-time.
+(eval-and-compile
+  (defvar w3m-current-title nil
+    "Title of a page visiting in the current buffer.")
+  (defvar w3m-current-url nil
+    "A url of a page visiting in the current buffer."))
+
+(require 'w3m-util)
+(require 'w3m-proc)
+
+;; Silence the Emacs' byte-compiler that says ``might not be defined''.
+(eval-when-compile
+  (defalias 'w3m-setup-menu 'ignore))
+
+(eval-and-compile
+  (cond
+   ((featurep 'xemacs)
+    (require 'w3m-xmas))
+   ((>= emacs-major-version 21)
+    (require 'w3m-ems))
+   (t
+    (error "Emacs-w3m of this version no longer supports Emacs %s"
+	   (mapconcat 'identity
+		      (nbutlast (split-string emacs-version "\\."))
+		      ".")))))
+
+(require 'w3m-fb)
+(require 'w3m-hist)
+(require 'timezone)
+(require 'image-mode nil t)
+
+;; Add-on programs:
+(eval-and-compile
+  (autoload 'w3m-bookmark-view "w3m-bookmark"
+    "Display the bookmark" t)
+  (autoload 'w3m-bookmark-view-new-session "w3m-bookmark"
+    "Display the bookmark on a new session" t)
+  (autoload 'w3m-bookmark-add-this-url "w3m-bookmark"
+    "Add a link under point to the bookmark." t)
+  (autoload 'w3m-bookmark-add-current-url "w3m-bookmark"
+    "Add a url of the current page to the bookmark." t)
+  (autoload 'w3m-bookmark-add-all-urls "w3m-bookmark"
+    "Add urls of all pages being visited to the bookmark." t)
+  (autoload 'w3m-bookmark-add "w3m-bookmark" "Add URL to bookmark.")
+  (autoload 'w3m-search "w3m-search"
+    "Search a word using search engines." t)
+  (autoload 'w3m-search-new-session "w3m-search"
+    "Search a word using search engines in a new session." t)
+  (autoload 'w3m-search-uri-replace "w3m-search")
+  (autoload 'w3m-weather "w3m-weather"
+    "Display a weather report." t)
+  (autoload 'w3m-about-weather "w3m-weather")
+  (autoload 'w3m-antenna "w3m-antenna"
+    "Report changes of web sites." t)
+  (autoload 'w3m-antenna-add-current-url "w3m-antenna"
+    "Add a link address of the current page to the antenna database." t)
+  (autoload 'w3m-about-antenna "w3m-antenna")
+  (autoload 'w3m-dtree "w3m-dtree"
+    "Display a directory tree." t)
+  (autoload 'w3m-about-dtree "w3m-dtree")
+  (autoload 'w3m-namazu "w3m-namazu"
+    "Search files with Namazu." t)
+  (autoload 'w3m-about-namazu "w3m-namazu")
+  (autoload 'w3m-perldoc "w3m-perldoc"
+    "View Perl documents" t)
+  (autoload 'w3m-about-perldoc "w3m-perldoc")
+  (autoload 'w3m-fontify-forms "w3m-form")
+  (autoload 'w3m-fontify-textareas "w3m-form")
+  (autoload 'w3m-form-textarea-file-cleanup "w3m-form")
+  (autoload 'w3m-form-textarea-files-remove "w3m-form")
+  (autoload 'w3m-form-kill-buffer "w3m-form")
+  (autoload 'w3m-form-set-number "w3m-form")
+  (autoload 'w3m-filter "w3m-filter")
+  (autoload 'w3m-setup-tab-menu "w3m-tabmenu")
+  (autoload 'w3m-setup-bookmark-menu "w3m-bookmark")
+  (autoload 'w3m-switch-buffer "w3m-tabmenu")
+  (autoload 'w3m-cookie-set "w3m-cookie")
+  (autoload 'w3m-cookie-get "w3m-cookie")
+  (autoload 'w3m-cookie "w3m-cookie")
+  (autoload 'w3m-about-cookie "w3m-cookie")
+  (autoload 'w3m-cookie-shutdown "w3m-cookie" nil t)
+  (autoload 'report-emacs-w3m-bug "w3m-bug" nil t)
+  (autoload 'w3m-replace-symbol "w3m-symbol" nil t)
+  (autoload 'w3m-mail "w3m-mail" nil t)
+  (autoload 'w3m-link-numbering-mode "w3m-lnum" nil t)
+  (autoload 'w3m-linknum-follow "w3m-lnum" nil t)
+  (autoload 'w3m-go-to-linknum "w3m-lnum" nil t)
+  (autoload 'w3m-linknum-toggle-inline-image "w3m-lnum" nil t)
+  (autoload 'w3m-linknum-view-image "w3m-lnum" nil t)
+  (autoload 'w3m-linknum-external-view-this-url "w3m-lnum" nil t)
+  (autoload 'w3m-linknum-edit-this-url "w3m-lnum" nil t)
+  (autoload 'w3m-linknum-print-this-url "w3m-lnum" nil t)
+  (autoload 'w3m-linknum-download-this-url "w3m-lnum" nil t)
+  (autoload 'w3m-linknum-bookmark-add-this-url "w3m-lnum" nil t)
+  (autoload 'w3m-linknum-zoom-in-image "w3m-lnum" nil t)
+  (autoload 'w3m-linknum-zoom-out-image "w3m-lnum" nil t)
+  (autoload 'w3m-session-select "w3m-session"
+    "Select session from session list." t)
+  (autoload 'w3m-session-save "w3m-session"
+    "Save list of displayed session." t)
+  (autoload 'w3m-setup-session-menu "w3m-session")
+  (autoload 'w3m-session-automatic-save "w3m-session")
+  (autoload 'w3m-session-deleted-save "w3m-session")
+  (autoload 'w3m-session-last-autosave-session "w3m-session")
+  (autoload 'w3m-session-goto-session "w3m-session")
+  (autoload 'w3m-session-crash-recovery-save "w3m-session")
+  (autoload 'w3m-session-last-crashed-session "w3m-session"))
+
+;; Avoid byte-compile warnings.
+(eval-when-compile
+  (autoload 'doc-view-mode "doc-view" nil t)
+  (autoload 'doc-view-mode-p "doc-view")
+  (autoload 'image-backward-hscroll "image-mode" nil t)
+  (autoload 'image-bol "image-mode" nil t)
+  (autoload 'image-eol "image-mode" nil t)
+  (autoload 'image-forward-hscroll "image-mode" nil t)
+  (autoload 'image-mode-setup-winprops "image-mode")
+  (autoload 'image-scroll-down "image-mode" nil t)
+  (autoload 'image-scroll-up "image-mode" nil t)
+  (autoload 'quit-window "window" nil t)
+  (autoload 'rfc2368-parse-mailto-url "rfc2368")
+  (autoload 'widget-convert-button "wid-edit")
+  (autoload 'widget-forward "wid-edit" nil t)
+  (autoload 'widget-get "wid-edit")
+  (unless (fboundp 'char-to-int)
+    (defalias 'char-to-int 'identity))
+  (defvar doc-view-mode-map)
+  (defvar w3m-bookmark-mode)
+  (defvar w3m-bookmark-menu-items)
+  (defvar w3m-bookmark-menu-items-pre)
+  (defvar w3m-tab-menubar-make-items-preitems)
+  (defvar w3m-session-menu-items-pre)
+  (defvar w3m-session-menu-items))
+
+(defconst emacs-w3m-version
+  (eval-when-compile
+    (let ((rev "$Revision: 1.1499 $"))
+      (and (string-match "\\.\\([0-9]+\\) \\$\\'" rev)
+	   (setq rev (- (string-to-number (match-string 1 rev)) 1136))
+	   (format "1.4.%d" (+ rev 50)))))
+  "Version number of this package.")
+
+(defgroup w3m nil
+  "Emacs-w3m - the web browser of choice."
+  :group 'hypermedia)
+
+(defgroup w3m-face nil
+  "Faces used for emacs-w3m."
+  :group 'w3m
+  :prefix "w3m-")
+
+(defcustom w3m-command nil
+  "*Name of the executable file of the w3m command.
+You normally don't have to specify the value, since emacs-w3m looks
+for the existing commands in order of w3m, w3mmee and w3m-m17n in the
+`exec-path' directories in order if it is nil in the beginning.
+
+If you want to use the other w3m command, specify the value of this
+variable explicitly in the .emacs file or customize the value and save
+it.  In this case, you need to restart Emacs and emacs-w3m.  That is,
+there is currently no way to apply the changing of the w3m command to
+all the emacs-w3m programs safely after loading the w3m.elc module."
+  :group 'w3m
+  :type '(radio (const :format "Not specified " nil)
+		(string :format "Command: %v\n" :size 0)))
+
+(defcustom w3m-display-ins-del 'auto
+  "*Value of `display_ins_del' option."
+  :group 'w3m
+  :type '(radio (const :format "Delect automatically" auto)
+		(const :format "Use fontify" fontify)
+		(const :format "Use tag" tag)
+		(const :format "No have option" nil)))
+
+(defvar w3m-type nil
+  "Type of the w3m command.
+The valid values include `w3m', `w3mmee', and `w3m-m17n'.")
+(defvar w3m-compile-options nil
+  "Compile options that the w3m command was built with.")
+(defvar w3m-version nil
+  "Version string of the w3m command.")
+
+;; Set w3m-command, w3m-type, w3m-version and w3m-compile-options
+(if noninteractive ;; Don't call the external command when compiling.
+    (unless w3m-command
+      (setq w3m-command "w3m"))
+  (when (or (null w3m-command)
+	    (null w3m-type)
+	    (null w3m-version)
+	    (null w3m-compile-options))
+    (let ((command (or w3m-command
+		       (w3m-which-command "w3m")
+		       (w3m-which-command "w3mmee")
+		       (w3m-which-command "w3m-m17n"))))
+      (when command
+	(setq w3m-command command)
+	(with-temp-buffer
+	  (call-process command nil t nil "-version")
+	  (goto-char (point-min))
+	  (when (re-search-forward "version \\(w3m/0\\.[3-9]\
+\\(?:\\.[0-9\\]\\)*\\(?:rc[0-9]+\\)?\
+\\(?:-stable\\|\\(?:\\+cvs\\(?:-[0-9]+\\.[0-9]+\\)?\\)\\)?\
+\\(?:-inu\\|\\(-m17n\\|\\(\\+mee\\)\\)\\)?[^,]*\\)" nil t)
+	    (setq w3m-version (match-string 1))
+	    (setq w3m-type
+		  (cond
+		   ((match-beginning 3) 'w3mmee)
+		   ((match-beginning 2) 'w3m-m17n)
+		   ((match-beginning 1) 'w3m)
+		   (t 'other))))
+	  (when (re-search-forward "options +" nil t)
+	    (setq w3m-compile-options
+		  (or (split-string (buffer-substring (match-end 0)
+						      (point-at-eol))
+				    ",")
+		      (list nil)))
+	    (when (member "m17n" w3m-compile-options)
+	      (setq w3m-type 'w3m-m17n))))))))
+
+(when (not (stringp w3m-command))
+  (error "\
+Install w3m command in `exec-path' or set `w3m-command' variable correctly"))
+
+(defcustom w3m-user-agent (concat "Emacs-w3m/" emacs-w3m-version
+				  " " w3m-version)
+  "String used for the User-Agent field.  See also `w3m-add-user-agent'."
+  :group 'w3m
+  :type '(string :size 0))
+
+(defcustom w3m-add-user-agent t
+  "Non-nil means add the User-Agent field to the request header.
+The value of `w3m-user-agent' is used for the field body."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-language
+  (if (and (boundp 'current-language-environment)
+	   ;; In XEmacs 21.5 it may be the one like "Japanese (UTF-8)".
+	   (string-match "\\`Japanese"
+			 (symbol-value 'current-language-environment)))
+      "Japanese")
+  "*Your preferred language used in emacs-w3m sessions."
+  :group 'w3m
+  :type '(radio (const :format "%v " "Japanese")
+		(const :tag "Other" nil))
+  :get (lambda (symbol)
+	 (let ((value (format "%s" (default-value symbol)))
+	       (case-fold-search t))
+	   (prog1
+	       (setq value (if (string-match "\\`japan" value) "Japanese"))
+	     (custom-set-default symbol value))))
+  :set (lambda (symbol value)
+	 (custom-set-default symbol (if (equal value "Japanese") "Japanese"))))
+
+(defcustom w3m-command-arguments
+  (if (eq w3m-type 'w3mmee) '("-o" "concurrent=0" "-F") nil)
+  "*List of the default arguments passed to the w3m command.
+See also `w3m-command-arguments-alist'."
+  :group 'w3m
+  :type '(repeat (string :format "Argument: %v\n" :size 0)))
+
+(defcustom w3m-command-arguments-alist nil
+  "*Alist of regexps matching urls and additional arguments passed to w3m.
+A typical usage of this variable is to specify whether to use the proxy
+server for the particular hosts.  The first match made will be used.
+Here is an example of how to set this variable:
+
+\(setq w3m-command-arguments-alist
+      '(;; Don't use the proxy server to visit local web pages.
+	(\"^http://\\\\(?:[^/]*\\\\.\\\\)*your-company\\\\.com\\\\(?:/\\\\|$\\\\)\"
+	 \"-no-proxy\")
+	;; Use the proxy server to visit any foreign urls.
+	(\"\"
+	 \"-o\" \"http_proxy=http://proxy.your-company.com:8080/\")))
+
+Where the first element matches the url that the scheme is \"http\" and
+the hostname is either \"your-company.com\" or a name ended with
+\".your-company.com\", and the proxy server is not used for those hosts.
+If you are a novice on the regexps, you can use the
+`w3m-no-proxy-domains' variable instead."
+  :group 'w3m
+  :type '(repeat (cons :format "%v" :indent 4
+		       (regexp :format "%t: %v\n" :size 0)
+		       (repeat :tag "Arguments passed to w3m command"
+			       (string :format "Arg: %v\n" :size 0)))))
+
+(defcustom w3m-no-proxy-domains nil
+  "*List of domain names with which emacs-w3m will not use a proxy server.
+Each element should be exactly a domain name which means the latter
+common part of the host names, not a regexp."
+  :group 'w3m
+  :type '(repeat (string :format "Domain name: %v\n" :size 0)))
+
+(defcustom w3m-command-environment
+  (delq nil
+	(list
+	 (if (eq w3m-type 'w3mmee)
+	     (cons "W3MLANG" "ja_JP.kterm"))
+	 (if (eq system-type 'windows-nt)
+	     (cons "CYGWIN" "binmode tty"))))
+  "*Alist of environment variables for subprocesses to inherit."
+  :group 'w3m
+  :type '(repeat
+	  (cons :format "%v" :indent 4
+		(string :format "Name: %v\n" :size 0)
+		(string :format "    Value: %v\n" :size 0))))
+
+(defcustom w3m-fill-column -1
+  "*Integer used as the value for `fill-column' in emacs-w3m buffers.
+If it is positive, pages will be displayed within the columns of that
+number.  If it is zero or negative, the number of columns which
+subtracted that number from the window width is applied to the maximum
+width of pages.  Note that XEmacs does not always obey this setting."
+  :group 'w3m
+  :type '(integer :size 0))
+
+(defcustom w3m-mailto-url-function nil
+  "*Function used to handle the `mailto' urls.
+Function is called with one argument, just a url.  If it is nil, a
+function specified by the `mail-user-agent' variable will be used for
+composing mail messages."
+  :group 'w3m
+  :type '(radio (const :tag "Not specified" nil)
+		(function :format "%t: %v\n" :size 0)))
+
+(defcustom w3m-mailto-url-popup-function-alist
+  '((cmail-mail-mode . pop-to-buffer)
+    (mail-mode . pop-to-buffer)
+    (message-mode . pop-to-buffer)
+    (mew-draft-mode . pop-to-buffer)
+    (mh-letter-mode . pop-to-buffer)
+    (wl-draft-mode . pop-to-buffer))
+  "*Alist of (MAJOR-MODE . FUNCTION) pairs used to pop to a mail buffer up.
+If a user clicks on a `mailto' url and a mail buffer is composed by
+`mail-user-agent' with the MAJOR-MODE, FUNCTION will be called with a
+mail buffer as an argument.  Note that the variables
+`special-display-buffer-names', `special-display-regexps',
+`same-window-buffer-names' and `same-window-regexps' will be bound to
+nil while popping to a buffer up."
+  :group 'w3m
+  :type '(repeat (cons :format "%v" :indent 11
+		       (symbol :format "Major-mode: %v\n" :size 0)
+		       (function :format "%t: %v\n" :size 0))))
+
+(defcustom w3m-use-mule-ucs
+  (and (eq w3m-type 'w3m) (featurep 'un-define))
+  "*Non-nil means use the multi-script support with Mule-UCS."
+  :group 'w3m
+  :type 'boolean
+  :require 'w3m-ucs)
+
+(when w3m-use-mule-ucs
+  (condition-case nil
+      (require 'w3m-ucs)
+    (error (setq w3m-use-mule-ucs nil))))
+
+(defcustom w3m-use-ange-ftp nil
+  "*Non-nil means that `ange-ftp' or `efs' is used to access FTP servers."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-doc-view-content-types
+  (condition-case nil
+      (delq nil (mapcar (lambda (type)
+			  (if (doc-view-mode-p type)
+			      (format "application/%s" type)))
+			'(dvi postscript pdf)))
+    (error nil))
+  "List of content types for which to use `doc-view-mode' to view contents.
+This overrides `w3m-content-type-alist'."
+  :group 'w3m
+  :type '(repeat (string :tag "Type" :value "application/")))
+
+(defcustom w3m-imitate-widget-button '(eq major-mode 'gnus-article-mode)
+  "*If non-nil, imitate the widget buttons on link (anchor) buttons.
+It is useful for moving about in a Gnus article buffer using TAB key.
+It can also be any Lisp form that should return a boolean value."
+  :group 'w3m
+  :type '(sexp :size 0))
+
+(defcustom w3m-treat-image-size t
+  "*Non-nil means let w3m mind the ratio of the size of images and text.
+
+If it is non-nil, the w3m command will make a halfdump which reserves
+rectangle spaces in which images will be put, and also `alt' texts
+will be truncated or padded with spaces so that their display width
+will be the same as the width of images.
+
+See also `w3m-pixels-per-character' and `w3m-pixels-per-line'.  Those
+values will be passed to the w3m command in order to compute columns
+and lines which images occupy."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-pixels-per-line 64
+  "*Integer used for the `-ppl' argument of the w3m command.
+If nil, the height of the default face is used.  It is valid only when
+`w3m-treat-image-size' is non-nil.  Note that a small value may not
+induce a good result.  If you want to use emacs-w3m in a character
+terminal and make `w3m-treat-image-size' effective, you need to set
+this variable properly."
+  :group 'w3m
+  :type '(choice (const :tag "Auto Detect" nil)
+		 (integer :tag "Specify Pixels")))
+
+(defcustom w3m-pixels-per-character nil
+  "*Integer used for the `-ppc' argument of the w3m command.
+If nil, the width of the default face is used.  It is valid only when
+`w3m-treat-image-size' is non-nil.  If you want to use emacs-w3m in a
+character terminal and make `w3m-treat-image-size' effective, you need
+to set this variable properly."
+  :group 'w3m
+  :type '(radio (const :tag "Auto Detect" nil)
+		(integer :format "Specify Pixels: %v\n" :size 0)))
+
+(defcustom w3m-image-default-background nil
+  "Color name used as transparent color of image.
+Nil means to use the background color of the Emacs frame.  Note that
+this value is effective only to xbm and monochrome pbm images in Emacs
+22 and greater."
+  :group 'w3m
+  :type '(radio (string :format "Color: %v\n" :size 0
+			:match (lambda (widget value)
+				 (and (stringp value) (> (length value) 0))))
+		(const :tag "Use the background color of the Emacs frame" nil)
+		(const :tag "Null string" "")))
+
+(defvar w3m-accept-japanese-characters
+  (and (not noninteractive)
+       (featurep 'mule)
+       (or (memq w3m-type '(w3mmee w3m-m17n))
+	   ;; Examine whether the w3m command specified by `w3m-command'
+	   ;; uses `euc-japan' for the internal character set.
+	   (let ((str
+		  (eval-when-compile
+		    (format
+		     (concat
+		      "<!doctype html public \"-//W3C//DTD HTML 3.2//EN\">"
+		      "<html><head><meta http-equiv=\"Content-Type\" "
+		      "content=\"text/html; charset=ISO-2022-JP\">"
+		      "</head><body>%s</body>\n")
+		     (string 27 36 66 52 65 59 122 27 40 66)))))
+	     (with-temp-buffer
+	       (set-buffer-multibyte nil)
+	       (insert str)
+	       (let ((coding-system-for-write 'binary)
+		     (coding-system-for-read 'binary)
+		     (default-process-coding-system (cons 'binary 'binary)))
+		 (call-process-region (point-min) (point-max) w3m-command
+				      t t nil "-T" "text/html" "-halfdump")
+		 (goto-char (point-min))
+		 (and (re-search-forward (string ?\264 ?\301 ?\273 ?\372)
+					 nil t)
+		      t))))))
+  "Non-nil means that the w3m command accepts Japanese characters.")
+
+(defcustom w3m-coding-system (if (featurep 'mule)
+				 (if (eq w3m-type 'w3mmee)
+				     'iso-2022-7bit-ss2
+				   'iso-2022-7bit)
+			       'iso-8859-1)
+  "*Default coding system used to communicate with the w3m command."
+  :group 'w3m
+  :type '(coding-system :size 0))
+
+(defcustom w3m-terminal-coding-system
+  (if w3m-accept-japanese-characters
+      'euc-japan 'iso-8859-1)
+  "*Default coding system used when writing to w3m processes.
+It is just a default value to set process' coding system initially.
+\(This variable name is analogically derived from the behavior of the
+w3m command which accepts data from Emacs just like reads from the
+terminal.)"
+  :group 'w3m
+  :type '(coding-system :size 0))
+
+(defcustom w3m-output-coding-system
+  (cond
+   ((not (featurep 'mule)) 'iso-8859-1)
+   ((eq w3m-type 'w3mmee) 'ctext)
+   ((eq w3m-type 'w3m-m17n)
+    (if (and (w3m-find-coding-system 'utf-8)
+	     (not (and (equal "Japanese" w3m-language)
+		       (featurep 'w3m-ems)
+		       (= emacs-major-version 21))))
+	'utf-8
+      'iso-2022-7bit-ss2))
+   (w3m-accept-japanese-characters 'w3m-euc-japan)
+   (t 'w3m-iso-latin-1))
+  "*Coding system used when reading from w3m processes."
+  :group 'w3m
+  :type '(coding-system :size 0))
+
+(defcustom w3m-input-coding-system
+  (if (memq w3m-type '(w3mmee w3m-m17n))
+      w3m-output-coding-system
+    (if w3m-accept-japanese-characters
+	(if w3m-use-mule-ucs
+	    'w3m-euc-japan-mule-ucs
+	  (if (featurep 'w3m-ems)
+	      'w3m-euc-japan
+	    'euc-japan))
+      (if w3m-use-mule-ucs
+	  'w3m-iso-latin-1-mule-ucs
+	(if (featurep 'w3m-ems)
+	    'w3m-iso-latin-1
+	  'iso-8859-1))))
+  "*Coding system used when writing to w3m processes.
+It overrides `coding-system-for-write' if it is not `binary'.
+Otherwise, the value of the `w3m-current-coding-system' variable is
+used instead."
+  :group 'w3m
+  :type '(coding-system :size 0))
+
+(defcustom w3m-file-coding-system (if (featurep 'mule)
+				      'iso-2022-7bit
+				    'iso-8859-1)
+  "*Coding system used when writing configuration files.
+This value will be referred to by the `w3m-save-list' function."
+  :group 'w3m
+  :type '(coding-system :size 0))
+
+(defvar w3m-file-coding-system-for-read nil
+  "*Coding system used when reading configuration files.
+It is strongly recommended that you do not set this variable if there
+is no particular reason.  The value will be referred to by the
+`w3m-load-list' function.")
+
+(defcustom w3m-file-name-coding-system
+  (if (memq system-type '(windows-nt OS/2 emx))
+      'shift_jis 'euc-japan)
+  "*Coding system used to convert pathnames when emacs-w3m accesses files."
+  :group 'w3m
+  :type '(coding-system :size 0))
+
+(defcustom w3m-default-coding-system
+  (if (equal "Japanese" w3m-language) 'shift_jis 'iso-8859-1)
+  "*Default coding system used to encode url strings and post-data."
+  :group 'w3m
+  :type '(coding-system :size 0))
+
+(defcustom w3m-coding-system-priority-list
+  (if (equal "Japanese" w3m-language) '(shift_jis))
+  "*Coding systems in order of priority used for emacs-w3m sessions."
+  :group 'w3m
+  :type '(repeat (coding-system :format "%t: %v\n" :size 0)))
+
+(defcustom w3m-key-binding nil
+  "*Type of key binding set used in emacs-w3m sessions.
+The valid values include `info' which provides Info-like keys, and
+nil which provides Lynx-like keys."
+  :group 'w3m
+  :type '(choice
+	  (const :tag "Use Info-like key mapping." info)
+	  (const :tag "Use Lynx-like key mapping." nil))
+  ;; Since the following form won't be byte-compiled, you developers
+  ;; should never use CL macros like `caaaar', `when', `unless' ...
+  :set (lambda (symbol value)
+	 (prog1
+	     (custom-set-default symbol value)
+	   (if (or noninteractive
+		   ;; Loading w3m.elc is just in progress...
+		   (not (featurep 'w3m)))
+	       nil
+	     (if (and;; Gnus binds `w3m-mode-map' for compiling.
+		  (boundp 'w3m-mode-map)
+		  (boundp 'w3m-info-like-map)
+		  (boundp 'w3m-lynx-like-map))
+		 ;; It won't be bound at the first time.
+		 (eval
+		  '(setq w3m-mode-map (if (eq value 'info)
+					  w3m-info-like-map
+					w3m-lynx-like-map)
+			 w3m-minor-mode-map (w3m-make-minor-mode-keymap))))
+	     (let ((buffers (buffer-list)))
+	       (save-current-buffer
+		 (while buffers
+		   (set-buffer (car buffers))
+		   (if (eq major-mode 'w3m-mode)
+		       (condition-case nil
+			   (progn
+			     (use-local-map (symbol-value 'w3m-mode-map))
+			     (w3m-setup-toolbar)
+			     (w3m-setup-menu))
+			 (error)))
+		   (setq buffers (cdr buffers)))))))))
+
+(defcustom w3m-use-cygdrive (eq system-type 'windows-nt)
+  "*If non-nil, use the /cygdrive/ rule when performing `expand-file-name'."
+  :group 'w3m
+  :type 'boolean)
+
+(eval-and-compile
+  (defconst w3m-treat-drive-letter (memq system-type '(windows-nt OS/2 emx))
+    "Say whether the system uses drive letters."))
+
+(defcustom w3m-profile-directory
+  (concat "~/." (file-name-sans-extension
+		 (file-name-nondirectory w3m-command)))
+  "*Directory where emacs-w3m config files are loaded from or saved to."
+  :group 'w3m
+  :type '(directory :size 0))
+
+(defcustom w3m-init-file "~/.emacs-w3m"
+  "*Your emacs-w3m startup file name.
+If a file with the `.el' or `.elc' suffixes exists, it will be read
+instead.
+
+Note: This file is used as the startup configuration *NOT* for the w3m
+command but for emacs-w3m.  In order to modify configurations for the
+w3m command, edit the file named \"~/.w3m/config\" normally."
+  :group 'w3m
+  :type '(file :size 0))
+
+(defcustom w3m-default-save-directory
+  (concat "~/." (file-name-sans-extension
+		 (file-name-nondirectory w3m-command)))
+  "*Default directory where downloaded files will be saved to."
+  :group 'w3m
+  :type '(directory :size 0))
+
+(defcustom w3m-default-directory nil
+  "*Directory used as the current directory in emacs-w3m buffers.
+The valid values include a string specifying an existing directory,
+a symbol of which the value specifies an existing directory,
+a function which takes a url as an argument and returns a directory,
+and nil.  If the specified directory does not exist or it is nil,
+the value of `w3m-profile-directory' is used.
+
+Note that there is an exception: if a page visits a local file or
+visits a remote file using ftp, the directory in which the file exists
+is used as the current directory instead."
+  :group 'w3m
+  :type '(radio (directory :format "%{%t%}: %v\n" :size 0 :value "~/")
+		(symbol :format "%{%t%}: %v\n"
+			:match (lambda (widget value) value)
+			:size 0
+			:value default-directory)
+		(function :format "%{%t%}: %v\n"
+			  :size 0)
+		(const nil)))
+
+(defcustom w3m-accept-languages
+  (let ((file (expand-file-name "config" w3m-profile-directory)))
+    (or (when (file-readable-p file)
+	  (with-temp-buffer
+	    (insert-file-contents file)
+	    (goto-char (point-min))
+	    (when (re-search-forward "^accept_language[\t ]+\\(.+\\)$" nil t)
+	      (delete "" (split-string (match-string 1)
+				       "[ \t\r\f\n]*,[ \t\r\f\n]*")))))
+	(when (string= w3m-language "Japanese")
+	  '("ja" "en"))))
+  "*List of acceptable languages in descending order of priority.
+The default value is set according to the accept_language entry of the
+w3m configuration file (normally \"~/.w3m/config\")."
+  :group 'w3m
+  :type '(repeat (string :format "Lang: %v\n" :size 0)))
+
+(defcustom w3m-delete-duplicated-empty-lines t
+  "*Non-nil means display two or more continuous empty lines into single."
+  :group 'w3m
+  :type 'boolean)
+
+(defvar w3m-display-inline-images nil
+  "Internal variable controls whether to show images in emacs-w3m buffers.
+This variable is buffer-local which defaults to the value of
+`w3m-default-display-inline-images'.  Don't set it directly; modify
+the `w3m-default-display-inline-images' variable or use the\
+ `\\<w3m-mode-map>\\[w3m-toggle-inline-images]' command
+to change the appearance of images.
+See also `w3m-toggle-inline-images-permanently'.")
+(make-variable-buffer-local 'w3m-display-inline-images)
+
+(defcustom w3m-default-display-inline-images nil
+  "*Non-nil means display images inline in emacs-w3m buffers.
+You can toggle the visibility of images by the\
+ `\\<w3m-mode-map>\\[w3m-toggle-inline-images]' command.
+See also `w3m-toggle-inline-images-permanently'."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-toggle-inline-images-permanently t
+  "*Non-nil means let the visibility of images continue permanently.
+The visibility of images is initialized according to
+`w3m-default-display-inline-images' at the first time, and except that
+it may be toggled by the `\\<w3m-mode-map>\\[w3m-toggle-inline-images]'\
+ command, it does not change hereafter, if
+it is non-nil.  Otherwise, whether images are visible is initialized
+according to `w3m-default-display-inline-images' whenever you visit a
+new page or reload the current page in an emacs-w3m buffer."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-icon-directory
+  (let (dir)
+    (or
+     (catch 'found-dir
+       (let* ((path (locate-library "w3m"))
+	      (paths (if path
+			 (cons (file-name-directory path) load-path)
+		       load-path)))
+	 (while paths
+	   (setq path (car paths)
+		 paths (cdr paths))
+	   (if path
+	       (progn
+		 (if (file-directory-p
+		      (setq dir
+			    (expand-file-name "../../etc/images/w3m/" path)))
+		     (throw 'found-dir dir))
+		 (if (file-directory-p
+		      (setq dir
+			    (expand-file-name "../etc/images/w3m/" path)))
+		     (throw 'found-dir dir))
+		 (if (file-directory-p
+		      (setq dir
+			    (expand-file-name "../../etc/w3m/icons/" path)))
+		     (throw 'found-dir dir))
+		 (if (file-directory-p
+		      (setq dir
+			    (expand-file-name "../etc/w3m/icons/" path)))
+		     (throw 'found-dir dir)))))))
+     (and (fboundp 'locate-data-directory)
+	  (or (locate-data-directory "images/w3m")
+	      (locate-data-directory "w3m")))
+     (and (file-directory-p
+	   (setq dir (expand-file-name "images/w3m/" data-directory)))
+	  dir)
+     (and (file-directory-p
+	   (setq dir (expand-file-name "w3m/icons/" data-directory)))
+	  dir)))
+  "*Directory where emacs-w3m should find icon files."
+  :group 'w3m
+  :type '(radio (const :tag "Not specified")
+		(directory :format "%t: %v\n" :size 0)))
+
+(defcustom w3m-broken-proxy-cache nil
+  "*Set it to t if the proxy server seems not to work properly in caching.
+Note that this may be the double-edged sword; setting it to t will
+likely be harmful if the proxy server sends bad requests (e.g., not
+including the Host header, see RFC2616 section 14.23) to foreign
+servers when the w3m command specifies the \"no-cache\" directive.  Also
+note that it may not be effective if you are using old w3m command."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-quick-start t
+  "*Non-nil means let emacs-w3m start quickly w/o requiring confirmation.
+When you invoke the `w3m' command, it attempts to visit the page of a
+string like url around the cursor or the value of `w3m-home-page'.
+You won't be asked for the confirmation then if this value is non-nil.
+Otherwise, you will be prompted for that url with the editing form."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-home-page
+  (or (getenv "HTTP_HOME")
+      (getenv "WWW_HOME")
+      "about:")
+  "*This variable specifies the url string to open when emacs-w3m starts.
+Don't say HP, which is the abbreviated name of a certain company. ;-)"
+  :group 'w3m
+  :type '(radio
+	  :convert-widget w3m-widget-type-convert-widget
+	  `(,@(if (getenv "HTTP_HOME")
+		  `((const :format "HTTP_HOME: \"%v\"\n"
+			   ,(getenv "HTTP_HOME"))))
+	    ,@(if (getenv "WWW_HOME")
+		  `((const :format "WWW_HOME: \"%v\"\n"
+			   (getenv "WWW_HOME"))))
+	    (const :tag "About emacs-w3m" "about:")
+	    (const :tag "Blank page" "about:blank")
+	    (string :format "URL: %v\n" :size 0))))
+
+(defcustom w3m-arrived-file
+  (expand-file-name ".arrived" w3m-profile-directory)
+  "*Name of the file to keep the arrived URLs database."
+  :group 'w3m
+  :type '(file :size 0))
+
+(defcustom w3m-keep-arrived-urls 500
+  "*Maximum number of URLs which the arrived URLs database keeps."
+  :group 'w3m
+  :type '(integer :size 0))
+
+(defcustom w3m-prefer-cache nil
+  "*Non-nil means that cached contents are used without checking headers."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-keep-cache-size 300
+  "*Maximum number of pages to be cached in emacs-w3m."
+  :group 'w3m
+  :type '(integer :size 0))
+
+(defcustom w3m-follow-redirection 9
+  "*Maximum number of redirections which emacs-w3m honors and follows.
+If nil, redirections are followed by the w3m command.  Don't set it to
+nil if you allow to use cookies (i.e., you have set `w3m-use-cookies'
+to non-nil) since cookies may be shared among many redirected pages."
+  :group 'w3m
+  :type '(radio (const :format "Ignore redirections " nil)
+		(integer :size 0)))
+
+(defcustom w3m-redirect-with-get t
+  "*If non-nil, use the GET method after redirection.
+It controls how emacs-w3m works when a server responds the code 301 or
+302.  Here is an extract from RFC2616:
+
+Note: RFC 1945 and RFC 2068 specify that the client is not allowed
+to change the method on the redirected request.  However, most
+existing user agent implementations treat 302 as if it were a 303
+response, performing a GET on the Location field-value regardless
+of the original request method."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-resize-image-scale 50
+  "*Number of steps in percent used when resizing images."
+  :group 'w3m
+  :type '(integer :size 0))
+
+(defface w3m-anchor
+  '((((class color) (background light)) (:foreground "blue"))
+    (((class color) (background dark)) (:foreground "cyan"))
+    (t (:underline t)))
+  "Face used for displaying anchors."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-anchor-face 'face-alias 'w3m-anchor)
+
+(defface w3m-arrived-anchor
+  '((((class color) (background light)) (:foreground "navy"))
+    (((class color) (background dark)) (:foreground "LightSkyBlue"))
+    (t (:underline t)))
+  "Face used for displaying anchors which have already arrived."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-arrived-anchor-face 'face-alias 'w3m-arrived-anchor)
+
+(defface w3m-current-anchor
+  '((t (:underline t :bold t)))
+  "Face used to highlight the current anchor."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-current-anchor-face 'face-alias 'w3m-current-anchor)
+
+(defface w3m-image
+  '((((class color) (background light)) (:foreground "ForestGreen"))
+    (((class color) (background dark)) (:foreground "PaleGreen"))
+    (t (:underline t)))
+  "Face used for displaying alternate strings of images."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-image-face 'face-alias 'w3m-image)
+
+(defface w3m-image-anchor
+  '((((class color) (background light)) (:background "light yellow"))
+    (((class color) (background dark)) (:background "dark green"))
+    (t (:underline t)))
+  "Face used for displaying alternate strings of images which are in anchors."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-image-anchor-face 'face-alias 'w3m-image-anchor)
+
+(defface w3m-history-current-url
+  ;; The following strange code compounds the attributes of the
+  ;; `secondary-selection' face and the `w3m-arrived-anchor' face,
+  ;; and generates the new attributes for this face.
+  (let ((base 'secondary-selection)
+	(fn (if (featurep 'xemacs)
+		'face-custom-attributes-get
+	      'custom-face-attributes-get));; What a perverseness it is.
+	;; Both `face-custom-attributes-get' in XEmacs and
+	;; `custom-face-attributes-get' in CUSTOM 1.9962 attempt to
+	;; require `font' in Emacs/w3 and `cl' arbitrarily. :-/
+	(features (cons 'font features))
+	base-attributes attributes attribute)
+    (setq base-attributes (funcall fn base nil)
+	  attributes (funcall fn 'w3m-arrived-anchor nil))
+    (while base-attributes
+      (setq attribute (car base-attributes))
+      (unless (memq attribute '(:foreground :underline))
+	(setq attributes (plist-put attributes attribute
+				    (cadr base-attributes))))
+      (setq base-attributes (cddr base-attributes)))
+    (list (list t attributes)))
+  "Face used to highlight the current url in the \"about://history/\" page."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-history-current-url-face 'face-alias 'w3m-history-current-url)
+
+(defface w3m-bold '((t (:bold t)))
+  "Face used for displaying bold text."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-bold-face 'face-alias 'w3m-bold)
+
+(defface w3m-italic '((((type tty)) (:underline t))
+		      (t (:italic t)))
+  "Face used for displaying italic text.
+By default it will be a underline face on a non-window system."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-italic-face 'face-alias 'w3m-italic)
+
+(defface w3m-underline '((t (:underline t)))
+  "Face used for displaying underlined text."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-underline-face 'face-alias 'w3m-underline)
+
+(defface w3m-strike-through
+  `((((class color))
+     ,(if (featurep 'xemacs)
+	  '(:strikethru t)
+	'(:strike-through t)))
+    (t (:underline t)))
+  "Face used for displaying strike-through text."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-strike-through-face 'face-alias 'w3m-strike-through)
+
+(defface w3m-insert
+  '((((class color) (background light))
+     (:foreground "purple"))
+    (((class color) (background dark))
+     (:foreground "orchid"))
+    (t (:underline t)))
+  "Face used for displaying insert text."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-insert-face 'face-alias 'w3m-insert)
+
+(defcustom w3m-mode-hook nil
+  "*Hook run after `w3m-mode' initialization.
+This hook is evaluated by the `w3m-mode' function."
+  :group 'w3m
+  :type 'hook)
+
+(defcustom w3m-fontify-before-hook nil
+  "*Hook run when starting to fontify emacs-w3m buffers.
+This hook is evaluated by the `w3m-fontify' function."
+  :group 'w3m
+  :type 'hook)
+
+(defcustom w3m-fontify-after-hook nil
+  "*Hook run after fontifying emacs-w3m buffers.
+This hook is evaluated by the `w3m-fontify' function."
+  :group 'w3m
+  :type 'hook)
+
+(defcustom w3m-display-hook
+  '(w3m-move-point-for-localcgi
+    w3m-history-highlight-current-url)
+  "*Hook run after displaying pages in emacs-w3m buffers.
+Each function is called with a url string as the argument.  This hook
+is evaluated by the `w3m-goto-url' function."
+  :group 'w3m
+  :type 'hook
+  :initialize 'w3m-custom-hook-initialize)
+
+(defcustom w3m-after-cursor-move-hook
+  '(w3m-highlight-current-anchor
+    w3m-print-this-url
+    w3m-auto-show)
+  "*Hook run each time after the cursor moves in emacs-w3m buffers.
+This hook is called by the `w3m-check-current-position' function by
+way of `post-command-hook'."
+  :group 'w3m
+  :type 'hook
+  :initialize 'w3m-custom-hook-initialize)
+
+(defcustom w3m-delete-buffer-hook
+  '(w3m-pack-buffer-numbers)
+  "*Hook run when every emacs-w3m buffer is deleted."
+  :group 'w3m
+  :type 'hook
+  :initialize 'w3m-custom-hook-initialize)
+
+(defcustom w3m-select-buffer-hook nil
+  "*Hook run when a different emacs-w3m buffer is selected."
+  :group 'w3m
+  :type 'hook)
+
+(defcustom w3m-async-exec t
+  "*Non-nil means execute the w3m command asynchronously in Emacs process."
+  :group 'w3m
+  :type 'boolean)
+
+;; As far as we know, Emacs 21 under Mac OS X[1] and XEmacs under
+;; Solaris[2] won't run the asynchronous operations correctly when
+;; both `w3m-async-exec' and `w3m-process-connection-type' are non-nil;
+;; [1]the final kilobyte or so might get lost from raw data downloaded
+;; from a web site; [2]XEmacs hangs up.
+
+(defcustom w3m-process-connection-type
+  (not (or (and (memq system-type '(darwin macos))
+		(let ((ver (shell-command-to-string "uname -r")))
+		  (and (string-match "^\\([0-9]+\\)\\." ver)
+		       (< (string-to-number (match-string 1 ver)) 7))))
+	   (and (featurep 'xemacs)
+		(string-match "solaris" system-configuration))))
+  "*Value for `process-connection-type' used when communicating with w3m."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-async-exec-with-many-urls
+  ;; XEmacs 21.5 tends to freeze when retrieving many urls at a time. :-<
+  (not (and (featurep 'xemacs) (not (featurep 'sxemacs))
+	    (= emacs-major-version 21) (= emacs-minor-version 5)))
+  "Non-nil means allow retrieving many urls asynchronously.
+The value affects how emacs-w3m will work with group:* urls and the
+`w3m-session-select' feature.  If it is nil, the asynchronous operation
+is inhibited in those cases even if `w3m-async-exec' is non-nil."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-default-content-type "text/html"
+  "*Default value assumed as the content type of local files."
+  :group 'w3m
+  :type '(string :size 0))
+
+(defvar w3m-image-viewer
+  (or (w3m-which-command "display")
+      (w3m-which-command "eeyes")
+      (w3m-which-command "xloadimage")
+      (w3m-which-command "xv"))
+  "*Command used to view image files externally.
+Note that this option is installed temporally.  It will be abolished
+when we implement the mailcap parser to set `w3m-content-type-alist'.")
+
+;; FIXME: we need to improve so that to set up the value of this
+;; variable may be performed by parsing the mailcap file.
+(defcustom w3m-content-type-alist
+  (let* ((fiber-viewer (when (and (eq system-type 'windows-nt)
+				  (w3m-which-command "fiber"))
+			 (list "fiber.exe" "-s" 'file)))
+	 (external-browser
+	  (if (and (eq system-type 'windows-nt) (w3m-which-command "fiber"))
+	      'w3m-w32-browser-with-fiber
+	    (or (when (condition-case nil (require 'browse-url) (error nil))
+		  (if (or (not (boundp 'browse-url-browser-function))
+			  (eq 'w3m-browse-url
+			      (symbol-value 'browse-url-browser-function)))
+		      (cond
+		       ((and (memq system-type '(windows-nt ms-dos cygwin))
+			     (fboundp 'browse-url-default-windows-browser))
+			'browse-url-default-windows-browser)
+		       ((and (memq system-type '(darwin))
+			     (fboundp 'browse-url-default-macosx-browser))
+			'browse-url-default-macosx-browser)
+		       ((fboundp 'browse-url-default-browser)
+			'browse-url-default-browser)
+		       ((fboundp 'browse-url-netscape)
+			'browse-url-netscape))
+		    (symbol-value 'browse-url-browser-function)))
+		(when (w3m-which-command "netscape")
+		  (list "netscape" 'url)))))
+	 (image-viewer (or fiber-viewer
+			   (when w3m-image-viewer
+			     (list w3m-image-viewer 'file))))
+	 (video-viewer (or fiber-viewer
+			   (when (w3m-which-command "mpeg_play")
+			     (list "mpeg_play" 'file))))
+	 (dvi-viewer (or fiber-viewer
+			 (cond ((w3m-which-command "xdvi") (list "xdvi" 'file))
+			       ((w3m-which-command "dvitty")
+				(list "dvitty" 'file)))))
+	 (ps-viewer (or fiber-viewer
+			(cond
+			 ((w3m-which-command "gv") (list "gv" 'file))
+			 ((w3m-which-command "gs") (list "gs" 'file)))))
+	 (pdf-viewer (or fiber-viewer
+			 (cond
+			  ((w3m-which-command "xpdf") (list "xpdf" 'file))
+			  ((w3m-which-command "acroread")
+			   (list "acroread" 'file))))))
+    `(("text/plain" "\\.\\(?:txt\\|tex\\|el\\)\\'" nil nil)
+      ("text/html" "\\.s?html?\\'" ,external-browser nil)
+      ("text/sgml" "\\.sgml?\\'" nil "text/plain")
+      ("text/xml" "\\.xml\\'" nil "text/plain")
+      ("image/jpeg" "\\.jpe?g\\'" ,image-viewer nil)
+      ("image/png" "\\.png\\'" ,image-viewer nil)
+      ("image/gif" "\\.gif\\'" ,image-viewer nil)
+      ("image/tiff" "\\.tif?f\\'" ,image-viewer nil)
+      ("image/x-xwd" "\\.xwd\\'" ,image-viewer nil)
+      ("image/x-xbm" "\\.xbm\\'" ,image-viewer nil)
+      ("image/x-xpm" "\\.xpm\\'" ,image-viewer nil)
+      ("image/x-bmp" "\\.bmp\\'" ,image-viewer nil)
+      ("video/mpeg" "\\.mpe?g\\'" ,video-viewer nil)
+      ("video/quicktime" "\\.mov\\'" ,video-viewer nil)
+      ("application/dvi" "\\.dvi\\'" ,dvi-viewer nil)
+      ("application/postscript" "\\.e?ps\\'" ,ps-viewer nil)
+      ("application/pdf" "\\.pdf\\'" ,pdf-viewer nil)
+      ("application/x-pdf" "\\.pdf\\'" ,pdf-viewer nil)
+      ("application/xml" "\\.xml\\'" nil w3m-detect-xml-type)
+      ("application/rdf+xml" "\\.rdf\\'" nil "text/plain")
+      ("application/rss+xml" "\\.rss\\'" nil "text/plain")
+      ("application/xhtml+xml" nil nil "text/html")))
+  "*Alist of content types, regexps, commands to view, and filters.
+Each element is a list which consists of the following data:
+
+1. Content type.
+
+2. Regexp matching a url or a file name.
+
+3. Method to view contents.  The following three types may be used:
+   a. Lisp function which takes the url to view as an argument.
+   b. (\"COMMAND\" [ARG...]) -- where \"COMMAND\" is the external command
+      and ARG's are the arguments passed to the command if any.  The
+      symbols `file' and `url' that appear in ARG's will be replaced
+      respectively with the name of a temporary file which contains
+      the contents and the string of the url to view.
+   c. nil which means to download the url into the local file.
+
+4. Content type that overrides the one specified by `1. Content type'.
+   Valid values include:
+   a. Lisp function that takes three arguments URL, CONTENT-TYPE, and
+      CHARSET, and returns a content type.
+   b. String that specifies a content type.
+   c. nil that means not to override the content type."
+  :group 'w3m
+  :type '(repeat
+	  (group
+	   :indent 2
+	   (string :format "Type: %v\n" :size 0)
+	   (radio :format "%{Regexp%}: %v" :extra-offset 8
+		  :sample-face underline
+		  (const :tag "Not specified" nil)
+		  (regexp :format "String: %v\n" :size 0))
+	   (radio :format "%{Viewer%}: %v" :extra-offset 8
+		  :sample-face underline
+		  (const :tag "Not specified" nil)
+		  (cons :tag "External viewer" :extra-offset 2
+			(string :format "Command: %v\n" :size 0)
+			(repeat :format "Arguments:\n%v%i\n" :extra-offset 2
+				(restricted-sexp
+				 :format "%v\n"
+				 :match-alternatives (stringp 'file 'url)
+				 :size 0)))
+		  (function :format "%t: %v\n" :size 0))
+	   (radio :format "%{Filter%}: %v" :extra-offset 8
+		  :sample-face underline
+		  (const :tag "Not specified" nil)
+		  (string :format "Equivalent type: %v\n" :size 0)
+		  (function :format "Function: %v\n" :size 0)))))
+
+;; FIXME: we need to rearrange the complicated and redundant relation of
+;; `w3m-encoding-type-alist', `w3m-decoder-alist', and `w3m-encoding-alist'.
+(defcustom w3m-encoding-type-alist
+  '(("\\.gz\\'" . "gzip")
+    ("\\.bz2?\\'" . "bzip"))
+  "*Alist of file suffixes and content encoding types."
+  :group 'w3m
+  :type '(repeat
+	  (cons :format "%v" :indent 14
+		(string :format "Regexp of Suffixes: %v\n" :size 0)
+		(string :format "Encoding Type: %v\n" :size 0))))
+
+(defcustom w3m-decoder-alist
+  `((gzip "gzip" ("-d"))	;; Don't use "gunzip" and "bunzip2"
+    (bzip "bzip2" ("-d"))	;; for broken OS and implementations.
+    (deflate
+      ,(if (not noninteractive)
+	   (let ((exec-path
+		  (let ((prefix (file-name-directory
+				 (directory-file-name
+				  (file-name-directory
+				   (w3m-which-command w3m-command))))))
+		    (list (expand-file-name "libexec/w3m" prefix)
+			  (expand-file-name "lib/w3m" prefix)))))
+	     (w3m-which-command "inflate")))
+      nil))
+  "Alist of encoding types, decoder commands, and arguments."
+  :group 'w3m
+  :type '(repeat
+	  (group :indent 4
+		 (radio :format "Encoding: %v"
+			(const :format "%v " gzip)
+			(const :format "%v " bzip)
+			(const deflate))
+		 (string :format "Command: %v\n" :size 0)
+		 (repeat :tag "Arguments" :extra-offset 2
+			 (string :format "%v\n" :size 0)))))
+
+(defcustom w3m-charset-coding-system-alist
+  (let ((rest
+	 '((us_ascii      . raw-text)
+	   (us-ascii      . raw-text)
+	   (gb2312	  . cn-gb-2312)
+	   (cn-gb	  . cn-gb-2312)
+	   (iso-2022-jp-2 . iso-2022-7bit-ss2)
+	   (iso-2022-jp-3 . iso-2022-7bit-ss2)
+	   (tis-620	  . tis620)
+	   (windows-874	  . tis-620)
+	   (cp874	  . tis-620)
+	   (x-ctext       . ctext)
+	   (unknown       . undecided)
+	   (x-unknown     . undecided)
+	   (windows-1250  . cp1250)
+	   (windows-1251  . cp1251)
+	   (windows-1252  . cp1252)
+	   (windows-1253  . cp1253)
+	   (windows-1254  . cp1254)
+	   (windows-1255  . cp1255)
+	   (windows-1256  . cp1256)
+	   (windows-1257  . cp1257)
+	   (windows-1258  . cp1258)
+	   (euc-jp	  . euc-japan)
+	   (shift-jis     . shift_jis)
+	   (shift_jis     . shift_jis)
+	   (sjis	  . shift_jis)
+	   (x-euc-jp      . euc-japan)
+	   (x-shift-jis   . shift_jis)
+	   (x-shift_jis   . shift_jis)
+	   (x-sjis	  . shift_jis)))
+	dest)
+    (while rest
+      (or (w3m-find-coding-system (car (car rest)))
+	  (setq dest (cons (car rest) dest)))
+      (setq rest (cdr rest)))
+    dest)
+  "Alist of MIME charsets and coding systems.
+Both charsets and coding systems must be symbols."
+  :group 'w3m
+  :type '(repeat (cons :format "%v" :indent 2
+		       (symbol :format "%t: %v\n" :size 0)
+		       (coding-system :format "%t: %v\n" :size 0))))
+
+(defcustom w3m-correct-charset-alist
+  '(("windows-874"  . "tis-620")
+    ("cp874"	    . "tis-620")
+    ("cp1250" . "windows-1250")
+    ("cp1251" . "windows-1251")
+    ("cp1252" . "windows-1252")
+    ("cp1253" . "windows-1253")
+    ("cp1254" . "windows-1254")
+    ("cp1255" . "windows-1255")
+    ("cp1256" . "windows-1256")
+    ("cp1257" . "windows-1257")
+    ("cp1258" . "windows-1258")
+    ("shift-jis"    . "shift_jis")
+    ("sjis"	    . "shift_jis")
+    ("x-euc-jp"     . "euc-jp")
+    ("x-shift-jis"  . "shift_jis")
+    ("x-shift_jis"  . "shift_jis")
+    ("x-sjis"	    . "shift_jis"))
+  "Alist of MIME charsets; strange ones and standard ones."
+  :group 'w3m
+  :type '(repeat (cons :format "%v" :indent 11
+		       (string :format "From: %v\n" :size 0)
+		       (string :format "To: %v\n" :size 0))))
+
+(defcustom w3m-horizontal-scroll-columns 10
+  "*Number of steps in columns used when scrolling a window horizontally."
+  :group 'w3m
+  :type '(integer :size 0))
+
+(defcustom w3m-horizontal-shift-columns 2
+  "*Number of steps in columns used when shifting a window horizontally.
+The term `shifting' means a fine level scrolling."
+  :group 'w3m
+  :type '(integer :size 0))
+
+(defcustom w3m-view-recenter 1
+  "Recenter window contents when going to an anchor.
+An integer is passed to `recenter', for instance the default 1
+    means put the anchor on the second line of the screen.
+t means `recenter' with no arguments, which puts it in the middle
+    of the screen.
+nil means don't recenter, let the display follow point in the
+    usual way."
+  :group 'w3m
+  ;; radio items in the same order as in the docstring, and `integer' first
+  ;; because it's the default
+  :type '(radio (integer :format "%{%t%}: %v\n" :value 1 :size 1)
+                (const :format "%t\n" t)
+                (const :format "%t\n" nil)))
+
+(defcustom w3m-use-form t
+  "*Non-nil means make it possible to use form extensions. (EXPERIMENTAL)"
+  :group 'w3m
+  :type 'boolean
+  :require 'w3m-form)
+
+(defcustom w3m-submit-form-safety-check nil
+  "Non-nil means ask you for confirmation when submitting a form."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-use-cookies nil
+  "*Non-nil means enable emacs-w3m to use cookies.  (EXPERIMENTAL)"
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-use-filter nil
+  "*Non-nil means use filter programs to convert web contents.
+See also `w3m-filter-rules'."
+  :group 'w3m
+  :type 'boolean
+  :require 'w3m-filter)
+
+(defcustom w3m-use-symbol
+  (when (and (featurep 'mule)
+	     (eq w3m-type 'w3m-m17n))
+    (if (eq w3m-output-coding-system 'utf-8)
+	(and (w3m-mule-unicode-p)
+	     (or (featurep 'xemacs)
+		 (< emacs-major-version 23))
+	     'w3m-device-on-window-system-p)
+      t))
+  "*Non-nil means replace symbols that the <_SYMBOL> tags lead into.
+It is meaningful only when the w3m-m17n command is used and (X)Emacs
+handles unicode charsets."
+  :group 'w3m
+  :type 'boolean
+  :require 'w3m-symbol)
+
+(defcustom w3m-edit-function 'find-file
+  "*Function used for editing local files.
+It is used when either `w3m-edit-current-url' or `w3m-edit-this-url'
+is invoked for local pages."
+  :group 'w3m
+  :type '(radio
+	  (const :tag "Edit it in the current window" find-file)
+	  (const :tag "Edit it in another window" find-file-other-window)
+	  (const :tag "Edit it in another frame" find-file-other-frame)
+	  (const :tag "View it in another window" view-file-other-window)
+	  (function :format "Other function: %v\n" :size 0
+		    :value view-file)))
+
+(defcustom w3m-edit-function-alist
+  '(("\\`[^?]+/hiki\\.cgi\\?" . hiki-edit-url))
+  "*Alist of functions used for editing pages.
+This option is referred to decide which function should be used to
+edit a specified page, when either `w3m-edit-current-url' or
+`w3m-edit-this-url' is invoked.  When no suitable function is found
+from this alist, `w3m-edit-function' is used."
+  :group 'w3m
+  :type '(repeat (cons :format "%v" :indent 3
+		       (regexp :format "URL: %v\n" :size 0)
+		       (function))))
+
+(defcustom w3m-url-local-directory-alist
+  (when (boundp 'yahtml-path-url-alist)
+    (mapcar
+     (lambda (pair)
+       (cons (cdr pair) (car pair)))
+     (symbol-value 'yahtml-path-url-alist)))
+  "*Alist of URLs and local directories.
+If directory names of a given URL and the car of an element are the
+same, emacs-w3m assumes that the file exists in the local directory
+where the cdr of an element points to.  The default value will be set
+to a value of the `yahtml-path-url-alist' variable which exchanged the
+car and the cdr in each element if it is available."
+  :type '(repeat
+	  (cons :format "%v" :indent 3
+		(string :format "URL: %v\n" :size 0)
+		(directory :format "%t: %v\n" :size 0)))
+  :group 'w3m)
+
+(defcustom w3m-track-mouse t
+  "*Whether to track the mouse and message the url under the mouse.
+See also `show-help-function' if you are using GNU Emacs.
+
+A tip for XEmacs users:
+
+You can also use the `balloon-help' feature by the
+`M-x balloon-help-mode' command with arg 1.  If the window manager
+decorates the balloon-help frame, and that is not to your taste, you
+may strip it off with the following directives:
+
+For ol[v]wm use this in .Xdefaults:
+   olvwm.NoDecor: balloon-help
+     or
+   olwm.MinimalDecor: balloon-help
+
+For fvwm version 1 use this in your .fvwmrc:
+   NoTitle balloon-help
+or
+   Style \"balloon-help\" NoTitle, NoHandles, BorderWidth 0
+
+For twm use this in your .twmrc:
+   NoTitle { \"balloon-help\" }
+
+See the balloon-help.el file for more information."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-show-decoded-url
+  '(("\\`http://\\(?:[^./?#]+\\.\\)*wikipedia\\.org/" . utf-8)
+    ("\\`http://\\(?:[^./?#]+\\.\\)*nikkei\\.co\\.jp/" . nil)
+    ("\\`http://\\(?:[^./?#]+\\.\\)*hatena\\.ne\\.jp/" . euc-jp)
+    ("\\`http://\\(?:[^./?#]+\\.\\)*ohmynews\\.co\\.jp/" . utf-8)
+    (t . t))
+  "*Non-nil means show decoded URIs in the echo area, the balloon, etc.
+This variable can take one of the following five kinds of forms:
+
+1. t
+  Decode URIs using the encoding guessed from the value of
+  `w3m-coding-system-priority-list'.
+
+2. Coding system
+  Decode URIs using this value.
+
+3. List of coding systems:
+  Decode URIs using the encoding assumed based on this list.
+
+4. Alist of predicates and forms described below:
+  Each element looks like the `(PREDICATE . ENCODING)' form.  PREDICATE
+  should be a regexp, a function or a Lisp form, and ENCODING should be
+  one of the forms described here excluding this form.  If PREDICATE is
+  a regexp, it will be tested whether it matches to the target url.
+  If it is a function, it will be called with the target url.  If it
+  is a Lisp form, it will be simply evaluated.  Elements are tested in
+  turn until the result of the test of the predicate is true and the
+  encoding which is associated to the predicate is used for decoding
+  URIs.
+
+5. nil
+  Don't decode URIs."
+  :group 'w3m
+  :type
+  '(choice
+    :format "%{%t%}: %[Value Menu%]\n  %v"
+    (coding-system :tag "Specify encoding" :format "Use this encoding: %v"
+		   :match (lambda (widget value)
+			    (w3m-find-coding-system value)))
+    (const :tag "Prefer the encoding of the current page"
+	   :format "%t: %{t%}\n" :sample-face widget-field-face
+	   t)
+    (group :tag "List of prefered encodings"
+	   :match (lambda (widget value)
+		    (and (car-safe value)
+			 (symbolp (car-safe value))))
+	   (repeat :format "List of prefered encodings:\n%v%i\n"
+		   :inline t
+		   (coding-system :tag "Encoding")))
+    (group :tag "Rules to select an encoding of URIs on the current page"
+	   :match (lambda (widget value) value)
+	   (repeat
+	    :format
+	    "Rules to select an encoding of URIs on the current page:\n%v%i\n"
+	    :inline t
+	    (cons
+	     :format "%v" :indent 2
+	     (choice
+	      :format "\n  %[Value Menu for the car%]\n    %v"
+	      (regexp :tag "Regexp matches the current page")
+	      (function :tag "Predicate checks for the current page")
+	      (sexp :tag "Expression checks for the current page"))
+	     (choice
+	      :format "%[Value Menu for the cdr%]\n    %v"
+	      (coding-system :tag "Specify encoding"
+			     :format "Use this encoding: %v"
+			     :match (lambda (widget value)
+				      (if (featurep 'xemacs)
+					  nil ;; ??
+					(w3m-find-coding-system value))))
+	      (const :tag "Prefer the encoding of the current page"
+		     :format "%t: %{t%}\n" :sample-face widget-field-face
+		     t)
+	      (group :tag "List of prefered encodings"
+		     (repeat :tag "List of prefered encodings"
+			     :inline t
+			     :extra-offset 4
+			     (coding-system :tag "Encoding")))
+	      (const :tag "Don't decode URIs"
+		     :format "%t: %{nil%}\n" :sample-face widget-field-face
+		     nil)))))
+    (const :tag "Don't decode URIs"
+	   :format "%t: %{nil%}\n" :sample-face widget-field-face
+	   nil)))
+
+(defcustom w3m-use-title-buffer-name nil
+  "Non-nil means use name of buffer included current title."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-use-japanese-menu
+  (and (equal "Japanese" w3m-language)
+       ;; Emacs 21, XEmacs 21.4 and SXEmacs don't seem to support
+       ;; non-ASCII text in the popup menu.
+       (not (featurep 'sxemacs))
+       (if (featurep 'xemacs)
+	   (or (> emacs-major-version 21)
+	       (and (= emacs-major-version 21)
+		    (>= emacs-minor-version 5)))
+	 (or (>= emacs-major-version 22)
+	     (featurep 'meadow))))
+  "Non-nil means use Japanese characters for Menu if possible."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-menu-on-forefront nil
+  "Non-nil means place the emacs-w3m menus on the forefront of the menu bar."
+  :group 'w3m
+  :type 'boolean
+  :set (lambda (symbol value)
+	 (prog1
+	     (custom-set-default symbol value)
+	   (unless noninteractive
+	     (w3m-menu-on-forefront value)))))
+
+(defcustom w3m-use-tab t
+  "Non-nil means make emacs-w3m a tab browser.
+It makes it possible to show all emacs-w3m buffers in a single window
+with the tabs line, and you can choose one by clicking a mouse on it.
+See also `w3m-use-tab-menubar'."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-add-tab-number nil
+  "Non-nil means put sequential number to a title on tab."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-use-tab-menubar t
+  "Non-nil means use the TAB pull-down menu in the menubar.
+It makes it possible to show all emacs-w3m buffers in a single window,
+and you can choose one by clicking a mouse on it.  This feature
+requires that Emacs has been built to be able to display multilingual
+text in the menubar if you often visit web sites written in non-ascii
+text.  See also `w3m-use-tab'."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-new-session-url "about://bookmark/"
+  "*Default url to be opened in a tab or a session which is created newly."
+  :group 'w3m
+  :type '(radio
+	  :convert-widget w3m-widget-type-convert-widget
+	  `((const :tag "About emacs-w3m" "about:")
+	    (const :tag "Blank page" "about:blank")
+	    (const :tag "Bookmark" "about://bookmark/")
+	    (const :tag ,(format "Home page (%s)" w3m-home-page)
+		   ,w3m-home-page)
+	    (string :format "URL: %v\n" :size 0
+		    :value "http://emacs-w3m.namazu.org"))))
+
+(defcustom w3m-make-new-session nil
+  "*Non-nil means making new emacs-w3m buffers when visiting new pages.
+If it is non-nil and there are already emacs-w3m buffers, the `w3m'
+command makes a new emacs-w3m buffer if a user specifies a url string
+in the minibuffer, and the `w3m-safe-view-this-url' command also makes
+a new buffer if a user invokes it in a buffer not being running the
+`w3m-mode'."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-use-favicon t
+  "*Non-nil means show favicon images if they are available.
+It will be set to nil automatically if ImageMagick's `convert' program
+does not support the ico format."
+  :get (lambda (symbol)
+	 (and (not noninteractive)
+	      (default-value symbol)
+	      (w3m-favicon-usable-p)))
+  :set (lambda (symbol value)
+	 (custom-set-default symbol (and (not noninteractive)
+					 value
+					 (w3m-favicon-usable-p))))
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-show-graphic-icons-in-mode-line t
+  "Non-nil means show graphic status indicators in the mode-line.
+If it is nil, also the favicon won't be shown in the mode-line even if
+`w3m-use-favicon' is non-nil."
+  :set (lambda (symbol value)
+	 (prog1
+	     (custom-set-default symbol value)
+	   (if (and (not noninteractive)
+		    ;; Make sure it is not the first time.
+		    (featurep 'w3m)
+		    (fboundp 'w3m-initialize-graphic-icons))
+	       (w3m-initialize-graphic-icons))))
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-show-graphic-icons-in-header-line t
+  "Non-nil means show graphic status indicators in the header-line.
+If it is nil, also the favicon won't be shown in the header-line even
+if `w3m-use-favicon' is non-nil.  This variable is currently
+meaningless under XEmacs."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-pop-up-windows t
+  "Non-nil means split the windows when a new emacs-w3m session is created.
+This variable is similar to `pop-up-windows' and quite overridden by
+`w3m-pop-up-frames' as if `pop-up-frames' influences.  Furthermore, if
+`w3m-use-tab' is non-nil or there is the buffers selection window (for
+the `w3m-select-buffer' feature), this variable is ignored when
+creating the second or more emacs-w3m session."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-pop-up-frames nil
+  "Non-nil means pop to a new frame up for an emacs-w3m session.
+This variable is similar to `pop-up-frames' and does override
+`w3m-pop-up-windows'.  If `w3m-use-tab' is non-nil or there is the
+buffers selection window (for the `w3m-select-buffer' feature), this
+variable is ignored when creating the second or more emacs-w3m session."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-view-this-url-new-session-in-background nil
+  "*Obsolete."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-new-session-in-background
+  w3m-view-this-url-new-session-in-background
+  "*Say whether not to focus on a new tab or a new session in target.
+It influences only when a new emacs-w3m buffer is created."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-popup-frame-parameters nil
+  "Alist of frame parameters used when creating a new emacs-w3m frame.
+It allows not only the alist form but also XEmacs' plist form."
+  :group 'w3m
+  :type '(choice (group :inline t :tag "Frame Parameters (Emacs)"
+			(repeat :inline t :tag "Frame Parameters (Emacs)"
+				(cons :format "%v" :indent 3
+				      (symbol :format "Parameter: %v\n"
+					      :size 0)
+				      (sexp :format "%t: %v\n" :size 0))))
+		 (group :inline t :tag "Frame Plist (XEmacs)"
+			(repeat :inline t :tag "Frame Plist (XEmacs)"
+				(group :indent 2 :inline t
+				       (symbol :format "Property: %v\n"
+					       :size 0)
+				       (sexp :format "%t: %v\n" :size 0))))))
+
+(defcustom w3m-auto-show t
+  "*Non-nil means provide the ability to horizontally scroll the window.
+Automatic horizontal scrolling is made when the point gets away from
+both ends of the window, but nothing occurs if `truncate-lines' is set
+to nil.
+
+This feature works with the specially made program in emacs-w3m; usual
+`auto-hscroll-mode', `automatic-hscrolling', `auto-show-mode' or
+`hscroll-mode' will all be invalidated in emacs-w3m buffers."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-horizontal-scroll-division 4
+  "*Integer used by the program making the point certainly visible.
+The cursor definitely does not go missing even when it has been driven
+out of the window while wandering around anchors and forms in an
+emacs-w3m buffer.
+
+Suppose that the value of this variable is N.  When the point is
+outside the left of the window, emacs-w3m scrolls the window so that
+the point may be displayed on the position within 1/N of the width of
+the window from the left.  Similarly, when the point is outside the
+right of the window, emacs-w3m scrolls the window so that the point
+may be displayed on the position of 1/N of the width of the window
+from the right.
+
+This feature doesn't work if `w3m-auto-show' is nil.  The value must
+be a larger integer than 1."
+  :group 'w3m
+  :type '(integer :size 0)
+  :set (lambda (symbol value)
+	 (custom-set-default symbol (if (and (integerp value) (> value 1))
+					value
+				      4))))
+
+(defcustom w3m-show-error-information t
+  "*Non-nil means show an error information as a web page.
+Page is made when the foreign server doesn't respond to a request to
+retrieve data."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-use-refresh t
+  "*Non-nil means honor the REFRESH attribute in META tags.
+Emacs-w3m arbitrarily takes you to a url specified by that attribute.
+Note that they may be malicious traps."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-mbconv-command "mbconv"
+  "*Name of the \"mbconv\" command provided by the \"libmoe\" package.
+The \"libmoe\" package is used when you use the w3mmee command instead
+of the w3m command.  See also `w3m-command'."
+  :group 'w3m
+  :type '(string :size 0))
+
+(defcustom w3m-local-find-file-regexps
+  (cons nil
+	(concat "\\."
+		(regexp-opt (append '("htm"
+				      "html"
+				      "shtm"
+				      "shtml"
+				      "xhtm"
+				      "xhtml"
+				      "txt")
+				    (and (w3m-image-type-available-p 'jpeg)
+					 '("jpeg" "jpg"))
+				    (and (w3m-image-type-available-p 'gif)
+					 '("gif"))
+				    (and (w3m-image-type-available-p 'png)
+					 '("png"))
+				    (and (w3m-image-type-available-p 'xbm)
+					 '("xbm"))
+				    (and (w3m-image-type-available-p 'xpm)
+					 '("xpm")))
+			    t) ;; with surrounding parens (for old Emacsen).
+		"\\'"))
+  "*Cons of two regexps matching and not matching with local file names.
+If a url of the `file:' scheme in which you entered matches the first
+form and does not match the latter form, it will be opened by the
+function specified by the `w3m-local-find-file-function' variable.
+Nil for the regexp matches any file names.
+
+For instance, the value `(nil . \"\\\\.[sx]?html?\\\\'\")' allows
+\"file:///some/where/w3m.el\", not \"file:///any/where/index.html\", to
+open by the function specified by `w3m-local-find-file-function'.  The
+latter will be opened as a normal web page.  Furthermore, if you would
+like to view some types of contents in the local system using the
+viewers specified by the `w3m-content-type-alist' variable, you can
+add regexps matching those file names to the second element of this
+variable.  For example:
+
+\(setq w3m-local-find-file-regexps
+      '(nil . \"\\\\.\\\\(?:[sx]?html?\\\\|dvi\\\\|ps\\\\|pdf\\\\)\\\\'\"))
+
+It is effective only when the `w3m-local-find-file-function' variable
+is set properly."
+  :group 'w3m
+  :type '(cons (radio :tag "Match"
+		      (const :format "All " nil)
+		      (regexp :format "%t: %v\n" :size 0))
+	       (radio :tag "Nomatch"
+		      (const :format "All " nil)
+		      (regexp :format "%t: %v\n" :size 0))))
+
+(defcustom w3m-local-find-file-function
+  '(if (w3m-popup-frame-p)
+       'find-file-other-frame
+     'find-file-other-window)
+  "*Function used to open local files.
+If a url of the `file:' scheme in which you entered agrees with the
+rule of the `w3m-local-find-file-regexps' variable (which see), it is
+used to open the file.
+
+Function should take one argument, the string naming the local file.
+It can also be any Lisp form returning a function.  Set this to nil if
+you want to always use emacs-w3m to see local files."
+  :group 'w3m
+  :type '(sexp :size 0))
+
+(defcustom w3m-local-directory-view-method 'w3m-cgi
+  "*Symbol of the method to view a local directory tree.
+The valid values include `w3m-cgi' using the CGI program specified by
+the `w3m-dirlist-cgi-program' variable (which see), and `w3m-dtree'
+using the w3m-dtree Lisp module."
+  :group 'w3m
+  :type '(radio (const :format "Dirlist CGI  " w3m-cgi)
+		(const :tag "Directory tree" w3m-dtree)))
+
+(defcustom w3m-dirlist-cgi-program
+  (cond ((eq system-type 'windows-nt)
+	 "c:/usr/local/lib/w3m/dirlist.cgi")
+	((memq system-type '(OS/2 emx))
+	 (expand-file-name "dirlist.cmd" (getenv "W3M_LIB_DIR")))
+	(t nil))
+  "*Name of the CGI program to list a local directory.
+If it is nil, the dirlist.cgi module of the w3m command will be used."
+  :group 'w3m
+  :type `(radio
+	  (const :tag "w3m internal CGI" nil)
+	  (file :format "path of 'dirlist.cgi': %v\n"
+		:size 0
+		:value ,(if (not noninteractive)
+			    (expand-file-name
+			     (concat "../lib/"
+				     (file-name-nondirectory w3m-command)
+				     "/dirlist.cgi")
+			     (file-name-directory
+			      (w3m-which-command w3m-command)))))))
+
+(defcustom w3m-add-referer
+  (if (boundp 'w3m-add-referer-regexps)
+      (symbol-value 'w3m-add-referer-regexps)
+    (cons "\\`http:" "\\`http://\\(?:localhost\\|127\\.0\\.0\\.1\\)/"))
+  "*Rule of sending referers.
+There are five choices as the valid values of this option.
+
+\(1\) nil: this means that emacs-w3m never send referers.
+\(2\) t: this means that emacs-w3m always send referers.
+\(3\) lambda: this means that emacs-w3m send referers only when both
+    the current page and the target page are provided by the same
+    server.
+\(4\) a cons cell keeping two regular expressions: this means that
+    emacs-w3m send referers when the url of the current page matches
+    the first regular expression and does not match the second regular
+    expression.  Nil for the regexp matches any url.
+\(5\) a function: emacs-w3m send referers when this function which has
+    two arguments, URL and REFERER, returns non-nil.
+
+If you become nervous about leak of your private WEB browsing history,
+set `nil' or `lambda' to this option.  When your computer belongs to a
+secret network, you may set a pair of regular expressions to inhibit
+sending referers which will disclose your private informations, as
+follows:
+
+\(setq w3m-add-referer
+      '(\"\\\\`http:\"
+	. \"\\\\`http://\\\\(?:[^./]+\\\\.\\\\)*example\\\\.net/\")\)
+"
+  :group 'w3m
+  :type '(choice
+	  (const :tag "Never send referers" nil)
+	  (const :tag "Always send referers" t)
+	  (const :tag "Send referers when accessing the same server" lambda)
+	  (cons :tag "Send referers when URI matches:"
+		(list :inline t :format "%v"
+		      (radio :indent 2 :sample-face underline
+			     :tag "Allow"
+			     (regexp :format "%t: %v\n" :size 0)
+			     (const :tag "Don't allow all" nil))
+		      (radio :indent 2 :sample-face underline
+			     :tag "Don't allow"
+			     (regexp :format "%t: %v\n" :size 0)
+			     (const :tag "Allow all" nil))))
+	  (function :tag "Send referers when your function returns non-nil")))
+
+(defcustom w3m-touch-command (w3m-which-command "touch")
+  "*Name of the executable file of the touch command.
+Note that the command is required to be able to modify file's
+timestamp with the `-t' option."
+  :group 'w3m
+  :type '(string :size 0))
+
+(defcustom w3m-puny-utf-16be
+  (cond
+   ((w3m-find-coding-system 'utf-16-be-no-signature)
+    'utf-16-be-no-signature)
+   ((w3m-find-coding-system 'utf-16be)
+    'utf-16be)
+   (t nil))
+  "*Coding system for PUNY coding. if nil, don't use PUNY code."
+  :group 'w3m
+  :type '(radio (coding-system :tag "UTF-16BE without BOM")
+		(const "Don't use" nil)))
+
+(defcustom w3m-uri-replace-alist
+  '(("\\`gg:" w3m-search-uri-replace "google")
+    ("\\`ggg:" w3m-search-uri-replace "google groups")
+    ("\\`ya:" w3m-search-uri-replace "yahoo")
+    ("\\`al:" w3m-search-uri-replace "altavista")
+    ("\\`bts:" w3m-search-uri-replace "debian-bts")
+    ("\\`dpkg:" w3m-search-uri-replace "debian-pkg")
+    ("\\`archie:" w3m-search-uri-replace "iij-archie")
+    ("\\`alc:"  w3m-search-uri-replace "alc")
+    ("\\`urn:ietf:rfc:\\([0-9]+\\)" w3m-pattern-uri-replace
+     "http://www.ietf.org/rfc/rfc\\1.txt"))
+  "*Alist of regexps matching URIs, and some types of replacements.
+It can be used universally to replace URI strings in the local rule to
+the valid forms in the Internet.
+
+Each element looks like the `(REGEXP FUNCTION OPTIONS...)' form.
+FUNCTION takes one or more arguments, a uri and OPTIONS.  You can use
+the grouping constructs \"\\\\(...\\\\)\" in REGEXP, and they can be
+referred by the \"\\N\" forms in a replacement (which is one of OPTIONS).
+
+Here are some predefined functions which can be used for those ways:
+
+`w3m-pattern-uri-replace'
+    Replace a URI using PATTERN (which is just an OPTION).  It is
+    allowed that PATTERN contains the \"\\N\" forms in the same manner
+    of `replace-match'.
+
+`w3m-search-uri-replace'
+    Generate the valid forms to query words to some specified search
+    engines.  For example, the element
+
+    (\"\\\\`gg:\" w3m-search-uri-replace \"google\")
+
+    makes it possible to replace the URI \"gg:emacs\" to the form to
+    query the word \"emacs\" to the Google site.\
+"
+  :group 'w3m
+  :type '(repeat
+	  :convert-widget w3m-widget-type-convert-widget
+	  `((choice
+	     :format "%[Value Menu%] %v" :tag "Replacing URI with"
+	     (list :indent 4 :tag "Replacement Using Pattern"
+		   (regexp :format "%t: %v\n" :size 0)
+		   (function-item :format "" w3m-pattern-uri-replace)
+		   (string :format "Pattern: %v\n" :size 0))
+	     (list :format "%t:\n%v" :indent 4 :tag "Quick Search"
+		   (regexp :format "Prefix URI %t: %v\n"
+			   :size 0 :value "")
+		   (function-item :format "" w3m-search-uri-replace)
+		   (string :format "Quick Search Engine: %v\n"
+			   :size 0 :value ""))
+	     ,@(progn
+		 (require 'w3m-search)
+		 (mapcar
+		  (lambda (elem)
+		    (let* ((engine (car elem))
+			   (prefix (mapconcat 'identity
+					      (split-string (downcase engine))
+					      "-")))
+		      `(list
+			:format "Quick Search:\n%v"
+			:indent 4
+			:tag ,(concat "Quick Search: " prefix)
+			(regexp :tag "Prefix URL Regexp"
+				,(concat "\\`" (regexp-quote prefix) ":"))
+			(function-item :format "" w3m-search-uri-replace)
+			(string :tag "Quick Search Engine" ,engine))))
+		  w3m-search-engine-alist))
+	     (list :indent 4 :tag "User Defined Function"
+		   (regexp :format "%t: %v\n" :size 0)
+		   (function
+		    :format "%t: %v\n" :size 0
+		    ;; Fix a bug in Emacs versions prior to 22.
+		    :value-to-internal
+		    (lambda (widget value)
+		      (if (stringp value)
+			  (if (string-match "\\`\".*\"\\'" value)
+			      (substring value 1 -1)
+			    value)
+			(prin1-to-string value))))
+		   (repeat :extra-offset 2 :tag "Options"
+			   (sexp :format "%t: %v\n" :size 0)))))))
+
+(defcustom w3m-relationship-estimate-rules
+  `((w3m-relationship-simple-estimate
+     "\\`http://\\(?:www\\|blogsearch\\|groups\\|news\\|images\\)\
+\\.google\\.[^/]+/\\(?:\\(?:blog\\|code\\)?search\\|groups\\|news\\|images\
+\\|cse\\?cx=\\|custom\\?\\(?:q\\|hl\\)=\\)"
+     ,(concat "<a[^>]+?href=" w3m-html-string-regexp "[^>]*>[\t\n ]*"
+	      "\\(?:\\(?:</?span[^>]*>[\t\n ]*\\)*<span[^>]+>Next</span>"
+	      "\\|\\(?:</?span[^>]*>[\t\n ]*\\)*"
+	      "<b>\\(?:$B2<0lJG(B\\|$B<!$X(B\\|$(C4Y@=(B\\)</b>\\)")
+     ,(concat "<a[^>]+?href=" w3m-html-string-regexp "[^>]*>[\t\n ]*"
+	      "\\(?:\\(?:</?span[^>]*>[\t\n ]*\\)*<span[^>]+>Previous</span>"
+	      "\\|\\(?:</?span[^>]*>[\t\n ]*\\)*"
+	      "<b>\\(?:$B>e0lJG(B\\|$BA0$X(B\\|$(C@L@|(B\\)</b>\\)")
+     nil nil)
+    (w3m-relationship-simple-estimate
+     "\\`http://www\\.google\\.[^/]+/gwt/n\\?u="
+     ,(concat "<a[^>]+?href=" w3m-html-string-regexp
+	      "[ \t\n]+accesskey=\"3\">")
+     ,(concat "<a[^>]+?href=" w3m-html-string-regexp
+	      "[ \t\n]+accesskey=\"1\">")
+     nil nil)
+    (w3m-relationship-simple-estimate
+     "\\`http://beta\\.search\\.yahoo\\.co\\.jp/"
+     ,(concat "<a href=" w3m-html-string-regexp
+	      "><img src=http://i\\.yimg\\.jp/images/common/ar_next\\.gif")
+     ,(concat "<a href=" w3m-html-string-regexp
+	      "><img src=http://i\\.yimg\\.jp/images/common/ar_prev\\.gif")
+     nil nil)
+    (w3m-relationship-simple-estimate
+     "\\`http://www\\.zdnet\\.co\\.jp/news/"
+     ,(concat "<a href=" w3m-html-string-regexp ">$B<!$N%Z!<%8(B</a>")
+     ,(concat "<a href=" w3m-html-string-regexp ">$BA0$N%Z!<%8(B</a>")
+     nil nil)
+    (w3m-relationship-simple-estimate
+     "\\`http://freshmeat\\.net/\\(search\\|browse\\)/"
+     ,(concat "<A HREF=" w3m-html-string-regexp ">\\[&raquo;\\]</A>")
+     ,(concat "<A HREF=" w3m-html-string-regexp ">\\[&laquo;\\]</A>")
+     nil nil)
+    (w3m-relationship-oddmuse-estimate)
+    (w3m-relationship-magicpoint-estimate)
+    (w3m-relationship-slashdot-estimate)
+    (w3m-relationship-alc-estimate))
+  "*Rules to estimate relationships between a retrieved page and others."
+  :group 'w3m
+  :type '(repeat
+	  (choice
+	   :format "%[Value Menu%] %v"
+	   (list :tag "Estimate relationships from anchors matching"
+		 :indent 1
+		 (const :format "Function: %v\n"
+			w3m-relationship-simple-estimate)
+		 (regexp :tag "URL")
+		 (regexp :tag "Next")
+		 (regexp :tag "Prev")
+		 (radio :format "Start: %v"
+			(const :format "%v " nil) regexp)
+		 (radio :format "Contents: %v"
+			(const :format "%v " nil) regexp))
+	   (list :tag "Estimate with a user defined function"
+		 :indent 1
+		 function
+		 (repeat :tag "Args" :extra-offset 1 (sexp :format "%v"))))))
+
+(defcustom w3m-enable-google-feeling-lucky t
+  "Non-nil enables you to enter any words as well as a url when prompted.
+In that case, emacs-w3m uses Google to search for the words."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-google-feeling-lucky-charset
+  (cond
+   ((or (featurep 'un-define) (fboundp 'utf-translate-cjk-mode))
+    "UTF-8")
+   ((equal "Japanese" w3m-language)
+    "SHIFT_JIS")
+   ((w3m-find-coding-system 'utf-8)
+    "UTF-8")
+   (t "US-ASCII"))
+  "*Character set for \"I'm Feeling Lucky on Google\"."
+  :group 'w3m
+  :type '(string :size 0))
+
+(defconst w3m-entity-table
+  (let ((table (make-hash-table :test 'equal)))
+    (dolist (entity '(("nbsp" . " ")
+		      ("gt" . ">")
+		      ("lt" . "<")
+		      ("amp" . "&")
+		      ("quot" . "\"")
+		      ("apos" . "'")
+		      ("circ" . "^")
+		      ("tilde" . "~")))
+      (puthash (car entity) (cdr entity) table))
+    (dolist (entity
+	     '(;("nbsp" . 160)
+	       ("iexcl" . 161) ("cent" . 162) ("pound" . 163) ("curren" . 164)
+	       ("yen" . 165) ("brvbar" . 166) ("sect" . 167) ("uml" . 168)
+	       ("copy" . 169) ("ordf" . 170) ("laquo" . 171) ("not" . 172)
+	       ("shy" . 173) ("reg" . 174) ("macr" . 175) ("deg" . 176)
+	       ("plusmn" . 177) ("sup2" . 178) ("sup3" . 179) ("acute" . 180)
+	       ("micro" . 181) ("para" . 182) ("middot" . 183) ("cedil" . 184)
+	       ("sup1" . 185) ("ordm" . 186) ("raquo" . 187) ("frac14" . 188)
+	       ("frac12" . 189) ("frac34" . 190) ("iquest" . 191)
+	       ("Agrave" . 192) ("Aacute" . 193) ("Acirc" . 194)
+	       ("Atilde" . 195) ("Auml" . 196) ("Aring" . 197) ("AElig" . 198)
+	       ("Ccedil" . 199) ("Egrave" . 200) ("Eacute" . 201)
+	       ("Ecirc" . 202) ("Euml" . 203) ("Igrave" . 204) ("Iacute" . 205)
+	       ("Icirc" . 206) ("Iuml" . 207) ("ETH"  . 208) ("Ntilde" . 209)
+	       ("Ograve" . 210) ("Oacute" . 211) ("Ocirc" . 212)
+	       ("Otilde" . 213) ("Ouml" . 214) ("times" . 215) ("Oslash" . 216)
+	       ("Ugrave" . 217) ("Uacute" . 218) ("Ucirc" . 219) ("Uuml" . 220)
+	       ("Yacute" . 221) ("THORN" . 222) ("szlig" . 223) ("agrave" . 224)
+	       ("aacute" . 225) ("acirc" . 226) ("atilde" . 227) ("auml" . 228)
+	       ("aring" . 229) ("aelig" . 230) ("ccedil" . 231) ("egrave" . 232)
+	       ("eacute" . 233) ("ecirc" . 234) ("euml" . 235) ("igrave" . 236)
+	       ("iacute" . 237) ("icirc" . 238) ("iuml" . 239) ("eth" . 240)
+	       ("ntilde" . 241) ("ograve" . 242) ("oacute" . 243)
+	       ("ocirc" . 244) ("otilde" . 245) ("ouml" . 246) ("divide" . 247)
+	       ("oslash" . 248) ("ugrave" . 249) ("uacute" . 250)
+	       ("ucirc" . 251) ("uuml" . 252) ("yacute" . 253) ("thorn" . 254)
+	       ("yuml" . 255)))
+      (puthash (car entity)
+	       (char-to-string (make-char 'latin-iso8859-1 (cdr entity)))
+	       table))
+    (dolist (entity
+	     '(("Alpha" . 65) ("Beta" . 66) ("Gamma" . 67) ("Delta" . 68)
+	       ("Epsilon" . 69) ("Zeta" . 70) ("Eta" . 71) ("Theta" . 72)
+	       ("Iota" . 73) ("Kappa" . 74) ("Lambda" . 75) ("Mu" . 76)
+	       ("Nu" . 77) ("Xi" . 78) ("Omicron" . 79) ("Pi" . 80)
+	       ("Rho" . 81)	; No ("Sigmaf" . 82)
+	       ("Sigma" . 83) ("Tau" . 84) ("Upsilon" . 85) ("Phi" . 86)
+	       ("Chi" . 87) ("Psi" . 88) ("Omega" . 89)
+	       ("alpha" . 97) ("beta" . 98) ("gamma" . 99) ("delta" . 100)
+	       ("epsilon" . 101) ("zeta" . 102) ("eta" . 103) ("theta" . 104)
+	       ("iota" . 105) ("kappa" . 106) ("lambda" . 107) ("mu" . 108)
+	       ("nu" . 109) ("xi" . 110) ("omicron" . 111) ("pi" . 112)
+	       ("rho" . 113) ("sigmaf" . 114) ("sigma" . 115) ("tau" . 116)
+	       ("upsilon" . 117) ("phi" . 118) ("chi" . 119) ("psi" . 120)
+	       ("omega" . 121)))
+      (puthash (car entity)
+	       (char-to-string (make-char 'greek-iso8859-7 (cdr entity)))
+	       table))
+    (when (w3m-mule-unicode-p)
+      (let ((latin-extended-a
+	     '((32 . (("OElig" . 114) ("oelig" . 115)))
+	       (33 . (("Scaron" . 32) ("scaron" . 33) ("Yuml" . 56)))))
+	    (latin-extended-b '((33 . (("fnof" . 82)))))
+	    ;;(spacing-modifier-letters '(36 . (("circ" . 120) ("tilde" . 124))))
+	    (general-punctuation
+	     '((114 .
+		    (("ensp" . 98) ("emsp" . 99) ("thinsp" . 105) ("zwnj" . 108)
+		     ("zwj" . 109) ("lrm" . 110) ("rlm" . 111) ("ndash" . 115)
+		     ("mdash" . 116) ("lsquo" . 120) ("rsquo" . 121)
+		     ("sbquo" . 122) ("ldquo" . 124) ("rdquo" . 125)
+		     ("bdquo" . 126)))
+	       (115 .
+		    (("dagger" . 32) ("Dagger" . 33) ("permil" . 48)
+		     ("lsaquo" . 57) ("rsaquo" . 58)
+		     ("bull" . 34) ("hellip" . 38) ("prime" . 50) ("Prime" . 51)
+		     ("oline" . 62) ("frasl" . 68)))
+	       (116 .
+		    (("euro" . 76)))))
+	    (greek '((39 . (("thetasym" . 81) ("upsih" . 82) ("piv" . 86)))))
+	    (letterlike-symbols
+	     '((117 .
+		    (("weierp" . 88) ("image" . 81) ("real" . 92)
+		     ("trade" . 98) ("alefsym" . 117)))))
+	    (arrows
+	     '((118 .
+		    (("larr" . 112) ("uarr" . 113) ("rarr" . 114) ("darr" . 115)
+		     ("harr" . 116)))
+	       (119 .
+		    (("crarr" . 53) ("lArr" . 80) ("uArr" . 81) ("rArr" . 81)
+		     ("dArr" . 83) ("hArr" . 84)))))
+	    (mathematical-operators
+	     '((120 .
+		    (("forall" . 32) ("part" . 34) ("exist" . 35) ("empty" . 37)
+		     ("nabla" . 39) ("isin" . 40) ("notin" . 41) ("ni" . 43)
+		     ("prod" . 47) ("sum" . 49) ("minus" . 50) ("lowast" . 55)
+		     ("radic" . 58) ("prop" . 61) ("infin" . 62) ("ang" . 64)
+		     ("and" . 71) ("or" . 72) ("cap" . 73) ("cup" . 74)
+		     ("int" . 75) ("there4" . 84) ("sim" . 92) ("cong" . 101)
+		     ("asymp" . 104)))
+	       (121 .
+		    (("ne" . 32) ("equiv" . 33) ("le" . 36) ("ge" . 37)
+		     ("sub" . 66) ("sup" . 67) ("nsub" . 68) ("sube" . 70)
+		     ("supe" . 71) ("oplus" . 85) ("otimes" . 87)
+		     ("perp" . 101)))
+	       (122 . (("sdot" . 37)))))
+	    (miscellaneous-technical
+	     '((122 . (("lceil" . 104) ("rceil" . 105) ("lfloor" . 106)
+		       ("rfloor" . 107)))
+	       (123 . (("lang" . 41) ("rang" . 42)))))
+	    (suit
+	     '(("loz" . (34 . 42)) ("spades" . (35 . 96)) ("clubs" . (35 . 99))
+	       ("hearts" . (35 . 101)) ("diams" . (35 . 102)))))
+	(dolist (entities `(,@latin-extended-a
+			    ,@latin-extended-b
+			    ,@general-punctuation
+			    ,@greek ,@letterlike-symbols ,@arrows
+			    ,@mathematical-operators
+			    ,@miscellaneous-technical))
+	  (let ((code1 (car entities)))
+	    (dolist (entity (cdr entities))
+	      (puthash (car entity)
+		       (char-to-string
+			(make-char 'mule-unicode-0100-24ff
+				   code1 (cdr entity)))
+		       table))))
+	(dolist (entity suit)
+	  (puthash (car entity)
+		   (char-to-string
+		    (make-char 'mule-unicode-2500-33ff
+			       (car (cdr entity)) (cdr (cdr entity))))
+		   table))))
+    table)
+  "Table of html character entities and values.")
+
+(defvar w3m-extra-numeric-character-reference
+  (mapcar
+   (lambda (item)
+     (cons (car item) (string (w3m-ucs-to-char (cdr item)))))
+   '((#x80 . #x20AC) (#x82 . #x201A) (#x83 . #x0192) (#x84 . #x201E)
+     (#x85 . #x2026) (#x86 . #x2020) (#x87 . #x2021) (#x88 . #x02C6)
+     (#x89 . #x2030) (#x8A . #x0160) (#x8B . #x2039) (#x8C . #x0152)
+     (#x8E . #x017D) (#x91 . #x2018) (#x92 . #x2019) (#x93 . #x201C)
+     (#x94 . #x201D) (#x95 . #x2022) (#x96 . #x2013) (#x97 . #x2014)
+     (#x98 . #x02DC) (#x99 . #x2122) (#x9A . #x0161) (#x9B . #x203A)
+     (#x9C . #x0153) (#x9E . #x017E) (#x9F . #x0178)))
+  "*Alist of (numeric . string) pairs for numeric character reference
+other than ISO 10646.")
+
+(defconst w3m-entity-reverse-table
+  (let ((table (make-hash-table :test 'equal)))
+    (maphash (lambda (key val) (puthash val key table))
+	     w3m-entity-table)
+    table)
+  "Revision table of html character entities and values.")
+
+(defconst w3m-entity-regexp
+  (let (buf)
+    (maphash (lambda (key val) (push key buf))
+	     w3m-entity-table)
+    (concat "&\\("
+	    (let ((max-specpdl-size (* 1024 1024))) ;; For old Emacsen.
+	      (regexp-opt buf))
+	    "\\|#\\(?:[xX][0-9a-fA-F]+\\|[0-9]+\\)\\)\\(\\'\\|[^0-9a-zA-Z]\\)"))
+  "Regexp matching html character entities.")
+
+(defconst w3m-encoding-alist
+  (eval-when-compile
+    (apply 'nconc
+	   (mapcar (lambda (elem)
+		     (mapcar (lambda (x) (cons x (car elem)))
+			     (cdr elem)))
+		   '((gzip . ("gzip" "x-gzip" "compress" "x-compress"))
+		     (bzip . ("x-bzip" "bzip" "bzip2"))
+		     (deflate . ("x-deflate" "deflate"))))))
+  "Alist of content encoding types and decoder symbols.
+Decoders are specified by `w3m-decoder-alist' (which see).")
+
+(defconst w3m-emacs-w3m-icon "\
+R0lGODlhUwAOAPIAAFUq/H8AvwC/AP8AAAAAv79/Af///wAAACH/C05FVFNDQVBFMi4wAwEA
+AAAh+QQAIQD/ACwAAAAAUwAOAAADxmi63P4wykmrvXiWvbP/4NIpY2ieUFlSQRssrRG7DGET
+DQEAzL5PAoEiSCo0RoOBIblkKmKyV/RFsymsBqzh99vyvBKiYbQaG5vKZFoZfUqhUO0C2613
+gUJzsVhy+tkuNG2DWjd0Xw0+iEGMYgJGHWVjbH8KTlAMcThZm1iHEYwakKMOlU2WgFKZUp6d
+m3YKdwtiEmRnfZS5qG5Ub6yuVzg+C1xfAES0EbZ7u6fOTlOqrcFzxcSyjRXLqGoLptAo4eLj
+5OUNCQAh+QQAIQD/ACwAAAAAUwAOAAADImi63P4wykmrvTjrzbv/YCiOZGmeaKqubOu+cCzP
+dG3fagIAIfkEACEA/wAsAAAAAFMADgAAAz5outz+MMpJq7046827/2AYBWSwkAZaimyFpiZs
+rm0tvXj82rxT0rmekLE7xYZIRVF5TA5XQWfyJ61ar9hsAgAh+QQAIQD/ACwAAAAAUwAOAAAD
+Vmi63P4wykmrvTjrzbv/YBgFZLCQBloyREs0rxiiqVmba6voBi//tKCN5lsUf7OSUEGM9VxO
+ZNLR3MV4R6mHxqg+rVrpavktZ8MgpfHKNqLf8Lh8XkkAACH5BAAhAP8ALAAAAABTAA4AAANw
+aLrc/jDKSau9OOvNu/9gGAVksJAGWjJESzQEADCyLGJoaurm2io/Q9BgsxFnx5slx9zlhoug
+cWpULktNxfMFdHGrtJq1kmNsu2jhFznulE+7oHytoLY1q6w6/RPXZ1N3F1hRXHNRRWx+goyN
+jo+QCQAh+QQAIQD/ACwAAAAAUwAOAAADhWi63P4wykmrvTjrzbv/YBgFZLCQBloyREs0BAAw
+sjwJgoKHaGr6plVLMTQUDTYbcraU7ESKnvTXOy6KyqzyloMCV77o7+jCMhu1M2797EJ7jOrL
+OC+aI2tvBX4a1/8KWoFnC096EitTRIB0S2dJTAA7hocjYI2YZJALNQxslaChoqOkDgkAIfkE
+ACEA/wAsAAAAAFMADgAAA6doutz+MMpJq714lr2z/+DSKWNonlBZUkEbLK0RuwxhEw0BAMy+
+TwKBIkgqNFaSmOy1fNFsCqhBavj9qjyshGgYIZERpZippC6k1/QVKOwa3UVw2DVWlHHRG37d
+8y2CgFwCRh1gbxVKDHd5jFN7WQ+AGoSUJokwTFKajwpqDlwSXm9yLDNkmXibWJBWWQBEoBGi
+RSB0Z6m4Z60Lfn+SFLMowsPExcbFCQAh+QQAIQD/ACwAAAAAUwAOAAADxmi63P4wykmrvXiW
+vbP/4NIpY2ieUFlSQRssrRG7DGETDQEAzL5PAoEiSCo0RoOBIblkKmKyV/RFsymsBqzh99vy
+vBKiYbQaG5vKZFoZfUqhUO0C2613gUJzsVhy+tkuNG2DWjd0Xw0+iEGMYgJGHWVjbH8KTlAM
+cThZm1iHEYwakKMOlU2WgFKZUp6dm3YKdwtiEmRnfZS5qG5Ub6yuVzg+C1xfAES0EbZ7u6fO
+TlOqrcFzxcSyjRXLqGoLptAo4eLj5OUNCQA7"
+  "A small image to be displayed in the about: page.
+It is encoded in the optimized interlaced endlessly animated gif format
+and base64.  Emacs can display only the 1st frame of an animation, but
+XEmacs can fully display it with the help of the gifsicle program.")
+
+(defcustom w3m-process-modeline-format " loaded: %s"
+  "*Format used when displaying the progress of the external w3m process.
+It shows a percentage of the data loaded from the web server."
+  :group 'w3m
+  :type '(choice (string :tag "Format") function))
+
+(defcustom w3m-ignored-image-url-regexp nil
+  "*Regexp matching image urls which you don't want to view.
+It is effective even if `w3m-display-inline-images' is non-nil.
+For instance, the value \"^http://www\\.google\\.com/\" conceals
+Google's logo and navigation images, but display YouTube's
+thumbnail."
+  :group 'w3m
+  :type '(radio (const :format "Accept any image\n" nil)
+		(regexp :format "URL regexp: %v\n" :size 0)))
+
+(defcustom w3m-refresh-minimum-interval 60
+  "*Minimum seconds to wait for refresh, when visiting a page by
+history-back or history-next."
+  :group 'w3m
+  :type '(integer :size 0))
+
+(defvar w3m-modeline-process-status-on "<PRC>"
+  "Modeline control for displaying the status when the process is running.
+The value will be modified for displaying the graphic icon.")
+
+(defvar w3m-modeline-image-status-on "[IMG]"
+  "Modeline control to display the status when inline images are turned on.
+The value will be modified for displaying the graphic icon.")
+
+(defvar w3m-modeline-status-off "[ - ]"
+  "Modeline control for displaying the status for the default.
+The value will be modified for displaying the graphic icon.")
+
+(defvar w3m-modeline-ssl-image-status-on "[IMG(SSL)]"
+  "Modeline control for displaying the status when images and SSL are on.
+The value will be modified for displaying the graphic icon.")
+
+(defvar w3m-modeline-ssl-status-off "[SSL]"
+  "Modeline control for displaying the status when SSL is turned on.
+The value will be modified for displaying the graphic icon.")
+
+(defvar w3m-modeline-separator " / "
+  "String used to separate a status and a title in the modeline.")
+
+(defvar w3m-modeline-favicon nil
+  "Modeline control for displaying a favicon.
+This variable will be made buffer-local.")
+
+(defvar w3m-favicon-image nil
+  "Favicon image of the page.
+This variable will be made buffer-local")
+
+(defvar w3m-current-process nil
+  "Flag used to say whether the external process is running in the buffer.
+This variable will be made buffer-local.")
+(make-variable-buffer-local 'w3m-current-process)
+
+(defvar w3m-refresh-timer nil
+  "Variable used to keep a timer object for refreshing a page.
+It will be supplied by the REFRESH attribute in the META tag, and made
+buffer-local in each emacs-w3m buffer.")
+(make-variable-buffer-local 'w3m-refresh-timer)
+
+(defvar w3m-mail-user-agents '(gnus-user-agent
+			       message-user-agent
+			       mew-user-agent
+			       vm-user-agent
+			       wl-user-agent)
+  "List of mail user agents that `w3m-mail' supports.
+See also w3m-mail.el.")
+
+(defvar w3m-current-base-url nil
+  "URL specified by <base...> tag in <head> element of the page source.")
+(defvar w3m-current-forms nil
+  "Variable used to keep forms data for the current emacs-w3m buffer.")
+(defvar w3m-current-coding-system nil
+  "Coding system used when decoding the current emacs-w3m buffer.")
+(defvar w3m-current-content-charset nil
+  "Content charset of the page specified by the server or the META tag.")
+(defvar w3m-icon-data nil
+  "Cons of icon data and its image-type for the current emacs-w3m buffer.
+It is used for favicon data.  The type is often `ico'.")
+(defvar w3m-next-url nil
+  "URL as the next document in the author-defined sequence.")
+(defvar w3m-previous-url nil
+  "URL as the previous document in the author-defined sequence.")
+(defvar w3m-start-url nil
+  "URL as the first document in the author-defined sequence.")
+(defvar w3m-contents-url nil
+  "URL as the table of contents for the current page.")
+(defvar w3m-max-anchor-sequence nil
+  "Maximum number of the anchor sequence in the current page.")
+(defvar w3m-current-refresh nil
+  "Cons of number of seconds and a url specified by the REFRESH attribute.")
+(defvar w3m-current-ssl nil
+  "SSL certification indicator for the current emacs-w3m buffer.")
+(defvar w3m-name-anchor-from-hist nil
+  "List of the points of where `w3m-search-name-anchor' come from.")
+
+(make-variable-buffer-local 'w3m-current-url)
+(make-variable-buffer-local 'w3m-current-base-url)
+(make-variable-buffer-local 'w3m-current-title)
+(make-variable-buffer-local 'w3m-current-forms)
+(make-variable-buffer-local 'w3m-current-coding-system)
+(make-variable-buffer-local 'w3m-current-content-charset)
+(make-variable-buffer-local 'w3m-icon-data)
+(make-variable-buffer-local 'w3m-next-url)
+(make-variable-buffer-local 'w3m-previous-url)
+(make-variable-buffer-local 'w3m-start-url)
+(make-variable-buffer-local 'w3m-contents-url)
+(make-variable-buffer-local 'w3m-max-anchor-sequence)
+(make-variable-buffer-local 'w3m-current-refresh)
+(make-variable-buffer-local 'w3m-current-ssl)
+(make-variable-buffer-local 'w3m-name-anchor-from-hist)
+
+(defun w3m-clear-local-variables ()
+  (setq w3m-current-url nil
+	w3m-current-base-url nil
+	w3m-current-title nil
+	w3m-current-coding-system nil
+	w3m-current-content-charset nil
+	w3m-icon-data nil
+	w3m-next-url nil
+	w3m-previous-url nil
+	w3m-start-url nil
+	w3m-contents-url nil
+	w3m-max-anchor-sequence nil
+	w3m-current-refresh nil
+	w3m-current-ssl nil
+	w3m-name-anchor-from-hist nil))
+
+(defun w3m-copy-local-variables (from-buffer)
+  (let (url base title cs char icon next prev start toc hseq refresh ssl)
+    (with-current-buffer from-buffer
+      (setq url w3m-current-url
+	    base w3m-current-base-url
+	    title w3m-current-title
+	    cs w3m-current-coding-system
+	    char w3m-current-content-charset
+	    icon w3m-icon-data
+	    next w3m-next-url
+	    prev w3m-previous-url
+	    start w3m-start-url
+	    toc w3m-contents-url
+	    hseq w3m-max-anchor-sequence
+	    refresh w3m-current-refresh
+	    ssl w3m-current-ssl))
+    (setq w3m-current-url url
+	  w3m-current-base-url base
+	  w3m-current-title title
+	  w3m-current-coding-system cs
+	  w3m-current-content-charset char
+	  w3m-icon-data icon
+	  w3m-next-url next
+	  w3m-previous-url prev
+	  w3m-start-url start
+	  w3m-contents-url toc
+	  w3m-max-anchor-sequence hseq
+	  w3m-current-refresh refresh
+	  w3m-current-ssl ssl)))
+
+(defvar w3m-verbose nil
+  "*Flag controls whether to log messages in the *Messages* buffer.
+If it is nil, a lot of messages issued by emacs-w3m will be displayed
+only in the echo area.")
+
+(defvar w3m-safe-url-regexp nil
+  "Regexp matching urls which are considered to be safe.
+The nil value means all urls are considered to be safe.
+
+Note: The value, that might be bound to a certain value while rendering
+contents, will be held by the `w3m-safe-url-regexp' text property that
+is set over the rendered contents in a buffer.  So, programs that use
+the value to test whether a url of a link in a buffer is safe should
+use the value of the text property, not the value of this variable.
+See the function definitions of `w3m-toggle-inline-image',
+`w3m-toggle-inline-images', `w3m-safe-view-this-url', and
+`w3m-mouse-safe-view-this-url'.")
+
+(defvar w3m-current-buffer nil)
+(defvar w3m-cache-buffer nil)
+(defvar w3m-cache-articles nil)
+(defvar w3m-cache-hashtb nil)
+(defvar w3m-input-url-history nil)
+
+(defconst w3m-arrived-db-size 1023)
+(defvar w3m-arrived-db nil
+  "Hash table, the arrived URLs database.
+The name of each symbol represents a url, the arrival time in the
+Emacs style (a list of three integers) is stored as the value, and
+informations including a title, a modification time, a content charset
+and a content type are stored as the properties of the symbol.  The
+nil value means it has not been initialized.")
+
+(defvar w3m-arrived-setup-functions nil
+  "Hook functions run after setting up the arrived URLs database.")
+(defvar w3m-arrived-shutdown-functions nil
+  "Hook functions run after saving the arrived URLs database.")
+
+(defconst w3m-image-type-alist
+  '(("image/jpeg" . jpeg)
+    ("image/gif" . gif)
+    ("image/png" . png)
+    ("image/x-xbm" . xbm)
+    ("image/x-xpm" . xpm))
+  "Alist of content types and image types defined as the Emacs' features.")
+
+(defconst w3m-toolbar-buttons
+  '("back" "parent" "forward" "reload" "open" "home" "search" "image"
+    "copy" "weather" "antenna" "history" "db-history")
+  "List of prefix strings for the toolbar buttons.")
+
+(defconst w3m-toolbar
+  (if (equal "Japanese" w3m-language)
+      (let ((a (decode-coding-string "\e$B%\"\e(B" 'iso-2022-jp))) ;; $B%"(B
+	`([w3m-toolbar-back-icon w3m-view-previous-page
+				 (w3m-history-previous-link-available-p)
+				 "$BA0$N%Z!<%8$KLa$k(B"]
+	  [w3m-toolbar-parent-icon w3m-view-parent-page
+				   (w3m-parent-page-available-p)
+				   "$B>e$N%G%#%l%/%H%j$X0\F0$9$k(B"]
+	  [w3m-toolbar-forward-icon w3m-view-next-page
+				    (w3m-history-next-link-available-p)
+				    "$B<!$N%Z!<%8$K?J$`(B"]
+	  [w3m-toolbar-reload-icon w3m-reload-this-page
+				   w3m-current-url
+				   "$B%5!<%P$+$i%Z!<%8$r$b$&0lEYFI$_9~$`(B"]
+	  [w3m-toolbar-open-icon w3m-goto-url t "URL $B$rF~NO$7$F%Z!<%8$r3+$/(B"]
+	  [w3m-toolbar-home-icon w3m-gohome w3m-home-page
+				 "$B%[!<%`%Z!<%8$X%8%c%s%W(B"]
+	  [w3m-toolbar-search-icon w3m-search t "$B%$%s%?!<%M%C%H>e$r8!:w(B"]
+	  [w3m-toolbar-image-icon w3m-toggle-inline-images t
+				  "$B2hA|$NI=<($r%H%0%k$9$k(B"]
+	  [w3m-toolbar-copy-icon w3m-copy-buffer t
+				 "$B$3$N%;%C%7%g%s$N%3%T!<$r:n$k(B"]
+	  [w3m-toolbar-weather-icon w3m-weather t "$BE75$M=Js$r8+$k(B"]
+	  [w3m-toolbar-antenna-icon w3m-antenna t
+				    ,(concat a "$B%s%F%J$G<u?.$9$k(B")]
+	  [w3m-toolbar-history-icon w3m-history t "$B%R%9%H%j!<(B"]
+	  [w3m-toolbar-db-history-icon w3m-db-history t
+				       "$B2a5n$KK,Ld$7$?(B URL $B$NMzNr$r8+$k(B"]))
+    '([w3m-toolbar-back-icon w3m-view-previous-page
+			     (w3m-history-previous-link-available-p)
+			     "Back to Previous Page"]
+      [w3m-toolbar-parent-icon w3m-view-parent-page
+			       (w3m-parent-page-available-p)
+			       "View the parent page"]
+      [w3m-toolbar-forward-icon w3m-view-next-page
+				(w3m-history-next-link-available-p)
+				"Forward to Next Page"]
+      [w3m-toolbar-reload-icon w3m-reload-this-page
+			       w3m-current-url
+			       "Reload This Page"]
+      [w3m-toolbar-open-icon w3m-goto-url t "Go to..."]
+      [w3m-toolbar-home-icon w3m-gohome w3m-home-page "Go to Home Page"]
+      [w3m-toolbar-search-icon w3m-search t "Search the Internet"]
+      [w3m-toolbar-image-icon w3m-toggle-inline-images t "Toggle Images"]
+      [w3m-toolbar-copy-icon w3m-copy-buffer t "Make a Copy of This Session"]
+      [w3m-toolbar-weather-icon w3m-weather t "Weather Forecast"]
+      [w3m-toolbar-antenna-icon w3m-antenna t "Investigate with Antenna"]
+      [w3m-toolbar-history-icon w3m-history t "Show a History"]
+      [w3m-toolbar-db-history-icon w3m-db-history t "View Arrived URLs"]))
+  "Toolbar definition for emacs-w3m.")
+
+;; "View" is page viewing
+;; "Show" is link list showing
+(defconst w3m-menubar
+  (let ((a (when w3m-use-japanese-menu
+	     (decode-coding-string "\e$B%\"\e(B" 'iso-2022-jp)))) ;; $B%"(B
+    `("w3m"
+      [,(w3m-make-menu-item "$B$3$N(B URL $B$r?7$7$$%;%C%7%g%s$G3+$/(B"
+	  "Open This URL in a new session")
+       w3m-view-this-url-new-session (or (w3m-anchor) (w3m-image))]
+      [,(w3m-make-menu-item "$B$3$N(B URL $B$r%@%&%s%m!<%I$9$k(B" "Download This URL")
+       w3m-download-this-url (or (w3m-anchor) (w3m-image))]
+      [,(w3m-make-menu-item "$B%@%&%s%m!<%I(B..." "Download to...")
+       w3m-download t]
+      "----" ;; separator
+      [,(w3m-make-menu-item "$BA0$N%Z!<%8$KLa$k(B" "Back to Previous Page")
+       w3m-view-previous-page
+       (w3m-history-previous-link-available-p)]
+      [,(w3m-make-menu-item "$B<!$N%Z!<%8$K0\F0$9$k(B" "Forward to Next Page")
+       w3m-view-next-page
+       (w3m-history-next-link-available-p)]
+      [,(w3m-make-menu-item "$B>e$N3,AX$K0\F0$9$k(B" "Up to Parent Page")
+       w3m-view-parent-page
+       (w3m-parent-page-available-p)]
+      "----" ;; separator
+      [,(w3m-make-menu-item "$B$3$N%Z!<%8$r30It%V%i%&%6$G3+$/(B"
+	  "Open This Page in an External Browser")
+       w3m-external-view-current-url w3m-current-url]
+      [,(w3m-make-menu-item "$B$3$N(B URL $B$r30It%V%i%&%6$G3+$/(B"
+	  "Open This URL in an External Browser")
+       w3m-external-view-this-url (or (w3m-anchor) (w3m-image))]
+      [,(w3m-make-menu-item "$B$3$N%Z!<%8$N%=!<%9$r%3%^%s%I$KAw$k(B..."
+	  "Pipe Page Source to Command...")
+       w3m-pipe-source  w3m-current-url]
+      "----" ;; separator
+      (,(w3m-make-menu-item "$B:FI=<((B" "Redisplay")
+       [,(w3m-make-menu-item "$B$3$N%Z!<%8$r:F<hF@$9$k(B" "Reload This Page")
+	w3m-reload-this-page w3m-current-url]
+       [,(w3m-make-menu-item "$B$9$Y$F$N%Z!<%8$r:F<hF@$9$k(B" "Reload All Pages")
+       w3m-reload-all-pages (cdr (w3m-list-buffers))]
+       "----" ;; separator
+       [,(w3m-make-menu-item "$B2hA|I=<($N@ZBX(B($BA4It(B)" "Toggle Images")
+	w3m-toggle-inline-images (w3m-display-graphic-p)]
+       [,(w3m-make-menu-item "$B2hA|I=<($N@ZBX(B($B$3$N2hA|(B)" "Toggle This Image")
+	w3m-toggle-inline-image (w3m-image)]
+       [,(w3m-make-menu-item "$B2hA|I=<($r;_$a$k(B" "Turn off Images")
+	w3m-turnoff-inline-images (w3m-display-graphic-p)]
+       "----" ;; separator
+       [,(w3m-make-menu-item "$B:FIA2h$9$k(B" "Redisplay This Page")
+	w3m-redisplay-this-page w3m-current-url]
+       [,(w3m-make-menu-item "Charset $B$r;XDj$7$F:FIA2h$9$k(B"
+	   "Redisplay This Page with Charset")
+	w3m-redisplay-with-charset w3m-current-url]
+       [,(w3m-make-menu-item "Content-type $B$r;XDj$7$F:FIA2h$9$k(B"
+	   "Redisplay This Page with Content-type")
+	w3m-redisplay-with-content-type w3m-current-url]
+       [,(w3m-make-menu-item "$B;XDj$7$?(B Charset $B$H(B Content-type $B$rGK4~$9$k(B"
+	   "Reset Charset and Content-type")
+	w3m-redisplay-and-reset w3m-current-url]
+       ) ;; end redisplay
+      [,(w3m-make-menu-item "$B%[!<%`%Z!<%8$X0\F0(B" "Go to Home Page")
+       w3m-gohome w3m-home-page]
+      (,(w3m-make-menu-item "$B%V%C%/%^!<%/(B" "Bookmark")
+       [,(w3m-make-menu-item "$B%V%C%/%^!<%/$rI=<((B" "View Bookmark")
+	w3m-bookmark-view t]
+       [,(w3m-make-menu-item "$B?7$7$$%;%C%7%g%s$G%V%C%/%^!<%/$rI=<((B"
+			     "View Bookmark in a New Session")
+	w3m-bookmark-view-new-session t])
+      [,(w3m-make-menu-item "$B0\F0(B..." "Go to...")
+       w3m-goto-url t]
+      "----" ;; separator
+      (,(w3m-make-menu-item "$BMzNr(B" "History")
+       [,(w3m-make-menu-item "$BLZ9=B$$GMzNr$rI=<((B" "Show a Visited URLs Tree")
+	w3m-history t]
+       [,(w3m-make-menu-item "$B%j%9%H$GMzNr$rI=<((B" "Show an Arrived URLs List")
+	w3m-db-history t]
+       ) ;; end history
+      [,(w3m-make-menu-item "$B%$%s%?!<%M%C%H$G$N8!:w(B..."
+			    "Search the Internet...")
+       w3m-search t]
+      [,(w3m-make-menu-item "$B?7$7$$%;%C%7%g%s$G8!:w(B..."
+			    "Search the Internet in a New Session...")
+       w3m-search-new-session t]
+      [,(w3m-make-menu-item "$BE75$M=Js(B" "Weather Forecast")
+       w3m-weather t]
+      [,(w3m-make-menu-item (concat a "$B%s%F%J$G<hF@(B")
+			    "Investigate with Antenna")
+       w3m-antenna t]
+      (,(w3m-make-menu-item "$B%X%k%W(B" "Resource")
+       [,(w3m-make-menu-item "$B%W%m%;%9$rCf;_$9$k(B" "Cancel Process")
+	w3m-process-stop w3m-current-process]
+       [,(w3m-make-menu-item "$B%=!<%9$r8+$k(B" "View Source")
+	w3m-view-source t]
+       [,(w3m-make-menu-item "$B%X%C%@!<$r8+$k(B" "View Header")
+	w3m-view-header t]
+       ) ;; end resource
+      "----" ;; separator
+      [,(w3m-make-menu-item "$B$3$N%Z!<%8$r%a!<%k$GAw$k(B" "Mail this page")
+       w3m-mail (memq mail-user-agent w3m-mail-user-agents)]
+      "----" ;; separator
+      [,(w3m-make-menu-item "$B%P%0%l%]!<%H$rAw$k(B" "Send a Bug Report")
+       report-emacs-w3m-bug t]
+      "----" ;; separator
+      [,(w3m-make-menu-item "$B$3$N(B URL $B$rI=<($9$k(B" "Print the Current URL")
+       w3m-print-current-url t]
+      [,(w3m-make-menu-item "w3m $B$rJD$8$k(B" "Close w3m")
+       w3m-close-window t]
+      [,(w3m-make-menu-item "w3m $B$r=*N;$9$k(B" "Quit w3m")
+       w3m-quit t]
+      )) ;; end w3m
+  "Menubar definition for emacs-w3m.")
+
+(defvar w3m-rmouse-menubar
+  `("w3m"
+    [,(w3m-make-menu-item "$BA0$N%Z!<%8$KLa$k(B" "Back to Previous Page")
+     w3m-view-previous-page
+     (w3m-history-previous-link-available-p)]
+    [,(w3m-make-menu-item "$B<!$N%Z!<%8$K0\F0$9$k(B" "Forward to Next Page")
+     w3m-view-next-page
+     (w3m-history-next-link-available-p)]
+    [,(w3m-make-menu-item "$B>e$N3,AX$K0\F0$9$k(B" "Up to Parent Page")
+     w3m-view-parent-page
+     (w3m-parent-page-available-p)]
+    "----" ;; separator
+    [,(w3m-make-menu-item "$B$3$N%Z!<%8$r:F<hF@$9$k(B" "Reload This Page")
+     w3m-reload-this-page w3m-current-url]
+    [,(w3m-make-menu-item "$B$9$Y$F$N%Z!<%8$r:F<hF@$9$k(B" "Reload All Pages")
+     w3m-reload-all-pages (cdr (w3m-list-buffers))]
+    [,(w3m-make-menu-item "$B%W%m%;%9$rCf;_$9$k(B" "Cancel Process")
+     w3m-process-stop w3m-current-process])
+  "*Menubar for click the right mouse button.")
+
+(defvar w3m-cid-retrieve-function-alist nil)
+(defvar w3m-force-redisplay t)
+
+(defvar w3m-work-buffer-list nil)
+(defconst w3m-work-buffer-name " *w3m-work*")
+(defconst w3m-select-buffer-name " *w3m buffers*")
+
+(defconst w3m-dump-head-source-command-arguments
+  (cond ((eq w3m-type 'w3mmee)
+	 (list "-dump=extra,head,source"))
+	(t
+	 (list
+	  '(if w3m-accept-languages
+	       '("-o"
+		 (concat "accept_language="
+			 (mapconcat 'identity w3m-accept-languages ","))))
+	  "-dump_extra")))
+  "Arguments passed to the w3m command to run \"dump_extra\".")
+
+(defvar w3m-halfdump-command nil
+  "Alternative w3m command used to run \"halfdump\".
+If it is nil, the command specified to `w3m-command' is used.")
+
+(defconst w3m-halfdump-command-arguments
+  (cond ((eq w3m-type 'w3mmee)
+	 (list '(if w3m-treat-image-size
+		    "-dump=half-buffer,single-row-image"
+		  "-dump=half-buffer")
+	       '(if (eq w3m-input-coding-system 'ctext)
+		    (list "-I" "x-ctext")
+		  (when (and (eq w3m-input-coding-system 'binary)
+			     charset)
+		    (list "-I" 'charset)))
+	       "-o" "concurrent=0"))
+	((eq w3m-type 'w3m-m17n)
+	 (list "-halfdump"
+	       "-o" "ext_halfdump=1"
+	       "-o" "strict_iso2022=0"
+	       "-o" "fix_width_conv=1"
+	       "-o" "use_jisx0201=0"
+	       "-o" "ucs_conv=1"
+	       '(if (eq w3m-input-coding-system 'binary)
+		    (if charset (list "-I" 'charset))
+		  (list "-I" (cond
+			      ((eq w3m-input-coding-system 'utf-8)
+			       "UTF-8")
+			      ((eq w3m-input-coding-system 'iso-8859-1)
+			       "ISO-8859-1")
+			      (t
+			       "ISO-2022-JP-2"))))
+	       "-O"
+	       '(cond
+		 ((eq w3m-output-coding-system 'utf-8)
+		  "UTF-8")
+		 ((eq w3m-output-coding-system 'iso-8859-1)
+		  "ISO-8859-1")
+		 (t
+		  "ISO-2022-JP-2"))))
+	((eq w3m-input-coding-system 'w3m-euc-japan)
+	 (list "-halfdump" "-I" "e"))
+	(t (list "-halfdump")))
+  "Arguments passed to the w3m command to run \"halfdump\".")
+
+(defconst w3m-halfdump-command-common-arguments
+  (list "-T" "text/html" "-t" tab-width "-cols" '(w3m-display-width)
+	'(cond
+	  ((and (eq w3m-display-ins-del 'fontify)
+		(w3m-device-on-window-system-p))
+	   (list "-o" "display_ins_del=2"))
+	  ((or (eq w3m-display-ins-del 'tag)
+	       (and (eq w3m-display-ins-del 'fontify)
+		    (not (w3m-device-on-window-system-p))))
+	   (list "-o" "display_ins_del=1"))))
+  "Arguments used in common by the w3m command variants to run \"halfdump\".")
+
+(defconst w3m-arrived-ignored-regexp
+  "\\`about:\\(?://\\(?:header\\|source\\|history\\|\
+db-history\\|antenna\\|namazu\\|dtree\\)/.*\\)?\\'\
+\\|\\`about:/*blank/?\\'"
+  "Regexp matching urls which aren't stored in the arrived URLs database.")
+
+(defconst w3m-history-ignored-regexp
+  "\\`about:\\(?://\\(?:header\\|source\\|history\\|\
+db-history\\|antenna\\|namazu\\|dtree\\)/.*\\)?\\'\
+\\|\\`about:/*blank/?\\'"
+  "Regexp matching urls which aren't stored in the history.")
+
+(defvar w3m-mode-map nil "Keymap for emacs-w3m buffers.")
+(defvar w3m-link-map nil "Keymap used on links.")
+(defvar w3m-doc-view-map nil
+  "Keymap used in `doc-view-mode' that emacs-w3m launches.
+`doc-view-mode-map' gets to be its parent keymap.")
+
+(defvar w3m-mode-setup-functions nil
+  "Hook functions run after setting up the `w3m-mode'.")
+(defvar w3m-display-functions nil
+  "Hook functions run after displaying pages in emacs-w3m buffers.
+Each function is called with a url string as the argument.  This hook
+is evaluated just before evaluating `w3m-display-hook'.")
+
+(defvar w3m-load-hook nil
+  "*Hook run after loading the w3m.elc module.
+It is not recommended that you use this hook instead of writing into
+`w3m-init-file' for customization.")
+
+
+;; Generic functions:
+(defun w3m-url-to-file-name (url)
+  "Return the file name which is pointed to by URL.
+When URL does not point to any local files, it returns nil.  The
+actual performance of this function is to strip off the scheme part
+and the net_loc part from URL.  It is meaningless to give an argument
+whose net_loc part is not empty, a null string or the localhost name
+to this function."
+  (cond
+   ((string-match "\\`\\(\\(file:/\\{0,2\\}\\)\\|about://dtree\\)/" url)
+    (setq url (substring url (match-end 1)))
+    (when (and (match-beginning 2) ;; file:
+	       (< (match-end 2) 7) ;; file:// or file:/
+	       (string-match "\\`\\(/[^/]+[^/:|]\\)/" url))
+      (cond ((file-directory-p (match-string 0 url))
+	     ) ;; The directory "/hostname/" exists.
+	    ((string-match (concat "\\`/\\(localhost\\|127\\.0\\.0\\.1\\|"
+				   (regexp-quote (system-name)) "\\)/")
+			   url)
+	     ;; Strip the localhost name.
+	     (setq url (substring url (match-end 1))))
+	    (t
+	     ;; Make it a Tramp url: /hostname:/...
+	     ;; See `tramp-default-method' and `tramp-default-method-alist'.
+	     (setq url (concat (substring url 0 (match-end 1))
+			       ":"
+			       (substring url (match-end 1)))))))
+    ;; Process abs_path part in Windows.
+    (when (and w3m-treat-drive-letter
+	       (string-match
+		"\\`/\\(?:\\([a-zA-Z]\\)[|:]?\\|cygdrive/\\([a-zA-Z]\\)\\)/"
+		url))
+      (setq url (concat (or (match-string 1 url) (match-string 2 url))
+			":/"
+			(substring url (match-end 0)))))
+    (if (string-match "\\`/[^/:]\\{2,\\}:/" url)
+	;; Don't check for a Tramp url.
+	url
+      (if (file-exists-p url)
+	  url
+	(let ((x (w3m-url-decode-string url w3m-file-name-coding-system)))
+	  (if (file-exists-p x) x url)))))
+   ((string-match "\\`\\(?:[~/]\\|[a-zA-Z]:/\\|\\.\\.?/\\)" url) url)
+   (t
+    (catch 'found-file
+      (dolist (pair w3m-url-local-directory-alist)
+	(and (string-match (concat "\\`"
+				   (regexp-quote
+				    (file-name-as-directory (car pair))))
+			   url)
+	     (let ((file (expand-file-name (substring url (match-end 0))
+					   (cdr pair))))
+	       (when (or (file-exists-p file)
+			 (file-exists-p
+			  (setq file (w3m-url-decode-string
+				      file w3m-file-name-coding-system))))
+		 (throw 'found-file file)))))))))
+
+(defun w3m-expand-file-name-as-url (file &optional directory)
+  "Return a url string which points to the FILE.
+Optional DIRECTORY is a directory to start with if FILE is relative
+\(i.e., FILE doesn't start with slash).  It defaults to the current
+directory."
+  (setq file (expand-file-name file directory))
+  (concat "file://"
+	  (if (string-match "\\`\\([a-zA-Z]\\):" file)
+	      (format (if w3m-use-cygdrive "/cygdrive/%s%s" "/%s|%s")
+		      (match-string 1 file)
+		      (substring file (match-end 0)))
+	    file)))
+
+
+;;; Managing the arrived URLs database:
+(defmacro w3m-arrived-intern (url &optional soft)
+  "Normalize URL by stripping last / and intern it into `w3m-arrived-db'.
+If SOFT is non-nil, use `intern-soft' instead."
+  (let ((fn (if soft 'intern-soft 'intern))
+	(str (if (consp url)
+		 `(let* ((url ,url)
+			 (len (length url)))
+		    (if (and (not (zerop len))
+			     (eq (aref url (1- len)) ?/))
+			(substring url 0 -1)
+		      url))
+	       `(if (let ((len (length ,url)))
+		      (and (not (zerop len))
+			   (eq (aref ,url (1- len)) ?/)))
+		    (substring ,url 0 -1)
+		  ,url))))
+    `(,fn ,str w3m-arrived-db)))
+
+(defun w3m-arrived-add (url &optional title modification-time
+			    arrival-time content-charset content-type)
+  "Add URL to the arrived URLs database.
+Optional TITLE, MODIFICATION-TIME, ARRIVAL-TIME, CONTENT-CHARSET and
+CONTENT-TYPE are also be added."
+  (unless (string-match w3m-arrived-ignored-regexp url)
+    (let ((ident (w3m-arrived-intern url)))
+      (if (string-match "\\`\\([^#]+\\)#" url)
+	  (w3m-arrived-add (substring url 0 (match-end 1))
+			   title modification-time arrival-time
+			   content-charset content-type)
+	(when title
+	  (put ident 'title title))
+	(when modification-time
+	  (put ident 'last-modified modification-time))
+	(when content-charset
+	  (put ident 'content-charset content-charset))
+	(when content-type
+	  (put ident 'content-type content-type)))
+      (set ident arrival-time))))
+
+(defun w3m-arrived-p (url)
+  "Return non-nil if a page of URL has arrived."
+  (or (string-match w3m-arrived-ignored-regexp url)
+      (w3m-arrived-intern url t)))
+
+(defun w3m-arrived-time (url)
+  "Return the arrival time of a page of URL if it has arrived.
+Otherwise return nil."
+  (let ((v (w3m-arrived-intern url t)))
+    (and v (boundp v) (symbol-value v))))
+(defsetf w3m-arrived-time (url) (value)
+  (list 'w3m-arrived-add url nil nil value))
+
+(defun w3m-arrived-put (url property value)
+  "Store VALUE in the arrived URLs database as the PROPERTY of URL.
+Return VALUE if a page of URL has arrived.  Otherwise, VALUE is
+ignored and return nil."
+  (let ((symbol (w3m-arrived-intern url t)))
+    (and symbol (put symbol property value))))
+
+(defun w3m-arrived-get (url property)
+  "Return the value of URL's PROPERTY stored in the arrived URLs database.
+If a page of URL has not arrived, return nil."
+  (let ((symbol (w3m-arrived-intern url t)))
+    (and symbol (get symbol property))))
+
+(defsetf w3m-arrived-get w3m-arrived-put)
+
+(defmacro w3m-arrived-title (url)
+  "Return the title of URL having stored in the arrived URLs database."
+  `(w3m-arrived-get ,url 'title))
+
+(defmacro w3m-arrived-last-modified (url)
+  "Return the mod time of URL having stored in the arrived URLs database.
+If a page of URL has not arrived yet, return nil."
+  `(w3m-arrived-get ,url 'last-modified))
+
+(defmacro w3m-arrived-content-charset (url)
+  "Return the content charset of URL stored in the arrived URLs database.
+If it has not been specified or a page of URL has not arrived yet,
+return nil."
+  `(w3m-arrived-get ,url 'content-charset))
+
+(defmacro w3m-arrived-content-type (url)
+  "Return the content type of URL stored in the arrived URLs database.
+If it has not been specified or a page of URL has not arrived yet,
+return nil."
+  `(w3m-arrived-get ,url 'content-type))
+
+(defun w3m-arrived-load-list ()
+  "Load the arrived URLs database file.
+The file is specified by `w3m-arrived-file'.  If the data is in old
+format, they will simply be ignored."
+  (let ((list (w3m-load-list w3m-arrived-file)))
+    (when (or
+	   ;; Before the revision 1.120, every element of the list was
+	   ;; a string that represented an arrived URL.
+	   (stringp (car list))
+	   ;; Before the revision 1.135, every element was a cons
+	   ;; cell: its car kept a URL, and its cdr kept a time when
+	   ;; the URL was arrived.
+	   ;; Before the revision 1.178, every element was a 4-tuple
+	   ;; that consisted of a URL, a title, a modification time,
+	   ;; and an arrival time.
+	   ;; An element of the modern database is a 6-tuple that
+	   ;; consisted of a URL, a title, a modification time, an
+	   ;; arrival time, a charset, and a content type.
+	   ;; Thus, the following condition eliminates the revision
+	   ;; 1.177 and olders.
+	   (<= (length (car list)) 4))
+      (setq list nil)
+      (when (file-exists-p w3m-arrived-file)
+	(delete-file w3m-arrived-file)))
+    list))
+
+(defun w3m-arrived-setup ()
+  "Load the arrived URLs database file and set up the hashed database.
+It is performed only when `w3m-arrived-db' has not been initialize yet.
+The file is specified by `w3m-arrived-file'."
+  (unless w3m-arrived-db
+    (setq w3m-arrived-db (make-vector w3m-arrived-db-size 0))
+    (let ((list (w3m-arrived-load-list)))
+      (dolist (elem list)
+	;; Ignore an element that lacks an arrival time information.
+	(when (nth 3 elem)
+	  (w3m-arrived-add (if (string-match "\\`/" (car elem))
+			       (w3m-expand-file-name-as-url (car elem))
+			     (car elem))
+			   (nth 1 elem)
+			   (nth 2 elem)
+			   (nth 3 elem)
+			   (when (stringp (nth 4 elem)) (nth 4 elem))
+			   (nth 5 elem))))
+      (unless w3m-input-url-history
+	(setq w3m-input-url-history (mapcar (function car) list))))
+    (run-hooks 'w3m-arrived-setup-functions)))
+
+(defun w3m-arrived-shutdown ()
+  "Save the arrived URLs database in the file.
+The database `w3m-arrived-db' will be cleared after saving.  The file
+is specified by `w3m-arrived-file'."
+  (when w3m-arrived-db
+    ;; Re-read the database file, and if there are data which another
+    ;; Emacs process registered, merge them to the current database.
+    (dolist (elem (w3m-arrived-load-list))
+      (when (w3m-time-newer-p (nth 3 elem) (w3m-arrived-time (car elem)))
+	(w3m-arrived-add (if (string-match "\\`/" (car elem))
+			     (w3m-expand-file-name-as-url (car elem))
+			   (car elem))
+			 (nth 1 elem)
+			 (nth 2 elem)
+			 (nth 3 elem)
+			 (when (stringp (nth 4 elem)) (nth 4 elem))
+			 (nth 5 elem))))
+    ;; Convert current database to a list.
+    (let (list)
+      (mapatoms
+       (lambda (sym)
+	 (and sym
+	      (boundp sym)
+	      (symbol-value sym) ; Ignore an entry lacks an arrival time.
+	      (push (list (symbol-name sym)
+			  (get sym 'title)
+			  (get sym 'last-modified)
+			  (symbol-value sym)
+			  (get sym 'content-charset)
+			  (get sym 'content-type))
+		    list)))
+       w3m-arrived-db)
+      (w3m-save-list w3m-arrived-file
+		     (w3m-sub-list
+		      (sort list
+			    (lambda (a b)
+			      (if (equal (nth 3 a) (nth 3 b))
+				  (string< (car a) (car b))
+				(w3m-time-newer-p (nth 3 a) (nth 3 b)))))
+		      w3m-keep-arrived-urls)
+		     nil t))
+    (setq w3m-arrived-db nil)
+    (run-hooks 'w3m-arrived-shutdown-functions)))
+
+(add-hook 'kill-emacs-hook 'w3m-arrived-shutdown)
+(add-hook 'kill-emacs-hook 'w3m-cookie-shutdown)
+(add-hook 'w3m-arrived-shutdown-functions 'w3m-session-automatic-save)
+(add-hook 'w3m-arrived-shutdown-functions 'w3m-session-crash-recovery-remove)
+(add-hook 'w3m-arrived-shutdown-functions 'w3m-cleanup-temp-files)
+
+;;; Generic macros and inline functions:
+(defun w3m-attributes (url &optional no-cache handler)
+  "Return a list of attributes corresponding to URL.
+Return nil if it failed in retrieving of the header.
+Otherwise, return a list which includes the following elements:
+
+ 0. Type of contents.
+ 1. Charset of contents.
+ 2. Size in bytes.
+ 3. Encoding of contents.
+ 4. Last modification time.
+ 5. Real URL.
+
+If the optional argument NO-CACHE is non-nil, cache is not used."
+  (if (not handler)
+      (condition-case nil
+	  (w3m-process-with-wait-handler
+	    (w3m-attributes url no-cache handler))
+	(w3m-process-timeout nil))
+    (setq url (w3m-url-strip-fragment url))
+    (cond
+     ((string= "about://emacs-w3m.gif" url)
+      (list "image/gif" nil nil nil nil url url))
+     ((string-match "\\`about://source/" url)
+      (lexical-let ((src (substring url (match-end 0))))
+	(w3m-process-do
+	    (attrs (w3m-attributes src no-cache handler))
+	  (list "text/plain"
+		(or (w3m-arrived-content-charset (w3m-url-strip-authinfo src))
+		    (cadr attrs))
+		(nth 2 attrs)
+		(nth 3 attrs)
+		(nth 4 attrs)
+		(concat "about://source/" (nth 5 attrs))))))
+     ((string-match "\\`about:" url)
+      (list "text/html" w3m-coding-system nil nil nil url))
+     ((string-match "\\`cid:" url)
+      (let ((w3m-current-buffer (current-buffer)))
+	(w3m-process-do-with-temp-buffer
+	    (type (w3m-cid-retrieve url nil nil))
+	  (list type nil nil nil nil url url))))
+     ((string-match "\\`data:" url)
+      (let ((w3m-current-buffer (current-buffer)))
+	(w3m-process-do-with-temp-buffer
+	    (type (w3m-data-retrieve url nil nil))
+	  (list type nil nil nil nil url url))))
+     ((w3m-url-local-p url)
+      (w3m-local-attributes url))
+     (t
+      (w3m-w3m-attributes url no-cache handler)))))
+
+(defmacro w3m-content-type (url &optional no-cache handler)
+  (if handler
+      `(let ((handler ,handler))
+	 (w3m-process-do
+	     (attrs (w3m-attributes ,url ,no-cache handler))
+	   (car attrs)))
+    `(car (w3m-attributes ,url ,no-cache))))
+(defmacro w3m-content-charset (url &optional no-cache handler)
+  (if handler
+      `(let ((handler ,handler))
+	 (w3m-process-do
+	     (attrs (w3m-attributes ,url ,no-cache handler))
+	   (nth 1 attrs)))
+    `(nth 1 (w3m-attributes ,url ,no-cache))))
+(defmacro w3m-content-length (url &optional no-cache handler)
+  (if handler
+      `(let ((handler ,handler))
+	 (w3m-process-do
+	     (attrs (w3m-attributes ,url ,no-cache handler))
+	   (nth 2 attrs)))
+    `(nth 2 (w3m-attributes ,url ,no-cache))))
+(defmacro w3m-content-encoding (url &optional no-cache handler)
+  (if handler
+      `(let ((handler ,handler))
+	 (w3m-process-do
+	     (attrs (w3m-attributes ,url ,no-cache handler))
+	   (nth 3 attrs)))
+    `(nth 3 (w3m-attributes ,url ,no-cache))))
+(defmacro w3m-last-modified (url &optional no-cache handler)
+  (if handler
+      `(let ((handler ,handler))
+	 (w3m-process-do
+	     (attrs (w3m-attributes ,url ,no-cache handler))
+	   (nth 4 attrs)))
+    `(nth 4 (w3m-attributes ,url ,no-cache))))
+(defmacro w3m-real-url (url &optional no-cache handler)
+  (if handler
+      `(let ((handler ,handler))
+	 (w3m-process-do
+	     (attrs (w3m-attributes ,url ,no-cache handler))
+	   (nth 5 attrs)))
+    `(nth 5 (w3m-attributes ,url ,no-cache))))
+
+(defmacro w3m-make-help-echo (property)
+  "Make a function returning a string used for the `help-echo' message.
+PROPERTY is a symbol (which doesn't need to be quoted) of a text
+property (in XEmacs, it is an extent) with the value of a string which
+should be in the place where having to show a help message.  If you
+need to know what function will be made, use `macroexpand'."
+  (if (featurep 'xemacs)
+      (let ((str `(get-text-property (extent-start-position extent)
+				     ',property)))
+	`(lambda (extent)
+	   (if (and w3m-track-mouse
+		    (eq (extent-object extent) (current-buffer)))
+	       (w3m-url-readable-string ,str))))
+    `(lambda (window object pos)
+       (if w3m-track-mouse
+	   (let ((deactivate-mark nil))
+	     (message nil)	; Clear the echo area.
+	     (w3m-url-readable-string
+	      (get-text-property pos ',property
+				 (window-buffer window))))))))
+
+(defmacro w3m-make-balloon-help (property)
+  "Make a function returning a string used for the `balloon-help' message.
+Functions made are used only when emacs-w3m is running under XEmacs.
+It returns an interned symbol of a function.  PROPERTY is a symbol
+\(which doesn't need to be quoted) of an extent with the value of a
+string which should be in the place where having to show a help
+message."
+  (when (featurep 'xemacs)
+    (let ((str `(get-text-property (extent-start-position extent)
+				   ',property)))
+      `(let ((fn (intern (format "w3m-balloon-help-for-%s"
+				 ',property))))
+	 (prog1
+	     fn
+	   (unless (fboundp fn)
+	     (defalias fn
+	       (lambda (extent)
+		 (if (and w3m-track-mouse
+			  (eq (extent-object extent) (current-buffer)))
+		     (w3m-url-readable-string ,str)))))
+	   (when (and (featurep 'bytecomp)
+		      (not (compiled-function-p (symbol-function fn))))
+	     (byte-compile fn)))))))
+
+(defvar w3m-current-message nil
+  "The string currently displayed by `w3m-message' in the echo area.")
+(defvar w3m-message-silent nil
+  "When set to `t', w3m-message is just ignored.")
+
+(defun w3m-message (&rest args)
+  "Print a one-line message at the bottom of the screen.
+It displays a given message without logging, when the cursor is
+neither in the minibuffer or in the echo area and `w3m-verbose' is
+nil.  When the cursor is either in the minibuffer or in the echo area
+and `w3m-verbose' is nil, it behaves as `format' and simply returns a
+string.  When `w3m-verbose' is non-nil, it behaves identically as
+`message', that displays a given message with logging."
+  ;; Always clear previous message in order to shrink the window height
+  ;; for the echo area.
+  (unless (or (featurep 'xemacs)
+	      (< emacs-major-version 22)
+	      (< (string-width (or (current-message) "")) (window-width)))
+    (message nil))
+  (unless w3m-message-silent
+    (if w3m-verbose
+	(apply (function message) args)
+      (if (when w3m-process-background
+	    (or (window-minibuffer-p (selected-window))
+		(when (current-message)
+		  (not (equal (current-message) w3m-current-message)))))
+	  (apply (function format) args)
+	(w3m-static-if (featurep 'xemacs)
+	    (progn
+	      (setq w3m-current-message (apply (function format) args))
+	      (display-message 'no-log w3m-current-message))
+	  (let (message-log-max)
+	    (setq w3m-current-message (apply (function message) args))))))))
+
+(defun w3m-time-parse-string (string)
+  "Parse the time-string STRING into a time in the Emacs style."
+  (ignore-errors
+    (let ((x (timezone-fix-time string nil nil)))
+      (encode-time (aref x 5) (aref x 4) (aref x 3)
+		   (aref x 2) (aref x 1) (aref x 0)
+		   (aref x 6)))))
+
+;; When a buggy timezone.el is loaded, we use parse-time.el instead.
+(unless (equal (w3m-time-parse-string "Thursday, 01-Jan-1970 00:00:00 GMT")
+	       '(0 0))
+  (ignore-errors
+    (require 'parse-time))
+  (defun w3m-time-parse-string (string)
+    "Parse the time-string STRING and return its time as Emacs style."
+    (ignore-errors
+      (let ((fn (when (fboundp 'parse-time-string)
+		  'parse-time-string)))
+	(when fn
+	  (apply (function encode-time) (funcall fn string)))))))
+
+(defun w3m-sub-list (list n)
+  "Return a list of the first N elements of LIST.
+If N is negative, return a list of the last N elements of LIST."
+  (if (integerp n)
+      (if (< n 0)
+	  ;; N is negative, extract the last items
+	  (if (>= (- n) (length list))
+	      (copy-sequence list)
+	    (nthcdr (+ (length list) n) (copy-sequence list)))
+	;; N is positive, extract the first items
+	(if (>= n (length list))
+	    (copy-sequence list)
+	  (nreverse (nthcdr (- (length list) n) (reverse list)))))
+    (copy-sequence list)))
+
+(defun w3m-load-list (file &optional coding-system)
+  "Read an emacs-w3m data file FILE and return contents as a list.
+It is used for loading `w3m-arrived-file', `w3m-cookie-file',
+`w3m-favicon-cache-file' and `w3m-antenna-file' (which see).
+CODING-SYSTEM is used to read FILE which defaults to the value of
+`w3m-file-coding-system-for-read'."
+  (when (and (file-readable-p file)
+	     ;; XEmacs 21.4 might crash when inserting a directory.
+	     (not (file-directory-p file)))
+    (with-temp-buffer
+      (when (condition-case nil
+		(let ((coding-system-for-read
+		       (or coding-system w3m-file-coding-system-for-read)))
+		  (insert-file-contents file))
+	      (error
+	       (message "Error while loading %s" file)
+	       nil))
+	;; point is not always moved to the beginning of the buffer
+	;; after `insert-file-contents' is done.
+	(goto-char (point-min))
+	(condition-case err
+	    (read (current-buffer))
+	  (error
+	   (message "Error while reading %s; %s"
+		    file (error-message-string err))
+	   nil))))))
+
+(defun w3m-save-list (file list &optional coding-system escape-ctl-chars)
+  "Save a LIST form into the emacs-w3m data file FILE.
+Contents will be encoded with CODING-SYSTEM which defaults to the
+value of `w3m-file-coding-system'.  Optional ESCAPE-CTL-CHARS if it is
+non-nil, control chars will be represented with ^ as `cat -v' does."
+  (when (and list (file-writable-p file))
+    (with-temp-buffer
+      (let ((coding-system-for-write (or coding-system w3m-file-coding-system))
+	    (standard-output (current-buffer))
+	    (print-fn (if escape-ctl-chars
+			  'w3m-prin1
+			'prin1))
+	    element print-length print-level)
+	(insert (format "\
+;;; %s  -*- mode: emacs-lisp%s -*-
+;; This file is generated automatically by emacs-w3m v%s.
+
+"
+			(file-name-nondirectory file)
+			(if coding-system-for-write
+			    (format "; coding: %s" coding-system-for-write)
+			  "")
+			emacs-w3m-version))
+	(insert "(")
+	(while list
+	  (setq element (car list)
+		list (cdr list))
+	  (if (consp element)
+	      (progn
+		(insert "(")
+		(funcall print-fn (car element))
+		(insert "\n")
+		(while (setq element (cdr element))
+		  (insert "  ")
+		  (funcall print-fn (car element))
+		  (insert "\n"))
+		(backward-delete-char 1)
+		(insert ")\n "))
+	    (funcall print-fn element)
+	    (insert "\n")))
+	(skip-chars-backward "\n ")
+	(delete-region (point) (point-max))
+	(insert ")\n")
+	(let ((mode (and (file-exists-p file)
+			 (file-modes file))))
+	  (write-region (point-min) (point-max) file nil 'nomsg)
+	  (when mode (set-file-modes file mode)))))))
+
+(defun w3m-url-encode-string (str &optional coding encode-space)
+  (apply (function concat)
+	 (mapcar
+	  (lambda (ch)
+	    (cond
+	     ((eq ch ?\n)		; newline
+	      "%0D%0A")
+	     ((string-match "[-a-zA-Z0-9_:/.]" (char-to-string ch)) ; xxx?
+	      (char-to-string ch))	; printable
+	     ((and (char-equal ch ?\x20); space
+		   encode-space)
+	      "+")
+	     (t
+	      (format "%%%02X" ch))))	; escape
+	  ;; Coerce a string into a list of chars.
+	  (append (encode-coding-string (or str "")
+					(or coding
+					    w3m-default-coding-system
+					    w3m-coding-system
+					    'iso-2022-7bit))
+		  nil))))
+
+(defun w3m-url-decode-string (str &optional coding)
+  (let ((start 0)
+	(buf)
+	(case-fold-search t))
+    (while (string-match "%\\(?:\\([0-9a-f][0-9a-f]\\)\\|0d%0a\\)" str start)
+      (push (substring str start (match-beginning 0)) buf)
+      (push (if (match-beginning 1)
+		(vector (string-to-number (match-string 1 str) 16))
+	      "\n")
+	    buf)
+      (setq start (match-end 0)))
+    (setq str (apply 'concat (nreverse (cons (substring str start) buf))))
+    (w3m-decode-coding-string-with-priority str coding)))
+
+(defun w3m-url-readable-string (url)
+  "Return a readable string for a given encoded URL.
+If `w3m-show-decoded-url' has a non-nil value, it is referred to to
+decide a decoding scheme."
+  (when (stringp url)
+    (setq url (w3m-puny-decode-url url))
+    (let ((rule
+	   (cond ((string-match "[^\000-\177]" url)
+		  ;; It looks not to have been encoded.
+		  nil)
+		 ((and (listp w3m-show-decoded-url)
+		       (consp (car w3m-show-decoded-url)))
+		  (catch 'found-rule
+		    (save-match-data
+		      (dolist (elem w3m-show-decoded-url)
+			(when (if (stringp (car elem))
+				  (string-match (car elem) url)
+				(if (functionp (car elem))
+				    (funcall (car elem) url)
+				  (eval (car elem))))
+			  (throw 'found-rule (cdr elem)))))))
+		 (t w3m-show-decoded-url))))
+      (if rule
+	  (w3m-url-decode-string url
+				 (if (eq t rule)
+				     w3m-coding-system-priority-list
+				   rule))
+	url))))
+
+(defun w3m-url-transfer-encode-string (url &optional coding)
+  "Encode non-ascii characters in URL into the sequence of escaped octets.
+CODING which defaults to `w3m-current-coding-system' (which see) is a
+coding system used when encoding non-ascii characters.
+
+This function is designed for conversion for safe transmission of URL,
+i.e., it handles only non-ASCII characters that can not be transmitted
+safely through the network.  For the other general purpose, you should
+use `w3m-url-encode-string' instead."
+  (setq url (w3m-puny-encode-url url))
+  (let ((start 0)
+	(buf))
+    (while (string-match "[^\x21-\x7e]+" url start)
+      (setq buf
+	    (cons (apply 'concat
+			 (mapcar
+			  (lambda (c) (format "%%%02X" c))
+			  (append (encode-coding-string
+				   (match-string 0 url)
+				   (or coding
+				       w3m-current-coding-system)))))
+		  (cons (substring url start (match-beginning 0))
+			buf))
+	    start (match-end 0)))
+    (apply 'concat
+	   (nreverse (cons (substring url start) buf)))))
+
+
+;;; HTML character entity handling:
+(defun w3m-entity-value (name)
+  "Get a char corresponding to NAME from the html char entities database.
+The database is kept in `w3m-entity-table'."
+  ;; Return a value of the specified entity, or nil if it is unknown.
+  (or (gethash name w3m-entity-table)
+      (and (eq (aref name 0) ?#)
+	   (let ((num (if (memq (aref name 1) '(?X ?x))
+			  (string-to-number (substring name 2) 16)
+			(string-to-number (substring name 1)))))
+	     (or (cdr (assq num w3m-extra-numeric-character-reference))
+		 (string (w3m-ucs-to-char num)))))))
+
+(defun w3m-fontify-bold ()
+  "Fontify bold text in the buffer containing halfdump."
+  (goto-char (point-min))
+  (while (search-forward "<b>" nil t)
+    (let ((start (match-beginning 0)))
+      (delete-region start (match-end 0))
+      (when (re-search-forward "</b[ \t\r\f\n]*>" nil t)
+	(delete-region (match-beginning 0) (match-end 0))
+	(w3m-add-face-property start (match-beginning 0) 'w3m-bold)))))
+
+(defun w3m-fontify-italic ()
+  "Fontify italic text in the buffer containing halfdump."
+  (goto-char (point-min))
+  (while (search-forward "<i>" nil t)
+    (let ((start (match-beginning 0)))
+      (delete-region start (match-end 0))
+      (when (re-search-forward "</i[ \t\r\f\n]*>" nil t)
+	(delete-region (match-beginning 0) (match-end 0))
+	(w3m-add-face-property start (match-beginning 0) 'w3m-italic)))))
+
+(defun w3m-fontify-underline ()
+  "Fontify underline text in the buffer containing halfdump."
+  (goto-char (point-min))
+  (while (search-forward "<u>" nil t)
+    (let ((start (match-beginning 0)))
+      (delete-region start (match-end 0))
+      (when (re-search-forward "</u[ \t\r\f\n]*>" nil t)
+	(delete-region (match-beginning 0) (match-end 0))
+	(w3m-add-face-property start (match-beginning 0) 'w3m-underline)))))
+
+(defun w3m-fontify-strike-through ()
+  "Fontify strike-through text in the buffer containing halfdump."
+  (goto-char (point-min))
+  (cond
+   ((and (eq w3m-display-ins-del 'fontify)
+	 (w3m-device-on-window-system-p))
+    (while (search-forward "<s>" nil t)
+      (let ((start (match-beginning 0)))
+	(delete-region start (match-end 0))
+	(when (re-search-forward "</s[ \t\r\f\n]*>" nil t)
+	  (delete-region (match-beginning 0) (match-end 0))
+	  (w3m-add-face-property start (match-beginning 0)
+				 'w3m-strike-through)))))
+   ((w3m-device-on-window-system-p)
+    (while (re-search-forward
+	    (concat "<U>\\(?:\\(?::\\(?:\\(?:DEL\\|S\\)]\\)\\|"
+		    "\\[\\(?:\\(?:DEL\\|S\\):\\)\\)</U>\\)")
+	    nil t)
+      (w3m-add-face-property (match-beginning 0) (match-end 0)
+			     'w3m-strike-through)))))
+
+(defun w3m-fontify-insert ()
+  "Fontify insert text in the buffer containing halfdump."
+  (goto-char (point-min))
+  (cond
+   ((and (eq w3m-display-ins-del 'fontify)
+	 (w3m-device-on-window-system-p))
+    (while (search-forward "<ins>" nil t)
+      (let ((start (match-beginning 0)))
+	(delete-region start (match-end 0))
+	(when (re-search-forward "</ins[ \t\r\f\n]*>" nil t)
+	  (delete-region (match-beginning 0) (match-end 0))
+	  (w3m-add-face-property start (match-beginning 0) 'w3m-insert)))))
+   ((w3m-device-on-window-system-p)
+    (while (re-search-forward "<U>\\(?:\\(?::INS]\\|\\[INS:\\)</U>\\)"
+			      nil t)
+      (w3m-add-face-property (match-beginning 0) (match-end 0) 'w3m-insert)))))
+
+(defun w3m-decode-anchor-string (str)
+  ;; FIXME: This is a quite ad-hoc function to process encoded url string.
+  ;; More discussion about timing &-sequence decode is required.  The
+  ;; following article (written in Japanese) is the origin of this issue:
+  ;;
+  ;; [emacs-w3m:00150] <URL:http://emacs-w3m.namazu.org/ml/msg00149.html>
+  ;;
+  ;; Takaaki MORIYAMA wrote in the article that the string "&amp;" which
+  ;; is replaced from "&" and embedded in the w3m's halfdump should be
+  ;; restored into "&" some time.
+  (let ((start 0) (buf))
+    (while (string-match "\\(&amp;\\)\\|\\([\t\r\f\n]+\\)" str start)
+      (setq buf (cons (if (match-beginning 1) "&" " ")
+		      (cons (substring str start (match-beginning 0)) buf))
+	    start (match-end 0)))
+    (apply (function concat)
+	   (nreverse (cons (substring str start) buf)))))
+
+(defun w3m-image-type (content-type)
+  "Return an image type which corresponds to CONTENT-TYPE."
+  (cdr (assoc content-type w3m-image-type-alist)))
+
+(defun w3m-imitate-widget-button ()
+  "Return a boolean value corresponding to the variable of the same name."
+  (if (listp w3m-imitate-widget-button)
+      (condition-case nil
+	  (eval w3m-imitate-widget-button)
+	(error nil))
+    (and w3m-imitate-widget-button t)))
+
+(defun w3m-fontify-anchors ()
+  "Fontify anchor tags in the buffer which contains halfdump."
+  (let ((help (w3m-make-help-echo w3m-balloon-help))
+	(balloon (w3m-make-balloon-help w3m-balloon-help))
+	prenames start end)
+    (goto-char (point-min))
+    (setq w3m-max-anchor-sequence 0)	;; reset max-hseq
+    (while (re-search-forward "<_id[ \t\r\f\n]+" nil t)
+      (setq start (match-beginning 0))
+      (setq prenames (get-text-property start 'w3m-name-anchor))
+      (w3m-parse-attributes (id)
+	(delete-region start (point))
+	(w3m-add-text-properties start (point-max)
+				 (list 'w3m-name-anchor
+				       (cons
+					(w3m-decode-entities-string
+					 (w3m-url-transfer-encode-string
+					  id))
+					prenames)))))
+    (goto-char (point-min))
+    (while (re-search-forward "<a[ \t\r\f\n]+" nil t)
+      (setq start (match-beginning 0))
+      (setq prenames (get-text-property start 'w3m-name-anchor2))
+      (w3m-parse-attributes (href name id charset
+				  (rel :case-ignore) (hseq :integer))
+	(unless name
+	  (setq name id))
+	(when rel
+	  (setq rel (split-string rel))
+	  (cond
+	   ((member "next" rel) (setq w3m-next-url href))
+	   ((or (member "prev" rel) (member "previous" rel))
+	    (setq w3m-previous-url href))
+	   ((member "start" rel) (setq w3m-start-url href))
+	   ((member "contents" rel) (setq w3m-contents-url href))))
+	(delete-region start (point))
+	(cond
+	 (href
+	  (when (re-search-forward "[ \t\r\f\n]*\\(</a>\\)" nil t)
+	    (setq end (match-beginning 0))
+	    (delete-region (match-beginning 1) (match-end 1))
+	    (setq href (w3m-expand-url (w3m-decode-anchor-string href)))
+	    (unless (w3m-url-local-p href)
+	      (w3m-string-match-url-components href)
+	      (setq href (if (match-beginning 8)
+			     (let ((tmp (match-string 9 href)))
+			       (concat (w3m-url-transfer-encode-string
+					(substring href 0 (match-beginning 8))
+					(w3m-charset-to-coding-system charset))
+				       "#" tmp))
+			 (w3m-url-transfer-encode-string
+			  href
+			  (w3m-charset-to-coding-system charset)))))
+	    (setq hseq (or (and (null hseq) 0) (abs hseq)))
+	    (setq w3m-max-anchor-sequence (max hseq w3m-max-anchor-sequence))
+	    (w3m-add-face-property start end (if (w3m-arrived-p href)
+						     'w3m-arrived-anchor
+						   'w3m-anchor))
+	    (w3m-add-text-properties start end
+				     (list 'w3m-href-anchor href
+					   'w3m-balloon-help href
+					   'mouse-face 'highlight
+					   'w3m-anchor-sequence hseq
+					   'help-echo help
+					   'balloon-help balloon
+					   'keymap w3m-link-map))
+	    (when (w3m-imitate-widget-button)
+	      (require 'wid-edit)
+	      (let ((widget-button-face (if (w3m-arrived-p href)
+					    'w3m-arrived-anchor
+					  'w3m-anchor))
+		    (widget-mouse-face 'highlight)
+		    w)
+		(setq w (widget-convert-button 'default start end
+					       :button-keymap nil
+					       :help-echo href))
+		(w3m-static-unless (featurep 'xemacs)
+		  (overlay-put (widget-get w :button-overlay) 'evaporate t))))
+	    (when name
+	      (w3m-add-text-properties start (point-max)
+				       (list 'w3m-name-anchor2
+					     (cons
+					      (w3m-decode-entities-string
+					       (w3m-url-transfer-encode-string
+						name))
+					      prenames))))))
+	 (name
+	  (w3m-add-text-properties start (point-max)
+				   (list 'w3m-name-anchor2
+					 (cons
+					  (w3m-decode-entities-string
+					   (w3m-url-transfer-encode-string
+					    name))
+					  prenames)))))))
+    (when w3m-icon-data
+      (setq w3m-icon-data (cons (and (car w3m-icon-data)
+				     (w3m-expand-url (car w3m-icon-data)))
+				(or (w3m-image-type (cdr w3m-icon-data))
+				    'ico))))
+    (when w3m-next-url
+      (setq w3m-next-url (w3m-expand-url w3m-next-url)))
+    (when w3m-previous-url
+      (setq w3m-previous-url (w3m-expand-url w3m-previous-url)))
+    (when w3m-start-url
+      (setq w3m-start-url (w3m-expand-url w3m-start-url)))
+    (when w3m-contents-url
+      (setq w3m-contents-url (w3m-expand-url w3m-contents-url)))))
+
+(eval-and-compile
+  (unless (featurep 'xemacs)
+    (defun w3m-setup-menu ()
+      "Define menubar buttons for Emacsen."
+      (w3m-menu-on-forefront w3m-menu-on-forefront t)
+      (unless (keymapp (lookup-key w3m-mode-map [menu-bar w3m]))
+	(let ((map (make-sparse-keymap (car w3m-menubar))))
+	  (define-key w3m-mode-map [menu-bar] (make-sparse-keymap))
+	  (w3m-setup-session-menu)
+	  (when w3m-use-tab-menubar (w3m-setup-tab-menu))
+	  (w3m-setup-bookmark-menu)
+	  (define-key w3m-mode-map [menu-bar w3m] (cons (car w3m-menubar) map))
+	  (require 'easymenu)
+	  (easy-menu-define
+	    w3m-mode-menu w3m-mode-map
+	    "w3m menu item" w3m-menubar)
+	  (easy-menu-add w3m-mode-menu))
+	(let ((map (make-sparse-keymap)))
+	  (easy-menu-define
+	    w3m-rmouse-menu map
+	    "w3m rmouse menu item" w3m-rmouse-menubar))))))
+
+(defun w3m-fontify-images ()
+  "Fontify img_alt strings of images in the buffer containing halfdump."
+  (goto-char (point-min))
+  (let ((help (w3m-make-help-echo w3m-balloon-help))
+	(balloon (w3m-make-balloon-help w3m-balloon-help))
+	upper start end help src1)
+    (while (re-search-forward "<\\(img_alt\\)[^>]+>" nil t)
+      (setq upper (string= (match-string 1) "IMG_ALT")
+	    start (match-beginning 0)
+	    end (match-end 0))
+      (goto-char (match-end 1))
+      (w3m-parse-attributes (src
+			     (width :integer)
+			     (height :integer)
+			     title
+			     usemap)
+	(delete-region start end)
+	(setq src (w3m-expand-url (w3m-decode-anchor-string src)))
+	;; Use the identical Lisp object for a string used as the value of
+	;; the `w3m-image' property.  A long title string will be chopped in
+	;; w3m's halfdump; since it makes `next-single-property-change' not
+	;; work properly, XEmacs didn't display images in shimbun articles.
+	(if (equal src src1)
+	    (setq src src1)
+	  (setq src1 src))
+	(when (search-forward "</img_alt>" nil t)
+	  (delete-region (setq end (match-beginning 0)) (match-end 0))
+	  (setq help (get-text-property start 'w3m-balloon-help))
+	  (cond
+	   ((and help title)
+	    (setq help (format "%s\nalt: %s\nimg: %s" help title src)))
+	   (help
+	    (setq help (format "%s\nimg: %s" help src)))
+	   (title
+	    (setq help (format "alt: %s\nimg: %s" title src)))
+	   (t
+	    (setq help (format "img: %s" src))))
+	  (w3m-add-text-properties start end
+				   (list 'w3m-image src
+					 'w3m-image-size
+					 (when (or width height)
+					   (cons width height))
+					 'w3m-image-alt title
+					 'w3m-balloon-help help
+					 'w3m-image-usemap usemap
+					 'w3m-image-status 'off
+					 'w3m-image-redundant upper
+					 'keymap w3m-link-map))
+	   (unless (w3m-action start)
+	     ;; No need to use `w3m-add-text-properties' here.
+	     (w3m-add-face-property start end
+				    (if (w3m-anchor start)
+					'w3m-image-anchor
+				      'w3m-image))
+	     (unless (w3m-anchor start)
+	       (add-text-properties start end (list 'mouse-face 'highlight
+						    'help-echo help
+						    'balloon-help balloon)))))))))
+
+(defvar w3m-idle-images-show-timer nil)
+(defvar w3m-idle-images-show-list nil)
+(defvar w3m-idle-images-show-interval 1)
+
+(defun w3m-idle-images-show ()
+  (let ((repeat t)
+	(onbuffer (member (current-buffer) (w3m-list-buffers))))
+    (while (and repeat w3m-idle-images-show-list)
+      (let* ((item (or (and onbuffer
+			    (or (get-text-property (point) 'w3m-idle-image-item)
+				(let* ((prev (previous-single-property-change
+					      (point) 'w3m-idle-image-item))
+				       (next (next-single-property-change
+					      (point) 'w3m-idle-image-item))
+				       (prev-diff (and prev (abs (- (point) prev))))
+				       (next-diff (and next (abs (- (point) next)))))
+				  (cond
+				   ((and prev next)
+				    (get-text-property
+				     (if (< prev-diff next-diff) prev next)
+				     'w3m-idle-image-item))
+				   (prev
+				    (get-text-property prev
+						       'w3m-idle-image-item))
+				   (next
+				    (get-text-property next
+						       'w3m-idle-image-item))
+				   (t nil)))))
+		       (car (last w3m-idle-images-show-list))))
+	     (start    (nth 0 item))
+	     (end      (nth 1 item))
+	     (iurl     (nth 2 item))
+	     (url      (nth 3 item))
+	     (no-cache (nth 4 item))
+	     (size     (nth 5 item)))
+	(setq w3m-idle-images-show-list
+	      (delete item w3m-idle-images-show-list))
+	(if (buffer-live-p (marker-buffer start))
+	    (with-current-buffer (marker-buffer start)
+	      (save-restriction
+		(widen)
+		(let ((inhibit-read-only t))
+		  (remove-text-properties start end '(w3m-idle-image-item))
+		  (set-buffer-modified-p nil))
+		(w3m-process-with-null-handler
+		  (lexical-let ((start start)
+				(end end)
+				(iurl iurl)
+				(url url))
+		    (w3m-process-do
+			(image (let ((w3m-current-buffer (current-buffer))
+				     (w3m-message-silent t))
+				 (w3m-create-image
+				  iurl no-cache
+				  url
+				  size handler)))
+		      (when (buffer-live-p (marker-buffer start))
+			(with-current-buffer (marker-buffer start)
+			  (save-restriction
+			    (widen)
+			    (if image
+				(when (equal url w3m-current-url)
+				  (let ((inhibit-read-only t))
+				    (w3m-insert-image start end image iurl))
+				  ;; Redisplay
+				  (when w3m-force-redisplay
+				    (sit-for 0)))
+			      (let ((inhibit-read-only t))
+				(w3m-add-text-properties
+				 start end '(w3m-image-status off))))
+			    (set-buffer-modified-p nil))
+			  (set-marker start nil)
+			  (set-marker end nil))))))))
+	  (set-marker start nil)
+	  (set-marker end nil)
+	  (w3m-idle-images-show-unqueue (marker-buffer start))))
+      (setq repeat (sit-for 0.1 t)))
+    (if w3m-idle-images-show-list
+      (when (input-pending-p)
+	(cancel-timer w3m-idle-images-show-timer)
+	(setq w3m-idle-images-show-timer
+	      (run-with-idle-timer w3m-idle-images-show-interval
+				   t
+				   'w3m-idle-images-show)))
+      (cancel-timer w3m-idle-images-show-timer)
+      (setq w3m-idle-images-show-timer nil))))
+
+(defun w3m-idle-images-show-unqueue (buffer)
+  (when w3m-idle-images-show-timer
+    (cancel-timer w3m-idle-images-show-timer)
+    (setq w3m-idle-images-show-timer nil)
+    (setq w3m-idle-images-show-list
+	  (delq nil
+		(mapcar (lambda (x)
+			  (and (not (eq buffer (marker-buffer (nth 0 x))))
+			       x))
+			w3m-idle-images-show-list)))
+    (when w3m-idle-images-show-list
+      (setq w3m-idle-images-show-timer
+	    (run-with-idle-timer w3m-idle-images-show-interval
+				 t
+				 'w3m-idle-images-show)))))
+
+(defvar w3m-image-no-idle-timer nil)
+(defun w3m-toggle-inline-images-internal (status
+					  &optional no-cache url
+					  begin-pos end-pos
+					  safe-regexp)
+  "Toggle displaying of inline images on current buffer.
+STATUS is current image status.
+If NO-CACHE is non-nil, cache is not used.
+If URL is specified, only the image with URL is toggled."
+  (let ((cur-point (point))
+	(inhibit-read-only t)
+	(end (or begin-pos (point-min)))
+	(allow-non-secure-images (not w3m-confirm-leaving-secure-page))
+	start iurl image size)
+    (unless end-pos (setq end-pos (point-max)))
+    (save-excursion
+      (if (equal status 'off)
+	  (while (< (setq start
+			  (if (w3m-image end)
+			      end
+			    (next-single-property-change end 'w3m-image
+							 nil end-pos)))
+		    end-pos)
+	    (setq end (or (next-single-property-change start 'w3m-image)
+			  (point-max))
+		  iurl (w3m-image start)
+		  size (get-text-property start 'w3m-image-size))
+	    (when (and (or (and (not url)
+				(or (not w3m-ignored-image-url-regexp)
+				    (not (string-match
+					  w3m-ignored-image-url-regexp
+					  iurl))))
+			   ;; URL is specified and is same as the image URL.
+			   (string= url iurl))
+		       (not (eq (get-text-property start 'w3m-image-status)
+				'on)))
+	      (w3m-add-text-properties start end '(w3m-image-status on))
+	      (if (get-text-property start 'w3m-image-redundant)
+		  (progn
+		    ;; Insert a dummy string instead of a redundant image.
+		    (setq image (make-string
+				 (string-width (buffer-substring start end))
+				 ? ))
+		    (w3m-add-text-properties start end '(invisible t))
+		    (goto-char end)
+		    (w3m-add-text-properties
+		     end (progn (insert image) (point))
+		     '(w3m-image-dummy t w3m-image "dummy"))
+		    (setq end (point)))
+		(goto-char cur-point)
+		(when (and (w3m-url-valid iurl)
+			   (or (null safe-regexp)
+			       (string-match safe-regexp iurl))
+			   (not (and (not (w3m-url-local-p w3m-current-url))
+				     (w3m-url-local-p iurl)))
+			   (or (not w3m-current-ssl)
+			       (string-match "\\`\\(?:ht\\|f\\)tps://" iurl)
+			       allow-non-secure-images
+			       (and (prog1
+					(y-or-n-p "\
+You are retrieving non-secure image(s).  Continue? ")
+				      (message nil))
+				    (setq allow-non-secure-images t))))
+		  (if (or w3m-image-no-idle-timer
+			  (and (null (and size w3m-resize-images))
+			       (or (string-match "\\`\\(?:cid\\|data\\):" iurl)
+				   (w3m-url-local-p iurl)
+				   (w3m-cache-available-p iurl))))
+		      (w3m-process-with-null-handler
+			(lexical-let ((start (set-marker (make-marker) start))
+				      (end (set-marker (make-marker) end))
+				      (iurl iurl)
+				      (url w3m-current-url))
+			  (w3m-process-do
+			      (image (let ((w3m-current-buffer (current-buffer)))
+				       (w3m-create-image
+					iurl no-cache
+					w3m-current-url
+					size handler)))
+			    (when (buffer-live-p (marker-buffer start))
+			      (with-current-buffer (marker-buffer start)
+				(if image
+				    (when (equal url w3m-current-url)
+				      (let ((inhibit-read-only t))
+					(w3m-insert-image start end image iurl))
+				      ;; Redisplay
+				      (when w3m-force-redisplay
+					(sit-for 0)))
+				  (let ((inhibit-read-only t))
+				    (w3m-add-text-properties
+				     start end '(w3m-image-status off))))
+				(set-buffer-modified-p nil)))
+			    (set-marker start nil)
+			    (set-marker end nil))))
+		    (let ((item (list (set-marker (make-marker) start)
+				      (set-marker (make-marker) end)
+				      (w3m-url-transfer-encode-string iurl)
+				      w3m-current-url
+				      no-cache
+				      size)))
+		      (setq w3m-idle-images-show-list
+			    (cons item w3m-idle-images-show-list))
+		      (w3m-add-text-properties
+		       start end
+		       `(w3m-idle-image-item ,item))
+		      (unless w3m-idle-images-show-timer
+			(setq w3m-idle-images-show-timer
+			      (run-with-idle-timer w3m-idle-images-show-interval
+						   t
+						   'w3m-idle-images-show)))))))))
+	;; Remove.
+	(while (< (setq start (if (w3m-image end)
+				  end
+				(next-single-property-change end 'w3m-image
+							     nil end-pos)))
+		  end-pos)
+	  (setq end (or (next-single-property-change start 'w3m-image)
+			(point-max))
+		iurl (w3m-image start))
+	  ;; IMAGE-ALT-STRING DUMMY-STRING
+	  ;; <--------w3m-image---------->
+	  ;; <---redundant--><---dummy--->
+	  ;; <---invisible-->
+	  (when (and (or (not url)
+			 ;; URL is specified and is not same as the image URL.
+			 (string= url iurl))
+		     (not (eq (get-text-property start 'w3m-image-status)
+			      'off)))
+	    (cond
+	     ((get-text-property start 'w3m-image-redundant)
+	      ;; Remove invisible property.
+	      (put-text-property start end 'invisible nil))
+	     ((get-text-property start 'w3m-image-dummy)
+	      ;; Remove dummy string.
+	      (delete-region start end)
+	      (setq end start))
+	     (t (w3m-remove-image start end)))
+	    (w3m-add-text-properties start end
+				     '(w3m-image-status off
+							w3m-idle-image-item nil))))
+	(set-buffer-modified-p nil)))))
+
+(defun w3m-toggle-inline-image (&optional force no-cache)
+  "Toggle the visibility of an image under point or images in the region.
+If FORCE is non-nil, displaying an image is forced.  If NO-CACHE is
+non-nil, cached data will not be used."
+  (interactive "P")
+  (unless (w3m-display-graphic-p)
+    (error "Can't display images in this environment"))
+  (let (toggle-list begin end)
+    (if (w3m-region-active-p)
+	(let ((p (region-beginning))
+	    iurl)
+	  (setq begin (region-beginning)
+		end (region-end))
+	  (w3m-deactivate-region)
+	  (while (< p end)
+	    (setq p (next-single-property-change p 'w3m-image nil end))
+	    (when (and (< p end)
+		       (setq iurl (w3m-image p))
+		       (not (assoc iurl toggle-list)))
+	    (setq toggle-list (cons (cons iurl p) toggle-list)))))
+      (setq toggle-list (and (w3m-image)
+			     `(,(cons (w3m-image) (point))))))
+    (if toggle-list
+	(dolist (x toggle-list)
+	  (let* ((url (car x))
+		 (pos (cdr x))
+		 (status (get-text-property pos 'w3m-image-status))
+		 safe-regexp)
+	    (if (and (get-text-property pos 'w3m-image-scale)
+		     (equal status 'off))
+		(w3m-zoom-in-image 0)
+	      (if (w3m-url-valid url)
+		  (if (eq status 'on)
+		      (progn
+			(if force (setq status 'off))
+			(w3m-toggle-inline-images-internal
+			 status no-cache url
+			 (or begin (point-min))
+			 (or end (point-max))))
+		    (setq safe-regexp
+			  (get-text-property (point) 'w3m-safe-url-regexp))
+		    (if (or force
+			    (not safe-regexp)
+			    (string-match safe-regexp url))
+			(w3m-toggle-inline-images-internal
+			 status no-cache url
+			 (or begin (point-min))
+			 (or end (point-max)))
+		      (when (interactive-p)
+			(w3m-message "This image is considered to be unsafe;\
+ use the prefix arg to force display"))))))))
+      (if begin
+	  (w3m-message "No images in region")
+	(w3m-message "No image at point")))))
+
+(defun w3m-turnoff-inline-images ()
+  "Turn off to display all images in the buffer or in the region."
+  (interactive)
+  (w3m-toggle-inline-images 'turnoff))
+
+(defun w3m-toggle-inline-images (&optional force no-cache)
+  "Toggle the visibility of all images in the buffer or in the region.
+If FORCE is neither nil nor `turnoff', displaying images is forced.
+The value `turnoff' is special; it turns displaying images off anyway.
+If NO-CACHE is non-nil, cached data will not be used.
+
+Note that the status of whether images are visible is kept hereafter
+even in new sessions if the `w3m-toggle-inline-images-permanently'
+variable is non-nil (default=t)."
+  (interactive "P")
+  (unless (w3m-display-graphic-p)
+    (error "Can't display images in this environment"))
+  (let ((status (cond ((eq force 'turnoff) t)
+		      (force nil)
+		      (t w3m-display-inline-images)))
+	(safe-p t)
+	beg end safe-regexp pos url)
+    (if (w3m-region-active-p)
+	(progn
+	  (setq beg (region-beginning)
+		end (region-end))
+	  (w3m-deactivate-region))
+      (setq beg (point-min)
+	    end (point-max)))
+    (unless status
+      (when (setq safe-regexp (get-text-property (point) 'w3m-safe-url-regexp))
+	;; Scan the buffer for searching for an insecure image url.
+	(setq pos beg)
+	(setq
+	 safe-p
+	 (catch 'done
+	   (when (setq url (get-text-property pos 'w3m-image))
+	     (unless (string-match safe-regexp url)
+	       (throw 'done nil))
+	     (setq pos (next-single-property-change pos 'w3m-image)))
+	   (while (< pos end)
+	     (when (and
+		    (setq pos (next-single-property-change pos 'w3m-image
+							   nil end))
+		    (setq url (get-text-property pos 'w3m-image)))
+	       (unless (string-match safe-regexp url)
+		 (throw 'done nil)))
+	     (setq pos (next-single-property-change pos 'w3m-image
+						    nil end)))
+	   t))))
+    (if (or force
+	    status
+	    (not safe-regexp)
+	    safe-p)
+	(progn
+	  (unwind-protect
+	      (w3m-toggle-inline-images-internal (if status 'on 'off)
+						 no-cache nil beg end
+						 (unless (interactive-p)
+						   safe-regexp))
+	    (setq w3m-display-inline-images (not status))
+	    (when status 
+	      (w3m-process-stop (current-buffer))
+	      (w3m-idle-images-show-unqueue (current-buffer)))
+	    (force-mode-line-update)))
+      (w3m-message "There are some images considered unsafe;\
+ use the prefix arg to force display"))))
+
+(defun w3m-resize-inline-image-internal (url rate)
+  "Resize an inline image on the cursor position.
+URL is a url of an image.  RATE is a number of percent used when
+resizing an image."
+  (let* ((inhibit-read-only t)
+	 (start (point))
+	 (end (or (next-single-property-change start 'w3m-image)
+		  (point-max)))
+	 (iurl (w3m-image start))
+	 (size (get-text-property start 'w3m-image-size))
+	 (iscale (or (get-text-property start 'w3m-image-scale) '100))
+	 (allow-non-secure-images (not w3m-confirm-leaving-secure-page))
+	 scale image)
+    (w3m-add-text-properties start end '(w3m-image-status on))
+    (setq scale (truncate (* iscale rate 0.01)))
+    (w3m-add-text-properties start end (list 'w3m-image-scale scale))
+    (if (get-text-property start 'w3m-image-redundant)
+	(progn
+	  ;; Insert a dummy string instead of a redundant image.
+	  (setq image (make-string
+		       (string-width (buffer-substring start end))
+		       ? ))
+	  (w3m-add-text-properties start end '(invisible t))
+	  (w3m-add-text-properties (point)
+				   (progn (insert image) (point))
+				   '(w3m-image-dummy t
+						     w3m-image "dummy")))
+      (when (and (w3m-url-valid iurl)
+		 (or (not w3m-current-ssl)
+		     (string-match "\\`\\(?:ht\\|f\\)tps://" iurl)
+		     allow-non-secure-images
+		     (and (prog1
+			      (y-or-n-p "\
+You are retrieving non-secure image(s).  Continue? ")
+			    (message nil))
+			  (setq allow-non-secure-images t))))
+	(w3m-process-with-null-handler
+	  (lexical-let ((start (set-marker (make-marker) start))
+			(end (set-marker (make-marker) end))
+			(iurl iurl)
+			(rate scale)
+			(url w3m-current-url))
+	    (w3m-process-do
+		(image (let ((w3m-current-buffer (current-buffer)))
+			 (w3m-create-resized-image
+			  iurl
+			  rate
+			  w3m-current-url
+			  size handler)))
+	      (when (buffer-live-p (marker-buffer start))
+		(with-current-buffer (marker-buffer start)
+		  (if image
+		      (when (equal url w3m-current-url)
+			(let ((inhibit-read-only t))
+			  (w3m-static-when (featurep 'xemacs)
+			    (w3m-remove-image start end))
+			  (w3m-insert-image start end image iurl))
+			;; Redisplay
+			(when w3m-force-redisplay
+			  (sit-for 0)))
+		    (let ((inhibit-read-only t))
+		      (w3m-add-text-properties
+		       start end '(w3m-image-status off))))
+		  (set-buffer-modified-p nil))
+		(set-marker start nil)
+		(set-marker end nil)))))))))
+
+(defun w3m-zoom-in-image (&optional rate)
+  "Zoom in an image on the point.
+Numeric prefix specifies how many percent the image is enlarged by
+\(30 means enlarging the image by 130%).  The default is the value of
+the `w3m-resize-image-scale' variable."
+  (interactive "P")
+  (unless (w3m-display-graphic-p)
+    (error "Can't display images in this environment"))
+  (unless (w3m-imagick-convert-program-available-p)
+    (error "ImageMagick's `convert' program is required"))
+  (let ((url (w3m-image)))
+    (if url
+	(w3m-resize-inline-image-internal
+	 url
+	 (+ 100 (or rate w3m-resize-image-scale)))
+      (w3m-message "No image at point"))))
+
+(defun w3m-zoom-out-image (&optional rate)
+  "Zoom out an image on the point.
+Numeric prefix specifies how many percent the image is shrunk by
+\(30 means shrinking the image by 70%).  The default is the value of
+the `w3m-resize-image-scale' variable."
+  (interactive "P")
+  (unless (w3m-display-graphic-p)
+    (error "Can't display images in this environment"))
+  (unless (w3m-imagick-convert-program-available-p)
+    (error "ImageMagick's `convert' program is required"))
+  (let ((url (w3m-image)))
+    (if url
+	(w3m-resize-inline-image-internal
+	 url
+	 (- 100 (or rate w3m-resize-image-scale)))
+      (w3m-message "No image at point"))))
+
+(defun w3m-decode-entities (&optional keep-properties)
+  "Decode entities in the current buffer.
+If optional KEEP-PROPERTIES is non-nil, text property is reserved."
+  (save-excursion
+    (goto-char (point-min))
+    ;; Character entity references are case-sensitive.
+    ;; Cf. http://www.w3.org/TR/1999/REC-html401-19991224/charset.html#h-5.3.2
+    (let (case-fold-search start fid prop value)
+      (while (re-search-forward w3m-entity-regexp nil t)
+	(setq start (match-beginning 0)
+	      fid (get-text-property start 'w3m-form-field-id))
+	(unless (and fid
+		     (save-match-data
+		       (string-match "/type=\\(?:text\\|select\\)/name=[^/]+/"
+				     fid)))
+	  (when keep-properties
+	    (setq prop (text-properties-at start)))
+	  (unless (eq (char-after (match-end 1)) ?\;)
+	    (goto-char (match-end 1)))
+	  ;; Note that `w3m-entity-value' breaks `match-data' at the 1st
+	  ;; time in XEmacs because of the autoloading unicode.elc for
+	  ;; the `ucs-to-char' function.
+	  (when (setq value (w3m-entity-value (match-string 1)))
+	    (delete-region start (point))
+	    (insert value))
+	  (when prop
+	    (w3m-add-text-properties start (point) prop)))))))
+
+(defun w3m-decode-entities-string (str)
+  "Decode entities in the string STR."
+  (save-match-data
+    ;; Character entity references are case-sensitive.
+    ;; Cf. http://www.w3.org/TR/1999/REC-html401-19991224/charset.html#h-5.3.2
+    (let ((case-fold-search) (pos 0) (buf))
+      (while (string-match w3m-entity-regexp str pos)
+	(setq buf (cons (or (w3m-entity-value (match-string 1 str))
+			    (match-string 1 str))
+			(cons (substring str pos (match-beginning 0))
+			      buf))
+	      pos (if (eq (aref str (match-end 1)) ?\;)
+		      (match-end 0)
+		    (match-end 1))))
+      (if buf
+	  (apply 'concat (nreverse (cons (substring str pos) buf)))
+	str))))
+
+(defun w3m-encode-specials-string (str)
+  "Encode special characters in the string STR."
+  (let ((pos 0)
+	(buf))
+    (while (string-match "[<>&]" str pos)
+      (setq buf
+	    (cons ";"
+		  (cons (gethash (match-string 0 str) w3m-entity-reverse-table)
+			(cons "&"
+			      (cons (substring str pos (match-beginning 0))
+				    buf))))
+	    pos (match-end 0)))
+    (if buf
+	(apply 'concat (nreverse (cons (substring str pos) buf)))
+      str)))
+
+(defun w3m-fontify ()
+  "Fontify the current buffer."
+  (let ((case-fold-search t)
+	(inhibit-read-only t))
+    (w3m-message "Fontifying...")
+    (run-hooks 'w3m-fontify-before-hook)
+    ;; Remove hidden anchors like "<a href=url> </a>".
+    (goto-char (point-min))
+    (while (re-search-forward "<a[\t\n ]+[^>]+>[\t\n ]*</a>" nil t)
+      (delete-region (match-beginning 0) (match-end 0)))
+    ;; Delete <?xml ... ?> tag
+    (goto-char (point-min))
+    (if (search-forward "<?xml" nil t)
+	(let ((start (match-beginning 0)))
+	  (search-forward "?>" nil t)
+	  (delete-region start (match-end 0))
+	  (goto-char (point-min))))
+    ;; Delete extra title tag.
+    (let (start)
+      (and (search-forward "<title>" nil t)
+	   (setq start (match-beginning 0))
+	   (search-forward "</title>" nil t)
+	   (delete-region start (match-end 0))))
+    (w3m-fontify-bold)
+    (w3m-fontify-italic)
+    (w3m-fontify-strike-through)
+    (w3m-fontify-insert)
+    (w3m-fontify-underline)
+    (when w3m-use-symbol
+      (w3m-replace-symbol))
+    (w3m-fontify-anchors)
+    (when w3m-use-form
+      (w3m-fontify-forms))
+    (w3m-fontify-images)
+    ;; Remove other markups.
+    (goto-char (point-min))
+    (while (re-search-forward "</?[A-Za-z_][^>]*>" nil t)
+      (let* ((start (match-beginning 0))
+	     (fid (get-text-property start 'w3m-form-field-id)))
+	(if (and fid (string-match "/type=text\\(?:area\\)?/" fid))
+	    (goto-char (1+ start))
+	  (delete-region start (match-end 0)))))
+    ;; Decode escaped characters (entities).
+    (w3m-decode-entities 'reserve-prop)
+    (when w3m-use-form
+      (w3m-fontify-textareas))
+    (goto-char (point-min))
+    (when w3m-delete-duplicated-empty-lines
+      (while (re-search-forward "^[ \t]*\n\\(?:[ \t]*\n\\)+" nil t)
+	(delete-region (match-beginning 0) (1- (match-end 0)))))
+
+    ;; FIXME: The code above reduces number of empty lines but one line
+    ;; remains.  While such empty lines might have been inserted for
+    ;; making sure of rooms for displaying images, they all should be
+    ;; removed since they are useless for emacs-w3m.  However, currently
+    ;; we don't have a proper way to identify whether they were inserted
+    ;; intentionally by the author or not.  So, we decided to remove only
+    ;; that one at the beginning of the buffer though it is unwillingness.
+    (goto-char (point-min))
+    (skip-chars-forward "\t\n $B!!(B")
+    (delete-region (point-min) (point-at-bol))
+
+    (w3m-header-line-insert)
+    (put-text-property (point-min) (point-max)
+		       'w3m-safe-url-regexp w3m-safe-url-regexp)
+    (w3m-message "Fontifying...done")
+    (run-hooks 'w3m-fontify-after-hook)))
+
+(defun w3m-refontify-anchor (&optional buff)
+  "Refontify anchors as they have already arrived.
+It replaces the faces on the arrived anchors from `w3m-anchor' to
+`w3m-arrived-anchor'."
+  (with-current-buffer (or buff (current-buffer))
+    (let (prop)
+      (when (and (eq major-mode 'w3m-mode)
+		 (get-text-property (point) 'w3m-anchor-sequence)
+		 (setq prop (get-text-property (point) 'face))
+		 (listp prop)
+		 (member 'w3m-anchor prop))
+	(let ((start)
+	      (end (next-single-property-change (point) 'w3m-anchor-sequence))
+	      (inhibit-read-only t))
+	  (when (and end
+		     (setq start (previous-single-property-change
+				  end 'w3m-anchor-sequence))
+		     (w3m-arrived-p (get-text-property (point)
+						       'w3m-href-anchor)))
+	    (w3m-remove-face-property start end 'w3m-anchor)
+	    (w3m-remove-face-property start end 'w3m-arrived-anchor)
+	    (w3m-add-face-property start end 'w3m-arrived-anchor))
+	  (set-buffer-modified-p nil))))))
+
+(defun w3m-url-completion (url predicate flag)
+  "Completion function for URL."
+  (if (string-match "\\`\\(?:file:\\|[/~]\\|\\.\\.?/\\|[a-zA-Z]:\\)" url)
+      (if (eq flag 'lambda)
+	  (file-exists-p (w3m-url-to-file-name url))
+	(let* ((partial
+		(expand-file-name
+		 (cond
+		  ((string-match "\\`file:[^/]" url)
+		   (substring url 5))
+		  ((string-match "/\\(~\\)" url)
+		   (substring url (match-beginning 1)))
+		  (t (w3m-url-to-file-name url)))))
+	       (collection
+		(let ((dir (file-name-directory partial)))
+		  (mapcar
+		   (lambda (f)
+		     (list (w3m-expand-file-name-as-url f dir)))
+		   (file-name-all-completions (file-name-nondirectory partial)
+					      dir)))))
+	  (setq partial
+		(if (string-match "/\\.\\'" url)
+		    (concat (file-name-as-directory
+			     (w3m-expand-file-name-as-url partial))
+			    ".")
+		  (w3m-expand-file-name-as-url partial)))
+	  (cond
+	   ((not flag)
+	    (try-completion partial collection predicate))
+	   ((eq flag t)
+	    (all-completions partial collection predicate)))))
+    (cond
+     ((not flag)
+      (try-completion url w3m-arrived-db))
+     ((eq flag t)
+      (all-completions url w3m-arrived-db))
+     ((eq flag 'lambda)
+      (if (w3m-arrived-p url) t nil)))))
+
+(defun w3m-gmane-url-at-point ()
+  "Return a url that indicates the thread page in Gmane.
+This function works only when the cursor stays in the References
+header or the Message-ID header, otherwise returns nil.
+
+On the Message-ID header, the url that asks Gmane for the thread
+beginning with the current article will be generated.
+On the References header, the url that asks Gmane for the whole thread
+\(namely it begins with the article of the first ID in the header) will
+be generated.  In that case, Gmane might fail to find the thread since
+it is possible that the root article has been posted to another group.
+
+That it returns an invalid url for the article of the group which is
+not being archived in Gmane cannot be helped."
+  (save-excursion
+    (let ((fmt "http://news.gmane.org/group/thread=%s/force_load=t")
+	  (start (point))
+	  (inhibit-point-motion-hooks t)
+	  case-fold-search)
+      (goto-char (point-min))
+      (re-search-forward (concat "^\\(?:"
+				 (regexp-quote mail-header-separator)
+				 "\\)?$")
+			 nil 'move)
+      (when (< start (point))
+	(setq case-fold-search t)
+	(save-restriction
+	  (narrow-to-region (point-min) (point))
+	  (goto-char start)
+	  (beginning-of-line)
+	  (while (and (memq (char-after) '(?\t ? ))
+		      (zerop (forward-line -1))))
+	  (when (looking-at
+		 "\\(?:Message-ID\\|References\\):[\t\n ]*<\\([^\t\n <>]+\\)>")
+	    (format
+	     fmt
+	     (w3m-url-encode-string (match-string-no-properties 1)
+				    nil t))))))))
+
+(defun w3m-header-line-url ()
+  "Return w3m-current-url if point on header line."
+  (let ((faces (get-text-property (point) 'face)))
+    (when (and (eq major-mode 'w3m-mode)
+	       (listp faces)
+	       (or (memq 'w3m-header-line-location-title faces)
+		   (memq 'w3m-header-line-location-content faces))
+	       w3m-current-url)
+      w3m-current-url)))
+
+(eval-and-compile
+  (autoload 'ffap-url-at-point "ffap")
+  (defalias 'w3m-url-at-point
+    (cond ((and (featurep 'xemacs) (featurep 'mule))
+	   (lambda nil "\
+Like `ffap-url-at-point', except that text props will be stripped and
+iso646 characters are unified into ascii characters."
+	     (or (w3m-gmane-url-at-point)
+		 (w3m-header-line-url)
+		 (let ((left (buffer-substring-no-properties (point-at-bol)
+							     (point)))
+		       (right (buffer-substring-no-properties (point)
+							      (point-at-eol)))
+		       (regexp (format "[%c-%c]"
+				       (make-char 'latin-jisx0201 33)
+				       (make-char 'latin-jisx0201 126)))
+		       (diff (- (char-to-int (make-char 'latin-jisx0201 33))
+				33))
+		       index)
+		   (while (setq index (string-match regexp left))
+		     (aset left index (- (aref left index) diff)))
+		   (while (setq index (string-match regexp right))
+		     (aset right index (- (aref right index) diff)))
+		   (with-temp-buffer
+		     (insert right)
+		     (goto-char (point-min))
+		     (insert left)
+		     (ffap-url-at-point))))))
+	  ((featurep 'xemacs)
+	   (lambda nil "\
+Like `ffap-url-at-point', except that text props will be stripped."
+	     (or (w3m-gmane-url-at-point)
+		 (w3m-header-line-url)
+		 (unless (fboundp 'ffap-url-at-point)
+		   ;; It is necessary to bind `ffap-xemacs'.
+		   (load "ffap" nil t))
+		 (let (ffap-xemacs)
+		   (ffap-url-at-point)))))
+	  (t
+	   (lambda nil
+	     (or (w3m-gmane-url-at-point)
+		 (w3m-header-line-url)
+		 (ffap-url-at-point)))))))
+
+(eval-after-load "ffap"
+  '(progn
+     ;; Under XEmacs, `ffap-url-regexp' won't match to https urls.
+     (if (and ffap-url-regexp
+	      (not (string-match ffap-url-regexp "https://foo"))
+	      (string-match "\\((\\|\\\\|\\)\\(http\\)\\(\\\\|\\|\\\\)\\)"
+			    ffap-url-regexp))
+	 (setq ffap-url-regexp (replace-match "\\1\\2s?\\3"
+					      nil nil ffap-url-regexp)))
+     ;; Add nntp:.
+     (if (and ffap-url-regexp
+	      (not (string-match ffap-url-regexp "nntp://bar"))
+	      (string-match "\\(\\\\(news\\\\(post\\\\)\\?:\\)\\(\\\\|\\)"
+			    ffap-url-regexp))
+	 (setq ffap-url-regexp (replace-match "\\1\\\\|nntp:\\2"
+					      nil nil ffap-url-regexp)))))
+
+(defun w3m-active-region-or-url-at-point (&optional default=current)
+  "Return an active region or a url around the cursor.
+In Transient Mark mode, deactivate the mark.  If DEFAULT=CURRENT is
+non-nil, return the url of the current page by default."
+  (if (w3m-region-active-p)
+      (prog1
+	  (let ((string (buffer-substring-no-properties
+			 (region-beginning) (region-end))))
+	    (with-temp-buffer
+	      (insert string)
+	      (skip-chars-backward "\t\n\f\r $B!!(B")
+	      (delete-region (point) (point-max))
+	      (goto-char (point-min))
+	      (skip-chars-forward "\t\n\f\r $B!!(B")
+	      (delete-region (point-min) (point))
+	      (while (re-search-forward "\
+\\(?:[\t\f\r $B!!(B]+\n[\t\f\r $B!!(B]*\\|[\t\f\r $B!!(B]*\n[\t\f\r $B!!(B]+\\)+" nil t)
+		(delete-region (match-beginning 0) (match-end 0)))
+	      (buffer-string)))
+	(w3m-deactivate-region))
+    (or (w3m-url-at-point)
+	(w3m-anchor)
+	(unless w3m-display-inline-images
+	  (w3m-image))
+	(and default=current
+	     (stringp w3m-current-url)
+	     (if (string-match "\\`about://\\(?:header\\|source\\)/"
+			       w3m-current-url)
+		 (substring w3m-current-url (match-end 0))
+	       w3m-current-url)))))
+
+(defun w3m-canonicalize-url (url &optional feeling-lucky)
+  "Add a scheme part to an URL or make an URL for \"I'm Feeling Lucky on Google\"
+if it has no scheme part."
+  (w3m-string-match-url-components url)
+  (cond
+   ((match-beginning 1)
+    url)
+   ((and (file-name-absolute-p url) (file-exists-p url))
+    (concat "file://" url))
+   (feeling-lucky
+    (let* ((charset w3m-google-feeling-lucky-charset)
+	   (cs (w3m-charset-to-coding-system charset))
+	   (str (w3m-url-encode-string url cs t)))
+      (format (concat "http://www.google.com/search"
+		      "?btnI=I%%27m+Feeling+Lucky&ie=%s&oe=%s&q=%s")
+	      charset charset str)))
+   (t
+    (concat "http://" url))))
+
+(defun w3m-input-url (&optional prompt initial default quick-start
+				feeling-lucky)
+  "Read a url from the minibuffer, prompting with string PROMPT."
+  (let (url)
+    (w3m-arrived-setup)
+    (cond ((null initial)
+	   (when (and (setq initial (w3m-active-region-or-url-at-point t))
+		      (not (string-match "[^\000-\177]" initial)))
+	     (setq initial (w3m-url-decode-string initial
+						  w3m-current-coding-system))))
+	  ((string= initial "")
+	   (setq initial nil)))
+    (when initial
+      (setq initial (w3m-puny-decode-url initial)))
+    (cond ((null default)
+	   (setq default w3m-home-page))
+	  ((string= default "")
+	   (setq default nil)))
+    (if (and quick-start
+	     default
+	     (not initial))
+	default
+      (unless w3m-enable-google-feeling-lucky
+	(setq feeling-lucky nil))
+      (setq url (let ((minibuffer-setup-hook
+		       (append minibuffer-setup-hook
+			       (list (lambda ()
+				       (beginning-of-line)
+				       (if (looking-at "[a-z]+:\\(?:/+\\)?")
+					   (goto-char (match-end 0)))))))
+		      (ofunc (lookup-key minibuffer-local-completion-map " ")))
+		  (when feeling-lucky
+		    (define-key minibuffer-local-completion-map " "
+		      'self-insert-command))
+		  (unwind-protect
+		      (completing-read
+		       (if prompt
+			   (if default
+			       (progn
+				 (when (string-match " *: *\\'" prompt)
+				   (setq prompt
+					 (substring prompt 0
+						    (match-beginning 0))))
+				 (concat prompt " (default "
+					 (if (equal default w3m-home-page)
+					     "HOME"
+					   default)
+					 "): "))
+			     prompt)
+			 (if default
+			     (format "URL %s(default %s): "
+				     (if feeling-lucky "or Keyword " "")
+				     (if (stringp default)
+					 (if (eq default w3m-home-page)
+					     "HOME" default)
+				       (prin1-to-string default)))
+			   (if feeling-lucky "URL or Keyword: " "URL: ")))
+		       'w3m-url-completion nil nil initial
+		       'w3m-input-url-history default)
+		    (define-key minibuffer-local-completion-map " " ofunc))))
+      (if (stringp url)
+	  (progn
+	    ;; remove duplication
+	    (setq w3m-input-url-history
+		  (cons url (delete url w3m-input-url-history)))
+	    (w3m-canonicalize-url url feeling-lucky))
+	;; It may be `popup'.
+	url))))
+
+;;; Cache:
+(defun w3m-cache-setup ()
+  "Initialize the variables for managing the cache."
+  (unless (and (bufferp w3m-cache-buffer)
+	       (buffer-live-p w3m-cache-buffer))
+    (with-current-buffer (w3m-get-buffer-create " *w3m cache*")
+      (buffer-disable-undo)
+      (set-buffer-multibyte nil)
+      (setq buffer-read-only t
+	    w3m-cache-buffer (current-buffer)
+	    w3m-cache-hashtb (make-vector 1021 0)))))
+
+(defun w3m-cache-shutdown ()
+  "Clear all the variables managing the cache, and the cache itself."
+  (when (buffer-live-p w3m-cache-buffer)
+    (kill-buffer w3m-cache-buffer))
+  (setq w3m-cache-hashtb nil
+	w3m-cache-articles nil))
+
+(defun w3m-cache-header-delete-variable-part (header)
+  (let (buf flag)
+    (dolist (line (split-string header "\n+"))
+      (if (string-match "\\`\\(?:Date\\|Server\\|W3m-[^:]+\\):" line)
+	  (setq flag t)
+	(unless (and flag (string-match "\\`[ \t]" line))
+	  (setq flag nil)
+	  (push line buf))))
+    (mapconcat (function identity) (nreverse buf) "\n")))
+
+(defun w3m-cache-header (url header &optional overwrite)
+  "Store HEADER into the cache so that it corresponds to URL.
+If OVERWRITE is non-nil, it forces the storing even if there has
+already been the data corresponding to URL in the cache."
+  (w3m-cache-setup)
+  (let ((ident (intern url w3m-cache-hashtb)))
+    (if (boundp ident)
+	(if (and
+	     (not overwrite)
+	     (string=
+	      (w3m-cache-header-delete-variable-part header)
+	      (w3m-cache-header-delete-variable-part (symbol-value ident))))
+	    (symbol-value ident)
+	  (w3m-cache-remove url)
+	  (set ident header))
+      (set ident header))))
+
+(defun w3m-cache-request-header (url)
+  "Return the header string of URL when it is stored in the cache."
+  (w3m-cache-setup)
+  (let ((ident (intern url w3m-cache-hashtb)))
+    (and (boundp ident)
+	 (symbol-value ident))))
+
+(defun w3m-cache-remove-oldest ()
+  (with-current-buffer w3m-cache-buffer
+    (goto-char (point-min))
+    (unless (zerop (buffer-size))
+      (let ((ident (get-text-property (point) 'w3m-cache))
+	    (inhibit-read-only t))
+	;; Remove the ident from the list of articles.
+	(when ident
+	  (setq w3m-cache-articles (delq ident w3m-cache-articles)))
+	;; Delete the article itself.
+	(delete-region (point)
+		       (next-single-property-change
+			(1+ (point)) 'w3m-cache nil (point-max)))))))
+
+(defun w3m-cache-remove (url)
+  "Remove the data coresponding to URL from the cache."
+  (w3m-cache-setup)
+  (let ((ident (intern url w3m-cache-hashtb))
+	beg end)
+    (when (memq ident w3m-cache-articles)
+      ;; It was in the cache.
+      (with-current-buffer w3m-cache-buffer
+	(let ((inhibit-read-only t))
+	  (when (setq beg (text-property-any
+			   (point-min) (point-max) 'w3m-cache ident))
+	    ;; Find the end (i. e., the beginning of the next article).
+	    (setq end (next-single-property-change
+		       (1+ beg) 'w3m-cache (current-buffer) (point-max)))
+	    (delete-region beg end)))
+	(setq w3m-cache-articles (delq ident w3m-cache-articles))))))
+
+(defun w3m-cache-contents (url buffer)
+  "Store the contents of URL into the cache.
+The contents are assumed to be in BUFFER.  Return a symbol which
+identifies the data in the cache."
+  (w3m-cache-setup)
+  (let ((ident (intern url w3m-cache-hashtb)))
+    (w3m-cache-remove url)
+    ;; Remove the oldest article, if necessary.
+    (and (numberp w3m-keep-cache-size)
+	 (>= (length w3m-cache-articles) w3m-keep-cache-size)
+	 (w3m-cache-remove-oldest))
+    ;; Insert the new article.
+    (with-current-buffer w3m-cache-buffer
+      (let ((inhibit-read-only t))
+	(goto-char (point-max))
+	(let ((b (point)))
+	  (insert-buffer-substring buffer)
+	  ;; Tag the beginning of the article with the ident.
+	  (when (> (point-max) b)
+	    (w3m-add-text-properties b (1+ b) (list 'w3m-cache ident))
+	    (setq w3m-cache-articles (cons ident w3m-cache-articles))
+	    ident))))))
+
+(defun w3m-cache-request-contents (url &optional buffer)
+  "Insert contents of URL into BUFFER.
+Return t if the contents are found in the cache, otherwise nil.  When
+BUFFER is nil, all contents will be inserted in the current buffer."
+  (w3m-cache-setup)
+  (let ((ident (intern url w3m-cache-hashtb)))
+    (when (memq ident w3m-cache-articles)
+      ;; It was in the cache.
+      (let (beg end)
+	(with-current-buffer w3m-cache-buffer
+	  (if (setq beg (text-property-any
+			 (point-min) (point-max) 'w3m-cache ident))
+	      ;; Find the end (i.e., the beginning of the next article).
+	      (setq end (next-single-property-change
+			 (1+ beg) 'w3m-cache (current-buffer) (point-max)))
+	    ;; It wasn't in the cache after all.
+	    (setq w3m-cache-articles (delq ident w3m-cache-articles))))
+	(and beg
+	     end
+	     (with-current-buffer (or buffer (current-buffer))
+	       (let ((inhibit-read-only t))
+		 (insert-buffer-substring w3m-cache-buffer beg end))
+	       t))))))
+
+;; FIXME: we need to check whether contents were updated in remote servers.
+(defun w3m-cache-available-p (url)
+  "Return non-nil if a content of URL has already been cached."
+  (w3m-cache-setup)
+  (when (stringp url)
+    (let ((ident (intern url w3m-cache-hashtb)))
+      (and
+       (memq ident w3m-cache-articles)
+       (or
+	w3m-prefer-cache
+	(save-match-data
+	  (let ((case-fold-search t)
+		(head (and (boundp ident) (symbol-value ident)))
+		time expire)
+	    (cond
+	     ((and (string-match "^\\(?:date\\|etag\\):[ \t]" head)
+		   (or (string-match "^pragma:[ \t]+no-cache\n" head)
+		       (string-match
+			"^cache-control:\\(?:[^\n]+\\)?[ \t,]\\(?:no-cache\\|max-age=0\\)[,\n]"
+			head)))
+	      nil)
+	     ((and
+	       (string-match "^date:[ \t]\\([^\n]+\\)\n" head)
+	       (setq time (match-string 1 head))
+	       (setq time (w3m-time-parse-string time))
+	       (string-match "^cache-control:\\(?:[^\n]+\\)?[ \t,]max-age=\\([1-9][0-9]*\\)"
+			     head)
+	       (setq expire (string-to-number (match-string 1 head))))
+	      (setq time (decode-time time))
+	      (setcar time (+ (car time) expire))
+	      ;; Work around too large integer.
+	      (when (floatp (car time))
+		(setcar time (eval '(lsh -1 -1))))
+	      (setq expire (apply 'encode-time time))
+	      (w3m-time-newer-p expire (current-time)))
+	     ((and
+	       (string-match "^expires:[ \t]+\\([^\n]+\\)\n" head)
+	       (setq expire (match-string 1 head))
+	       (setq expire (w3m-time-parse-string expire)))
+	      (w3m-time-newer-p expire (current-time)))
+	     (t
+	      ;; Adhoc heuristic rule: pages with neither
+	      ;; Last-Modified header and ETag header are treated as
+	      ;; dynamically-generated pages.
+	      (string-match "^\\(?:last-modified\\|etag\\):" head))))))
+       ident))))
+
+(defun w3m-read-file-name (&optional prompt dir default existing)
+  (when default
+    (setq default (file-name-nondirectory (w3m-url-strip-query default))))
+  (unless prompt
+    (setq prompt (if (and default (not (string-equal default "")))
+		     (format "Save to (%s): " default)
+		   "Save to: ")))
+  (setq dir (file-name-as-directory (or dir w3m-default-save-directory)))
+  (let ((default-directory dir)
+	(file (read-file-name prompt dir nil existing default)))
+    (if (not (file-directory-p file))
+	(setq w3m-default-save-directory
+	      (or (file-name-directory file) w3m-default-save-directory))
+      (setq w3m-default-save-directory file)
+      (if default
+	  (setq file (expand-file-name default file))))
+    (expand-file-name file)))
+
+;;; Handling character sets:
+(defun w3m-charset-to-coding-system (charset)
+  "Return a coding system which is most suitable to CHARSET.
+CHARSET is a symbol whose name is MIME charset.
+This function is imported from mcharset.el."
+  (if (stringp charset)
+      (setq charset (intern (downcase charset))))
+  (let ((cs (assq charset w3m-charset-coding-system-alist)))
+    (w3m-find-coding-system (if cs (cdr cs) charset))))
+
+(defun w3m-coding-system-to-charset (coding-system)
+  "Return the MIME charset corresponding to CODING-SYSTEM."
+  (when coding-system
+    (w3m-static-if (featurep 'xemacs)
+	(when (or (fboundp 'coding-system-to-mime-charset)
+		  (progn
+		    (require 'mcharset)
+		    (fboundp 'coding-system-to-mime-charset)))
+	  (defalias 'w3m-coding-system-to-charset
+	    'coding-system-to-mime-charset)
+	  (w3m-coding-system-to-charset coding-system))
+      (or (coding-system-get coding-system :mime-charset)
+	  (coding-system-get coding-system 'mime-charset)))))
+
+;; FIXME: we need to investigate the kind of Content-Charsets being
+;; actually possible.
+(defun w3m-read-content-charset (prompt &optional default)
+  "Read a content charset from the minibuffer, prompting with string PROMPT.
+The second argument DEFAULT is the default value, which is used as the
+value to return if the user enters the empty string."
+  (let ((charset (completing-read
+		  prompt
+		  (nconc
+		   (mapcar (lambda (c) (cons (symbol-name c) c))
+			   (coding-system-list))
+		   (mapcar (lambda (c) (cons (symbol-name (car c)) c))
+			   w3m-charset-coding-system-alist))
+		  nil t)))
+    (if (string= "" charset)
+	default
+      charset)))
+
+
+;;; Handling encoding of contents:
+(defun w3m-decode-encoded-contents (encoding)
+  "Decode encoded contents in the current buffer.
+It supports the encoding types of gzip, bzip2, deflate, etc."
+  (let ((x (and (stringp encoding)
+		(assoc (downcase encoding) w3m-encoding-alist))))
+    (or (not (and x (setq x (cdr (assq (cdr x) w3m-decoder-alist)))))
+	(let ((coding-system-for-write 'binary)
+	      (coding-system-for-read 'binary)
+	      (default-process-coding-system (cons 'binary 'binary)))
+	  (w3m-process-with-environment w3m-command-environment
+	    (zerop (apply 'call-process-region
+			  (point-min) (point-max)
+			  (w3m-which-command (car x))
+			  t '(t nil) nil (cadr x))))))))
+
+(defmacro w3m-correct-charset (charset)
+  `(or (and ,charset (stringp ,charset)
+	    (cdr (assoc (downcase ,charset) w3m-correct-charset-alist)))
+       ,charset))
+
+(defun w3m-detect-meta-charset ()
+  (let ((case-fold-search t))
+    (goto-char (point-min))
+    (catch 'found
+      (while (re-search-forward "<meta[ \t\r\f\n]+" nil t)
+	(w3m-parse-attributes ((http-equiv :case-ignore)
+			       (content :case-ignore))
+	  (when (and (string= http-equiv "content-type")
+		     content
+		     (string-match ";[ \t\n]*charset=\\([^\";]+\\)" content))
+	    (throw 'found (match-string 1 content))))))))
+
+(defun w3m-detect-xml-charset ()
+  (let ((case-fold-search t))
+    (goto-char (point-min))
+    (when (looking-at "[ \t\r\f\n]*<\\?xml[ \t\r\f\n]+")
+      (goto-char (match-end 0))
+      (or (w3m-parse-attributes ((encoding :case-ignore))
+	    encoding)
+	  "utf-8"))))
+
+(defvar w3m-compatible-encoding-alist
+  '((gb2312 . gbk)
+    (iso-8859-1 . windows-1252)
+    (iso-8859-8 . windows-1255)
+    (iso-8859-9 . windows-1254))
+  "Alist of encodings and those supersets.
+The cdr of each element is used to decode data if it is available when
+the car is what the data specify as the encoding.  Or, the car is used
+for decoding when the cdr that the data specify is not available.")
+
+(defvar w3m-view-source-decode-level 0
+  "Say whether `w3m-view-source' decodes html sources.
+Users should never modify the value.  See also `w3m-view-source'.")
+
+(defun w3m-decode-buffer (url &optional content-charset content-type)
+  (let* ((sourcep (string-match "\\`about://source/" url))
+	 (level (if sourcep w3m-view-source-decode-level 0))
+	 cs)
+    (unless (>= level 4)
+      (unless content-type
+	(setq content-type (w3m-content-type url)))
+      (unless content-charset
+	(setq content-charset
+	      (or (w3m-content-charset url)
+		  (when (or (string= "text/html" content-type) sourcep)
+		    (w3m-detect-meta-charset))
+		  (w3m-detect-xml-charset))))
+      (cond
+       ((or (and (stringp content-charset)
+		 (string= "x-moe-internal" (downcase content-charset)))
+	    (eq content-charset 'x-moe-internal))
+	(setq cs (w3m-x-moe-decode-buffer))
+	(setq content-charset (symbol-name cs)))
+       (content-charset
+	(setq content-charset (w3m-correct-charset content-charset))
+	(setq cs (w3m-charset-to-coding-system content-charset))))
+      (setq w3m-current-content-charset content-charset)
+      (unless cs
+	(setq cs (w3m-detect-coding-region
+		  (point-min) (point-max) (if (w3m-url-local-p url)
+					      nil
+					    w3m-coding-system-priority-list))))
+      (setq w3m-current-coding-system
+	    (or (w3m-find-coding-system
+		 (cdr (assq cs w3m-compatible-encoding-alist)))
+		(w3m-find-coding-system cs)
+		(w3m-find-coding-system
+		 (car (rassq cs w3m-compatible-encoding-alist)))))
+      ;; Decode `&#nnn;' entities in 128..159 and 160.
+      (when (and (<= level 1)
+		 (rassq w3m-current-coding-system
+			w3m-compatible-encoding-alist))
+	(goto-char (point-min))
+	(let ((case-fold-search t))
+	  (while (re-search-forward "\
+\\(?:&#\\(12[89]\\|1[3-5][0-9]\\)\;\\)\\|\\(?:&#x\\([89][0-9a-f]\\)\;\\)"
+				    nil t)
+	    (insert (prog1
+			(if (match-beginning 1)
+			    (string-to-number (match-string 1))
+			  (string-to-number (match-string 2) 16))
+		      (delete-region (match-beginning 0) (match-end 0)))))
+	  (goto-char (point-min))
+	  (while (re-search-forward "\240\\|&#160;\\|&#xa0;" nil t)
+	    (replace-match "&nbsp;"))))
+      (insert
+       (prog1
+	   (decode-coding-string (buffer-string) w3m-current-coding-system)
+	 (erase-buffer)
+	 (set-buffer-multibyte t))))))
+
+(defun w3m-x-moe-decode-buffer ()
+  (let ((args '("-i" "-cs" "x-moe-internal"))
+	(coding-system-for-read 'binary)
+	(coding-system-for-write 'binary)
+	(default-process-coding-system (cons 'binary 'binary))
+	charset)
+    (if (w3m-find-coding-system 'utf-8)
+	(setq args (append args '("-o" "-cs" "utf-8"))
+	      charset 'utf-8)
+      (setq args
+	    (append args (list "-o" "-cs" (symbol-name w3m-coding-system))))
+      (setq charset w3m-coding-system))
+    (w3m-process-with-environment w3m-command-environment
+      (apply 'call-process-region (point-min) (point-max)
+	     w3m-mbconv-command t t nil args))
+    charset))
+
+(defun w3m-safe-decode-buffer (url &optional content-charset content-type)
+  (and (not w3m-current-coding-system)
+       (stringp content-type)
+       (string-match "\\`text/" content-type)
+       (w3m-decode-buffer url content-charset content-type)))
+
+;;; Retrieving local data:
+(defun w3m-local-file-type (url)
+  "Return the content type and the content encoding of URL."
+  (setq url (or (w3m-url-to-file-name url)
+		(file-name-nondirectory url)))
+  (if (or (and (file-name-absolute-p url)
+	       (file-directory-p url))
+	  (string-match "\\`news:" url)) ;; FIXME: isn't this a kludge?
+      (cons "text/html" nil)
+    (let ((encoding
+	   (catch 'encoding-detected
+	     (dolist (elem w3m-encoding-type-alist)
+	       (when (string-match (car elem) url)
+		 (setq url (substring url 0 (match-beginning 0)))
+		 (throw 'encoding-detected (cdr elem)))))))
+      (cons (catch 'type-detected
+	      (dolist (elem w3m-content-type-alist)
+		(when (and (cadr elem) (string-match (cadr elem) url))
+		  (throw 'type-detected (car elem))))
+	      "unknown")
+	    encoding))))
+
+(defmacro w3m-local-content-type (url)
+  `(car (w3m-local-file-type ,url)))
+
+(defun w3m-local-attributes (url &rest args)
+  "Return a list of attributes corresponding to URL.
+Return nil if it failed in retrieving of the header.
+Otherwise, return a list which includes the following elements:
+
+ 0. Type of contents.
+ 1. Charset of contents.
+ 2. Size in bytes.
+ 3. Encoding of contents.
+ 4. Last modification time.
+ 5. Real URL.
+"
+  (let* ((file (w3m-url-to-file-name url))
+	 (attr (when (file-exists-p file)
+		 (file-attributes file)))
+	 (type (w3m-local-file-type url)))
+    (list (or (w3m-arrived-content-type url) (car type))
+	  nil
+	  (nth 7 attr)
+	  (cdr type)
+	  (nth 5 attr)
+	  (w3m-expand-file-name-as-url (file-truename file)))))
+
+(defun w3m-local-retrieve (url &optional no-uncompress &rest args)
+  "Retrieve contents of local URL and put it into the current buffer.
+This function will return the content-type of URL as a string when
+retrieval is successful."
+  (let ((file (w3m-url-to-file-name url)))
+    (when (file-readable-p file)
+      (if (file-directory-p file)
+	  (w3m-local-dirlist-cgi url)
+	(let ((coding-system-for-read 'binary))
+	  (if no-uncompress
+	      (let (jka-compr-compression-info-list
+		    format-alist)
+		(insert-file-contents file))
+	    (insert-file-contents file))))
+      (or (w3m-arrived-content-type url)
+	  (w3m-local-content-type file)))))
+
+(defun w3m-local-dirlist-cgi (url)
+  (w3m-message "Reading %s..." (w3m-url-readable-string url))
+  (if w3m-dirlist-cgi-program
+      (if (file-executable-p w3m-dirlist-cgi-program)
+	  (let ((coding-system-for-read 'binary)
+		(default-process-coding-system
+		  (cons 'binary 'binary))
+		(lcookie (make-temp-name
+			  (format "%s.%d." (user-login-name) (emacs-pid))))
+		(cfile (make-temp-name
+			(expand-file-name "w3melck" w3m-profile-directory)))
+		(env (copy-sequence w3m-command-environment))
+		file)
+	    (with-temp-buffer
+	      (insert lcookie)
+	      (write-region (point-min) (point-max) cfile 'nomsg))
+	    (w3m-process-with-environment
+		(append
+		 (list
+		  (cons "LOCAL_COOKIE" lcookie)
+		  (cons "LOCAL_COOKIE_FILE" cfile)
+		  (cons "QUERY_STRING"
+			(format
+			 "dir=%s&cookie=%s"
+			 (encode-coding-string (w3m-url-to-file-name url)
+					       w3m-file-name-coding-system)
+			 lcookie)))
+		 (delq (assoc "LOCAL_COOKIE" env)
+		       (delq (assoc "LOCAL_COOKIE_FILE" env)
+			     (delq (assoc "QUERY_STRING" env) env))))
+	      (call-process w3m-dirlist-cgi-program nil t nil))
+	    ;; delete local cookie file
+	    (when (and (file-exists-p cfile) (file-writable-p cfile))
+	      (delete-file cfile))
+	    (goto-char (point-min))
+	    (when (re-search-forward "^<html>" nil t)
+	      (delete-region (point-min) (match-beginning 0))
+	      (while (re-search-forward "<a href=\"\\([^\"]+\\)\"\\(?:>\\| \\)"
+					nil t)
+		(setq file (match-string 1))
+		(delete-region (goto-char (match-beginning 1)) (match-end 1))
+		(if (file-directory-p file)
+		    (setq file (w3m-expand-file-name-as-url
+				(file-name-as-directory file)))
+		  (setq file (w3m-expand-file-name-as-url file)))
+		(insert (encode-coding-string
+			 (w3m-url-decode-string file
+						w3m-file-name-coding-system)
+			 w3m-file-name-coding-system)))))
+	(error "Can't execute: %s" w3m-dirlist-cgi-program))
+    ;; execute w3m internal CGI
+    (w3m-process-with-wait-handler
+      (setq w3m-current-url url)
+      (w3m-process-start handler
+			 w3m-command
+			 (append w3m-command-arguments
+				 (list "-dump_source" url)))))
+  ;; bind charset to w3m-file-name-coding-system
+  (let ((charset (or (car (rassq w3m-file-name-coding-system
+				 w3m-charset-coding-system-alist))
+		     w3m-file-name-coding-system))
+	beg)
+    (goto-char (point-min))
+    (when (search-forward "<head>" nil t)
+      (insert "\n<meta http-equiv=\"CONTENT-TYPE\" "
+	      "content=\"text/html; charset="
+	      (symbol-name charset)
+	      "\">"))
+    (goto-char (point-min))
+    ;; Remove <form>...</form>
+    (when (search-forward "<form " nil t)
+      (setq beg (match-beginning 0))
+      (when (search-forward "</form>" nil t)
+	(delete-region beg (match-end 0)))))
+  (w3m-message "Reading %s...done" (w3m-url-readable-string url)))
+
+;;; Retrieving data via HTTP:
+(defun w3m-remove-redundant-spaces (str)
+  "Remove leading and trailing whitespace from STR."
+  (save-match-data
+    (when (string-match "\\`[ \t\r\f\n]+" str)
+      (setq str (substring str (match-end 0))))
+    (if (string-match "[ \t\r\f\n]+\\'" str)
+	(substring str 0 (match-beginning 0))
+      str)))
+
+(defun w3m-w3m-parse-header (url header)
+  "Parse a given string HEADER as a MIME header of URL.
+Return a list which includes:
+
+ 0. Status code.
+ 1. Type of contents.
+ 2. Charset of contents.
+ 3. Size in bytes.
+ 4. Encoding of contents.
+ 5. Last modification time.
+ 6. Real URL.
+"
+  (let ((case-fold-search t)
+	(headers)
+	(status))
+    (dolist (line (split-string header "[ \f\t\r]*\n"))
+      (cond
+       ((string-match "\\`HTTP/1\\.[0-9] \\([0-9][0-9][0-9]\\)\\b" line)
+	(setq status (string-to-number (match-string 1 line))))
+       ((string-match (eval-when-compile
+			(concat "\\`\\("
+				(regexp-opt
+				 '(;; MEMO: $B%U%!%$%k$r%@%&%s%m!<%I$9$k(B
+				   ;; $B$H$-$N(B $BE,@Z$J%G%U%)%k%HL>$r7hDj(B
+				   ;; $B$9$k$?$a$K$O(B content-disposition
+				   ;; $B$N2r<a$,I,MW!%(B
+				   "content-disposition"
+				   "content-encoding"
+				   "content-length"
+				   ;; MEMO: See [emacs-w3m:02341].
+				   "content-transfer-encoding"
+				   "content-type"
+				   "last-modified"
+				   "location"
+				   "w3m-current-url"
+				   "w3m-document-charset"
+				   "w3m-ssl-certificate"
+				   "x-w3m-content-encoding"
+				   "alternates"))
+				"\\):[ \t]*"))
+		      line)
+	(push (cons (downcase (match-string 1 line))
+		    (substring line (match-end 0)))
+	      headers))))
+    (let (alt real-url type charset xmoe)
+      (when (and (setq alt (cdr (assoc "alternates" headers)))
+		 (string-match "\\`{[\t ]*\"\\(.+\\)\"" alt))
+	(setq real-url (w3m-expand-url (match-string 1 alt) url))
+	(when (string-match "{[\t ]*type[\t ]+\\([^\t }]+\\)" alt)
+	  (setq type (downcase (match-string 1 alt))))
+	(when (string-match "{[\t ]*charset[\t ]+\\([^\t }]+\\)" alt)
+	  (setq charset (downcase (match-string 1 alt)))))
+      (when (and (not type)
+		 (setq type (cdr (assoc "content-type" headers))))
+	(if (string-match ";[ \t]*charset=\"?\\([^\"]+\\)\"?" type)
+	    (setq charset (w3m-remove-redundant-spaces
+			   (match-string 1 type))
+		  type (w3m-remove-redundant-spaces
+			(substring type 0 (match-beginning 0))))
+	  (setq type (w3m-remove-redundant-spaces type)))
+	(when (string-match ";" type)
+	  (setq type (substring type 0 (match-beginning 0))))
+	(setq type (downcase type)))
+      (setq w3m-current-ssl (cdr (assoc "w3m-ssl-certificate" headers)))
+      (when (string-match "\\`ftps?:" url)
+	(setq url (or (cdr (assoc "w3m-current-url" headers))
+		      url)))
+      (when (and (setq xmoe (cdr (assoc "w3m-document-charset" headers)))
+		 (string= xmoe "x-moe-internal"))
+	(setq charset xmoe))
+      (list status
+	    (if (string-match "\\`ftps?:.*/\\'" url)
+		"text/html"
+	      (or type (w3m-local-content-type url)))
+	    (if (string-match "\\`ftps?:.*/\\'" url)
+		(if w3m-accept-japanese-characters
+		    "w3m-euc-japan" "w3m-iso-latin-1")
+	      charset)
+	    (let ((v (cdr (assoc "content-length" headers))))
+	      (and v (setq v (string-to-number v)) (> v 0) v))
+	    (cdr (or (assoc "content-encoding" headers)
+		     (assoc "x-w3m-content-encoding" headers)))
+	    (let ((v (cdr (assoc "last-modified" headers))))
+	      (and v (w3m-time-parse-string v)))
+	    (or real-url
+		(let ((v (cdr (assoc "location" headers))))
+		  ;; RFC2616 says that the field value of the Location
+		  ;; response-header consists of a single absolute
+		  ;; URI.  However, some broken servers return
+		  ;; relative URIs.
+		  (and v (w3m-expand-url v url)))
+		url)))))
+
+(defun w3m-w3m-dump-head (url handler)
+  "Return the header string of URL."
+  (lexical-let ((url url)
+		(silent w3m-message-silent))
+    (w3m-message "Request sent, waiting for response...")
+    (w3m-process-do-with-temp-buffer
+	(success (progn
+		   (setq w3m-current-url url
+			 url (w3m-url-strip-authinfo url))
+		   (w3m-process-start handler
+				      w3m-command
+				      (append w3m-command-arguments
+					      (list "-o" "follow_redirection=0"
+						    "-dump_head" url)))))
+      (let ((w3m-message-silent silent))
+	(w3m-message "Request sent, waiting for response...done")
+	(when success
+	  (buffer-string))))))
+
+(defun w3m-w3m-canonicalize-url (url)
+  "Add a slash to an URL, when its server part is not ended with a slash."
+  ;; Because URLs encountered in WEB documents are no less reliable
+  ;; than URLs given by users, a minimum canonicalization may be
+  ;; required in the backend side.  For more detail, please see
+  ;; [emacs-w3m:07000].
+  (if (string-match "\\`\\(?:ht\\|f\\)tps?://[^/]+\\'" url)
+      (concat url "/")
+    url))
+
+(defun w3m-w3m-attributes (url no-cache handler)
+  "Return a list of attributes corresponding to URL.
+Return nil if it failed in retrieving of the header.
+Otherwise, return a list which includes the following elements:
+
+ 0. Type of contents.
+ 1. Charset of contents.
+ 2. Size in bytes.
+ 3. Encoding of contents.
+ 4. Last modification time.
+ 5. Real URL.
+
+If the optional argument NO-CACHE is non-nil, cache is not used."
+  (w3m-w3m-attributes-1 (w3m-w3m-canonicalize-url url)
+			no-cache
+			(or w3m-follow-redirection 0)
+			handler))
+
+(defun w3m-w3m-attributes-1 (url no-cache counter handler)
+  "A subroutine for `w3m-w3m-attributes'."
+  (lexical-let ((url url)
+		(no-cache no-cache)
+		(counter counter))
+    (w3m-process-do
+	(header (or (unless no-cache
+		      (w3m-cache-request-header url))
+		    (w3m-w3m-dump-head url handler)))
+      (when header
+	(let ((attr (w3m-w3m-parse-header url header)))
+	  (w3m-cache-header url header)
+	  (if (memq (car attr) '(301 302 303 304 305 306 307))
+	      (if (zerop counter)
+		  ;; Redirect counter exceeds `w3m-follow-redirection'.
+		  (list "text/html" "us-ascii" nil nil nil url)
+		;; Follow redirection.
+		(w3m-w3m-attributes-1 (nth 6 attr) no-cache
+				      (1- counter) handler))
+	    (cdr attr)))))))
+
+(defun w3m-w3m-expand-arguments (arguments)
+  (apply 'append
+	 (mapcar
+	  (lambda (x)
+	    (cond
+	     ((stringp x) (list x))
+	     ((setq x (eval x))
+	      (cond ((stringp x)
+		     (list x))
+		    ((listp x)
+		     (w3m-w3m-expand-arguments x))
+		    (t
+		     (let (print-level print-length)
+		       (list (prin1-to-string x))))))))
+		arguments)))
+
+(defun w3m-w3m-dump-extra (url handler)
+  "Retrive headers and contents pointed to by URL"
+  (lexical-let ((url url)
+		(silent w3m-message-silent))
+    (setq w3m-current-url url
+	  url (w3m-url-strip-authinfo url))
+    (w3m-message "Reading %s...%s"
+		 (w3m-url-readable-string url)
+		 (if (and w3m-async-exec (not w3m-process-waited))
+		     (substitute-command-keys "\
+ (Type `\\<w3m-mode-map>\\[w3m-process-stop]' to stop asynchronous process)")
+		   ""))
+    (w3m-process-do
+	(success
+	 (w3m-process-start handler
+			    w3m-command
+			    (append w3m-command-arguments
+				    (w3m-w3m-expand-arguments
+				     w3m-dump-head-source-command-arguments)
+				    (list url))))
+      (let ((w3m-message-silent silent))
+	(w3m-message "Reading %s...done" (w3m-url-readable-string url))
+	(when success
+	  (goto-char (point-min))
+	  (let ((case-fold-search t))
+	    (when (and (re-search-forward "^w3m-current-url:" nil t)
+		       (progn
+			 (delete-region (point-min) (match-beginning 0))
+			 (search-forward "\n\n" nil t)))
+	      (let ((header (buffer-substring (point-min) (point))))
+		(when w3m-use-cookies
+		  (w3m-cookie-set url (point-min) (point)))
+		(delete-region (point-min) (point))
+		(w3m-cache-header url header)
+		(w3m-cache-contents url (current-buffer))
+		(w3m-w3m-parse-header url header)))))))))
+
+(defun w3m-additional-command-arguments (url)
+  "Return a list of additional arguments passed to the w3m command.
+You may specify additional arguments for the particular urls using the
+option `w3m-command-arguments-alist', or using `w3m-no-proxy-domains'
+to add the option \"-no-proxy\"."
+  (let ((defs w3m-command-arguments-alist)
+	def args host)
+    (while (and defs
+		(null args))
+      (setq def (car defs)
+	    defs (cdr defs))
+      (when (string-match (car def) url)
+	(setq args (cdr def))))
+    (when (and w3m-no-proxy-domains
+	       (not (member "-no-proxy" args))
+	       (string-match "^[a-z]+://\\([^/:]+\\)" url)
+	       (catch 'domain-match
+		 (setq host (match-string 1 url))
+		 (dolist (domain w3m-no-proxy-domains)
+		   (when (string-match (concat "\\(?:^\\|\\.\\)"
+					       (regexp-quote domain)
+					       "$")
+				       host)
+		     (throw 'domain-match t)))))
+      (push "-no-proxy" args))
+    args))
+
+(defun w3m-add-referer-p (url referer)
+  "Return non-nil when URL and REFERER satisfies the condition
+specified by `w3m-add-referer'."
+  (when (stringp referer)
+    (cond
+     ((eq w3m-add-referer 'lambda)
+      (let (host)
+	(w3m-string-match-url-components url)
+	(when (match-beginning 4)
+	  (setq host (match-string 4 url))
+	  (w3m-string-match-url-components referer)
+	  (when (match-beginning 4)
+	    (string= host (match-string 4 referer))))))
+     ((consp w3m-add-referer)
+      (and (not (and (cdr w3m-add-referer)
+		     (string-match (cdr w3m-add-referer) referer)))
+	   (car w3m-add-referer)
+	   (string-match (car w3m-add-referer) referer)))
+     ((functionp w3m-add-referer)
+      (funcall w3m-add-referer url referer))
+     (t w3m-add-referer))))
+
+;; Currently, -request argument is supported only by w3mmee.
+(defun w3m-request-arguments (method url temp-file
+				     &optional body referer content-type)
+  "Make the arguments for `-request' or `-header' option passed to w3m.
+METHOD is an HTTP method name.
+TEMP-FILE is a name of temporal file to write request content to.
+Optional BODY is the body content string.
+Second optional REFERER is the Referer: field content.
+Third optional CONTENT-TYPE is the Content-Type: field content."
+  (with-temp-buffer
+    (let ((modes (default-file-modes))
+	  (cookie (and w3m-use-cookies (w3m-cookie-get url))))
+      (if (and (null cookie)(null body)
+	       (null content-type))
+	  (append
+	   (when w3m-add-user-agent
+	     (list "-header" (concat "User-Agent:" w3m-user-agent)))
+	   (when (w3m-add-referer-p url referer)
+	     (list "-header" (concat "Referer: " referer)))
+	   (when w3m-accept-languages
+	     (list "-header" (concat
+			      "Accept-Language: "
+			      (mapconcat 'identity w3m-accept-languages
+					 " ")))))
+	(when w3m-add-user-agent (insert "User-Agent: " w3m-user-agent "\n"))
+	(when (w3m-add-referer-p url referer)
+	  (insert "Referer: " referer "\n"))
+	(when w3m-accept-languages
+	  (insert "Accept-Language: "
+		  (mapconcat 'identity w3m-accept-languages " ") "\n"))
+	(when cookie
+	  (insert "Cookie: " cookie "\n"))
+	(when content-type
+	  (insert "Content-Type: " content-type "\n"))
+	(insert "\n")
+	(when body
+	  (insert body))
+	(unwind-protect
+	    (let ((coding-system-for-write 'binary))
+	      (set-default-file-modes (* 64 6))
+	      (write-region (point-min) (point-max) temp-file nil 'silent))
+	  (set-default-file-modes modes))
+	(list "-request" (concat method ":" temp-file))))))
+
+;; Currently, w3m uses this function.
+(defun w3m-header-arguments (method url temp-file
+				    &optional body referer content-type)
+  "Make the arguments for the `-header' option passed to the w3m command.
+METHOD is an HTTP method name.
+TEMP-FILE is a name of temporal file to write post body to.
+Optional BODY is the post body content string.
+Optional second REFERER is the Referer: field content.
+Third optional CONTENT-TYPE is the Content-Type: field content."
+  (let ((modes (default-file-modes))
+	(cookie (and w3m-use-cookies (w3m-cookie-get url)))
+	args)
+    (when w3m-add-user-agent
+      (setq args (nconc args
+			(list "-o" (concat "user_agent=" w3m-user-agent)))))
+    (when cookie
+      (setq args (nconc args
+			(list "-header" (concat "Cookie: " cookie)))))
+    (when (and (string= method "post") temp-file)
+      (with-temp-buffer
+	(set-buffer-multibyte nil)
+	(when body (insert body))
+	(unwind-protect
+	    (let ((coding-system-for-write 'binary))
+	      (set-default-file-modes (* 64 6))
+	      (write-region (point-min) (point-max) temp-file nil 'silent))
+	  (set-default-file-modes modes)))
+      (setq args (nconc args
+			(when content-type
+			  (list "-header" (concat "Content-Type: "
+						  content-type)))
+			(list "-post" temp-file))))
+    (when (w3m-add-referer-p url referer)
+      (setq args (nconc args (list "-header" (concat "Referer: " referer)))))
+    args))
+
+(defun w3m-w3m-retrieve (url no-uncompress no-cache post-data referer handler)
+  "Retrieve web contents pointed to by URL using the external w3m command.
+It will put the retrieved contents into the current buffer.  See
+`w3m-retrieve' for how does it work asynchronously with the arguments."
+  (lexical-let ((url (w3m-w3m-canonicalize-url url))
+		(no-uncompress no-uncompress)
+		(current-buffer (current-buffer))
+		(silent w3m-message-silent))
+    (w3m-process-do-with-temp-buffer
+	(attr (progn
+		(set-buffer-multibyte nil)
+		(w3m-w3m-retrieve-1 url post-data referer no-cache
+				    (or w3m-follow-redirection 0) handler)))
+      (let ((w3m-message-silent silent))
+	(when attr
+	  (cond
+	   ((eq attr 'redirection-exceeded)
+	    "X-w3m-error/redirection")
+	   ((or (not (string-match "\\`https?:" url))
+		(memq (car attr) '(200 300)))
+	    (if (or no-uncompress
+		    (w3m-decode-encoded-contents (nth 4 attr)))
+		(let ((temp-buffer (current-buffer)))
+		  (with-current-buffer current-buffer
+		    (insert-buffer-substring temp-buffer))
+		  (goto-char (point-min))
+		  (cadr attr))
+	      (ding)
+	      (w3m-message "Can't decode encoded contents: %s" url)
+	      nil))
+	   (t nil)))))))
+
+(defun w3m-w3m-retrieve-1 (url post-data referer no-cache counter handler)
+  "A subroutine for `w3m-w3m-retrieve'."
+  (let ((w3m-command-arguments
+	 (append w3m-command-arguments
+		 (when (member "cookie" w3m-compile-options)
+		   (list "-no-cookie"))
+		 (list "-o" "follow_redirection=0")
+		 (w3m-additional-command-arguments url)))
+	(cachep (w3m-cache-available-p url))
+	temp-file)
+    (when (and w3m-broken-proxy-cache
+	       (or no-cache (not cachep)))
+      (setq w3m-command-arguments
+	    (append w3m-command-arguments '("-o" "no_cache=1"))))
+    (setq temp-file
+	  (when (or (eq w3m-type 'w3mmee) post-data)
+	    (make-temp-name
+	     (expand-file-name "w3mel" w3m-profile-directory))))
+    (setq w3m-command-arguments
+	  (append w3m-command-arguments
+		  (apply (if (eq w3m-type 'w3mmee)
+			     'w3m-request-arguments
+			   'w3m-header-arguments)
+			 (list (if post-data "post" "get")
+			       url
+			       temp-file
+			       (if (consp post-data)
+				   (cdr post-data)
+				 post-data)
+			       referer
+			       (if (consp post-data) (car post-data))))))
+    (lexical-let ((url url)
+		  (post-data post-data)
+		  (referer referer)
+		  (no-cache no-cache)
+		  (counter counter)
+		  (temp-file temp-file))
+      (w3m-process-do
+	  (attr (or (unless no-cache
+		      (and cachep
+			   (w3m-cache-request-contents url)
+			   (w3m-w3m-parse-header
+			    url (w3m-cache-request-header url))))
+		    (w3m-w3m-dump-extra url handler)))
+	(and temp-file
+	     (file-exists-p temp-file)
+	     (delete-file temp-file))
+	(if (memq (car attr) '(301 302 303 304 305 306 307))
+	    (if (zerop counter)
+		;; Redirect counter exceeds `w3m-follow-redirection'.
+		'redirection-exceeded
+	      ;; Follow redirection.
+	      (erase-buffer)
+	      (unless (and post-data
+			   (cond
+			    ((memq (car attr) '(301 302))
+			     (if w3m-redirect-with-get
+				 (setq post-data nil)
+			       (not (y-or-n-p
+				     (format "Send POST data to `%s'?" url)))))
+			    ((eq (car attr) 303) ; => See Other
+			     (setq post-data nil))
+			    ((eq (car attr) 307) ; => Temporally Redirect
+			     (not (y-or-n-p
+				   (format "Send POST data to `%s'?" url))))))
+		(w3m-w3m-retrieve-1 (nth 6 attr)
+				    post-data referer no-cache
+				    (1- counter) handler)))
+	  (if (and (eq (car attr) 406)
+		   (not (equal url (nth 6 attr))))
+	      ;; Attempt to retrieve an alternative url.
+	      (progn
+		(erase-buffer)
+		(w3m-w3m-retrieve-1 (nth 6 attr) post-data referer no-cache
+				    counter handler))
+	    attr))))))
+
+(defun w3m-about-retrieve (url &optional no-uncompress no-cache
+			       post-data referer handler)
+  "Retrieve the about: page which is pointed to by URL.
+It will put the retrieved contents into the current buffer.  See
+`w3m-retrieve' for how does it work asynchronously with the arguments."
+  (cond
+   ((string= "about://emacs-w3m.gif" url)
+    (let ((icon (base64-decode-string w3m-emacs-w3m-icon)))
+      (if (featurep 'xemacs)
+	  (insert icon)
+	(set-buffer-multibyte (multibyte-string-p icon))
+	(insert icon)
+	(set-buffer-multibyte nil)))
+    "image/gif")
+   ((string-match "\\`about://source/" url)
+    (lexical-let ((url (substring url (match-end 0))))
+      (w3m-process-do
+	  (type (w3m-retrieve url
+			      no-uncompress no-cache post-data referer handler))
+	(cond
+	 (type "text/plain")
+	 ((w3m-cache-request-contents url)
+	  (w3m-decode-encoded-contents (w3m-content-encoding url))
+	  "text/plain")
+	 (t nil)))))
+   ((string-match "\\`about:/*blank/?\\'" url)
+    "text/plain")
+   (t
+    (lexical-let ((output-buffer (current-buffer)))
+      (w3m-process-do-with-temp-buffer
+	  (type (let (func)
+		  (setq w3m-current-url url)
+		  (set-buffer-multibyte t)
+		  (if (and (string-match "\\`about://\\([^/]+\\)/" url)
+			   (setq func
+				 (intern-soft (concat "w3m-about-"
+						      (match-string 1 url))))
+			   (fboundp func))
+		      (funcall func url no-uncompress no-cache
+			       post-data referer handler)
+		    (w3m-about url no-uncompress no-cache))))
+	(when type
+	  (when (string-match "\\`text/" type)
+	    (encode-coding-region (point-min) (point-max) w3m-coding-system))
+	  (set-buffer-multibyte nil)
+	  (when (buffer-name output-buffer)
+	    (let ((temp-buffer (current-buffer)))
+	      (with-current-buffer output-buffer
+		(insert-buffer-substring temp-buffer))))
+	  type))))))
+
+(defun w3m-cid-retrieve (url &optional no-uncompress no-cache)
+  "Retrieve contents pointed to by URL prefixed with the cid: scheme.
+This function is mainly used when displaying text/html MIME parts in
+message user agents, e.g., Gnus, Mew, T-gnus, Wanderlust, and possibly
+VM.
+
+It calls a function according to the `major-mode' of the buffer
+specified by `w3m-current-buffer'.  Functions to be called are
+specified by the `w3m-cid-retrieve-function-alist' variable.
+
+Each function in that variable should take three arguments passed
+through this function, extract and insert contents specified by URL
+\(which can be found in the raw message itself) into the current buffer,
+and return the content type of the data.
+
+The optional two arguments can be omitted by functions; NO-UNCOMPRESS
+specifies whether functions should not uncompress extracted contents;
+NO-CACHE specifies whether functions should not use cached contents."
+  (let ((func (cdr (assq (with-current-buffer w3m-current-buffer major-mode)
+			 w3m-cid-retrieve-function-alist))))
+    (when func (funcall func url no-uncompress no-cache))))
+
+(defun w3m-data-retrieve (url &optional no-uncompress no-cache)
+  "Retrieve contents pointed to by URL prefixed with the data: scheme.
+See RFC2397."
+  (let ((case-fold-search t) (mime-type "text/plain")
+	(coding nil) (encode nil) (param "")
+	data-string)
+    (when (string-match
+	   "data:\\(\\([^/;,]+\\(/[^;,]+\\)?\\)\\(;[^;,]+\\)*\\)?,\\(.*\\)"
+	   url)
+      (setq  mime-type (or (match-string-no-properties 2 url)
+			   mime-type)
+	     param (or (match-string-no-properties 4 url)
+		       param)
+	     data-string (match-string-no-properties 5 url))
+      (when (string-match "^.*\\(;[ \t]*base64\\)$" param)
+	(setq param (substring param 0 (match-beginning 1)))
+	(setq encode 'base64))
+      (when (string-match "charset=\\([^;]+\\)" param)
+	(setq coding (w3m-charset-to-coding-system
+		      (match-string-no-properties 1 param))))
+      (when data-string
+	(erase-buffer)
+	(let (decode-string)
+	  (setq decode-string
+		(cond
+		 ((eq encode 'base64)
+		  (base64-decode-string data-string))
+		 (t
+		  (w3m-url-decode-string
+		   data-string coding))))
+	  (set-buffer-multibyte nil)
+	  (if (featurep 'xemacs)
+	      (insert decode-string)
+	    (set-buffer-multibyte (multibyte-string-p decode-string))
+	    (insert decode-string)
+	    (set-buffer-multibyte nil)))))
+    mime-type))
+
+;;;###autoload
+(defun w3m-retrieve (url &optional no-uncompress no-cache
+			 post-data referer handler)
+  "Retrieve web contents pointed to by URL.
+It will put the retrieved contents into the current buffer.
+
+If HANDLER is nil, this function will retrieve web contents, return
+the content type of the retrieved data, and then come to an end.  This
+behavior is what is called a synchronous operation.  You have to
+specify HANDLER in order to make this function show its real ability,
+which is called an asynchronous operation.
+
+If HANDLER is a function, this function will come to an end in no time.
+In this case, contents will be retrieved by the asynchronous process
+after a while.  And after finishing retrieving contents successfully,
+HANDLER will be called on the buffer where this function starts.  The
+content type of the retrieved data will be passed to HANDLER as a
+string argument.
+
+NO-UNCOMPRESS specifies whether this function should not uncompress contents.
+NO-CACHE specifies whether this function should not use cached contents.
+POST-DATA and REFERER will be sent to the web server with a request."
+  (if (not handler)
+      (condition-case nil
+	  (w3m-process-with-wait-handler
+	    (w3m-retrieve url
+			  no-uncompress no-cache post-data referer handler))
+	(w3m-process-timeout nil))
+    (unless (and w3m-safe-url-regexp
+		 (not (string-match w3m-safe-url-regexp url)))
+      (setq url (w3m-url-strip-fragment url))
+      (set-buffer-multibyte nil)
+      (cond
+       ((string-match "\\`about:" url)
+	(w3m-about-retrieve url
+			    no-uncompress no-cache post-data referer handler))
+       ((string-match "\\`cid:" url)
+	(w3m-cid-retrieve url no-uncompress no-cache))
+       ((string-match "\\`data:" url)
+	(w3m-data-retrieve url no-uncompress no-cache))
+       ((w3m-url-local-p url)
+	(w3m-local-retrieve url no-uncompress))
+       (t
+	(w3m-w3m-retrieve url
+			  no-uncompress no-cache post-data referer handler))))))
+
+(defvar w3m-touch-file-available-p 'undecided)
+
+(eval-and-compile
+  (if (fboundp 'set-file-times)
+      (defalias 'w3m-touch-file 'set-file-times)
+    (defun w3m-touch-file (file time)
+      "Change the access and/or modification TIME of the specified FILE."
+      ;; Check the validity of `touch' command.
+      (when (eq w3m-touch-file-available-p 'undecided)
+	(let ((file (make-temp-name
+		     (expand-file-name "w3mel" w3m-profile-directory)))
+	      time timefile)
+	  (while (progn
+		   (setq time (list (abs (% (random) 8192))
+				    (abs (% (random) 65536)))
+			 timefile (expand-file-name
+				   (format-time-string "%Y%m%d%H%M.%S" time)
+				   w3m-profile-directory))
+		   (file-exists-p timefile)))
+	  (unwind-protect
+	      (setq w3m-touch-file-available-p
+		    (when (w3m-which-command w3m-touch-command)
+		      (with-temp-buffer
+			(insert "touch check")
+			(write-region (point-min) (point-max) file nil 'nomsg))
+		      (and (let ((default-directory w3m-profile-directory)
+				 (w3m-touch-file-available-p t))
+			     (w3m-touch-file file time))
+			   (zerop (w3m-time-lapse-seconds
+				   time (nth 5 (file-attributes file)))))))
+	    (when (file-exists-p file)
+	      (ignore-errors (delete-file file)))
+	    (when (file-exists-p timefile)
+	      (ignore-errors (delete-file timefile))))))
+      (and w3m-touch-file-available-p
+	   time
+	   (w3m-which-command w3m-touch-command)
+	   (file-exists-p file)
+	   (zerop (let ((default-directory (file-name-directory file))
+			(coding-system-for-write
+			 (or
+			  (and (boundp 'file-name-coding-system)
+			       (symbol-value 'file-name-coding-system))
+			  (and (boundp 'default-file-name-coding-system)
+			       (symbol-value 'default-file-name-coding-system))
+			  ;; Some versions of X*macsen seem touched.
+			  (and (boundp 'coding-system-for-write)
+			       (symbol-value 'coding-system-for-write)))))
+		    (call-process w3m-touch-command nil nil nil
+				  "-t"
+				  (format-time-string "%Y%m%d%H%M.%S" time)
+				  file)))))))
+
+;;;###autoload
+(defun w3m-download (url &optional filename no-cache handler post-data)
+  "Download contents of URL to a file named FILENAME.
+NO-CHACHE (which the prefix argument gives when called interactively)
+specifies not using the cached data."
+  (interactive
+   (let* ((url (w3m-input-url "Download URL: "))
+	  (basename (file-name-nondirectory (w3m-url-strip-query url))))
+     (if (string-match "^[\t ]*$" basename)
+	 (list url
+	       (w3m-read-file-name (format "Download %s to: " url)
+				   w3m-default-save-directory "index.html")
+	       current-prefix-arg)
+       (list url
+	     (w3m-read-file-name (format "Download %s to: " basename)
+				 w3m-default-save-directory basename)
+	     current-prefix-arg))))
+  (if (and w3m-use-ange-ftp (string-match "\\`ftp://" url))
+      (w3m-goto-ftp-url url filename)
+    (lexical-let ((url url)
+		  (filename (or filename (w3m-read-file-name nil nil url))))
+      (w3m-process-do-with-temp-buffer
+	  (type (progn
+		  (w3m-clear-local-variables)
+		  (setq w3m-current-url url)
+		  (w3m-retrieve url t no-cache post-data nil handler)))
+	(if type
+	    (let ((buffer-file-coding-system 'binary)
+		  (coding-system-for-write 'binary)
+		  jka-compr-compression-info-list
+		  format-alist)
+	      (when (or (not (file-exists-p filename))
+			(prog1 (y-or-n-p
+				(format "File(%s) already exists. Overwrite? "
+					filename))
+			  (message nil)))
+		(write-region (point-min) (point-max) filename)
+		(w3m-touch-file filename (w3m-last-modified url))
+		t))
+	  (ding)
+	  (message "Cannot retrieve URL: %s%s"
+		   url
+		   (if w3m-process-exit-status
+		       (format " (exit status: %s)" w3m-process-exit-status)
+		     ""))
+	  nil)))))
+
+;;; Retrieve data:
+(w3m-make-ccl-coding-system
+ 'w3m-euc-japan ?E
+ "ISO 2022 based EUC encoding for Japanese with w3m internal characters.
+  (generated by `w3m')"
+ 'w3m-euc-japan-decoder
+ 'w3m-euc-japan-encoder)
+
+(w3m-make-ccl-coding-system
+ 'w3m-iso-latin-1 ?1
+ "ISO 2022 based 8-bit encoding for Latin-1 with w3m internal characters.
+  (generated by `w3m')"
+ 'w3m-iso-latin-1-decoder
+ 'w3m-iso-latin-1-encoder)
+
+(defun w3m-remove-comments ()
+  "Remove HTML comments in the current buffer."
+  (goto-char (point-min))
+  (let (beg)
+    (while (search-forward "<!--" nil t)
+      (setq beg (match-beginning 0))
+      (if (search-forward "-->" nil t)
+	  (delete-region beg (point))))))
+
+(defun w3m-remove-invisible-image-alt ()
+  "Remove alt=\"whitespace\" attributes in img tags.
+Such attributes not only obscure them but also might make images not
+be displayed especially in shimbun articles."
+  (goto-char (point-min))
+  (let ((case-fold-search t)
+	start end)
+    (while (and (re-search-forward "\\(<img\\)[\t\n\f\r ]+" nil t)
+		(progn
+		  (setq start (match-end 1))
+		  (search-forward ">" nil t))
+		(progn
+		  (setq end (match-beginning 0))
+		  (goto-char start)
+		  (re-search-forward "[\t\n\f\r ]+alt=\"[\t\n\f\r ]*\""
+				     end t)))
+      (delete-region (match-beginning 0) (match-end 0)))))
+
+(defun w3m-check-header-tags ()
+  "Process header tags (<LINK>,<BASE>) in the current buffer."
+  (let ((case-fold-search t)
+	tag)
+    (goto-char (point-min))
+    (when (re-search-forward "</head\\(?:[ \t\r\f\n][^>]*\\)?>" nil t)
+      (save-restriction
+	(narrow-to-region (point-min) (point))
+	(goto-char (point-min))
+	(while (re-search-forward "<\\(link\\|base\\)[ \t\r\f\n]+" nil t)
+	  (setq tag (downcase (match-string 1)))
+	  (cond
+	   ((string= tag "link")
+	    (w3m-parse-attributes ((rel :case-ignore) href type)
+	      (when rel
+		(setq rel (split-string rel))
+		(cond
+		 ((member "icon" rel) (setq w3m-icon-data (cons href type)))
+		 ((member "next" rel) (setq w3m-next-url href))
+		 ((or (member "prev" rel) (member "previous" rel))
+		  (setq w3m-previous-url href))
+		 ((member "start" rel) (setq w3m-start-url href))
+		 ((member "contents" rel) (setq w3m-contents-url href))))))
+	   ((string= tag "base")
+	    (w3m-parse-attributes (href)
+	      (when (< 0 (length href))
+		(setq w3m-current-base-url href))))))))))
+
+(defun w3m-check-refresh-attribute ()
+  "Get REFRESH attribute in META tags."
+  (setq w3m-current-refresh nil)
+  (when w3m-use-refresh
+    (let ((case-fold-search t)
+	  (refurl w3m-current-url)
+	  sec)
+      (goto-char (point-min))
+      (catch 'found
+	(while (re-search-forward "<meta[ \t\r\f\n]+" nil t)
+	  (w3m-parse-attributes ((http-equiv :case-ignore) content)
+	    (when (string= http-equiv "refresh")
+	      (cond
+	       ((string-match "\\`[0-9]+\\'" content)
+		(setq sec (match-string-no-properties 0 content)))
+	       ((string-match
+		 "\\([^;]+\\);[ \t\n]*url=[\"']?\\([^\"']+\\)"
+		 content)
+		(setq sec (match-string-no-properties 1 content))
+		(setq refurl (w3m-decode-entities-string
+			      (match-string-no-properties 2 content)))
+		(when (string-match "\\`[\"']\\(.*\\)[\"']\\'" refurl)
+		  (setq refurl (match-string 1 refurl)))))
+	      (when (and sec (string-match "\\`[0-9]+\\'" sec))
+		(when (and (eq w3m-use-refresh 'wait-minimum)
+			   (< (string-to-number sec) w3m-refresh-minimum-interval))
+		  (setq sec (number-to-string w3m-refresh-minimum-interval)))
+		(throw 'found
+		       (setq w3m-current-refresh
+			     (cons (string-to-number sec)
+				   (w3m-expand-url refurl))))))))))))
+
+(defun w3m-remove-meta-charset-tags ()
+  (let ((case-fold-search t))
+    (goto-char (point-min))
+    (catch 'found
+      (when (re-search-forward "<meta[ \t\r\f\n]+" nil t)
+	(let ((start (match-beginning 0)))
+	  (w3m-parse-attributes ((http-equiv :case-ignore)
+				 (content :case-ignore))
+	    (when (and (string= http-equiv "content-type")
+		       content
+		       (string-match ";[ \t\n]*charset=" content))
+	      (delete-region start (point))
+	      (throw 'found nil))))))))
+
+(defun w3m-rendering-extract-title ()
+  "Extract the title from the halfdump and put it into the current buffer."
+  (goto-char (point-min))
+  (or (when (re-search-forward "<title_alt[ \t\n]+title=\"\\([^\"]+\\)\">"
+			       nil t)
+	(prog1 (w3m-decode-entities-string
+		(mapconcat 'identity
+			   (save-match-data (split-string (match-string 1)))
+			   " "))
+	  (delete-region (match-beginning 0) (match-end 0))))
+      (when (and (stringp w3m-current-url)
+		 (string-match "/\\([^/]+\\)/?\\'" w3m-current-url))
+	(match-string 1 w3m-current-url))
+      "<no-title>"))
+
+(defun w3m-set-display-ins-del ()
+  (when (eq w3m-display-ins-del 'auto)
+    (with-temp-buffer
+      (let* ((coding-system-for-read w3m-output-coding-system)
+	     (coding-system-for-write (if (eq 'binary w3m-input-coding-system)
+					  w3m-current-coding-system
+					w3m-input-coding-system))
+	     (default-process-coding-system
+	       (cons coding-system-for-read coding-system-for-write))
+	     (env (copy-sequence w3m-command-environment))
+	     type)
+	(setq w3m-display-ins-del nil)
+	(w3m-process-with-environment (cons '("LANG" . "C")
+					    (delq (assoc "LANG" env) env))
+	  (call-process (or w3m-halfdump-command w3m-command) nil t nil "-o")
+	  (goto-char (point-min))
+	  (when (re-search-forward "display_ins_del=<\\([^>]+\\)>" nil t)
+	    (setq type (match-string 1))
+	    (cond
+	     ((string= type "number")
+	      (setq w3m-display-ins-del 'fontify))
+	     ((string= type "bool")
+	      (setq w3m-display-ins-del 'tag)))))))))
+
+(defun w3m-rendering-half-dump (charset)
+  ;; `charset' is used by `w3m-w3m-expand-arguments' to generate
+  ;; arguments for w3mmee and w3m-m17n from `w3m-halfdump-command-arguments'.
+  (w3m-set-display-ins-del)
+  (let* ((coding-system-for-read w3m-output-coding-system)
+	 (coding-system-for-write (if (eq 'binary w3m-input-coding-system)
+				      w3m-current-coding-system
+				    w3m-input-coding-system))
+	 (default-process-coding-system
+	   (cons coding-system-for-read coding-system-for-write)))
+    (w3m-process-with-environment w3m-command-environment
+      (apply 'call-process-region
+	     (point-min)
+	     (point-max)
+	     (or w3m-halfdump-command w3m-command)
+	     t t nil
+	     (w3m-w3m-expand-arguments
+	      (append w3m-halfdump-command-arguments
+		      w3m-halfdump-command-common-arguments
+		      ;; Image size conscious rendering
+		      (when (member "image" w3m-compile-options)
+			(if (and w3m-treat-image-size
+				 (or (w3m-display-graphic-p)
+				     (and w3m-pixels-per-line
+					  w3m-pixels-per-character)))
+			    (list "-o" "display_image=on"
+				  "-ppl" (number-to-string
+					  (or w3m-pixels-per-line
+					      (w3m-static-if
+						  (featurep 'xemacs)
+						  (font-height
+						   (face-font 'default))
+						(frame-char-height))))
+				  "-ppc" (number-to-string
+					  (or w3m-pixels-per-character
+					      (w3m-static-if
+						  (featurep 'xemacs)
+						  (font-width
+						   (face-font 'default))
+						(frame-char-width)))))
+			  (list "-o" "display_image=off")))))))))
+
+(defun w3m-rendering-buffer (&optional charset)
+  "Do rendering of contents in the currenr buffer as HTML and return title."
+  (w3m-message "Rendering...")
+  (w3m-remove-comments)
+  (w3m-remove-invisible-image-alt)
+  (w3m-check-header-tags)
+  (w3m-check-refresh-attribute)
+  (unless (eq w3m-type 'w3m-m17n)
+    (w3m-remove-meta-charset-tags))
+  (w3m-rendering-half-dump charset)
+  (w3m-message "Rendering...done")
+  (w3m-rendering-extract-title))
+
+(defcustom w3m-confirm-leaving-secure-page t
+  "If non-nil, you'll be asked for confirmation when leaving secure pages.
+This option controls whether the confirmation is made also when
+retrieving data (typically images) in a secure page from non-secure
+pages.  It is STRONGLY recommended to set non-nil value to this option.
+You MUST understand what you want to do completely before
+switching off this option."
+  :group 'w3m
+  :type 'boolean)
+
+(defun w3m-retrieve-and-render (url &optional no-cache charset
+				    post-data referer handler)
+  "Retrieve contents of URL and render them in the current buffer.
+It returns a `w3m-process' object and comes to an end immediately.
+The HANDLER function will be called when rendering is complete.  When
+a new content is retrieved in the buffer, the HANDLER function will be
+called with t as an argument.  Otherwise, it will be called with nil."
+  (unless (and w3m-current-ssl
+	       w3m-confirm-leaving-secure-page
+	       ;; Permit leaving safe pages without confirmation for
+	       ;; several safe commands.  For more detail of
+	       ;; definition of safe commands, see the thread
+	       ;; beginning at [emacs-w3m:09767].
+	       (not
+		(or (memq this-command
+			  '(w3m
+			    w3m-goto-url w3m-redisplay-this-page
+			    w3m-reload-this-page w3m-history
+			    w3m-view-next-page w3m-view-previous-page
+			    w3m-view-header w3m-view-source))
+		    (string-match "\\`\\(?:ht\\|f\\)tps://" url)
+		    (prog1
+			(y-or-n-p "You are leaving secure page.  Continue? ")
+		      (message nil)))))
+    (lexical-let ((url (w3m-url-strip-fragment url))
+		  (charset charset)
+		  (page-buffer (current-buffer))
+		  (arrival-time (current-time))
+		  (silent w3m-message-silent))
+      (w3m-process-do-with-temp-buffer
+	  (type (progn
+		  (w3m-clear-local-variables)
+		  (w3m-retrieve url nil no-cache post-data referer handler)))
+	(let ((w3m-message-silent silent))
+	  (when (buffer-live-p page-buffer)
+	    (setq url (w3m-url-strip-authinfo url))
+	    (if type
+		(if (string= type "X-w3m-error/redirection")
+		    (when (w3m-show-redirection-error-information url page-buffer)
+		      (w3m-message (w3m-message "Cannot retrieve URL: %s"
+						url)))
+		  (let ((modified-time (w3m-last-modified url)))
+		    (w3m-arrived-add url nil modified-time arrival-time)
+		    (unless modified-time
+		      (setf (w3m-arrived-last-modified url) nil))
+		    (let ((real (w3m-real-url url)))
+		      (unless (string= url real)
+			(w3m-arrived-add url nil nil arrival-time)
+			(setf (w3m-arrived-title real)
+			      (w3m-arrived-title url))
+			(setf (w3m-arrived-last-modified real)
+			      (w3m-arrived-last-modified url))
+			(setq url real)))
+		    (prog1 (w3m-create-page url
+					    (or (w3m-arrived-content-type url)
+						type)
+					    (or charset
+						(w3m-arrived-content-charset url)
+						(w3m-content-charset url))
+					    page-buffer)
+		      (w3m-force-window-update-later page-buffer)
+		      (unless (get-buffer-window page-buffer)
+			(w3m-message "The content (%s) has been retrieved in %s"
+				     url (buffer-name page-buffer))))))
+	      (ding)
+	      (when (eq (car w3m-current-forms) t)
+		(setq w3m-current-forms (cdr w3m-current-forms)))
+	      (prog1 (when (and w3m-show-error-information
+				(not (or (w3m-url-local-p url)
+					 (string-match "\\`about:" url))))
+		       (w3m-show-error-information url charset page-buffer))
+		(w3m-message "Cannot retrieve URL: %s%s"
+			     url
+			     (if w3m-process-exit-status
+				 (format " (exit status: %s)"
+					 w3m-process-exit-status)
+			       ""))))))))))
+
+(defun w3m-show-error-information (url charset page-buffer)
+  "Create and prepare the error information."
+  (or (when (w3m-cache-request-contents url)
+	(w3m-decode-encoded-contents (w3m-content-encoding url))
+	t) ; Even if decoding is failed, use the cached contents.
+      (let ((case-fold-search t)
+	    (header (w3m-cache-request-header url))
+	    (errmsg (format "\n<br><h1>Cannot retrieve URL: %s%s</h1>"
+			    (format "<a href=\"%s\">%s</a>" url url)
+			    (when w3m-process-exit-status
+			      (format " (exit status: %s)"
+				      w3m-process-exit-status)))))
+	(if (or (null header)
+		(string-match "\\`w3m: Can't load " header))
+	    (progn
+	      (erase-buffer)
+	      (setq charset "us-ascii")
+	      (insert
+	       errmsg
+	       (format "<br><br><b>%s</b> could not be found; "
+		       (w3m-get-server-hostname url))
+	       (if (string-match "\\`news:" url)
+		   "check the name of the <b>URL</b>\
+ and the value of the <b>NNTPSERVER</b> environment variable\
+ (that should be the address of the <b>NNTP</b> server)."
+		 "check the name of the <b>URL</b>.")))
+	  (goto-char (point-min))
+	  (when (or (re-search-forward "<body>" nil t)
+		    (re-search-forward "<html>" nil t))
+	    (goto-char (match-end 0)))
+	  (insert errmsg "<br><br><hr><br><br>")
+	  (when (or (re-search-forward "</body>" nil t)
+		    (re-search-forward "</html>" nil 'max))
+	    (goto-char (match-end 0)))
+	  (insert "\n<br><br><hr><br><br><h2>Header information</h2><br>\n<pre>"
+		  header "</pre>\n"))))
+  (w3m-create-page url "text/html" charset page-buffer)
+  nil)
+
+(defun w3m-show-redirection-error-information (url page-buffer)
+  (erase-buffer)
+  (insert
+   (format "\n<br><h1>Cannot retrieve URL: %s</h1><br><br>%s"
+	   (format "<a href=\"%s\">%s</a>" url url)
+	   "The number of redirections has exceeded a limit.  This may have<br>\n
+happened due to the server side miss-configuration.  Otherwise,<br>\n
+try increasing the limit, the value of <b>`w3m-follow-redirection'</b>.<br>\n"))
+  (w3m-create-page url "text/html" "us-ascii" page-buffer))
+
+(defun w3m-prepare-content (url type charset)
+  "Prepare contents in the current buffer according to TYPE.
+URL is assumed to be a place where the contents come from.  CHARSET is
+passed to the filter function  corresponding to TYPE if it is
+specified in the `w3m-content-type-alist' variable."
+  (let ((filter (nth 3 (assoc type w3m-content-type-alist))))
+    (cond
+     ; Filter function is specified.
+     ((functionp filter) (funcall filter url type charset))
+     ; Equivalent type is specified.
+     ((stringp filter) filter)
+     ; No filter is specified.
+     ((not filter) type)
+     ; Failed.
+     (t ""))))
+
+(defun w3m-detect-xml-type (url type charset)
+  "Check if the type of xml contents of URL is xhtml+xml.
+If so return \"text/html\", otherwise \"text/plain\"."
+  (with-temp-buffer
+    (w3m-retrieve url)
+    (w3m-decode-buffer url charset type)
+    (goto-char (point-min))
+    (setq case-fold-search t)
+    (if (re-search-forward
+	 "<[\t\n ]*html\\(?:\\(?:[\t\n ]+[^>]+\\)?>\\|[\t\n ]*>\\)"
+	 nil t)
+	"text/html"
+      "text/plain")))
+
+(defun w3m-create-text-page (url type charset page-buffer)
+  (w3m-safe-decode-buffer url charset type)
+  (setq w3m-current-url (if (w3m-arrived-p url)
+			    (w3m-real-url url)
+			  url)
+	w3m-current-title
+	(if (string= "text/html" type)
+	    (let ((title (w3m-rendering-buffer charset)))
+	      (setf (w3m-arrived-title url) title)
+	      title)
+	  (or (when (string-match "\\`about://\\(?:source\\|header\\)/" url)
+		(w3m-arrived-title (substring url (match-end 0))))
+	      (file-name-nondirectory (if (string-match "/\\'" url)
+					  (directory-file-name url)
+					url)))))
+  (let ((result-buffer (current-buffer)))
+    (with-current-buffer page-buffer
+      (let ((inhibit-read-only t))
+	(widen)
+	(delete-region (point-min) (point-max))
+	(insert-buffer-substring result-buffer)
+	(goto-char (point-min))
+	(w3m-copy-local-variables result-buffer)
+	(set-buffer-file-coding-system w3m-current-coding-system)
+	(when (string= "text/html" type) (w3m-fontify))
+	'text-page))))
+
+(defsubst w3m-image-page-displayed-p ()
+  (and (fboundp 'image-mode-setup-winprops)
+       w3m-current-url
+       (string-match "\\`image/" (w3m-content-type w3m-current-url))
+       (eq (get-text-property (point-min) 'w3m-image-status) 'on)))
+
+(defun w3m-create-image-page (url type charset page-buffer)
+  (when (w3m-image-type-available-p (w3m-image-type type))
+    (with-current-buffer page-buffer
+      (let ((inhibit-read-only t))
+	(w3m-clear-local-variables)
+	(setq w3m-current-url (w3m-real-url url)
+	      w3m-current-title (file-name-nondirectory url))
+	(widen)
+	(delete-region (point-min) (point-max))
+	(insert w3m-current-title)
+	(w3m-add-face-property (point-min) (point-max) 'w3m-image)
+	(w3m-add-text-properties (point-min) (point-max)
+				 (list 'w3m-image url
+				       'mouse-face 'highlight))
+	(when (fboundp 'image-mode-setup-winprops)
+	  (image-mode-setup-winprops))
+	'image-page))))
+
+(defun w3m-create-page (url type charset page-buffer)
+  ;; Select a content type.
+  (unless (and (stringp type)
+	       (assoc type w3m-content-type-alist))
+    (save-window-excursion
+      (pop-to-buffer (current-buffer))
+      (delete-other-windows)
+      (ding)
+      (setq type
+	    (completing-read
+	     (format "Input %s's content type (default Download): "
+		     (file-name-nondirectory url))
+	     w3m-content-type-alist nil t))
+      (setf (w3m-arrived-content-type url) type)))
+  (setq w3m-current-coding-system nil)	; Reset decoding status of this buffer.
+  (setq type (w3m-prepare-content url type charset))
+  (w3m-safe-decode-buffer url charset type)
+  (setq charset (or charset w3m-current-content-charset))
+  (when w3m-use-filter (w3m-filter url))
+  (w3m-relationship-estimate url)
+  ;; Create pages.
+  (cond
+   ((string-match "\\`text/" type)
+    (w3m-create-text-page url type charset page-buffer))
+   ((string-match "\\`image/" type)
+    (w3m-create-image-page url type charset page-buffer))
+   ((member type w3m-doc-view-content-types)
+    (w3m-doc-view url))
+   (t
+    (with-current-buffer page-buffer
+      (w3m-external-view url)
+      'external-view))))
+
+(defun w3m-relationship-estimate (url)
+  "Estimate relationships between a page and others."
+  (save-excursion
+    (save-match-data
+      (catch 'estimated
+	(dolist (rule w3m-relationship-estimate-rules)
+	  (when (apply (car rule) url (cdr rule))
+	    (throw 'estimated t)))))))
+
+(defun w3m-relationship-simple-estimate (url regexp &optional next previous
+					     start contents)
+  "Search relationships with given patterns
+when the URL of the retrieved page matches the REGEXP."
+  (when (string-match regexp url)
+    (w3m-relationship-search-patterns url next previous start contents)))
+
+(defun w3m-relationship-magicpoint-estimate (url)
+  "Search relationships for pages generated by MagicPoint."
+  (goto-char (point-max))
+  (when (search-backward
+	 "Generated by <A HREF=\"http://www.mew.org/mgp/\">MagicPoint</A>"
+	 nil t)
+    (goto-char (point-min))
+    (w3m-relationship-search-patterns
+     url
+     (eval-when-compile
+       (concat "<A HREF=" w3m-html-string-regexp ">\\[next&gt;\\]</A>"))
+     (eval-when-compile
+       (concat "<A HREF=" w3m-html-string-regexp ">\\[&lt;prev\\]</A>"))
+     (eval-when-compile
+       (concat "<A HREF=" w3m-html-string-regexp ">\\[&lt;&lt;start\\]</A>"))
+     (eval-when-compile
+       (concat "<A HREF=" w3m-html-string-regexp ">\\[index\\]</A>")))))
+
+(defun w3m-relationship-oddmuse-estimate (url)
+  (when (string-match "/wiki\\?search=.*" url)
+    (goto-char (point-min))
+    (and (re-search-forward "href=\"\\([^\"]+\\)\">Previous</a>" nil t)
+	 (setq w3m-previous-url (match-string 1)))
+    (and (re-search-forward "href=\"\\([^\"]+\\)\">Next</a>" nil t)
+	 (setq w3m-next-url (match-string 1)))))
+
+(defun w3m-relationship-slashdot-estimate (url)
+  (goto-char (point-min))
+  (when (and (string-match
+	      "slashdot\\.org/\\(article\\|comments\\)\\.pl\\?"
+	      url)
+	     (search-forward "<div class=\"linkCommentPage\">" nil t))
+    (let ((min (point)) (max (save-excursion (search-forward "</div>" nil t))))
+      ;; move to the position of the current page indicator and then search
+      ;; for the next and previous link within the current <div>
+      (when (and max (re-search-forward "<b>\\(([0-9]+)\\)</b>" max t))
+	(let ((re (concat "<a href=" w3m-html-string-regexp ">")))
+	  (when (save-excursion (re-search-backward re min t))
+	    (setq w3m-previous-url
+		  (w3m-expand-url (w3m-decode-anchor-string
+				   (or (match-string 2)
+				       (match-string 3)
+				       (match-string 1))))))
+	  (when (re-search-forward re max t)
+	    (setq w3m-next-url
+		  (w3m-expand-url (w3m-decode-anchor-string
+				   (or (match-string 2)
+				       (match-string 3)
+				       (match-string 1)))))))))))
+
+(defun w3m-relationship-alc-estimate (url)
+  ;; use filter
+  (when (string-match "\\`http://eow\\.alc\\.co\\.jp/[^/]+/UTF-8/" url)
+    (when (re-search-forward
+	   (concat "<a href=\\\"http://eow\\.alc\\.co\\.jp/[^/]+/UTF-8/"
+		   "\\(\\?pg=[0-9]+\\)\\\">$BA0$X(B</a>")
+	   nil t)
+      (setq w3m-previous-url
+	    (w3m-expand-url (match-string 1) url)))
+    (when (re-search-forward
+	   (concat "<a href=\\\"http://eow\\.alc\\.co\\.jp/[^/]+/UTF-8/"
+		   "\\(\\?pg=[0-9]+\\)\\\">$B<!$X(B</a>")
+	   nil t)
+      (setq w3m-next-url
+	    (w3m-expand-url (match-string 1) url)))
+    (unless (or w3m-previous-url w3m-next-url)
+      ;; no use filter
+      (goto-char (point-min))
+      (when (re-search-forward
+	     "<a href='javascript:goPage(\"\\([0-9+]\\)\")'>$BA0$X(B</a>"
+	     nil t)
+	(setq w3m-previous-url
+	      (w3m-expand-url (format "?pg=%s" (match-string 1)) url)))
+      (when (re-search-forward
+	     "<a href='javascript:goPage(\"\\([0-9+]\\)\")'>$B<!$X(B</a>"
+	     nil t)
+	(setq w3m-next-url
+	      (w3m-expand-url (format "?pg=%s" (match-string 1)) url))))))
+
+(defun w3m-relationship-search-patterns (url next previous
+					     &optional start contents)
+  "Search relationships with given patterns."
+  (goto-char (point-min))
+  (and next
+       (re-search-forward next nil t)
+       (setq w3m-next-url
+	     (w3m-expand-url (w3m-decode-anchor-string (or (match-string 2)
+							   (match-string 3)
+							   (match-string 1)))
+			     url))
+       (goto-char (point-min)))
+  (and previous
+       (re-search-forward previous nil t)
+       (setq w3m-previous-url
+	     (w3m-expand-url (w3m-decode-anchor-string (or (match-string 2)
+							   (match-string 3)
+							   (match-string 1)))
+			     url))
+       (goto-char (point-min)))
+  (and start
+       (re-search-forward start nil t)
+       (setq w3m-start-url
+	     (w3m-expand-url (w3m-decode-anchor-string (or (match-string 2)
+							   (match-string 3)
+							   (match-string 1)))
+			     url))
+       (goto-char (point-min)))
+  (and contents
+       (re-search-forward contents nil t)
+       (setq w3m-contents-url
+	     (w3m-expand-url (w3m-decode-anchor-string (or (match-string 2)
+							   (match-string 3)
+							   (match-string 1)))
+			     url))))
+
+(defun w3m-search-name-anchor (name &optional quiet no-record)
+  (interactive "sName: ")
+  (let ((pos (point-min))
+	(cur-pos (point))
+	found)
+    (catch 'found
+      (while (setq pos (next-single-property-change pos 'w3m-name-anchor))
+	(when (member name (get-text-property pos 'w3m-name-anchor))
+	  (goto-char pos)
+	  (when (eolp) (forward-line))
+	  (w3m-horizontal-on-screen)
+	  (throw 'found (setq found t))))
+      (setq pos (point-min))
+      (while (setq pos (next-single-property-change pos 'w3m-name-anchor2))
+	(when (member name (get-text-property pos 'w3m-name-anchor2))
+	  (goto-char pos)
+	  (when (eolp) (forward-line))
+	  (w3m-horizontal-on-screen)
+	  (throw 'found (setq found t))))
+      (unless quiet
+	(message "No such anchor: %s" name)))
+
+    (when (and found
+	       (not no-record)
+	       (/= (point) cur-pos))
+	(setq w3m-name-anchor-from-hist
+	      (append (list 1 nil (point) cur-pos)
+		      (and (integerp (car w3m-name-anchor-from-hist))
+			   (nthcdr (1+ (car w3m-name-anchor-from-hist))
+				   w3m-name-anchor-from-hist)))))
+    (when found
+      (w3m-recenter))
+    found))
+
+(defun w3m-parent-page-available-p ()
+  (if (null w3m-current-url)
+      nil
+    (save-match-data
+      (string-match "\\`[a-z]+://?[^/]+/." w3m-current-url))))
+
+(defun w3m-view-parent-page (&optional count)
+  "Attempt to move to the parent directory of the page currently displayed.
+For instance, it will let you visit \"http://foo/bar/\" if you are currently
+viewing \"http://foo/bar/baz\".
+If COUNT is a integer, you will visit the parent directory to step up the COUNT.
+If COUNT is zero, you will visit the top of this site."
+  (interactive "p")
+  (unless (integerp count)
+    (setq count 1))
+  (setq count (abs count))
+  (cond
+   ((and w3m-current-url
+	 (eq count 0)
+	 (string-match "\\`[a-z]+:///?[^/]+/" w3m-current-url))
+    (w3m-goto-url (match-string 0 w3m-current-url)))
+   (w3m-start-url (w3m-goto-url w3m-start-url))
+   (w3m-contents-url (w3m-goto-url w3m-contents-url))
+   (w3m-current-url
+    (let ((parent-url w3m-current-url))
+      (catch 'loop
+	(while (not (zerop count))
+	  (setq count (1- count))
+	  ;; Check whether http://foo/bar/ or http://foo/bar
+	  (if (string-match "/$" parent-url)
+	      (if (string-match "\\(.*\\)/[^/]+/$" parent-url)
+		  ;; http://foo/bar/ -> http://foo/
+		  (setq parent-url (concat (match-string 1 parent-url) "/")))
+	    (if (string-match "\\(.*\\)/.+$" parent-url)
+		;; http://foo/bar -> http://foo/
+		(setq parent-url (concat (match-string 1 parent-url) "/"))))
+	  ;; Ignore "http:/"
+	  (cond
+	   ((string-match "\\`[a-z]+:///?[^/]+/\\'" parent-url)
+	    (throw 'loop t))
+	   ((and parent-url
+		 (string-match "\\`[a-z]+:/+\\'" parent-url))
+	    (setq parent-url nil)
+	    (throw 'loop nil)))))
+      (if parent-url
+	  (w3m-goto-url parent-url)
+	(error "No parent page for: %s" w3m-current-url))))
+   (t (error "w3m-current-url is not set"))))
+
+(defun w3m-view-previous-page (&optional count)
+  "Move back COUNT pages in the history.
+If COUNT is a positive integer, move backward COUNT times in the
+history.  If COUNT is a negative integer, moving forward is performed.
+COUNT is treated as 1 by default if it is omitted."
+  (interactive "p")
+  (unless w3m-current-url
+    ;; This page may have not been registered in the history since an
+    ;; accident has probably occurred, so we should skip the page.
+    (if (integerp count)
+	(when (> count 0)
+	  (decf count))
+      (setq count 0)))
+  (let ((index (car w3m-name-anchor-from-hist))
+	pos)
+    (if (and (integerp count)
+	     (integerp index)
+	     (< 0 (setq index (+ index count)))
+	     (setq pos (nth index w3m-name-anchor-from-hist)))
+	(progn
+	  (when (and (= (point) pos)
+		     (nth (1+ index) w3m-name-anchor-from-hist))
+	    (setq index (1+ index)))
+	  (goto-char (nth index w3m-name-anchor-from-hist))
+	  (setcar w3m-name-anchor-from-hist index)
+	  ;; Restore last position.
+	  (w3m-history-restore-position))
+      (let ((hist ;; Cons of a new history element and position pointers.
+	     (if (integerp count)
+		 (w3m-history-backward count)
+	       (w3m-history-backward)))
+	    ;; Inhibit sprouting of a new history.
+	    (w3m-history-reuse-history-elements t)
+	    (w3m-use-refresh 'wait-minimum))
+	(if hist
+	    (let ((w3m-prefer-cache t))
+	      ;; Save last position.
+	      (w3m-history-store-position)
+	      (w3m-goto-url (caar hist) nil nil
+			    (w3m-history-plist-get :post-data)
+			    (w3m-history-plist-get :referer)
+			    nil
+			    (w3m-history-element (caddr hist) t))
+	      ;; Set the position pointers in the history.
+	      (setcar w3m-history (cdr hist))
+	      ;; Restore last position.
+	      (w3m-history-restore-position))
+	  (message "There's no more history"))))))
+
+(defun w3m-view-next-page (&optional count)
+  "Move forward COUNT pages in history.
+If COUNT is a positive integer, move forward COUNT times in the
+history.  If COUNT is a negative integer, moving backward is performed.
+COUNT is treated as 1 by default if it is omitted."
+  (interactive "p")
+  (w3m-view-previous-page (if (integerp count) (- count) -1)))
+
+(defun w3m-expand-path-name (file base)
+  (let ((input (if (eq (elt file 0) ?/)
+		   file
+		 (concat base file)))
+	(output ""))
+    (save-match-data
+      (while (string-match "^\\(?:\\.\\.?/\\)+" input)
+	(setq input (substring input (match-end 0))))
+      (while (not (zerop (length input)))
+	(cond
+	 ((string-match "^/\\.\\(?:/\\|$\\)" input)
+	  (setq input (concat "/" (substring input (match-end 0)))))
+	 ((string-match "^/\\.\\.\\(?:/\\|$\\)" input)
+	  (setq input (concat "/" (substring input (match-end 0))))
+	  (when (string-match "/?[^/]+$" output)
+	    (setq output (substring output 0 (match-beginning 0)))))
+	 ((string-match "^\\.\\.?$" input)
+	  (setq input ""))
+	 (t
+	  (let ((end (and (string-match "^/[^/]*" input)
+			  (match-end 0))))
+	    (setq output
+		  (concat output (substring input 0 end)))
+	    (setq input
+		  (substring input end))))))
+      output)))
+
+(defconst w3m-url-hierarchical-schemes
+  '("http" "https" "ftp" "ftps" "file")
+  "List of schemes which may have hierarchical parts.
+This list is refered to by `w3m-expand-url' to keep backward
+compatibility which is described in Section 5.2 of RFC 2396.")
+
+(defun w3m-expand-url (url &optional base)
+  "Convert URL to the absolute address, and canonicalize it."
+  (save-match-data
+    (if base
+	(if (progn
+	      (w3m-string-match-url-components base)
+	      (match-beginning 1))
+	    (and (not (match-beginning 3))
+		 (member (match-string 2 base) w3m-url-hierarchical-schemes)
+		 (setq base (concat
+			     (substring base 0 (match-end 1))
+			     "//"
+			     (substring base (match-beginning 5)))))
+	  (error "BASE must have a scheme part: %s" base))
+      (setq base (or w3m-current-base-url
+		     w3m-current-url
+		     w3m-url-fallback-base)))
+    (w3m-string-match-url-components url)
+    ;; Remove an empty fragment part.
+    (when (and (match-beginning 8)
+	       (= (match-beginning 9) (length url)))
+      (setq url (substring url 0 (match-beginning 8)))
+      (w3m-string-match-url-components url))
+    ;; Remove an empty query part.
+    (when (and (match-beginning 6)
+	       (= (match-beginning 7) (or (match-beginning 8)
+					  (length url))))
+      (setq url (concat (substring url 0 (match-beginning 6))
+			(if (match-beginning 8)
+			    (substring url (match-beginning 8))
+			  ""))
+	    base (progn (w3m-string-match-url-components base)
+			(substring base 0 (match-beginning 6))))
+      (w3m-string-match-url-components url))
+    (cond
+     ((match-beginning 1)
+      ;; URL has a scheme part. => URL may have an absolute spec.
+      (if (or (match-beginning 3)
+	      (and (< (match-beginning 5) (length url))
+		   (eq ?/ (aref url (match-beginning 5)))))
+	  ;; URL has a net-location part or an absolute hierarchical
+	  ;; part. => URL has an absolute spec.
+	  url
+	(let ((scheme (match-string 2 url)))
+	  (if (and (member scheme w3m-url-hierarchical-schemes)
+		   (progn
+		     (w3m-string-match-url-components base)
+		     (equal scheme (match-string 2 base))))
+	      (w3m-expand-url (substring url (match-end 1)) base)
+	    url))))
+     ((match-beginning 3)
+      ;; URL has a net-location part. => The hierarchical part of URL
+      ;; has an absolute spec.
+      (w3m-string-match-url-components base)
+      (concat (substring base 0 (match-end 1)) url))
+     ((> (match-end 5) (match-beginning 5))
+      (let ((path-end (match-end 5))
+	    expanded-path
+	    ;; See the following thread about a problem related to
+	    ;; the use of file-name-* functions for url string:
+	    ;; http://news.gmane.org/group/gmane.emacs.w3m/thread=4210
+	    file-name-handler-alist)
+	(w3m-string-match-url-components base)
+	(setq expanded-path
+	      (w3m-expand-path-name
+	       (substring url 0 path-end)
+	       (or (file-name-directory (match-string 5 base))
+		   "/")))
+	(concat
+	 (substring base 0 (match-beginning 5))
+	 (if (member (match-string 2 base) w3m-url-hierarchical-schemes)
+	     expanded-path
+	   (substring url 0 path-end))
+	 (substring url path-end))))
+     ((match-beginning 6)
+      ;; URL has a query part.
+      (w3m-string-match-url-components base)
+      (concat (substring base 0 (match-end 5)) url))
+     (t
+      ;; URL has only a fragment part.
+      (w3m-string-match-url-components base)
+      (concat (substring base 0 (match-beginning 8))
+	      url)))))
+
+(defun w3m-display-progress-message (url)
+  "Show \"Reading URL...\" message in the middle of a buffer."
+  (insert (make-string (max 0 (/ (1- (window-height)) 2)) ?\n)
+	  "Reading " (w3m-url-readable-string (w3m-url-strip-authinfo url))
+	  "...")
+  (beginning-of-line)
+  (let ((fill-column (window-width)))
+    (center-region (point) (point-max)))
+  (goto-char (point-min))
+  (put-text-property (point) (point-max) 'w3m-progress-message t)
+  (sit-for 0))
+
+(defun w3m-view-this-url-1 (url reload new-session)
+  (lexical-let ((cur w3m-current-url)
+		(url url)
+		(obuffer (current-buffer))
+		(wconfig (current-window-configuration))
+		pos buffer)
+    (if new-session
+	(let ((empty
+	       ;; If a new url has the #name portion, we simply copy
+	       ;; the buffer's contents to the new session, otherwise
+	       ;; creating an empty buffer.
+	       (not (and (progn
+			   (w3m-string-match-url-components url)
+			   (match-beginning 8))
+			 (string-equal w3m-current-url
+				       (substring url
+						  0 (match-beginning 8)))))))
+	  (setq pos (point-marker)
+		buffer (w3m-copy-buffer
+			nil nil nil empty w3m-new-session-in-background))
+	  (when w3m-new-session-in-background
+	    (set-buffer buffer))
+	  (when empty
+	    (w3m-display-progress-message url)))
+      (setq buffer (current-buffer)))
+    (let (handler)
+      (w3m-process-do
+	  (success (w3m-goto-url url reload nil nil w3m-current-url handler))
+	(set-window-hscroll (selected-window) 0)
+	;; Delete the newly created buffer if it's been made empty.
+	(when (and pos
+		   (buffer-name buffer))
+	  (w3m-delete-buffer-if-empty buffer))
+	(when pos ;; the new session is created.
+	  ;; FIXME: what we should actually do is to modify the `w3m-goto-url'
+	  ;; function so that it may return a proper value, and checking it.
+	  (when (and (marker-buffer pos) (buffer-name (marker-buffer pos)))
+	    (with-current-buffer (marker-buffer pos)
+	      (save-excursion
+		(goto-char pos)
+		(w3m-refontify-anchor)))))
+	;; We need to restore the window configuration to the former
+	;; one if `w3m-new-session-in-background' is non-nil unless
+	;; the buffer's major mode has changed from the w3m-mode to
+	;; another by visiting the new url (possibly a local file,
+	;; a mailto url, doc-view-mode, etc.).
+	(if (and w3m-new-session-in-background
+		 (not (eq obuffer (current-buffer)))
+		 (or (buffer-name buffer)
+		     ;; Clear "...has been retrieved in..." message.
+		     (progn (w3m-message "") nil))
+		 (or (eq major-mode 'w3m-mode)
+		     (not (eq (with-current-buffer buffer major-mode)
+			      'w3m-mode))))
+	    (set-window-configuration wconfig)
+	  (unless (eq cur w3m-current-url)
+	    (w3m-recenter)))))))
+
+(defun w3m-view-this-url (&optional arg new-session)
+  "Display the page pointed to by the link under point.
+If ARG is the number 2 or the list of the number 16 (you may produce
+this by typing `C-u' twice) or NEW-SESSION is non-nil and the link is
+an anchor, this function makes a copy of the current session in
+advance.  Otherwise, if ARG is non-nil, it forces to reload the url at
+point."
+  (interactive (if (member current-prefix-arg '(2 (16)))
+		   (list nil t)
+		 (list current-prefix-arg nil)))
+  ;; Store the current position in the history structure.
+  (w3m-history-store-position)
+  (let ((w3m-prefer-cache
+	 (or w3m-prefer-cache
+	     (and (stringp w3m-current-url)
+		  (string-match "\\`about://\\(?:db-\\)?history/"
+				w3m-current-url))))
+	act url)
+    (cond
+     ((setq act (w3m-action))
+      (let ((w3m-form-new-session new-session)
+	    (w3m-form-download nil))
+	(eval act)))
+     ((setq url (w3m-url-valid (w3m-anchor)))
+      (w3m-view-this-url-1 url arg new-session))
+     ((w3m-url-valid (w3m-image))
+      (if (w3m-display-graphic-p)
+	  (w3m-toggle-inline-image)
+	(w3m-view-image)))
+     ((setq url (w3m-active-region-or-url-at-point t))
+      (unless (eq 'quit (setq url (w3m-input-url nil url 'quit nil
+						 'feeling-lucky)))
+	(w3m-view-this-url-1 url arg new-session)))
+     (t (w3m-message "No URL at point")))))
+
+(eval-and-compile
+  (autoload 'mouse-set-point "mouse"))
+
+(defun w3m-mouse-view-this-url (event &optional arg)
+  "Follow the link under the mouse pointer."
+  (interactive "e\nP")
+  (mouse-set-point event)
+  (w3m-view-this-url arg))
+
+(defun w3m-open-all-links-in-new-session (start end &optional arg)
+  "Open all http links between START and END as new sessions.
+If the page looks like Google's search result and the START point is
+the beginning of a line, only the links displayed in the beginning of
+lines are picked up.  If ARG is non-nil, it forces to reload all links.
+If Transient Mark mode, deactivate the mark."
+  (interactive "r\nP")
+  (when (w3m-region-active-p)
+    (w3m-deactivate-region))
+  (let ((buffer (current-buffer))
+	(prev start)
+	(url (w3m-url-valid (w3m-anchor start)))
+	urls all)
+    (when url
+      (setq urls (list url)))
+    (save-excursion
+      (goto-char start)
+      (setq all (not (and (bolp)
+			  w3m-current-url
+			  (string-match "\\`http://\\(?:[^/]+\\.\\)*google\\."
+					w3m-current-url))))
+      (while (progn
+	       (w3m-next-anchor)
+	       (and (> (point) prev)
+		    (< (point) end)))
+	(setq prev (point))
+	(when (and (setq url (w3m-url-valid (w3m-anchor)))
+		   (string-match "\\`https?:" url)
+		   (or all
+		       (bolp)))
+	  (push url urls))))
+    (setq urls (nreverse urls))
+    (while urls
+      (setq url (car urls)
+	    urls (cdr urls))
+      (set-buffer buffer)
+      (w3m-view-this-url-1 url arg t))))
+
+(defun w3m-view-this-url-new-session ()
+  "Display the page of the link under point in a new session.
+If the region is active, use the `w3m-open-all-links-in-new-session'
+command instead."
+  (interactive)
+  (if (w3m-region-active-p)
+      (call-interactively 'w3m-open-all-links-in-new-session)
+    (w3m-view-this-url nil t)))
+
+(defun w3m-mouse-view-this-url-new-session (event)
+  "Follow the link under the mouse pointer in a new session."
+  (interactive "e")
+  (mouse-set-point event)
+  (w3m-view-this-url nil t))
+
+(defun w3m-submit-form (&optional new-session)
+  "Submit the form at point."
+  (interactive "P")
+  (let ((submit (w3m-submit)))
+    (if (and submit
+	     w3m-current-url
+	     (w3m-url-valid w3m-current-url)
+	     (if w3m-submit-form-safety-check
+		 (prog1 (y-or-n-p "Submit? ") (message nil))
+	       t))
+	(let ((w3m-form-new-session new-session)
+	      (w3m-form-download nil))
+	  (eval submit))
+      (w3m-message "Can't submit form at this point"))))
+
+(defun w3m-external-view (url &optional no-cache handler)
+  (when (w3m-url-valid url)
+    (lexical-let ((url url)
+		  (no-cache no-cache))
+      (w3m-process-do
+	  (type (w3m-content-type url no-cache handler))
+	(when type
+	  (lexical-let ((method
+			 (or (nth 2 (assoc type w3m-content-type-alist))
+			     (nth 2 (assoc (w3m-prepare-content url type nil)
+					   w3m-content-type-alist)))))
+	    (cond
+	     ((not method)
+	      (if (w3m-url-local-p url)
+		  (error "\
+No method to view `%s' is registered. Use `w3m-edit-this-url'"
+			 (file-name-nondirectory (w3m-url-to-file-name url)))
+		(w3m-download url nil no-cache handler)))
+	     ((functionp method)
+	      (funcall method url))
+	     ((consp method)
+	      (lexical-let
+		  ((command (w3m-which-command (car method)))
+		   (arguments (cdr method))
+		   (file (make-temp-name
+			  (expand-file-name "w3mel" w3m-profile-directory)))
+		   suffix)
+		(setq suffix (file-name-nondirectory url))
+		(when (string-match "\\.[a-zA-Z0-9]+$" suffix)
+		  (setq suffix (match-string 0 suffix))
+		  (when (< (length suffix) 5)
+		    (setq file (concat file suffix))))
+		(cond
+		 ((and command (memq 'file arguments))
+		  (let ((w3m-current-buffer (current-buffer)))
+		    (w3m-process-do
+			(success (w3m-download url file no-cache handler))
+		      (when success
+			(w3m-external-view-file command file url arguments)))))
+		 (command
+		  (w3m-external-view-file command nil url arguments))
+		 (t
+		  (w3m-download url nil no-cache handler))))))))))))
+
+(defun w3m-external-view-file (command file url arguments)
+  ;; The 3rd argument `url' is necessary to handle the constant `url'
+  ;; included in the 4th argument `arguments' which is provided by
+  ;; `w3m-content-type-alist'.
+  (lexical-let ((file file))
+    (let (proc)
+      (unwind-protect
+	  (with-current-buffer
+	      (generate-new-buffer " *w3m-external-view*")
+	    (setq proc
+		  (apply 'start-process
+			 "w3m-external-view"
+			 (current-buffer)
+			 command
+			 (mapcar (function eval) arguments)))
+	    (w3m-message "Start %s..." (file-name-nondirectory command))
+	    (set-process-sentinel
+	     proc
+	     (lambda (proc event)
+	       (let ((buffer (process-buffer proc)))
+		 (when (and (string-match "^\\(?:finished\\|exited\\)" event)
+			    (buffer-name buffer))
+		   (with-current-buffer buffer
+		     (and (stringp file)
+			  (file-exists-p file)
+			  (delete-file file)))
+		   (kill-buffer buffer))))))
+	(and (stringp file)
+	     (file-exists-p file)
+	     (unless (and (processp proc)
+			  (memq (process-status proc) '(run stop)))
+	       (delete-file file)))))))
+
+(defun w3m-view-image ()
+  "Display the image under point in the external viewer.
+The viewer is defined in `w3m-content-type-alist' for every type of an
+image."
+  (interactive)
+  (let ((url (w3m-url-valid (w3m-image))))
+    (if url
+	(w3m-external-view url)
+      (w3m-message "No image at point"))))
+
+(defun w3m-save-image ()
+  "Save the image under point to a file.
+The default name will be the original name of the image."
+  (interactive)
+  (let ((url (w3m-url-valid (w3m-image))))
+    (if url
+	(w3m-download url)
+      (w3m-message "No image at point"))))
+
+(defun w3m-external-view-this-url ()
+  "Launch the external browser and display the link an point."
+  (interactive)
+  (let ((url (w3m-url-valid (or (w3m-anchor) (w3m-image)))))
+    (if url
+	(w3m-external-view url)
+      (w3m-message "No URL at point"))))
+
+(defun w3m-external-view-current-url ()
+  "Launch the external browser and display the current URL."
+  (interactive)
+  (if w3m-current-url
+      (w3m-external-view w3m-current-url)
+    (w3m-message "No URL at this page")))
+
+(defun w3m-view-url-with-external-browser (&optional url)
+  "Launch the external browser and display the same web page.
+If the cursor points to a link, it visits the url of the link instead
+of the url currently displayed.  The browser is defined in
+`w3m-content-type-alist' for every type of a url."
+  (interactive)
+  (unless url
+    (setq url (or url
+		  (w3m-anchor)
+		  (unless w3m-display-inline-images
+		    (w3m-image))
+		  (when (y-or-n-p (format "Browse <%s> ? " w3m-current-url))
+		    w3m-current-url))))
+  (if (w3m-url-valid url)
+      (progn
+	(message "Browsing <%s>..." url)
+	(w3m-external-view url))
+    (w3m-message "No URL at point")))
+
+(defun w3m-download-this-url ()
+  "Download the file or the page pointed to by the link under point."
+  (interactive)
+  (let ((url (or (w3m-anchor) (w3m-image))) act)
+    (cond
+     ((w3m-url-valid url)
+      (lexical-let ((pos (point-marker))
+		    (curl w3m-current-url))
+	(w3m-process-with-null-handler
+	  (w3m-process-do
+	      (success (w3m-download url nil nil handler))
+	    (and success
+		 (buffer-name (marker-buffer pos))
+		 (with-current-buffer (marker-buffer pos)
+		   (when (equal curl w3m-current-url)
+		     (goto-char pos)
+		     (w3m-refontify-anchor))))))))
+     ((setq act (w3m-action))
+      (let ((w3m-form-download t))
+	(eval act)))
+     (t
+      (w3m-message "No URL at point")))))
+
+(defun w3m-download-this-image ()
+  "Download the image under point."
+  (interactive)
+  (let ((url (w3m-image)) act)
+    (cond
+     ((w3m-url-valid url)
+      (lexical-let ((pos (point-marker))
+		    (curl w3m-current-url))
+	(w3m-process-with-null-handler
+	  (w3m-process-do
+	      (success (w3m-download url nil nil handler))
+	    (and success
+		 (buffer-name (marker-buffer pos))
+		 (with-current-buffer (marker-buffer pos)
+		   (when (equal curl w3m-current-url)
+		     (goto-char pos)
+		     (w3m-refontify-anchor))))))))
+     ((setq act (w3m-action))
+      (let ((w3m-form-download t))
+	(eval act)))
+     (t
+      (w3m-message "No image at point")))))
+
+(defun w3m-print-current-url ()
+  "Display the current url in the echo area and put it into `kill-ring'."
+  (interactive)
+  (when w3m-current-url
+    (let ((deactivate-mark nil))
+      (kill-new w3m-current-url)
+      (w3m-message "%s" (w3m-url-readable-string w3m-current-url)))))
+
+(defun w3m-print-this-url (&optional interactive-p)
+  "Display the url under point in the echo area and put it into `kill-ring'."
+  (interactive (list t))
+  (let ((deactivate-mark nil)
+	(url (if interactive-p
+		 (or (w3m-anchor) (w3m-image))
+	       (or (w3m-anchor (point)) (w3m-image (point)))))
+	(alt (if interactive-p
+		 (w3m-image-alt)
+	       (w3m-image-alt (point)))))
+    (when (or url interactive-p)
+      (and url interactive-p (kill-new url))
+      (w3m-message "%s%s"
+		   (if (zerop (length alt))
+		       ""
+		     (concat alt ": "))
+		   (or (w3m-url-readable-string url)
+		       (and (w3m-action) "There is a form")
+		       "There is no url")))))
+
+(defun w3m-print-this-image-url (&optional interactive-p)
+  "Display image url under point in echo area and put it into `kill-ring'."
+  (interactive (list t))
+  (let ((deactivate-mark nil)
+	(url (if interactive-p
+		 (w3m-image)
+	       (w3m-image (point))))
+	(alt (if interactive-p
+		 (w3m-image-alt)
+	       (w3m-image-alt (point)))))
+    (when (or url interactive-p)
+      (and url interactive-p (kill-new url))
+      (w3m-message "%s%s"
+		   (if (zerop (length alt))
+		       ""
+		     (concat alt ": "))
+		   (or (w3m-url-readable-string url)
+		       (and (w3m-action) "There is a form")
+		       "There is no image url")))))
+
+(defmacro w3m-delete-all-overlays ()
+  "Delete all momentary overlays."
+  '(dolist (overlay (overlays-in (point-min) (point-max)))
+     (if (overlay-get overlay 'w3m-momentary-overlay)
+	 (delete-overlay overlay))))
+
+(defun w3m-highlight-current-anchor-1 (seq)
+  "Highlight an anchor in the line if the anchor sequence is the same as SEQ.
+Return t if highlighting is successful."
+  (let ((limit (point-at-eol))
+	ov beg pos pseq)
+    (save-excursion
+      (beginning-of-line)
+      (setq pos (point))
+      (while (and pos
+		  (< pos limit)
+		  (not (eq seq (setq pseq (w3m-anchor-sequence pos)))))
+	(setq pos (next-single-property-change pos 'w3m-anchor-sequence)))
+      (when (and pos (< pos limit) (eq seq pseq))
+	(setq beg pos)
+	(setq pos (next-single-property-change pos 'w3m-anchor-sequence))
+	(setq ov (make-overlay beg pos))
+	(overlay-put ov 'face 'w3m-current-anchor)
+	(overlay-put ov 'w3m-momentary-overlay t)
+	(overlay-put ov 'evaporate t)
+	t))))
+
+(defun w3m-highlight-current-anchor ()
+  "Highlight an anchor under point."
+  (when (let ((ovs (overlays-at (point))) ov)
+	  ;; If the anchor is already highlighted, it does nothing.
+	  (or (null ovs)
+	      (null (progn (while ovs
+			     (if (overlay-get (car ovs) 'w3m-momentary-overlay)
+				 (setq ov (car ovs)
+				       ovs nil))
+			     (setq ovs (cdr ovs)))
+			   ov))))
+    (w3m-delete-all-overlays)
+    (save-excursion
+      (let ((seq (w3m-anchor-sequence))
+	    (pos (point)))
+	(when (and seq
+		   (w3m-highlight-current-anchor-1 seq)
+		   (zerop (forward-line 1)))
+	  (while (and (w3m-highlight-current-anchor-1 seq)
+		      (zerop (forward-line 1))))
+	  (goto-char pos)
+	  (while (and (zerop (forward-line -1))
+		      (w3m-highlight-current-anchor-1 seq))))))))
+
+(defun w3m-edit-url (url)
+  "Edit the page pointed by URL."
+  (interactive (list (w3m-input-url)))
+  (when (string-match "\\`about://\\(?:header\\|source\\)/" url)
+    (setq url (substring url (match-end 0))))
+  (catch 'found
+    (dolist (pair w3m-edit-function-alist)
+      (when (and (string-match (car pair) url)
+		 (fboundp (cdr pair)))
+	(throw 'found (funcall (cdr pair) url))))
+    (funcall w3m-edit-function
+	     (or (w3m-url-to-file-name url)
+		 (error "URL:%s is not a local file" url)))))
+
+(defun w3m-edit-current-url ()
+  "Edit this viewing page."
+  (interactive)
+  (if w3m-current-url
+      (w3m-edit-url w3m-current-url)
+    (w3m-message "No URL")))
+
+(defun w3m-edit-this-url ()
+  "Edit the page linked from the anchor under the cursor."
+  (interactive)
+  (let ((url (w3m-url-valid (w3m-anchor))))
+    (if url
+	(w3m-edit-url url)
+      (w3m-message "No URL at point"))))
+
+(defvar w3m-goto-anchor-hist nil)
+(make-variable-buffer-local 'w3m-goto-anchor-hist)
+
+(defun w3m-goto-next-anchor ()
+  (let ((hseq (w3m-anchor-sequence))
+	(pos (next-single-property-change (point) 'w3m-anchor-sequence)))
+    (if (or (not hseq) (< hseq 1))
+	(and pos (goto-char pos))
+      (setq pos
+	    ;; hseq is not sequence in form.
+	    (catch 'loop
+	      (setq hseq (1+ hseq))
+	      (while (<= hseq w3m-max-anchor-sequence)
+		(setq pos (text-property-any
+			   (point-min) (point-max) 'w3m-anchor-sequence hseq))
+		(when pos (throw 'loop pos))
+		(setq hseq (1+ hseq)))))
+      (and pos (goto-char pos)))))
+
+(defun w3m-next-anchor (&optional arg)
+  "Move the point to the next anchor."
+  (interactive "p")
+  (w3m-keep-region-active)
+  (unless arg (setq arg 1))
+  (if (null (memq last-command '(w3m-next-anchor w3m-previous-anchor)))
+      (when (setq w3m-goto-anchor-hist (w3m-anchor-sequence))
+	(setq w3m-goto-anchor-hist (list w3m-goto-anchor-hist)))
+    (when (and (eq last-command 'w3m-previous-anchor) w3m-goto-anchor-hist)
+      (setcdr w3m-goto-anchor-hist nil)))
+  (if (< arg 0)
+      (w3m-previous-anchor (- arg))
+    (let (pos)
+      (while (> arg 0)
+	(unless (w3m-goto-next-anchor)
+	  (setq w3m-goto-anchor-hist nil)
+	  (if (w3m-imitate-widget-button)
+	      (widget-forward 1)
+	    (when (setq pos (text-property-any
+			     (point-min) (point-max) 'w3m-anchor-sequence 1))
+	      (goto-char pos))))
+	(setq arg (1- arg))
+	(if (member (w3m-anchor-sequence) w3m-goto-anchor-hist)
+	    (setq arg (1+ arg))
+	  (push (w3m-anchor-sequence) w3m-goto-anchor-hist))))
+    (w3m-horizontal-on-screen)
+    (w3m-print-this-url)))
+
+(defun w3m-goto-previous-anchor ()
+  (let ((hseq (w3m-anchor-sequence))
+	(pos (previous-single-property-change (point) 'w3m-anchor-sequence)))
+    (cond
+     ((and (not hseq) pos)
+      (if (w3m-anchor-sequence pos)
+	  (goto-char pos)
+	(setq pos (previous-single-property-change pos 'w3m-anchor-sequence))
+	(and pos (goto-char pos))))
+     ((or (not pos) (< hseq 2)) nil)
+     (t
+      (setq pos
+	    ;; hseq is not sequence in form.
+	    (catch 'loop
+	      (setq hseq (1- hseq))
+	      (while (> hseq 0)
+		(setq pos (text-property-any
+			   (point-min) (point-max) 'w3m-anchor-sequence hseq))
+		(when pos (throw 'loop pos))
+		(setq hseq (1- hseq)))))
+      (and pos (goto-char pos))))))
+
+(defun w3m-previous-anchor (&optional arg)
+  "Move the point to the previous anchor."
+  (interactive "p")
+  (w3m-keep-region-active)
+  (unless arg (setq arg 1))
+  (if (null (memq last-command '(w3m-next-anchor w3m-previous-anchor)))
+      (when (setq w3m-goto-anchor-hist (w3m-anchor-sequence))
+	(setq w3m-goto-anchor-hist (list w3m-goto-anchor-hist)))
+    (when (and (eq last-command 'w3m-next-anchor) w3m-goto-anchor-hist)
+      (setcdr w3m-goto-anchor-hist nil)))
+  (if (< arg 0)
+      (w3m-next-anchor (- arg))
+    (let (pos)
+      (while (> arg 0)
+	(unless (w3m-goto-previous-anchor)
+	  (setq w3m-goto-anchor-hist nil)
+	  (if (w3m-imitate-widget-button)
+	      (widget-forward -1)
+	    (when (setq pos (and w3m-max-anchor-sequence
+				 (text-property-any
+				  (point-min) (point-max)
+				  'w3m-anchor-sequence
+				  w3m-max-anchor-sequence)))
+	      (goto-char pos))))
+	(setq arg (1- arg))
+	(if (member (w3m-anchor-sequence) w3m-goto-anchor-hist)
+	    (setq arg (1+ arg))
+	  (push (w3m-anchor-sequence) w3m-goto-anchor-hist))))
+    (w3m-horizontal-on-screen)
+    (w3m-print-this-url)))
+
+(defun w3m-goto-next-form ()
+  ;; Move the point to the end of the current form.
+  (when (w3m-action (point))
+    (goto-char (next-single-property-change (point) 'w3m-action)))
+  ;; Find the next form.
+  (or (w3m-action (point))
+      (let ((pos (next-single-property-change (point) 'w3m-action)))
+	(when pos
+	  (goto-char pos)
+	  t))))
+
+(defun w3m-next-form (&optional arg)
+  "Move the point to the next form."
+  (interactive "p")
+  (w3m-keep-region-active)
+  (unless arg (setq arg 1))
+  (if (null (memq last-command '(w3m-next-form w3m-previous-form)))
+      (when (setq w3m-goto-anchor-hist (w3m-action (point)))
+	(setq w3m-goto-anchor-hist (list w3m-goto-anchor-hist)))
+    (when (and (eq last-command 'w3m-previous-form) w3m-goto-anchor-hist)
+      (setcdr w3m-goto-anchor-hist nil)))
+  (if (< arg 0)
+      (w3m-previous-form (- arg))
+    (while (> arg 0)
+      (unless (w3m-goto-next-form)
+	;; Make a search from the beginning of the buffer.
+	(setq w3m-goto-anchor-hist nil)
+	(goto-char (point-min))
+	(w3m-goto-next-form))
+      (setq arg (1- arg))
+      (if (member (w3m-action (point)) w3m-goto-anchor-hist)
+	  (setq arg (1+ arg))
+	(push (w3m-action (point)) w3m-goto-anchor-hist)))
+    (w3m-horizontal-on-screen)
+    (w3m-print-this-url)))
+
+(defun w3m-goto-previous-form ()
+  ;; Move the point to the beginning of the current form.
+  (when (w3m-action (point))
+    (goto-char (previous-single-property-change (1+ (point))
+						'w3m-action)))
+  ;; Find the previous form.
+  (let ((pos (previous-single-property-change (point) 'w3m-action)))
+    (if pos
+	(goto-char
+	 (if (w3m-action pos)
+	     pos
+	   (previous-single-property-change pos 'w3m-action))))))
+
+(defun w3m-previous-form (&optional arg)
+  "Move the point to the previous form."
+  (interactive "p")
+  (w3m-keep-region-active)
+  (unless arg (setq arg 1))
+  (if (null (memq last-command '(w3m-next-form w3m-previous-form)))
+      (when (setq w3m-goto-anchor-hist (w3m-action (point)))
+	(setq w3m-goto-anchor-hist (list w3m-goto-anchor-hist)))
+    (when (and (eq last-command 'w3m-next-form) w3m-goto-anchor-hist)
+      (setcdr w3m-goto-anchor-hist nil)))
+  (if (< arg 0)
+      (w3m-next-form (- arg))
+    (while (> arg 0)
+      (unless (w3m-goto-previous-form)
+	;; search from the end of the buffer
+	(setq w3m-goto-anchor-hist nil)
+	(goto-char (point-max))
+	(w3m-goto-previous-form))
+      (setq arg (1- arg))
+      (if (member (w3m-action (point)) w3m-goto-anchor-hist)
+	  (setq arg (1+ arg))
+	(push (w3m-action (point)) w3m-goto-anchor-hist)))
+    (w3m-horizontal-on-screen)
+    (w3m-print-this-url)))
+
+(defun w3m-goto-next-image ()
+  ;; Move the point to the end of the current image.
+  (when (w3m-image (point))
+    (goto-char (next-single-property-change (point) 'w3m-image)))
+  ;; Find the next form or image.
+  (or (w3m-image (point))
+      (let ((pos (next-single-property-change (point) 'w3m-image)))
+	(when pos
+	  (goto-char pos)
+	  t))))
+
+(defun w3m-next-image (&optional arg)
+  "Move the point to the next image."
+  (interactive "p")
+  (w3m-keep-region-active)
+  (unless arg (setq arg 1))
+  (if (null (memq last-command
+		  '(w3m-next-image w3m-previous-image)))
+      (when (setq w3m-goto-anchor-hist (w3m-image (point)))
+	(setq w3m-goto-anchor-hist (list w3m-goto-anchor-hist)))
+    (when (and (eq last-command 'w3m-previous-image)
+	       w3m-goto-anchor-hist)
+      (setcdr w3m-goto-anchor-hist nil)))
+  (if (< arg 0)
+      (w3m-previous-image (- arg))
+    (while (> arg 0)
+      (unless (w3m-goto-next-image)
+	;; Make a search for an image from the beginning of the buffer.
+	(setq w3m-goto-anchor-hist nil)
+	(goto-char (point-min))
+	(w3m-goto-next-image))
+      (setq arg (1- arg))
+      (if (member (w3m-image (point)) w3m-goto-anchor-hist)
+	  (setq arg (1+ arg))
+	(push (w3m-image (point)) w3m-goto-anchor-hist)))
+    (w3m-horizontal-on-screen)
+    (w3m-print-this-url)))
+
+(defun w3m-goto-previous-image ()
+  ;; Move the point to the beginning of the current image.
+  (when (w3m-image (point))
+    (goto-char (previous-single-property-change (1+ (point))
+						'w3m-image)))
+  ;; Find the previous form or image.
+  (let ((pos (previous-single-property-change (point) 'w3m-image)))
+    (if pos
+	(goto-char
+	 (if (w3m-image pos) pos
+	   (previous-single-property-change pos 'w3m-image))))))
+
+(defun w3m-previous-image (&optional arg)
+  "Move the point to the previous image."
+  (interactive "p")
+  (w3m-keep-region-active)
+  (unless arg (setq arg 1))
+  (if (null (memq last-command '(w3m-next-image w3m-previous-image)))
+      (when (setq w3m-goto-anchor-hist (w3m-image (point)))
+	(setq w3m-goto-anchor-hist (list w3m-goto-anchor-hist)))
+    (when (and (eq last-command 'w3m-next-image)
+	       w3m-goto-anchor-hist)
+      (setcdr w3m-goto-anchor-hist nil)))
+  (if (< arg 0)
+      (w3m-next-image (- arg))
+    (while (> arg 0)
+      (unless (w3m-goto-previous-image)
+	;; Make a search from the end of the buffer.
+	(setq w3m-goto-anchor-hist nil)
+	(goto-char (point-max))
+	(w3m-goto-previous-image))
+      (setq arg (1- arg))
+      (if (member (w3m-image (point)) w3m-goto-anchor-hist)
+	  (setq arg (1+ arg))
+	(push (w3m-image (point)) w3m-goto-anchor-hist)))
+    (w3m-horizontal-on-screen)
+    (w3m-print-this-url)))
+
+(defun w3m-copy-buffer (&optional buffer newname just-copy empty background)
+  "Create a copy of the BUFFER in which emacs-w3m is working.
+Return a new buffer.
+
+If BUFFER is nil, the current buffer is assumed.  If NEWNAME is nil,
+it defaults to the name of the current buffer.  If JUST-COPY is nil,
+this function lets a new buffer be the current buffer and pop up as a
+new window or a new frame according to `w3m-pop-up-windows' and
+`w3m-pop-up-frames' (which see), otherwise just creates BUFFER's copy.
+If EMPTY is nil, a page of the same url will be re-rendered in a new
+buffer, otherwise an empty buffer is created. If BACKGROUND is non-nil,
+this function stays on the current buffer.
+
+Note that this function should be called on the window displaying the
+original buffer BUFFER even if JUST-COPY is non-nil in order to render
+a page in a new buffer with the correct width."
+  (interactive (list (current-buffer)
+		     (if current-prefix-arg (read-string "Name: "))
+		     t))
+  (unless buffer
+    (setq buffer (current-buffer)))
+  (unless newname
+    (setq newname (buffer-name buffer)))
+  (when (string-match "<[0-9]+>\\'" newname)
+    (setq newname (substring newname 0 (match-beginning 0))))
+  (let (url coding images init-frames new)
+    (save-current-buffer
+      (set-buffer buffer)
+      (setq url (or w3m-current-url
+		    (car (w3m-history-element (cadar w3m-history))))
+	    coding w3m-current-coding-system
+	    images w3m-display-inline-images
+	    init-frames (when (w3m-popup-frame-p)
+			  (copy-sequence w3m-initial-frames)))
+      (unless url
+	(setq empty t))
+      ;;
+      (set-buffer (setq new (w3m-generate-new-buffer newname)))
+      (w3m-mode)
+      ;; Make copies of `w3m-history' and `w3m-history-flat'.
+      (w3m-history-copy buffer)
+      (setq w3m-current-coding-system coding
+	    w3m-initial-frames init-frames
+	    w3m-display-inline-images
+	    (if w3m-toggle-inline-images-permanently
+		images
+	      w3m-default-display-inline-images)))
+    (cond
+     ((and empty (not background))
+      ;; Pop to a window or a frame up because `w3m-goto-url' is not called.
+      (w3m-popup-buffer new))
+     (empty
+      ;; When empty and just-copy, stay origianl buffer.
+      )
+     (t
+      ;; Need to change to the `new' buffer in which `w3m-goto-url' runs.
+      (set-buffer new)
+      ;; Render a page.
+      (let ((positions (copy-sequence (car w3m-history)))
+	    (w3m-history-reuse-history-elements t)
+	    (w3m-prefer-cache t))
+	(w3m-process-with-wait-handler
+	  (w3m-goto-url url 'redisplay nil nil nil handler
+			;; Pass the properties of the history elements,
+			;; although it is currently always nil.
+			(w3m-history-element (cadr positions))))
+	(setcar w3m-history positions))
+      (when (and w3m-new-session-in-background
+		 just-copy
+		 (not (get-buffer-window buffer)))
+	(set-window-buffer (selected-window) buffer))))
+    new))
+
+(defun w3m-next-buffer (arg)
+  "Turn ARG pages of emacs-w3m buffers ahead."
+  (interactive "p")
+  (unless arg (setq arg 1))
+  (when (and (/= arg 0) (eq major-mode 'w3m-mode))
+    (w3m-history-store-position)
+    (let* ((buffers (w3m-list-buffers))
+	   (len (length buffers)))
+      (switch-to-buffer
+       (nth (mod (+ arg (- len (length (memq (current-buffer) buffers))))
+		 len)
+	    buffers)))
+    (w3m-history-restore-position)
+    (run-hooks 'w3m-select-buffer-hook)
+    (w3m-select-buffer-update)))
+
+(defun w3m-previous-buffer (arg)
+  "Turn ARG pages of emacs-w3m buffers behind."
+  (interactive "p")
+  (w3m-next-buffer (- arg)))
+
+(defun w3m-delete-buffer (&optional force)
+  "Delete the current emacs-w3m buffer and switch to the previous one.
+If there is the sole emacs-w3m buffer, it is assumed to be called for
+terminating the emacs-w3m session; the prefix argument FORCE will be
+passed to the `w3m-quit' function (which see)."
+  (interactive "P")
+  ;; Bind `w3m-fb-mode' to nil so that this function might not call
+  ;; `w3m-quit' when there is only one buffer belonging to the selected
+  ;; frame, but there are emacs-w3m buffers in other frames.
+  (let* ((w3m-fb-mode nil)
+	 (buffers (w3m-list-buffers t))
+	 (num (length buffers))
+	 cur buf bufs)
+    (if (= 1 num)
+	(w3m-quit force)
+      (setq cur (current-buffer))
+      (if (w3m-use-tab-p)
+	  (save-window-excursion
+	    (select-window (or (get-buffer-window cur t) (selected-window)))
+	    (w3m-next-buffer -1))
+	;; List buffers being shown in the other windows of the current frame.
+	(save-current-buffer
+	  (walk-windows (lambda (window)
+			  (set-buffer (setq buf (window-buffer window)))
+			  (when (and (eq major-mode 'w3m-mode)
+				     (not (eq buf cur)))
+			    (push buf bufs)))
+			'no-minibuf))
+	(cond ((= (1- num) (length bufs))
+	       ;; All the other buffers are shown in the current frame.
+	       (select-window (get-buffer-window (prog2
+						     (w3m-next-buffer -1)
+						     (current-buffer)
+						   (delete-window)))))
+	      (bufs
+	       ;; Look for the buffer which is not shown in the current frame.
+	       (setq buf nil)
+	       (while (progn
+			(w3m-next-buffer -1)
+			(unless buf
+			  (setq buf (current-buffer)))
+			(memq (current-buffer) bufs)))
+	       (when (memq buf bufs)
+		 ;; Go to the buffer which is most suitable to be called
+		 ;; the *previous* buffer.
+		 (select-window (get-buffer-window buf))))
+	      ((progn ;; List buffers being not shown anywhere.
+		 (setq bufs nil)
+		 (while buffers
+		   (unless (get-buffer-window (setq buf (pop buffers)) t)
+		     (push buf bufs)))
+		 bufs)
+	       (while (progn
+			(w3m-next-buffer -1)
+			(not (memq (current-buffer) bufs)))))
+	      ((memq (selected-frame) w3m-initial-frames)
+	       ;; Assume that this frame was created to show this buffer.
+	       (if (one-window-p t)
+		   (delete-frame)
+		 (delete-window)))
+	      (t
+	       (if (>= num 2)
+		   (w3m-next-buffer -1)
+		 (unless (one-window-p t)
+		   (delete-window))))))
+      (w3m-session-deleted-save (list cur))
+      (w3m-process-stop cur)
+      (w3m-idle-images-show-unqueue cur)
+      (kill-buffer cur)
+      (when w3m-use-form
+	(w3m-form-kill-buffer cur))
+      (w3m-history-restore-position)
+      (run-hooks 'w3m-delete-buffer-hook)
+      (w3m-session-crash-recovery-save)))
+  (w3m-select-buffer-update)
+  (unless w3m-fb-inhibit-buffer-selection
+    (w3m-fb-select-buffer)))
+
+(defun w3m-delete-buffer-if-empty (buffer)
+  "Delete a newly created emacs-w3m buffer BUFFER if it seems unnecessary.
+Some emacs-w3m commands create a buffer for the new session first, but
+it may be useless if the command is invoked for visiting a local file
+or a mail buffer.  This command will delete BUFFER if it is empty or
+there is only a progress message.  It also deletes windows and frames
+related to BUFFER."
+  (with-current-buffer buffer
+    (unless (or w3m-current-process
+		w3m-current-url
+		(not (or (zerop (buffer-size))
+			 (and (get-text-property (point-min)
+						 'w3m-progress-message)
+			      (get-text-property (1- (point-max))
+						 'w3m-progress-message)))))
+      (w3m-delete-buffer t))))
+
+(defun w3m-pack-buffer-numbers ()
+  "Renumber suffixes of names of emacs-w3m buffers.
+It aligns emacs-w3m buffers in order of *w3m*, *w3m<2>, *w3m*<3>,...
+as if the folder command of MH performs with the -pack option."
+  (interactive)
+  (let ((count 1) number newname)
+    (dolist (buffer (w3m-list-buffers))
+      (setq number (w3m-buffer-number buffer))
+      (when number
+	(unless (eq number count)
+	  (when (and (setq newname (w3m-buffer-set-number buffer count))
+		     w3m-use-form)
+	    (w3m-form-set-number buffer newname)))
+	(incf count)))))
+
+(defun w3m-delete-other-buffers (&optional buffer)
+  "Delete emacs-w3m buffers except for BUFFER or the current buffer."
+  (interactive)
+  (unless buffer
+    (setq buffer (current-buffer)))
+  (w3m-delete-frames-and-windows buffer)
+  (let ((buffers (delq buffer (w3m-list-buffers t))))
+    (w3m-delete-buffers buffers)))
+
+(defun w3m-delete-left-tabs ()
+  "Delete tabs on the left side of the current tab."
+  (interactive)
+  (let ((cbuf (current-buffer))
+	bufs)
+    (setq bufs (catch 'done
+		 (dolist (buf (w3m-list-buffers))
+		   (if (eq cbuf buf)
+		       (throw 'done bufs)
+		     (setq bufs (cons buf bufs))))))
+    (when bufs
+      (w3m-delete-buffers bufs))))
+
+(defun w3m-delete-right-tabs ()
+  "Delete tabs on the right side of the current tab."
+  (interactive)
+  (let ((bufs (w3m-righttab-exist-p)))
+    (when bufs
+      (w3m-delete-buffers bufs))))
+
+(defun w3m-delete-buffers (buffers)
+  "Delete emacs-w3m buffers."
+  (let (buffer)
+    (when buffers
+      (w3m-session-deleted-save buffers))
+    (while buffers
+      (setq buffer (pop buffers))
+      (w3m-process-stop buffer)
+      (w3m-idle-images-show-unqueue buffer)
+      (kill-buffer buffer)
+      (when w3m-use-form
+	(w3m-form-kill-buffer buffer))))
+  (run-hooks 'w3m-delete-buffer-hook)
+  (w3m-session-crash-recovery-save)
+  (w3m-select-buffer-update)
+  (w3m-force-window-update))
+
+(defvar w3m-ctl-c-map nil
+  "Sub-keymap used for the `C-c'-prefixed commands.
+
+Note: keys should not be alphabet since `C-c LETTER' keys are reserved
+for users.  See Info node `(elisp)Key Binding Conventions'.")
+(unless w3m-ctl-c-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "\C-@" 'w3m-history-store-position)
+    (if (featurep 'xemacs)
+	(define-key map [(control space)] 'w3m-history-store-position)
+      ;; `C- ' doesn't mean `C-SPC' in XEmacs.
+      (define-key map [?\C-\ ] 'w3m-history-store-position))
+    (define-key map "\C-v" 'w3m-history-restore-position)
+    (define-key map "\C-t" 'w3m-copy-buffer)
+    (define-key map "\C-p" 'w3m-previous-buffer)
+    (define-key map "\C-n" 'w3m-next-buffer)
+    (when (featurep 'w3m-ems)
+      (define-key map [?\C-,] 'w3m-tab-move-left)
+      (define-key map [?\C-<] 'w3m-tab-move-left)
+      (define-key map [?\C-.] 'w3m-tab-move-right)
+      (define-key map [?\C->] 'w3m-tab-move-right))
+    (define-key map "\C-w" 'w3m-delete-buffer)
+    (define-key map "\M-w" 'w3m-delete-other-buffers)
+    (define-key map "\M-l" 'w3m-delete-left-tabs)
+    (define-key map "\M-r" 'w3m-delete-right-tabs)
+    (define-key map "\C-s" 'w3m-select-buffer)
+    (define-key map "\C-a" 'w3m-switch-buffer)
+    (define-key map "\C-b" 'report-emacs-w3m-bug)
+    (define-key map "\C-c" 'w3m-submit-form)
+    (define-key map "\C-k" 'w3m-process-stop)
+    (define-key map "\C-m" 'w3m-move-unseen-buffer)
+    (define-key map "\C-l" 'w3m-go-to-linknum)
+    (setq w3m-ctl-c-map map)))
+
+(defvar w3m-redisplay-map nil
+  "Sub-keymap used for the `C'-prefixed redisplay commands.")
+(unless w3m-redisplay-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "t" 'w3m-redisplay-with-content-type)
+    (define-key map "c" 'w3m-redisplay-with-charset)
+    (define-key map "C" 'w3m-redisplay-and-reset)
+    (setq w3m-redisplay-map map)))
+
+(defvar w3m-linknum-map nil
+  "Sub-keymap used for the `L'-prefixed link numbering commands.")
+(unless w3m-linknum-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "F" 'w3m-go-to-linknum)
+    (define-key map "I" 'w3m-linknum-view-image)
+    (define-key map "\M-i" 'w3m-linknum-save-image)
+    (define-key map "d" 'w3m-linknum-download-this-url)
+    (define-key map "e" 'w3m-linknum-edit-this-url)
+    (define-key map "f" 'w3m-linknum-follow)
+    (define-key map "t" 'w3m-linknum-toggle-inline-image)
+    (define-key map "u" 'w3m-linknum-print-this-url)
+    (define-key map "b" 'w3m-linknum-bookmark-add-this-url)
+    (define-key map "]" 'w3m-linknum-zoom-in-image)
+    (define-key map "[" 'w3m-linknum-zoom-out-image)
+    (setq w3m-linknum-map map)))
+
+(defvar w3m-lynx-like-map nil
+  "Lynx-like keymap used in emacs-w3m buffers.")
+;; `C-t' is a prefix key reserved to commands that do something in all
+;; emacs-w3m buffers.  2006-05-18
+(unless w3m-lynx-like-map
+  (let ((map (make-keymap)))
+    (suppress-keymap map)
+    (define-key map " " 'w3m-scroll-up-or-next-url)
+    (define-key map "b" 'w3m-scroll-down-or-previous-url)
+    (define-key map [backspace] 'w3m-scroll-down-or-previous-url)
+    (define-key map [delete] 'w3m-scroll-down-or-previous-url)
+    (if (featurep 'xemacs)
+	(define-key map [(shift space)] 'w3m-scroll-down-or-previous-url)
+      (define-key map [?\S-\ ] 'w3m-scroll-down-or-previous-url))
+    (define-key map "h" 'backward-char)
+    (define-key map "j" 'next-line)
+    (define-key map "k" 'previous-line)
+    (define-key map "l" 'forward-char)
+    (define-key map "J" 'w3m-scroll-up-1)
+    (define-key map "K" (lambda () (interactive) (scroll-down 1)))
+    (define-key map "\C-?" 'w3m-scroll-down-or-previous-url)
+    (define-key map "\t" 'w3m-next-anchor)
+    (define-key map [tab] 'w3m-next-anchor)
+    (define-key map [(shift tab)] 'w3m-previous-anchor)
+    (define-key map [(shift iso-lefttab)] 'w3m-previous-anchor)
+    (define-key map [backtab] 'w3m-previous-anchor)
+    (define-key map [down] 'w3m-next-anchor)
+    (define-key map "\M-\t" 'w3m-previous-anchor)
+    (define-key map [up] 'w3m-previous-anchor)
+    (define-key map "\C-m" 'w3m-view-this-url)
+    (define-key map [(shift return)] 'w3m-view-this-url-new-session)
+    (define-key map [(shift kp-enter)] 'w3m-view-this-url-new-session)
+    (define-key map [right] 'w3m-view-this-url)
+    (cond ((featurep 'xemacs)
+	   (define-key map [(button3)] 'w3m-mouse-major-mode-menu))
+	  ;; Don't use [mouse-3], which gets submenus not working in GTK Emacs.
+	  ((featurep 'gtk)
+	   (define-key map [down-mouse-3] 'w3m-mouse-major-mode-menu)
+	   (define-key map [drag-mouse-3] 'undefined)
+	   (define-key map [mouse-3] 'undefined))
+	  (t
+	   (define-key map [mouse-3] 'w3m-mouse-major-mode-menu)))
+    (if (featurep 'xemacs)
+	(progn
+	  (define-key map [(button2)] 'w3m-mouse-view-this-url)
+	  (define-key map [(shift button2)]
+	    'w3m-mouse-view-this-url-new-session))
+      (define-key map [mouse-2] 'w3m-mouse-view-this-url)
+      ;; Support for mouse-1 on Emacs 22 and greater.
+      (define-key map [follow-link] 'mouse-face)
+      (define-key map [S-mouse-2] 'w3m-mouse-view-this-url-new-session))
+    (define-key map [left] 'w3m-view-previous-page)
+    (define-key map "B" 'w3m-view-previous-page)
+    (define-key map "N" 'w3m-view-next-page)
+    (define-key map "^" 'w3m-view-parent-page)
+    (define-key map "\M-d" 'w3m-download)
+    (define-key map "d" 'w3m-download-this-url)
+    (define-key map "u" 'w3m-print-this-url)
+    (define-key map "I" 'w3m-view-image)
+    (define-key map "\M-i" 'w3m-save-image)
+    (define-key map "c" 'w3m-print-current-url)
+    (define-key map "M" 'w3m-view-url-with-external-browser)
+    (define-key map "G" 'w3m-goto-url-new-session)
+    (define-key map "g" 'w3m-goto-url)
+    (define-key map "T" 'w3m-toggle-inline-images)
+    (define-key map "\M-T" 'w3m-turnoff-inline-images)
+    (define-key map "t" 'w3m-toggle-inline-image)
+    (when (w3m-display-graphic-p)
+      (define-key map "\M-[" 'w3m-zoom-out-image)
+      (define-key map "\M-]" 'w3m-zoom-in-image))
+    (define-key map "U" 'w3m-goto-url)
+    (define-key map "v" 'w3m-bookmark-view)
+    (define-key map "V" 'w3m-bookmark-view-new-session)
+    (define-key map "q" 'w3m-close-window)
+    (define-key map "Q" 'w3m-quit)
+    (define-key map "\M-n" 'w3m-copy-buffer)
+    (define-key map "\M-s" 'w3m-session-select)
+    (define-key map "\M-S" 'w3m-session-save)
+    (define-key map "r" 'w3m-redisplay-this-page)
+    (define-key map "R" 'w3m-reload-this-page)
+    (define-key map "\C-tR" 'w3m-reload-all-pages)
+    (define-key map "?" 'describe-mode)
+    (define-key map "\M-a" 'w3m-bookmark-add-this-url)
+    (define-key map "\M-k" 'w3m-cookie)
+    (define-key map "a" 'w3m-bookmark-add-current-url)
+    (define-key map "\C-ta" 'w3m-bookmark-add-all-urls)
+    (define-key map "+" 'w3m-antenna-add-current-url)
+    (define-key map "]" 'w3m-next-form)
+    (define-key map "[" 'w3m-previous-form)
+    (define-key map "}" 'w3m-next-image)
+    (define-key map "{" 'w3m-previous-image)
+    (define-key map "H" 'w3m-gohome)
+    (define-key map "A" 'w3m-antenna)
+    (define-key map "W" 'w3m-weather)
+    (define-key map "S" 'w3m-search)
+    (define-key map "D" 'w3m-dtree)
+    (define-key map ">" 'w3m-scroll-left)
+    (define-key map "<" 'w3m-scroll-right)
+    (define-key map "." 'w3m-shift-left)
+    (define-key map "," 'w3m-shift-right)
+    (define-key map "\M-l" 'w3m-horizontal-recenter)
+    (define-key map "\C-a" 'w3m-beginning-of-line)
+    (define-key map "\C-e" 'w3m-end-of-line)
+    (define-key map "\\" 'w3m-view-source)
+    (define-key map "=" 'w3m-view-header)
+    (define-key map "s" 'w3m-history)
+    (define-key map "E" 'w3m-edit-current-url)
+    (define-key map "e" 'w3m-edit-this-url)
+    (define-key map "|" 'w3m-pipe-source)
+    (define-key map "\C-c" w3m-ctl-c-map)
+    (define-key map "C" w3m-redisplay-map)
+    (define-key map "L" w3m-linknum-map)
+    (setq w3m-lynx-like-map map)))
+
+(defvar w3m-info-like-map nil
+  "Info-like keymap used in emacs-w3m buffers.")
+;; `C-t' is a prefix key reserved to commands that do something in all
+;; emacs-w3m buffers.  2006-05-18
+(unless w3m-info-like-map
+  (let ((map (make-keymap)))
+    (suppress-keymap map)
+    (define-key map [backspace] 'w3m-scroll-down-or-previous-url)
+    (define-key map [delete] 'w3m-scroll-down-or-previous-url)
+    (define-key map "\C-?" 'w3m-scroll-down-or-previous-url)
+    (if (featurep 'xemacs)
+	(define-key map [(shift space)] 'w3m-scroll-down-or-previous-url)
+      (define-key map [?\S-\ ] 'w3m-scroll-down-or-previous-url))
+    (define-key map "\t" 'w3m-next-anchor)
+    (define-key map [tab] 'w3m-next-anchor)
+    (define-key map [(shift tab)] 'w3m-previous-anchor)
+    (define-key map [(shift iso-lefttab)] 'w3m-previous-anchor)
+    (define-key map [backtab] 'w3m-previous-anchor)
+    (define-key map "\M-\t" 'w3m-previous-anchor)
+    (define-key map "\C-m" 'w3m-view-this-url)
+    (define-key map [(shift return)] 'w3m-view-this-url-new-session)
+    (define-key map [(shift kp-enter)] 'w3m-view-this-url-new-session)
+    (if (featurep 'xemacs)
+	(progn
+	  (define-key map [(button2)] 'w3m-mouse-view-this-url)
+	  (define-key map [(shift button2)]
+	    'w3m-mouse-view-this-url-new-session))
+      (define-key map [mouse-2] 'w3m-mouse-view-this-url)
+      ;; Support for mouse-1 on Emacs 22 and greater.
+      (define-key map [follow-link] 'mouse-face)
+      (define-key map [S-mouse-2] 'w3m-mouse-view-this-url-new-session))
+    (cond ((featurep 'xemacs)
+	   (define-key map [(button3)] 'w3m-mouse-major-mode-menu))
+	  ;; Don't use [mouse-3], which gets submenus not working in GTK Emacs.
+	  ((featurep 'gtk)
+	   (define-key map [down-mouse-3] 'w3m-mouse-major-mode-menu)
+	   (define-key map [drag-mouse-3] 'undefined)
+	   (define-key map [mouse-3] 'undefined))
+	  (t
+	   (define-key map [mouse-3] 'w3m-mouse-major-mode-menu)))
+    (define-key map " " 'w3m-scroll-up-or-next-url)
+    (define-key map "a" 'w3m-bookmark-add-current-url)
+    (define-key map "\C-ta" 'w3m-bookmark-add-all-urls)
+    (define-key map "\M-a" 'w3m-bookmark-add-this-url)
+    (define-key map "+" 'w3m-antenna-add-current-url)
+    (define-key map "A" 'w3m-antenna)
+    (define-key map "b" 'w3m-scroll-down-or-previous-url)
+    (define-key map "!" 'w3m-redisplay-with-content-type)
+    (define-key map "d" 'w3m-download)
+    (define-key map "D" 'w3m-download-this-url)
+    (define-key map "e" 'w3m-edit-current-url)
+    (define-key map "E" 'w3m-edit-this-url)
+    (define-key map "f" 'undefined) ;; reserved.
+    (define-key map "g" 'w3m-goto-url)
+    (define-key map "G" 'w3m-goto-url-new-session)
+    (define-key map "h" 'describe-mode)
+    (define-key map "H" 'w3m-gohome)
+    (define-key map "i" (if (w3m-display-graphic-p)
+			    'w3m-toggle-inline-image
+			  'w3m-view-image))
+    (define-key map "I" 'w3m-toggle-inline-images)
+    (define-key map "\M-I" 'w3m-turnoff-inline-images)
+    (when (w3m-display-graphic-p)
+      (define-key map "\M-[" 'w3m-zoom-out-image)
+      (define-key map "\M-]" 'w3m-zoom-in-image))
+    (define-key map "\M-i" 'w3m-save-image)
+    (define-key map "l" 'w3m-view-previous-page)
+    (define-key map "\C-l" 'recenter)
+    (define-key map [(control L)] 'w3m-reload-this-page)
+    (define-key map [(control t) (control L)] 'w3m-reload-all-pages)
+    (define-key map "M" 'w3m-view-url-with-external-browser)
+    (define-key map "n" 'w3m-view-next-page)
+    (define-key map "N" 'w3m-namazu)
+    (define-key map "\M-n" 'w3m-copy-buffer)
+    (define-key map "\M-k" 'w3m-cookie)
+    (define-key map "\M-s" 'w3m-session-select)
+    (define-key map "\M-S" 'w3m-session-save)
+    (define-key map "o" 'w3m-history)
+    (define-key map "O" 'w3m-db-history)
+    (define-key map "p" 'w3m-view-previous-page)
+    (define-key map "P" 'undecided) ;; reserved for print-this-buffer.
+    (define-key map "q" 'w3m-close-window)
+    (define-key map "Q" 'w3m-quit)
+    (define-key map "r" 'w3m-redisplay-this-page)
+    (define-key map "R" 'w3m-reload-this-page)
+    (define-key map "\C-tR" 'w3m-reload-all-pages)
+    (define-key map "s" 'w3m-search)
+    (define-key map "S" 'w3m-search-new-session)
+    (define-key map "T" 'w3m-dtree)
+    (define-key map "u" 'w3m-view-parent-page)
+    (define-key map "v" 'w3m-bookmark-view)
+    (define-key map "V" 'w3m-bookmark-view-new-session)
+    (define-key map "W" 'w3m-weather)
+    (define-key map "y" 'w3m-print-current-url)
+    (define-key map "Y" 'w3m-print-this-url)
+    (define-key map "=" 'w3m-view-header)
+    (define-key map "\\" 'w3m-view-source)
+    (define-key map "?" 'describe-mode)
+    (define-key map ">" 'w3m-scroll-left)
+    (define-key map "<" 'w3m-scroll-right)
+    (define-key map [(shift right)] 'w3m-shift-left)
+    (define-key map [(shift left)] 'w3m-shift-right)
+    (define-key map "\M-l" 'w3m-horizontal-recenter)
+    (define-key map "\C-a" 'w3m-beginning-of-line)
+    (define-key map "\C-e" 'w3m-end-of-line)
+    (define-key map "." 'beginning-of-buffer)
+    (define-key map "^" 'w3m-view-parent-page)
+    (define-key map "]" 'w3m-next-form)
+    (define-key map "[" 'w3m-previous-form)
+    (define-key map "}" 'w3m-next-image)
+    (define-key map "{" 'w3m-previous-image)
+    (define-key map "|" 'w3m-pipe-source)
+    (define-key map "\C-c" w3m-ctl-c-map)
+    (define-key map "C" w3m-redisplay-map)
+    (define-key map "L" w3m-linknum-map)
+    (setq w3m-info-like-map map)))
+
+(defun w3m-alive-p (&optional visible)
+  "Return a buffer in which emacs-w3m is running.
+If there is no emacs-w3m session, return nil.  If the optional VISIBLE
+is non-nil, a visible emacs-w3m buffer is preferred.  The last visited
+emacs-w3m buffer is likely to return if VISIBLE is omitted or there is
+no visible buffer."
+  (let* ((buffers (w3m-list-buffers t))
+	 (buf (car buffers)))
+    (if visible
+	(progn
+	  (setq visible nil)
+	  (while (and (not visible)
+		      buffers)
+	    (when (get-buffer-window (car buffers) t)
+	      (setq visible (car buffers)))
+	    (setq buffers (cdr buffers)))
+	  (or visible buf))
+      buf)))
+
+(defun w3m-quit (&optional force)
+  "Return to a peaceful life (exiting all emacs-w3m sessions).
+This command lets you quit browsing web after updating the arrived
+URLs database.  Quit browsing immediately if the prefix argument FORCE
+is specified, otherwise prompt you for the confirmation.  See also
+`w3m-close-window'."
+  (interactive "P")
+  (let ((buffers (w3m-list-buffers t))
+	(all-buffers (let ((w3m-fb-mode nil))
+		       (w3m-list-buffers t))))
+    (if (or (= (length buffers) (length all-buffers))
+	    (prog1 (y-or-n-p "Kill emacs-w3m buffers on other frames? ")
+	      (message nil)))
+	(let ((w3m-fb-mode nil))
+	  (when (or force
+		    (prog1 (y-or-n-p "Do you want to exit emacs-w3m? ")
+		      (message nil)))
+	    (w3m-session-automatic-save)
+	    (w3m-delete-frames-and-windows)
+	    (sit-for 0) ;; Delete frames seemingly fast.
+	    (dolist (buffer all-buffers)
+	      (w3m-cancel-refresh-timer buffer)
+	      (kill-buffer buffer)
+	      (when w3m-use-form
+		(w3m-form-kill-buffer buffer)))
+	    (when w3m-use-form
+	      (w3m-form-textarea-file-cleanup))
+	    (w3m-select-buffer-close-window)
+	    (w3m-cache-shutdown)
+	    (w3m-arrived-shutdown)
+	    (w3m-process-shutdown)
+	    (when w3m-use-cookies
+	      (w3m-cookie-shutdown))
+	    (w3m-kill-all-buffer)))
+      (w3m-session-automatic-save)
+      (w3m-fb-delete-frame-buffers)
+      (w3m-fb-select-buffer))))
+
+(defun w3m-close-window ()
+  "Return to a restless life (quitting all emacs-w3m sessions).
+This command closes all emacs-w3m windows, but all the emacs-w3m
+buffers remain.  Frames created for emacs-w3m sessions will also be
+closed.  See also `w3m-quit'."
+  (interactive)
+  (w3m-history-store-position)
+  ;; `w3m-list-buffers' won't return all the emacs-w3m buffers if
+  ;; `w3m-fb-mode' is turned on.
+  (let* ((buffers (w3m-list-buffers t))
+	 (bufs buffers)
+	 buf windows window)
+    (w3m-delete-frames-and-windows)
+    (while bufs
+      (setq buf (pop bufs))
+      (w3m-cancel-refresh-timer buf)
+      (bury-buffer buf))
+    (while buffers
+      (setq buf (pop buffers)
+	    windows (get-buffer-window-list buf 'no-minibuf t))
+      (while windows
+	(setq window (pop windows))
+	(set-window-buffer
+	 window
+	 (w3m-static-if (featurep 'xemacs)
+	     (other-buffer buf (window-frame window) nil)
+	   (other-buffer buf nil (window-frame window)))))))
+  (w3m-select-buffer-close-window)
+  ;; The current-buffer and displayed buffer are not necessarily the
+  ;; same at this point; if they aren't bury-buffer will be a nop, and
+  ;; we will infloop.
+  (set-buffer (window-buffer (selected-window)))
+  (while (eq major-mode 'w3m-mode)
+    (bury-buffer)))
+
+(unless w3m-mode-map
+  (setq w3m-mode-map
+	(if (eq w3m-key-binding 'info)
+	    w3m-info-like-map
+	  w3m-lynx-like-map)))
+
+(defun w3m-mouse-major-mode-menu (event)
+  "Pop up a W3M mode-specific menu of mouse commands."
+  (interactive "e")
+  (mouse-set-point event)
+  (let* ((bmkitems (if w3m-bookmark-mode
+		       (cdr w3m-bookmark-menu-items)
+		     (car w3m-bookmark-menu-items)))
+	 (bmkmenu (if w3m-bookmark-menu-items-pre
+		      `(,@bmkitems
+			"----"
+			,@w3m-bookmark-menu-items-pre)
+		    bmkitems)))
+    (w3m-static-if (featurep 'xemacs)
+	(let (menubar)
+	  (when current-menubar
+	    (run-hooks 'activate-menubar-hook))
+	  (setq menubar
+		(cons "w3m"
+		      (delq nil
+			    `(,@(cdr w3m-rmouse-menubar)
+			      "----"
+			      "----"
+			      ,(assoc "w3m" current-menubar)
+			      "----"
+			      ,(assoc "Bookmark" current-menubar)
+			      ,(assoc "Tab" current-menubar)
+			      ,(assoc "Session" current-menubar)))))
+	  (popup-menu menubar event))
+      (run-hooks 'menu-bar-update-hook)
+      (popup-menu (delete nil
+			  `(,@w3m-rmouse-menubar
+			    "----"
+			    "----"
+			    ,w3m-menubar
+			    "----"
+			    ,(cons "Bookmark" bmkmenu)
+			    ,(when w3m-tab-menubar-make-items-preitems
+			       (cons "Tab" w3m-tab-menubar-make-items-preitems))
+			    ,(cons "Session" (if w3m-session-menu-items-pre
+						 (append w3m-session-menu-items
+							 '("----")
+							 w3m-session-menu-items-pre)
+					       w3m-session-menu-items))))
+		  event))))
+
+(defvar w3m-tab-button-menu-current-buffer nil
+  "Internal variable used by `w3m-tab-button-menu'.")
+
+(defvar w3m-tab-button-menu-commands
+  (let ((manyp '(cdr (w3m-list-buffers)))
+	(currentp 'w3m-tab-button-menu-current-buffer)
+	(leftp '(and w3m-tab-button-menu-current-buffer
+		     (w3m-lefttab-exist-p w3m-tab-button-menu-current-buffer)))
+	(rightp '(and w3m-tab-button-menu-current-buffer
+		      (w3m-righttab-exist-p
+		       w3m-tab-button-menu-current-buffer)))
+	(many2p '(and w3m-tab-button-menu-current-buffer
+		      (cdr (w3m-list-buffers)))))
+    `((w3m-goto-url-new-session
+       ,(w3m-make-menu-item "$B?7$7$$%?%V(B" "New Tab")
+       t ,w3m-new-session-in-background w3m-new-session-url)
+      (w3m-copy-buffer
+       ,(w3m-make-menu-item "$B%?%V$rJ#@=(B" "Copy Tab")
+       ,currentp ,w3m-new-session-in-background)
+      -
+      (w3m-reload-this-page
+       ,(w3m-make-menu-item "$B%?%V$r:FFI$_9~$_(B" "Reload Tab")
+       ,currentp)
+      (w3m-reload-all-pages
+       ,(w3m-make-menu-item "$B$9$Y$F$N%?%V$r:FFI$_9~$_(B" "Reload All Tabs")
+       ,manyp)
+      -
+      (w3m-delete-buffer
+       ,(w3m-make-menu-item "$B$3$N%?%V$rJD$8$k(B" "Close This Tab")
+       ,currentp)
+      -
+      (w3m-delete-other-buffers
+       ,(w3m-make-menu-item "$BB>$N%?%V$r$9$Y$FJD$8$k(B" "Close Other Tabs")
+       ,many2p)
+      (w3m-delete-left-tabs
+       ,(w3m-make-menu-item "$B:8B&$N%?%V$r$9$Y$FJD$8$k(B" "Close Left Tabs")
+       ,leftp)
+      (w3m-delete-right-tabs
+       ,(w3m-make-menu-item "$B1&B&$N%?%V$r$9$Y$FJD$8$k(B" "Close Right Tabs")
+       ,rightp)
+      -
+      (w3m-view-url-with-external-browser
+       ,(w3m-make-menu-item "$B30It%V%i%&%6$G3+$/(B" "View with external browser")
+       ,currentp ,w3m-new-session-in-background w3m-current-url)
+      -
+      (w3m-session-save
+       ,(w3m-make-menu-item "$B$9$Y$F$N%?%V$rJ]B8$9$k(B" "Save All Tabs...")
+       t)
+      (w3m-session-select
+       ,(w3m-make-menu-item "$B%?%V%j%9%H$rA*Br$9$k(B" "Select List of Tabs...")
+       t)
+      (w3m-bookmark-add-current-url
+       ,(w3m-make-menu-item "$B$3$N%?%V$r%V%C%/%^!<%/(B" "Bookmark This Tab...")
+       ,currentp ,w3m-new-session-in-background)
+      (w3m-bookmark-add-all-urls
+       ,(w3m-make-menu-item
+	 "$B$9$Y$F$N%?%V$r%V%C%/%^!<%/(B" "Bookmark All Tabs..." )
+       ,manyp)))
+  "List of commands invoked by the tab button menu.
+Each item is the symbol `-' which is a separator,
+or a list which consists of the following elements:
+
+0: a function.
+1: a function description.
+2: a Lisp form which returns non-nil if the item is active.
+3: a flag specifying whether the buffer should be selected.
+&rest: arguments passed to the function.")
+
+(w3m-static-unless (featurep 'xemacs)
+  (easy-menu-define
+    w3m-tab-button-menu w3m-tab-map "w3m tab button menu."
+    (cons nil (w3m-make-menu-commands w3m-tab-button-menu-commands)))
+
+  ;; This function must be placed after `easy-menu-define'.
+  (defun w3m-tab-button-menu (event buffer)
+    (select-window (posn-window (event-start event)))
+    (setq w3m-tab-button-menu-current-buffer buffer)
+    (popup-menu w3m-tab-button-menu))
+
+  (defun w3m-tab-button-menu2 (event buffer)
+    (select-window (posn-window (event-start event)))
+    (setq w3m-tab-button-menu-current-buffer nil)
+    (popup-menu w3m-tab-button-menu)))
+
+(unless w3m-link-map
+  (setq w3m-link-map (make-sparse-keymap))
+  (cond ((featurep 'xemacs)
+	 (define-key w3m-link-map [(button3)] 'w3m-link-menu))
+	;; Don't use [mouse-3], which gets submenus not working in GTK Emacs.
+	((featurep 'gtk)
+	 (define-key w3m-link-map [down-mouse-3] 'w3m-link-menu)
+	 (define-key w3m-link-map [drag-mouse-3] 'undefined)
+	 (define-key w3m-link-map [mouse-3] 'undefined))
+	(t
+	 (define-key w3m-link-map [mouse-3] 'w3m-link-menu))))
+
+(easy-menu-define w3m-link-menu w3m-link-map "w3m link menu."
+  `("Link" ;; This cannot be omitted for at least MacOS.
+    [,(w3m-make-menu-item "$B%j%s%/$r$3$N%;%C%7%g%s$G3+$/(B"
+			  "Open Link in This Session")
+     w3m-view-this-url (w3m-anchor (point))]
+    [,(w3m-make-menu-item "$B%j%s%/$r?7$7$$%;%C%7%g%s$G3+$/(B"
+			  "Open Link in New Session")
+     w3m-view-this-url-new-session (w3m-anchor (point))]
+    [,(w3m-make-menu-item "$B%j%s%/$r30It%V%i%&%6$G3+$/(B"
+			  "Open Link in an External Browser")
+     w3m-external-view-this-url (w3m-anchor (point))]
+    "-"
+    [,(w3m-make-menu-item "$B$3$N%j%s%/$r%V%C%/%^!<%/(B..."
+			  "Bookmark This Link...")
+     w3m-bookmark-add-this-url (w3m-anchor (point))]
+    [,(w3m-make-menu-item "$BL>A0$rIU$1$F%j%s%/@h$rJ]B8(B..."
+			  "Save Link As...")
+     w3m-download-this-url (w3m-anchor (point))]
+    [,(w3m-make-menu-item "$BL>A0$rIU$1$F2hA|$rJ]B8(B..."
+			  "Save Image As...")
+     w3m-download-this-image (w3m-image (point))]
+    [,(w3m-make-menu-item "$B%j%s%/$N(B URL $B$r%3%T!<(B"
+			  "Copy Link Location")
+     w3m-print-this-url (w3m-anchor (point))]
+    [,(w3m-make-menu-item "$B2hA|$N(B URL $B$r%3%T!<(B"
+			  "Copy Image Location")
+     w3m-print-this-image-url (w3m-image (point))]))
+
+(defun w3m-link-menu (event)
+  "Pop up a link menu."
+  (interactive "e")
+  (mouse-set-point event)
+  (popup-menu w3m-link-menu))
+
+(defvar w3m-buffer-unseen nil)
+(make-variable-buffer-local 'w3m-buffer-unseen)
+
+(defun w3m-set-buffer-unseen (&optional url)
+  (setq w3m-buffer-unseen t)
+  (w3m-add-local-hook 'pre-command-hook 'w3m-set-buffer-seen))
+
+(defun w3m-set-buffer-seen ()
+  (setq w3m-buffer-unseen nil)
+  (w3m-remove-local-hook 'pre-command-hook 'w3m-set-buffer-seen))
+
+(defun w3m-move-unseen-buffer ()
+  "Move to the next unseen buffer."
+  (interactive)
+  (when (eq major-mode 'w3m-mode)
+    (let* ((bufs (w3m-list-buffers))
+	   (right (memq (current-buffer) bufs))
+      unseen)
+      (setq unseen
+	    (catch 'unseen
+	      (dolist (buf (append right bufs))
+		(when (w3m-unseen-buffer-p buf)
+		  (throw 'unseen buf)))))
+      (if (not unseen)
+	  (message "No unseen buffer.")
+	(switch-to-buffer unseen)
+	(run-hooks 'w3m-select-buffer-hook)
+	(w3m-select-buffer-update)))))
+
+(defun w3m-mode ()
+  "Major mode for browsing web.
+
+\\<w3m-mode-map>\
+\\[w3m-view-this-url]	Display the page pointed to by the link under point.
+	You may use the prefix arg `2' or\
+ `\\[universal-argument] \\<universal-argument-map>\
+\\[universal-argument-more]\\<w3m-mode-map>' to make a new session.
+\\[w3m-mouse-view-this-url]	Follow the link under the mouse pointer.
+	If w3m-use-form is t, `\\[w3m-view-this-url]' and\
+ `\\[w3m-mouse-view-this-url]' enable you to enter forms.
+	You may use the prefix arg `2' or\
+ `\\[universal-argument] \\<universal-argument-map>\
+\\[universal-argument-more]\\<w3m-mode-map>' to make a new session.
+\\[w3m-view-this-url-new-session]	Display the page of the link\
+ in a new session.
+	If the region is active, visit all the links within the region.
+\\[w3m-mouse-view-this-url-new-session]	Display the page of the link\
+ in a new session by mouse.
+
+\\[w3m-submit-form]	Submit the form at point.
+
+\\[w3m-reload-this-page]	Reload the current page.
+\\[w3m-reload-all-pages]	Reload all the pages.
+\\[w3m-redisplay-this-page]	Redisplay the current page.
+\\[w3m-redisplay-with-content-type]	Redisplay the page, specifying\
+ a content type.
+\\[w3m-redisplay-with-charset]	Redisplay the current page, specifying\
+ a charset.
+\\[w3m-redisplay-and-reset]	Redisplay the current page and reset\
+ the user-specified charset and\n\tcontent type.
+
+\\[w3m-next-anchor]	Move the point to the next anchor.
+\\[w3m-previous-anchor]	Move the point to the previous anchor.
+\\[w3m-go-to-linknum] Move the point to the numbered anchor.
+\\[w3m-next-form]	Move the point to the next form.
+\\[w3m-previous-form]	Move the point to the previous form.
+\\[w3m-next-image]	Move the point to the next image.
+\\[w3m-previous-image]	Move the point to the previous image.
+
+\\[w3m-view-previous-page]	Move back to the previous page in the history.
+\\[w3m-view-next-page]	Move forward to the next page in the history.
+\\[w3m-view-parent-page]	Attempt to move to the parent directory of\
+ the page.
+
+\\[w3m-goto-url]	Visit the web page.
+\\[w3m-goto-url-new-session]	Visit the web page in a new session.
+\\[w3m-gohome]	Go to the Home page.
+\\[w3m-view-url-with-external-browser]	Display the current page using the\
+ external browser.
+
+\\[w3m-download]	Download the URL.
+\\[w3m-download-this-url]	Download the URL under point.
+
+\\[w3m-view-image]	Display the image under point in the external viewer.
+\\[w3m-save-image]	Save the image under point to a file.
+\\[w3m-toggle-inline-images]	Toggle the visibility of all images.
+\\[w3m-turnoff-inline-images]	Turn off to display all images.
+\\[w3m-zoom-out-image]	Zoom in an image on the point.
+\\[w3m-zoom-in-image]	Zoom out an image on the point.
+
+\\[w3m-print-this-url]	Display the url under point and put it into\
+ `kill-ring'.
+\\[w3m-print-current-url]	Display the url of the current page and put\
+ it into `kill-ring'.
+
+\\[w3m-view-source]	Display the html source of the current page.
+\\[w3m-view-header]	Display the header of the current page.
+\\[w3m-edit-current-url]	Edit the local file displayed as the current\
+ page.
+\\[w3m-edit-this-url]	Edit the local file which is pointed to by URL under\
+ point.
+
+\\[w3m-scroll-up-or-next-url]	Scroll up the current window, or go to the\
+ next page.
+\\[w3m-scroll-down-or-previous-url]	Scroll down the current window, or\
+ go to the previous page.
+\\[w3m-scroll-left]	Scroll to the left.
+\\[w3m-scroll-right]	Scroll to the right.
+\\[w3m-shift-left]	Shift to the left.
+\\[w3m-shift-right]	Shift to the right.
+\\[w3m-horizontal-recenter]	Recenter horizontally.
+\\[w3m-beginning-of-line]	Go to the entire beginning of line, may be\
+ accompanied by scrolling.
+\\[w3m-end-of-line]	Go to the entire end of line, may be accompanied\
+ by scrolling.
+
+\\[next-line]	Next line.
+\\[previous-line]	Previous line.
+\\[forward-char]	Forward char.
+\\[backward-char]	Backward char.
+
+\\[goto-line]	Go to the line, specifying the line number (beginning with 1).
+\\[w3m-history-store-position]	Mark the current position.
+\\[w3m-history-restore-position]	Go to the last marked position.
+
+\\[w3m-history]	Display the history of pages you have visited in the\
+ session.
+	If it is called with the prefix arg, it displays the arrived URLs.
+\\[w3m-antenna]	Display the report of changes in web pages.
+	If it is called with the prefix arg, it updates the report.
+\\[w3m-antenna-add-current-url]	Add the current url to the antenna database.
+\\[w3m-search]	Query to the search engine a word.
+	To change the server, give any prefix argument to the command.
+\\[w3m-search-new-session] Query to the search engine a word in a new session.
+	To change the server, give any prefix argument to the command.
+\\[w3m-weather]	Display a weather report.
+	To change the local area, give any prefix argument to the command.
+\\[w3m-dtree]	Display a directory tree.
+	If the prefix arg is given, display files in addition to directories.
+\\[w3m-namazu]	Search files with Namazu.
+	To change the index, give any prefix argument to the command.
+
+\\[w3m-bookmark-view]	Display the bookmark.
+\\[w3m-bookmark-view-new-session]	Display the bookmark on a new session.
+\\[w3m-bookmark-add-current-url]	Add a url of the current page to\
+ the bookmark.
+	If the prefix arg is given, the user will be prompted for the url.
+\\[w3m-bookmark-add-all-urls]	Add urls of all pages being visited to\
+ the bookmark.
+\\[w3m-bookmark-add-this-url]	Add the url under point to the bookmark.
+
+\\[w3m-copy-buffer]	Create a copy of the current page as a new session.
+\\[w3m-next-buffer]	Turn the page of emacs-w3m buffers ahead.
+\\[w3m-previous-buffer]	Turn the page of emacs-w3m buffers behind.
+\\[w3m-select-buffer]	Pop to the emacs-w3m buffers selection window up.
+\\[w3m-switch-buffer]	Select one of emacs-w3m buffers at the current window.
+\\[w3m-delete-buffer]	Delete the current emacs-w3m buffer.
+\\[w3m-delete-other-buffers]	Delete emacs-w3m buffers except for the\
+ current buffer.
+
+\\[w3m]	Start browsing web with emacs-w3m.
+\\[w3m-close-window]	Close all emacs-w3m windows, without deleteing\
+ buffers.
+\\[w3m-quit]	Exit browsing web.  All emacs-w3m buffers will be deleted.
+
+\\[describe-mode]	describe-mode.
+
+\\[report-emacs-w3m-bug]	Send a bug report to the emacs-w3m team.
+"
+  (kill-all-local-variables)
+  (buffer-disable-undo)
+  (setq major-mode 'w3m-mode)
+  (setq mode-name "w3m")
+  (use-local-map w3m-mode-map)
+  (setq truncate-lines t
+	w3m-display-inline-images w3m-default-display-inline-images)
+  (when w3m-auto-show
+    (when (boundp 'auto-hscroll-mode)
+      (set (make-local-variable 'auto-hscroll-mode) nil))
+    (when (boundp 'automatic-hscrolling)
+      (set (make-local-variable 'automatic-hscrolling) nil))
+    (when (boundp 'auto-show-mode)
+      (set (make-local-variable 'auto-show-mode) nil))
+    (when (boundp 'hscroll-mode)
+      (set (make-local-variable 'hscroll-mode) nil)))
+  (make-local-variable 'list-buffers-directory)
+  (w3m-static-unless (featurep 'xemacs)
+    (setq show-trailing-whitespace nil))
+  (w3m-setup-toolbar)
+  (w3m-setup-menu)
+  (run-hooks 'w3m-mode-setup-functions)
+  (w3m-run-mode-hooks 'w3m-mode-hook))
+
+(defun w3m-scroll-up-1 (&optional arg)
+  "Scroll the current window up ARG line.
+ARG will be fixed into 1 when this function is called interactively.
+This function avoids the bug that Emacs 21.x hangs up when scrolling
+up for too many number of lines if `scroll-margin' is set as two or
+greater."
+  (interactive '(1))
+  (w3m-static-unless (featurep 'xemacs)
+    (when (and (numberp arg)
+	       (> arg 0)
+	       (numberp scroll-margin)
+	       (> scroll-margin 0))
+      (setq arg (min arg
+		     (max 0 (- (count-lines (window-start) (point-max))
+			       scroll-margin))))))
+  (scroll-up arg))
+
+(defun w3m-scroll-up-or-next-url (arg)
+  "Scroll the current window up ARG lines, or go to the next page."
+  (interactive "P")
+  (if (w3m-image-page-displayed-p)
+      (image-scroll-up arg)
+    (w3m-keep-region-active)
+    (if (pos-visible-in-window-p (point-max))
+	(if w3m-next-url
+	    (let ((w3m-prefer-cache t))
+	      (w3m-goto-url w3m-next-url))
+	  (signal 'end-of-buffer nil))
+      (w3m-scroll-up-1 arg))))
+
+(defun w3m-scroll-down-or-previous-url (arg)
+  "Scroll the current window down ARG lines, or go to the previous page."
+  (interactive "P")
+  (if (w3m-image-page-displayed-p)
+      (image-scroll-down arg)
+    (w3m-keep-region-active)
+    (if (pos-visible-in-window-p (point-min))
+	(if w3m-previous-url
+	    (let ((w3m-prefer-cache t))
+	      (w3m-goto-url w3m-previous-url))
+	  (signal 'beginning-of-buffer nil))
+      (scroll-down arg))))
+
+(defvar w3m-current-longest-line nil
+  "The length of the longest line in the window.")
+
+(defun w3m-set-current-longest-line ()
+  "Set the value of `w3m-current-longest-line'."
+  (save-excursion
+    (goto-char (window-start))
+    (end-of-line)
+    (setq w3m-current-longest-line 0)
+    ;; The XEmacs version of `window-end' returns the point beyond
+    ;; `point-max' if it is visible in the window.
+    (let ((end (min (window-end) (point-max))))
+      (while (progn
+	       (skip-chars-backward " ")
+	       (setq w3m-current-longest-line
+		     (max w3m-current-longest-line (current-column)))
+	       (end-of-line 2)
+	       (< (point) end))))))
+
+(defun w3m-scroll-left (arg)
+  "Scroll to the left.
+If ARG (the prefix) is a number, scroll the window ARG columns.
+Otherwise, it defaults to `w3m-horizontal-scroll-columns'."
+  (interactive "P")
+  (when (if (memq last-command '(w3m-scroll-left w3m-shift-left))
+	    (or (< (window-hscroll) w3m-current-longest-line)
+		(progn (ding) nil))
+	  (w3m-set-current-longest-line)
+	  (< (window-hscroll) w3m-current-longest-line))
+    (w3m-horizontal-scroll 'left (if arg
+				     (prefix-numeric-value arg)
+				   w3m-horizontal-scroll-columns))))
+
+(defun w3m-scroll-right (arg)
+  "Scroll to the right.
+If ARG (the prefix) is a number, scroll the window ARG columns.
+Otherwise, it defaults to `w3m-horizontal-scroll-columns'."
+  (interactive "P")
+  (if (zerop (window-hscroll))
+      (when (memq last-command '(w3m-scroll-right w3m-shift-right))
+	(ding))
+    (w3m-horizontal-scroll 'right (if arg
+				      (prefix-numeric-value arg)
+				    w3m-horizontal-scroll-columns))))
+
+(defun w3m-shift-left (arg)
+  "Shift to the left.  Shift means a fine level horizontal scrolling.
+If ARG (the prefix) is a number, scroll the window ARG columns.
+Otherwise, it defaults to `w3m-horizontal-shift-columns'."
+  (interactive "P")
+  (if (w3m-image-page-displayed-p)
+      (image-forward-hscroll (or arg 1))
+    (when (if (memq last-command '(w3m-scroll-left w3m-shift-left))
+	      (or (< (window-hscroll) w3m-current-longest-line)
+		  (progn (ding) nil))
+	    (w3m-set-current-longest-line)
+	    (< (window-hscroll) w3m-current-longest-line))
+      (w3m-horizontal-scroll 'left (if arg
+				       (prefix-numeric-value arg)
+				     w3m-horizontal-shift-columns)))))
+
+(defun w3m-shift-right (arg)
+  "Shift to the right.  Shift means a fine level horizontal scrolling.
+If ARG (the prefix) is a number, scroll the window ARG columns.
+Otherwise, it defaults to `w3m-horizontal-shift-columns'."
+  (interactive "P")
+  (if (w3m-image-page-displayed-p)
+      (image-backward-hscroll (or arg 1))
+    (if (zerop (window-hscroll))
+	(when (memq last-command '(w3m-scroll-right w3m-shift-right))
+	  (ding))
+      (w3m-horizontal-scroll 'right (if arg
+					(prefix-numeric-value arg)
+				      w3m-horizontal-shift-columns)))))
+
+(defvar w3m-horizontal-scroll-done nil)
+(make-variable-buffer-local 'w3m-horizontal-scroll-done)
+(defvar w3m-current-position '(-1 0 0))
+(make-variable-buffer-local 'w3m-current-position)
+
+(defun w3m-auto-show ()
+  "Scroll horizontally so that the point is visible."
+  (when (and truncate-lines
+	     w3m-auto-show
+	     (not w3m-horizontal-scroll-done)
+	     (not (and (eq last-command this-command)
+		       (or (eq (point) (point-min))
+			   (eq (point) (point-max)))))
+	     (or (memq this-command '(beginning-of-buffer end-of-buffer))
+		 (and (symbolp this-command)
+		      (string-match "\\`i?search-" (symbol-name this-command)))
+		 (and (markerp (nth 1 w3m-current-position))
+		      (markerp (nth 2 w3m-current-position))
+		      (>= (point)
+			  (marker-position (nth 1 w3m-current-position)))
+		      (<= (point)
+			  (marker-position (nth 2 w3m-current-position))))))
+    (w3m-horizontal-on-screen))
+  (setq w3m-horizontal-scroll-done nil))
+
+;; Ailiases to meet XEmacs bugs?
+(eval-and-compile
+  (unless (fboundp 'w3m-window-hscroll)
+    (defalias 'w3m-window-hscroll 'window-hscroll))
+  (unless (fboundp 'w3m-current-column)
+    (defalias 'w3m-current-column 'current-column))
+  (unless (fboundp 'w3m-set-window-hscroll)
+    (defalias 'w3m-set-window-hscroll 'set-window-hscroll)))
+
+(defun w3m-horizontal-scroll (direction ncol)
+  "Scroll the window NCOL columns horizontally to DIRECTION.
+DIRECTON should be the symbol `left' which specifies to scroll to the
+left, or any other Lisp object meaning to scroll to the right.  NCOL
+should be a number.  This function is a subroutine called by the
+commands `w3m-scroll-left', `w3m-scroll-right', `w3m-shift-left' and
+`w3m-shift-right'."
+  (setq w3m-horizontal-scroll-done t)
+  (let ((inhibit-point-motion-hooks t))
+    (w3m-set-window-hscroll (selected-window)
+			    (max 0
+				 (+ (w3m-window-hscroll)
+				    (if (eq direction 'left) ncol (- ncol)))))
+    (let ((hs (w3m-window-hscroll)))
+      (unless (and (>= (- (current-column) hs) 0)
+		   (< (- (current-column) hs) (window-width)))
+	(move-to-column (if (eq direction 'left) hs
+			  (+ hs (window-width)
+			     (w3m-static-if (featurep 'xemacs) -3 -2))))))))
+
+(defun w3m-horizontal-on-screen ()
+  "Scroll the window horizontally so that the current position is visible.
+See the documentation for the `w3m-horizontal-scroll-division' variable
+for details."
+  (when w3m-auto-show
+    (setq w3m-horizontal-scroll-done t)
+    (let ((cc (w3m-current-column))
+	  (hs (w3m-window-hscroll))
+	  (ww (window-width))
+	  (inhibit-point-motion-hooks t))
+      (unless (and (>= (- cc hs) 0)
+		   (< (+ (- cc hs) (if (eolp)
+				       0
+				     (w3m-static-if (featurep 'xemacs)
+					 3 2)))	;; '$$'
+		      ww))
+	(w3m-set-window-hscroll
+	 (selected-window)
+	 (max 0 (- cc (if (> hs cc)
+			  (/ ww w3m-horizontal-scroll-division)
+			(* (/ ww w3m-horizontal-scroll-division)
+			   (1- w3m-horizontal-scroll-division))))))))))
+
+(defun w3m-horizontal-recenter (&optional arg)
+  "Recenter horizontally.  With ARG, put the point on the column ARG.
+If `truncate-lines' is nil, it does nothing besides resetting the
+window's hscroll."
+  (interactive "P")
+  (if truncate-lines
+      (progn
+	(cond ((< (w3m-current-column) (window-hscroll))
+	       (move-to-column (w3m-window-hscroll))
+	       (setq arg 0))
+	      ((>= (w3m-current-column) (+ (window-hscroll) (window-width)))
+	       (move-to-column (+ (w3m-window-hscroll) (window-width) -2))
+	       (setq arg -1))
+	      ((listp arg)
+	       (setq arg (car arg))))
+	(w3m-set-window-hscroll
+	 (selected-window)
+	 (if (numberp arg)
+	     (if (>= arg 0)
+		 (max (- (current-column) arg) 0)
+	       (let* ((home (point))
+		      (inhibit-point-motion-hooks t)
+		      (maxcolumn (prog2
+				     (end-of-line)
+				     (1- (current-column))
+				   (goto-char home))))
+		 (max (min (- (current-column)
+			      (window-width)
+			      arg
+			      -2)
+			   maxcolumn)
+		      0)))
+	   (max (- (current-column) (/ (window-width) 2) -1)
+		0))))
+    (set-window-hscroll (selected-window) 0)))
+
+(defun w3m-recenter ()
+  "Recenter according to `w3m-view-recenter'."
+  (when (and w3m-view-recenter
+             (eq (window-buffer) (current-buffer)))
+    (recenter (if (eq t w3m-view-recenter)
+                  '(4)  ;; per "C-u C-l" to recenter in middle
+                w3m-view-recenter)))) ;; otherwise an integer
+
+(defun w3m-beginning-of-line (&optional arg)
+  "Make the beginning of the line visible and move the point to there."
+  (interactive "P")
+  (if (w3m-image-page-displayed-p)
+      (image-bol (or arg 1))
+    (w3m-keep-region-active)
+    (when (listp arg)
+      (setq arg (car arg)))
+    (set-window-hscroll (selected-window) 0)
+    (beginning-of-line arg)))
+
+(defun w3m-end-of-line (&optional arg)
+  "Move the point to the end of the line and scroll the window left.
+It makes the ends of upper and lower three lines visible.  If
+`truncate-lines' is nil, it works identically as `end-of-line'."
+  (interactive "P")
+  (if (w3m-image-page-displayed-p)
+      (image-eol (or arg 1))
+    (w3m-keep-region-active)
+    (if truncate-lines
+	(progn
+	  (when (listp arg)
+	    (setq arg (car arg)))
+	  (forward-line (1- (or arg 1)))
+	  (let ((inhibit-point-motion-hooks t)
+		home)
+	    (end-of-line)
+	    (setq home (point)
+		  arg (current-column))
+	    (dolist (n '(-3 -2 -1 1 2 3))
+	      (forward-line n)
+	      (end-of-line)
+	      (setq arg (max (current-column) arg))
+	      (goto-char home)))
+	  (setq temporary-goal-column arg
+		this-command 'next-line)
+	  (w3m-set-window-hscroll (selected-window)
+				  (max (- arg (window-width) -2) 0)))
+      (set-window-hscroll (selected-window) 0)
+      (end-of-line arg))))
+
+(defun w3m-pattern-uri-replace (uri format)
+  "Create a new uri from URI matched by last search according to FORMAT."
+  (replace-match format nil nil uri))
+
+(defun w3m-uri-replace (uri)
+  "Return the converted URI according to `w3m-uri-replace-alist'."
+  (catch 'found-replacement
+    (dolist (elem w3m-uri-replace-alist uri)
+      (when (string-match (car elem) uri)
+	(if (setq uri
+		  (cond
+		   ((consp (cdr elem))
+		    (apply (cadr elem) uri (cddr elem)))
+		   ;; Rest conditions are inserted in order to keep
+		   ;; backward compatibility.
+		   ((functionp (cdr elem))
+		    (funcall (cdr elem) uri))
+		   ((stringp (cdr elem))
+		    (w3m-pattern-uri-replace uri (cdr elem)))))
+	    (throw 'found-replacement uri)
+	  (error "Invalid replacement: %s" elem))))))
+
+(defun w3m-goto-mailto-url (url &optional post-data)
+  (let ((before (nreverse (buffer-list)))
+	comp info buffers buffer function)
+    (save-window-excursion
+      (if (and (symbolp w3m-mailto-url-function)
+	       (fboundp w3m-mailto-url-function))
+	  (funcall w3m-mailto-url-function url)
+	;; Require `mail-user-agent' setting
+	(unless (and (boundp 'mail-user-agent)
+		     (symbol-value 'mail-user-agent))
+	  (error "You must specify the valid value to `mail-user-agent'"))
+	(unless (and (setq comp (get (symbol-value 'mail-user-agent)
+				     'composefunc))
+		     (fboundp comp))
+	  (error "No function to compose a mail in `%s'"
+		 (symbol-value 'mail-user-agent)))
+	;; Use rfc2368.el if exist.
+	;; rfc2368.el is written by Sen Nagata.
+	;; You can find it in "contrib" directory of Mew package
+	;; or in "utils" directory of Wanderlust package.
+	(if (or (featurep 'rfc2368)
+		(condition-case nil (require 'rfc2368) (error nil)))
+	    (progn
+	      (setq info (rfc2368-parse-mailto-url url))
+	      (apply comp
+		     (append (mapcar (lambda (x)
+				       (cdr (assoc x info)))
+				     '("To" "Subject"))
+			     (if post-data
+				 (list
+				  (list (cons
+					 "body"
+					 (or (and
+					      (consp post-data)
+					      (concat (car post-data) "\n"))
+					     (concat post-data "\n")))))))))
+	  ;; without rfc2368.el.
+	  (string-match ":\\([^?]+\\)" url)
+	  (funcall comp (match-string 1 url)))))
+    (setq buffers (nreverse (buffer-list)))
+    (save-current-buffer
+      (while buffers
+	(setq buffer (car buffers)
+	      buffers (cdr buffers))
+	(unless (memq buffer before)
+	  (set-buffer buffer)
+	  (when (setq function
+		      (cdr (assq major-mode
+				 w3m-mailto-url-popup-function-alist)))
+	    (setq buffers nil)))))
+    (when function
+      (let (special-display-buffer-names
+	    special-display-regexps
+	    same-window-buffer-names
+	    same-window-regexps)
+	(funcall function buffer)))))
+
+(defun w3m-convert-ftp-url-for-emacsen (url)
+  (or (and (string-match "^ftp://?\\([^/@]+@\\)?\\([^/]+\\)\\(?:/~/\\)?" url)
+	   (concat "/"
+		   (if (match-beginning 1)
+		       (substring url (match-beginning 1) (match-end 1))
+		     "anonymous@")
+		   (substring url (match-beginning 2) (match-end 2))
+		   ":"
+		   (substring url (match-end 2))))
+      (error "URL is strange")))
+
+(defun w3m-file-directory-p (file)
+  "Emulate the `file-directory-p' function for the remote file FILE."
+  (when (file-exists-p file)
+    (let (dirp (i 10))
+      (catch 'loop
+	(while (> i 0)
+	  (setq dirp (car (file-attributes file)))
+	  (if (stringp dirp)
+	      (setq file (expand-file-name
+			  dirp
+			  (file-name-directory (directory-file-name file)))
+		    i (1- i))
+	    (throw 'loop dirp)))))))
+
+(defun w3m-goto-ftp-url (url &optional filename)
+  "Copy a remote file to the local system or run dired for ftp URLs.
+If URL looks like a file, it will perform the copy.  Otherwise, it
+will run `dired-other-window' using `ange-ftp' or `efs'.  Optional
+FILENAME specifies the name of a local file.  If FILENAME is omitted,
+this function will prompt user for it."
+  (let ((ftp (w3m-convert-ftp-url-for-emacsen url))
+	file)
+    (if (or (string-equal "/" (substring ftp -1))
+	    ;; `file-directory-p' takes a long time for remote files.
+	    ;; `file-directory-p' returns t in Emacsen, anytime.
+	    (w3m-file-directory-p ftp))
+	(dired-other-window ftp)
+      (setq file (file-name-nondirectory ftp))
+      (unless filename
+	(setq filename (w3m-read-file-name nil nil file)))
+      (unless (file-writable-p (file-name-directory filename))
+	(error "Permission denied, %s" (file-name-directory filename)))
+      (when (or (not (file-exists-p filename))
+		(if (file-writable-p filename)
+		    (and (prog1
+			     (y-or-n-p
+			      (format "File(%s) already exists. Overwrite? "
+				      filename))
+			   (message nil))
+			 (progn
+			   (delete-file filename)
+			   t))
+		  (error "Permission denied, %s" filename)))
+	(copy-file ftp filename)
+	(message "Wrote %s" filename)))))
+
+(unless w3m-doc-view-map
+  (setq w3m-doc-view-map (make-sparse-keymap))
+  (define-key w3m-doc-view-map "q" 'w3m-doc-view-quit))
+
+(defun w3m-doc-view (url)
+  "View PDF/PostScript/DVI files using `doc-view-mode'.
+`w3m-pop-up-windows' and `w3m-pop-up-frames' control how the document
+window turns up."
+  (let* ((basename (file-name-nondirectory (w3m-url-strip-query url)))
+	 (regexp (concat "\\`" (regexp-quote basename) "\\(?:<[0-9]+>\\)?\\'"))
+	 (buffers (buffer-list))
+	 buffer data case-fold-search)
+    (save-current-buffer
+      (while buffers
+	(setq buffer (pop buffers))
+	(if (and (string-match regexp (buffer-name buffer))
+		 (progn
+		   (set-buffer buffer)
+		   (eq major-mode 'doc-view-mode))
+		 (equal buffer-file-name url))
+	    (setq buffers nil)
+	  (setq buffer nil))))
+    (unless (prog1
+		buffer
+	      (unless buffer
+		(setq buffer (generate-new-buffer basename)
+		      data (buffer-string)))
+	      (let ((pop-up-windows w3m-pop-up-windows)
+		    (pop-up-frames w3m-pop-up-frames))
+		(pop-to-buffer buffer)))
+      (set-buffer-multibyte nil)
+      (insert data)
+      (set-buffer-modified-p nil)
+      (setq buffer-file-name url)
+      (doc-view-mode)
+      (use-local-map w3m-doc-view-map)
+      (set-keymap-parent w3m-doc-view-map doc-view-mode-map)
+      'internal-view)))
+
+(defun w3m-doc-view-quit (&optional kill)
+  "Quit the `doc-view-mode' window that emacs-w3m launches.
+With the prefix argument KILL, kill the buffer."
+  (interactive "P")
+  (cond (w3m-pop-up-frames
+	 (when (prog1 (one-window-p t) (quit-window kill))
+	   (delete-frame (selected-frame))))
+	(w3m-pop-up-windows
+	 (if (fboundp 'quit-window)
+	     (quit-window kill)
+	   (if kill
+	       (progn
+		 (set-buffer-modified-p nil)
+		 (kill-buffer (current-buffer)))
+	     (bury-buffer)))
+	 (unless (eq (next-window nil 'no-mini) (selected-window))
+	   (delete-window)))))
+
+(eval-and-compile
+  (unless (fboundp 'w3m-add-local-hook)
+    ;; Silence the byte compiler; `w3m-add-local-hook' will be defined
+    ;; in w3m-ems.el for GNU Emacs.
+    (eval-when-compile
+      (when (eq 'byte-compile-obsolete (get 'make-local-hook 'byte-compile))
+	(put 'make-local-hook 'byte-compile nil)
+	(put 'make-local-hook 'byte-obsolete-info nil)))
+    (defun w3m-add-local-hook (hook function &optional append)
+      "Add to the buffer-local value of HOOK the function FUNCTION.
+This function is designed for XEmacs."
+      (make-local-hook hook)
+      (add-hook hook function append t))
+    (defun w3m-remove-local-hook (hook function)
+      "Remove to the buffer-local value of HOOK the function FUNCTION.
+This function is designed for XEmacs."
+      (remove-hook hook function t))))
+
+(defun w3m-store-current-position ()
+  "Memorize the current positions whenever every command starts.
+The value will be held in the `w3m-current-position' variable.  This
+function is designed as the hook function which is registered to
+`pre-command-hook' by `w3m-buffer-setup'."
+  (setq w3m-current-position (list (point)
+				   (copy-marker (point-at-bol))
+				   (copy-marker (point-at-eol)))))
+
+(defun w3m-check-current-position ()
+  "Run `w3m-after-cursor-move-hook' if the point gets away from the window.
+This function is designed as the hook function which is registered to
+`post-command-hook' by `w3m-buffer-setup'."
+  (when (/= (point) (car w3m-current-position))
+    ;; To bind `deactivate-mark' to nil protects the mark from being
+    ;; deactivated.  `deactivate-mark' is set when any function modifies
+    ;; a buffer, and it causes the deactivation of the mark.
+    (let ((deactivate-mark nil))
+      (run-hooks 'w3m-after-cursor-move-hook))))
+
+(defun w3m-buffer-setup ()
+  "Generate a new buffer, select it and set it up for emacs-w3m.
+When the current buffer has already been prepared, it won't bother to
+generate a new buffer."
+  (unless (eq major-mode 'w3m-mode)
+    (let ((buffer (w3m-alive-p t)))
+      (if buffer
+	  (set-buffer buffer)
+	(set-buffer (w3m-generate-new-buffer "*w3m*"))
+	(w3m-mode))))
+  ;; It may have been set to nil for viewing a page source or a header.
+  (setq truncate-lines t)
+  (w3m-add-local-hook 'pre-command-hook 'w3m-store-current-position)
+  (w3m-add-local-hook 'post-command-hook 'w3m-check-current-position)
+  (w3m-initialize-graphic-icons)
+  (setq mode-line-buffer-identification
+	`(,@(w3m-static-if (featurep 'xemacs)
+		(list (cons modeline-buffer-id-right-extent "%b") " ")
+	      (nconc (propertized-buffer-identification "%b") '(" ")))
+	  (w3m-current-process
+	   w3m-modeline-process-status-on
+	   (w3m-current-ssl
+	    (w3m-display-inline-images
+	     w3m-modeline-ssl-image-status-on
+	     w3m-modeline-ssl-status-off)
+	    (w3m-display-inline-images
+	     w3m-modeline-image-status-on
+	     w3m-modeline-status-off)))
+	  (w3m-show-graphic-icons-in-mode-line
+	   (w3m-use-favicon
+	    (w3m-favicon-image
+	     w3m-modeline-favicon
+	     w3m-modeline-separator)
+	    w3m-modeline-separator)
+	   w3m-modeline-separator)
+	  (w3m-current-process
+	   "Loading..." ,(if (fboundp 'format-mode-line)
+			     '(:eval (w3m-modeline-title))
+			   (if w3m-use-title-buffer-name
+			       ""
+			     'w3m-current-title)))))
+  (unless (assq 'w3m-current-process mode-line-process)
+    (setq mode-line-process
+	  (cons (list 'w3m-current-process 'w3m-process-modeline-string)
+		mode-line-process))))
+
+(defvar w3m-modeline-title-string nil
+  "Internal variable used to keep contents to be shown in the mode line.
+This is a buffer-local variable.")
+(make-variable-buffer-local 'w3m-modeline-title-string)
+
+(defvar w3m-modeline-title-timer nil
+  "Say time has not gone by after the mode line was updated last time.
+It is used to control the `w3m-modeline-title' function running too
+frequently, set by the function itself and cleared by a timer.")
+(make-variable-buffer-local 'w3m-modeline-title-timer)
+
+(eval-when-compile
+  (unless (fboundp 'format-mode-line)
+    (defalias 'format-mode-line 'ignore)))
+
+(defun w3m-modeline-title ()
+  "Return a truncated title not to cut the right end of the mode line.
+It currently works only with Emacs 22 and newer."
+  (if w3m-use-title-buffer-name
+      ""
+    (when w3m-current-title
+      (or (and w3m-modeline-title-timer w3m-modeline-title-string)
+	  (prog2
+	      (setq w3m-modeline-title-string w3m-current-title
+		    w3m-modeline-title-timer t)
+	      (let ((excess (- (string-width
+				(condition-case nil
+				    (format-mode-line mode-line-format 1)
+				  (error "")))
+			       (window-width)))
+		    (tlen (string-width w3m-current-title)))
+		(when (and (> excess 0)
+			   (> tlen 3))
+		  (setq w3m-modeline-title-string
+			(concat (w3m-replace-in-string
+				 (w3m-truncate-string
+				  w3m-current-title (max (- tlen excess 3) 2))
+				 "[\t ]+\\'" "")
+				"...")))
+		w3m-modeline-title-string)
+	    (run-at-time 0.5 nil
+			 (lambda (buffer)
+			   (when (buffer-live-p buffer)
+			     (with-current-buffer buffer
+			       (setq w3m-modeline-title-timer nil))))
+			 (current-buffer)))))))
+
+(defconst w3m-buffer-local-url "buffer://")
+(defun w3m-buffer-local-url-p (url)
+  (save-match-data
+    (string-match (concat "^" w3m-buffer-local-url) url)))
+
+;;;###autoload
+(defun w3m-goto-url (url &optional reload charset post-data referer handler
+			 element no-popup)
+  "Visit World Wide Web pages.  This is the primitive function of `w3m'.
+If the second argument RELOAD is non-nil, reload a content of URL.
+Except that if it is 'redisplay, re-display the page without reloading.
+The third argument CHARSET specifies a charset to be used for decoding
+a content.
+The fourth argument POST-DATA should be a string or a cons cell.  If
+it is a string, it makes this function request a body as if the
+content-type is \"x-www-form-urlencoded\".  If it is a cons cell, the
+car of a cell is used as the content-type and the cdr of a cell is
+used as the body.
+If the fifth argument REFERER is specified, it is used for a Referer:
+field for this request.
+The remaining HANDLER, ELEMENT[1], and NO-POPUP are for the
+internal operations of emacs-w3m.
+You can also use \"quicksearch\" url schemes such as \"gg:emacs\" which
+would search for the term \"emacs\" with the Google search engine.  See
+the `w3m-search' function and the variable `w3m-uri-replace-alist'.
+
+\[1] A note for the developers: ELEMENT is a history element which has
+already been registered in the `w3m-history-flat' variable.  It is
+corresponding to URL to be retrieved at this time, not for the url of
+the current page."
+  (interactive
+   (list (w3m-input-url nil nil nil nil 'feeling-lucky)
+	 current-prefix-arg
+	 (w3m-static-if (fboundp 'universal-coding-system-argument)
+	     coding-system-for-read)))
+  (when (and (stringp url)
+	     (not (interactive-p)))
+    (setq url (w3m-canonicalize-url url)))
+  (set-text-properties 0 (length url) nil url)
+  (setq url (w3m-uri-replace url))
+  (unless (or (w3m-url-local-p url)
+	      (string-match "\\`about:" url))
+    (w3m-string-match-url-components url)
+    (setq url (concat (w3m-url-transfer-encode-string
+		       (substring url 0 (match-beginning 8))
+		       (or w3m-current-coding-system
+			   w3m-default-coding-system))
+		      (if (match-beginning 8)
+			  (concat "#" (match-string 9 url))
+			""))))
+  (cond
+   ;; process mailto: protocol
+   ((string-match "\\`mailto:" url)
+    (w3m-goto-mailto-url url post-data))
+   ;; process ftp: protocol
+   ((and w3m-use-ange-ftp
+	 (string-match "\\`ftps?://" url)
+	 (not (string= "text/html" (w3m-local-content-type url))))
+    (w3m-goto-ftp-url url))
+   ;; find-file directly
+   ((condition-case nil
+	(and (w3m-url-local-p url)
+	     w3m-local-find-file-function
+	     (let ((base-url (w3m-url-strip-fragment url))
+		   (match (car w3m-local-find-file-regexps))
+		   nomatch file)
+	       (and (or (not match)
+			(string-match match base-url))
+		    (not (and (setq nomatch (cdr w3m-local-find-file-regexps))
+			      (string-match nomatch base-url)))
+		    (setq file (w3m-url-to-file-name base-url))
+		    (file-exists-p file)
+		    (not (file-directory-p file))
+		    (prog1
+			t
+		      (funcall (if (functionp w3m-local-find-file-function)
+				   w3m-local-find-file-function
+				 (eval w3m-local-find-file-function))
+			       file)))))
+      (error nil)))
+   ;; process buffer-local url
+   ((w3m-buffer-local-url-p url)
+    (let (file-part fragment-part)
+      (w3m-string-match-url-components url)
+      (setq file-part (concat (match-string 4 url)
+			      (match-string 5 url))
+	    fragment-part (match-string 9 url))
+      (cond
+       ((and (string= file-part "")
+	     fragment-part)
+	(w3m-search-name-anchor fragment-part))
+       ((not (string= file-part ""))
+	(w3m-goto-url (w3m-expand-url (substring url (match-beginning 4))
+				      (concat "file://" default-directory))
+		      reload charset post-data referer handler element))
+       (t (w3m-message "No URL at point")))))
+   ((w3m-url-valid url)
+    (w3m-buffer-setup)			; Setup buffer.
+    (w3m-arrived-setup)			; Setup arrived database.
+    (unless no-popup
+      (w3m-popup-buffer (current-buffer)))
+    (w3m-cancel-refresh-timer (current-buffer))
+    (when w3m-current-process
+      (error "%s"
+	     (substitute-command-keys "
+Cannot run two w3m processes simultaneously \
+\(Type `\\<w3m-mode-map>\\[w3m-process-stop]' to stop asynchronous process)")))
+    (w3m-process-stop (current-buffer))	; Stop all processes retrieving images.
+    (w3m-idle-images-show-unqueue (current-buffer))
+    ;; Store the current position in the history structure if and only
+    ;; if this command is called interactively.  The other user commands
+    ;; that calls this function want to store the position by themselves.
+    (when (interactive-p)
+      (w3m-history-store-position))
+    ;; Access url group
+    (if (string-match "\\`group:" url)
+	(let ((urls (mapcar 'w3m-url-decode-string
+			    (split-string (substring url (match-end 0)) "&")))
+	      (w3m-async-exec (and w3m-async-exec-with-many-urls
+				   w3m-async-exec)))
+	  (w3m-process-do
+	      (type (prog1
+			(w3m-goto-url (car urls))
+		      (dolist (url (cdr urls))
+			(save-window-excursion
+			  (with-current-buffer (w3m-copy-buffer nil nil nil
+								'empty)
+			    (w3m-goto-url url))))))
+	    type))
+      ;; Retrieve the page.
+      (lexical-let ((orig url)
+		    (url (w3m-url-strip-authinfo url))
+		    (reload (and (not (eq reload 'redisplay)) reload))
+		    (redisplay (eq reload 'redisplay))
+		    (charset charset)
+		    (post-data post-data)
+		    (referer referer)
+		    (name)
+		    (history-position (get-text-property (point)
+							 'history-position))
+		    (reuse-history w3m-history-reuse-history-elements))
+	(when w3m-current-forms
+	  ;; Store the current forms in the history structure.
+	  (w3m-history-plist-put :forms w3m-current-forms))
+	(let ((w3m-current-buffer (current-buffer)))
+	  (unless element
+	    (setq element
+		  (if (and (equal referer "about://history/")
+			   history-position)
+		      (w3m-history-element history-position t)
+		    (if w3m-history-reuse-history-elements
+			(w3m-history-assoc url)))))
+	  ;; Set current forms using the history structure.
+	  (when (setq w3m-current-forms
+		      (when (and (not reload) ; If reloading, ignore history.
+				 (null post-data) ; If post, ignore history.
+				 (or (w3m-cache-available-p url)
+				     (w3m-url-local-p url)))
+			;; Don't use `w3m-history-plist-get' here.
+			(plist-get (nthcdr 3 element) :forms)))
+	    ;; Mark that the form is from history structure.
+	    (setq w3m-current-forms (cons t w3m-current-forms)))
+	  (when (and post-data element)
+	    ;; Remove processing url's forms from the history structure.
+	    (w3m-history-set-plist (cadr element) :forms nil))
+	  ;; local directory URL check
+	  (when (and (w3m-url-local-p url)
+		     (file-directory-p (w3m-url-to-file-name url))
+		     (setq url (file-name-as-directory url))
+		     (eq w3m-local-directory-view-method 'w3m-dtree)
+		     (string-match "\\`file:///" url))
+	    (setq url (replace-match "about://dtree/" nil nil url)
+		  orig url))
+	  ;; Split body and fragments.
+	  (w3m-string-match-url-components url)
+	  (and (match-beginning 8)
+	       (setq name (match-string 9 url)
+		     url (substring url 0 (match-beginning 8))))
+	  (when (w3m-url-local-p url)
+	    (unless (string-match "[^\000-\177]" url)
+	      (setq url (w3m-url-decode-string url))))
+	  (w3m-process-do
+	      (action
+	       (if (and (not reload)
+			(not redisplay)
+			(stringp w3m-current-url)
+			(string= url w3m-current-url))
+		   (progn
+		     (w3m-refontify-anchor)
+		     'cursor-moved)
+		 (when w3m-name-anchor-from-hist
+		   (w3m-history-plist-put
+		    :name-anchor-hist
+		    (append (list 1 nil)
+			    (and (integerp (car w3m-name-anchor-from-hist))
+				 (nthcdr (1+ (car w3m-name-anchor-from-hist))
+					 w3m-name-anchor-from-hist)))))
+		 (setq w3m-name-anchor-from-hist
+		       (plist-get (nthcdr 3 element) :name-anchor-hist))
+		 (setq w3m-current-process
+		       (w3m-retrieve-and-render orig reload charset
+						post-data referer handler))))
+	    (with-current-buffer w3m-current-buffer
+	      (setq w3m-current-process nil)
+	      (if (not action)
+		  (progn
+		    (w3m-history-push w3m-current-url
+				      (list :title (or w3m-current-title
+						       "<no-title>")))
+		    (goto-char (point-min)))
+		(when (and name
+			   (progn
+			     ;; Redisplay to search an anchor sure.
+			     (sit-for 0)
+			     (w3m-search-name-anchor
+			      (w3m-url-transfer-encode-string
+			       name
+			       (or w3m-current-coding-system
+				   w3m-default-coding-system))
+			      nil (not (eq action 'cursor-moved)))))
+		  (setf (w3m-arrived-time (w3m-url-strip-authinfo orig))
+			(w3m-arrived-time url)))
+		(unless (eq action 'cursor-moved)
+		  (if (equal referer "about://history/")
+		      ;; Don't sprout a new branch for the existing history
+		      ;; element.
+		      (let ((w3m-history-reuse-history-elements t))
+			(w3m-history-push w3m-current-url
+					  (list :title w3m-current-title))
+			;; Fix the history position pointers.
+			(when history-position
+			  (setcar w3m-history
+				  (w3m-history-regenerate-pointers
+				   history-position))))
+		    (let ((w3m-history-reuse-history-elements reuse-history)
+			  (position (when (eq 'reload reuse-history)
+				      (cadar w3m-history))))
+		      (w3m-history-push w3m-current-url
+					(list :title w3m-current-title))
+		      (when position
+			(w3m-history-set-current position))))
+		  (w3m-history-add-properties (list :referer referer
+						    :post-data post-data))
+		  (unless w3m-toggle-inline-images-permanently
+		    (setq w3m-display-inline-images
+			  w3m-default-display-inline-images))
+		  (when (and w3m-use-form reload)
+		    (w3m-form-textarea-files-remove))
+		  (cond ((w3m-display-inline-images-p)
+			 (and w3m-force-redisplay (sit-for 0))
+			 (w3m-toggle-inline-images 'force reload))
+			((and (w3m-display-graphic-p)
+			      (eq action 'image-page))
+			 (and w3m-force-redisplay (sit-for 0))
+			 (w3m-toggle-inline-image 'force reload)))))
+	      (setq buffer-read-only t)
+	      (set-buffer-modified-p nil)
+	      (setq list-buffers-directory w3m-current-title)
+	      ;; must be `w3m-current-url'
+	      (setq default-directory (w3m-current-directory w3m-current-url))
+	      (w3m-buffer-name-add-title)
+	      (w3m-update-toolbar)
+	      (w3m-select-buffer-update)
+	      (let ((real-url (if (w3m-arrived-p url)
+				  (or (w3m-real-url url) url)
+				url)))
+		(run-hook-with-args 'w3m-display-functions real-url)
+		(run-hook-with-args 'w3m-display-hook real-url))
+	      (w3m-session-crash-recovery-save)
+	      (when (and w3m-current-url
+			 (stringp w3m-current-url)
+			 (or (string-match
+			      "\\`about://\\(?:header\\|source\\)/"
+			      w3m-current-url)
+			     (equal (w3m-content-type w3m-current-url)
+				    "text/plain")))
+		(setq truncate-lines nil))
+	      ;; restore position must call after hooks for localcgi.
+	      (when (or reload redisplay)
+		(w3m-history-restore-position))
+	      (w3m-set-buffer-unseen)
+	      (w3m-refresh-at-time)))))))
+   (t (w3m-message "Invalid URL: %s" url))))
+
+(defun w3m-current-directory (url)
+  "Return a directory used as the current directory in a page visiting URL.
+See `w3m-default-directory'."
+  (or (and url
+	   (stringp url)
+	   (let (file)
+	     (if (string-match "\\`ftp://" url)
+		 (progn
+		   (setq file (w3m-convert-ftp-url-for-emacsen url))
+		   (file-name-as-directory
+		    (if (string-match "/\\`" file)
+			file
+		      (file-name-directory file))))
+	       (and (setq file (w3m-url-to-file-name url))
+		    (file-exists-p file)
+		    (file-name-as-directory
+		     (if (file-directory-p file)
+			 file
+		       (file-name-directory file)))))))
+      (let (directory)
+	(file-name-as-directory
+	 (or (and (stringp w3m-default-directory)
+		  (file-directory-p w3m-default-directory)
+		  (expand-file-name w3m-default-directory))
+	     (and (symbolp w3m-default-directory)
+		  (boundp w3m-default-directory)
+		  (setq directory (symbol-value w3m-default-directory))
+		  (stringp directory)
+		  (file-directory-p directory)
+		  (expand-file-name directory))
+	     (and (functionp w3m-default-directory)
+		  (stringp (setq directory
+				 (condition-case nil
+				     (funcall w3m-default-directory url)
+				   (error nil))))
+		  (file-directory-p directory)
+		  (expand-file-name directory))
+	     w3m-profile-directory)))))
+
+(defun w3m-refresh-at-time ()
+  (when (and w3m-use-refresh w3m-current-refresh)
+    (if (= (car w3m-current-refresh) 0)
+	(w3m-goto-url-with-timer (cdr w3m-current-refresh) (current-buffer))
+      (setq w3m-refresh-timer
+	    (run-at-time (car w3m-current-refresh)
+			 nil
+			 'w3m-goto-url-with-timer
+			 (cdr w3m-current-refresh)
+			 (current-buffer))))))
+
+(defun w3m-goto-url-with-timer (url buffer)
+  "Run the `w3m-goto-url' function by the refresh timer."
+  (when (and (w3m-url-valid url) buffer (get-buffer buffer))
+    (cond
+     ((get-buffer-window buffer)
+      (save-selected-window
+	(pop-to-buffer buffer)
+	(with-current-buffer buffer
+	  (w3m-cancel-refresh-timer buffer)
+	  (if (and w3m-current-url
+		   (string= url w3m-current-url))
+	      (w3m-reload-this-page t)
+	    (w3m-goto-url url)))))
+     ((buffer-live-p buffer)
+      (let* ((cwin (selected-window))
+	     (cbuf (window-buffer cwin)))
+	(with-current-buffer buffer
+	  (w3m-cancel-refresh-timer buffer)
+	  (if (and w3m-current-url
+		   (string= url w3m-current-url))
+	      (w3m-reload-this-page t t)
+	    (w3m-goto-url url nil
+			  nil nil nil nil nil t)))
+	(set-window-buffer cwin cbuf)))
+     (t
+      (with-current-buffer buffer
+	(w3m-cancel-refresh-timer buffer))))))
+
+(defun w3m-goto-new-session-url (&optional reload)
+  "Open `w3m-new-session-url' in a new session."
+  (interactive "P")
+  (if (not (eq major-mode 'w3m-mode))
+      (message "This command can be used in w3m mode only")
+    (w3m-view-this-url-1 w3m-new-session-url reload 'new-session)))
+
+;;;###autoload
+(defun w3m-goto-url-new-session (url &optional reload charset post-data
+				     referer)
+  "Visit World Wide Web pages in a new session.
+If you invoke this command in the emacs-w3m buffer, the new session
+will be created by copying the current session.  Otherwise, the new
+session will start afresh."
+  (interactive
+   (list (w3m-input-url nil nil	nil nil 'feeling-lucky)
+	 current-prefix-arg
+	 (w3m-static-if (fboundp 'universal-coding-system-argument)
+	     coding-system-for-read)
+	 nil ;; post-data
+	 nil)) ;; referer
+  (let (buffer)
+    (if (or (eq 'w3m-mode major-mode)
+	    (and (setq buffer (w3m-alive-p))
+		 (progn
+		   (w3m-popup-buffer buffer)
+		   t)))
+	(progn
+	  ;; Store the current position in the history structure.
+	  (w3m-history-store-position)
+	  (switch-to-buffer (setq buffer
+				  (w3m-copy-buffer nil nil
+						   w3m-new-session-in-background
+						   'empty)))
+	  (w3m-display-progress-message url)
+	  (w3m-goto-url url
+			(or reload
+			    ;; When new URL has `name' portion, we have to
+			    ;; goto the base url because generated buffer
+			    ;; has no content at this moment.
+			    (and (progn
+				   (w3m-string-match-url-components url)
+				   (match-beginning 8))
+				 'redisplay))
+			charset post-data referer)
+	  ;; Delete useless newly created buffer if it is empty.
+	  (w3m-delete-buffer-if-empty buffer))
+      (w3m-goto-url url))))
+
+(defun w3m-move-point-for-localcgi (url)
+  (when (and (w3m-url-local-p url)
+	     (file-directory-p (w3m-url-to-file-name url))
+	     (not (eq w3m-local-directory-view-method 'w3m-dtree))
+	     (= (point-min) (point))
+	     (w3m-search-name-anchor "current" 'quiet))
+    (recenter (/ (window-height) 5))))
+
+;;;###autoload
+(defun w3m-gohome ()
+  "Go to the Home page."
+  (interactive)
+  (unless w3m-home-page
+    (error "You have to specify the value of `w3m-home-page'"))
+  (w3m-goto-url w3m-home-page))
+
+(defun w3m-reload-this-page (&optional arg no-popup)
+  "Reload the current page, disregarding the cached contents.
+If the prefix arg ARG is given, it also clears forms and post data."
+  (interactive "P")
+  (if w3m-current-url
+      (let ((w3m-history-reuse-history-elements
+	     ;; Don't move the history position.
+	     'reload)
+	    post-data)
+	(if arg
+	    (progn
+	      (w3m-history-remove-properties '(:forms nil :post-data nil))
+	      (setq w3m-current-forms nil))
+	  (when (and (setq post-data (w3m-history-plist-get :post-data))
+		     (not (y-or-n-p "Repost form data? ")))
+	    (setq post-data nil)))
+	(w3m-history-store-position)
+	(w3m-goto-url w3m-current-url 'reload nil post-data
+		      (w3m-history-plist-get :referer)
+		      nil
+		      (w3m-history-element (cadar w3m-history) t)
+		      no-popup)
+	(w3m-history-restore-position))
+    (w3m-message "Can't reload this page")))
+
+(defun w3m-reload-all-pages (&optional arg)
+  "Reload all pages, disregarding the cached contents.
+If the prefix arg ARG is given, it also clears forms and post data."
+  (interactive "P")
+  (if arg
+      (save-window-excursion
+	(dolist (buffer (w3m-list-buffers))
+	  (switch-to-buffer buffer)
+	  (w3m-reload-this-page)))
+    (dolist (buffer (w3m-list-buffers))
+      (save-window-excursion
+	(switch-to-buffer buffer)
+	(w3m-reload-this-page)))))
+
+(defun w3m-redisplay-this-page (&optional arg)
+  "Redisplay the current page.
+If the prefix arg ARG is given, it toggles the visibility of images."
+  (interactive "P")
+  (if (null w3m-current-url)
+      (w3m-message "Can't redisplay this page")
+    (when arg
+      (setq w3m-display-inline-images (not w3m-display-inline-images)))
+    (let ((w3m-prefer-cache t)
+	  (w3m-history-reuse-history-elements
+	   ;; Don't move the history position.
+	   'reload))
+      (w3m-history-store-position)
+      (w3m-goto-url w3m-current-url 'redisplay)
+      (w3m-history-restore-position))))
+
+(defun w3m-redisplay-and-reset (&optional arg)
+  "Redisplay the current page and reset the user-specified values.
+This function clears the charset and the content type which the user
+specified for overriding the values of what the page requires.  The
+prefix argument ARG is passed to the `w3m-redisplay-this-page'
+function (which see)."
+  (interactive "P")
+  (if (null w3m-current-url)
+      (w3m-message "Can't execute this page")
+    (setf (w3m-arrived-content-type w3m-current-url) nil)
+    (setf (w3m-arrived-content-charset
+	   (if (string-match "\\`about://source/" w3m-current-url)
+	       (substring w3m-current-url (match-end 0))
+	     w3m-current-url))
+	  nil)
+    (w3m-redisplay-this-page arg)))
+
+(defun w3m-redisplay-with-charset (&optional arg)
+  "Redisplay the current page, specifying a charset.
+If the user enters the empty string, the value which once was used for
+decoding the page is used.  The prefix argument ARG is passed to the
+`w3m-redisplay-this-page' function (which see)."
+  (interactive "P")
+  (if (null w3m-current-url)
+      (w3m-message "Can't execute the command")
+    (setf (w3m-arrived-content-charset
+	   (if (string-match "\\`about://source/" w3m-current-url)
+	       (substring w3m-current-url (match-end 0))
+	     w3m-current-url))
+	  (w3m-read-content-charset
+	   (format "Content-charset (current %s, default reset): "
+		   w3m-current-coding-system)))
+    (w3m-redisplay-this-page arg)))
+
+(defun w3m-redisplay-with-content-type (&optional arg)
+  "Redisplay the current page, specifying a content type.
+If the user enters the empty string, it uses the value which was
+specified by the page's contents itself.  The prefix argument ARG is
+passed to the `w3m-redisplay-this-page' function (which see)."
+  (interactive "P")
+  (if (null w3m-current-url)
+      (w3m-message "Can't execute this page")
+    (setf (w3m-arrived-content-type w3m-current-url)
+	  (let ((type (completing-read
+		       (format "Content-type (current %s, default reset): "
+			       (or (w3m-arrived-content-type w3m-current-url)
+				   (w3m-content-type w3m-current-url)))
+		       w3m-content-type-alist nil t)))
+	    (unless (string= type "") type)))
+    (w3m-redisplay-this-page arg)))
+
+(defun w3m-examine-command-line-args ()
+  "Return a url when the `w3m' command is invoked from the command line.
+The `w3m' Lisp command can be invoked even in the batch mode, e.g.,
+``emacs -f w3m'' or ``emacs -f w3m url''.  This function is used in
+the very case, it extracts a url string from the command line
+arguments and passes it to the `w3m' command.  If a url is omitted, it
+defaults to the value of `w3m-home-page' or \"about:\"."
+  (let ((url (car command-line-args-left))
+	(directives '("-f" "-funcall" "--funcall" "-e"))
+	args)
+    (if (and url (not (string-match "\\`-" url)))
+	(progn
+	  (setq command-line-args-left (cdr command-line-args-left))
+	  (when (string-match "\\`[\t ]*\\'" url)
+	    ;; emacs -f w3m '' ...
+	    (setq url (or w3m-home-page "about:"))))
+      (setq args (nthcdr (max (- (length command-line-args)
+				 (length command-line-args-left)
+				 2)
+			      1)
+			 command-line-args))
+      (when (and (equal (cadr args) "w3m")
+		 (member (car args) directives))
+	(setq url (or w3m-home-page "about:"))))
+    (unless
+	(and command-line-args-left
+	     (progn
+	       (setq args (reverse command-line-args-left))
+	       (while (and args
+			   (not (and (setq args (cdr (member "w3m" args)))
+				     (member (car args) directives)))))
+	       args))
+      (defalias 'w3m-examine-command-line-args (lambda nil)))
+    ;; Inhibit the startup screen.
+    (when (and url
+	       ;; Since XEmacs provides `inhibit-startup-message' as
+	       ;; a constant, we don't modify the value.
+	       (not (featurep 'xemacs)))
+      (let ((var (cond ((boundp 'inhibit-startup-screen)
+			'inhibit-startup-screen)
+		       ((boundp 'inhibit-startup-message)
+			'inhibit-startup-message)))
+	    fn)
+	(when (and var
+		   (not (symbol-value var)))
+	  (set var t)
+	  (setq fn (make-symbol "w3m-inhibit-startup-screen"))
+	  (fset fn `(lambda nil
+		      (set ',var nil)
+		      (remove-hook 'window-setup-hook ',fn)
+		      (fmakunbound ',fn)))
+	  (add-hook 'window-setup-hook fn))))
+    url))
+
+;;;###autoload
+(defun w3m (&optional url new-session interactive-p)
+  "Visit World Wide Web pages using the external w3m command.
+
+When you invoke this command interactively for the first time, it will
+visit a page which is pointed to by a string like url around the
+cursor position or the home page specified by the `w3m-home-page'
+variable, but you will be prompted for a URL if `w3m-quick-start' is
+nil (default t) or `w3m-home-page' is nil.
+
+The variables `w3m-pop-up-windows' and `w3m-pop-up-frames' control
+whether this command should pop to a window or a frame up for the
+session.
+
+When emacs-w3m sessions have already been opened, this command will
+pop to the existing window or frame up, but if `w3m-quick-start' is
+nil, \(default t), you will be prompted for a URL (which defaults to
+`popup' meaning to pop to an existing emacs-w3m buffer up).
+
+In addition, if the prefix argument is given or you enter the empty
+string for the prompt, it will visit the home page specified by the
+`w3m-home-page' variable or the \"about:\" page.
+
+You can also run this command in the batch mode as follows:
+
+  emacs -f w3m http://emacs-w3m.namazu.org/ &
+
+In that case, or if this command is called non-interactively, the
+variables `w3m-pop-up-windows' and `w3m-pop-up-frames' will be ignored
+\(treated as nil) and it will run emacs-w3m at the current (or the
+initial) window.
+
+If the optional NEW-SESSION is non-nil, this function makes a new
+emacs-w3m buffer.  Besides that, it also makes a new emacs-w3m buffer
+if `w3m-make-new-session' is non-nil and a user specifies a url string.
+
+The optional INTERACTIVE-P is for the internal use; it is mainly used
+to check whether Emacs 22 or later calls this function as an
+interactive command in the batch mode."
+  (interactive
+   (let ((url
+	  ;; Emacs 22 or later calls a Lisp command interactively even
+	  ;; if it is in the batch mode.  If the following function
+	  ;; returns non-nil value, it means this function is called in
+	  ;; the batch mode, and we don't treat it as what it is called
+	  ;; to interactively.
+	  (w3m-examine-command-line-args))
+	 new)
+     (list
+      ;; url
+      (or url
+	  (let ((default (if (w3m-alive-p) 'popup w3m-home-page)))
+	    (setq new (if current-prefix-arg
+			  default
+			(w3m-input-url nil nil default w3m-quick-start
+				       'feeling-lucky)))))
+      ;; new-session
+      (and w3m-make-new-session
+	   (w3m-alive-p)
+	   (not (eq new 'popup)))
+      ;; interactive-p
+      (not url))))
+  (let ((nofetch (eq url 'popup))
+	(alived (w3m-alive-p))
+	(buffer (unless new-session (w3m-alive-p t)))
+	(w3m-pop-up-frames (and interactive-p w3m-pop-up-frames))
+	(w3m-pop-up-windows (and interactive-p w3m-pop-up-windows)))
+    (unless (and (stringp url)
+		 (> (length url) 0))
+      (if buffer
+	  (setq nofetch t)
+	;; This command was possibly be called non-interactively or as
+	;; the batch mode.
+	(setq url (or (w3m-examine-command-line-args)
+		      ;; Unlikely but this function was called with no url.
+		      "about:")
+	      nofetch nil)))
+    (unless buffer
+      ;; It means `new-session' is non-nil or there's no emacs-w3m buffer.
+      ;; At any rate, we create a new emacs-w3m buffer in this case.
+      (with-current-buffer (setq buffer (w3m-generate-new-buffer "*w3m*"))
+	(w3m-mode)))
+    (w3m-popup-buffer buffer)
+    (unless nofetch
+      ;; `unwind-protect' is needed since a process may be terminated by C-g.
+      (unwind-protect
+	  (let* ((crash (and (not alived)
+			     (w3m-session-last-crashed-session)))
+		 (last (and (not alived)
+			    (not crash)
+			    (w3m-session-last-autosave-session))))
+	    (w3m-goto-url url)
+	    (when (or crash last)
+	      (w3m-session-goto-session (or crash last))))
+	;; Delete useless newly created buffer if it is empty.
+	(w3m-delete-buffer-if-empty buffer)))))
+
+(eval-when-compile
+  (autoload 'browse-url-interactive-arg "browse-url"))
+
+;;;###autoload
+(defun w3m-browse-url (url &optional new-session)
+  "Ask emacs-w3m to browse URL.
+NEW-SESSION specifies whether to create a new emacs-w3m session.  URL
+defaults to the string looking like a url around the cursor position.
+Pop to a window or a frame up according to `w3m-pop-up-windows' and
+`w3m-pop-up-frames'."
+  (interactive (progn
+		 (require 'browse-url)
+		 (browse-url-interactive-arg "Emacs-w3m URL: ")))
+  (when (stringp url)
+    (setq url (w3m-canonicalize-url url))
+    (if new-session
+	(w3m-goto-url-new-session url)
+      (w3m-goto-url url))))
+
+;;;###autoload
+(defun w3m-find-file (file)
+  "Function used to open FILE whose name is expressed in ordinary format.
+The file name will be converted into the file: scheme."
+  (interactive "fFilename: ")
+  (w3m-goto-url (w3m-expand-file-name-as-url file)
+		nil
+		(w3m-static-if (fboundp 'universal-coding-system-argument)
+		    coding-system-for-read)))
+
+(defun w3m-cygwin-path (path)
+  "Convert PATH in the win32 style into the cygwin format.
+ex. c:/dir/file => //c/dir/file"
+  (if (string-match "^\\([A-Za-z]\\):" path)
+      (replace-match "//\\1" nil nil path)
+    path))
+
+;;;###autoload
+(defun w3m-region (start end &optional url charset)
+  "Render the region of the current buffer between START and END.
+URL specifies the address where the contents come from.  It can be
+omitted or nil when the address is not identified.  CHARSET is used
+for decoding the contents.  If it is nil, this function attempts to
+parse the meta tag to extract the charset."
+  (interactive
+   (list (region-beginning)
+	 (region-end)
+	 (w3m-expand-file-name-as-url
+	  (or (buffer-file-name) default-directory))))
+  (save-restriction
+    (w3m-process-stop (current-buffer))
+    (narrow-to-region start end)
+    (w3m-clear-local-variables)
+    (let ((w3m-current-buffer (current-buffer)))
+      (unless charset
+	(setq charset (w3m-correct-charset (w3m-detect-meta-charset))))
+      (setq url (or url
+		    w3m-buffer-local-url)
+	    w3m-current-url url
+	    w3m-current-base-url url
+	    w3m-current-coding-system
+	    (if charset
+		(w3m-charset-to-coding-system charset)
+	      w3m-coding-system)
+	    w3m-current-title
+	    (let (w3m-use-refresh)
+	      (w3m-rendering-buffer charset)))
+      (w3m-fontify)
+      (when (w3m-display-inline-images-p)
+	(and w3m-force-redisplay (sit-for 0))
+	(w3m-toggle-inline-images 'force)))))
+
+;;;###autoload
+(defun w3m-buffer (&optional url charset)
+  "Render the current buffer.
+See `w3m-region' for the optional arguments."
+  (interactive (list (w3m-expand-file-name-as-url (or (buffer-file-name)
+						      default-directory))))
+  (w3m-region (point-min) (point-max) url charset))
+
+;;; About:
+(defun w3m-about (url &rest args)
+  (insert "<!doctype html public \"-//W3C//DTD HTML 3.2//EN\">
+<html>
+<head><title>About emacs-w3m</title></head>
+<body>
+<center>
+Welcome to <a href=\"http://emacs-w3m.namazu.org/\">\
+<img src=\"about://emacs-w3m.gif\" alt=\"emacs-w3m\" width=\"83\"
+height=\"14\"></a>!<br><br>
+emacs-w3m is an interface program of
+<a href=\"http://w3m.sourceforge.net/\">w3m</a>,
+works on Emacs.
+</center>
+</body>
+</html>")
+  "text/html")
+
+(defun w3m-view-source (&optional arg)
+  "Display an html source of a page visited in the current buffer.
+ARG should be a number (a non-numeric value is treated as `1') which
+controls how much to decode a source.  A number larger than or equal
+to 4 (which the `C-u' prefix produces) means don't decode.  The number
+2 or 3 means decode normal text.  The number 1 means decodes `&#nnn;'
+entities in 128..159 and 160 in addition to normal text (the default).
+A number less than or equal to zero means also encode urls containing
+non-ASCII characters."
+  (interactive "p")
+  (if w3m-current-url
+      (let ((w3m-prefer-cache t)
+	    (w3m-view-source-decode-level (if (numberp arg) arg 0))
+	    (w3m-history-reuse-history-elements t))
+	(w3m-history-store-position)
+	(cond
+	 ((string-match "\\`about://source/" w3m-current-url)
+	  (w3m-goto-url (substring w3m-current-url (match-end 0))))
+	 ((string-match "\\`about://header/" w3m-current-url)
+	  (w3m-goto-url (concat "about://source/"
+				(substring w3m-current-url (match-end 0)))))
+	 (t
+	  (w3m-goto-url  (concat "about://source/" w3m-current-url))))
+	(w3m-history-restore-position))
+    (w3m-message "Can't view page source")))
+
+(defun w3m-make-separator ()
+  (if (string= w3m-language "Japanese")
+      (make-string (/ (w3m-display-width) 2)
+		   (make-char 'japanese-jisx0208 40 44))
+    (make-string (w3m-display-width) ?-)))
+
+(defun w3m-about-header (url &optional no-uncompress no-cache &rest args)
+  (when (string-match "\\`about://header/" url)
+    (setq url (substring url (match-end 0)))
+    (insert "Page Information\n"
+	    "\nTitle:          " (or (w3m-arrived-title
+				      (w3m-url-strip-authinfo url))
+				     "")
+	    "\nURL:            " url
+	    "\nDocument Type:  " (or (w3m-content-type url) "")
+	    "\nLast Modified:  "
+	    (let ((time (w3m-last-modified url)))
+	      (if time (current-time-string time) ""))
+	    (let ((anchor (with-current-buffer w3m-current-buffer
+			    (and (equal url w3m-current-url) (w3m-anchor)))))
+	      (if anchor
+		  (concat "\nCurrent Anchor: " anchor)
+		"")))
+    (let ((ct (w3m-arrived-content-type url))
+	  (charset (w3m-arrived-content-charset url))
+	  (separator (w3m-make-separator))
+	  (case-fold-search t)
+	  header ssl beg)
+      (when (or ct charset)
+	(insert "\n\n" separator "\n\nModifier Information\n")
+	(insert "\nDocument Content-Type:  " (or ct ""))
+	(insert "\nDocument Charset:       " (or charset "")))
+      (when (and (not (w3m-url-local-p url))
+		 (setq header (condition-case nil
+				  (or (unless no-cache
+					(w3m-cache-request-header url))
+				      (w3m-process-with-wait-handler
+					(w3m-w3m-dump-head url handler)))
+				(w3m-process-timeout nil))))
+	(insert "\n\n" separator "\n\nHeader Information\n\n" header)
+	(goto-char (point-min))
+	(when (re-search-forward "^w3m-ssl-certificate: " nil t)
+	  (setq beg (match-end 0))
+	  (forward-line)
+	  (while (and (not (eobp)) (looking-at "^[ \t]"))
+	    (forward-line))
+	  (setq ssl (buffer-substring beg (point)))
+	  (delete-region beg (point))
+	  (goto-char beg)
+	  (insert "SSL\n")
+	  (goto-char (point-max))
+	  (insert separator "\n\nSSL Information\n\n")
+	  (setq beg (point))
+	  (insert ssl)
+	  (goto-char beg)
+	  (while (re-search-forward "^\t" nil t)
+	    (delete-char -1)
+	    (when (looking-at "Certificate:")
+	      (insert "\n"))))))
+    "text/plain"))
+
+(defun w3m-view-header ()
+  "Display the header of the current page."
+  (interactive)
+  (if w3m-current-url
+      (let ((w3m-prefer-cache t)
+	    (w3m-history-reuse-history-elements t)
+	    (url (cond
+		  ((string-match "\\`about://header/" w3m-current-url)
+		   (substring w3m-current-url (match-end 0)))
+		  ((string-match "\\`about://source/" w3m-current-url)
+		   (let ((real-url (substring w3m-current-url (match-end 0))))
+		     (unless (string-match "\\`about:" real-url)
+		       (concat "about://header/" real-url))))
+		  ((string-match "\\`about:" w3m-current-url)
+		   nil)
+		  (t
+		   (concat "about://header/" w3m-current-url)))))
+	(if url
+	    (progn
+	      (w3m-history-store-position)
+	      (w3m-goto-url url)
+	      (w3m-history-restore-position))
+	  (w3m-message "Can't load a header for %s" w3m-current-url)))
+    (w3m-message "Can't view page header")))
+
+(defvar w3m-about-history-max-indentation '(/ (* (window-width) 2) 3)
+  "*Number used to limit the identation level when showing a history.
+This value is evaluated whenever a history page is displayed by the
+`w3m-about-history' command.  So, it can be any s-expression returning
+a number.")
+
+(defvar w3m-about-history-indent-level 4
+  "*Number used to specify the indentation level when showing a history.
+A history page is invoked by the `w3m-about-history' command.")
+
+(defun w3m-about-history (&rest args)
+  "Show a tree-structured history."
+  (let (start history current)
+    (with-current-buffer w3m-current-buffer
+      (setq history w3m-history-flat
+	    current (cadar w3m-history)))
+    (insert "\
+<head><title>URL history</title></head><body>
+<h1>List of all the links you have visited in this session.</h1><pre>\n")
+    (setq start (point))
+    (when history
+      (let ((form
+	     (format
+	      "%%0%dd"
+	      (length
+	       (number-to-string
+		(apply 'max
+		       (apply 'append
+			      (mapcar
+			       ;; Don't use `caddr' here, since it won't
+			       ;; be substituted by the compiler macro.
+			       (lambda (e)
+				 (car (cdr (cdr e))))
+			       history)))))))
+	    (cur (current-buffer))
+	    (margin (if (> w3m-about-history-indent-level 1)
+			1
+		      0))
+	    (max-indent (condition-case nil
+			    ;; Force the value to be a number or nil.
+			    (+ 0 (eval w3m-about-history-max-indentation))
+			  (error nil)))
+	    (last-indent -1)
+	    (sub-indent 0)
+	    element url about title position bol indent)
+	(while history
+	  (setq element (pop history)
+		url (car element)
+		;; FIXME: an ad-hoc workaround to avoid illegal-type errors.
+		about (or (not (stringp url))
+			  (string-match w3m-history-ignored-regexp url))
+		title (plist-get (cadr element) :title)
+		position (caddr element))
+	  (when url
+	    (insert (format "h%s %d %d <a href=\"%s\">%s%s%s %s</a>\n"
+			    (mapconcat (lambda (d) (format form d))
+				       position
+				       "-")
+			    (/ (1- (length position)) 2)
+			    (if (equal current position) 1 0)
+			    url
+			    (if about "&lt;" "")
+			    (if (or (not title)
+				    (string-equal "<no-title>" title)
+				    (string-match "^[\t $B!!(B]*$" title))
+				url
+			      (w3m-encode-specials-string title))
+			    (if about "&gt;" "")
+			    position))))
+	(sort-fields 0 start (point-max))
+	(goto-char start)
+	(while (not (eobp))
+	  (setq bol (point))
+	  (skip-chars-forward "^ ")
+	  (setq indent (read cur)
+		sub-indent (if (= indent last-indent)
+			       (1+ sub-indent)
+			     0)
+		last-indent indent
+		indent (+ (* w3m-about-history-indent-level indent)
+			  sub-indent))
+	  (when (prog1
+		    (= (read cur) 1)
+		  (delete-region bol (point))
+		  (insert-char ?\  (+ margin (if max-indent
+						 (min max-indent indent)
+					       indent))))
+	    (beginning-of-line)
+	    (delete-char 1)
+	    (insert "&gt;"))
+	  (forward-line 1))))
+    (insert "</pre></body>")
+    "text/html"))
+
+(defun w3m-about-db-history (url &rest args)
+  (let ((start 0)
+	(size nil)
+	(width (- (w3m-display-width) 18))
+	(now (current-time))
+	title time alist prev next page total)
+    (when (string-match "\\`about://db-history/\\?" url)
+      (dolist (s (split-string (substring url (match-end 0)) "&"))
+	(when (string-match "\\`\\(?:start\\|\\(size\\)\\)=" s)
+	  (set (if (match-beginning 1) 'size 'start)
+	       (string-to-number (substring s (match-end 0)))))))
+    (when w3m-arrived-db
+      (mapatoms
+       (lambda (sym)
+	 (and sym
+	      (setq url (symbol-name sym))
+	      (not (string-match "#" url))
+	      (not (string-match w3m-history-ignored-regexp url))
+	      (push (cons url (w3m-arrived-time url)) alist)))
+       w3m-arrived-db)
+      (setq alist (sort alist
+			(lambda (a b)
+			  (w3m-time-newer-p (cdr a) (cdr b))))))
+    (setq total (length alist))
+    (setq alist (nthcdr start alist))
+    (when size
+      (when (> start 0)
+	(setq prev
+	      (format "about://db-history/?start=%d&size=%d"
+		      (max 0 (- start size)) size)))
+      (when (> (length alist) size)
+	(setq next
+	      (format "about://db-history/?start=%d&size=%d"
+		      (+ start size) size)))
+      (when (> total 0)
+	(setq total (+ (/ total size) (if (> (% total size) 0) 1 0)))
+	(setq page (1+ (/ start size)))))
+    (insert "<html><head><title>URL history in DataBase</title>"
+	    (if prev (format "<link rel=\"prev\" href=\"%s\">\n" prev) "")
+	    (if next (format "<link rel=\"next\" href=\"%s\">\n" next) "")
+	    (format
+	     "</head>\n<body>\n<h1>Arrived URL history in DataBase%s</h1>\n"
+	     (if (and page total)
+		 (format " (%d/%d)" page total) "")))
+    (setq prev
+	  (if (or prev next)
+	      (setq next
+		    (concat
+		     "<p align=\"left\">"
+		     (if prev
+			 (format "[<a href=\"%s\">Prev History</a>]" prev)
+		       "")
+		     (if next
+			 (format "[<a href=\"%s\">Next History</a>]" next)
+		       "")
+		     "</p>\n"))
+	    ""))
+    (if (null alist)
+	(insert "<em>Nothing in DataBase.</em>\n")
+      (insert prev "<table cellpadding=0>
+<tr><td><h2> Title/URL </h2></td><td><h2>Time/Date</h2></td></tr>\n")
+      (while (and alist
+		  (or (not size)
+		      (>= (decf size) 0)))
+	(setq url (car (car alist))
+	      time (cdr (car alist))
+	      alist (cdr alist)
+	      title (w3m-arrived-title url))
+	(if (or (null title)
+		(string= "<no-title>" title))
+	    (setq title (concat "<" (w3m-truncate-string url width) ">"))
+	  (when (>= (string-width title) width)
+	    (setq title (concat (w3m-truncate-string title width) "..."))))
+	(insert (format "<tr><td><a href=\"%s\">%s</a></td>"
+			url
+			(w3m-encode-specials-string title)))
+	(when time
+	  (insert "<td>"
+		  (if (<= (w3m-time-lapse-seconds time now)
+			  64800) ;; = (* 60 60 18) 18hours.
+		      (format-time-string "%H:%M:%S" time)
+		    (format-time-string "%Y-%m-%d" time))
+		  "</td>"))
+	(insert "</tr>\n"))
+      (insert "</table>"
+	      (if next "\n<br>\n<hr>\n" "")
+	      prev))
+    (insert "</body></html>\n"))
+  "text/html")
+
+(defun w3m-history-highlight-current-url (url)
+  "Highlight the current url if it is a page for the history.
+It does manage history position data as well."
+  (when (string-equal "about://history/" url)
+    (let ((inhibit-read-only t)
+	  (buffer (current-buffer))
+	  start)
+      ;; Make history position data invisible.
+      (goto-char (point-min))
+      (w3m-next-anchor)
+      (while (progn
+	       (setq start (point))
+	       (re-search-forward " (\\(?:[0-9]+ \\)*[0-9]+)$" nil t))
+	(goto-char (match-beginning 0))
+	(put-text-property start (match-beginning 0)
+			   'history-position (read buffer))
+	(add-text-properties (match-beginning 0) (match-end 0)
+			     '(invisible t intangible t))
+	(forward-char 2)
+	(skip-chars-forward "\t "))
+      ;; Highlight the current url.
+      (goto-char (point-min))
+      (when (search-forward "\n>" nil t)
+	(w3m-next-anchor)
+	(setq start (point))
+	(end-of-line)
+	(w3m-add-face-property start (point) 'w3m-history-current-url)
+	(goto-char start)))
+    (set-buffer-modified-p nil)))
+
+(defcustom w3m-db-history-display-size
+  (and (> w3m-keep-arrived-urls 500) 500)
+  "*Maximum number of arrived URLs which are displayed per page."
+  :group 'w3m
+  :type '(radio (const :tag "All entries are displayed in single page." nil)
+		(integer :format "%t: %v\n" :size 0)))
+
+(defun w3m-db-history (&optional start size)
+  "Display arrived URLs."
+  (interactive
+   (list nil w3m-db-history-display-size))
+  (w3m-goto-url (concat
+		 (format "about://db-history/?start=%d" (or start 0))
+		 (if size (format "&size=%d" size) ""))))
+
+(defun w3m-history (&optional arg)
+  "Display the history of all the links you have visited in the session.
+If it is called with the prefix argument, display the arrived URLs."
+  (interactive "P")
+  (if (null arg)
+      (w3m-goto-url "about://history/")
+    (w3m-db-history nil w3m-db-history-display-size)))
+
+(defun w3m-w32-browser-with-fiber (url)
+  (let ((proc (start-process "w3m-w32-browser-with-fiber"
+			     (current-buffer)
+			     "fiber.exe" "-s"
+			     (if (w3m-url-local-p url)
+				 (w3m-url-to-file-name url)
+			       url))))
+    (set-process-filter proc 'ignore)
+    (set-process-sentinel proc 'ignore)))
+
+(defun w3m-pipe-source (&optional url command)
+  "Pipe the page source of url URL in binary to a shell command COMMAND.
+For the interactive use, URL defaults to that of a link at the point;
+if there are both a link to a page and a link to an image at the point,
+the link to a page is preferred unless the prefix argument is given."
+  (interactive
+   (let ((url (or (if current-prefix-arg
+		      (or (w3m-image) (w3m-anchor))
+		    (or (w3m-anchor) (w3m-image)))
+		  (and w3m-current-url
+		       (prog1
+			   (y-or-n-p (format "Pipe <%s> ? " w3m-current-url))
+			 (message nil))
+		       w3m-current-url)))
+	 command)
+     (if (and (w3m-url-valid url)
+	      (progn
+		(setq command (read-string "Command: "))
+		(not (string-match "\\`[\000-\040]*\\'" command))))
+	 (list url command)
+       (list 'none nil))))
+  (cond ((eq url 'none) nil)
+	((and (stringp url)
+	      (w3m-url-valid url)
+	      (stringp command)
+	      (not (string-match "\\`[\000-\040]*\\'" command)))
+	 (w3m-message "Pipe <%s> to \"| %s\"..." url command)
+	 (with-temp-buffer
+	   (set-buffer-multibyte nil)
+	   (w3m-process-with-wait-handler
+	     (w3m-retrieve (cond ((string-match "\\`about://source/" url)
+				  url)
+				 ((string-match "\\`about://header/" url)
+				  (concat "about://source/"
+					  (substring url (match-end 0))))
+				 (t
+				  (concat "about://source/" url)))))
+	   (shell-command-on-region (point-min) (point-max) command nil)
+	   (w3m-message "Pipe <%s> to \"| %s\"...done" url command)
+	   (let ((buffer (get-buffer "*Shell Command Output*")))
+	     (when (and buffer
+			(not (zerop (buffer-size buffer))))
+	       (display-buffer buffer)))))
+	(t (error "Can't pipe page source"))))
+
+;;; Interactive select buffer.
+(defcustom w3m-select-buffer-horizontal-window t
+  "*Non-nil means split windows horizontally to open the selection window."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-select-buffer-window-ratio '(18 . 12)
+  "*The percentage of the selection window to the whole frame.
+The car is used when splitting windows horizontally and the cdr is for
+splitting windows vertically."
+  :group 'w3m
+  :type '(cons (integer :format "H: %v[%%]  " :size 0)
+	       (integer :format "V: %v[%%]\n" :size 0)))
+
+(defvar w3m-select-buffer-window nil)
+(defconst w3m-select-buffer-message
+  "n: next buffer, p: previous buffer, q: quit."
+  "Help message used when the emacs-w3m buffers selection window is open.")
+
+;; Why this function is here abruptly is because of `w-s-b-horizontal-window'.
+(defun w3m-display-width ()
+  "Return the maximum width which should display lines within the value."
+  (if (< 0 w3m-fill-column)
+      w3m-fill-column
+    (+ (if (and w3m-select-buffer-horizontal-window
+		(get-buffer-window w3m-select-buffer-name))
+	   ;; Show pages as if there is no buffers selection window.
+	   (frame-width)
+	 (window-width))
+       (or w3m-fill-column -1))))
+
+(defun w3m-select-buffer (&optional toggle nomsg)
+  "Pop to the emacs-w3m buffers selection window up.
+It provides the feature for switching emacs-w3m buffers using the
+buffer list.  The following command keys are available:
+
+\\{w3m-select-buffer-mode-map}"
+  (interactive "P")
+  (when toggle
+    (setq w3m-select-buffer-horizontal-window
+	  (not w3m-select-buffer-horizontal-window))
+    (when (get-buffer-window w3m-select-buffer-name)
+      (delete-windows-on w3m-select-buffer-name)))
+  (unless (or (eq major-mode 'w3m-mode)
+	      (eq major-mode 'w3m-select-buffer-mode))
+    (let ((buffer (w3m-alive-p t)))
+      (if buffer
+	  (w3m-popup-buffer buffer)
+	(w3m-goto-url (or w3m-home-page "about:")))))
+  (let ((selected-window (selected-window))
+	(current-buffer (current-buffer)))
+    (set-buffer (w3m-get-buffer-create w3m-select-buffer-name))
+    (unless (eq nomsg 'update)
+      (setq w3m-select-buffer-window selected-window))
+    (let ((w (or (get-buffer-window w3m-select-buffer-name)
+		 (split-window selected-window
+			       (w3m-select-buffer-window-size)
+			       w3m-select-buffer-horizontal-window))))
+      (set-window-buffer w (current-buffer))
+      (select-window w))
+    (w3m-select-buffer-generate-contents current-buffer))
+  (w3m-select-buffer-mode)
+  (or nomsg (w3m-message w3m-select-buffer-message)))
+
+(defun w3m-select-buffer-update (&rest args)
+  (when (get-buffer-window w3m-select-buffer-name)
+    (save-selected-window
+      (w3m-select-buffer nil 'update)))
+  (when w3m-use-tab
+    (w3m-force-window-update)))
+
+(defun w3m-select-buffer-generate-contents (current-buffer)
+  (let ((i 0)
+	(inhibit-read-only t))
+    (delete-region (point-min) (point-max))
+    (dolist (buffer (w3m-list-buffers))
+      (put-text-property (point)
+			 (progn
+			   (insert (format "%d:%s %s\n" (incf i)
+					   (if (w3m-unseen-buffer-p buffer)
+					       "(u)" "   ")
+					   (w3m-buffer-title buffer)))
+			   (point))
+			 'w3m-select-buffer buffer))
+    (skip-chars-backward " \t\r\f\n")
+    (delete-region (point) (point-max))
+    (set-buffer-modified-p nil)
+    (goto-char (or (text-property-any (point-min) (point-max)
+				      'w3m-select-buffer current-buffer)
+		   (point-min)))))
+
+(defvar w3m-select-buffer-mode-map nil)
+(unless w3m-select-buffer-mode-map
+  (let ((map (make-keymap)))
+    (suppress-keymap map)
+    (substitute-key-definition
+     'next-line 'w3m-select-buffer-next-line map global-map)
+    (substitute-key-definition
+     'previous-line 'w3m-select-buffer-previous-line map global-map)
+    (substitute-key-definition
+     'w3m-copy-buffer 'w3m-select-buffer-copy-buffer map w3m-mode-map)
+    (substitute-key-definition
+     'w3m-next-buffer 'w3m-select-buffer-next-line map w3m-mode-map)
+    (substitute-key-definition
+     'w3m-previous-buffer 'w3m-select-buffer-previous-line map w3m-mode-map)
+    (substitute-key-definition
+     'w3m-delete-buffer 'w3m-select-buffer-delete-buffer map w3m-mode-map)
+    (substitute-key-definition
+     'w3m-delete-other-buffers
+     'w3m-select-buffer-delete-other-buffers map w3m-mode-map)
+    (substitute-key-definition
+     'w3m-scroll-up-or-next-url
+     'w3m-select-buffer-show-this-line map w3m-mode-map)
+    (substitute-key-definition
+     'w3m-scroll-down-or-previous-url
+     'w3m-select-buffer-show-this-line-and-down map w3m-mode-map)
+    (substitute-key-definition
+     'w3m-select-buffer 'w3m-select-buffer-toggle-style map w3m-mode-map)
+    (define-key map " " 'w3m-select-buffer-show-this-line)
+    (define-key map "g" 'w3m-select-buffer-recheck)
+    (define-key map "j" 'w3m-select-buffer-next-line)
+    (define-key map "k" 'w3m-select-buffer-previous-line)
+    (define-key map "n" 'w3m-select-buffer-next-line)
+    (define-key map "p" 'w3m-select-buffer-previous-line)
+    (define-key map "q" 'w3m-select-buffer-quit)
+    (define-key map "h" 'w3m-select-buffer-show-this-line-and-switch)
+    (define-key map "w" 'w3m-select-buffer-show-this-line-and-switch)
+    (define-key map "\C-m" 'w3m-select-buffer-show-this-line-and-quit)
+    (define-key map "\C-c\C-c" 'w3m-select-buffer-show-this-line-and-quit)
+    (define-key map "\C-c\C-k" 'w3m-select-buffer-quit)
+    (define-key map "\C-c\C-q" 'w3m-select-buffer-quit)
+    (define-key map "\C-g" 'w3m-select-buffer-quit)
+    (define-key map "?" 'describe-mode)
+    (setq w3m-select-buffer-mode-map map)))
+
+(defun w3m-select-buffer-mode ()
+  "Major mode for switching emacs-w3m buffers using the buffer list.
+
+\\<w3m-select-buffer-mode-map>\
+\\[w3m-select-buffer-next-line]\
+	Next buffer.
+\\[w3m-select-buffer-previous-line]\
+	Previous buffer.
+
+\\[w3m-select-buffer-show-this-line]\
+	Show the buffer on the current menu line or scroll it up.
+\\[w3m-select-buffer-show-this-line-and-down]\
+	Show the buffer on the current menu line or scroll it down.
+\\[w3m-select-buffer-show-this-line-and-switch]\
+	Show the buffer on the menu and switch to the buffer.
+\\[w3m-select-buffer-show-this-line-and-quit]\
+	Show the buffer on the menu and quit the buffers selection.
+
+\\[w3m-select-buffer-copy-buffer]\
+	Create a copy of the buffer on the menu, and show it.
+\\[w3m-select-buffer-delete-buffer]\
+	Delete the buffer on the current menu line.
+\\[w3m-select-buffer-delete-other-buffers]\
+	Delete emacs-w3m buffers except for the buffer on the menu.
+
+\\[w3m-select-buffer-toggle-style]\
+	Toggle the style of the selection between horizontal and vertical.
+\\[w3m-select-buffer-recheck]\
+	Do the roll call to all emacs-w3m buffers.
+\\[w3m-select-buffer-quit]\
+	Quit the buffers selection.
+"
+  (setq major-mode 'w3m-select-buffer-mode
+	mode-name "w3m buffers"
+	truncate-lines t
+	buffer-read-only t)
+  (use-local-map w3m-select-buffer-mode-map)
+  (w3m-run-mode-hooks 'w3m-select-buffer-mode-hook))
+
+(defun w3m-select-buffer-recheck ()
+  "Do the roll call to all emacs-w3m buffers and regenerate the menu."
+  (interactive)
+  (let ((inhibit-read-only t))
+    (erase-buffer))
+  (w3m-select-buffer-generate-contents
+   (window-buffer w3m-select-buffer-window))
+  (w3m-select-buffer-show-this-line))
+
+(defmacro w3m-select-buffer-current-buffer ()
+  '(get-text-property (point-at-bol) 'w3m-select-buffer))
+
+(defun w3m-select-buffer-show-this-line (&optional interactive-p)
+  "Show the buffer on the current menu line or scroll it up."
+  (interactive (list t))
+  (forward-line 0)
+  (let ((obuffer (and (window-live-p w3m-select-buffer-window)
+		      (window-buffer w3m-select-buffer-window)))
+	(buffer (w3m-select-buffer-current-buffer)))
+    (unless buffer
+      (error "No buffer at point"))
+    (cond
+     ((get-buffer-window buffer)
+      (setq w3m-select-buffer-window (get-buffer-window buffer)))
+     ((window-live-p w3m-select-buffer-window)
+      ())
+     ((one-window-p t)
+      (setq w3m-select-buffer-window (selected-window))
+      (select-window
+       (split-window nil
+		     (w3m-select-buffer-window-size)
+		     w3m-select-buffer-horizontal-window)))
+     (t (setq w3m-select-buffer-window (get-largest-window))))
+    (set-window-buffer w3m-select-buffer-window buffer)
+    (when (and interactive-p (eq obuffer buffer))
+      (save-selected-window
+	(pop-to-buffer buffer)
+	(w3m-scroll-up-or-next-url nil)))
+    (w3m-force-window-update w3m-select-buffer-window)
+    (w3m-message w3m-select-buffer-message)
+    buffer))
+
+(defun w3m-select-buffer-show-this-line-and-down ()
+  "Show the buffer on the current menu line or scroll it down."
+  (interactive)
+  (let ((obuffer (and (window-live-p w3m-select-buffer-window)
+		      (window-buffer w3m-select-buffer-window)))
+	(buffer (w3m-select-buffer-show-this-line)))
+    (when (eq obuffer buffer)
+      (save-selected-window
+	(pop-to-buffer buffer)
+	(w3m-scroll-down-or-previous-url nil)))))
+
+(defun w3m-select-buffer-next-line (&optional n)
+  "Move cursor vertically down N lines and show the buffer on the menu."
+  (interactive "p")
+  (forward-line n)
+  (prog1
+      (w3m-select-buffer-show-this-line)
+    (w3m-static-when (featurep 'xemacs)
+      (save-window-excursion
+	;; Update gutter tabs.
+	(select-window w3m-select-buffer-window)))))
+
+(defun w3m-select-buffer-previous-line (&optional n)
+  "Move cursor vertically up N lines and show the buffer on the menu."
+  (interactive "p")
+  (w3m-select-buffer-next-line (- n)))
+
+(defun w3m-select-buffer-copy-buffer ()
+  "Create a copy of the buffer on the current menu line, and show it."
+  (interactive)
+  (w3m-select-buffer-show-this-line)
+  (let ((window (selected-window)))
+    (select-window (get-buffer-window (w3m-select-buffer-current-buffer)))
+    ;; The selection buffer will be updated automatically because
+    ;; `w3m-copy-buffer' calls `w3m-select-buffer-update' by way of
+    ;; `w3m-goto-url'.
+    (w3m-copy-buffer)
+    (select-window window)))
+
+(defun w3m-select-buffer-delete-buffer (&optional force)
+  "Delete the buffer on the current menu line.
+If there is the sole emacs-w3m buffer, it is assumed to be called for
+terminating the emacs-w3m session; the prefix argument FORCE will be
+passed to the `w3m-quit' function (which see)."
+  (interactive "P")
+  (w3m-select-buffer-show-this-line)
+  (if (= 1 (count-lines (point-min) (point-max)))
+      (w3m-quit force)
+    (let ((buffer (w3m-select-buffer-current-buffer)))
+      (forward-line -1)
+      (w3m-process-stop buffer)
+      (w3m-idle-images-show-unqueue buffer)
+      (kill-buffer buffer)
+      (when w3m-use-form
+	(w3m-form-kill-buffer buffer))
+      (run-hooks 'w3m-delete-buffer-hook)
+      (w3m-select-buffer-generate-contents (w3m-select-buffer-current-buffer))
+      (w3m-select-buffer-show-this-line))))
+
+(defun w3m-select-buffer-delete-other-buffers ()
+  "Delete emacs-w3m buffers except for the buffer on the current menu."
+  (interactive)
+  (w3m-select-buffer-show-this-line)
+  (w3m-delete-other-buffers (w3m-select-buffer-current-buffer)))
+
+(defun w3m-select-buffer-quit ()
+  "Quit the buffers selection."
+  (interactive)
+  (if (one-window-p t)
+      (set-window-buffer (selected-window)
+			 (or (w3m-select-buffer-current-buffer)
+			     (w3m-alive-p)))
+    (let ((buf (or (w3m-select-buffer-current-buffer)
+		   (w3m-alive-p)))
+	  pop-up-frames)
+      (pop-to-buffer buf)
+      (and (get-buffer-window w3m-select-buffer-name)
+	   (delete-windows-on w3m-select-buffer-name)))))
+
+(defun w3m-select-buffer-show-this-line-and-switch ()
+  "Show the buffer on the menu and switch to the buffer."
+  (interactive)
+  (pop-to-buffer (w3m-select-buffer-show-this-line))
+  (message nil))
+
+(defun w3m-select-buffer-show-this-line-and-quit ()
+  "Show the buffer on the menu and quit the buffers selection."
+  (interactive)
+  (w3m-select-buffer-show-this-line-and-switch)
+  (and (get-buffer-window w3m-select-buffer-name)
+       (delete-windows-on w3m-select-buffer-name)))
+
+(defun w3m-select-buffer-close-window ()
+  "Close the window which displays the buffers selection."
+  (let ((window (get-buffer-window w3m-select-buffer-name)))
+    (when window
+      (if (one-window-p t)
+	  (set-window-buffer window (other-buffer))
+	(delete-window window)))))
+
+(defun w3m-select-buffer-toggle-style()
+  "Toggle the style of the selection between horizontal and vertical."
+  (interactive)
+  (w3m-select-buffer t))
+
+(defun w3m-select-buffer-window-size ()
+  (if w3m-select-buffer-horizontal-window
+      (- (window-width)
+	 (/ (* (frame-width) (car w3m-select-buffer-window-ratio)) 100))
+    (- (window-height)
+       (/ (* (frame-height) (cdr w3m-select-buffer-window-ratio)) 100))))
+
+
+;;; Header line
+(defcustom w3m-use-header-line t
+  "*Non-nil means display the header line."
+  :group 'w3m
+  :type 'boolean)
+
+(defcustom w3m-use-header-line-title nil
+  "Non-nil means display the current title at the header line.
+This variable is effective only when `w3m-use-tab' is nil."
+  :group 'w3m
+  :type 'boolean)
+
+(defface w3m-header-line-location-title
+  '((((class color) (background light))
+     (:foreground "Blue" :background "Gray90"))
+    (((class color) (background dark))
+     (:foreground "Cyan" :background "Gray20")))
+  "Face used to highlight title when displaying location in the header line."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-header-line-location-title-face
+     'face-alias 'w3m-header-line-location-title)
+
+(defface w3m-header-line-location-content
+  '((((class color) (background light))
+     (:foreground "DarkGoldenrod" :background "Gray90"))
+    (((class color) (background dark))
+     (:foreground "LightGoldenrod" :background "Gray20")))
+  "Face used to highlight url when displaying location in the header line."
+  :group 'w3m-face)
+;; backward-compatibility alias
+(put 'w3m-header-line-location-content-face
+     'face-alias 'w3m-header-line-location-content)
+
+(defvar w3m-header-line-map nil)
+(unless w3m-header-line-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map w3m-mode-map)
+    (define-key map [mouse-2] 'w3m-goto-url)
+    ;; Prevent tool-bar from being doubled under GNU Emacs.
+    (define-key map [tool-bar] 'undefined)
+    (setq w3m-header-line-map map)))
+
+(defun w3m-header-line-insert ()
+  "Put the header line into the current buffer."
+  (when (and (or (featurep 'xemacs)
+		 (w3m-use-tab-p))
+	     w3m-use-header-line
+	     w3m-current-url
+	     (eq 'w3m-mode major-mode))
+    (goto-char (point-min))
+    (let ((ct (w3m-arrived-content-type w3m-current-url))
+	  (charset (w3m-arrived-content-charset w3m-current-url)))
+      (insert (format "Location%s: " (cond ((and ct charset) " [TC]")
+					   (ct " [T]")
+					   (charset " [C]")
+					   (t "")))))
+    (w3m-add-face-property (point-min) (point) 'w3m-header-line-location-title)
+    (let ((start (point)))
+      (insert (w3m-puny-decode-url
+	       (if (string-match "[^\000-\177]" w3m-current-url)
+		   w3m-current-url
+		 (w3m-url-decode-string w3m-current-url w3m-current-coding-system))))
+      (w3m-add-face-property start (point) 'w3m-header-line-location-content)
+      (w3m-add-text-properties start (point)
+			       `(mouse-face highlight
+				 keymap ,w3m-header-line-map
+				 ,@(if (featurep 'xemacs)
+				       '(help-echo
+					 "button2 prompts to input URL"
+					 balloon-help
+					 "button2 prompts to input URL")
+				     '(help-echo
+				       "mouse-2 prompts to input URL"))))
+      (setq start (point))
+      (insert-char ?\  (max
+			0
+			(- (if (and w3m-select-buffer-horizontal-window
+				    (get-buffer-window w3m-select-buffer-name))
+			       (frame-width)
+			     (window-width))
+			   (current-column) 1)))
+      (w3m-add-face-property start (point) 'w3m-header-line-location-content)
+      (unless (eolp)
+	(insert "\n")))))
+
+;;; w3m-minor-mode
+(defcustom w3m-goto-article-function nil
+  "Function used to visit an article pointed to by a given URL
+in `w3m-minor-mode' buffer.  Normally, this option is used only
+when you follow a link in an html article.  A function set to
+this variable must take one argument URL, and should display the
+specified page.  It may return the symbol `w3m-goto-url' when it
+fails displaying the page.  In this case, either `w3m-goto-url'
+or `w3m-goto-url-new-session' is employed to display the page."
+  :group 'w3m
+  :type '(radio (const :tag "Use emacs-w3m" nil)
+		(function :value browse-url)))
+
+(defun w3m-safe-view-this-url (&optional force)
+  "View the URL of the link under point.
+This command is quite similar to `w3m-view-this-url' except for the
+four differences: [1]don't handle forms, [2]don't consider URL-like
+string under the cursor, [3]compare URL with `w3m-safe-url-regexp'
+first to check whether it is safe, and [4]the arguments list differs;
+the optional FORCE, if it is non-nil, specifies URL is safe.  You
+should use this command rather than `w3m-view-this-url' when viewing
+doubtful pages that might contain vicious forms.
+
+This command makes a new emacs-w3m buffer if `w3m-make-new-session' is
+non-nil and a user invokes this command in a buffer not being running
+the `w3m-mode', otherwise use an existing emacs-w3m buffer."
+  (interactive "P")
+  (let ((w3m-pop-up-windows nil)
+	(url (w3m-url-valid (w3m-anchor)))
+	safe-regexp)
+    (cond
+     (url
+      (setq safe-regexp (get-text-property (point) 'w3m-safe-url-regexp))
+      (if (or (not safe-regexp)
+	      (w3m-buffer-local-url-p url)
+	      (string-match safe-regexp url)
+	      force)
+	  (unless (and (functionp w3m-goto-article-function)
+		       (not (eq 'w3m-goto-url
+				(funcall w3m-goto-article-function url))))
+	    (if (and w3m-make-new-session
+		     (not (eq major-mode 'w3m-mode)))
+		(w3m-goto-url-new-session url)
+	      (w3m-goto-url url)))
+	(when (interactive-p)
+	  (w3m-message "\
+This link is considered to be unsafe; use the prefix arg to view anyway"))))
+     ((w3m-url-valid (w3m-image))
+      (if (w3m-display-graphic-p)
+	  (if (interactive-p)
+	      (call-interactively 'w3m-toggle-inline-image)
+	    (w3m-toggle-inline-image force))
+	(w3m-view-image)))
+     (t (w3m-message "No URL at point")))))
+
+(defun w3m-mouse-safe-view-this-url (event)
+  "Perform the command `w3m-safe-view-this-url' by the mouse event."
+  ;; Note: a command invoked by [mouse-N] cannot accept the prefix
+  ;; argument since [down-mouse-N] eats it.
+  (interactive "e")
+  (mouse-set-point event)
+  (let ((url (w3m-url-valid (or (w3m-anchor) (w3m-image)))))
+    (if url
+	(let ((safe-regexp (get-text-property (point) 'w3m-safe-url-regexp))
+	      (use-dialog-box t))
+	  (when (or (not safe-regexp)
+		    (w3m-buffer-local-url-p url)
+		    (string-match safe-regexp url)
+		    (y-or-n-p "\
+This link is considered to be unsafe; continue? "))
+	    (w3m-safe-view-this-url t)))
+      (w3m-message "No URL at point"))))
+
+(defconst w3m-minor-mode-command-alist
+  '((w3m-next-anchor)
+    (w3m-previous-anchor)
+    (w3m-next-image)
+    (w3m-previous-image)
+    (w3m-toggle-inline-image)
+    (w3m-toggle-inline-images)
+    (w3m-view-this-url . w3m-safe-view-this-url)
+    (w3m-mouse-view-this-url . w3m-mouse-safe-view-this-url)
+    (w3m-print-this-url))
+  "Alist of commands and commands to be defined in `w3m-minor-mode-map'.
+Each element looks like (FROM-COMMAND . TO-COMMAND); those keys which
+are defined as FROM-COMMAND in `w3m-mode-map' are redefined as
+TO-COMMAND in `w3m-minor-mode-map'.  When TO-COMMAND is nil,
+FROM-COMMAND is defined in `w3m-minor-mode-map' with the same key in
+`w3m-mode-map'.")
+
+(defun w3m-make-minor-mode-keymap ()
+  "Return a keymap used for `w3m-minor-mode'."
+  (let ((keymap (make-sparse-keymap)))
+    (dolist (pair w3m-minor-mode-command-alist)
+      (substitute-key-definition (car pair)
+				 (or (cdr pair) (car pair))
+				 keymap w3m-mode-map))
+    (unless (featurep 'xemacs)
+      ;; Inhibit the `widget-button-click' command when
+      ;; `w3m-imitate-widget-button' is activated.
+      (define-key keymap [down-mouse-2] 'undefined))
+    keymap))
+
+(defvar w3m-minor-mode-map (w3m-make-minor-mode-keymap)
+  "*Keymap used when `w3m-minor-mode' is active.")
+
+(defcustom w3m-minor-mode-hook nil
+  "*Hook run after `w3m-minor-mode' initialization."
+  :group 'w3m
+  :type 'hook)
+
+(defvar w3m-minor-mode nil "Non-nil if w3m minor mode is enabled.")
+(make-variable-buffer-local 'w3m-minor-mode)
+(unless (assq 'w3m-minor-mode minor-mode-alist)
+  (push (list 'w3m-minor-mode " w3m") minor-mode-alist))
+(unless (assq 'w3m-minor-mode minor-mode-map-alist)
+  (push (cons 'w3m-minor-mode w3m-minor-mode-map) minor-mode-map-alist))
+
+(defun w3m-minor-mode (&optional arg)
+  "Minor mode to view text/html parts in articles."
+  (interactive "P")
+  (when (setq w3m-minor-mode
+	      (if arg
+		  (> (prefix-numeric-value arg) 0)
+		(not w3m-minor-mode)))
+    (run-hooks 'w3m-minor-mode-hook)))
+
+(defcustom w3m-do-cleanup-temp-files nil
+  "*Whether to clean up temporary files when emacs-w3m shutdown."
+  :group 'w3m
+  :type 'boolean)
+  
+(defun w3m-cleanup-temp-files ()
+  (when w3m-do-cleanup-temp-files
+    (dolist (f (directory-files w3m-profile-directory))
+      (when (string-match "^w3m\\(el\\|src\\)" f)
+	(delete-file (expand-file-name f w3m-profile-directory))))))
+
+(provide 'w3m)
+
+(unless noninteractive
+  (if (string-match "\\.el\\'" w3m-init-file)
+      (or (load (concat w3m-init-file "c") t t t)
+	  (load w3m-init-file t t t))
+    (load w3m-init-file t t))
+  (run-hooks 'w3m-load-hook))
+
+;;; w3m.el ends here

=== added directory 'share/info'
=== added file 'share/info/emacs-w3m-ja.info'
--- share/info/emacs-w3m-ja.info	1970-01-01 00:00:00 +0000
+++ share/info/emacs-w3m-ja.info	2010-09-13 10:14:52 +0000
@@ -0,0 +1,7024 @@
+Info file: emacs-w3m-ja.info,    -*-Text-*-
+produced by `texinfo-format-buffer'
+from file `emacs-w3m-ja.texi'
+using `texinfmt.el' version 2.42 of  7 Jul 2006.
+
+
+
+INFO-DIR-SECTION GNU Emacs Lisp
+START-INFO-DIR-ENTRY
+* Emacs-w3m-ja: (emacs-w3m-ja).  An Emacs interface to w3m (Japanese)
+END-INFO-DIR-ENTRY
+
+
+This file documents emacs-w3m, an Emacs interface to w3m.
+
+$B$3$N%U%!%$%k$O(B Emacs $B$GF0$/(B w3m $B$N%$%s%?%U%'!<%9$G$"$k(B emacs-w3m $B$K4X$9(B
+$B$k@bL@=q$G$9!#(B
+
+This edition is for emacs-w3m version 1.4.413.
+
+$B$3$NHG$O(B emacs-w3m $B%P!<%8%g%s(B 1.4.413 $B$KBP1~$7$^$9!#(B
+
+
+
+
+
+File: emacs-w3m-ja.info, Node: Top, Next: Introduction, Prev: (dir), Up: (dir)
+
+Emacs-w3m $A%f$B!<$A%6%^%K%e%"%k(B
+**************************
+
+                                                  Emacs-w3m $B3+H/%A!<%`(B
+
+$B$3$NJ8=q$O(B emacs-w3m $B%P!<%8%g%s(B 1.4.413 $B$KBP1~$7$^$9!#(B
+
+
+
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+2008, 2009 TSUCHIYA Masatoshi
+
+     Permission is granted to copy, distribute and/or modify this
+     document under the terms of the GNU General Public License,
+     Version 2 or any later version published by the Free Software
+     Foundation.
+
+     $A$3$NND$(GUs$A$r!"%U%j$B!<$A%=%U%H%&%'%"$(GXB$(I#>$A$K$h$C$F$BH/$APP$5$l$?(B GNU $AR;0c9+$(I>j(B
+     $A@{SC$(G]Br?$AFu$(GR|Us$A5Z(B 2 $A0f$^$?$O$=$lRT=5$N0f$N$&$A$I$l$+$N6($a$kLu<~$N(B
+     $AOB$G$(Gnoj{$A!"Ed2<!"$"$k$$$O$(I+y$A8|$9$k$3$H$r$(G]B$A?I$7$^$9!#(B
+
+     This document is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     $A$3$NND$(GUs$A$OSPSC$G$"$k$3$H$r$(GyL$A$C$F$(Ggc$A2<$5$l$^$9$,!"(B*$AH+$/$N$(G`R$A1#$(Gb%(B* $A$G(B
+     $A$9!#(B*$AIL$(GdF$A?ID\PT(B* $A$N1#$(Gb%$A$d(B *$ALX6($ND?5D$X$N$(GoK$A:OPT(B* $A$O!"QTMb$KJ>$5$l(B
+     $A$?$b$N$b:,$aH+$/4fTZ$7$^$;$s!#$(Gf[$A$7$/$O(B GNU $AR;0c9+$(I>j$A@{SC$(G]Br?$AFu$(GR|Us(B
+     $A$r$4$(IRf$A$/$@$5$$!#(B
+
+     You should have received a copy of the GNU General Public License
+     along with this document; see the file COPYING.  If not, write to
+     the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+     Floor, Boston, MA 02110-1301, USA.
+
+     $A$"$J$?$O$3$NND$(GUs$A$H92$K!"(BGNU $AR;0c9+$(I>j$A@{SC$(G]Br?$AFu$(GR|Us$A$N$(Gnoj{$ANo$rR;2?J\(B
+     $A$1H!$C$?$O$:$G$9!#(BCOPYING $A%U%!%$%k$r2NUU$7$F$/$@$5$$!#$b$7J\$1H!$C(B
+     $A$F$$$J$1$l$P!"%U%j$B!<$A%=%U%H%&%'%"$(GXB$(I#>$A$^$G$(Gny$AGs$7$F$/$@$5$$(B ($AMpOH$O(B
+     the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+     Boston, MA 02111-1307 USA)$A!#(B
+
+
+
+* Menu:
+
+* Introduction::                $B$O$8$a$K(B
+* Getting Started::             Emacs-w3m $B$r;H$$;O$a$k$N$O$H$C$F$b4JC1(B
+* Basic Usage::                 $B4pK\E*$J;H$$J}(B
+* Pretty Good Features::        $B$?$/$5$s$N$9$0$l$b$N(B
+* Customizable Variables::      $B%G%U%)%k%H$N$^$^$G$b7k9=NI$$$H;W$&$1$l$I(B
+* Hooking into MUAs::           $B%a!<%k(B/$B%K%e!<%9%j!<%@!<$G;H$&(B
+* Frequently Asked Questions::  $BI,$:Ez$,$"$k$H$O8B$i$J$$(B
+* Known Problems::              $B$"$J$?$J$i$-$C$H2r7h$G$-$k(B
+* Shimbun Library::             $B%&%'%V>e$N?7J9$rFI$`$?$a$NF;6q(B
+* Tips::                        Emacs-w3m $B$r;H$&^/Mn$?>.J*$?$A(B
+* Mailing List::                $B%a!<%j%s%0%j%9%H!"%P%0%j%]!<%H(B
+* Emacs-w3m Functions::         Emacs-w3m $B$N4X?t$N>\$7$$@bL@(B
+* External Packages::           $B$*Cg4V$N%Q%C%1!<%8$?$A(B
+* Authors::                     $B$3$N%^%K%e%"%k$r=q$$$??M$?$A(B
+* Index::                       $B:w0z(B
+
+ -- $B9`L\$N>\:Y$J%j%9%H(B ---
+
+Getting Started
+
+* Required Emacs Version::      $B$I$s$J%P!<%8%g%s$N(B Emacs $B$G;H$($k$N(B?
+* You Need w3m::                w3m $B$r;H$$$^$9(B: emacs-w3m $B$,B.$$$o$1(B
+* Other Requirements::          Emacs-w3m $B$rF0:n$5$;$k$N$KI,MW$J$b$N(B
+* Installing Emacs-w3m::        Emacs-w3m $B$r%$%s%9%H!<%k$9$k(B
+* Non-UNIX-like systems::       $BHs(B UNIX $B7O4D6-$G$N%$%s%9%H!<%k(B
+* Minimal Settings::            $B@_Dj$7$J$1$l$P$J$i$J$$:GDc8B$N$b$N(B
+
+Basic Usage
+
+* Browsing Web Pages::          $B%M%C%H%5!<%U%#%s$7$h$&(B!
+* Inline Images::               $B2hA|I=<($r(B ON/OFF $B$9$k(B
+* Tracing History::             $B;~6u$rAL$k(B
+* Managing Bookmarks::          $B$\$/$N(B/$B$o$?$7$N$*5$$KF~$j(B
+* Using Tabs::                  $B$_$s$J%?%V$,9%$-$@$h$M(B
+* Working with buffers::        $B%P%C%U%!$r:n$k(B/$B>C$9(B/$B0\F0$9$k(B
+* Downloading::                 $B%U%!%$%k$r%@%&%s%m!<%I$9$k(B
+* Submitting Forms::            HTML $B%U%)!<%`$K5-F~$9$k(B
+* HTML File Information::       $B%&%'%V%Z!<%8:n$j$H%O%C%/$N$*<jEA$$(B
+
+Pretty Good Features
+
+* Using Search Engines::        $B;H$$$d$9$$%&%'%V8!:w(B
+* Grouping URLs::               $B0l$D$N(B URL $B$GJ#?t$N%&%'%V%Z!<%8$r8+$k(B
+* Weather Information::         $BL@F|$NE75$$O@2$l$G$7$g$&(B
+* Using Antenna::               $B%"%s%F%J$rD%$j=d$i$=$&(B
+* Showing Directory Tree::      $B%G%#%l%/%H%j$NLZ9=B$$rI=<($9$k(B
+* Viewing Perl Documents::      Perl $B$N%I%-%e%a%s%H$r8+$k(B
+* Using Namazu::                Namazu $B$G%U%!%$%k$r8!:w$9$k(B
+* Octet::                       application/octet-stream $B%G!<%?$r8+$k(B
+* Frame Local Buffers::         $BB??t$N%;%C%7%g%s$r%U%l!<%`$G%0%k!<%WJ,$1$9$k(B
+* Session Manager::             $B%;%C%7%g%s$NJ]B8$HFI$_$3$_(B
+
+Customizable Variables
+
+* General Variables::           $B0lHLE*$JJQ?t(B
+* Image Variables::             $B2hA|$K4XO"$7$?JQ?t(B
+* Form Variables::              $B%U%)!<%`$K4XO"$7$?JQ?t(B
+* Cookie Variables::            $B%/%C%-!<$K4XO"$7$?JQ?t(B
+* Bookmark Variables::          $B%V%C%/%^!<%/$K4XO"$7$?JQ?t(B
+* Search Variables::            $B%&%'%V8!:w$K4XO"$7$?JQ?t(B
+* Weather Variables::           $BE75$M=Js$K4XO"$7$?JQ?t(B
+* Dtree Variables::             dtree $B$K4XO"$7$?JQ?t(B
+* Antenna Variables::           $B%"%s%F%J$K4XO"$7$?JQ?t(B
+* Perldoc Variables::           Perldoc $B$K4XO"$7$?JQ?t(B
+* Namazu Variables::            Namazu $B$K4XO"$7$?JQ?t(B
+* Octet Variables::             Octet $B$K4XO"$7$?JQ?t(B
+* Session Manager Variables::   $B%;%C%7%g%s%^%M!<%8%c$K4XO"$7$?JQ?t(B
+* Hooks::                       $B%U%C%/(B
+* Other Variables::             $B$=$NB>$NJQ?t(B
+
+Hooking into MUAs
+
+* Gnus::                        Gnus $B$G(B HTML $B%a!<%k$rFI$`(B
+* Mew::                         Mew $B$G(B HTML $B%a!<%k$rFI$`(B
+* SEMI MUAs::                   SEMI MUA $B$G(B HTML $B%a!<%k$rFI$`(B
+* VM::                          VM (vieW maiL) $B$O(B Wanderlust $B$K$"$i$:(B
+
+Frequently Asked Questions
+
+* General FAQ::                 $B0lHLE*$J<ALd(B
+* Trouble FAQ::                 $B%H%i%V%k(B
+* Shimbun FAQ::                 Shimbun $B$K4X$9$k<ALd(B
+
+Known Problems
+
+Shimbun Library
+
+* Nnshimbun::                   Gnus $B$r%&%'%V%V%i%&%6$K$9$k(B!
+* Mew Shimbun::                 Mew $B$G?7J9$rFI$`(B
+* Shimbun with Wanderlust::     Wanderlust $B$G?7J9$rFI$`(B
+* Shimbun local mode::          $B?7J9$N<hF@$K%7%'%k%9%/%j%W%H$r;H$&(B
+* Shimbun Sites::               $B?7J9$,FI$a$k%5%$%H(B
+* Shimbun Basics::              $B?7J9%b%8%e!<%k$N:n$jJ}(B
+
+Tips
+
+Mailing List
+
+Emacs-w3m Functions
+
+
+
+
+File: emacs-w3m-ja.info, Node: Introduction, Next: Getting Started, Prev: Top, Up: Top
+
+$A$O$8$a$K(B
+********
+
+Emacs/W3 (http://www.cs.indiana.edu/elisp/w3/docs.html) $B$O!"$+$D$F$O(B
+Emacs $B>e$GF0:n$9$k:G$b%]%T%e%i!<$J(B web $B%V%i%&%6!<$G$7$?!#$7$+$7F0:n$,Hs(B
+$B>o$KCY$+$C$?$N$G!";d$?$A$O$=$l$KBe$o$kB.$$$b$N$rM_$7$^$7$?!#0lJ}!"(Bw3m
+(http://w3m.sourceforge.net/) $B$H$$$&%Z!<%8%c!<$,$"$j$^$7$?!#$=$l$O%Z!<(B
+$B%8%c!<$G$7$?$,!"%F%-%9%H%b!<%I(B WWW $B%V%i%&%6!<$H$7$F;H$&$3$H$,$G$-$?$N$G!"(B
+$B;d$?$A$O(B w3m $B$X$N(B Emacs $B%$%s%?!<%U%'!<%9$N3+H/$r;O$a$^$7$?!#(B
+
+$B$9$P$i$7$$(B w3m $B%W%m%0%i%`$r3+H/$7$F$/$l$?0KF#>4B'$5$s$H(B w3m $B%A!<%`$N$_(B
+$B$J$5$s$K!"3JCJ$N46<U$rJ{$2$^$9!#$5$i$K%3%a%s%H!"Ds0F$*$h$S%P%0$N=$@5$r(B
+$B$7$F$/$l$?$9$Y$F$N?M!9$K46<U$7$^$9!#$?$H$(LdBj$,$"$C$F$b!"@UG$$O$9$Y$F(B
+$B;d$?$A(B (emacs-w3m $B3+H/%A!<%`(B) $B$K$"$j$^$9!#$b$C$H$b!"J]>Z$O$^$C$?$/$"$j(B
+$B$^$;$s$,!#(BEmacs-w3m $B$O(B 2000$BG/(B6$B7n$KEZ202mL-$K$h$C$FAO;O$5$l$^$7$?!#(B
+
+Emacs-w3m $A$N9+J=%Z$B!<$A%8(B (http://emacs-w3m.namazu.org/) $B$bJ;$;$F$4Mw$/$@(B
+$B$5$$!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Getting Started, Next: Basic Usage, Prev: Introduction, Up: Top
+
+Emacs-w3m $A$rJ9$$J<$a$k$N$O$H$C$F$b$(Gv|$(I+J(B
+**************************************
+
+$B$R$g$C$H$9$k$H!"$"$J$?$N%7%9%F%`$K$O(B emacs-w3m $B$,$9$G$K%$%s%9%H!<%k$5$l(B
+$B$F$$$k$+$b$7$l$^$;$s!#$=$N>l9g!"$"$J$?$O$3$N9`$rFI$_Ht$P$7$F!"D>$A$K;H(B
+$B$$;O$a$k$3$H$,$G$-$^$9!#$=$s$J9,1?$K7C$^$l$J$+$C$?$J$i$P!"(Bemacs-w3m $B$N(B
+$B%$%s%9%H!<%k$N;EJ}$r2qF@$9$k$?$a$K!"FI$_B3$1$F$/$@$5$$!#(B
+
+* Menu:
+
+* Required Emacs Version::      $B$I$s$J%P!<%8%g%s$N(B Emacs $B$G;H$($k$N(B?
+* You Need w3m::                w3m $B$r;H$$$^$9(B: emacs-w3m $B$,B.$$$o$1(B
+* Other Requirements::          Emacs-w3m $B$rF0:n$5$;$k$N$KI,MW$J$b$N(B
+* Installing Emacs-w3m::        Emacs-w3m $B$r%$%s%9%H!<%k$9$k(B
+* Non-UNIX-like systems::       $BHs(B UNIX $B7O4D6-$G$N%$%s%9%H!<%k(B
+* Minimal Settings::            $B@_Dj$7$J$1$l$P$J$i$J$$:GDc8B$N$b$N(B
+
+
+
+File: emacs-w3m-ja.info, Node: Required Emacs Version, Next: You Need w3m, Prev: Getting Started, Up: Getting Started
+
+$A$I$s$J%P$B!<$A%8%g%s$N(B Emacs $A$GJ9$($k$N(B?
+====================================
+
+$B0J2<$K5s$2$?$$$m$$$m$J%P!<%8%g%s$N(B Emacsen $B$G(B emacs-w3m $B$rF0:n$5$;$k$3(B
+$B$H$,$G$-$^$9!#(B
+
+`Emacs 21.1 $ARTIO(B'
+     $BDI2C$N%Q%C%1!<%8$OITMW$G$9!#(B
+
+`XEmacs 21.x'
+     $BBh0l$K!"(Bemacs-w3m $B$O(B XEmacs 21.4.17 $B0J>e!"$*$h$S(B XEmacs 21.5-b19
+     $B0J>e$@$1$r%5%]!<%H$9$k$3$H$KCm0U$7$F$/$@$5$$!#2C$($F!"(B
+     `timer-funcs.el' $B$r4^$`:G?7$N(B xemacs-base $B%Q%C%1!<%8$r%$%s%9%H!<%k(B
+     $B$7$F$*$/I,MW$,$"$j$^$9!#(B
+
+     APEL $B%Q%C%1!<%8$H(B `gifsicle' $B%W%m%0%i%`$,I,MW$G$9!#$5$i$K!"(B
+     `mailto' url $B$r2r@O$9$k$?$a$N(B `rfc2368.el' $B%b%8%e!<%k$r%$%s%9%H!<(B
+     $B%k$7$F$*$$$?J}$,NI$$$G$7$g$&(B (*Note Other Requirements::)$B!#(B
+
+`Emacs 20.x, Emacs 19.34 ($A:,(B Mule 2.3)'
+     $B$3$l$i$N(B Emacs $B$r(B emacs-w3m $B$O%5%]!<%H$7$^$;$s!#(B
+
+GNU Emacs $B$N3+H/HG$r;H$C$F$$$k$N$G$"$l$P!"$*$=$i$/(B CVS $BHG$N(B emacs-w3m
+$B$r;H$o$J$1$l$P$J$i$J$$$G$7$g$&!#$=$N>l9g$K$O!"%a!<%j%s%0%j%9%H$K;22C$9(B
+$B$k$3$H$r6/$/4+$a$^$9(B (*Note Mailing List::)$B!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: You Need w3m, Next: Other Requirements, Prev: Required Emacs Version, Up: Getting Started
+
+w3m $A$rJ9$$$^$9(B: emacs-w3m $A$,KY$$$o$1(B
+====================================
+
+Emacs-w3m $B$O30It%3%^%s%I(B w3m $B$r!"%&%'%V%3%s%F%s%D$r<hF@$9$k$?$a$N%P%C%/(B
+$B%(%s%I$H$7$F!"$^$?$O(B HTML $B$NIA2h%(%s%8%s$H$7$F;HMQ$7$^$9!#HsF14|F0:n$K(B
+$B$h$C$F9bB.$J(B Emacs $B%&%'%V%V%i%&%6$r<B8=$9$k$3$H$,$G$-$?$N$O(B w3m $B$N$*$+(B
+$B$2$G$9!#(B
+
+$B$"$J$?$O:G?7$N(B w3m $B$r%$%s%9%H!<%k$7$J$1$l$P$J$j$^$;$s!#$=$l$O0J2<$N>l=j(B
+$B$G<hF@$G$-$^$9(B:
+
+`http://prdownloads.sourceforge.net/w3m/'
+
+
+
+File: emacs-w3m-ja.info, Node: Other Requirements, Next: Installing Emacs-w3m, Prev: You Need w3m, Up: Getting Started
+
+Emacs-w3m $A$r$(GY/$AWw$5$;$k$N$K1XR*$J$b$N(B
+====================================
+
+$B;HMQ$7$F$$$k(B Emacs $B$N%P!<%8%g%s$K$h$C$F$O!"%5!<%I%Q!<%F%#$N%Q%C%1!<%8$,(B
+$BI,MW$K$J$k$3$H$,$"$j$^$9!#$3$N9`$G$O!"$=$l$i$r8+$D$1$F%$%s%9%H!<%k$9$k(B
+$B$?$a$N;qNA$rDs6!$7$^$9!#(B
+
+`APEL'
+     XEmacs $B$KIT2D7g$G$9!#(BEmacs-w3m $B$r9=C[$9$kA0$K(B APEL $B$r%$%s%9%H!<%k(B
+     $B$7$J$1$l$P$J$j$^$;$s!#(BAPEL $B$O0J2<$N>l=j$K$"$j$^$9(B:
+
+     `http://kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/apel/'
+
+     APEL XEmacs $B%Q%C%1!<%8(B (SUMO $B$K4^$^$l$F$$$^$9(B) $B$N%P!<%8%g%s(B 1.32
+     $B$h$j8E$$$b$N$O;H$($J$$$3$H$KCm0U$7$F$/$@$5$$!#$b$7$9$G$K$=$N$h$&$J(B
+     $BHG$N%Q%C%1!<%8$,%$%s%9%H!<%k$5$l$F$$$k$J$i$P!"$=$l$r99?7$9$k$+!"$^(B
+     $B$?$O>e5-$N%j%s%/$G<($7$?(B APEL $B$GCV$-49$($k$?$a$K!"0J2<$NL?Na$r;H$C(B
+     $B$F$/$@$5$$(B ($B?75,$K(B APEL $B$r%$%s%9%H!<%k$9$k>l9g$bF1$8L?Na$r;H$&$3$H(B
+     $B$,$G$-$^$9(B):
+
+          % rm -fr /usr/local/lib/xemacs/xemacs-packages/lisp/apel
+          % cd apel-10.7
+          % make install-package XEMACS=xemacs-21.4.x\
+            PACKAGEDIR=/usr/local/lib/xemacs/xemacs-packages
+
+`gifsicle'
+     XEmacs $B$KIT2D7g$G$9!#$9$Y$F$N(B XEmacs 21.x $B$K$O!"%*%W%F%#%^%$%:$5$l(B
+     $B$?%"%K%a!<%7%g%s(B gif $B$,@5>o$KI=<($5$l$J$+$C$?$j!"$"$k<o$N%$%s%?!<(B
+     $B%l!<%9(B gif $B$rI=<($7$h$&$H$9$k$H%/%i%C%7%e$7$F$7$^$&4{CN$N%P%0$,$"(B
+     $B$j$^$9!#(BEmacs-w3m $B$O(B gif $B%G!<%?$r(B XEmacs 21.x $B$G07$($k7A<0$KJQ49$9(B
+     $B$k$?$a$K!"(B`gifsicle' $B%W%m%0%i%`$r;H$$$^$9!#$3$l$O<!$N>l=j$+$iF~<j(B
+     $B$9$k$3$H$,$G$-$^$9(B:
+
+     `http://www.lcdf.org/gifsicle/'
+
+`ImageMagick'
+     ImageMagick $B%Q%C%1!<%8$K4^$^$l$F$$$k(B `convert' $B%W%m%0%i%`$,$"$l$P!"(B
+     emacs-w3m $B$O2hA|%5%$%:$NJQ99$d(B `favicon' $B2hA|$r(B Emacs $B$,07$($k%U%)!<(B
+     $B%^%C%H$KJQ49$9$k$?$a$K$=$l$r;H$$$^$9!#(BEmacs-w3m $B$O(B ImageMagick $B$,(B
+     $BL5$/$F$bF0:n$9$k$G$7$g$&$,!"%$%s%9%H!<%k$9$k$3$H$K$h$C$F$"$J$?$N%M%C(B
+     $B%H%5!<%U%#%s$,K-$+$J$b$N$K$J$k$G$7$g$&!#(BImageMagick $B%Q%C%1!<%8$O!"(B
+     $B0J2<$N>l=j$+$i<j$KF~$l$k$3$H$,$G$-$^$9(B:
+
+     `ftp://ftp.imagemagick.org/pub/ImageMagick/'
+
+     `favicon' $B2hA|$rA`:n$9$k$?$a$K!"%P!<%8%g%s(B 5.4.0-5 $B0J9_$N$b$N$r;H(B
+     $B$&$3$H$r?d>)$7$^$9!#0JA0$N%P!<%8%g%s$bF0$/$+$b$7$l$^$;$s$,!"$=$l$i(B
+     $B$O40A4$K%A%'%C%/$5$l$F$$$^$;$s!#(B
+
+`FLIM'
+     `Shimbun' $B%i%$%V%i%j$r;H$&$?$a$K$O(B FLIM $B%Q%C%1!<%8$,I,MW$G$9!#(B
+     `Shimbun' $B%i%$%V%i%j$O%&%'%V>e$N?7J9$rFI$`$?$a$NF;6qN`$N%3%l%/%7%g(B
+     $B%s$G!"(BGnus$B!"(BMew $B$^$?$O(B Wanderlust $B$H$H$b$K;H$&$3$H$,$G$-$^$9!#(B
+     *Note Shimbun Library::.
+
+     $B;H$C$F$$$k(B Emacs $B$N%P!<%8%g%s$K$+$+$o$i$:!"(BFLIM $B%Q%C%1!<%8$K$O(B
+     APEL $B%Q%C%1!<%8$,I,MW$G$"$k$3$H$KCm0U$7$F$/$@$5$$!#$7$?$,$C$F(B
+     `shimbun' $B%i%$%V%i%j$r;H$&$K$O!"(BAPEL $B$H(B FLIM $B$NN>J}$r%$%s%9%H!<%k(B
+     $B$7$J$1$l$P$J$j$^$;$s!#(BFLIM $B%Q%C%1!<%8$O0J2<$N>l=j$K$"$j$^$9(B:
+
+     `http://kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/flim/flim-1.14/'
+
+`Mule-UCS'
+     XEmacs 21.4 $B$r;H$&$+!"$^$?$O(B Emacs 21 $B$r;H$C$FCf9q8l!"F|K\8l!"4Z9q(B
+     $B8l$J$I$N%F%-%9%H$rFI$`I,MW$,$"$k$J$i$P!"(Bemacs-w3m $B$,(B (Unicode $B%7%9(B
+     $B%F%`$NBeI=E*$J(B coding system $B$G$"$k(B) UTF-8 $B$G%(%s%3!<%I$5$l$?%Z!<(B
+     $B%8$rI=<($G$-$k$h$&$K$9$k$?$a$K!"(BMule-UCS Emacs Lisp $B%Q%C%1!<%8$r%$(B
+     $B%s%9%H!<%k$9$k$3$H$r4+$a$^$9!#(BEmacs 21 $B$,(B Unicode $B%7%9%F%`$rItJ,E*(B
+     $B$K(B ($BNc$($P%i%F%s!&%F%-%9%H$N$?$a$K(B) $B%5%]!<%H$7!"(BEmacs 22 $B0J>e$,$=(B
+     $B$l$r40A4$K%5%]!<%H$9$k$3$H$KCm0U$7$F$/$@$5$$!#(BMule-UCS Emacs Lisp
+     $B%Q%C%1!<%8$O0J2<$N>l=j$+$i<hF@$7$F$/$@$5$$(B:
+
+     `http://unit.aist.go.jp/itri/itri-gist/ftp.m17n.org/pub/mule/Mule-UCS/test/Mule-UCS-current.tar.gz'
+
+     (Mule-UCS $B$N8x<0%Z!<%8$O6a$$>-Mh(B `http://www.meadowy.org/' $B$G%*!<(B
+     $B%W%s$7$^$9!#(B)
+
+     Emacs-21.2 $B$GMxMQ$9$k>l9g$O!"(BMule-UCS $B$K(B $A$3$N%Q%C%A(B
+     (http://www.m17n.org/mlarchive/mule/200203/msg00000.html) $B$rE,MQ$7(B
+     $B$?$[$&$,$$$$$G$7$g$&!#(B
+
+     XEmacs 21.4 $B%f!<%68~$1$K$O!"$3$3$K%3%s%Q%$%k:Q$_$N%Q%C%1!<%8$,$"$j(B
+     $B$^$9(B:
+
+     `ftp://ftp.xemacs.org/xemacs/packages/mule-ucs-1.14-pkg.tar.gz'
+
+     (Mule SUMO $B$K4^$^$l$F$$$k$N$G!"2C$($F$5$i$K$3$l$r%$%s%9%H!<%k$9$k(B
+     $BI,MW$O$"$j$^$;$s!#(B)
+
+`codepage-ex'
+     $B%h!<%m%C%Q$N$$$/$D$+$N(B web $B%5%$%H$O!"(B`charset=ISO-8859-1' $B$r%F%-%9(B
+     $B%H$N%(%s%3!<%I$K;XDj$7$F$$$k$N$K$b$+$+$o$i$:!"<B:]$K$O(B
+     `windows-1252' $B$r;H$$$^$9!#$=$l$i$r%G%3!<%I$9$k$N$K(B `iso-8859-1'
+     $B$OIT==J,$J$N$G!"(Bemacs-w3m $B$OMxMQ2DG=$J$i(B `windows-1252' $B$r(B
+     `iso-8859-1' $B$N%9!<%Q!<%;%C%H$H$7$F;HMQ$7$^$9!#(BEmacs 22 $B$+$i(B
+     `windows-1252' coding system $B$OAH$_9~$^$l$F$$$^$9$,!"(B
+     `codepage-ex' $B$H$$$&%b%8%e!<%k$r;H$&$3$H$K$h$C$F!"(BEmacs 21 $B$G$b$=(B
+     $B$l$r;H$($k$h$&$K$9$k$3$H$,$G$-$^$9!#0J2<$N%Z!<%8$r;2>H$7$F$/$@$5$$!#(B
+
+     `http://nijino.homelinux.net/emacs/codepage-ex.html'
+
+`rfc2368.el'
+     XEmacs $B>e$GF0:n$5$;$k(B emacs-w3m $B$,!"E,@Z$K(B `mailto' url $B$r2r@O$G$-(B
+     $B$k$h$&$K$7$?$$>l9g$K%$%s%9%H!<%k$7$F$/$@$5$$!#(BXEmacs $B$G;H$&$3$H$,(B
+     $B$G$-$k(B `rfc2368.el' $B%b%8%e!<%k$O!"(Bemacs-w3m $B$NG[I[$N(B `attic' $B%G%#(B
+     $B%l%/%H%j$K$"$j$^$9!#%$%s%9%H!<%k$9$k$K$O(B `rfc2368.el' $B%U%!%$%k$r(B
+     `load-path' $B$,DL$C$F$$$k%G%#%l%/%H%j$K%3%T!<$7$F!"0J2<$N%3%^%s%I$r(B
+     $B<B9T$7$F$/$@$5$$(B:
+
+          % xemacs -batch -vanilla -f batch-byte-compile rfc2368.el
+
+
+
+File: emacs-w3m-ja.info, Node: Installing Emacs-w3m, Next: Non-UNIX-like systems, Prev: Other Requirements, Up: Getting Started
+
+Emacs-w3m $A$r%$%s%9%H$B!<$A%k$9$k(B
+============================
+
+Emacs-w3m $B$N<hF@$K4X$7$F$O8x<0%Z!<%8(B `http://emacs-w3m.namazu.org/' $B$r(B
+$B;2>H$7$F$/$@$5$$!#$9$Y$F=`Hw$G$-$^$7$?$+(B?  $B$G$O;O$a$^$7$g$&!#(B
+
+$BHs(B UNIX $B7O$N%7%9%F%`(B (`configure' $B$r<B9T$G$-$J$$$+(B `make' $B%3%^%s%I$,L5(B
+$B$$!"2?$i$+$N%7%9%F%`(B) $B$K(B emacs-w3m $B$r%$%s%9%H!<%k$9$k$K$O!"$3$N9`$rHt$P(B
+$B$7$F<!$N9`(B *Note Non-UNIX-like systems:: $B$K9T$C$F$/$@$5$$!#(B
+
+  1. $B:G=i$K!"G[I[$5$l$?(B emacs-w3m $B$N(B tarball $B$r0J2<$N$h$&$KE,Ev$J>l=j$G(B
+     $BE83+$7$F!"@hF,$N%G%#%l%/%H%j$KF~$C$F$/$@$5$$(B:
+
+          % tar zxf emacs-w3m-1.4.413.tar.gz
+          % cd emacs-w3m-1.4.413
+
+     Emacs-w3m $B$r(B CVS $B$G<hF@$7$?$N$J$i$P!"(B`configure' $B%9%/%j%W%H$r@8@.(B
+     $B$9$k$?$a$K(B ($B0z?tL5$7$G(B) `autoconf' $B$r<B9T$7$J$1$l$P$J$j$^$;$s!#(B
+
+  2. `configure' $B%9%/%j%W%H$r<B9T$7$^$9!#(B
+
+          % ./configure
+
+     *Gnus $A%f$B!<$A%6$X$NVXR*$J$*V*$i$;(B*:
+
+     $BJ#?t$N%P!<%8%g%s$N(B Gnus $B$,%$%s%9%H!<%k$5$l$F$$$k>l9g(B ($B%j%j!<%9HG$H(B
+     $B3+H/HG$N(B Gnus $B$,$"$k$+$b$7$l$^$;$s(B) $B$O!"(B`load-path' $B$K$"$J$?$,;H$&(B
+     $B%P!<%8%g%s$,%$%s%9%H!<%k$5$l$F$$$k%G%#%l%/%H%j(B (`gnus.elc' $B%U%!%$(B
+     $B%k$rD4$Y$^$7$g$&(B) $B$r4^$`$h$&$K$7$F$/$@$5$$!#0J2<$N$h$&$K(B
+     `--with-addpath' $B%*%W%7%g%s$r;H$&$3$H$K$h$C$F!"$3$l$r3N<B$K9T$J$&(B
+     $B$3$H$,$G$-$^$9(B:
+
+          % ./configure --with-addpath=/usr/local/share/emacs/site-lisp/gnus
+
+     APEL$B!"(BFLIM $B$^$?$OB>$N2?$+$r!"%G%U%)%k%H$N(B `load-path' $B0J30$NI8=`$G(B
+     $B$O$J$$%G%#%l%/%H%j$K%$%s%9%H!<%k$7$F$"$k>l9g$O!"0J2<$N$h$&$K(B
+     `--with-addpath' $B%*%W%7%g%s$r;H$C$F$=$l$i$r;XDj$7$J$1$l$P$J$j$^$;(B
+     $B$s(B ($B$5$i$K!"$=$l$K(B `:' $B$GJ,$1$i$l$?(B Gnus $B$N%G%#%l%/%H%j$r4^$a$F$b(B
+     $B9=$$$^$;$s(B):
+
+          % ./configure --with-addpath=/opt/share/apel:/opt/share/flim
+
+  3. $BC1$K(B `make' $B$H(B `make install' $B$r<B9T$7$^$9!#(BXEmacs $B$r;H$C$F$$$k>l(B
+     $B9g$O!"$5$i$K<!$NCJMn$b8+$F$/$@$5$$!#(B
+
+          % make
+          % make install
+
+     $B$9$Y$F$N(B Lisp $B%U%!%$%k$H(B info $B%U%!%$%k$,E,@Z$J%G%#%l%/%H%j$K%$%s%9(B
+     $B%H!<%k$5$l$k$G$7$g$&!#(B
+
+     $B$5$F!"$"$J$?$O$I$s$J%U%!%$%k$,$I$3$K9T$/$+J,$+$j$^$9$+(B?  $B$=$l$rA0(B
+     $B$b$C$FCN$k$?$a$K$O!"$3$l$r;H$C$F$/$@$5$$(B:
+
+          % make what-where
+
+     $B2hA|$rI=<($9$k$3$H$,$G$-$k(B Emacs $B$^$?$O(B XEmacs $B$r;H$C$F$$$k$J$i$P!"(B
+     $B%"%$%3%s2hA|$N%U%!%$%k$r%$%s%9%H!<%k$7$?J}$,NI$$$G$7$g$&!#$=$l$r9T(B
+     $B$J$&$K$O(B:
+
+          % make install-icons
+
+     $B$^$?$O(B
+
+          % make install-icons30
+
+     $B8e<T$O$A$g$C$HBg$-$J%"%$%3%s2hA|$r;H$&$?$a$N$b$N$G$9!#(B
+
+  4. $B0J2<$N$h$&$K(B `make install' $B$NBe$o$j$K(B `make install-package' $B$r;H(B
+     $B$&$3$H$K$h$C$F!"(Bemacs-w3m $B$r(B XEmacs $B%Q%C%1!<%8$H$7$F%$%s%9%H!<%k$9(B
+     $B$k$3$H$b$G$-$^$9(B:
+
+          % make
+          % make install-package
+
+     $B$3$N>l9g(B `make install-icons' $B$^$?$O(B `make install-icons30' $B$r<B9T(B
+     $B$9$kI,MW$O$"$j$^$;$s!#(B
+
+     $B%Q%C%1!<%8!&%G%#%l%/%H%j$r;XDj$9$k$K$OFs$D$NJ}K!$,$"$j$^$9(B:
+
+        * `configure' $B%*%W%7%g%s$N(B `--with-packagedir=' $B$r;H$$$^$9!#Nc(B
+          $B$G$9(B:
+
+               % ./configure --with-packagedir=/opt/xemacs/xemacs-packages
+               % make what-where
+               % make
+               % make install-package
+
+        * $BJQ?t(B `PACKAGEDIR' $B$r;H$$$^$9!#Nc$G$9(B:
+
+               % ./configure
+               % make what-where PACKAGEDIR=/opt/xemacs/xemacs-packages
+               % make
+               % make install-package PACKAGEDIR=/opt/xemacs/xemacs-packages
+
+
+
+File: emacs-w3m-ja.info, Node: Non-UNIX-like systems, Next: Minimal Settings, Prev: Installing Emacs-w3m, Up: Getting Started
+
+$A7G(B UNIX $AO5$(Gt?$A>3$G$N%$%s%9%H$B!<$A%k(B
+==============================
+
+$B$"$J$?$N%7%9%F%`$G(B `configure' $B%9%/%j%W%H$r<B9T$9$k$3$H$,$G$-$J$$$+!"(B
+`make' $B%3%^%s%I$,MxMQ$G$-$J$$>l9g$O!"0J2<$NJ86g$r>'$($F$/$@$5$$!#(B
+
+     % emacs -batch -q -no-site-file -l w3mhack.el NONE -f w3mhack-nonunix-install
+
+APEL$B!"(BFLIM ($B$^$?$OB>$N2?$+(B) $B$,IaDL$N>l=j$K%$%s%9%H!<%k$5$l$F$$$J$$$H!"(B
+$B%$%s%9%H!<%i$O$=$l$i$rL5;k$7$F$7$^$&$G$7$g$&!#$=$s$J>l9g$O!"0J2<$K<($9(B
+$B$h$&$K!"$=$l$i$N>l=j$r%$%s%9%H!<%i$K9p$2$kI,MW$,$"$j$^$9(B:
+
+     % emacs -batch -q -no-site-file -l w3mhack.el //c/share/apel://c/share/flim -f w3mhack-nonunix-install
+
+
+
+File: emacs-w3m-ja.info, Node: Minimal Settings, Prev: Non-UNIX-like systems, Up: Getting Started
+
+$(G]C$A6($7$J$1$l$P$J$i$J$$Wn5MO^$N$b$N(B
+==================================
+
+$B$3$N9`$G$O4pK\E*$J(B emacs-w3m $B$N@_Dj$N$$$/$D$+$r@bL@$7$^$9!#$-$a:Y$+$J@_(B
+$BDj$r$7$?$$$J$i$P!"$?$/$5$s$N%+%9%?%^%$%:2DG=$JJQ?t$r(B *Note
+Customizable Variables:: $B$G8+$D$1$k$3$H$,$G$-$k$G$7$g$&!#(B
+
+`Autoloads'
+     Emacs-w3m $B$r(B XEmacs $B%Q%C%1!<%8$H$7$F%$%s%9%H!<%k(B (*Note
+     Installing Emacs-w3m::) $B$7$F$"$l$P(B `w3m/auto-autoloads.el' $B%U%!%$(B
+     $B%k$,<+F0%m!<%I(B (autoload) $B$NLLE]$r8+$F$/$l$k$N$G!"$3$l$OI,MW$"$j$^(B
+     $B$;$s!#(B
+
+     $B$=$l0J30$N$9$Y$F$N>l9g!"0J2<$N9T$r(B `~/.emacs' $B%U%!%$%k$KF~$l$F$/$@(B
+     $B$5$$(B:
+
+          (require 'w3m-load)
+
+`Startup File'
+     Emacs-w3m $B$N$$$m$s$JJQ?t$r$$$8$kI,MW$,$"$k$H$-$O!"(B`~/.emacs-w3m'
+     $B%U%!%$%k(B ($B$3$l$O(B `w3m-init-file' $B$H$$$&JQ?t$N%G%U%)%k%HCM$G$9(B) $B$N(B
+     $BMxMQ$r?d>)$7$^$9!#$3$N%U%!%$%k$O(B `~/.emacs' $B$H;w$F$$$^$9$,!"$3$A$i(B
+     $B$O(B emacs-w3m $B$,5/F0$9$k$H$-$KFI$_9~$^$l$^$9!#(B`w3m-command' $B$J$I4v(B
+     $B$D$+$N%*%W%7%g%s$O!"$3$N%U%!%$%k$G$OJQ99$G$-$J$$$3$H$KCm0U$7$F$/$@(B
+     $B$5$$!#(B
+
+`Proxy Gateway'
+     $B$"$J$?$,KI2PJI(B (firewall) $B$NCf$+$i(B proxy $B%2!<%H%&%'%$$rDL$7$F%$%s(B
+     $B%?!<%M%C%H$K@\B3$7$F$$$k>l9g$O!"$=$l$r;H$&$h$&$K(B w3m $B$K;X<($9$kI,(B
+     $BMW$,$"$j$^$9!#(B
+
+     $B$3$l$K$O$$$/$D$+$NJ}K!$,$"$j$^$9!#0l$D$O4D6-JQ?t(B `http_proxy' $B$r(B
+     shell $B>e$G!"$3$s$J$U$&$K%0%m!<%P%k$K@_Dj$9$k$3$H$G$9(B:
+
+          setenv http_proxy http://proxy.hogege.com:8000/
+
+     $BB>$K!"JQ?t(B `w3m-command-arguments' $B$r%+%9%?%^%$%:$7$F!"(B`-o' $B$*$h$S(B
+     `http_proxy=http://PROXY_SERVER_NAME:PORT/' $B$rDI2C$9$kJ}K!$,$"$j$^(B
+     $B$9!#$3$l$O(B `~/.emacs-w3m' $B%U%!%$%k$G0J2<$N$h$&$K9T$J$&$3$H$b$G$-$^(B
+     $B$9!#(B
+
+          (setq w3m-command-arguments
+                (nconc w3m-command-arguments
+                       '("-o" "http_proxy=http://proxy.hogege.com:8000/")))
+
+     Proxy $B%2!<%H%&%'%$$rDL$9$Y$-$G$O$J$$%[%9%H(B ($B%$%s%H%i%M%C%H$N%5%$%H(B
+     $B$J$I(B) $B$r;XDj$9$k$K$O!"4D6-JQ?t(B `no_proxy' (`no-proxy' $B$G$O$J$$$3$H(B
+     $B$K$4Cm0U(B) $B$K%3%s%^$G6hJ,$1$5$l$?%[%9%HL>$N%j%9%H$r@_Dj$7$F$/$@$5$$!#(B
+     $B$"$k$$$O0J2<$N$h$&$K!"JQ?t(B `w3m-no-proxy-domains' $B$K%I%a%$%sL>(B ($B%[(B
+     $B%9%HL>$G$O$J$$(B) $B$N%j%9%H$r@_Dj$9$k$3$H$b$G$-$^$9(B:
+
+          (setq w3m-no-proxy-domains '("local.com" "neighbor.com"))
+
+     `no_proxy' $B%[%9%H$N@_Dj$K$I$&$d$C$F@55,I=8=$r;H$&$+$N@bL@$O!"JQ?t(B
+     `w3m-command-arguments-alist' $B$N%I%-%e%a%s%H$r8+$F$/$@$5$$!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Basic Usage, Next: Pretty Good Features, Prev: Getting Started, Up: Top
+
+$A;y1>5D$JJ9$$7=(B
+**************
+
+* Menu:
+
+* Browsing Web Pages::          $B%M%C%H%5!<%U%#%s$7$h$&(B!
+* Inline Images::               $B2hA|I=<($r(B ON/OFF $B$9$k(B
+* Tracing History::             $B;~6u$rAL$k(B
+* Managing Bookmarks::          $B$\$/$N(B/$B$o$?$7$N$*5$$KF~$j(B
+* Using Tabs::                  $B$_$s$J%?%V$,9%$-$@$h$M(B
+* Working with buffers::        $B%P%C%U%!$r:n$k(B/$B>C$9(B/$B0\F0$9$k(B
+* Downloading::                 $B%U%!%$%k$r%@%&%s%m!<%I$9$k(B
+* Submitting Forms::            HTML $B%U%)!<%`$K5-F~$9$k(B
+* HTML File Information::       $B%&%'%V%Z!<%8:n$j$H%O%C%/$N$*<jEA$$(B
+
+
+
+File: emacs-w3m-ja.info, Node: Browsing Web Pages, Next: Inline Images, Prev: Basic Usage, Up: Basic Usage
+
+$A%M%C%H%5$B!<$A%U%#%s$7$h$&(B!
+=======================
+
+$B$9$Y$F$N%&%'%V!&%V%i%&%:$NA`:n$O!"%-!<$G9T$&$3$H$,$G$-$^$9!#(BEmacs-w3m
+$B$O%G%U%)%k%H$G(B `Lynx-like' $B%-!<%^%C%W(B (*Note Key Binding::) $B$H$$$&$b$N(B
+$B$r;H$$$^$9!#$b$A$m$s%^%&%9$r;H$&$3$H$b$G$-$^$9!#(B
+
+* Menu:
+
+* Key Binding::                 $BFs$D$N%-!<%P%$%s%I(B
+* Launching and Jumping::       $B$H$K$+$/F0$+$7$F$_$h$&(B
+* Moving in a page::            $B%Z!<%8Fb$rHt$S$^$o$k(B
+* Moving over pages::           $B%Z!<%84V$rEO$jJb$/(B
+* Browsing With Mouse Operations:: $B%^%&%9$r;H$C$F%5!<%U%#%s(B
+* Going back to daily hacking and/or daily writing:: $BIaCJ$N@83h$KLa$k$K$O(B
+
+
+
+File: emacs-w3m-ja.info, Node: Key Binding, Next: Launching and Jumping, Prev: Browsing Web Pages, Up: Browsing Web Pages
+
+$A6~$D$N%-$B!<$A%P%$%s%I(B
+------------------
+
+Emacs-w3m $B$O(B Emacs $B%&%'%V!&%V%i%&%6$NNr;K$NCf$G$O8eH/$N%V%i%&%6$J$N$G!"(B
+$B%f!<%6$,?7$7$$%&%'%V!&%V%i%&%6$KMF0W$K47$l$k$3$H$,$G$-$k$h$&$K$9$k$?$a(B
+$B$K!"Fs<oN`$N%-!<%P%$%s%I$rMQ0U$7$^$7$?!#0l$D$O(B `Lynx-like' $B%-!<%^%C%W$H(B
+$B8F$P$l!"$b$&0l$D$O(B `Info-like' $B%-!<%^%C%W$G$9!#$3$l$i$NL>A0$+$i!"$=$l$i(B
+$B$,2?$r0UL#$9$k$+$OJ,$+$j$^$9$M(B?  $BA0<T$O%F%-%9%HHG$N%&%'%V!&%V%i%&%6$G$"(B
+$B$k(B `Lynx' $B$N$b$N$K;w$F$$$^$9!#$=$7$F8e<T$O(B GNU $B$N8x<0%I%-%e%a%s%H!&%V%i(B
+$B%&%6$G$"$k(B `Info' $B$N$b$N$K;w$F$$$^$9!#%G%U%)%k%H$G$O(B `Lynx-like' $B%-!<%^%C(B
+$B%W$,;H$o$l$^$9!#(B`Info-like' $B%-!<%^%C%W$r;H$$$?$$$N$J$i$P!"(B
+
+     M-x customize-option <RET> w3m-key-binding <RET>
+
+$B$H%?%$%W$7$F(B `Info-like' $B%-!<%^%C%W$rA*$S!"JQ99$r%;!<%V$7$F$/$@$5$$!#$"(B
+$B$k$$$O0J2<$NCGJR$r(B `~/.emacs' $B%U%!%$%k(B (`~/.emacs-w3m.el' $B%U%!%$%k$G$O(B
+$B$"$j$^$;$s(B) $B$K2C$($F$/$@$5$$(B:
+
+     (setq w3m-key-binding 'info)
+
+$B%-!<%P%$%s%I$r0l$D$:$DJQ99$9$k$K$O!"(B`~/.emacs-w3m.el' $B%U%!%$%k$G0J2<$N(B
+$B$h$&$K(B `w3m-mode-map' $BJQ?t$r$$$8$C$F$/$@$5$$(B:
+
+     (define-key w3m-mode-map [up] 'previous-line)
+     (define-key w3m-mode-map [down] 'next-line)
+     (define-key w3m-mode-map [left] 'backward-char)
+     (define-key w3m-mode-map [right] 'forward-char)
+
+
+
+File: emacs-w3m-ja.info, Node: Launching and Jumping, Next: Moving in a page, Prev: Key Binding, Up: Browsing Web Pages
+
+$A$H$K$+$/$(GY/$A$+$7$F$_$h$&(B
+----------------------
+
+$B0J2<$K5s$2$k;0$D$N0c$&%3%^%s%I$r;H$C$F(B emacs-w3m $B$r5/F0$9$k$3$H$,$G$-$^(B
+$B$9!#$=$l$i$N%3%^%s%I$N0l$D$r;n$7$F$/$@$5$$!#%&%'%V%Z!<%8$,(B "*w3m*" $B$H$$(B
+$B$&L>A0$N(B Emacs $B$N%P%C%U%!(B (emacs-w3m $B$N%P%C%U%!$N$3$H(B) $B$KI=<($5$l$^$9!#(B
+$B$*$=$i$/5$IU$/$G$7$g$&$1$l$I$b!"(Bemacs-w3m $B$N%P%C%U%!$N%a%8%c!<%b!<%I$O(B
+`w3m-mode' $B$G$9!#B>$K%^%$%J!<%b!<%I(B (*Note Managing Bookmarks::) $B$b$"$j(B
+$B$^$9!#(B
+
+$B$3$3$G$O!"$=$l$i$N%3%^%s%I$N:G$b4pK\E*$J;H$$J}$@$1$r@bL@$7$^$9!#$=$l$i(B
+$B$K$D$$$F$b$C$H>\$7$/CN$j$?$$>l9g$O!"(B*Note Emacs-w3m Functions:: $B$r;2>H(B
+$B$7$F$/$@$5$$!#$^$?!"(Bemacs-w3m $B$NF0:n$r%+%9%?%^%$%:$9$k$?$a$K;H$&$3$H$,(B
+$B$G$-$kJQ?t72$r!"(B*Note Customizable Variables:: $B$G;2>H$7$F$/$@$5$$!#(B
+
+`w3m'
+     Emacs-w3m $B$r5/F0$7$F!"(B`w3m-home-page' $B$H$$$&JQ?t$G;XDj$5$l$?%[!<%`(B
+     $B%Z!<%8$rI=<($7$^$9!#(B`w3m-home-page' $B$N%G%U%)%k%H$NCM$O(B "about:" $B$G(B
+     $B$9!#(BEmacs-w3m $B$r5/F0$7$?$H$-$KKh2s(B URL $B$rF~NO$G$-$k$h$&$K$7$?$$>l(B
+     $B9g$O!"JQ?t(B `w3m-quick-start' $B$NCM$r(B `nil' $B$K$7$F$/$@$5$$(B (*Note
+     Customizable Variables::)$B!#(B
+
+     $B$3$l$O(B Emacs $B$r5/F0$9$k$H$-$K0z?t$H$7$F;H$&$3$H$b$G$-$^$9!#Nc$G$9(B:
+
+          % emacs -f w3m
+
+     URL $B$r;XDj$7$F!"$3$N$h$&$K;H$&$3$H$b$G$-$^$9(B:
+
+          % emacs -f w3m http://emacs-w3m.namazu.org/
+
+`w3m-find-file'
+     $B%m!<%+%k%U%!%$%kL>$r%_%K%P%C%U%!$GF~NO$7$F!"$=$l$r(B emacs-w3m $B$GI=(B
+     $B<($7$^$9!#(B
+
+`w3m-browse-url'
+     URL $B$r%_%K%P%C%U%!$GF~NO$7$F!"$=$l$r(B emacs-w3m $B$GI=<($7$^$9!#$3$N(B
+     $B%3%^%s%I$O!"$I$A$i$+$H8@$($PB>$N%"%W%j%1!<%7%g%s%W%m%0%i%`$+$i(B
+     emacs-w3m $B$r5/F0$9$k$?$a$KMQ0U$5$l$F$$$^$9!#(B
+
+$B$"$J$?$,$9$G$K(B Emacs $B$N%f!<%6$J$i$P!"(Bemacs-w3m $B$N%P%C%U%!$NCf$G0\F0$9$k(B
+$B$N$K6lO+$OL5$$$G$7$g$&!#B?$/$NI8=`$N%-!<$,$=$N$^$^;H$($k$N$G$9$+$i!#Nc(B
+$B$($P(B `C-n'$B!"(B`C-v' $B$=$l$K(B `C-s' $B$O(B emacs-w3m $B%P%C%U%!$GM-8z$J%-!<$G$9(B
+($B$3$l$i$O0l9T2<9_!"0l%Z!<%8Aw$j!"$^$?$O8eJ}C18l8!:w$H$7$F6&DL$K;H$o$l$^(B
+$B$9(B)$B!#(B
+
+$B%j%s%/$r$?$I$k$K$O(B `<RET>' $B%-!<$r;H$C$F$/$@$5$$!#$=$l$K$O%]%$%s%H$r%j%s(B
+$B%/$N>l=j$K0\F0$7$J$1$l$P$J$j$^$;$s!#%j%s%/$OIaDL$N%F%-%9%H$H$O0c$C$FI=(B
+$B<($5$l$F$$$k$N$G!"4JC1$K8+J,$1$k$3$H$,$G$-$^$9!#$=$l$i$O2<@~IU$-!"$^$?(B
+$B$O0c$&?'$K$J$C$F$$$k$O$:$G$9!#$=$l$i$N8+1I$($O(B `w3m-anchor' $B$H$$$&%U%'!<(B
+$B%9$K$h$C$F7h$^$j$^$9(B (*Note Customizable Variables::)$B!#(B
+
+`<RET>'
+`<right>' (Lynx-like $A%-$B!<$A%^%C%W$N$_(B)
+     $B8=:_0LCV$N%j%s%/$,;X$7<($9%Z!<%8$rI=<($7$^$9(B
+     (`w3m-view-this-url')$B!#(B
+
+     $B$3$N%3%^%s%I$N?6$kIq$$$O!"87L)$K$O8=:_0LCV$N%j%s%/$N@-<A$K$h$C$F!"(B
+     $B$^$?$O@\F,0z?t$rM?$($k$+$I$&$+$K0MB8$7$^$9!#>\:Y$O(B *Note
+     Emacs-w3m Functions:: $B$r;2>H$7$F$/$@$5$$!#(B
+
+$BA0=R$N$h$&$K!"JQ?t(B `w3m-quick-start' $B$NCM$r(B `nil' $B$K@_Dj$9$k$3(B
+$B$H$K$h$C$F!"(B`M-x w3m' $B%3%^%s%I$r;H$C$?$H$-$K(B URL $B$r;XDj$9$k$3$H(B
+$B$,2DG=$G$9!#(BEmacs-w3m $B$N%P%C%U%!$G$O!"F~NO$7$??7$7$$(B URL $B$N%Z!<%8$K9T$/(B
+$B$?$a$N0lHLE*$JJ}K!$,!"$5$i$K0J2<$NFs$D$"$j$^$9!#(B
+
+`<RET>'
+     Emacs-w3m $B$N%P%C%U%!$K$*$$$F!"%X%C%@%i%$%s$KI=<($5$l$F$$$k(B URL $B$N(B
+     $B0LCV$K%]%$%s%H$r0\F0$5$;$F$+$i(B `<RET>' $B$rC!$/$3$H$K$h$C$F!"%_%K%P%C(B
+     $B%U%!$+$i(B URL $B$rF~NO$7$F!"$=$N%Z!<%8$rI=<($5$;$k$3$H$,$G$-$^$9!#(B
+     Mozilla $B$J$I$N(B GUI $B%Y!<%9$N%&%'%V%V%i%&%6$K47$l$F$$$k?M$K$H$C$F!"(B
+     $B$3$N5!G=$O$*$J$8$_$G$9$h$M!#$3$l$K4X$9$k>\$7$$@bL@$,(B *Note
+     Emacs-w3m Functions:: $B$G8+$D$+$k$O$:$G$9(B (`w3m-view-this-url')$B!#(B
+
+`g'
+     $B%_%K%P%C%U%!$G(B URL $B$NF~NO$r$&$J$,$7$F!"(Bemacs-w3m $B$K$=$N%Z!<%8$rI=(B
+     $B<($5$;$k$3$H$,$G$-$^$9(B ($B%]%$%s%H$N0LCV$H$OL54X78$G$9(B)$B!#$3$N%-!<$N(B
+     $B3d$jEv$F$O!"$9$G$K(B Gnus $B$d(B Mew $B$rMxMQ$7$F$$$k?M$K$O$*$J$8$_$G$7$g(B
+     $B$&(B (`w3m-goto-url')$B!#(B
+
+`G'
+     $B%_%K%P%C%U%!$G(B URL $B$NF~NO$r$&$J$,$7$F!"$=$l$r?7$7$$%;%C%7%g%s$GI=<($7$^(B
+     $B$9!#$3$l$O$A$g$&$I(B `g' (<M-x w3m-goto-url>) $B$N$h$&$KF0:n$7$^(B
+     $B$9$,!"?7$7$$%;%C%7%g%s$r3+$/$H$3$m$,0c$$$^$9!#J8;zC<Kv$G(B emacs-w3m $B$r;H$C(B
+     $B$F$$$k$N$G$J$$8B$j!"?7$7$$%;%C%7%g%s$r3+$/$H$$$&$3$H$O!"$=$N%Z!<%8$r?7$7(B
+     $B$$%?%V$GI=<($9$k$3$H$r0UL#$7$^$9!#%?%V$K$D$$$F$N$b$C$H>\$7$$$3$H$O!"(B
+     *Note Using Tabs:: $B$r;2>H$7$F$/$@$5$$(B (`w3m-goto-url-new-session')$B!#(B
+
+`c' (Lynx-like $A%-$B!<$A%^%C%W(B)
+`y' (Info-like $A%-$B!<$A%^%C%W(B)
+     $BI=<($7$F$$$k%Z!<%8$N(B URL $B$r%(%3!<%(%j%"$KI=<($9$k$H$H$b$K!"(B
+     `kill-ring' $B$K(B URL $B$rA^F~$7$^$9(B (`w3m-print-current-url')$B!#(B
+
+`u' (Lynx-like $A%-$B!<$A%^%C%W(B)
+`Y' (Info-like $A%-$B!<$A%^%C%W(B)
+     $B8=:_0LCV$N%j%s%/$,;X$7<($9BP>]$N(B URL $B$r%(%3!<%(%j%"$KI=<($9$k$H$H$b$K!"(B
+     `kill-ring' $B$K(B URL $B$rA^F~$7$^$9(B (`w3m-print-this-url')$B!#(B
+
+$B$5$F!"$"$J$?$,FI$s$G$$$k%Z!<%8$,:#F|$N;~;v%K%e!<%9$+$@$l$+$NF|5-$@$C$?(B
+$B$i!"$=$l$r<h$j9~$s$@8e$G?7$7$$FbMF$GCV$-49$($i$l$F$$$k$+$b$7$l$^$;$s!#(B
+$B<!$N%3%^%s%I$r;H$&$H!"F1$8%Z!<%8$N:G?7$NFbMF$K99?7$9$k$3$H$,$G$-$^$9!#(B
+($B$3$N%3%^%s%I$O!"%Z!<%8$,2u$l$F$$$k$h$&$K8+$($k>l9g$K!"A42hLL$N:FIA2h$r(B
+$B6/@)$5$;$k$?$a$K$bLrN)$F$k$3$H$,$G$-$^$9!#(B)
+
+`R'
+`C-S-l' (Info-like $A%-$B!<$A%^%C%W$N$_(B)
+     $B%Z!<%8$rFI$_9~$_D>$7$^$9(B (`w3m-reload-this-page')$B!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Moving in a page, Next: Moving over pages, Prev: Launching and Jumping, Up: Browsing Web Pages
+
+$A%Z$B!<$A%8DZ$r$(GSy$A$S$^$o$k(B
+--------------------
+
+Emacs $B$G0\F0MQ$K3d$jEv$F$i$l$F$$$kFk@w$_?<$$%-!<$,%&%'%V%Z!<%8$N1\MwCf(B
+$B$K;H$($k$3$H$O!"$*$=$i$/$9$G$K$"$J$?$rL%N;$7$F$$$k$G$7$g$&!#?.$8$F$b$i(B
+$B$($J$$$+$b$7$l$^$;$s$,!"$b$C$H$"$k$N$G$9(B!  $B;d$?$A$O$"$J$?$N;~4V$rBg@Z$K(B
+$B$7$?$$$N$G!"%]%$%s%H$N0\F0!"%Z!<%8$N%9%/%m!<%k!"$"$k$$$O$H$F$bB.$$$d$j(B
+$BJ}$G%j%s%/$r8+$D$1$k$?$a$N%-!<$rDI2C$7$^$7$?!#$=$l$i$r%^%9%?!<$9$l$P!"(B
+$B$=$l$i$,$I$s$J$KJXMx$+$rJ,$+$C$F$b$i$($k$G$7$g$&!#(B
+
+Emacs $B$NI8=`%-!<%P%$%s%I$KHf$Y$F(B `w3m-mode' $B$G$O!"$h$jC;$$%-!<%9%H%m!<(B
+$B%/$G%9%/%m!<%k%3%^%s%I72$r8F$S=P$;$k$h$&$K%-!<$,3d$jEv$F$i$l$F$$$^$9!#(B
+$B%&%'%V%Z!<%8Fb$G%F%-%9%H$rF~NO$G$-$k8D=j$O$+$J$jFCJL$J$N$G(B (*Note
+Submitting Forms::)$B!"$?$$$F$$$N%-!<$OFCJL$J0UL#$r;}$C$F$$$F!"$=$3$G$O(B
+`self-insert-command' $B$K3d$jEv$F$i$l$F$$$^$;$s!#(B
+
+`<SPC>'
+     $B2<$K8~$+$C$F%9%/%m!<%k$7$^$9!#(B`more' $B$d(B `less' $B%3%^%s%I!"$"$k$$$O(B
+     Emacs $B$N(B `view-mode' $B$r;H$C$?$3$H$,$"$l$P!"3P$($k$^$G$b$J$$%-!<$G(B
+     $B$9$h$M(B (`w3m-scroll-up-or-next-url')$B!#(B
+
+`<DEL>'
+`b'
+`<backspace>'
+`S-<SPC>'
+`C-?'
+     $B>e$K8~$+$C$F%9%/%m!<%k$7$^$9!#(B`less' $B%3%^%s%I$d(B Emacs $B$N(B
+     `view-mode' $B$KFk$l?F$7$s$G$$$k$"$J$?$N<j$O!"<+A3$K$3$N%-!<$rC!$/$G(B
+     $B$7$g$&(B (`w3m-scroll-down-or-previous-url')$B!#(B
+
+`>'
+     $B:8$K%9%/%m!<%k$7$^$9!#%9%/%m!<%k$NNL$O(B
+     `w3m-horizontal-scroll-columns' $B$GM?$(!"%G%U%)%k%HCM$O(B 10 $B$G$9(B
+     (`w3m-scroll-left')$B!#(B
+
+`<'
+     $B1&$K%9%/%m!<%k$7$^$9!#%9%/%m!<%k$NNL$O(B
+     `w3m-horizontal-scroll-columns' $B$GM?$(!"%G%U%)%k%HCM$O(B 10 $B$G$9(B
+     (`w3m-scroll-right')$B!#(B
+
+`.' (Lynx-like $A%-$B!<$A%^%C%W(B)
+`S-<left>' (Info-like $A%-$B!<$A%^%C%W(B)
+     $B:8$K%7%U%H$7$^$9(B ($B>.9o$_$J?eJ?%9%/%m!<%k(B)$B!#%7%U%H$NNL$O(B
+     `w3m-horizontal-shift-columns' $B$GM?$(!"%G%U%)%k%HCM$O(B 2 $B$G$9(B
+     (`w3m-shift-left')$B!#(B
+
+`,' (Lynx-like $A%-$B!<$A%^%C%W(B)
+`S-<right>' (Info-like $A%-$B!<$A%^%C%W(B)
+     $B1&$K%7%U%H$7$^$9(B ($B>.9o$_$K?eJ?%9%/%m!<%k$G$9(B)$B!#%7%U%H$NNL$O(B
+     `w3m-horizontal-shift-columns' $B$GM?$(!"%G%U%)%k%HCM$O(B 2 $B$G$9(B
+     (`w3m-shift-right')$B!#(B
+
+`M-l'
+     $B8=:_%]%$%s%H$,$"$k0LCV$N%F%-%9%H$,!"?eJ?J}8~$K4X$7$FCf?4$K$J$k$h$&(B
+     $B$K%9%/%m!<%k$7$^$9(B (`w3m-horizontal-recenter')$B!#(B
+
+`w3m-mode' $B%a%8%c!<%b!<%I$G$O!"$$$m$$$m$J<oN`$N0\F0%3%^%s%I$,Dj5A$5$l$F(B
+$B$$$^$9!#$9$J$o$A!"%j%s%/!"%U%)!<%`!"$=$l$K2hA|(B ($B$=$l$,I=<($5$l$F$$$F$b(B
+$B$$$J$/$F$b(B) $B$G$9!#(B
+
+$B4JC1$JNc$r5s$2$F$_$^$9!#9-$/CN$i$l$F$$$k(B Google $B8!:w%(%s%8%s$GC18l$rD4(B
+$B$Y$?$$$N$@$H$7$^$7$g$&!#%9%F%C%W#1(B: emacs-w3m $B$G(B
+`http://www.google.com' $B$r3+$-$^$9!#%9%F%C%W#2(B: $B$$$C$?$s%Z!<%8$,FI$_9~(B
+$B$^$l$?$i(B `]' $B$rC!$$$F$/$@$5$$!#$0$o$7$C(B! (1) (*Note Moving in a
+page-Footnotes::) $B%]%$%s%H$,%Z!<%8$N:G=i$NF~NO%U%)!<%`$K0\F0$7$^$7$?$M!#(B
+$B:#$d(B `<RET>' $B$rC!$$$F$=$3$K2?$+$rF~NO$7$F!"(B`C-c C-c' $B$GAw$k(B
+$B$3$H$,$G$-$^$9!#$3$N%3%^%s%IL5$7$G$O!"$=$N%Z!<%8$K(B `C-n' $B$d(B
+`C-f' $B$J$I$rBG$A9~$s$G0\F0$7$J$1$l$P$J$i$J$/$F!"$^$C$?$/9|@^$j$J$3(B
+$B$H$@$C$?$G$7$g$&!#(B
+
+`<TAB>'
+`<down>' (Lynx-like $A%-$B!<$A%^%C%W$N$_(B)
+     $B<!$N%j%s%/(B (emacs-w3m $B$NMQ8l$G$O(B "$B%"%s%+!<(B") $B$X%]%$%s%H$r0\F0$7$^(B
+     $B$9!#$h$j87L)$K$O!"=gJ}8~$G:G$b6a$$%"%s%+!<$X0\F0$7$^$9!#(B
+
+`M-<TAB>'
+`S-<TAB>'
+`<backtab>'
+`<up>' (Lynx-like $A%-$B!<$A%^%C%W$N$_(B)
+     $BA0$N%"%s%+!<$X%]%$%s%H$r0\F0$7$^$9!#$h$j87L)$K$O!"5UJ}8~$G:G$b6a$$(B
+     $B%"%s%+!<$X0\F0$7$^$9(B (`w3m-previous-anchor')$B!#(B
+
+`]'
+     $B<!$N%U%)!<%`$X%]%$%s%H$r0\F0$7$^$9!#$h$j87L)$K$O!"=gJ}8~$G:G$b6a$$(B
+     $B%U%)!<%`$X0\F0$7$^$9(B (`w3m-next-form')$B!#(B
+
+`['
+     $BA0$N%U%)!<%`$X%]%$%s%H$r0\F0$7$^$9!#$h$j87L)$K$O!"5UJ}8~$G:G$b6a$$(B
+     $B%U%)!<%`$X0\F0$7$^$9(B (`w3m-previous-form')$B!#(B
+
+`}'
+     $B<!$N2hA|$X%]%$%s%H$r0\F0$7$^$9!#$h$j87L)$K$O!"=gJ}8~$G:G$b6a$$2hA|(B
+     $B$X0\F0$7$^$9(B (`w3m-next-image')$B!#(B
+
+`{'
+     $BA0$N2hA|$X%]%$%s%H$r0\F0$7$^$9!#$h$j87L)$K$O!"5UJ}8~$G:G$b6a$$2hA|(B
+     $B$X0\F0$7$^$9(B (`w3m-previous-image')$B!#(B
+
+
+File: emacs-w3m-ja.info  Node: Moving in a page-Footnotes, Up: Moving in a page
+
+(1) $AFUM($=$s$JRt$O$7$J$$$1$l$I$M!#S"$(Gk#$A0f$N(B Tadaa! $A$OB~;-$J$I$GJ9$o$l$k(B
+$(Gsi$ARt$G!"$=$NW4$(GNS$A$K$(I%w$A$8$F$$$m$$$m$K$BLu$A$5$l$^$9!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Moving over pages, Next: Browsing With Mouse Operations, Prev: Moving in a page, Up: Browsing Web Pages
+
+$A%Z$B!<$A%8$(Gbf$A$r6I$j$(I)V$A$/(B
+------------------
+
+$B$3$N9`$G$O%Z!<%8$+$i%Z!<%8$K0\F0$9$k$d$jJ}$r@bL@$7$^$9!#%j%s%/$r$?$I$C(B
+$B$?$j(B URL $B$rF~NO$9$kJ}K!$O$3$3$K$O$"$j$^$;$s(B ($B$=$l$iFs$D$NJ}K!$O(B *Note
+Launching and Jumping:: $B$G@bL@$5$l$F$$$^$9(B)$B!#(B
+
+$B$3$3$K$O!"0JA0$KK,Ld$7$?%Z!<%8$NMzNr$r8e$m$K!"$*$h$SA0$K0\F0$9$k(B ($BB>$N(B
+$B%V%i%&%6$G$O!VLa$k!W!V?J$`!W$H$7$F$*$J$8$_$N(B) $B%3%^%s%I$H!"2>$K$b%V%i%&(B
+$B%6$?$k$b$N$,5AL3$H$7$FDs6!$9$Y$-!V%[!<%`%Z!<%8$X0\F0$9$k!W5!G=$,$"$j$^(B
+$B$9!#$"$i$+$8$a(B *Note Tracing History:: $B$N9`$rFI$s$G$*$$$?J}$,!"$?$V$sM}(B
+$B2r$7$d$9$$$G$7$g$&!#(B
+
+`B' (Lynx-like $A%-$B!<$A%^%C%W(B)
+`<left>' (Lynx-like $A%-$B!<$A%^%C%W(B)
+`l' (Info-like $A%-$B!<$A%^%C%W(B)
+`p' (Info-like $A%-$B!<$A%^%C%W(B)
+     $B0JA0$KK,Ld$7$?%Z!<%8$NMzNr$r#1%Z!<%8La$j$^$9(B
+     (`w3m-view-previous-page')$B!#?t$N0z?t(B N $B$,M?$($i$l$k$H(B N $B%Z!<%8La$j(B
+     $B$^$9!#$3$l$O2a5n$KLa$k$?$a$N$*4+$a$NJ}K!$G$9!#(B
+
+`N' (Lynx-like $A%-$B!<$A%^%C%W(B)
+`n' (Info-like $A%-$B!<$A%^%C%W(B)
+     $B0JA0$KK,Ld$7$?%Z!<%8$NMzNr$r#1%Z!<%8?J$_$^$9(B
+     (`w3m-view-next-page')$B!#$b$A$m$s(B `B' (`Info-like' $B%-!<%^%C%W$N>l9g(B
+     $B$O(B `l') $B$GMzNr$rLa$C$?8e$G$J$1$l$PF/$-$^$;$s!#?t$N0z?t(B N $B$,M?$($i(B
+     $B$l$k$H(B N $B%Z!<%8?J$_$^$9!#$3$N%3%^%s%I$O!"$^$5$K(B back to the
+     future $B$r<B8=$7$^$9(B!
+
+`H'
+     $B%[!<%`%Z!<%8$X0\F0$7$^$9(B (`w3m-gohome')$B!#%[!<%`%Z!<%8$N(B URL $B$O(B
+     `w3m-home-page' $B$H$$$&JQ?t$G;XDj$7$^$9(B (*Note Customizable
+     Variables::)$B!#(B`w3m-home-page' $B$N%G%U%)%k%H$NCM$O(B "about:" $B$G$9!#(B
+
+$B0J2<$N%3%^%s%I$O!"B>$K$OL5$$(B emacs-w3m $B$NFCD9$G$9!#;d$?$A$O$=$l$i$NFC5v(B
+$B$rF@$k$3$H$,$G$-$^$7$?!#=>$C$F!"B>$N$$$+$J$k>l=j$G$b8+$D$+$i$J$$$G$7$g(B
+$B$&!#$=$N$?$a!":#F|$=$l$i$r;H$&$3$H$r3X$P$J$1$l$P$J$j$^$;$s(B! ($B??$K<u$1$J(B
+$B$$$G$/$@$5$$$M!#$?$@$N>iCL$G$9$+$i!#(B)
+
+`^'
+`u' (Info-like $A%-$B!<$A%^%C%W$N$_(B)
+     $B8=:_I=<($5$l$F$$$k%Z!<%8$N?F%G%#%l%/%H%j$X$N0\F0$r;n$_$^$9!#Nc$($P!"(B
+     http://foo/bar/baz" $B$,I=<($5$l$F$$$k>l9g$O(B "http://foo/bar/" $B$K0\(B
+     $BF0$7$h$&$H$7$^$9!#$3$N5!G=$O<!$N4Q;!$K4p$E$$$F<BAu$5$l$^$7$?(B: $B%&%'(B
+     $B%V%V%i%&%6$N%f!<%6$O!"$7$P$7$P0lCJ3,>e$N%G%#%l%/%H%j$K0\F0$7$J$1$l(B
+     $B$P$J$j$^$;$s!#H`$i$,A\$7$F$$$k>pJs$,!"8=:_$N%Z!<%8$KI=<($5$l$J$$$+(B
+     $B$i(B ($B$=$l$,:o=|$5$l$?$N$G!"$"$k$$$O8!:w%(%s%8%s$,4V0c$C$F$$$k%Z!<%8(B
+     $B$KO"$l$F9T$C$?$?$a(B) $B$G$9!#(B
+
+     $BB>$N%&%'%V%V%i%&%6$r;H$&>l9g!"0lHL$K$O!"(BURL $B$+$i(B `<DEL>' $B%-!<Ey$r(B
+     $BJ#?t2s;H$C$F!"<j:n6H$GKvHx$N%3%s%]!<%M%s%H$r:o=|$9$k<j4V$,I,MW$G$9!#(B
+     Emacs-w3m $B$G$O!"$3$NA`:n$r(B `^' $B$N$?$C$?0l2!$7(B! $B$G9T$J$&$3$H$,$G$-(B
+     $B$^$9!#(B
+
+     $B$^$?!"(B"2 ^" $B$H?t;z$rIU$1$F%3%^%s%I$r<B9T$9$k$H!"$=$N?t;z$NJ,$@$1?F(B
+     $B$N%G%#%l%/%H%j$K0\F0$7$^$9!#(B"0 ^" $B$H(B "0" $B$rIU$1$F<B9T$9$k$H$=$N%5(B
+     $B%$%H$N:G>e0L$^$G0\F0$7$^$9!#(B
+
+`<SPC>'
+     $B8=:_$N%]%$%s%H0LCV$,%P%C%U%!$NKvHxIU6a$K$"$j!"2<J}8~$K%9%/%m!<%k$G(B
+     $B$-$J$$>l9g$K(B `<SPC>' $B$r2!$9$H!V<!!W$N%Z!<%8$X0\F0$7$^$9(B
+     (`w3m-scroll-up-or-next-url')$B!#$3$3$G!V<!$N%Z!<%8!W$H$O!"8=:_FI$s(B
+     $B$G$$$k%Z!<%8$N%X%C%@Fb$NFCJL$J(B "next" $B%U%#!<%k%I$,;X$7<($7$F$$$k%Z!<(B
+     $B%8$N$3$H$G$9!#$3$N5!G=$OK,Ld$7$?%Z!<%8$NMzNr$H$O4X78$"$j$^$;$s!#(B
+
+     $B0lEY$K5pBg$J%3%s%F%s%D$rE>Aw$9$k$N$rBT$D$3$H$,!"%f!<%6$K$H$C$F2wE,(B
+     $B$G$O$J$$$J$I$NM}M3$G!"$$$/$D$+$N%&%'%V%5%$%H$,$=$l$i$N%3%s%F%s%D$r(B
+     $B>.$5$JJ#?t$N%Z!<%8$KJ,3d$7$F$$$k$3$H$K!"$*$=$i$/5$IU$$$F$$$k$G$7$g(B
+     $B$&!#Nc$($P!"8!:w%(%s%8%s$N8!:w7k2L$O!"$7$P$7$P$=$N$h$&$K8=$o$l$^$9!#(B
+     $B$=$s$J%5%$%H$G$O!"%f!<%6$O$9$Y$F$N>pJs$K%"%/%;%9$9$k$?$a$K!"$7$P$7(B
+     $B$P0l$D$N%Z!<%8$+$i<!$N%Z!<%8$K!"<jF0$G%j%s%/$r$?$I$i$J$1$l$P$J$j$^(B
+     $B$;$s!#(B
+
+     Emacs-w3m $B$O!"2DG=$G$"$l$P$3$N%j%s%/$rL@<(E*$K$?$I$kA`:n$r%9%/%m!<(B
+     $B%kA`:n$HE}9g$7$F!"J#?t$N%Z!<%8$KJ,3d$5$l$FDs6!$5$l$k%3%s%F%s%D$r!"(B
+     $B$G$-$l$P0lKg$N%&%'%V%Z!<%8$H$7$F1\Mw$G$-$k$h$&;n$_$^$9!#(B
+
+     $B$=$l$O$3$&$7$FF/$-$^$9(B: $B$=$N$h$&$J%&%'%V%5%$%H$G$O!"J,3d$7$?%&%'%V(B
+     $B%Z!<%84V$N$D$J$,$j$r%Z!<%8$N%X%C%@Fb$N(B "next"$B!"(B"prev" $B$"$k$$$O(B
+     previous" $B%U%#!<%k%I$K5-:\$7$F$"$k>l9g$,$"$j$^$9!#(BEmacs-w3m $B$O2?$r(B
+     $B$?$I$k$+$rCN$k$?$a$K!"$3$N%U%#!<%k%I$rMxMQ$7$F$$$^$9!#(B
+
+     $BFs$D$NA`:n(B ($B%j%s%/$r$?$I$k(B + $B%9%/%m!<%k(B) $B$,(B Emacs-w3m $B>e$G$I$N$h$&(B
+     $B$KE}9g$5$l$F$$$k$N$+$r!":F$S(B Google $B$rNc$K@bL@$7$^$7$g$&!#(B
+     `http://www.google.com' $B$r3+$-!"$"$kC18l$r8!:w$7$^$9!#$b$7!"$"$^$j(B
+     $B$K$b$"$j$U$l$?C18l(B ($BNc$($P!V5mP'!W(B) $B$r8!:w$9$k$H!"BgNL$N8!:w7k2L$r(B
+     $BF@$k$3$H$K$J$k$G$7$g$&!#(BGoogle $B$O!"$=$N4p=`$r;H$C$F%=!<%H$7$?8!:w(B
+     $B7k2L$rJ#?t$N%&%'%V%Z!<%8$KJ,3d$7$?>e$G!"$^$::G=i$N%Z!<%8$rJV$7$^$9!#(B
+     `<SPC>' $B$r;H$C$F:G=i$N%Z!<%8$r%9%/%m!<%k$5$;$J$,$iD/$a$F$/$@$5$$!#(B
+     $B$=$7$F!"$=$N%Z!<%8$N:G8e$,$=$N%&%#%s%I%&$G8+$($k$^$G!"%9%/%m!<%k$7(B
+     $BB3$1$F$/$@$5$$!#$=$3$G$O!"$"$J$?$r$S$C$/$j$5$;$k$7$+$1$,BT$C$F$$$^(B
+     $B$9!#(BEmacs-w3m $B0J30$N%V%i%&%6$r;H$C$F;D$j$N8!:w7k2L$r8+$?$$$H;W$C$?(B
+     $B$J$i$P!"(B
+
+          Gooooooogle
+
+     $B$N2<$K$J$i$V?t;z$N$I$l$+(B
+
+          1 2 3 4 5 6 7 8...
+
+     $B$r%/%j%C%/$9$kI,MW$,$"$j$^$9!#$7$+$7(B emacs-w3m $B$J$i$P!"C1$K(B
+     `<SPC>' $B$r2!$9$H$$$&%9%/%m!<%k$HF1$8A`:n$G!"%j%s%/$r$?$I$k$3$H$,$G(B
+     $B$-$k$N$G$9!#(B
+
+`<DEL>'
+`b'
+`<backspace>'
+`S-<SPC>'
+`C-?'
+     $B%]%$%s%H0LCV$,%P%C%U%!$N@hF,IU6a$K$"$j!">eJ}8~$K%9%/%m!<%k$G$-$J$$(B
+     $B>l9g$K(B `<DEL>' $B$r2!$9$H!"!VA0!W$N%Z!<%8$X0\F0$7$^$9(B
+     (`w3m-scroll-down-or-previous-url')$B!#$3$3$G!VA0!W$N%Z!<%8$H$O!"8=(B
+     $B:_I=<($5$l$F$$$k%Z!<%8$N%X%C%@Fb$N(B "prev" $B$"$k$$$O(B "previous" $B%U%#!<(B
+     $B%k%I$K;XDj$5$l$F$$$k%Z!<%8$N$3$H$G$9!#$3$N5!G=$OK,Ld$7$?%Z!<%8$NMz(B
+     $BNr$H$O4X78$"$j$^$;$s!#(B`<SPC>' (`w3m-scroll-up-or-next-url') $B$HF1MM!"(B
+     $B$?$@$75U$NF0$-$K$J$j$^$9!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Browsing With Mouse Operations, Next: Going back to daily hacking and/or daily writing, Prev: Moving over pages, Up: Browsing Web Pages
+
+$A%^%&%9$rJ9$C$F%5$B!<$A%U%#%s(B
+------------------------
+
+Emacs-w3m $B$N3+H/<TC#$O!"(BEmacs $B%.!<%/(B (1) (*Note Browsing With Mouse
+Operations-Footnotes::) $B$G$J$$IaDL$N?M$K$b(B emacs-w3m $B$r;H$C$F$b$i$($k$h(B
+$B$&$K!">/$79|$r@^$j$^$7$?!#Nc$($P(B URL $B$d%U%)!<%`$N%F%-%9%H$NF~NO$r=|$/$[(B
+$B$H$s$I$N%&%'%V%V%i%&%:A`:n$r!"%^%&%9$@$1$G9T$J$&$3$H$,$G$-$^$9!#$=$l$G(B
+$B$b$J$*=$>~%-!<$H$7$F%7%U%H%-!<$,I,MW$K$J$k>l9g$,$"$k$3$H$KCm0U$7$F$/$@(B
+$B$5$$!#(BEmacs-w3m $B$N3+H/<T$,$_$s$J(B Emacs $B%.!<%/$J$N$G(B...
+
+$B%&%'%V1\Mw$N:G=i$N4pK\$H$J$k!V%j%s%/$r$?$I$kA`:n!W$K$O(B `mouse-2' $B$r;H$C(B
+$B$F$/$@$5$$!#(BEmacs 22.1 $B0J>e$G$O!"(B`mouse-1' $B$G$b(B
+`mouse-1-click-follows-link' $B$NCM$K1~$8$?!"%j%s%/$r$?$I$kA`:n$r9T$J$&$3(B
+$B$H$,$G$-$^$9!#(B
+
+`mouse-2'
+     $B%^%&%9%+!<%=%k$N2<$K$"$k%j%s%/$r$?$I$j$^$9(B
+     (`w3m-mouse-view-this-url')$B!#(B
+
+`S-<mouse-2>'
+     $B?7$7$$%;%C%7%g%s(B (*Note Tracing History::) $B$N$b$H$G%^%&%9%+!<%=%k(B
+     $B$N2<$K$"$k%j%s%/$r$?$I$j$^$9(B
+     (`w3m-mouse-view-this-url-new-session')$B!#(B
+
+Emacs-w3m $B$N%9%/%m!<%k%P!<!"%a%K%e!<5Z$S%D!<%k%P!<$O!"%^%&%9$r;H$&>l9g(B
+$B$KLrN)$A$^$9!#$?$@$7(B Emacs $B$,$=$l$i$r%5%]!<%H$7$F$$$k$3$H$,I,MW$G!"$+$D(B
+$B$=$l$i$rM-8z$K$7$F$$$J$1$l$P$J$j$^$;$s!#8@$&$^$G$b$J$$$G$9$,!"%9%/%m!<(B
+$B%k%P!<$rF0$+$7$FI=<($r%9%/%m!<%k$5$;$k$3$H$,$G$-$^$9!#(BEmacs $B%U%l!<%`$N(B
+$B0lHV>e$K$"$k!V(Bw3m$B!W%a%K%e!<$+$i!"$3$N(B info $B%I%-%e%a%s%H$G>R2p$7$F$$$k(B
+emacs-w3m $B$NMM!9$J5!G=$r8F$S=P$9$3$H$,$G$-$^$9!#<gMW$J5!G=$K$D$$$F$O%a(B
+$B%K%e!<%"%$%F%`$rA*$V$^$G$b$J$$$3$H$KCm0U$7$F$/$@$5$$!#Be$o$j$K%D!<%k(B
+$B%P!<!&%"%$%3%s$r;H$&$3$H$,$G$-$^$9!#(B
+
+$B%?%V(B (*Note Using Tabs::) $B$r;H$C$F(B emacs-w3m $B$N%P%C%U%!$r@Z$jBX$($k$K$O!"(B
+$B%&%#%s%I%&$N$F$C$Z$s$N9T$r(B `mouse-2' $B$GD>@\%/%j%C%/$9$k$+!"$^$?$O!V(Bw3m$B!W(B
+$B%a%K%e!<$N0l$D$*$$$FNY$K$"$k!V(BTab$B!W%a%K%e!<$+$i0l$D$rA*$s$G$/$@$5$$!#(B
+
+
+File: emacs-w3m-ja.info  Node: Browsing With Mouse Operations-Footnotes, Up: Browsing With Mouse Operations
+
+(1) $AS"$(Gk#$A0f$N(B Info $A$G$O(B Emacs otaku
+
+
+
+File: emacs-w3m-ja.info, Node: Going back to daily hacking and/or daily writing, Prev: Browsing With Mouse Operations, Up: Browsing Web Pages
+
+$AFU6N$NIz;n$K$(I&($A$k$K$O(B
+--------------------
+
+$B;W$$=P$7$F$/$@$5$$!#$*$=$i$/$"$J$?$O%&%'%V$r8+$k$?$a$K(B Emacs $B$r;O$a$?$N(B
+$B$G$O$"$j$^$;$s!#%(%G%#%?$NFbB"%$%s%?!<%W%j%?$r(B scheme $B$KCV$-49$($?$j!"(B
+$B%=%U%H%&%'%"$N(B info $B%I%-%e%a%s%H$r:n@.$7$?$j!"%=%U%H%&%'%"$NFC5v$KBP$9(B
+$B$k<+J,$N9M$($r0u:~$7$?$j(B...$B$9$k$?$a$@$C$?$N$G$O$"$j$^$;$s$+(B?  Emacs $B$r(B
+$B;H$C$F$$$?4V$K!";E;v$N$?$a$K%&%'%V$r8+$kI,MW$KGw$i$l!"$7$+$7$?$^$?$^(B
+Emacs $B$+$iN%$l$:$K%&%'%V$r8+$k$3$H$,$G$-$F$7$^$C$?$N$G$9!#(B
+
+$B$5$!!"K\Mh$N:n6H$KLa$k;~$,Mh$^$7$?!#$"$J$?$,$,$s$P$i$J$$$H@$3&$OJQ$j$^(B
+$B$;$s(B!  $B$9$0$K$^$?%&%'%V$r1\Mw$9$kI,MW$,$"$k$+$b$7$l$J$$$J$i(B `q' $B$r!"$7(B
+$B$P$i$/(B emacs-w3m $B$KLa$C$F$/$k$D$b$j$,$J$$$J$i(B `Q' $B$r;H$C$F$/$@$5$$!#(B
+
+`q'
+     Emacs-w3m $B$N%&%#%s%I%&$HJD$8$F!"B>$N%P%C%U%!$rA*Br$7$^$9(B
+     (`w3m-close-window')$B!#(B
+
+`Q'
+     Arrived URLs ($B1\MwMzNr(B, *Note Tracing History:: $B;2>H(B) $B$N%j%9%H$H%/%C(B
+     $B%-!<(B (*Note Cookie Variables::) $B$r%G%#%9%/$KJ]B8$7$F!"K\Ev$K(B
+     emacs-w3m $B$r=*N;$7$^$9(B (`w3m-quit')$B!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Inline Images, Next: Tracing History, Prev: Browsing Web Pages, Up: Basic Usage
+
+$A;-Oq1mJ>$r(B ON/OFF $A$9$k(B
+======================
+
+$B$"$J$?$,;H$C$F$$$k%P!<%8%g%s$N(B Emacs $B$,%P%C%U%!$K2hA|$rI=<($9$k$3$H$,$G(B
+$B$-$k$J$i$P!"$"$?$+$b(B Mozilla $B$N$h$&$J!V%0%i%U%#%+%k!W%V%i%&%6$N$h$&$K!"(B
+emacs-w3m $B$O%&%'%V%Z!<%8$K$=$l$i$rI=<($9$k$3$H$,$G$-$^$9!#2<5-$N%3%^%s(B
+$B%I$N$I$l$+$r;H$*$&$H$9$kA0$K!"$"$J$?$N(B Emacs $B$,@5$7$/2hA|I=<($K;H$($k$3(B
+$B$H$r3N$+$a$F$/$@$5$$(B (*Note Required Emacs Version::)$B!#(B
+
+$B8=:_$N%P%C%U%!$K$*$1$k2hA|$NI=<($r@Z$jBX$($k$K$O(B `T' (`Info-like' $B%-!<(B
+$B%^%C%W$N>l9g$O(B `I') $B$r;H$C$F$/$@$5$$!#$=$l$K$h$C$F(B emacs-w3m $B$O%5!<%P$+(B
+$B$i2hA|$r<h$C$F$-$F!"$7$+$k8e$K$=$l$i$r!V%0%i%U%#%+%k!W%V%i%&%6$H$7$F$=(B
+$B$&$J$k$G$"$m$&%P%C%U%!$N0LCV$KI=<($7$^$9!#$b$&0lEY%-!<$rC!$/$H!"2hA|$O(B
+$B%P%C%U%!$+$i>C$(5n$j$^$9!#(B
+
+$B%G%U%)%k%H$G$O(B emacs-w3m $B$O2hA|$rI=<($7$^$;$s$,!"$=$N?6$kIq$$$rJQ99$7$F(B
+$B>o$K2hA|I=<($9$k$3$H$rA*$V$N$O2DG=$G!"$=$l$K$OJQ(B
+$B?t(B `w3m-default-display-inline-images' $B$r%+%9%?%^%$%:$7$F!"$=$NCM(B
+$B$r(B `nil' $B$+$i(B `t' $B$KJQ99$9$kI,MW$,$"$j$^$9!#(B
+*Note Customizable Variables::.
+
+$B$5$i$K(B emacs-w3m $B$K$O!"2hA|$N3HBg=L>.!"%U%!%$%k$X$N%;!<%V!"$^$?$O30It(B
+$B%S%e!<%o$G8+$k!"$H$$$C$?5$$NMx$$$?5!G=$,IUB0$7$F$$$^$9!#(B
+
+`T' (Lynx-like $A%-$B!<$A%^%C%W(B)
+`I' (Info-like $A%-$B!<$A%^%C%W(B)
+     $B8=:_$N%P%C%U%!$K$"$k$9$Y$F$N%$%s%i%$%s2hA|$NI=<($r%H%0%k$G@Z$jBX$((B
+     $B$^$9(B (`w3m-toggle-inline-images')$B!#(B`transient-mark-mode' $B$,(B on $B$G!"(B
+     $B$+$DNN0h$,@_Dj$5$l$F$$$k>l9g$K8B$C$F!"$=$NNN0hFb$K$"$k2hA|$@$1$,(B
+     on $B$K$J$j$^$9!#(B
+
+     $BCm(B1: $B=i$a$FK,$l$?%Z!<%8$G:G=i$+$i%$%s%i%$%s2hA|$rI=<($9$k$+$I$&$+(B
+     $B$O!"A0=R$NDL$jJQ?t(B `w3m-default-display-inline-images' $B$NCM$G@)8f(B
+     $B$5$l$^$9(B ($B%G%U%)%k%H$O(B off $B$G$9(B)$B!#$7$+$7!"$=$N%P%C%U%!$r5/E@$K$7$F(B
+     $BK,$l$k%P%C%U%!$G2hA|$rI=<($9$k$+$I$&$+$O!"(B
+     `w3m-toggle-inline-images-permanently' $B$,(B `nil' $B$G$O$J$$CM(B ($B%G%U%)(B
+     $B%k%H$O(B `t') $B$@$C$?>l9g$O!"$=$N%P%C%U%!$G2hA|$rI=<($7$F$$$?$+$I$&$+(B
+     $B$N:G8e$N>uBV$r7Q>5$7$^$9!#(B`w3m-toggle-inline-images-permanently'
+     $B$,(B `nil' $B$@$C$?$i!">o$K(B `w3m-default-display-inline-images' $B$,$=$l(B
+     $B$r@)8f$7$^$9!#(B
+
+     $BCm(B2: $B$3$N%3%^%s%I$ONN0h$rIT3h@-$K$7$^$9!#$7$?$,$C$F!":F$SFCDj$NNN(B
+     $B0h$K$"$k2hA|$@$1$rI=<($7$?$$$J$i$P!"$b$&0lEY$=$NNN0h$r@_Dj$7$J$1$l(B
+     $B$P$J$j$^$;$s!#(B
+
+`t' (Lynx-like $A%-$B!<$A%^%C%W(B)
+`i' (Info-like $A%-$B!<$A%^%C%W(B)
+     $B%+!<%=%k$N>l=j$K$"$kC10l$N2hA|$NI=<($r%H%0%k$G@Z$jBX$($^$9(B
+     (`w3m-toggle-inline-image')$B!#(B`transient-mark-mode' $B$,(B on $B$G!"$+$D(B
+     $BNN0h$,@_Dj$5$l$F$$$k>l9g$K8B$C$F!"$=$NNN0hFb$K$"$k2hA|$@$1$,(B on $B$K(B
+     $B$J$j$^$9!#(B`Info-like' $B%-!<%^%C%W$K$D$$$F$O!"$b$7(B Emacs $B$,2hA|I=<((B
+     $B$r%5%]!<%H$7$J$$$J$i$P!"$3$N%-!<$O30It%S%e!<%o$r5/F0$9$k%3%^%s%I(B
+     (`w3m-view-image') $B$K%P%$%s%I$5$l$^$9!#(B
+
+`M-S-t' (Lynx-like $A%-$B!<$A%^%C%W(B)
+`M-S-i' (Info-like $A%-$B!<$A%^%C%W(B)
+     $B8=:_$N%P%C%U%!$K$"$k$9$Y$F$N%$%s%i%$%s2hA|$NI=<($r<h$j;_$a$^$9!#(B
+     (`w3m-turnoff-inline-images')$B!#(B
+
+`I' (Lynx-like $A%-$B!<$A%^%C%W(B)
+     $B%]%$%s%H$N2<$K$"$k2hA|$r30It%S%e!<%o$G8+$^$9(B (`w3m-view-image')$B!#(B
+
+`M-i'
+     $B%]%$%s%H$N2<$K$"$k2hA|$r30It%U%!%$%k$K%;!<%V$7$^$9!#%G%U%)%k%H$NL>A0$O$=(B
+     $B$N2hA|$N85$NL>A0$G$9!#$=$l8N$K!"$[$H$s$I$N>l9g(B
+     $B$K(B `M-i <RET>' $B$O@5$7$$L>A0$G2hA|$r%;!<%V$9$k$G$7$g(B
+     $B$&(B (`w3m-save-image')$B!#(B
+
+`M-['
+     $B%]%$%s%H$N2<$K$"$k2hA|$r=L>.(B (zoom out) $B$7$^$9(B
+     (`w3m-zoom-out-image')$B!#(B
+
+`M-]'
+     $B%]%$%s%H$N2<$K$"$k2hA|$r3HBg(B (zoom in) $B$7$^$9(B
+     (`w3m-zoom-in-image')$B!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Tracing History, Next: Managing Bookmarks, Prev: Inline Images, Up: Basic Usage
+
+$(GUk$A?U$r$(IJ&$A$k(B
+==========
+
+Emacs-w3m $B$K$O!"0JA0$KK,Ld$7$?$9$Y$F$N%Z!<%8$N%j%9%H$rDs<($9$k$?$a$N!"(B
+2$B$D$NJ}K!$,$"$j$^$9!#Bh0l$NJ}K!$O!V(Bemacs-w3m $B$NMzNr!W(B(emacs-w3m
+history) $B$HC1=c$K8F$P$l$k$b$N$G!"$=$N%;%C%7%g%s(B ($BCm(B: $B$=$N%P%C%U%!Fb$G9T(B
+$B$J$&A`:n$H$=$l$KBP$9$kH?1~(B) $B$K$*$$$FK,Ld$7$?%Z!<%8$N%j%9%H$r3,AXE*$KDs(B
+$B<($7$^$9!#$9$J$o$A!"$"$k%j%s%/$r$?$I$k$H!"$=$l$^$G$N%Z!<%8$O9T$-@h$N(B
+$B!V?F!W$K$J$j$^$9!#$=$l$O!"K,$l$?%Z!<%8$N@W$r$?$I$C$?$j!"MzNr$,D9$/$J$C(B
+$B$F$7$^$C$?>l9g$K$I$3$+$iCe$?$+$r;W$$=P$9$?$a$K$O!"$?$$$X$sET9g$NNI$$$b(B
+$B$N$G$9!#(B
+
+$B$3$l$O!"(BGNU $B%W%m%8%'%/%H$N%[!<%`%Z!<%8$r$A$g$C$HK,$M$?8e$K$*$1$k!"$3$N(B
+$B5!G=$NF0:n$NNc$G$9(B:
+
+     GNU's Not Unix! - the GNU Project and the Free Software Foundation (FSF)
+       Philosophy of the GNU Project - Free Software Foundation (FSF)
+         GNU Emacs - GNU Project - Free Software Foundation (FSF)
+          Order from the Free Software Foundation (FSF)
+       Links to Other Free Software Sites - GNU Project - Free Software Fo...
+         EFF: Homepage
+
+($B<B:]$K$O!"$3$NNc$O(B 72 $B7e$K<}$^$k$h$&$K!">/$7$P$+$jJT=8$5$l$F$$$^$9!#8=(B
+$B<B$N(B emacs-w3m $B%P%C%U%!$G$O(B URLs $B$O@Z$j5M$a$i$l$^$;$s!#(B)
+
+$B$I$N(B emacs-w3m $B%P%C%U%!$+$i$G$b(B `s' $B%-!<(B (`Info-like' $B%-!<%^%C%W$N>l9g(B
+$B$O(B `o' $B%-!<(B) $B$r;H$&$3$H$K$h$C$F!"$3$N$h$&$JMzNr$rDs<($5$;$k$3$H$,2DG=$G(B
+$B$9!#(B
+
+$B$3$NMzNr$O%P%C%U%!!&%m!<%+%k!"$9$J$o$A!"$"$k(B emacs-w3m $B$N%P%C%U%!$K8GM-(B
+$B$N$b$N$G$"$k$3$H$KCm0U$7$F$/$@$5$$!#$G$b(B emacs-w3m $B$K$O%f%K!<%/$J5!G=$,(B
+$B$"$j$^$9(B: $B$"$J$?$,?7$7$$%Z!<%8$rK,Ld$9$k>l9g!"MzNr$O?7$7$$%P%C%U%!$K%3(B
+$B%T!<$5$l$^$9!#$=$N7k2L!"$=$l$^$G$KK,$l$?%Z!<%8$K:#$^$GDL$j%"%/%;%9$9$k(B
+$B$3$H$,$G$-$^$9!#$3$l$O!"(BMozilla $B$J$I$N!"?7$7$$%P%C%U%!$G$OMzNr$,>o$K%<(B
+$B%m$+$i%9%?!<%H$9$k%V%i%&%6$H$O0[$J$j$^$9!#(B
+
+Emacs-w3m $B$OC1$K$"$J$?$,K,$l$?%Z!<%8$r5-O?$9$k$@$1$G$J$/!"$"$J$?$,%Z!<%8(B
+$B$N@53N$JF1$8>l=j$XLa$j$?$$>l9g$K!"$=$l$i$N%Z!<%8$NCf$NFCDj$N0LCV$r5-O?$9(B
+$B$k$3$H$b$G$-$^$9!#(B`C-c C-@' $B$r2!$9$H!"%+!<%=%k$N0LCV$,MzNr$KEP(B
+$BO?$5$l$^$9!#0JA0$K5-O?$7$?0LCV$X0\F0$9$k$K$O!"$=$N%Z!<%8$r3+$$(B
+$B$?(B emacs-w3m $B$N%P%C%U%!$G(B `C-c C-v' $B$r2!$7$F$/$@$5$$!#(B
+
+`s' (Lynx-like $A%-$B!<$A%^%C%W(B)
+`C-u s' (Lynx-like $A%-$B!<$A%^%C%W(B)
+`o' (Info-like $A%-$B!<$A%^%C%W(B)
+`C-u o' (Info-like $A%-$B!<$A%^%C%W(B)
+     $B$3$N%;%C%7%g%s$K$*$$$FK,Ld$7$?(B URLs $B$N%j%9%H$rI=<($7$^$9!#@\F,0z?t(B
+     $BIU$-$G8F$P$l$k$H(B ($B8e=R(B)$B!"Be$o$j$K(B arrived URLs $B$rI=<($7$^$9(B
+     (`w3m-history')$B!#(B
+
+`C-c C-@'
+`C-c C-<SPC>'
+     $B$=$N%Z!<%8$NCf$N%+!<%=%k$N0LCV$rMzNr$K5-O?$7$^$9!#(B
+
+`C-c C-v'
+     $B8=:_I=<($7$F$$$k%Z!<%8$K$*$$(B
+     $B$F!"(B`C-c C-@' (`w3m-history-store-position') $B$G5-21$7$?0L(B
+     $BCV$X0\F0$7$^$9!#(B
+
+$B$b$&0l$D$N2a5n$KK,$l$?%Z!<%8$K4X$9$k>pJs$r<j$KF~$l$kJ}K!$O!"!V(Barrived
+URLs$B!W$G$9!#$3$l$O$"$J$?$,(B emacs-w3m $B$GK,Ld$7$?!":G8e$N(B 500$B8D(B! $B$N(B URL
+$B$N%j%9%H$G$9!#%j%9%H$OF|IU=g$G!":G$b:G6a$N$b$N$r@hF,$K!"$=$l$>$l$N%Z!<(B
+$B%8$NK,Ld;~9o$,I=<($5$l$^$9!#$3$l$ONc$G$9(B (info $B$NI=<($,3H$,$j2a$.$J$$$h(B
+$B$&$KJT=8$5$l$F$$$^$9(B):
+
+     Order from the Free Software Foundation (FSF)             22:53:25
+     GNU Emacs - GNU Project - Free Software Foundation (FS    22:53:05
+     Philosophy of the GNU Project - Free Software Foundati... 22:52:46
+     Philosophy of the GNU Project - Free Software Foundati... 22:52:39
+     EFF: Homepage                                             22:52:18
+     Links to Other Free Software Sites - GNU Project - Fre... 22:52:07
+     Links to Other Free Software Sites - GNU Project - Fre... 22:52:07
+     GNU's Not Unix! - the GNU Project and the Free Softwar... 22:51:32
+     Bookmarks                                                 22:51:02
+     The DICT Development Group- upwards                       2003-01-08
+     the monkey puzzle: new debian packages as an rss feed     2003-01-08
+     new-debian-packages.rss                                   2003-01-07
+     it's a miracle                                            2003-01-06
+
+$BA0$N%3%^%s%I$K@\F,0z?t$rEO$9!"$9$J$o$A(B `C-u s'
+(`Info-like' $B%-!<%^%C%W$N>l9g$O(B `C-u o') $B$r;H$&$3$H$K$h$C$F!"(B
+$B$3$NMzNr$rF@$k$3$H$,$G$-$^$9!#$3$N%Z!<%8$KI=<($5$l$k(B URLs $B$N?t$O%+%9%?%^(B
+$B%$%:$G$-$^$9!#JQ?t(B `w3m-keep-arrived-urls' $B$r;2>H$7$F$/$@$5$$!#$=$l(B
+$B$O%G%U%)%k%H$G$O(B 500 $B$r1[$($k$3$H$O$G$-$^$;$s!#(B*Note Customizable Variables::.
+
+$B$b$A$m$s!"$9$Y$F$N>l9g$K!"Nc$K<($5$l$F$$$k$9$Y$F$N9T$O%j%s%/$G$9!#$=$N(B
+$B%j%s%/$r$?$I$k$3$H$K$h$C$F!"DL>o$N%Z!<%8$rK,Ld$7$F$$$?$i$A$g$&$I$=$&$J(B
+$B$k$h$&$K!"0JA0$KK,$M$?$I$N%Z!<%8$K$b9T$/$3$H$,$G$-$^$9!#(B
+
+*Note Moving over pages:: $B$N9`$b8+$F$/$@$5$$!#$=$3$G$O!VLa$k!W!V?J$`!W(B
+$B$J$I$N5!G=$K3d$jEv$F$i$l$?C1=c$J%-!<$G!"MzNr$NCf$r0\F0$9$k$d$jJ}$r@bL@(B
+$B$7$F$$$^$9!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Managing Bookmarks, Next: Using Tabs, Prev: Tracing History, Up: Basic Usage
+
+$A$\$/$N(B/$A$o$?$7$N$*$B5$$A$KHk$j(B
+=========================
+
+$B8=BeE*$J$"$^$?$N%V%i%&%6$NNc$KO3$l$:!"(Bemacs-w3m $B$K$O@h?J$N%V%C%/%^!<%/(B
+$B$N5!G=$,$"$j$^$9!#$=$l$K$h$C$F%+%F%4%j!<Kh$KJ,N`$7!"$=$l$i$rJT=8$7!"$"(B
+$B$"!"$b$A$m$s4JC1$K1\Mw$9$k$3$H$,$G$-$^$9!#(B
+
+$BF|K\8lHGCm<a(B: $B%V%C%/%^!<%/$N8l8;$O!"K\$K64$`[Y(B ($B$7$*$j(B) $B$N$3$H$G$9!#(B
+
+* Menu:
+
+* Adding Bookmarks::            $B$*5$$KF~$j$K(B URL $B$r2C$($k(B
+* Consulting Bookmarks::        $B%V%C%/%^!<%/$r1\Mw$9$k(B
+* Editing Bookmarks::           $B%V%C%/%^!<%/$rJQ99$9$k$K$O(B?
+
+
+
+File: emacs-w3m-ja.info, Node: Adding Bookmarks, Next: Consulting Bookmarks, Prev: Managing Bookmarks, Up: Managing Bookmarks
+
+$A$*$B5$$A$KHk$j$K(B URL $A$r<S$($k(B
+-------------------------
+
+$B%V%C%/%^!<%/$K(B URL $B$r2C$($k$K$O!"$$$/$D$+$N$d$jJ}$,$"$j$^$9!#:G=i$N0l$D(B
+$B$O!"(B`a' $B%-!<$r;H$C$F(B ($B$^$?$O(B `w3m-bookmark-add-current-url' $B%3%^%s%I$r(B
+$B8F$s$G(B) $B:#8=:_1\Mw$7$F$$$k%Z!<%8$r2C$($k$3$H$G$9!#$9$k$H!"$=$N%V%C%/%^!<(B
+$B%/$r$I$N9`L\$KF~$l$k$+$r?R$M$i$l(B (`<TAB>' $B%-!<$K$h$kJd40$,8z$-$^$9(B)$B!"%?(B
+$B%$%H%k$N=q$-49$($,B%$5$l$^$9(B ($B%G%U%)%k%H$O!"$=$N%Z!<%8$N%?%$%H%k$K$J$C(B
+$B$F$$$^$9(B)$B!#$3$l$i$NFs$D$r$3$J$7$?$i!"$=$l$i$rM-8z$K$9$k$?$a$K(B `<RET>'
+$B$rC!$$$F$/$@$5$$!#$9$k$H(B "Added" $B$H$$$&%a%C%;!<%8$,%_%K%P%C%U%!$K8=$l$F!"(B
+($B6C$/$J$+$l(B!) $B$=$N%Z!<%8$,%V%C%/%^!<%/$K5-O?$5$l$^$9!#(B
+
+$B%V%C%/%^!<%/$r2C$($k$b$&0l$D$NJ}K!$O!"(B`M-a' $B$r;H$&(B ($B$^$?$O(B
+`w3m-bookmark-add-this-url' $B%3%^%s%I$r8F$V(B) $B$3$H$G$9!#$3$l$O!"8=:_0LCV(B
+$B$N(B URL ($B$b$7$=$N%j%s%/$r$?$I$k$H!"1\Mw$9$k$3$H$,$G$-$k(B URL) $B$r%V%C%/%^!<(B
+$B%/$K2C$($^$9!#$=$N>l9g$G$b:G=i$K@bL@$7$?J}K!$HF1MM$K!"9`L\$NL>A0$H%?%$(B
+$B%H%k$rF~NO$7$J$1$l$P$J$j$^$;$s!#$=$N$H$-!"$=$l$i$N%G%U%)%k%H$O%j%s%/<+(B
+$BBN$NL>A0$K$J$C$F$$$^$9!#(B
+
+$B:G8e$K!";0HVL\$NJ}K!$O(B `C-u a' $B$rC!$/$3$H$G$9!#$3$N$H$-$O!"%V%C(B
+$B%/%^!<%/$K2C$($k(B URL$B!"$=$N9`L\!"$*$h$S%?%$%H%k$NF~NO$,B%$5$l$^$9!#(B
+
+`a'
+     $B8=:_$N%Z!<%8$r%V%C%/%^!<%/$K2C$($^$9!#@\F,0z?tIU$-$G8F$P$l$?>l9g$O!"(B
+     $B2C$($k(B URL $B$NF~NO$,5a$a$i$l$^$9(B (`w3m-bookmark-add-current-url')$B!#(B
+
+`M-a'
+     $B8=:_0LCV$N(B URL $B$r%V%C%/%^!<%/$K2C$($^$9(B
+     (`w3m-bookmark-add-this-url')$B!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Consulting Bookmarks, Next: Editing Bookmarks, Prev: Adding Bookmarks, Up: Managing Bookmarks
+
+$A%V%C%/%^$B!<$A%/$r$(IOURf$A$9$k(B
+----------------------
+
+$B%V%C%/%^!<%/$5$l$?%Z!<%8$r1\Mw$9$k:G$b4JC1$JJ}K!$O!"(Bemacs-w3m $B$N%P%C%U%!(B
+$B$G(B `v' $B%-!<$rC!$/$3$H$G$9!#$G$9$,$b$&0l$D!"FCJL$J(B URL $B$G$"$k(B
+`about://bookmark/' $B$K9T$/$3$H$K$h$C$F$b2DG=$G$9!#$9$k$H0l9T$"$?$j0l$D(B
+$B$:$D$N%V%C%/%^!<%/$,!"9`L\$4$H$K$^$H$a$i$l$FI=<($5$l$k$G$7$g$&!#$=$3$G(B
+$B$O!"B>$N%Z!<%8$r1\Mw$9$k$N$HF1$8$h$&$K!"$=$l$i$r3N<B$K1\Mw$9$k$3$H$,$G(B
+$B$-$^$9!#(B
+
+$B%V%C%/%^!<%/$N%Z!<%8$G$O(B bookmark $B%^%$%J!<%b!<%I$,F/$$$F$$$^$9!#$=$l$O!"(B
+$B%V%C%/%^!<%/$rJT=8$9$k$?$a$N%-!<%P%$%s%I$rDI2C$7$^$9!#(B*Note Editing
+Bookmarks::.
+
+`v'
+     $B%V%C%/%^!<%/$N%Z!<%8$r8F$S=P$7$^$9(B (`w3m-bookmark-view')$B!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Editing Bookmarks, Prev: Consulting Bookmarks, Up: Managing Bookmarks
+
+$A%V%C%/%^$B!<$A%/$r$(I+y$A8|$9$k$K$O(B?
+---------------------------
+
+Bookmark $B%^%$%J!<%b!<%I(B (*Note Consulting Bookmarks::) $B$O!"%V%C%/%^!<%/(B
+$B$rJT=8$9$k$?$a$K$$$/$D$+$N%-!<%P%$%s%I$r@_$1$F$$$^$9!#Cf$G$b%V%C%/%^!<(B
+$B%/$r(B kill ($B$9$J$o$A>C5n(B) $B$9$k$?$a$N(B `C-k' $B$H%V%C%/%^!<%/!&%U%!%$%k$rJT(B
+$B=8$9$k$?$a$N(B `E' (`Info-like' $B%-!<%^%C%W$N>l9g$O(B `e') $B$O!":G$bCmL\$KCM(B
+$B$7$^$9!#(B
+
+$B%V%C%/%^!<%/$O(B HTML $B%U%!%$%k$K<}$a$i$l$F$$$^$9!#$7$?$,$C$F$=$N%U%!%$%k(B
+$B$O<j$GJT=8$9$k$3$H$,$G$-$^$9$,!"==J,$KCm0U$7$F$/$@$5$$!#(Bemacs-w3m $B$,9`(B
+$BL\L>$rG'<1$9$k$?$a$KI,MW$J%3%a%s%H$r>C$7$F$7$^$&$3$H$K$h$C$F!"$b$N$4$H(B
+$B$O4JC1$KBfL5$7$K$J$j$^$9!#$"$J$?$,(B HTML $B$N4pK\$rCN$C$F$$$l$P!"$`$7$m$=(B
+$B$N%U%!%$%k$NCf?H$O6K$a$FJ,$+$j0W$$$b$N$G$7$g$&!#(B
+
+`C-k'
+     $B8=:_0LCV$N%V%C%/%^!<%/$r(B kill $B$7$^$9(B (`w3m-bookmark-kill-entry')$B!#(B
+
+`E'
+     $B%V%C%/%^!<%/!&%U%!%$%k$rFI$_9~$s$G!"JT=82DG=$J>uBV$K$7$^$9(B
+     (`w3m-bookmark-edit')$B!#(B
+
+`C-_'
+     $B$d$jD>$7$r$7$^$9(B (`w3m-bookmark-undo')$B!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Using Tabs, Next: Working with buffers, Prev: Managing Bookmarks, Up: Basic Usage
+
+$A$_$s$J%?%V$,:C$-$@$h$M(B
+======================
+
+$B$[$H$s$I$NB>$N%F%-%9%H%Y!<%9$N%V%i%&%6!<$H0[$J$j!"(Bemacs-w3m $B$O%?%V$K$h(B
+$B$k1\Mw$r%5%]!<%H$7$F$$$^$9!#%?%V$K$h$k1\Mw$C$F2?(B? $B$H?R$M$i$l$=$&$G$9$M!#(B
+$B$=$l$O$H$F$bC1=c$G!"%&%#%s%I%&$N$F$C$Z$s$N9T$K$9$Y$F$N%P%C%U%!$rC1=c$+(B
+$B$DJ,$+$j$d$9$$$d$jJ}$GI=<($9$k$3$H$K$h$C$F!"C10l$N%&%#%s%I%%$G$9$Y$F$N(B
+emacs-w3m $B$N%P%C%U%!$rI=8=$9$kJ}K!$G$9!#$=$l$>$l$N%P%C%U%!$O!V%?%V!W$H(B
+$B$7$FI=<($5$l$^$9!#$3$N9T$O!"B>$N%P%C%U%!$K0\F0$7$?$j!"%Z!<%8$N>uBV$rCN(B
+$B$k$3$H$,$G$-$k$h$&$K$9$k$?$a$K>o$K8+$($?$^$^$K$J$C$F$$$F!"%P%C%U%!$K$D(B
+$B$i$l$F%9%/%m!<%k$7$^$;$s!#(B
+
+$B$=$N46?($r$D$+$`:G$b4JC1$JJ}K!$O!"C1$K;n$7$F$_$k$3$H$G$9!#$G$9$+$i!"0z(B
+$B$-B3$$$F(B emacs-w3m $B$N%;%C%7%g%s$r;O$a$F$/$@$5$$!#2?$b@_DjJQ99$r$7$F$$$J(B
+$B$1$l$P!"%G%U%)%k%H$G%?%V$N9T$,8=$l$^$9!#$F$C$Z$s$G!">.$5$J;M3Q$K8=:_$N(B
+$B%Z!<%8$N%?%$%H%k$rI=<($7$F$$$kL@$k$$9T$,$=$l$G$9!#$G$O(B ($BNc$($P(B `G' $B$G(B)
+$BJL$N(B w3m $B%P%C%U%!$r:n$C$F$_$^$7$g$&!#$9$k$H;M3Q$,Fs$D$K$J$C$?$G$7$g$&!#(B
+$B$=$l$i$,%?%V$G$9!#(B
+
+$B$b$C$H$bJ,$+$j$d$9$$%?%V$N;H$$F;$O@Z$jBX$($G$9(B: $B%?%V$N>e$G(B `mouse-1' $B%\(B
+$B%?%s$r%/%j%C%/$9$k$3$H$K$h$C$F!"$=$N%P%C%U%!$rI=<($5$;$k$3$H$,$G$-$^$9!#(B
+$B$5$i$K(B `mouse-2' $B%\%?%s$G$b!"$^$?$O(B GNU Emacs $B$G$O%^%&%9%[%$!<%k$G$bF0(B
+$B:n$7$^$9!#$3$l$O!"J#?t$N(B emacs-w3m $B%P%C%U%!$r;H$&$?$a$N!"Hs>o$KB.$/$F4J(B
+$BC1$JJ}K!$G$9!#C1$K;X$7<($7$F%/%j%C%/$9$k$+!"%^%&%9%[%$!<%k$r%/%k%/%k$9(B
+$B$l$PNI$$$N$G$9$+$i!#(B($B$O$$$O$$!"$"$J$?$rL5;k$7$F$$$^$;$s$h!#$"$J$?$O%-!<(B
+$B%\!<%I$r;H$C$F@Z$jBX$($?$$$N$G$9$M!#$4?4G[L5$/!#$=$l$b2DG=$G$9!#<!$N@a(B
+$B$G@bL@$7$^$9$+$i!"L[$C$FFI$_B3$1$F$/$@$5$$(B!)
+
+$B$b$&0l$D$N5$$,Mx$$$?5!G=$O!"%Z!<%8$N>uBV$rCN$i$;$k$3$H$G$9!#%+%i!<C<Kv(B
+$B$+%&%#%s%I%%%7%9%F%`$r;H$C$F$$$l$P!"%Z!<%8$N>uBV$rCN$i$;$k$?$a$K(B
+emacs-w3m $B$O0c$&?'$G%F%-%9%H$r%?%V$KI=<($7$^$9(B (1) (*Note Using
+Tabs-Footnotes::)$B!#Nc$($P%Y!<%8$r<h$j9~$s$G$$$k:GCf$O%F%-%9%H$O@V$/$J$C(B
+$B$F$$$F!"<h$j9~$_$,40N;$9$k$H%G%U%)%k%H$N?'(B ($BDL>o$O9u(B) $B$KLa$j$^$9!#$3$l(B
+$B$K$h$j!"8+$h$&$H;W$C$FBT$C$F$$$k%Z!<%8$,E~Ce$7$?$+$I$&$+$,!"%?%V9T$r0l(B
+$BL\8+$?$@$1$GJ,$+$j$^$9!#(B
+
+$B:G8e$K!"$b$7%&%'%V%Z!<%8$,(B favicon $B$r;}$C$F$$$l$P!"$=$l$b%?%V$KI=<($5$l(B
+$B$^$9(B (2) (*Note Using Tabs-Footnotes::)$B!#(BEmacs-w3m $B%f!<%6$K$b$C$H;k3P8z(B
+$B2L$r(B!
+
+$B%f!<%6%*%W%7%g%s(B:
+
+`w3m-use-tab'
+     $B%?%V$K$h$k1\Mw$r3h$+$9$+$I$&$+!#(B
+
+$B$"$J$?$,(B GNU Emacs $B$N%f!<%6!<$J$i$P!"%^%&%9%[%$!<%k$r;H$&$H!"NY$N%P%C%U%!(B
+$B$K9T$/$@$1$G$J$/!"%P%C%U%!$rNY$N>l=j$K0\F0$5$;$k$3$H$b$G$-$^$9!#$=$l$K(B
+$B$O%?%V9T$N>e$G%^%&%9%[%$!<%k$r2s$94V!"%3%s%H%m!<%k!&%-!<$r2!$72<$2$F$*(B
+$B$$$F$/$@$5$$!#%^%&%9%[%$!<%k$K$h$C$F(B emacs-w3m $B$,$I$N$h$&$KF0:n$9$k$+$r(B
+$B@)8f$9$kFs$D$NJQ?t$,$"$j$^$9(B:
+
+`w3m-tab-track-mouse'
+     $B$3$NJQ?t$O!"%^%&%9$,A*Br$7$?%?%V$rDI$$$+$1$F0\F0$9$k$+$I$&$+$r@)8f(B
+     $B$7$^$9!#%G%U%)%k%HCM$O(B `t' $B$G$9!#$b$7%W%m%]!<%7%g%J%k$J%U%)%s%H$r(B
+     $B%?%V$N%U%'!<%9$K;H$C$F$$$k$J$i$P!"$3$l$r(B `nil' $B$K@_Dj$9$kI,MW$,$"(B
+     $B$k$+$b$7$l$^$;$s!#(B`w3m-tab-mouse-position-adjuster' $B$b8+$F$/$@$5$$!#(B
+
+`w3m-tab-mouse-position-adjuster'
+     $B$3$NJQ?t$O!"%^%&%9%]%$%s%?!<$,A*Br$7$?%?%V$rDI$$$+$1$F0\F0$9$k$H$-(B
+     $B$N%^%&%9$N0LCV$rD4@0$9$k$?$a$NCM$r4^$s$G$$$^$9!#%G%U%)%k%HCM$O(B
+     `(0.5 . -4)' $B$G$9!#$3$l$OIbF0>/?t(B M $B$H@0?t(B N $B$N%3%s%9!&%;%k$G!"%^(B
+     $B%&%9$N0LCV(B ($B%T%/%;%k?t$GM?$($i$l$^$9(B) $B$N7W;;$K0J2<$N$h$&$KE,MQ$5$l(B
+     $B$^$9(B:
+
+          (TAB_WIDTH + M) * ORDER + N
+
+     $B$3$3$G(B TAB_WIDTH $B$O0l$D$N%?%V$N%T%/%;%kI}!"(BORDER $B$O2?HVL\$N%?%V$+(B
+     $B$rI=$7$^$9!#7k2L$N>/?t0J2<$O@Z$j<N$F$i$l$^$9!#(B
+
+     $B$b$7%?%V$N%U%'!<%9$K%W%m%]!<%7%g%J%k$J%U%)%s%H$r;H$C$F$$$k$H!"$3$N(B
+     $B7W;;$O>o$K<:GT$9$k$G$7$g$&!#(B`w3m-tab-track-mouse' $B$b;2>H$7$F$/$@$5(B
+     $B$$!#(B
+
+
+File: emacs-w3m-ja.info  Node: Using Tabs-Footnotes, Up: Using Tabs
+
+(1) XEmacs $A$O$9$Y$F$N%?%V$r$$$D$bM,$8I+$G1mJ>$7$^$9$,!"$(GrY$(I&1$A$5$l$?%?%V$H(B
+$AK{$N$b$N$rGx$(GI1$A$7$?$j!"%b$B!<$A%I%i%$%s$G$(G\"$ATZ$N%Z$B!<$A%8$NW4$(Ghh$A$rV*$k$3$H$O$(Gv|$(I+J(B
+$A$G$9!#(B
+
+(2) XEmacs $A$G$O=q$N$H$3$m%?%VPP$K(B favicon $A$O1mJ>$5$l$^$;$s!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Working with buffers, Next: Downloading, Prev: Using Tabs, Up: Basic Usage
+
+$A%P%C%U%!$rWw$k(B/$AO{$9(B/$ARF$(GY/$A$9$k(B
+============================
+
+$BCY$+$lAa$+$l$"$J$?$O(B emacs-w3m $BCfFG$K$J$C$F!"$9$Y$F$N%&%'%V$N1\Mw$r$=$l(B
+$B$GOE$o$J$1$l$P$J$i$J$/$J$k$G$7$g$&!#$"$J$?$,$a$2$F$7$^$$$=$&$J$3$NG$L3(B
+$B$r<jEA$&$?$a$K!"(Bemacs-w3m $B$N%P%C%U%!$GF0:n$9$k$?$/$5$s$N0c$&<jCJ$r9M$((B
+$B$^$7$?!#(B
+
+* Menu:
+
+* Creating and killing buffers:: $B%P%C%U%!$r:n$C$?$j>C$7$?$j(B
+* Moving across buffers::        $B%P%C%U%!4V$N0\F0(B
+* Selecting buffers::            $B%j%9%H$+$i%P%C%U%!$rA*$V(B
+
+
+
+File: emacs-w3m-ja.info, Node: Creating and killing buffers, Next: Moving across buffers, Prev: Working with buffers, Up: Working with buffers
+
+$A%P%C%U%!$rWw$C$?$jO{$7$?$j(B
+--------------------------
+
+$B;~$K!"%&%'%V%Z!<%8$r3+$+$J$$$GC1$K?7$7$$%P%C%U%!$r:n$k$3$H$,Lr$KN)$D$3(B
+$B$H$,$"$j$^$9!#$3$NA`:n$r(B emacs-w3m $B$NMQ8l$G$O!V$U$?$4$N%3%T!<$r:n$k!W(B
+(creating a twin copy) $B$H8@$$$^$9!#$3$l$OC1$K!"$=$NFbMF$,8=:_$N%P%C%U%!(B
+$B$HF10l$J?7$7$$%P%C%U%!$r:n$j$^$9!#(B
+
+$B$3$NH?BP$O%P%C%U%!$rJD$8$k$3$H$G!":#$O$=$NFbMF$K6=L#$,L5$$0l$D$N%P%C%U%!(B
+$B$r!"C1$KJD$8$k$3$H$,$G$-$^$9!#$"$k$$$O!"8=:_$N%P%C%U%!0J30$N$9$Y$F$rJD(B
+$B$8$k$3$H$r7hCG$7$F$bNI$$$G$9!#0J2<$N%3%^%s%I$G$=$l$r9T$J$C$F$/$@$5$$(B:
+
+`C-c C-t'
+`M-n'
+     $B8=:_$N%P%C%U%!$HF10l$N%3%T!<$r?7$7$$L>A0$G:n$j$^$9!#$3$l$O?7$7$$%P%C(B
+     $B%U%!$K%&%'%V%Z!<%8$r<h$j9~$^$:$K!"?7$7$$%;%C%7%g%s$r;O$a$k$N$K;H$$(B
+     $B$^$9(B (`w3m-copy-buffer')$B!#(B
+
+`C-c C-w'
+     $B8=:_$N(B emacs-w3m $B$N%P%C%U%!$rJD$8$^$9(B (`w3m-delete-buffer')$B!#(B
+
+`C-c M-w'
+     $B8=:_$N$b$N0J30$N$9$Y$F$N(B emacs-w3m $B$N%P%C%U%!$rJD$8$^$9(B
+     (`w3m-delete-other-buffers')$B!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Moving across buffers, Next: Selecting buffers, Prev: Creating and killing buffers, Up: Working with buffers
+
+$A%P%C%U%!$(Gbf$A$NRF$(GY/(B
+----------------
+
+$B:G$bIQHK$K;H$&%3%^%s%I$,$?$V$sNY$N%P%C%U%!$K9T$/$b$N$G$"$m$&$3$H$O!"@$4V(B
+$B$NG'$a$k$H$3$m$G$7$g$&!#$=$l$O!"8=:_$N!V8e!W$+!VA0!W$N%P%C%U%!$G$9!#$3$N(B
+$B0UL#$O%?%V$r;H$C$F$_$l$P$h$/$o$+$j$^$9!#<!$N%P%C%U%!$O8=:_$N1&B&$N0l$D8e!"(B
+$BA0$N%P%C%U%!$O:8B&$G$9!#$7$+$7!";DG0$J$,$i(B XEmacs $B$O%?%V$r=gITF1$KI=<($9(B
+$B$k$N$G!"$I$l$,NY$N%P%C%U%!$+$rCN$k$K$O!"3F%?%V$KI=<($5$l$F$$$k?t;z$KCmL\(B
+$B$9$kI,MW$,$"$j$^$9!#$3$l$i$N%3%^%s%I$K3d$jEv$F$i$l$F$$$k%-!<(B
+$B$O(B `C-c C-p' $B$H(B `C-c C-n' $B$G$9!#(B
+
+$B$3$l$i$N%3%^%s%I$O?t;z@\F,0z?t$N=,47$rM}2r$7$^$9!#$9$J$o$A!"$=$l$i$r?t(B
+N $B$r0z?t$H$7$F8F$V$H!"8=:_$N%P%C%U%!$+$i(B N $B8DN%$l$?%P%C%U%!$K9T$-$^$9!#(B
+$BNc$($P!"8=:_0LCV$+$i1&$K%P%C%U%!$rFs8DJ,(B ($B$9$J$o$A%P%C%U%!Fs8DJ,$@$1<!(B
+$B$K(B) $B0\F0$9$k$K$O!"(B`2 C-c C-n' $B$r;H$C$F$/$@$5$$(B (1) (*Note Moving
+across buffers-Footnotes::)$B!#(B
+
+`C-c C-p'
+     $BA0$N(B emacs-w3m $B%P%C%U%!$K0\F0$7$^$9!#$3$l$ODL>o%?%V9T$K$*$$$F:8J}(B
+     $B8~$K<!$G$9!#?t$N0z?t(B N $B$rIU$1$F;H$&$H!"%P%C%U%!$r(B N $B8DJ,A0$K0\F0$7(B
+     $B$^$9(B (`w3m-previous-buffer')$B!#(B
+
+`C-c C-n'
+     $B<!$N(B emacs-w3m $B%P%C%U%!$K0\F0$7$^$9!#$3$l$ODL>o%?%V9T$K$*$$$F1&J}(B
+     $B8~$K<!$G$9!#?t$N0z?t(B N $B$rIU$1$F;H$&$H!"%P%C%U%!$r(B N $B8DJ,<!$K0\F0$7(B
+     $B$^$9(B (`w3m-next-buffer')$B!#(B
+
+$B$"$J$?$,(B GNU Emacs $B$N%f!<%6!<$J$i$P!"0J2<$N%3%^%s%I$r;H$C$F(B emacs-w3m
+$B%P%C%U%!$r%?%V9T$NNY$N>l=j$K0\F0$5$;$k$3$H$b$G$-$^$9(B:
+
+`C-c C-.'
+`C-c C->'
+     $BA*Br$5$l$F$$$k(B emacs-w3m $B%P%C%U%!$r!"%?%V9T$N1&NY$N>l=j$K0\F0$5$;(B
+     $B$^$9!#?t$N0z?t(B N $B$rIU$1$F;H$&$H!"%?%V$N(B N $B8DJ,1&$K0\F0$5$;$^$9(B
+     (`w3m-tab-move-right')$B!#(B
+
+`C-c C-,'
+`C-c C-<'
+     $BA*Br$5$l$F$$$k(B emacs-w3m $B%P%C%U%!$r!"%?%V9T$N:8NY$N>l=j$K0\F0$5$;(B
+     $B$^$9!#?t$N0z?t(B N $B$rIU$1$F;H$&$H!"%?%V$N(B N $B8DJ,:8$K0\F0$5$;$^$9(B
+     (`w3m-tab-move-left')$B!#(B
+
+$B;d$?$A$,9|$r@^$C$?$K$b$+$+$o$i$:!"$3$l$i$N%3%^%s%I$,$*5$$K>$$5$J$$$J$i(B
+$B$P!"$"$J$?$,M_$7$$$b$N$,(B ibuffer $B$d(B iswitchb $B$N$h$&$JK|G=;V8~$N?M(B
+(generalist) $B8~$1$N%P%C%U%!4IM}%Q%C%1!<%8$NCf$K$"$k$+$I$&$+$rC5$7$F$_$k(B
+$B$N$bNI$$$+$b$7$l$^$;$s!#(Bemacs-w3m $B%P%C%U%!$O(B Emacs $B$N@55,$N%P%C%U%!$G$9(B
+$B$+$i!"$=$l$i$b$^$?NI9%$KF0:n$9$k$G$7$g$&!#(B
+
+
+File: emacs-w3m-ja.info  Node: Moving across buffers-Footnotes, Up: Moving across buffers
+
+(1) $A$$$D$b$N$h$&$K!"(B`2 C-c C-n' $A$N4z$o$j$K(B `C-u 2 C-c
+C-n' $A$rJ9$C$F$bA<$$$N$G$9$,!"(Bemacs-w3m $A$N%P%C%U%!$G$O$9$Y$F$NJ}WV%-$B!<(B
+$A$H%^%$%J%9$(GX4$A:E$,J}$N=S$(Gs$$AR}J}$K8n$j51$F$i$l$F$$$k$3$H$r$(I>t$A$($F$*$$$F$/$@(B
+$A$5$$!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Selecting buffers, Prev: Moving across buffers, Up: Working with buffers
+
+$A%j%9%H$+$i%P%C%U%!$r$(GrY$A$V(B
+------------------------
+
+$B%j%9%H$+$i(B emacs-w3m $B$N%P%C%U%!$rA*$V$?$a$NFs$D$N$d$jJ}$,$"$j$^$9!#0l$D(B
+$BL\$O!"(B`C-c C-a' $B$G8F$S=P$5$l$k%_%K%P%C%U%!!&%Y!<%9$N%$%s%?!<%U%'!<(B
+$B%9$G$9!#I=<($7$?$$%P%C%U%!$r!"(B`M-p' $B$H(B `M-n' $B%-!<(B ($B$^$?(B
+$B$O(B <$A!|(B> $B$H(B <$A!}(B> $B%-!<(B) $B$r;H$C$FA*$V$3$H$,$G$-!"$=$l$i$O%j%9%H$NCf(B
+$B$G=[4D$7$^$9!#$^$?!"%W%m%s%W%H$rJT=8$7$F!"(B`<TAB>' $B$NJd40$r;H$C$F(B
+$B4{B8$N%&%'%V%Z!<%8$N%?%$%H%k$r=q$-9~$`$3$H$b$G$-$^$9!#Nc$($P!"(B"Google
+Search" $B$N%Z!<%8$r3+$$$F$"$k$J$i$P!"(B"Goo" $B$KB3$1$F(B `<TAB>' $B$r(B
+$BC!$/$3$H$K$h$C$F!"$=$N%Z!<%8$N%?%$%H%k$,40@.$7$^$9!#%Z!<%8$NL>A0$N8e$m$K(B
+$B$O!"(B($B803g8L$G64$^$l$?(B) $B%P%C%U%!$NL>A0$,IU$-$^$9!#$=$7(B
+$B$F(B `<RET>' $B$r;H$&$H!"$"$J$?$,A*$s$@%P%C%U%!$K@Z$jBX$o$j$^$9!#(B
+
+$BFs$DL\$N$b$C$H@vN}$5$l$?%$%s%?!<%U%'!<%9$O(B emacs-w3m $B%P%C%U%!%j%9%H$H8@(B
+$B$$!"(B`C-c C-s' $B$G5/F0$5$l$^$9!#$=$l$OJ,3d$5$l$?%&%#%s%I%%$K$9$Y$F(B
+$B$N3+$$$F$$$k%P%C%U%!$rI=<($7(B (`C-c C-s' $B$GI=<(7A<0$,@Z$jBX$o$j$^(B
+$B$9(B)$B!"<B;~4V$G%P%C%U%!$r8+$k$3$H$,$G$-$k$h$&$K$J$j$^$9!#$=$N%P%C%U%!%j%9(B
+$B%H$NCf$G%]%$%s%H$r0\F0$9$k$H!"%]%$%s%H$N$H$3$m$K$"$k%P%C%U%!$,<g%&%#%s%I%%(B
+$B$KI=<($5$l!"%P%C%U%!$N@Z$jBX$($,D>@\L\$K8+$($k7A$GJV$C$F$/$k$N$G$9!#(B
+
+$B%P%C%U%!%j%9%H$NCf$r0\F0$9$k$K$O(B `p' $B$H(B `n' $B%-!<(B ($B$^$?$OLp0u%-!<(B) $B$r;H$C(B
+$B$F$/$@$5$$!#%P%C%U%!%j%9%H$G$O(B `<DEL>' $B$H(B `<SPC>' $B$G!"<g%&%#%s%I%%$KI=(B
+$B<($5$l$F$$$k%P%C%U%!$r%9%/%m!<%k$5$;$k$3$H$,2DG=$G!"$3$l$O@5$7$$%P%C%U%!(B
+$B$r8+$F$$$k$+$I$&$+$r%A%'%C%/$7$?$$$H$-$KJXMx$G$9!#%]%$%s%H$N$H$3$m$K$"(B
+$B$k%P%C%U%!$rA*$S$?$$$H$-$O(B `<RET>' $B%-!<$r;H$C$F$/$@$5$$!#$3$N>l9g$O%P%C(B
+$B%U%!%j%9%H$,1#$5$l$^$9!#$"$k$$$O!"(B`w' $B%-!<$r;H$C$?>l9g$O%P%C%U%!%j%9%H(B
+$B$OI=<($5$l$?$^$^$G!"<g%&%#%s%I%%$K%U%)!<%+%9$7$^$9!#(B
+
+$B$^$?!"$3$N%a%K%e!<$GIaDL$N%P%C%U%!$G;H$o$l$k$N$HF1$8%-!<3d$jEv$F(B
+(*Note Creating and killing buffers::) $B$G!"%P%C%U%!$rJD$8$?$j:n$k$3$H$b(B
+$B$G$-$^$9!#(B
+
+$B:G8e$K!"(B`?' $B$O%X%k%W$NI=<(!"(B`g' $B$O%j%9%H$N:n$jD>$7!"$=$7$F(B `q' $B$O%P%C%U%!(B
+$B%j%9%H$N=*N;$r<g%&%#%s%I%%$N%P%C%U%!$OJQ99$;$:$K!"$=$l$>$l<B9T$7$^$9!#(B
+
+`C-c C-a'
+     $B%_%K%P%C%U%!$G%P%C%U%!L>$NF~NO$r5a$a$^$9!#(B`M-p' $B$H(B `M-n' $B$G4{B8$N(B
+     $B%P%C%U%!$,=[4D$7!"(B`<TAB>' $B$GJd40$G$-$^$9(B (`w3m-switch-buffer')$B!#(B
+
+`C-c C-s'
+     $BJ,3d$5$l$?%&%#%s%I%%$K%P%C%U%!%j%9%H$rI=<($7$^(B
+     $B$9(B (`w3m-select-buffer')$B!#$3$N%&%#%s%I%%$G$O(B `C-c C-s' $B$G?e(B
+     $BJ?$H?bD>%b!<%I$,@Z$jBX$o$j!"(B`<RET>' $B$G%]%$%s%H$N$H$3$m$K$"$k%P%C(B
+     $B%U%!$rA*$s$G%P%C%U%!%j%9%H$O1#JC!"(B`w' $B$G%]%$%s%H$N$H$3$m$K$"$k%P%C%U%!(B
+     $B$rA*$s$G$=$l$K%U%)!<%+%9!"(B`n' $B$H(B `p' $B$=$l$KLp0u%-!<$,>e2<$N0\F0(B
+     $B$K;H$($^$9!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Downloading, Next: Submitting Forms, Prev: Working with buffers, Up: Basic Usage
+
+$A%U%!%$%k$r%@%&%s%m$B!<$A%I$9$k(B
+==========================
+
+$B$I$s$J%&%'%V%Z!<%8$d%U%!%$%k$b(B emacs-w3m $B$G%@%&%s%m!<%I(B ($B$9$J$o$A<hF@!"(B
+$BI=<($G$O$"$j$^$;$s(B) $B$G$-$^$9!#C1$K%@%&%s%m!<%I$7$?$$%j%s%/$K%]%$%s%H$r(B
+$BCV$$$F(B `d' $B$rC!$$$F$/$@$5$$!#%m!<%+%k$K%;!<%V$9$k%U%!%$%kL>$,?R$M$i$l$^(B
+$B$9!#%G%U%)%k%H$G$O1s3V%5!<%P!<$K$*$1$k%U%!%$%k$NL>A0$K$J$j$^$9!#$=$l$G(B
+$BNI$1$l$P(B `<RET>' $B$r2!$7$F$/$@$5$$!#%@%&%s%m!<%I$OHsF14|$K<B9T$5$l!"(B
+Emacs $B$G9T$J$C$F$$$kB>$N;E;v$N<YKb$r$7$J$$$N$G!"$=$&$7$?$1$l$PB>$N%P%C(B
+$B%U%!$G(B emacs-w3m $B$K$h$k1\Mw$rB3$1$k$3$H$,$G$-$^$9!#(B
+
+$B$3$N%@%&%s%m!<%I$N;EAH$_$O(B w3m $B$r;H$&$N$G$9$,!"Be$o$j$K$b$C$H6/NO$J(B
+wget $B$r;H$&$3$H$b9MN8$7$F$_$F$/$@$5$$!#;d$?$A$N$*M'$@$A%W%m%8%'%/%H$G$"(B
+$B$k(B "emacs-wget" $B$rGA$$$F$_$^$7$g$&!#$=$N%[!<%`%Z!<%8$O$3$3(B
+`http://pop-club.hp.infoseek.co.jp/emacs/emacs-wget/' $B$G$9!#(B
+
+`d' (Lynx-like $A%-$B!<$A%^%C%W(B)
+`D' (Info-like $A%-$B!<$A%^%C%W(B)
+     $B%]%$%s%H$N$H$3$m$K$"$k%j%s%/$,;X$7<($9%U%!%$%k$+%Z!<%8$r%@%&%s%m!<(B
+     $B%I$7$^$9(B (`w3m-download-this-url')$B!#(B
+
+`M-d' (Lynx-like $A%-$B!<$A%^%C%W(B)
+`d' (Info-like $A%-$B!<$A%^%C%W(B)
+     URL $B$NFbMF$r%m!<%+%k%U%!%$%k$K%@%&%s%m!<%I$7$^$9(B (`w3m-download')$B!#(B
+     $B$=$N(B URL $B$H%m!<%+%k%U%!%$%k$NL>A0$NF~NO$r5a$a$i$l$^$9!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Submitting Forms, Next: HTML File Information, Prev: Downloading, Up: Basic Usage
+
+HTML $A%U%)$B!<$A%`$K$(GX4$AHk$9$k(B
+=======================
+
+$B$3$l$i$N(B emacs-w3m $B%3%^%s%I$O!"C1=c$J%-!<%P%$%s%I$H@lMQ$N(B Emacs $B$N%&%#(B
+$B%s%I%%$+%_%K%P%C%U%!$r;H$C$F!"%U%)!<%`$+$i%U%)!<%`$X$N0\F0$H%U%#!<%k%I(B
+$B$KF~NO$9$k$?$a$N5!G=$rDs6!$7$^$9!#(B
+
+$B3P$($F$*$$$FM_$7$$Bg;v$J%-!<%P%$%s%I$O(B `<RET>' $B$G$9!#$3$l$O8=:_0LCV$K$"(B
+$B$k$b$N$K$h$C$F0[$J$k0UL#$r;}$A$^$9!#%F%-%9%HNN0h(B (textarea) $B$G$O!"%_%K(B
+$B%P%C%U%!$GCM$rF~NO$9$k$3$H$,B%$5$l$^$9!#A*BrMQ$N%?%0$G$O!"A*Br;h$N%j%9(B
+$B%H$,(B Emacs $B$N%(%l%/%H%j%C%/(B (electric == $B<+8JA^F~(B) $B%&%#%s%I%%$K8=$l$^$9(B
+($B$=$3$G$OLp0u%-!<$G0\F0$7$F!"(B`<RET>' $B%-!<$G0l$D$rA*$V$3$H$,$G$-$^$9(B)$B!#(B
+$B%i%8%*%\%?%s$*$h$S%A%'%C%/%\%C%/%9$G$O(B `<RET>' $B%-!<$G$=$l$i$N$&$A$N0l$D(B
+$B$rA*$S$^$9!#(B
+
+$B%_%K%P%C%U%!$+%(%l%/%H%j%C%/!&%&%#%s%I%%$K$$$k$H$-$O!"(B
+`C-c C-q' $B%-!<$G<h$j>C$9$3$H$,$G$-$^$9!#%U%)!<%`$K5-F~$7$?$b$N$r(B
+$BAw$j=P$9$K$O(B `C-c C-c' $B$r;H$C$F$/$@$5$$!#(B
+
+`]'
+     $B<!$N%U%)!<%`$K%8%c%s%W$7$^$9(B (`w3m-next-form')$B!#(B
+
+`['
+     $BA0$N%U%)!<%`$K%8%c%s%W$7$^$9(B (`w3m-previous-form')$B!#(B
+
+`C-c C-c'
+     $B8=:_0LCV$N%U%)!<%`$K5-F~$7$?$b$N$rAw$j=P$7$^$9(B
+     (`w3m-submit-form')$B!#(B
+
+`<RET>'
+     $B8=:_0LCV$K$"$k$N%U%)!<%`CM$r=q$-49$($^$9!#(B
+
+`<RET>' (w3m-form-*-keymap)
+     $B$=$NCM$rA*Br$7$^$9!#(B
+
+`C-c C-q' (w3m-form-*-keymap)
+     $B%U%)!<%`$NJT=8$rCfCG$7$F!"JQ99$r<h$j;_$a$^$9!#(B
+
+`w3m-form-use-textarea-backup' $B$,(B `nil' $B$K@_Dj$5$l$F$$$J$+$C$?$i!"(B
+textarea $B$GF~NO$7$?%F%-%9%H$r8e$G:FMxMQ$G$-$k$h$&$K!"%P%C%/%"%C%W!&%U%!(B
+$B%$%k$K5-O?$7$^$9!#%U%)!<%`$NJT=8$r;O$a$k$H$-$K%P%C%/%"%C%W$5$l$?%F%-%9(B
+$B%H$,$"$C$?$i!"$=$l$r;H$&$+$I$&$+$r?R$M$i$l$k$G$7$g$&!#%F%-%9%H$rJ]B8$9(B
+$B$k$?$a$N%U%!%$%k$O!"JQ?t(B `w3m-form-textarea-directory' $B$G;XDj$5$l$k%G%#(B
+$B%l%/%H%j$K3JG<$5$l$^$9!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: HTML File Information, Prev: Submitting Forms, Up: Basic Usage
+
+$A%&%'%V%Z$B!<$A%8Ww$j$H%O%C%/$N$*JV$(H!s$A$$(B
+==================================
+
+$B$$$D$b%I%-%e%a%s%H$N<9I.4D6-$H$7$F!"$"$k$$$O%=%U%H%&%'%"$N3+H/4D6-$H$7(B
+$B$F(B Emacs $B$r;H$C$F$$$k?M$K$O!"F1$8$=$N4D6-$NCf$G%&%'%V$r1\Mw$G$-$k$3$H$O(B
+$BK\Ev$KJXMx$G$7$g$&!#Nc$($P(B HTML $B%U%!%$%k$r<9I.$7$F$$$k$N$G$"$l$P!"30It(B
+$B$N%&%'%V%V%i%&%6$r5/F0$9$kI,MW$J$/!"(BEmasc $B$NCf$G:n@.$7$?(B HTML $B%U%!%$%k(B
+$B$r%W%l%S%e!<$G$-$^$9!#%W%m%0%i%_%s%0!&%^%i%=%s$N:GCf$K!"?WB.$K5;=QJ88%(B
+$B$+$i%5%s%W%k%3!<%I$r@Z$jE=$j$9$k$H$$$C$?$3$H$@$C$F(B...
+
+$B5U$O$I$&$G$7$g$&!#(B($B$9$J$o$A%&%'%V1\Mw$N4D6-$G!"$=$N%=!<%9$G$"$k(B HTML $B%U%!(B
+$B%$%k$rJT=8$7$?$j!";2>H$7$?$j$G$-$?$i(B) $B$+$C$3$$$$$H;W$$$^$;$s$+!)(B $B%I%-%e(B
+$B%a%s%H$r<9I.Cf$K(B emacs-w3m $B$G2<8+(B (preview) $B$7$F8m;z$rH/8+$7$?$HA[A|$7(B
+$B$F$_$F$/$@$5$$!#$=$N(B HTML $B%U%!%$%k$r$?$A$I$3$m$K=$@5$7$?$/$J$k$O$:$G$9!#(B
+$B$"$J$?$,%&%'%V%F%/%N%m%8!<$K7H$o$k%W%m%0%i%^$J$i!"1\MwCf$N%&%'%V%Z!<%8(B
+$B$r(B HTML $B7A<0$G1\Mw$7$?$/$J$k$3$H$,$"$k$G$7$g$&!"FC$K!"?7J9%b%8%e!<%k$N(B
+$B:n<T$NJ}(B (*Note Shimbun Basics::)$B!#(B
+
+HTML $B%U%!%$%k$r3+$$$F$$$k(B Emacs $B$N%P%C%U%!$NL>A0$rL@<(E*$K;XDj$7$F%P%C(B
+$B%U%!$r@Z$jBX$($k$3$H$bIaDL$K$G$-$^$9$,!"(Bemacs-w3m $B$G$O$=$&$$$C$?L\E*$N(B
+$B$?$a$K@lMQ$N%-!<$,3dEv$F$i$l$F$$$^$9!#(BEmacs-w3m $B$O<+J,$,8=:_I=<($7$F$$(B
+$B$k%&%'%V%Z!<%8$N(B URL $B$rCN$C$F$k$s$G$9!#$=$N>pJs$r;H$o$J$$<j$O$"$j$^$;$s!#(B
+
+`\'
+     $BI=<(Cf$N%&%'%V%Z!<%8$r(B HTML $B7A<0$G$=$N$^$^I=<($7$^$9(B
+     (`w3m-view-source')$B!#(B
+
+`='
+     $BI=<(Cf$N%&%'%V%Z!<%8$N>pJs$rI=<($7$^$9!#>pJs$K$O!"%?%$%H%k!"(BURL$B!"(B
+     $B%I%-%e%a%s%H%?%$%W!":G=*JQ99F|;~$,4^$^$l$^$9(B (`w3m-view-header')$B!#(B
+
+`E' (Lynx-like $A%-$B!<$A%^%C%W(B)
+`e' (Info-like $A%-$B!<$A%^%C%W(B)
+     $B8=:_1\MwCf$N%m!<%+%k%U%!%$%k$rJT=8$7$^$9(B (`w3m-edit-current-url')$B!#(B
+
+`e' (Lynx-like $A%-$B!<$A%^%C%W(B)
+`E' (Info-like $A%-$B!<$A%^%C%W(B)
+     $B8=:_%]%$%s%H$N2<$K$"$k%j%s%/@h$N%m!<%+%k%U%!%$%k$rJT=8$7$^$9(B
+     (`w3m-edit-this-url')$B!#(B
+
+`M'
+     (Emacs-w3m $B0J30$N(B) $B30It%V%i%&%6$r?7$?$K5/F0$7$F!"8=:_(B emacs-w3m $B$G(B
+     $B1\Mw$7$F$$$k%Z!<%8$rI=<($7$^$9(B
+     (`w3m-view-url-with-external-browser')$B!#$I$N30It%V%i%&%6$r;H$&$+$O!"(B
+     $BJQ?t(B `w3m-content-type-alist' $B$K$h$C$F(B URL $B$N<oN`Kh$KDj5A$5$l$^$9!#(B
+
+`|'
+     $B%&%'%V%Z!<%8$N%=!<%9$r%3%^%s%I$K%Q%$%W$7$^$9!#$I$s$J%3%^%s%I$r;H$&(B
+     $B$+$r?R$M$i$l$^$9(B (`w3m-pipe-source')$B!#(B
+
+$B$3$3$G>R2p$7$?0J30$K$b!"B>$N%3%^%s%I$d(B Emacs $B$N%5%V%7%9%F%`$H(B
+emacs-w3m $B$rO"7H$5$;$kJ}K!$r(B *Note Tips:: $B$K$F>R2p$7$F$$$k$N$G!";29M$K(B
+$B$7$F$/$@$5$$!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Pretty Good Features, Next: Customizable Variables, Prev: Basic Usage, Up: Top
+
+$A$?$/$5$s$N$9$0$l$b$N(B
+********************
+
+* Menu:
+
+* Using Search Engines::        $B;H$$$d$9$$%&%'%V8!:w(B
+* Grouping URLs::               $B0l$D$N(B URL $B$GJ#?t$N%&%'%V%Z!<%8$r8+$k(B
+* Weather Information::         $BL@F|$NE75$$O@2$l$G$7$g$&(B
+* Using Antenna::               $B%"%s%F%J$rD%$j=d$i$=$&(B
+* Showing Directory Tree::      $B%G%#%l%/%H%j$NLZ9=B$$rI=<($9$k(B
+* Viewing Perl Documents::      Perl $B$N%I%-%e%a%s%H$r8+$k(B
+* Using Namazu::                Namazu $B$G%U%!%$%k$r8!:w$9$k(B
+* Octet::                       application/octet-stream $B%G!<%?$r8+$k(B
+* Frame Local Buffers::         $BB??t$N%;%C%7%g%s$r%U%l!<%`$G%0%k!<%WJ,$1$9$k(B
+* Session Manager::             $B%;%C%7%g%s$NJ]B8$HFI$_$3$_(B
+
+
+
+File: emacs-w3m-ja.info, Node: Using Search Engines, Next: Grouping URLs, Prev: Pretty Good Features, Up: Pretty Good Features
+
+$AJ9$$$d$9$$%&%'%V$(I<D$AKw(B
+====================
+
+Emacs-w3m $B$K$O8!:w%(%s%8%s$rMxMQ$9$k$?$a$N@h?J$N5!G=$,$"$j!";0$D$N%$%s(B
+$B%?!<%U%'!<%9$rDL$7$FMxMQ$9$k$3$H$,$G$-$^$9(B:
+
+   * $BI8=`$N8!:w%$%s%?!<%U%'!<%9$G$9!#(B`S' $B%-!<(B (`Info-like' $B%-!<%^%C%W$N(B
+     $B>l9g$O(B `s' $B%-!<(B) $B$G!"$$$:$l$+$N(B emacs-w3m $B%P%C%U%!$+$i5/F0$5$l$^$9!#(B
+     $B$3$l$O8!:w%(%s%8%s$r;XDj$7$F8!:w8l$rF~NO$9$k!"C1=c$JBPOC7?$N$d$jJ}(B
+     $B$G$9!#(B*Note The Search Interface:: $B$r;2>H$7$F$/$@$5$$!#(B
+
+   * $B%/%$%C%/%5!<%A!&%$%s%?!<%U%'!<%9$G$9!#$3$l$O5;9*E*$K:n$i$l$?(B URL
+     $B$K9T$/$3$H$K$h$C$F8!:w%(%s%8%s$rMxMQ$9$k$?$a$N!"$h$jB.$$(B ($B$5$i$K!"(B
+     $B$h$jJ#;($J(B) $BJ}K!$G$9!#$3$N5!G=$K4X$9$k>\:Y$O(B *Note Quick
+     Searching:: $B$r;2>H$7$F$/$@$5$$!#(B
+
+   * "I'm feeling lucky" $B5!G=$,M-8z$K$J$C$F$$$k(B
+     (`w3m-enable-google-feeling-lucky') $B$H!"(BURL $B$rF~NO$9$k$H$-$KDL>o$N(B
+     URL $B$NBe$o$j$K2?$+$N8l6g$r;XDj$9$k$3$H$K$h$C$F!"$=$N8l6g$N(B Google
+     $B8!:w$r<+F0E*$K3+;O$7$F!":G$b4X78$,$"$j$=$&$J7k2L$rI=<($5$;$k$3$H$,(B
+     $B$G$-$^$9!#$3$l$O:G$b4X78$,$"$j$=$&$J%Z!<%8$r$9$0$K8+$?$$>l9g$KJXMx(B
+     $B$G$9$,!"8!:w7k2L$N%j%9%H$OI=<($5$l$^$;$s!#(B
+
+* Menu:
+
+* The Search Interface::        Emacs-w3m $B$K$h$k8!:w$N$d$jJ}(B
+* Quick Searching::             $B$b$&0l$D$N(B ($B$=$7$FB.$$(B) $B%&%'%V8!:w(B
+* Adding New Search Engines::   $B$*5$$KF~$j$N%(%s%8%s$r;H$&$K$O(B?
+
+
+
+File: emacs-w3m-ja.info, Node: The Search Interface, Next: Quick Searching, Prev: Using Search Engines, Up: Using Search Engines
+
+Emacs-w3m $A$K$h$k$(I<D$AKw$N$d$j7=(B
+----------------------------
+
+Emacs-w3m $B$N%P%C%U%!$G(B `S' $B%-!<(B (`Info-like' $B%-!<%^%C%W$N>l9g$O(B `s'
+$B%-!<(B) $B$r;H$&$3$H$K$h$j!"I8=`$N8!:w%$%s%?!<%U%'!<%9$rN)$A>e$2$k$3$H$,$G(B
+$B$-$^$9!#$9$k$H!"%_%K%P%C%U%!$G8!:w8l$NF~NO$r5a$a$k%W%m%s%W%H$,8=$l$k$N(B
+$B$G!"0l$D$^$?$OJ#?t$N8l$rF~$l$F!"(B`<RET>' $B$rC!$$$F$/$@$5$$!#$=$N%(%s%8%s(B
+$B$N8!:w7k2L$N%Z!<%8$,8=$l!"$=$N8e!"$"$?$+$b8!:w%(%s%8%s$KDL>o$N%&%'%V$N(B
+$BN.57$K$h$kF~NO$r9T$J$C$?$H$-$N$h$&$K!"7k2L$r1\Mw$9$k$3$H$,$G$-$^$9!#(B
+
+$B$*$=$i$/!"$"$J$?$O$I$N%(%s%8%s$GC5:w$7$?$$$+$r7h$a$k5!2q$,M?$($i$l$F$$(B
+$B$J$$$3$H$K5$IU$/$G$7$g$&!#(BEmacs-w3m $B$O%G%U%)%k%H$G(B Google $B8!:w%(%s%8%s(B
+$B$r;H$$$^$9$,!"JQ?t(B `w3m-search-default-engine' (*Note Customizable
+Variables:: $B;2>H(B) $B$r%+%9%?%^%$%:$9$k$3$H$K$h$C$F!"$3$N?6$kIq$$$rJQ99$9(B
+$B$k$3$H$,$G$-$^$9!#$"$k$$$O!"$3$N%3%^%s%I$r;H$&$?$S$K8!:w%(%s%8%s$r;XDj(B
+$B$9$k$3$H$,$G$-$^$9!#(B
+
+$B$I$N%(%s%8%s$r;HMQ$9$k$+$rL@<($9$k$?$a$K$O!"%3%^%s%I$K@\F,0z?t$rM?$($J$1(B
+$B$l$P$J$j$^$;$s(B ($BDL>o$3$l$O(B `C-u S' (`Info-like' $B%-!<%^%C%W(B
+$B$N>l9g$O(B `C-u s') $B$N$h$&$K!"%3%^%s%I$NA0$K(B `C-u' $B$rC!$/$3$H(B
+$B$r0UL#$7$^$9(B)$B!#$9$k$H(B emacs-w3m $B$O%(%s%8%s$NF~NO$rB%$9$N$G!"$=$NL>A0$r0l(B
+$B$DA*$V$3$H$,$G$-$^$9(B (<TAB> $B%-!<$GJd40$,$G$-$^$9(B)$B!#$$$C$?$sA*(B
+$BBr$7$?$i(B `<RET>' $B%-!<$rC!$$$F$/$@$5$$!#$=$N8e$G8!:w8l$rF~NO$9$k(B
+$B$3$H$,$G$-!"(B`<RET>' $B$r%?%$%W$9$l$P8!:w7k2L$,8=$l$k$G$7$g$&!#(B
+
+`S' (Lynx-like $A%-$B!<$A%^%C%W(B)
+`s' (Info-like $A%-$B!<$A%^%C%W(B)
+     $B?7$7$$8!:w$r;O$a$^$9!#@\F,0z?tIU$-$G8F$P$l$?>l9g$O!"$I$N%(%s%8%s$r(B
+     $B;H$&$+$r?R$M$^$9(B (`w3m-search')$B!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Quick Searching, Next: Adding New Search Engines, Prev: The Search Interface, Up: Using Search Engines
+
+$A$b$&R;$D$N(B ($A$=$7$FKY$$(B) $A%&%'%V$(I<D$AKw(B
+----------------------------------
+
+$B%&%'%V!&%Q%o!<%f!<%6(B ($B$3$l$rFI$s$G$$$k$"$J$?(B) $B$K$O!"?WB.$G8zN(E*$J8!:w(B
+$B$NJ}K!$,I,MW$G$9!#%/%$%C%/%5!<%A$O$=$N0l$D$G$9!#(B
+
+$B$=$l$O2?$r$9$k$N$+$C$F(B?  $B$=$l$O(B `gg:emacs' $B$N$h$&$JFCJL$N(B URL $B$K9T$/$@(B
+$B$1$G!"%&%'%V8!:w$r;O$a$5$;$k$N$G$9!#$3$N%b!<%I$NF0:n$ND9=j$O!"<!$NDL$j(B
+$B$G$9(B:
+
+   * $BB.$$!#%(%s%8%s$H8!:w8l$rA*$V$N$K!"0l$D$N(B URL $B$r%?%$%W$9$k$@$1$G$9!#(B
+
+   * $BJXMx!#$3$N5!G=$K$h$C$F!"MF0W$K(B emacs-w3m $B$N%?%V$+%&%#%s%I%%$r3+$$(B
+     $B$F!"8!:w$r;O$a$k$3$H$,$G$-$^$9!#Nc$($P!"(B`G' $B%-!<$G?7$7$$%&%#%s%I%&(B
+     $B$r3+$$$F%/%$%C%/%5!<%A(B URL $B$K9T$/$h$&$K!#$=$7$F!"FCJL$N%/%$%C%/%5!<(B
+     $B%A(B URL $B$=$N$b$N$K$b!"%V%C%/%^!<%/$rIU$1$k$3$H$,$G$-$^$9!#(B
+
+   * $B%0%k!<%T%s%05!G=$b;H$($k!#Nc$($P(B `group:gg:emacs&ya:w3m' $B$N$h$&(B
+     $B$J(B URL $B$K$h$C$F!"F1;~$KFs$D$N8!:w$r;O$a$k$3$H$,$G$-$^$9!#Nc$($P$3$N>l9g(B
+     $B$O!"(BGoogle $B$G(B "emacs" $B$N!"(BYahoo! $B$G(B "w3m" $B$N8!:w$r$=$l$>$l;O$a$^$9!#(B
+     *Note Grouping URLs::.
+
+$B$3$l$r;H$&$N$O$H$F$b4JC1$G$9!#(B"gnu" $B$H$$$&C18l$r(B Google $B$GC5$7$F7k2L$N(B
+$B%j%9%H$rF@$?$$$N$G$"$l$P!"(B`g' $B$rC!$$$F$+$i(B "gg:gnu" $B$H$$$&(B URL $B$r(B
+$B%?%$%W$7$F$/$@$5$$!#$3$NI=8=$NBh0l$NItJ,(B "gg" $B$O!"(BGoogle $B8!:w%(%s%8%s$r(B
+$B;HMQ$7$?$$$3$H$r<($7$^$9!#BhFs$NItJ,$O8!:w8l$G$9!#%(%s%8%s$H8!:w8l$O!"%3(B
+$B%m%s$GJ,$1$J$1$l$P$J$j$^$;$s!#$=$7$F(B `<RET>' $B$rC!$1$P8!:w7k2L$r(B
+$B8+$k$3$H$,$G$-$^$9!#%9%Z!<%9$GJ,N%$7$?J#?t$N8l$rF~NO$G$-$k$3$H$r!"?4$KN1(B
+$B$a$F$*$$$F$/$@$5$$!#(B"Feeling Lucky" $B5!G=$,M-8z$K$J$C$F$$$l$P!"%_%K%P%C(B
+$B%U%!$G(B `<SPC>' $B$O(B self-insert $B%-!<$K$J$C$F$$$^$9(B ($B$3$l$,%G%U%)%k(B
+$B%H$G$9!#(B`w3m-enable-google-feeling-lucky' $B$r;2>H$7$F$/$@$5$$!#(B) $BL5(B
+$B8z$K$7$F$"$k>l9g$O!":G=i$K(B `C-q' $B$rC!$$$F$/$@$5$$!#$D$^(B
+$B$j(B `C-q <SPC>' $B$G$9!#(B
+
+Emacs-w3m $B$N%G%U%)%k%H$G$O!"MxMQ2DG=$J$$$/$D$+$N8!:w%(%s%8%s$NC;=L7A$,(B
+$B$"$j!"$=$l$i$OJQ?t(B `w3m-uri-replace-alist' $B$GDj5A$5$l$F$$$^$9!#Nc$($P(B
+Google $B$K$O(B "gg"$B!"(BGoogle Groups $BMQ$K$O(B "ggg"$B!"(BYahoo! $B$N$?$a$N(B "ya"$B!"(B
+Altavista $B$KBP$9$k(B "al" $B$*$h$S(B $B1Q<-O/(B on the WEB $B$N(B "alc" $B$J$I$NC;$$L>(B
+$BA0$G$9!#$5$i$K8!:w%(%s%8%s$NC;=L7A$rDI2C$9$k$K$O(B *Note Adding New
+Search Engines:: $B$r;2>H$7$F$/$@$5$$!#(B
+
+$BC;=L7A$NBe$o$j$K!"(B"google" $B$d(B "yahoo" $B$N$h$&$J40A4$J%(%s%8%s$NL>A0$r!"(B
+$B%/%$%C%/%5!<%A(B URL $B$K;H$&$3$H$b$G$-$^$9!#$=$l$i$NL>A0$O!"JQ?t(B
+`w3m-search-engine-alist' $B$GDj5A$5$l$^$9!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Adding New Search Engines, Prev: Quick Searching, Up: Using Search Engines
+
+$A$*$B5$$A$KHk$j$N%(%s%8%s$rJ9$&$K$O(B?
+-------------------------------
+
+Emacs-w3m $B$OMxMQ2DG=$JB?$/$N8!:w%(%s%8%s$r;}$C$F$$$^$9!#$"$J$?$N$*5$$K(B
+$BF~$j$N8!:w%(%s%8%s$r;H$$$?$$$N$K!"K|$,0l$K$b$=$l$,4{CN$N8!:w%(%s%8%s$N(B
+$B%j%9%H$K:\$C$F$$$J$+$C$?$i$I$&$7$^$7$g$&(B?  $B$=$l$r8!:w%(%s%8%s$N%j%9%H$K(B
+$B2C$($l$PNI$$$N$G$9!#$=$7$F$=$l$O6K$a$F4JC1$G$9(B:
+
+  1. $B:G=i$K!"$"$J$?$,2C$($?$$8!:w%(%s%8%s$N%(%s%H%j!<!&%]%$%s%H$,2?$+$r(B
+     $BCN$i$J$1$l$P$J$j$^$;$s!#Nc$($P(B:
+
+     `http://my.searchengine.com/?query=foobar'
+
+     $B$3$3$G(B foobar $B$O$"$J$?$,8!:w$7$?$$8l$G$9!#(B
+
+  2. $B$3$N>pJs$,<j$KF~$C$?$i!"(B`~/.emacs-w3m' $B%U%!%$%k$K2C$($F$/$@$5$$(B:
+
+          (eval-after-load "w3m-search"
+            '(add-to-list 'w3m-search-engine-alist
+                          '("My engine"
+                            "http://my.searchengine.com/?query=%s"
+                            nil)))
+
+     $BBh0l%U%#!<%k%I$N(B "My engine" $B$r$"$J$?$N%(%s%8%s$N@bL@$G!"BhFs%U%#!<(B
+     $B%k%I$r%(%s%H%j!<!&%]%$%s%H$GCV$-49$($F$/$@$5$$(B (`%s' $B$O=EMW$G$9!#(B
+     $B$3$l$O8!:w$r9T$J$&$H$-$K!"8!:w8l$GCV$-49$($i$l$^$9(B)$B!#$=$7$FBh;0(B
+     $B%U%#!<%k%I$O;HMQ$9$k%(%s%3!<%G%#%s%0$r0UL#$7!"(B`nil' $B$^$?$O$=$l$,>J(B
+     $BN,$5$l$?>l9g$OJQ?t(B `w3m-default-coding-system' $B$NCM$,I8=`$N%(%s%3!<(B
+     $B%G%#%s%0$H$7$F;H$o$l$^$9!#(B
+
+     $B1Q8l$N8!:w%(%s%8%s$G$OLGB?$K5$$K$9$kI,MW$,L5$$$3$H$J$N$G$9$,!"$$$/(B
+     $B$D$+$NF|K\$N8!:w%(%s%8%s$G$O!"$=$l$K2?$+(B ($BNc$($P(B `euc-japan') $B$r;X(B
+     $BDj$9$kI,MW$,$"$k$+$b$7$l$^$;$s!#(B
+
+  3. $B:#$d$3$N8!:w%(%s%8%s$O!"(Bemacs-w3m $B$GDL>o$N(B `S' $B%-!<(B (`Info-like'
+     $B%-!<%^%C%W$N>l9g$O(B `s' $B%-!<(B) $B$G;H$&$3$H$,$G$-$^$9!#$3$N%(%s%8%s$r(B
+     $BIQHK$K;H$&$N$J$i$P!"C;$$%(%s%8%s$NL>A0$r%/%$%C%/%5!<%A%(%s%8%s(B
+     (*Note Quick Searching:: $B$r;2>H(B) $B$K2C$($k$3$H$b$G$-$^$9!#$=$l$K$O!"(B
+     $B0J2<$N%3!<%I$r(B `~/.emacs-w3m' $B%U%!%$%k$KDI2C$7$F$/$@$5$$(B:
+
+          (eval-after-load "w3m-search"
+            '(progn
+               (add-to-list 'w3m-search-engine-alist
+                            '("My engine"
+                              "http://my.searchengine.com/?query=%s"
+                              nil))
+               (add-to-list 'w3m-uri-replace-alist
+                            '("\\`my:" w3m-search-uri-replace "My engine"))))
+
+     $B$3$l$K$h$j!"(B`my:foobar' $B$N$h$&$J(B URL $B$r;H$C$F!"$"$J$?$N8!:w%(%s%8(B
+     $B%s$G(B "foobar" $B$H$$$&8l$r8!:w$9$k$3$H$,$G$-$^$9!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Grouping URLs, Next: Weather Information, Prev: Using Search Engines, Up: Pretty Good Features
+
+$AR;$D$N(B URL $A$G$(Gno$AJ}$N%&%'%V%Z$B!<$A%8$r$(GKD$A$k(B
+=====================================
+
+Emacs-w3m $B$O(B "group URLs" $B$H$$$&!"J#?t$N<B:]$N(B URL $B$r0l$D$K$^$H$a$?FCJL(B
+$B$J(B URL $B$r07$&$3$H$,$G$-$^$9!#$=$N$h$&$J%0%k!<%W(B URL $B$r3+$/$H!"(B
+emacs-w3m $B$O0lEY$KJ#?t$N%Z!<%8$r3+$/$?$a$K!"$=$N%0%k!<%W$K4^$^$l$k$=$l(B
+$B$>$l$N(B URL $B$KBP$7$F0l$D$N%P%C%U%!$r3+$-$^$9!#(B
+
+$B%0%k!<%W(B URL $B$r:n$k$K$O!"3+$-$?$$$9$Y$F$N%Z!<%8$N%"%I%l%9$rC1$K%"%s%Q%5(B
+$B%s%I5-9f(B ("&") $B$G0l=o$K$7$F(B ($B$9$J$o$A7k9g$7$F(B)$B!"%0%k!<%W(B URL $B$rI=$9@\F,(B
+$B<-$N(B "group:" $B$rIU$1$l$PNI$$$N$G$9!#Nc$r5s$2$k$H!"(BGNU $B%W%m%8%'%/%H$N%[!<(B
+$B%`%Z!<%8(B `http://www.gnu.org/' $B$H(B Savannah $B%[!<%`%Z!<%8(B
+`http://savannah.nongnu.org/' $B$r8+$?$$$b$N$H$9$l$P!"%0%k!<%W(B URL $B$O<!$N(B
+$B$h$&$J$b$N$K$J$k$G$7$g$&!#(B
+
+`group:http://www.gnu.org/&http://savannah.nongnu.org/'
+
+$B$3$N9=J8$rF|>oE*$K;H$&$N$O$+$J$j?I$$$b$N$,$"$j$^$9$,!"Hs>o$KC;$$(B URL
+($BNc$($P%/%$%C%/%5!<%A(B URL$B!"(B*Note Quick Searching:: $B$r;2>H(B) $B$dHsBPOC7?$G(B
+$B;H$&>u67$G$O!"$3$N5!G=$O$*$*$$$KLrN)$D$G$7$g$&!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Weather Information, Next: Using Antenna, Prev: Grouping URLs, Up: Pretty Good Features
+
+$ACwHU$NLl$B5$$A$OGg$l$G$7$g$&(B
+========================
+
+
+
+
+File: emacs-w3m-ja.info, Node: Using Antenna, Next: Showing Directory Tree, Prev: Weather Information, Up: Pretty Good Features
+
+$A%"%s%F%J$r$(GZ/$A$jQ2$i$=$&(B
+======================
+
+$B%"%s%F%J$O%&%'%V%Z!<%8$NJQ2=$rDI@W$9$k$?$a$NF;6q$G$9!#%"%s%F%J$r;H$&$H!"(B
+$BFCDj$N%Z!<%8$,!"0JA0$K8+$?$H$-$+$i99?7$5$l$?$+$5$l$J$+$C$?$+$r!"<~4|E*(B
+$B$K%A%'%C%/$9$k$3$H$,$G$-$^$9!#(B
+
+$B$$$:$l$+$N(B emacs-w3m $B%P%C%U%!$G(B `A' $B$r;H$&$3$H$K$h$C$F!"%"%s%F%J$r;O$a(B
+$B$k$3$H$,$G$-$^$9!#$"$k$$$O!"FCJL$N(B URL `about://antenna/' $B$K9T$/$3$H$K(B
+$B$h$C$F$bF1$8$3$H$,$G$-$^$9!#(B
+
+* Menu:
+
+* Setting up Antenna::          $B%&%'%V%5%$%H$r%"%s%F%J$K2C$($k$K$O(B?
+* Daily web tracking::          $B%"%s%F%J$GJQ2=$rDI@W$9$k(B
+
+
+
+File: emacs-w3m-ja.info, Node: Setting up Antenna, Next: Daily web tracking, Prev: Using Antenna, Up: Using Antenna
+
+$A%&%'%V%5%$%H$r%"%s%F%J$K<S$($k$K$O(B?
+-----------------------------------
+
+$B8=$KI=<(Cf$N%&%'%V%Z!<%8$r%"%s%F%J$K2C$($k$K$O!"C1=c$K(B `+' $B%-!<$r2!$7$F(B
+$B$/$@$5$$!#$9$Y$F$N%U%#!<%k%I$,$9$G$K=q$-$3$^$l$F$$$k(B
+`w3m-antenna-sites' $B$r%+%9%?%^%$%:$9$k$?$a$N%P%C%U%!$,8=$l$k$G$7$g$&!#(B
+$B$"$J$?$OC1$K(B "Save for future sessions" $B$H(B "Finish" $B$N%\%?%s$r2!$;$PNI(B
+$B$$$N$G$9!#(B
+
+`+'
+     URL $B$r%"%s%F%J!&%G!<%?%Y!<%9$K2C$($^$9!#@\F,0z?tIU$-$G8F$P$l$?>l9g(B
+     $B$O!"8=:_$N%Z!<%8$rDI2C$9$k$N$G$O$J$/$F!"2C$($k(B URL $B$r?R$M$^$9(B
+     (`w3m-antenna-add-current-url')$B!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Daily web tracking, Prev: Setting up Antenna, Up: Using Antenna
+
+$A%"%s%F%J$G$(I+y$A;/$rW7$(Gfx$A$9$k(B
+------------------------
+
+$B%"%s%F%J!&%Z!<%8$K$OFs$D$N9`L\$,8=$l$^$9!#0l$D$O(B "Updated" $B$H8F$P$l!"$b(B
+$B$&0l$D$O(B "Visited" $B$H8F$P$l$^$9!#(B"Updated" $B$N9`L\$G$O:G8e$K%"%s%F%J$r99(B
+$B?7$7$?8e$GJQ2=$7$?%&%'%V%5%$%H$,!"$=$7$F(B "Visited" $B$N9`L\$G$OJQ2=$7$J$+$C(B
+$B$?%&%'%V%5%$%H$,8+$D$+$j$^$9!#$=$l$>$l$N9`L\$G!"3F9T$O%"%s%F%J!&%G!<%?(B
+$B%Y!<%9$N0l$D$N%&%'%V%5%$%H$rI=$7!"0J2<$N9=B$$K$J$C$F$$$^$9(B:
+
+`  * 2002/12/15 16:43  (T)  My website'
+
+$B:G=i$NItJ,$O!"%"%s%F%J$,:G8e$K$=$N%Z!<%8$NJQ2=$rJs9p$7$?!"$=$N%&%'%V%5(B
+$B%$%H$,99?7$5$l$?:G=*;~9o$G$9!#$^$?$O$=$N>pJs$,F@$i$l$J$$$3$H$b$"$j$^$9!#(B
+
+`(T)' $B$O(B "Time" $B$rI=$7!":G8e$K%"%s%F%J$r99?7$7$?8e$G!"$=$N%Z!<%8$NJQ99(B
+$B;~9o$,JQ2=$7$?$N$G!"JQ2=$,8!=P$5$l$?$3$H$r0UL#$7$^$9!#$b$&0l$D$N2DG=@-(B
+$B$,$"$kCM$O(B `S' ("Size" $B$N$3$H(B) $B$G!"$=$N%Z!<%8$N%5%$%:$,JQ2=$7$?$N$G!"JQ(B
+$B2=$,8!=P$5$l$?$3$H$r0UL#$7$^$9!#(B
+
+$B9T$N:G8e$NItJ,$O!"%G!<%?%Y!<%9$KDI2C$7$?$H$-$KM?$($?!"$3$N%&%'%V%5%$%H(B
+$B$N%?%$%H%k$G$9!#(B
+
+$B$I$&$+!"%"%s%F%J!&%G!<%?%Y!<%9$O<+F0E*$K99?7$5$l$J$$$3$H$KCm0U$7$F$/$@$5(B
+$B$$!#%"%s%F%J!&%Z!<%8$G(B `R' $B$rC!$/$+!"$^$?$O@\F,0z?t$r%3%^%s%I$KEO(B
+$B$9(B ($BNc$($P(B `C-u A' $B$G%"%s%F%J$r;O$a$k(B) $B$3$H$K$h$C$F!"%5%$%H$,JQ(B
+$B2=$7$?$+$I$&$+$r%A%'%C%/$7$?$$Kh$K!"$=$l$r99?7$7$J$1$l$P$J$j$^$;$s!#(B
+
+$B$b$7!"<+F0$G99?7$5$;$?$$$J$i!"JQ?t(B `w3m-antenna-refresh-interval' $B$K99(B
+$B?74V3V$rIC$G@_Dj$7$F$/$@$5$$!#(B
+
+`A'
+     $B%"%s%F%J$N%Z!<%8$K9T$-$^$9!#@\F,0z?tIU$-$G8F$P$l$?>l9g$O!"I=<($9$k(B
+     $BA0$K%"%s%F%J!&%G!<%?%Y!<%9$r99?7$7$^$9(B (`w3m-antenna')$B!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Showing Directory Tree, Next: Viewing Perl Documents, Prev: Using Antenna, Up: Pretty Good Features
+
+$A%G%#%l%/%H%j$ND>$(Gi,$ATl$r1mJ>$9$k(B
+==============================
+
+`w3m-dtree' $B%3%^%s%I$r;H$&$H!"%m!<%+%k%G%#%l%/%H%j$N$9$Y$F$N%5%V%G%#%l(B
+$B%/%H%j$NLZ9=B$$rI=<($7$F!"IaDL$N%&%'%V%Z!<%8$N$h$&$K1\Mw$9$k$3$H$,$G$-(B
+$B$^$9!#$3$N5!G=$r;H$C$?$H$-$K8=$l$k(B emacs-w3m $B$N%P%C%U%!$O!"$=$NL>A0$f$((B
+$B$K30It$N(B "tree" $B%W%m%0%i%`$N=PNO$KHs>o$KN`;w$7$?$b$N$K$J$j$^$9!#$5$i$K(B
+emacs-w3m $B$+$i$N%\!<%J%9(B: $B$3$N%3%^%s%I$r@\F,0z?tIU$-$G8F$V$H%U%!%$%k$b(B
+$BI=<($7!"(Bemacs-w3m $B$O40A4AuHw$N%U%!%$%k1\Mw4o$KJQ?H$7$^$9!#(B
+
+Emacs-w3m dtree $B$,$I$s$J$U$&$KF0:n$9$k$+$NNc$G$9(B:
+
+     /home/romain/.elisp/emacs-w3m/
+      |-CVS/
+      |-attic/
+      |  +-CVS/
+      |-autom4te.cache/
+      |-doc/
+      |  |-CVS/
+      |  +-emacs-w3m/
+      |-icons/
+      |  +-CVS/
+      |-patches/
+      |  +-CVS/
+      +-shimbun/
+         +-CVS/
+
+$B@\F,0z?t$rIU$1$k$H!"Be$o$j$K$3$s$J$U$&$K$J$j$^$9(B:
+
+     /home/romain/.elisp/emacs-w3m/ (allfiles)
+      |-(f).cvsignore
+      |-(f)BUGS.ja
+      |-(f)COPYING
+      |-[d]CVS/
+      |  |-(f)Entries
+      |  |-(f)Repository
+      |  +-(f)Root
+      |-(f)ChangeLog
+      |-(f)ChangeLog.1
+      |-(f)Makefile
+      |-(f)Makefile.in
+      |-(f)README
+      |-(f)README.ja
+
+`D' (Lynx-like $A%-$B!<$A%^%C%W(B)
+`T' (Info-like $A%-$B!<$A%^%C%W(B)
+     $B%_%K%P%C%U%!$G%m!<%+%k%G%#%l%/%H%j$NF~NO$r5a$a!"$=$NLZ9=B$$rI=<($7$^$9!#(B
+     $B@\F,0z?tIU$-$G8F$P$l$k$H(B ($BNc(B: `C-u D'$B!"$?$@(B
+     $B$7(B `Info-like' $B%-!<%^%C%W$N>l9g$O(B `C-u T')$B!"$=$N%G%#%l%/%H(B
+     $B%j$K$"$k%U%!%$%k$bI=<($7$^$9(B (`w3m-dtree')$B!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Viewing Perl Documents, Next: Using Namazu, Prev: Showing Directory Tree, Up: Pretty Good Features
+
+Perl $A$N%I%-%e%a%s%H$r$(GKD$A$k(B
+=========================
+
+
+
+
+File: emacs-w3m-ja.info, Node: Using Namazu, Next: Octet, Prev: Viewing Perl Documents, Up: Pretty Good Features
+
+Namazu $A$G%U%!%$%k$r$(I<D$AKw$9$k(B
+===========================
+
+emacs-w3m $B$O!"A4J88!:w%=%U%H(B Namazu $B$r;H$C$F%U%!%$%k$r8!:w$9$k$3$H$b$G(B
+$B$-$^$9(B (`w3m-namazu')$B!#$3$N5!G=$r;H$&$?$a$K$O!"(BNamazu $B$r0J2<$N>l=j$+$i(B
+$B<hF@$7$F!"%$%s%9%H!<%k$7$F$*$/I,MW$,$"$j$^$9(B:
+
+`http://namazu.org/'
+
+Namazu $B$r;H$&$?$a$K$O!"<B:]$K8!:w$r9T$&A0$K!"8!:wBP>]$H$J$k%U%!%$%k$K4^(B
+$B$^$l$F$$$kC18l$N:w0z(B ($B%$%s%G%C%/%9(B) $B$r:n@.$7$F$*$/I,MW$,$"$j$^$9!#$b$C(B
+$B$H$bE57?E*$J%3%^%s%I$O0J2<$NDL$j$G$9!#(B
+
+     % mknmz -O <$B%$%s%G%C%/%9$rCV$/%G%#%l%/%H%j(B> <$B%I%-%e%a%s%H$N$"$k%G%#%l%/%H%j(B>
+
+`w3m-namazu' $B$rF0$+$9A0$K!"$$$/$D$+$NJQ?t$r@_Dj$7$F$*$/I,MW$,$"$j$^$9!#(B
+$B0J2<$NJQ?t$r!";H$C$F$$$k4D6-$K$"$o$;$F@_Dj$7$F$/$@$5$$!#(B
+
+`w3m-namazu-index-alist'
+     $B%$%s%G%C%/%9$NJ]B8$5$l$F$$$k%G%#%l%/%H%j$NO"A[G[Ns$r@_Dj$7$^$9!#(B
+     `w3m-namazu' $B$G$O!"%$%s%G%C%/%9$NJ]B8$5$l$F$$$k%G%#%l%/%H%j$KBP$7(B
+     $B$F!"%G%#%l%/%H%jL>$h$j$bJ,$+$j$d$9$$JLL>$rDj5A$9$k$3$H$,$G$-$^$9!#(B
+     $B$^$?!"4v$D$+$NJL!9$N%$%s%G%C%/%9$r!"$"$?$+$bC10l$N%$%s%G%C%/%9$G$"(B
+     $B$k$+$N$h$&$K07$&$3$H$b$G$-$^$9!#$=$N$?$a$K$O!"<!$N$h$&$KJLL>$r%-!<(B
+     $B$H$7!"%$%s%G%C%/%9$NJ]B8$5$l$F$$$k%G%#%l%/%H%j(B ($B$N%j%9%H(B) $B$rCM$H$9(B
+     $B$kO"A[G[Ns$r(B `w3m-namazu-index-alist' $B$K@_Dj$7$^$9!#(B
+
+          (setq w3m-namazu-index-alist
+                '(("alias1" "Path/to/the/index/directory1")
+                  ("alias2" "Path/to/the/index/dir2"
+                            "Path/to/the/index/dir3")))
+
+`w3m-namazu-default-index'
+     $B8!:wBP>]$H$9$k%$%s%G%C%/%9$r;XDj$7$^$9!#<B:]$K%$%s%G%C%/%9$,J]B8$5$l$F$$(B
+     $B$k%G%#%l%/%H%j$d!"(B`w3m-namazu-index-alist' $B$r@_Dj$9$k$H$-$K;H$C$?JL(B
+     $BL>$,;H$($^$9!#CM$,(B `nil' $B$N>l9g$O!"(B
+     `M-x w3m-namazu <RET>' $B$H<B9T$9$k$?$S$K!"8!:wBP>]$H$9$k%$%s(B
+     $B%G%C%/%9$rLd$$9g$o$;$^$9!#(B
+
+$B$3$l$G=`Hw$,@0$$$^$7$?$+$i!"(B
+`M-x w3m-namazu <RET> query <RET>' $B$H$9$k$H!"J8;zNs(B query $B$r(B
+$B8!:w$9$k$3$H$,$G$-$^$9!#%G%U%)%k%H0J30$N%$%s%G%C%/%9$rBP>]$H$7$F8!:w$r9T(B
+$B$&>l9g$O!"(B`C-u M-x w3m-namazu' $B$H$$$&$h$&$KA0CV0z?t$r;XDj$7$F<B(B
+$B9T$7$^$9!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Octet, Next: Frame Local Buffers, Prev: Using Namazu, Up: Pretty Good Features
+
+application/octet-stream $A%G$B!<$A%?$r$(GKD$A$k(B
+=====================================
+
+($B:n@.Cf(B)
+
+$B0J2<$N@_Dj$r(B `~/.emacs' $B$K=q$$$F$*$/$H!"(B`octet-find-file' $B$G%U%!%$%k$r(B
+$B3+$$$?$H$-$KJXMx$+$bCN$l$^$;$s!#(B
+
+     (add-hook 'octet-find-file-hook 'view-mode)
+     (add-hook 'octet-find-file-hook 'w3m-minor-mode)
+
+
+
+File: emacs-w3m-ja.info, Node: Frame Local Buffers, Next: Session Manager, Prev: Octet, Up: Pretty Good Features
+
+$A6`J}$N%;%C%7%g%s$r%U%l$B!<$A%`$G%0%k$B!<$A%W7V$1$9$k(B
+============================================
+
+$BB??t$N(B emacs-w3m $B$N%;%C%7%g%s$r%0%k!<%WKh$KJL!9$N%U%l!<%`$KJ,3d$9$k$3$H(B
+$B$,$G$-$^$9!#Nc$($PFs$D$N(B emacs-w3m $B$N%U%l!<%`$rMQ0U$7$F!"0l$D$O8!:w%(%s(B
+$B%8%s72$r07$$!"$b$&0lJ}$G$O%K%e!<%9%5%$%H72$r07$&$h$&$J;H$$J}$G$9!#(B
+
+Emacs-w3m $B$O$?$/$5$s$N%Z!<%8$rF1;~$K8+$k$?$a$N$$$/$D$+$N5!G=$rDs6!$7$^(B
+$B$9!#Nc$($P!"$?$/$5$s$N%Z!<%8$r$=$l$>$l?7$7$$%;%C%7%g%s$H$7$FN)$A>e$2$k(B
+$B$?$a$K%?%V$r;H$C$?$j(B (*Note Using Tabs::)$B!"$^$?$O(B `group:' $B$G;O$^$kFCJL(B
+$B$J(B URL (*Note Grouping URLs::) $B$r;H$&$3$H$,$G$-$^$9!#$7$+$7!"$"$^$j$K$?(B
+$B$/$5$s$N%Z!<%8$,$"$k>l9g$O!"$=$l$i$rJL!9$N%U%l!<%`$G%0%k!<%WJ,$1$r$7$?(B
+$B$$$H;W$&$+$b$7$l$^$;$s!#$=$&$G$"$l$P!"(B`w3m-fb-mode' $B%3%^%s%I$O$"$J$?$N(B
+$B$?$a$N$b$N$G$9!#$?$@$7$=$l$r;H$&$?$a$K$O(B `w3m-use-tab' $BJQ?t$rHs(B-`nil'
+($B%G%U%)%k%H$G(B `t') $B$K!"(B`w3m-pop-up-frames' $BJQ?t$r(B `nil' ($B$=$l$,%G%U%)%k(B
+$B%H(B) $B$K@_Dj$7$F$*$+$J$1$l$P$J$j$^$;$s(B (*Note General Variables::)$B!#(B
+
+`M-x w3m-fb-mode' $B$r%?%$%W$9$k$H%b!<%I$,%H%0%k$K@Z$jBX$o$j$^$9$,!"(B
+$B@\F,0z?t$H$7$F$=$N%3%^%s%I$K@5$N@0?t$rM?$($k$3$H$K$h$C$F!"%b!<%I$r(B on $B$K(B
+$B$9$k$3$H$,$G$-$^$9(B ($B%<%m0J2<$G$O(B off $B$K$J$j$^$9(B)$B!#(B
+
+`w3m-fb-mode' $B$,(B on $B$K$J$C$F$$$k$H!"8=:_$N%U%l!<%`$G3+;O$7$?%;%C%7%g%s(B
+$B$O$=$N%U%l!<%`$@$1$K4XO"IU$1$i$l$^$9!#$=$7$FB>$N%U%l!<%`$G3+$$$?B>$N%;%C(B
+$B%7%g%s$O!"F1MM$K$=$l$i$N%U%l!<%`$@$1$K8=$l$^$9!#8@$$49$($k$H!"$"$k%U%l!<(B
+$B%`$K4XO"IU$1$i$l$?%;%C%7%g%s$OB>$N%U%l!<%`$K$O8=$l$^$;$s!#(B
+`w3m-fb-mode' $B$O?7$7$$%U%l!<%`$r:n$i$J$$$N$G!"$=$l$i$O2?$i$+$NJ}K!$G$"(B
+$B$J$?<+?H$,:n$kI,MW$,$"$j$^$9!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Session Manager, Prev: Frame Local Buffers, Up: Pretty Good Features
+
+$A%;%C%7%g%s$N1#4f$H$BFI$A$_$3$_(B
+==========================
+
+emacs-w3m $B$G$O%;%C%7%g%sAH$rJ]B8$7$?$jFI$_$3$s$@$j$9$k$3$H$,$G$-$^$9!#(B
+
+$B>-Mh;H$&$?$a$K!":#3+$$$F$$$k%;%C%7%g%sAH$rJ]B8$G$-$^$9!#(B`M-S' $B$r2!$7$F!"(B
+$B$=$N%;%C%7%g%s>pJs$KL>A0$r$D$1$F$/$@$5$$!#(B
+
+$B$=$&$9$k$H<!$O!"J]B8$7$?%;%C%7%g%sAH$rI|5"$7$?$/$J$k$H;W$$$^$9!#(B`M-s'
+$B$r2!$9$H%;%C%7%g%sA*Br%a%K%e!<$,3+$-$^$9!#$3$N%a%K%e!<$N%-!<%P%$%s%I$O(B
+$B0J2<$N$h$&$K$J$C$F$$$^$9!#(B
+
+`<RET>'
+     $BA*Br$5$l$F$$$k%;%C%7%g%sAH$K4^$^$l$k$9$Y$F$N%;%C%7%g%s$r3+$-$^$9!#(B
+
+`M-s'
+     $BA*Br$5$l$F$$$k%;%C%7%g%sAH$N>\:Y$J%a%K%e!<$r3+$-$^$9!#$3$l$r;H$C$F(B
+     $B%;%C%7%g%sAH$NCf$N%;%C%7%g%s$r0l$D$:$D3+$/$3$H$,$G$-$^$9!#(B
+
+`d'
+     $BA*Br$5$l$F$$$k%;%C%7%g%sAH!"$^$?$O%;%C%7%g%s$r:o=|$7$^$9!#(B
+
+`r'
+     $BA*Br$5$l$F$$$k%;%C%7%g%sAH$NL>A0$rJQ99$7$^$9!#(B
+
+`s'
+     $B8=:_3+$$$F$$$k$9$Y$F$N%;%C%7%g%s$rJ]B8$7$^$9!#(B`M-S' $B$HF1$8$G$9!#(B
+
+`n'
+     $B%+!<%=%k$r<!$N%;%C%7%g%sAH$KF0$+$7$^$9!#(B
+
+`p'
+     $B%+!<%=%k$rA0$N%;%C%7%g%sAH$KF0$+$7$^$9!#(B
+
+`q'
+     $B%;%C%7%g%sA*Br%a%K%e!<$r=*N;$7$^$9!#(B
+
+emacs-w3m $B$O%;%C%7%g%sAH$r<+F0E*$KJ]B8$9$k$3$H$,$G$-$^$9!#(B
+`w3m-session-deleted-save' $B$,(B non-`nil' $B$N;~!"(Bemacs-w3m $B$OJD$8$i$l$?%;%C(B
+$B%7%g%s$r<+F0E*$KJ]B8$7$^$9!#$3$l$O!"$&$C$+$j%;%C%7%g%s$rJD$8$F$7$^$C$?(B
+$B;~$J$I$KJXMx$G$7$g$&!#(B`w3m-session-automatic-save' $B$,(B non-`nil' $B$J$i$P!"(B
+emacs-w3m $B=*N;;~$K3+$$$F$$$?$9$Y$F$N%;%C%7%g%s$r<+F0E*$KJ]B8$7$^$9!#(B
+
+$B<+F0E*$KJ]B8$5$l$F$$$k%;%C%7%g%sAH$N$3$H$rK:$l$F$7$^$C$F!"$J$K$+$*$b$7(B
+$B$m$$%Z!<%8$N(B URL $B$rK:$l$F$7$^$&$H$$$&$3$H$,;~!9$"$j$^$9!#(Bemacs-w3m $B$O$3(B
+$B$&$$$&$3$H$rKI;_$9$k$3$H$,$G$-$^$9!#(B`w3m-session-load-last-sessions' $B$,(B
+`auto' $B$G$"$l$P!"(Bemacs-w3m $B$O<+F0E*$KA02s3+$$$F$$$?%;%C%7%g%s$?$A$rI|5"(B
+$B$7$^$9!#(B`w3m-session-load-last-sessions' $B$,(B `ask' $B$G$"$l$P!"(Bemacs-w3m
+$B$O$=$l$rI|5"$9$k$+$I$&$+$r$?$:$M$^$9!#(B($B%G%U%)%k%H$O(B `nil' $B$K$J$C$F$$$^(B
+$B$9!#(B)
+
+$B%/%i%C%7%e$G6l$$7P83$r$7$?$3$H$,$"$k$H;W$$$^$9!#(B $B%/%i%C%7%e$K$"$&$H$,$C(B
+$B$+$j$7$^$9$7!"8+$F$$$?%Z!<%8$,$I$3$+$bK:$l$F$7$^$$$^$9!#(B emacs-w3m $B$O$3(B
+$B$s$J>u67$G$b=u$1$F$/$l$^$9!#(B `w3m-session-crash-recovery' $B$,(Bnon-`nil'
+$B$J$i$P!"(B emacs-w3m $B$OI=<($7$F$$$k%;%C%7%g%sAH$r%/%i%C%7%eI|85MQ$K<+F0E*(B
+$B$KJ]B8$7!"%/%i%C%7%e$,5/$3$C$?;~$KJ]B8$7$F$$$?%;%C%7%g%sAH$rI|85$7$^$9!#(B
+($B%G%U%)%k%H$O(B `t' $B$K$J$C$F$$$^$9!#(B)
+`w3m-session-load-crashed-sessions' $B$,(Bnon-`nil' $B$G$"$l$P!"(Bemacs-w3m $B$O(B
+$B$3$NI|85$r<+F0E*$K9T$J$$$^$9!#(B`w3m-session-load-crashed-sessions' $B$,(B
+`ask' $B$G$"$l$P!"(Bemacs-w3m $B$OI|85$9$k$+$I$&$+$r$?$:$M$^$9!#(B ($B%G%U%)%k%H(B
+$B$O(B `ask' $B$K$J$C$F$$$^$9!#(B)
+
+
+
+File: emacs-w3m-ja.info, Node: Customizable Variables, Next: Hooking into MUAs, Prev: Pretty Good Features, Up: Top
+
+$A%G%U%)%k%H$N$^$^$G$b$(Ga8i,$AA<$$$HK<$&$1$l$I(B
+****************************************
+
+$B$?$/$5$s$N(B emacs-w3m $B$NJQ?t$,!"(BCustom $B$N;E3]$1$K$h$C$F%+%9%?%^%$%:$9$k$3(B
+$B$H$,$G$-$^$9!#(BCustom $B$OJQ?t$rDj5A$9$k$?$a$N!"(BEmacs $B$N%0%i%U%#%C%/!&%$%s(B
+$B%?!<%U%'!<%9$G$9!#(BCustom $B$K$O$$$/$D$+$N%+%9%?%^%$%:$N$?$a$N<jCJ$,$"$j!"(B
+$BNc$($PC10l$N%*%W%7%g%s(B ($B$9$J$o$A!"(BEmacs Lisp $BJQ?t(B) $B$N$?$a(B
+$B$N(B `M-x customize-option'$B!"$^$?$O$"$k(B "group" ($B$3$N>l9g$N%0%k!<(B
+$B%W$O(B `w3m') $B$KB0$9$k$9$Y$F$N%*%W%7%g%s(B ($BJQ?t$H%U%'!<%9(B) $B$r8+$F!"$+(B
+$B$DJQ99$9$k$?$a$N(B `M-x customize-group' $B$,;H$($^$9!#(B
+
+$B$"$k$$$O(B ($B$b$7(B Custom $B$r;H$$$?$/$J$$$N$G$"$l$P(B)$B!"G$0U$N(B Emacs Lisp $B<0$r(B
+emacs-w3m $B=i4|@_Dj%U%!%$%k$K=q$-9~$`$3$H$,$G$-$^$9!#%G%U%)%k%H$N%U%!%$(B
+$B%k$O(B `~/.emacs-w3m' $B$G$9!#Nc$($P!"(B
+
+     (setq w3m-home-page "http://emacs-w3m.namazu.org/")
+
+$B$3$l$O%G%U%)%k%H$N%[!<%`%Z!<%8$r(B `http://emacs-w3m.namazu.org/' $B$K@_Dj(B
+$B$7$^$9!#%7%s%?%C%/%9$O(B `.emacs' $B%U%!%$%k$HF1$8$G$9(B (*Note Init File:
+(emacs)Init File.)$B!#(B
+
+$B5$$rIU$1$J$1$l$P$$$1$J$$$N$O!"30It%b%8%e!<%k$GDj5A$5$l$F$$$k$$$/$D$+$N(B
+$BJQ?t$,(B `~/.emacs-w3m' $B%U%!%$%k$,FI$_9~$^$l$k$H$-$K$OL$Dj5A$G!"$=$l$i$r(B
+$BJQ99$G$-$J$$$+$b$7$l$J$$$3$H$G$9(B ($B$b$A$m$s!"%G%U%)%k%H$NCM$r5$$K$7$J$$(B
+$B$N$G$"$l$P!"(B`~/.emacs-w3m' $B%U%!%$%k$G40`z$K>e=q$-$7$F$7$^$&$3$H$O2DG=$J(B
+$B$N$G$9$1$l$I$M(B)$B!#JQ?t(B `w3m-search-engine-alist' $B$OE57?E*$JNc$G$9(B
+(*Note Search Variables::)$B!#(B
+
+`w3m-init-file'
+     Emacs-w3m $B$,5/F0$9$k$H!"(B`w3m-init-file' $B%U%!%$%k$rFI$_9~$_$^$9!#%G(B
+     $B%U%)%k%HCM$O(B `~/.emacs-w3m' $B$G$9!#$?$V$s!"$"$J$?$O$3$l$rJQ99$9$kI,(B
+     $BMW$OL5$$$G$7$g$&!#$3$l$OIaDL$N(B Emacs Lisp $B%U%!%$%k$G!"(B`~/.emacs'
+     $B$d(B `site-init' $B%U%!%$%k$r(B emacs-w3m $B4X78$N$b$N$GMp;($K$7$J$$$h$&$K(B
+     $B$9$k$?$a$K;H$&$3$H$,$G$-$^$9!#(BEmacs-w3m $B$O$3$l$HF1$8L>A0$K!"3HD%;R(B
+     `.elc' $B$H(B `.el' $B$,IU$$$F$$$k$b$N$b(B ($B8@$$49$($l$P!"(B
+     `~/.emacs-w3m.elc'$B!"(B`~/.emacs-w3m.el' $B$*$h$S(B `~/.emacs-w3m' $B$N=g$K(B)
+     $BD4$Y$^$9!#(B
+
+* Menu:
+
+* General Variables::           $B0lHLE*$JJQ?t(B
+* Image Variables::             $B2hA|$K4XO"$7$?JQ?t(B
+* Form Variables::              $B%U%)!<%`$K4XO"$7$?JQ?t(B
+* Cookie Variables::            $B%/%C%-!<$K4XO"$7$?JQ?t(B
+* Bookmark Variables::          $B%V%C%/%^!<%/$K4XO"$7$?JQ?t(B
+* Search Variables::            $B%&%'%V8!:w$K4XO"$7$?JQ?t(B
+* Weather Variables::           $BE75$M=Js$K4XO"$7$?JQ?t(B
+* Dtree Variables::             dtree $B$K4XO"$7$?JQ?t(B
+* Antenna Variables::           $B%"%s%F%J$K4XO"$7$?JQ?t(B
+* Perldoc Variables::           Perldoc $B$K4XO"$7$?JQ?t(B
+* Namazu Variables::            Namazu $B$K4XO"$7$?JQ?t(B
+* Octet Variables::             Octet $B$K4XO"$7$?JQ?t(B
+* Session Manager Variables::   $B%;%C%7%g%s%^%M!<%8%c$K4XO"$7$?JQ?t(B
+* Hooks::                       $B%U%C%/(B
+* Other Variables::             $B$=$NB>$NJQ?t(B
+
+
+
+File: emacs-w3m-ja.info, Node: General Variables, Next: Image Variables, Prev: Customizable Variables, Up: Customizable Variables
+
+$AR;0c5D$J$(I+y$AJ}(B
+============
+
+`w3m-accept-languages'
+     $B<u$1F~$l2DG=$J8@8l$rM%@hEY$K$h$j9_=g$KJB$Y$?$b%j%9%H!#%G%U%)%k%HCM(B
+     $B$O(B `w3m' $B$N@_Dj%U%!%$%k(B ($BDL>o$O(B `~/.w3m/config') $B$N(B
+     `accept_language' $B$N%(%s%H%j$K$h$C$F@_Dj$5$l$k!#(B
+
+`w3m-add-referer'
+
+     $B%j%U%!%i$NAw$j$+$?!#(B5$B$D$NA*Br;R$,$"$k!#(B
+
+       1. `nil': $B7h$7$F%j%U%!%i$rAw$i$J$$!#(B
+
+       2. `t': $B>o$K%j%U%!%i$rAw$k!#(B
+
+       3. `lambda': $B0\F085$N%Z!<%8$H0\F0@h$N%Z!<%8$NN>J}$,F1$8%5!<%P$K(B
+          $B$h$jDs6!$5$l$F$$$k;~$N$_%j%U%!%i$rAw$k!#(B
+
+       4. $BFs$D$N@55,I=8=$N%3%s%9!&%;%k(B: $B0\F085$N%Z!<%8$N(B URL $B$,(B 1$B$D$a$N@55,I=8=$K(B
+          $B%^%C%A$7!"$+$D!"(B2$B$D$a$N@55,I=8=$K%^%C%A$7$J$$>l9g$N$_%j%U%!%i$rAw$k!#(B
+          `nil' $B$,;XDj$5$l$k$H$9$Y$F$N(B URL $B$K%^%C%A$9$k!#(B
+
+       5. $B4X?t(B: URL $B$H%j%U%!%i$N(B 2$B$D$r0z?t$K$H$k4X?t$,(B non-`nil' $B$rJV$;(B
+          $B$P%j%U%!%i$rAw$k!#(B
+
+     $B%V%i%&%8%s%0MzNr$,1L$l$k$N$r?4G[$9$k$N$J$i!"(B`nil' $B$+(B `lambda' $B$K@_(B
+     $BDj$7$F$/$@$5$$!#$"$J$?$N%3%s%T%e!<%?$,HkL)$N%M%C%H%o!<%/$KB0$7$F$$(B
+     $B$k$N$J$i!"0J2<$N$h$&$K(B 2$B$D$N@55,I=8=$r@_Dj$7$F!"8D?M>pJs$,1L$l$k$N(B
+     $B$rKI$0$H$$$$$G$7$g$&(B:
+
+          (setq w3m-add-referer
+                '("\\`http:\"
+                  . "\\`http://\\([^./]+\\.\\)*example\\.net/"))
+
+`w3m-add-user-agent'
+     non-`nil' $B$J$i$P!"%j%/%(%9%H%X%C%@$K(B User-Agent $B$r4^$a$^$9!#(B
+     `w3m-user-agent' $B$NCM$,(B User-Agent $B$H$7$F;H$o$l$^$9!#(B
+
+`w3m-arrived-file'
+     $B1\Mw$7$?(B URL $B$N%G!<%?%Y!<%9$rJ]B8$9$k%U%!%$%kL>!#(B
+
+`w3m-auto-show'
+     non-`nil' $B$J$i$P%&%#%s%I%&$N?eJ?%9%/%m!<%k$rM-8z$K$9$k!#(Bpoint $B$,%&%#(B
+     $B%s%I%&$NN>C<$N30$K=P$?>l9g$K<+F0E*$K?eJ?%9%/%m!<%k$9$k$,!"(B
+     `truncate-lines' $B$,(B `nil' $B$J$i$P2?$b5/$3$i$J$$!#(B
+
+     $B$3$N5!G=$OFCDj$N(B emacs-w3m $B$N%3!<%I$N$_$G;H$o$l$k!#$9$J$o$A!"DL>o(B
+     `auto-hscroll-mode'$B!"(B`automatic-hscrolling'$B!"(B`auto-show-mode' $B$*$h(B
+     $B$S(B `hscroll-mode' $B$O$9$Y$F(B emacs-w3m $B$N%P%C%U%!$G$OL58z$K$J$k$@$m(B
+     $B$&!#(B
+
+`w3m-charset-coding-system-alist'
+     MIME charset $B$H%3!<%G%#%s%0%7%9%F%`$NO"A[G[Ns!#(Bcharset $B$H%3!<%G%#(B
+     $B%s%0%7%9%F%`$NN>J}$,%7%s%\%k$G$J$1$l$P$J$i$J$$!#(B
+
+`w3m-coding-system'
+     `w3m' $B%3%^%s%I$HDL?.$9$k$?$a$K;H$&%3!<%G%#%s%0%7%9%F%`$N%G%U%)%k%H(B
+     $BCM!#(B
+
+`w3m-coding-system-priority-list'
+     emacs-w3m $B$G;H$o$l$k%3!<%G%#%s%0%7%9%F%`$rM%@hEY$K$h$jJB$Y$?%j%9%H!#(B
+
+`w3m-command'
+     `w3m' $B%3%^%s%I$N<B9T%U%!%$%kL>!#$3$NCM$,(B nil $B$J$i$P:G=i$K(B
+     emacs-w3m $B$,B8:_$9$k(B `w3m'$B!"(B`w3mmee' $B$^$?$O(B `w3m-m17n' $B$r(B ($B$3$N=g(B
+     $BHV$K(B) `exec-path' $B%G%#%l%/%H%j$+$iC5:w$7$F$/$l$k$N$G!"DL>o$O$3$NCM(B
+     $B$r@_Dj$9$kI,MW$O$J$$!#(B
+
+     $BB>$N(B `w3m' $B%3%^%s%I$r;H$$$?$1$l$P!"(B.emacs $B$G$3$NCM$rL@<(E*$K@_Dj$9(B
+     $B$k$+!"%+%9%?%^%$%:$7$FJ]B8$7$F$/$@$5$$!#$3$N>l9g!"(BEmacs $B$H(B
+     emacs-w3m $B$r:F5/F0$7$J$1$l$P$$$1$^$;$s!#:#$N$H$3$m!"(B`w3m.elc' $B$rFI(B
+     $B$_$3$s$@8e$K(B `w3m' $B%3%^%s%I$NJQ99$r0BA4$K$9$Y$F$N(B emacs-w3m $B%W%m%0(B
+     $B%i%`$K9T$J$&$3$H$O$G$-$J$$$+$i$G$9!#(B
+
+`w3m-command-arguments'
+     `w3m' $B%3%^%s%I$N0z?t$N%G%U%)%k%HCM!#(B
+     `w3m-command-arguments-alist' $B$b;2>H$9$k$H$h$$!#(B
+
+`w3m-command-arguments-alist'
+     URL $B$K%^%C%A$9$k@55,I=8=$H(B `w3m' $B$KDI2C$GEO$5$l$k0z?t$H$NO"A[G[Ns!#(B
+     $B$3$NJQ?t$OFCDj$N%[%9%H$X$N@\B3$K%W%m%-%7$rMQ$$$k$J$I$N$3$H$K;H$o$l(B
+     $B$^$9!#:G=i$K%^%C%A$7$?MWAG$,E,MQ$5$l$^$9!#0J2<$K$I$N$h$&$K$3$NJQ?t(B
+     $B$r@_Dj$9$k$+$NNc$r<($7$^$9!#(B
+
+          (setq w3m-command-arguments-alist
+                '(;; Don't use the proxy server to visit local web pages.
+                  ("^http://\\([^/]*\\.\\)*your-company\\.com\\(/\\|$\\)"
+                   "-no-proxy")
+                  ;; Use the proxy server to visit any foreign urls.
+                  (""
+                   "-o" "http_proxy=http://proxy.your-company.com:8080/")))
+
+     $B$3$N(B 1$B$D$a$NMWAG$O!"%9%-!<%`$,(B `http' $B$G$"$j!"%[%9%HL>(B
+     $B$,(B `your-company.com' $B$G$"$k$+!"(B`.your-company.com' $B$G=*$o$k(B
+     $B$9$Y$F$N(B URL $B$K%^%C%A$7$^$9!#$3$l$i$N%[%9%H$K@\B3$9$k$N$K%W%m%-%7$OMQ$$$i(B
+     $B$l$^$;$s!#$"$J$?$,@55,I=8=$N=i?4<T$G$"$k$N$J$i!"(B
+     `w3m-no-proxy-domains' $B$rBe$o$j$K;H$C$F$/$@$5$$!#(B
+
+`w3m-command-environment'
+     $B%5%V%W%m%;%9$,7Q>5$9$k4D6-JQ?t$NO"A[G[Ns!#(B
+
+`w3m-confirm-leaving-secure-page'
+     non-`nil' $B$J$i$P!"%;%-%e%"$J%Z!<%8$r5n$k;~$K(B emacs-w3m $B$O3NG'$r5a(B
+     $B$a$^$9!#$3$NJQ?t$K$O(B non-nil $B$NCM$r(B *$(GZ0$A$/(B* $B$*$9$9$a$7$^$9!#$3$N%*(B
+     $B%W%7%g%s$r@Z$kA0$K(B *$A1X$:(B* $B$I$&$$$&$3$H$r$7$?$$$N$+$r40A4$KM}2r$7$F(B
+     $B$/$@$5$$!#%G%U%)%k%H$G$O!"(B`t' $B$K$J$C$F$$$^$9!#(B
+
+`w3m-content-type-alist'
+     $B%3%s%F%s%H%?%$%W$H@55,I=8=$HI=<($9$k$?$a$N%3%^%s%I$H%U%#%k%?$H$NO"(B
+     $BA[G[Ns!#$=$l$>$l$NMWAG$O!"0J2<$N%G!<%?$,9=@.$9$k%j%9%H$G$"$k!#(B
+
+       1. $B%3%s%F%s%H%?%$%W!#(B
+
+       2. URL $B$^$?$O%U%!%$%kL>$K%^%C%A$9$k@55,I=8=!#(B
+
+       3. $B%U%!%$%k$r1\Mw$9$k$?$a$NJ}K!!#0J2<$N;0$D$N<oN`$,;H$o$l$k$G$7$g(B
+          $B$&!#(B
+
+            a. $B1\Mw$9$k(B URL $B$r0z?t$K$H$k(B lisp $B$N4X?t!#(B
+            b. ("COMMAND" [ARG...]) -- "COMMAND" $B$O30It%3%^%s%I$G$"$j!"(B
+               ARG $B$O(B ($B$"$k$J$i$P(B) $B%3%^%s%I$KEO$90z?t$G$"$k!#(B`file' $B$H(B
+               `url' $B$N%7%s%\%k$r(B ARG $B$H$7$F;XDj$9$k$H!"$=$l$>$l1\Mw$9(B
+               $B$k%U%!%$%k$NFbMF$r4^$s$@%F%s%]%i%j%U%!%$%k$N%U%!%$%kL>$H!"(B
+               $B1\Mw$9$k(B URL $B$H$KCV49$($i$l$k!#(B
+            c. `nil' $B$J$i$P!"(BURL $B$r%m!<%+%k$N%U%!%$%k$K%@%&%s%m!<%I$7$^$9!#(B
+
+       4. `1. $A%3%s%F%s%H%?%$%W(B' $B$G;XDj$5$l$?$b$N$r>e=q$-$9$k%3%s%F%s%H(B
+          $B%?%$%W!#0J2<$NCM$bM-8z$G$9!#(B
+
+            a. URL $B$H(B CONTENT-TYPE $B$H(B CHARSET $B$N(B 3$B$D$N0z?t$r$H$j!"%3%s(B
+               $B%F%s%H%?%$%W$rJV$9(B Lisp $B4X?t!#(B
+            b. $B%3%s%F%s%H%?%$%W$r<($9J8;zNs!#(B
+            c. `nil' $B$J$i$P!"%3%s%F%s%H%?%$%W$r>e=q$-$7$J$$!#(B
+
+`w3m-correct-charset-alist'
+     $BFC<l$J(B MIME $BJ8;z%;%C%H$HI8=`$N(B MIME $BJ8;z%;%C%H$H$NO"A[G[Ns!#(B
+
+`w3m-db-history-display-size'
+     about://arived-db/ $B$G0lEY$KI=<($9$k(B URL $B$N:GBg?t!#(B
+
+`w3m-decoder-alist'
+     $B%(%s%3!<%I$N<oN`$H%G%3!<%@$H0z?t$H$NO"A[G[Ns!#(B
+
+`w3m-default-coding-system'
+     URL $BJ8;zNs$H(B POST $B$5$l$k%G!<%?$H$r%(%s%3!<%I$9$k$N$K%G%U%)%k%H$G;H(B
+     $B$o$l$k%3!<%G%#%s%0%7%9%F%`!#(B
+
+`w3m-default-content-type'
+     $B%m!<%+%k$N%U%!%$%k$r;2>H$9$k;~$K%G%U%)%k%H$G;H$o$l$k%3%s%F%s%H%?%$(B
+     $B%W!#(B
+
+`w3m-default-directory'
+     emacs-w3m $B$N%P%C%U%!$K$*$$$F!"8=:_$N%G%#%l%/%H%j$H$7$F;H$o$l$k%G%#(B
+     $B%l%/%H%j!#B8:_$9$k%G%#%l%/%H%j$r<($9J8;zNs!"$=$NCM$,B8:_$9$k%G%#%l(B
+     $B%/%H%j$r<($9%7%s%\%k!"(Burl $B$r0z?t$K$H$j%G%#%l%/%H%j$rJV$94X?t!"$b$7(B
+     $B$/$O(B `nil' ($B%G%U%)%k%HCM(B)$B$,M-8z$JCM$H$J$j$^$9!#;XDj$5$l$?%G%#%l%/(B
+     $B%H%j$,B8:_$7$J$$>l9g$d!"(B`nil' $B$,;XDj$5$l$?>l9g$O(B
+     `w3m-profile-directory' $B$NCM$,;H$o$l$^$9!#(B
+
+     $BNc30(B: $B%m!<%+%k$N%U%!%$%k$d!"%j%b!<%H$N%U%!%$%k$r(B ftp $B$G%"%/%;%9$7(B
+     $B$F$$$k>l9g$O$=$N%U%!%$%k$N%G%#%l%/%H%j$,8=:_$N%G%#%l%/%H%j$H$7$F;H(B
+     $B$o$l$^$9!#(B
+
+`w3m-default-save-directory'
+     $B%@%&%s%m!<%I$7$?%U%!%$%k$,%G%U%)%k%H$GJ]B8$5$l$k%G%#%l%/%H%j!#(B
+
+`w3m-delete-duplicated-empty-lines'
+     non-`nil' $B$J$i$PFs9T0J>e$NO"B3$7$?6uGr9T$r0l9T$K$^$H$a$k!#(B
+
+`w3m-dirlist-cgi-program'
+     $B%m!<%+%k$N%G%#%l%/%H%jNs5s$9$k$N$K;H$o$l$k(B CGI $B%W%m%0%i%`$NL>A0!#(B
+     `nil' $B$J$i$P!"(B`w3m' $B%3%^%s%I$N(B dirlist.cgi $B$N%b%8%e!<%k$,;H$o$l$k!#(B
+
+`w3m-doc-view-content-types'
+     $B%U%!%$%k$r1\Mw$9$k$N$K(B `doc-view-mode' $B$r;H$&%3%s%F%s%H%?%$%W$N%j(B
+     $B%9%H!#$3$NJQ?t$O(B `w3m-content-type-alist' $B$NCM$r>e=q$-$9$k!#(B
+
+`w3m-edit-function'
+     $B%m!<%+%k$N%U%!%$%k$rJT=8$9$k$?$a$N4X?t!#(B`w3m-edit-current-url' $B$^(B
+     $B$?$O(B `w3m-edit-this-url' $B$N%3%^%s%I$,8F$P$l$?;~$K;H$o$l$^$9!#(B
+
+`w3m-edit-function-alist'
+     $B%Z!<%8$rJT=8$9$k$?$a$K;H$&4X?t$NO"A[G[Ns!#$3$N%*%W%7%g%s$O!"(B
+     `w3m-edit-current-url' $B$d(B `w3m-edit-this-url' $B$N%3%^%s%I$,8F$P$l$?(B
+     $B;~$K$I$N4X?t$G$=$N%Z!<%8$rJT=8$9$k$+$r7h$a$k$N$K;H$o$l$^$9!#$3$NO"(B
+     $BA[G[Ns$+$iE,Ev$J4X?t$,8+$D$+$i$J$1$l$P!"(B`w3m-edit-function' $B$,;H$o(B
+     $B$l$^$9!#(B
+
+`w3m-enable-google-feeling-lucky'
+     non-`nil' $B$J$i$P!"(Burl $B$H$7$F$I$s$JC18l$bF~NO$9$k$3$H$,$G$-$k$h$&$K(B
+     $B$J$j$^$9!#$=$N>l9g!"(Bemacs-w3m $B$O(B Google $B$r;H$C$F$=$N8@MU$r8!:w$7$^(B
+     $B$9!#%G%U%)%k%H$G$O(B `t' $B$G$9!#(B
+
+`w3m-encoding-type-alist'
+     $B%U%!%$%k$N3HD%;R$H%U%!%$%k$N%(%s%3!<%I$N<oN`$H$NO"A[G[Ns!#(B
+
+`w3m-file-coding-system'
+     $B@_Dj%U%!%$%k$r=q$/$?$a$K;H$o$l$k%3!<%G%#%s%0%7%9%F%`!#$3$NJQ?t$O(B
+     `w3m-save-list' $B4X?t$G;H$o$l$^$9!#(B
+
+`w3m-file-name-coding-system'
+     emacs-w3m $B$,%U%!%$%k$K%"%/%;%9$9$k;~$K!"%Q%9L>$rJQ49$9$k@h$N%3!<%G%#(B
+     $B%s%0%7%9%F%`!#(B
+
+`w3m-fill-column'
+     emacs-w3m $B$N%P%C%U%!$G(B `fill-column' $B$H$7$F;H$o$l$k?t;z!#@5$NCM$J(B
+     $B$i$P!"%Z!<%8$,$=$N7e?t$GI=<($5$l$k!#(B0 $B$+Ii$NCM$J$i$P!"%&%#%s%I%&$N(B
+     $BI}$+$i$=$N?t;z$r$,%Z!<%8$N:GBgI}$H$7$F;H$o$l$k!#(BXEmacs $B$G$O$3$N@_(B
+     $BDj$,>o$KF/$/$o$1$G$O$J$$$H$$$&$3$H$KCm0U$7$F$/$@$5$$!#(B
+
+`w3m-follow-redirection'
+     emacs-w3m $B$,%j%@%$%l%/%H$rB:=E$7%j%@%$%l%/%H@h$rDI$$$+$1$k:GBg?t!#(B
+     `nil' $B$J$i$P!"(B`w3m' $B%3%^%s%I$,%j%@%$%l%/%H$r=hM}$7$^$9!#%/%C%-!<$,(B
+     $B%j%@%$%l%/%H$5$l$k%Z!<%84V$G6&M-$5$l$k$3$H$,$"$j$&$k$N$G!"%/%C%-!<(B
+     $B$r5v2D$9$k$J$i$P(B ($B$D$^$j!"(B`w3m-use-cookies' $B$r(B non-`nil' $B$K$7$F$$(B
+     $B$k$J$i$P(B)$B!"$3$NJQ?t$r(B `nil' $B$K$7$J$$$G$/$@$5$$!#(B
+
+`w3m-home-page'
+     emacs-w3m $B$,5/F0$7$?;~$K3+$/(B URL $B$NJ8;zNs$r;XDj$7$^$9!#K?2q<R$NN,(B
+     $B>N$K$J$C$A$c$$$^$9$+$i(B HP $B$H$O8@$o$J$$$G$/$@$5$$$M!#(B
+
+`w3m-horizontal-scroll-columns'
+     $B%&%#%s%I%&$r?eJ?%9%/%m!<%k$9$k;~$K!"%9%/%m!<%k$9$kJ8;z?t!#(B
+
+`w3m-horizontal-scroll-division'
+     $B%+!<%=%k0LCV$,$-$A$s$HI=<($5$l$k$h$&$K$9$k$N$K;H$o$l$k?t;z!#(B
+     emacs-w3m $B$N%P%C%U%!$G%"%s%+!<$d%U%)!<%`$r0\F0$7$F$$$F%+!<%=%k$,%&%#(B
+     $B%s%I%&$N30$K=P$F$7$^$C$F$b%+!<%=%k$,8+$D$+$i$J$/$J$k$3$H$O7h$7$F$"(B
+     $B$j$^$;$s!#(B
+
+     $B$3$NJQ?t$NCM$r(B N $B$H$7$^$9!#%+!<%=%k$,%&%#%s%I%&$N:8$K=P$F$7$^$&$H(B
+     emacs-w3m $B$O%&%#%s%I%&$r%9%/%m!<%k$7!"%+!<%=%k$,%&%#%s%I%&$N:8$+$i(B
+     $B%&%#%s%I%&$NI}$N(B 1/N $B$N=j$KCV$+$l$k$h$&$K$7$^$9!#F1MM$K%+!<%=%k$,(B
+     $B%&%#%s%I%&$N1&$+$i=P$F$7$^$&$H!"(Bemacs-w3m $B$O%&%#%s%I%&$r%9%/%m!<%k(B
+     $B$7!"%+!<%=%k$,%&%#%s%I%&$N1&$+$i%&%#%s%I%&$NI}$N(B 1/N $B$N=j$KCV$+$l(B
+     $B$k$h$&$K$7$^$9!#(B
+
+     `w3m-auto-show' $B$,(B `nil' $B$J$i$P$3$N5!G=$OF0$-$^$;$s!#CM$O(B 1 $B$h$j$b(B
+     $BBg$-$$@0?t$G$J$1$l$P$$$1$^$;$s!#(B
+
+`w3m-horizontal-shift-columns'
+     $B%&%#%s%I%&$r(B shifting $B$9$k;~$K!"%9%/%m!<%k$9$kJ8;z?t!#(B`shifting'
+     $B$H$$$&$N$O!"%9%`!<%:$J%9%/%m!<%k$r0UL#$7$^$9!#(B
+
+`w3m-imitate-widget-button'
+     non-`nil' $B$J$i$P!"%j%s%/(B ($B%"%s%+!<(B) $B%\%?%s$G%&%#%8%'%C%H$N%\%?%s$N(B
+     $BF0:n$r$7$^$9!#$3$l$O(B `<TAB>' $B$r;H$C$F(B Gnus $B$N5-;v%P%C%U%!$NCf$r0\(B
+     $BF0$9$k$N$KJXMx$G$9!#??56CM$rJV$9(B Lisp $B4X?t$r@_Dj$9$k$3$H$b$G$-$^$9!#(B
+
+`w3m-init-file'
+     Your emacs-w3m startup file name.  If a file with the `.el' or
+     `.elc' suffixes exists, it will be read instead.
+
+     Note: This file is used as the startup configuration *NOT* for
+     the `w3m' command but for emacs-w3m.  In order to modify
+     configurations for the `w3m' command, edit the file named
+     `~/.w3m/config' normally.
+
+`w3m-input-coding-system'
+     Coding system used when writing to `w3m' processes.  It overrides
+     `coding-system-for-write' if it is not `binary'.  Otherwise, the
+     value of the `w3m-current-coding-system' variable is used
+     instead.
+
+`w3m-keep-arrived-urls'
+     Maximum number of URLs which the arrived URLs database keeps.
+
+`w3m-keep-cache-size'
+     Maximum number of pages to be cached in emacs-w3m.
+
+`w3m-key-binding'
+     Type of key binding set used in emacs-w3m sessions.  The valid
+     values include `info' which provides `Info-like' keys, and `nil'
+     which provides `Lynx-like' keys.
+
+`w3m-language'
+     Your preferred language used in emacs-w3m sessions.
+
+`w3m-local-directory-view-method'
+     Symbol of the method to view a local directory tree.  The valid values
+     include `w3m-cgi' using the CGI program specified by the
+     `w3m-dirlist-cgi-program' variable (which see), and
+     `w3m-dtree' using the w3m-dtree Lisp module.
+
+`w3m-local-find-file-function'
+     Function used to open local files.  If a url of the `file:'
+     scheme in which you entered agrees with the rule of the
+     `w3m-local-find-file-regexps' variable (which see), it is used to
+     open the file.
+
+     Function should take one argument, the string naming the local
+     file.  It can also be any Lisp form returning a function.  Set
+     this to `nil' if you want to always use emacs-w3m to see local
+     files.
+
+`w3m-local-find-file-regexps'
+     `Cons' of two regexps matching and not matching with local file
+     names.  If a url of the `file:' scheme in which you entered
+     matches the first form and does not match the latter form, it
+     will be opened by the function specified by the
+     `w3m-local-find-file-function' variable.  `Nil' for the regexp
+     matches any file names.
+
+     For instance, the value `(nil . "\\.html?\\'")' allows
+     `file:///some/where/w3m.el', not `file:///any/where/index.html',
+     to open by the function specified by
+     `w3m-local-find-file-function'.  The latter will be opened as a
+     normal web page.  Furthermore, if you would like to view some
+     types of contents in the local system using the viewers specified
+     by the `w3m-content-type-alist' variable, you can add regexps
+     matching those file names to the second element of this variable.
+     For example:
+
+          (setq w3m-local-find-file-regexps
+                '(nil . "\\.\\(?:[sx]?html?\\|dvi\\|ps\\|pdf\\)\\'"))
+
+     It is effective only when the `w3m-local-find-file-function'
+     variable is set properly.
+
+`w3m-mailto-url-function'
+     Function used to handle the `mailto' urls.  Function is called
+     with one argument, just a url.  If it is `nil', a function
+     specified by the `mail-user-agent' variable will be used for
+     composing mail messages.
+
+`w3m-mailto-url-popup-function-alist'
+     Alist of `(MAJOR-MODE . FUNCTION)' pairs used to pop a mail
+     buffer up.  If a user clicks on a `mailto' url and a mail buffer
+     is composed by `mail-user-agent' with the `MAJOR-MODE',
+     `FUNCTION' will be called with a mail buffer as an argument.
+     Note that the variables `special-display-buffer-names',
+     `special-display-regexps', `same-window-buffer-names' and
+     `same-window-regexps' will be bound to `nil' while popping to a
+     buffer up.
+
+`w3m-make-new-session'
+     Non-`nil' means making new emacs-w3m buffers when visiting new
+     pages.  If it is non-`nil' and there are already emacs-w3m
+     buffers, the `w3m' command makes a new emacs-w3m buffer if a user
+     specifies a url string in the minibuffer, and the
+     `w3m-safe-view-this-url' command also makes a new buffer if a
+     user invokes it in a buffer not being running the `w3m-mode'.
+     The default value is `nil'.
+
+`w3m-mbconv-command'
+     Name of the `mbconv' command provided by the `libmoe' package.
+     The `libmoe' package is used when you use the `w3mmee' command
+     instead of the `w3m' command.  See also `w3m-command'.
+
+`w3m-no-proxy-domains'
+     List of domain names for which emacs-w3m will not use a proxy
+     server.  Each element should be exactly a domain name which means
+     the latter common part of the host names, not a regexp.
+
+`w3m-output-coding-system'
+     Coding system used when reading from `w3m' processes.
+
+`w3m-pop-up-frames'
+     Non-`nil' means pop to a new frame up for an emacs-w3m session.
+     This variable is similar to `pop-up-frames' and does override
+     `w3m-pop-up-windows'.  If `w3m-use-tab' is non-`nil' or there is
+     the buffers selection window (for the `w3m-select-buffer'
+     feature), this variable is ignored when creating the second or
+     more emacs-w3m session.
+
+`w3m-pop-up-windows'
+     Non-`nil' means split the windows when a new emacs-w3m session is
+     created.  This variable is similar to `pop-up-windows' and quite
+     overridden by `w3m-pop-up-frames' as if `pop-up-frames'
+     influences.  Furthermore, if `w3m-use-tab' is non-`nil' or there
+     is the buffers selection window (for the `w3m-select-buffer'
+     feature), this variable is ignored when creating the second or
+     more emacs-w3m session.
+
+`w3m-popup-frame-parameters'
+     Alist of frame parameters used when creating a new emacs-w3m
+     frame.  It allows not only the alist form but also XEmacs' plist
+     form.
+
+`w3m-prefer-cache'
+     Non-`nil' means that cached contents are used without checking
+     headers.
+
+`w3m-profile-directory'
+     Directory where emacs-w3m config files are loaded from or saved
+     to.
+
+`w3m-quick-start'
+     Non-`nil' means let emacs-w3m start quickly w/o requiring
+     confirmation.  When you invoke the `w3m' command, it attempts to
+     visit the page of a string like url around the cursor or the
+     value of `w3m-home-page'.  You won't be asked for the
+     confirmation then if this value is non-`nil'.  Otherwise, you
+     will be prompted for that url with the editing form.
+
+`w3m-redirect-with-get'
+     If non-`nil', use the GET method after redirection.  It controls
+     how emacs-w3m works when a server responds the code 301 or 302.
+     Here is an extract from RFC2616:
+
+     Note: RFC 1945 and RFC 2068 specify that the client is not
+     allowed to change the method on the redirected request.  However,
+     most existing user agent implementations treat 302 as if it were
+     a 303 response, performing a GET on the Location field-value
+     regardless of the original request method.
+
+`w3m-relationship-estimate-rules'
+     Rules to estimate relationships between a retrieved page and
+     others.
+
+`w3m-select-buffer-horizontal-window'
+     Non-`nil' means split windows horizontally to open the selection
+     window.
+
+`w3m-select-buffer-window-ratio'
+     The percentage of the selection window to the whole frame.  The
+     car is used when splitting windows horizontally and the cdr is
+     for splitting windows vertically.
+
+`w3m-show-decoded-url'
+     Non-`nil' means show decoded URIs in the echo area, the balloon,
+     etc.  This variable can take one of the following five kinds of
+     forms:
+
+       1. t
+
+          Decode URIs using the encoding guessed from the value of
+          `w3m-coding-system-priority-list'.
+
+       2. Coding system
+
+          Decode URIs using this value.
+
+       3. List of coding systems
+
+          Decode URIs using the encoding assumed based on this list.
+
+       4. Alist of predicates and forms described below:
+
+          Each element looks like the `(PREDICATE . ENCODING)' form.
+          `PREDICATE' should be a regexp, a function or a Lisp form,
+          and `ENCODING' should be one of the forms described here
+          excluding this form.  If `PREDICATE' is a regexp, it will be
+          tested whether it matches to the target url.  If it is a
+          function, it will be called with the target url.  If it is a
+          Lisp form, it will be simply evaluated.  Elements are tested
+          in turn until the result of the test of the predicate is
+          true and the encoding which is associated to the predicate
+          is used for decoding URIs.
+
+       5. nil
+
+          Don't decode URIs.
+
+`w3m-use-title-buffer-name'
+     Non-`nil' means use name of buffer included current title.
+
+`w3m-show-error-information'
+     Non-`nil' means show an error information as a web page.  Page is
+     made when the foreign server doesn't respond to a request to
+     retrieve data.
+
+`w3m-space-before-favicon'
+     String of space char(s) to be put in front of favicon in the
+     mode-line.  It may be better to use two or more spaces if you are
+     using oblique or italic font in the modeline.
+
+`w3m-space-before-modeline-icon'
+     String of space character(s) to be put in front of the modeline
+     icon.  It may be better to use one or more spaces if you are
+     using oblique or italic font in the modeline.
+
+`w3m-terminal-coding-system'
+     Default coding system used when writing to `w3m' processes.  It
+     is just a default value to set process' coding system initially.
+     (This variable name is analogically derived from the behavior of
+     the `w3m' command which accepts data from Emacs just like reads
+     from the terminal.)
+
+`w3m-touch-command'
+     Name of the executable file of the touch command.  Note that the
+     command is required to be able to modify file's timestamp with
+     the `-t' option.
+
+`w3m-track-mouse'
+     Whether to track the mouse and message the url under the mouse.
+     See also `show-help-function' if you are using GNU Emacs.
+
+     A tip for XEmacs users:
+
+     You can also use the `balloon-help' feature by the
+     `M-x balloon-help-mode' command with arg 1.  If the window
+     manager decorates the balloon-help frame, and that is not to your taste,
+     you may strip it off with the following directives:
+
+          For ol[v]wm use this in .Xdefaults:
+             olvwm.NoDecor: balloon-help
+               or
+             olwm.MinimalDecor: balloon-help
+
+          For fvwm version 1 use this in your .fvwmrc:
+             NoTitle balloon-help
+          or
+             Style "balloon-help" NoTitle, NoHandles, BorderWidth 0
+
+          For twm use this in your .twmrc:
+             NoTitle { "balloon-help" }
+
+     See the `balloon-help.el' file for more information.
+
+`w3m-uri-replace-alist'
+     Alist of regexps matching URIs, and some types of replacements.
+     It can be used universally to replace URI strings in the local
+     rule to the valid forms in the Internet.
+
+     Each element looks like the `(REGEXP FUNCTION OPTIONS...)' form.
+     `FUNCTION' takes one or more arguments, a uri and `OPTIONS'.  You
+     can use the grouping constructs `\\(...\\)' in `REGEXP', and they
+     can be referred by the `\N' forms in a replacement (which is one
+     of `OPTIONS').
+
+     Here are some predefined functions which can be used for those
+     ways:
+
+     `w3m-pattern-uri-replace'
+          Replace a URI using PATTERN (which is just an `OPTION').  It
+          is allowed that PATTERN contains the `\N' forms in the same
+          manner of `replace-match'.
+
+     `w3m-search-uri-replace'
+          Generate valid URLs to query words on some specified search
+          engines.  For example, the element
+
+               ("\\`gg:" w3m-search-uri-replace "google")
+
+          makes it possible to replace the URI `gg:emacs' to a query
+          for the word `emacs' on the Google search engine.
+
+`w3m-url-local-directory-alist'
+     Alist of URLs and local directories.  If directory names of a
+     given URL and the car of an element are the same, emacs-w3m
+     assumes that the file exists in the local directory where the cdr
+     of an element points to.  The default value will be set to a
+     value of the `yahtml-path-url-alist' variable which exchanged the
+     car and the cdr in each element if it is available.
+
+`w3m-use-ange-ftp'
+     Non-`nil' means that `ange-ftp' or `efs' is used to access FTP
+     servers.
+
+`w3m-use-cygdrive'
+     If non-`nil', use the `/cygdrive/' rule when performing
+     `expand-file-name'.
+
+`w3m-use-filter'
+     Non-`nil' means use filter programs to convert web contents.  See
+     also `w3m-filter-rules' (the `w3m-filter.elc' module provides
+     it but might have never been loaded.  In that case, to see the default
+     value and the documentation of `w3m-filter-rules', type
+     `M-x load-library <RET> w3m-filter <RET>').
+
+`w3m-use-form'
+     Non-`nil' means make it possible to use form
+     extensions. *(EXPERIMENTAL)*
+
+`w3m-submit-form-safety-check'
+     Non-`nil' means ask you for confirmation when submitting a form.
+     The default value is `nil'.
+
+`w3m-use-header-line'
+     Non-`nil' means display the header line.
+
+`w3m-use-header-line-title'
+     Non-`nil' means display the current title at the header
+     line. This variable is effective only when `w3m-use-tab' is
+     `nil'.
+
+`w3m-use-mule-ucs'
+     Non-`nil' means use the multi-script support with Mule-UCS.
+
+`w3m-use-refresh'
+     Non-`nil' means honor the REFRESH attribute in META tags.
+     Emacs-w3m arbitrarily takes you to a url specified by that
+     attribute.  Note that they may be malicious traps.
+
+`w3m-refresh-minimum-interval'
+     history-back, history-next $B$G%Z!<%8$r8+$?;~$K:GDc8B(B refresh $B$rBT$D(B
+     $BIC?t!#(B
+
+`w3m-use-symbol'
+     Non-`nil' means replace symbols that the `<_SYMBOL>' tags lead
+     into.  It is meaningful only when the `w3m-m17n' command is used
+     and (X)Emacs handles unicode charsets.
+
+`w3m-menu-on-forefront'
+     Non-`nil' means place the emacs-w3m menus on the forefront of the
+     menu bar.  The default value is `nil'.
+
+`w3m-use-tab'
+     Non-`nil' means make emacs-w3m a tab browser.  It makes it possible
+     to show all emacs-w3m buffers in a single window with the tabs line, and
+     you can choose one by clicking a mouse on it.  See also
+     `w3m-use-tab-menubar'.
+
+`w3m-use-tab-menubar'
+     Non-`nil' means use the TAB pull-down menu in the menubar.  It
+     makes it possible to show all emacs-w3m buffers in a single
+     window, and you can choose one by clicking a mouse on it.  This
+     feature requires that Emacs has been built to be able to display
+     multilingual text in the menubar if you often visit web sites
+     written in non-ascii text.  See also `w3m-use-tab'.
+
+`w3m-use-toolbar'
+     Non-`nil' activates toolbar of `w3m'.
+
+`w3m-user-agent'
+     String used for the User-Agent field.  See also
+     `w3m-add-user-agent'.
+
+`w3m-new-session-in-background'
+     Say whether not to focus on a new tab or a new session in target.
+     It influences only when a new emacs-w3m buffer is created.
+
+`w3m-do-cleanup-temp-files'
+     $BHs(B`nil' $B$J$i$P!"(B emacs-w3m $B$O<+F0E*$K:o=|$7$=$3$J$C$?0l;~%U%!%$%k(B
+     $B$r:o=|$7$^$9!#(B $B%G%U%)%k%H$O(B `nil' $B$G$9!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Image Variables, Next: Form Variables, Prev: General Variables, Up: Customizable Variables
+
+$A;-Oq$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B
+==================
+
+`w3m-default-display-inline-images'
+     $BHs(B`nil' $B$J$i$P!"%$%s%i%$%s2hA|$r(B emacs-w3m $B$N%P%C%U%!$KI=<($7$^$9!#(B
+     $B2hA|I=<($N(B ON/OFF $B$O(B `w3m-toggle-inline-images' $B$G@Z$jBX$($i$l$^$9!#(B
+     `w3m-toggle-inline-images-permanently' $B$b;2>H$7$F$/$@$5$$!#(B
+
+`w3m-favicon-cache-expire-wait'
+     $B<hF@$+$i$3$NJQ?t$G;XDj$5$l$?IC?t0J>e7P2a$7$?%-%c%C%7%e$O:o=|$5$l$^(B
+     $B$9!#$3$NJQ?t$,(B `nil' $B$J$i$P!":o=|$5$l$k$3$H$O$"$j$^$;$s!#(B
+
+`w3m-favicon-cache-file'
+     favicon $B$N%-%c%C%7%e$rJ]B8$9$k%U%!%$%kL>!#%G%U%)%k%H$O!"JQ?t(B
+     `w3m-profile-directory' $B$G;XDj$5$l$?%G%#%l%/%H%j2<$N(B `.favicon' $B$H(B
+     $B$$$&L>A0$N%U%!%$%k$G$9!#(B
+
+`w3m-favicon-size'
+     favicon $B$N%5%$%:!#$3$NCM$O!"(B`convert' $B$X$N(B geometry $B0z?t$H$7$F;H$o(B
+     $B$l$^$9!#(B
+
+`w3m-favicon-type'
+     favicon $B$rI=<($9$k$N$K;H$o$l$k2hA|$N<oN`!#(B
+
+`w3m-favicon-use-cache-file'
+     $BHs(B`nil' $B$J$i$P!"(Bfavicon $B$N%-%c%C%7%e%U%!%$%k$r;H$$$^$9!#(B
+
+`w3m-favicon-default-background'
+     favicon $B2hA|$NF)2a?'$H$7$F;H$o$l$k?'$NL>A0!#(B`nil' $B$G$"$l$P!"(BEmacs
+     $B$N%U%l!<%`$NGX7J?'$r;H$&!#6uJ8;z$OFCJL$G!"%X%C%@%i%$%s$+%b!<%I%i%$(B
+     $B%s$+$N(B favicon $B$,I=<($5$l$F$$$k$[$&$NGX7J?'$KCV49$($i$l$k!#$3$NJQ(B
+     $B?t$O!"(BEmacs 22 $B0J>e$G$7$+8zNO$r;}$?$J$$$3$H$KCm0U!#(B
+
+`w3m-icon-directory'
+     emacs-w3m $B$,%"%$%3%s$rC5$9%G%#%l%/%H%j!#(B
+
+`w3m-imagick-convert-program'
+     ImageMagick $B$N(B `convert' $B$N%W%m%0%i%`L>!#(B
+
+`w3m-treat-image-size'
+     $BHs(B`nil' $B$J$i$P!"(B`w3m' $B$,2hA|$H%F%-%9%H$NHfN($r9MN8$7$^$9!#%G%U%)%k(B
+     $B%H$O(B `t' $B$G$9!#(B
+
+     $BHs(B-`nil' $B$J$i$P!"(B`w3m' $B2hA|$,CV$+$l$k>l=j$r3NJ]$7$?(B `halfdump' $B$r(B
+     $B@8@.$7!"(B`alt' $B%F%-%9%H$O2hA|$NI=<(I}$KEy$7$/$J$k$h$&$K@Z$j5M$a$i$l(B
+     $B$k!"$"$k$$$O%9$Z!<%9$r5M$a$i$l$^$9!#(B
+
+     `w3m-pixels-per-character' $B$H(B `w3m-pixels-per-line' $B$b;2>H$7$F$/$@(B
+     $B$5$$!#$3$l$i$NCM$,2hA|$,@j$a$k7e$H9T$H$r7W;;$9$k$?$a$K(B `w3m' $B%3%^(B
+     $B%s%I$KEO$5$l$^$9!#(B
+
+`w3m-pixels-per-character'
+     Integer used for the `-ppc' argument of the `w3m' command.  If
+     `nil', the width of the default face is used.  It is valid only
+     when `w3m-treat-image-size' is non-`nil'.  The default value is
+     `nil'.  If you want to use emacs-w3m in a character terminal and
+     make `w3m-treat-image-size' effective, you need to set this
+     variable properly.
+
+`w3m-pixels-per-line'
+     Integer used for the `-ppl' argument of the `w3m' command.  If
+     `nil', the height of the default face is used.  It is valid only
+     when `w3m-treat-image-size' is non-`nil'.  Note that a small
+     value may not induce a good result.  The default value is `64'.
+     If you want to use emacs-w3m in a character terminal and make
+     `w3m-treat-image-size' effective, you need to set this variable
+     properly.
+
+`w3m-resize-image-scale'
+     Number of steps in percent used when resizing images.
+
+`w3m-resize-images'
+     If non-`nil', resize images to the specified width and height.
+
+`w3m-show-graphic-icons-in-header-line'
+     Non-`nil' means show graphic status indicators in the
+     header-line.  If it is `nil', also the favicon won't be shown in
+     the header-line even if `w3m-use-favicon' is non-`nil'.  This
+     variable is currently meaningless under XEmacs.
+
+`w3m-show-graphic-icons-in-mode-line'
+     Non-`nil' means show graphic status indicators in the mode-line.
+     If it is `nil', also the favicon won't be shown in the mode-line
+     even if `w3m-use-favicon' is non-`nil'.
+
+`w3m-toggle-inline-images-permanently'
+     Non-`nil' means let the visibility of images continue
+     permanently.  The visibility of images is initialized according
+     to `w3m-default-display-inline-images' at the first time, and
+     except that it may be toggled by the `w3m-toggle-inline-images'
+     command, it does not change hereafter, if it is non-`nil'.
+     Otherwise, whether images are visible is initialized according to
+     `w3m-default-display-inline-images' whenever you visit a new page
+     or reload the current page in an emacs-w3m buffer.
+
+`w3m-use-favicon'
+     Non-`nil' means show favicon images if they are available.  It
+     will be set to `nil' automatically if ImageMagick's `convert'
+     program does not support the ico format.
+
+`w3m-image-default-background'
+     $B2hA|$NF)2a?'$H$7$F;H$o$l$k?'$NL>A0!#(B`nil' $B$J$i$P!"(BEmacs $B$N%U%l!<%`(B
+     $B$NGX7J?'$,;H$o$l$k!#6uJ8;z(B ("") $B$OFCJL$K!"%P%C%U%!$NGX7J?'$KCV$-49(B
+     $B$($i$l$k!#$3$NJQ?t$O(B Emacs 22 $B0J9_$G$N$_M-8z$G$"$k!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Form Variables, Next: Cookie Variables, Prev: Image Variables, Up: Customizable Variables
+
+$A%U%)$B!<$A%`$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B
+======================
+
+`w3m-form-input-map-buffer-lines'
+     Buffer lines for form select map buffer.
+
+`w3m-form-input-select-buffer-lines'
+     Buffer lines for form select buffer.
+
+`w3m-form-input-textarea-buffer-lines'
+     Buffer lines for form textarea buffer.
+
+`w3m-form-mouse-face'
+     Mouse face to highlight selected value.
+
+`w3m-form-treat-textarea-size'
+     Non-`nil' means to process textarea size (treat textarea rows).
+
+`w3m-form-use-fancy-faces'
+     Use fancy faces to fontify `<form>' tags.
+
+`w3m-form-use-textarea-backup'
+     Non-`nil' means save and restore backup text saved when you last
+     edited this textarea.  Files to save text are stored in the
+     directory specified by the `w3m-form-textarea-directory'
+     variable.
+
+
+
+File: emacs-w3m-ja.info, Node: Cookie Variables, Next: Bookmark Variables, Prev: Form Variables, Up: Customizable Variables
+
+$A%/%C%-$B!<$A$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B
+======================
+
+`w3m-cookie-accept-bad-cookies'
+     If `nil', don't accept bad cookies.  If `t', accept bad cookies.
+     If ask, ask user whether accept bad cookies or not.
+
+`w3m-cookie-accept-domains'
+     A list of trusted domain name string.
+
+`w3m-cookie-file'
+     File in which cookies are kept.
+
+`w3m-cookie-reject-domains'
+     A list of untrusted domain name string.
+
+`w3m-use-cookies'
+     Non-`nil' means enable emacs-w3m to use cookies.
+     *(EXPERIMENTAL)*
+
+
+
+File: emacs-w3m-ja.info, Node: Bookmark Variables, Next: Search Variables, Prev: Cookie Variables, Up: Customizable Variables
+
+$A%V%C%/%^$B!<$A%/$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B
+==========================
+
+`w3m-bookmark-file'
+     Bookmark file of w3m.
+
+`w3m-bookmark-file-coding-system'
+     Coding system for a created bookmark file.  This option is used
+     when a new bookmark file is created, or when an existing bookmark
+     file includes ASCII characters only.  If the coding system which
+     is used to encode your using bookmark file is different from the
+     value of this option, emacs-w3m does not change the encoding of
+     your bookmark file.
+
+`w3m-bookmark-default-section'
+     Default section to add new entry.
+
+`w3m-bookmark-menu-open-new-session'
+     If non-`nil', "Bookmark" menu item open new session.
+
+
+
+File: emacs-w3m-ja.info, Node: Search Variables, Next: Weather Variables, Prev: Bookmark Variables, Up: Customizable Variables
+
+$A%&%'%V$(I<D$AKw$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B
+========================
+
+`w3m-search-default-engine'
+     Name of the default search engine.  The default is `google'.
+
+`w3m-search-engine-alist'
+     An alist of search engines.  Each element looks like `(ENGINE
+     ACTION CODING POST-DATA)'.  ENGINE is a string, the name of the
+     search engine.  ACTION is a string, the URL that performs a
+     search.  ACTION must contain a `"%s"', which is substituted by a
+     query string.  CODING is optional value which is coding system
+     for query string.  POST-DATA is optional value which is a string
+     for POST method search engine.  If CODING is omitted, it defaults
+     to `w3m-default-coding-system'.
+
+`w3m-search-word-at-point'
+     Non-`nil' means that the word at point is used as an initial
+     string.  If `transient-mark-mode', this option is ignored and the
+     region is used as an initial string.  The default is `t'.
+
+`w3m-search-thing-at-point-arg'
+     `w3m-search-read-query' $B$G;H$o$l$k(B `thing-at-point' $B$X$N0z?t!#%G%U%)(B
+     $B%k%H$O(B `word'.
+
+
+
+File: emacs-w3m-ja.info, Node: Weather Variables, Next: Dtree Variables, Prev: Search Variables, Up: Customizable Variables
+
+$ALl$B5$$ASh$(G^^$A$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B
+======================
+
+`w3m-weather-default-area'
+     Default region to check weather.  The default is the southern
+     part of Kyoto city.
+
+`w3m-weather-filter-functions'
+     Filter functions to remove useless tags.  The default value is a
+     list that contains the following function symbols in this order:
+
+     `w3m-weather-extract-contents' `w3m-weather-adjust-contents'
+     `w3m-weather-expand-anchors' `w3m-weather-insert-title'
+
+
+
+File: emacs-w3m-ja.info, Node: Dtree Variables, Next: Antenna Variables, Prev: Weather Variables, Up: Customizable Variables
+
+dtree $A$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B
+====================
+
+`w3m-dtree-default-allfiles'
+     If non-`nil', invert the meaning of the prefix argument given to
+     the `w3m-dtree' command, i.e., the command shows not only
+     directories but also files even if you don't give a prefix
+     argument.  The default is `nil'.
+
+`w3m-dtree-directory-depth'
+     Integer that controls how deep `w3m-dtree' shows subdirectories.
+     If it is `nil', files in all subdirectories are shown.  The
+     default is `8'.
+
+`w3m-dtree-indent-strings'
+     Vector containing strings used for the indentation.  The default is
+     `["|-" "+-" "|  " "   "]'.
+
+`w3m-dtree-stop-strings'
+     Vector containing strings used to indent directories under which
+     there are subdirectories hidden because of
+     `w3m-dtree-directory-depth'.  The default is `["|=" "+="]'.
+
+
+
+File: emacs-w3m-ja.info, Node: Antenna Variables, Next: Perldoc Variables, Prev: Dtree Variables, Up: Customizable Variables
+
+$A%"%s%F%J$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B
+======================
+
+`w3m-antenna-file'
+     Name of the file containing antenna URLs.  The default value is
+     `~/.w3m/.antenna', where `~/.w3m' is the default value of
+     `w3m-profile-directory' (*Note General Variables::).
+
+`w3m-antenna-html-skelton'
+     Skeleton used for making the html contents of antenna pages.
+
+`w3m-antenna-make-summary-function'
+     Function used to make the summary of the site information.  The
+     default is `w3m-antenna-make-summary-like-natsumican'.  The other
+     ready-made function is `w3m-antenna-make-summary'.
+
+`w3m-antenna-sites'
+     List of web sites that `w3m-antenna' watches.  The default is
+     `nil'.
+
+`w3m-antenna-sort-changed-sites-function'
+     Function used to sort a list of sites having been changed.  The
+     default is `w3m-antenna-sort-sites-by-time'.  The other
+     ready-made function is `w3m-antenna-sort-sites-by-title'.
+
+`w3m-antenna-sort-unchanged-sites-function'
+     Function used to sort a list of sites having not been changed.
+     The default is `w3m-antenna-sort-sites-by-time'.  The other
+     ready-made function is `w3m-antenna-sort-sites-by-title'.
+
+
+
+File: emacs-w3m-ja.info, Node: Perldoc Variables, Next: Namazu Variables, Prev: Antenna Variables, Up: Customizable Variables
+
+Perldoc $A$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B
+======================
+
+`w3m-perldoc-command'
+     Name of the executable file of `perldoc'.  The default is
+     `"perldoc"'.
+
+`w3m-perldoc-input-coding-system'
+     Coding system used when writing to the `perldoc' command.  The
+     default value is `euc-japan' if you are in the Japanese language
+     environment.  Otherwise it is `utf-8' if it is available, or
+     `iso-latin-1'.
+
+`w3m-perldoc-output-coding-system'
+     Coding system used when reading from the `perldoc' command.  The
+     default is `undecided'.
+
+`w3m-perldoc-pod2html-command'
+     Name of the executable file of `pod2html'.  The default is
+     `"pod2html"'.
+
+`w3m-perldoc-pod2html-arguments'
+     Lisp of arguments passed to the `pod2html' command.  The default is
+     `("--noindex")'.
+
+
+
+File: emacs-w3m-ja.info, Node: Namazu Variables, Next: Octet Variables, Prev: Perldoc Variables, Up: Customizable Variables
+
+Namazu $A$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B
+=====================
+
+`w3m-namazu-command'
+     Name of the executable file of Namazu.  The default is `namazu'.
+
+`w3m-namazu-arguments'
+     List of arguments passed to Namazu.  The default value is `("-h"
+     -H" "-n" w3m-namazu-page-max "-w" whence)'.  The symbols
+     `w3m-namazu-page-max' and `whence' will be replaced respectively
+     with the value of that variable and a proper value that the
+     program determines properly.
+
+`w3m-namazu-default-index'
+     An alias for the default index, or the directory name of it.  If this is
+     `nil', you will be prompted for the directory name whenever you
+     invoke the `w3m-namazu' command with no prefix argument.  The
+     default is the value of `namazu-default-dir' if it exists and
+     `namazu-always-query-index-directory' is `nil'.  Otherwise
+     `nil'.
+
+`w3m-namazu-index-alist'
+     Alist of aliases and index directories.  The default value is
+     determined due to `namazu-dir-alist' if any or `nil'.
+
+`w3m-namazu-input-coding-system'
+     Coding system used when reading from the namazu process.  The
+     default is the value of `namazu-cs-read' if it exists, or
+     `undecided'.
+
+`w3m-namazu-output-coding-system'
+     Coding system used when writing to the namazu process.  The default is
+     the value of `namazu-cs-write' if it exists, or is determined to
+     `shift_jis-dos' or `euc-japan-unix' due to the system type.
+
+`w3m-namazu-page-max'
+     The maximum number of documents retrieved in one search.  The
+     default is the value of `namazu-search-num' if any, or `30'.
+
+
+
+File: emacs-w3m-ja.info, Node: Octet Variables, Next: Session Manager Variables, Prev: Namazu Variables, Up: Customizable Variables
+
+Octet $A$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B
+====================
+
+There is no user option for the moment.
+
+* Session Manager Variables::
+
+
+File: emacs-w3m-ja.info, Node: Session Manager Variables, Next: Hooks, Prev: Octet Variables, Up: Customizable Variables
+
+$A%;%C%7%g%s%^%M$B!<$A%8%c$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B
+==================================
+
+`w3m-session-file'
+     $B%;%C%7%g%s$rJ]B8$9$k%U%!%$%kL>!#(B
+
+`w3m-session-time-format'
+     $BJ]B8;~4V$N7A<0!#(B
+
+`w3m-session-automatic-title'
+     emacs-w3m $B=*N;;~$N<+F0J]B8%;%C%7%g%s$N%?%$%H%k!#(B
+
+`w3m-session-crash-recovery-title'
+     $B%/%i%C%7%eI|85MQ%;%C%7%g%s$N%?%$%H%k!#(B
+
+`w3m-session-deleted-title'
+     $B%P%C%U%!$rJD$8$?;~$N<+F0J]B8%;%C%7%g%s$N%?%$%H%k!#(B
+
+`w3m-session-deleted-keep-number'
+     $B%P%C%U%!$rJD$8$?;~$N<+F0J]B8%;%C%7%g%s$r$$$/$DJ]B8$7$F$*$/$+!#(B
+
+`w3m-session-automatic-keep-number'
+     emacs-w3m $B=*N;;~$N<+F0J]B8%;%C%7%g%s$r$$$/$DJ]B8$7$F$*$/$+!#(B
+
+`w3m-session-unknown-title'
+     $B%?%$%H%k$,;XDj$5$l$J$+$C$?;~$K;H$o$l$kJ8;zNs!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Hooks, Next: Other Variables, Prev: Session Manager Variables, Up: Customizable Variables
+
+$A%U%C%/(B
+======
+
+`w3m-after-cursor-move-hook'
+     Hook run each time after the cursor moves in emacs-w3m buffers.
+     This hook is called by the `w3m-check-current-position' function
+     by way of `post-command-hook'.
+
+`w3m-delete-buffer-hook'
+     Hook run when every emacs-w3m buffer is deleted.
+
+`w3m-display-hook'
+     Hook run after displaying pages in emacs-w3m buffers.  Each function is
+     called with a url string as the argument.  This hook is evaluated by the
+     `w3m-goto-url' function.
+
+`w3m-fontify-after-hook'
+     Hook run after fontifying emacs-w3m buffers.  This hook is
+     evaluated by the `w3m-fontify' function.
+
+`w3m-fontify-before-hook'
+     Hook run when starting to fontify emacs-w3m buffers.  This hook
+     is evaluated by the `w3m-fontify' function.
+
+`w3m-form-input-map-mode-hook'
+     A hook called after w3m-form-input-map-mode.
+
+`w3m-form-input-map-set-hook'
+     A Hook called before w3m-form-input-map-set.
+
+`w3m-form-input-select-mode-hook'
+     A hook called after w3m-form-input-select-mode.
+
+`w3m-form-input-select-set-hook'
+     A Hook called before w3m-form-input-select-set.
+
+`w3m-form-input-textarea-mode-hook'
+     A hook called after w3m-form-input-textarea-mode.
+
+`w3m-form-input-textarea-set-hook'
+     A Hook called before w3m-form-input-textarea-set.
+
+`w3m-minor-mode-hook'
+     Hook run after `w3m-minor-mode' initialization.
+
+`w3m-mode-hook'
+     Hook run after `w3m-mode' initialization.  This hook is evaluated
+     by the `w3m-mode' function.
+
+`w3m-select-buffer-hook'
+     Hook run when a different emacs-w3m buffer is selected.
+
+`w3m-bookmark-mode-hook'
+     Hook run at the end of function `w3m-bookmark-mode'.
+
+
+
+File: emacs-w3m-ja.info, Node: Other Variables, Prev: Hooks, Up: Customizable Variables
+
+$A$=$NK{$N$(I+y$AJ}(B
+============
+
+`w3m-async-exec'
+     Non-`nil' means execute the `w3m' command asynchronously in Emacs
+     process.
+
+`w3m-broken-proxy-cache'
+     Set it to `t' if the proxy server seems not to work properly in
+     caching.  Note that this may be the double-edged sword; setting
+     it to `t' will likely be harmful if the proxy server sends bad
+     requests (e.g., not including the Host header, see RFC2616
+     section 14.23) to foreign servers when the `w3m' command
+     specifies the `no-cache' directive.  Also note that it may not be
+     effective if you are using old `w3m' command.
+
+`w3m-history-minimize-in-new-session'
+     Non-`nil' means minimize copied history so that there's only
+     current page.  This variable is effective when creating of the new
+     session by copying (i.e., `w3m-copy-buffer').  The default value is
+     `nil'.
+
+`w3m-history-reuse-history-elements'
+     Non-`nil' means reuse the history element when re-visiting the
+     page.  Otherwise, a new history element will be created even if
+     there are elements for the same url in the history.
+
+     Emacs-w3m used to operate as the case in which it is non-`nil',
+     however it sometimes brought about users' dissatisfaction.  For
+     example, if a user visited the pages A -> B -> C -> B in order,
+     performing BACK on the second B would let a user visit A.  The
+     reason why a user was taken to A rather than C is that the
+     `w3m-history' variable only had the list `(A B C)' as a history
+     and B was the current position at that time.
+
+     The default value for this variable is `nil' which allows the
+     `w3m-history' variable to have the list `(A B C B)'.  Where
+     contents of two B's are the identical Lisp objects.  So, too much
+     wasting the Lisp resources will be avoided.
+
+     See the documentation for the variables `w3m-history' and
+     `w3m-history-flat' for more information.
+
+`w3m-process-connection-type'
+     Value for `process-connection-type' used when communicating with
+     `w3m'.
+
+`w3m-process-modeline-format'
+     Format used when displaying the progress of the external `w3m'
+     process.  It shows a percentage of the data loaded from the web
+     server.
+
+`w3m-show-current-title-in-buffer-tab'
+     If non-`nil', show the title strings in the buffers tab.  It has
+     no effect if your XEmacs does not support the gutter items.
+
+
+
+File: emacs-w3m-ja.info, Node: Hooking into MUAs, Next: Frequently Asked Questions, Prev: Customizable Variables, Up: Top
+
+$A%a$B!<$A%k(B/$A%K%e$B!<$A%9%j$B!<$A%@$B!<$A$GJ9$&(B
+*****************************
+
+$B$3$3$G$O;0<oN`$N(B MUA (Message User Agent) $B$r>R2p$7$^$9!#$=$l$i$N(B MUA $B$O(B
+$B$9$Y$F(B emacs-w3m $B$r;H$&$3$H$K$h$C$F(B HTML $B%a!<%k$rE,@Z$KI=<($9$k$3$H$,$G(B
+$B$-$^$9!#$=$l$>$l$N(B MUA $B$H(B emacs-w3m $B$r@_Dj$7$F;H$&$?$a$N(B HowTo $B$H$$$/$D(B
+$B$+$NCm0U$r!"$3$3$G8+$D$1$k$3$H$,$G$-$k$G$7$g$&!#(B
+
+$B0[$J$k=,47$K4X$9$kB(@J$NCm<a(B: `message' $B$C$F2?(B? $B!](B Gnus $B%f!<%6$,(B
+`message' $B$H8@$&$H$-!"$=$l$O$7$P$7$P%a!<%k$^$?$O%K%e!<%9$H$7$FAw?.$9$k(B
+$B%a%C%;!<%8$NAp9F$r0UL#$7$^$9!#$7$+$7!"$=$l$O(B Mew $B$d(B Wanderlust $B$N%f!<%6(B
+$B$,!"<u?.$7$?%a%C%;!<%8$KBP$7$F;H$&MQ8l$G$9!#H`$i$OAw?.$9$k%a%C%;!<%8$K(B
+`draft' $B$r;H$C$F$$$^$9!#0lJ}(B Gnus $B%f!<%6$O!"<u?.$7$?%a%C%;!<%8$r(B
+`article' $B$H8F$S$^$9!#(B
+
+* Menu:
+
+* Gnus::                        Gnus $B$G(B HTML $B%a!<%k$rFI$`(B
+* Mew::                         Mew $B$G(B HTML $B%a!<%k$rFI$`(B
+* SEMI MUAs::                   SEMI MUA $B$G(B HTML $B%a!<%k$rFI$`(B
+* VM::                          VM (vieW maiL) $B$O(B Wanderlust $B$K$"$i$:(B
+
+
+
+File: emacs-w3m-ja.info, Node: Gnus, Next: Mew, Prev: Hooking into MUAs, Up: Hooking into MUAs
+
+Gnus $A$G(B HTML $A%a$B!<$A%k$r$BFI$A$`(B
+=========================
+
+Gnus (Emacs $B$N%K%e!<%:%j!<%@!<(B) $B$,(B emacs-w3m $B$r%5%]!<%H$7$F$$$k$C$F!"CN$C(B
+$B$F$$$^$7$?$+(B?  $B<B$O!"%P!<%8%g%s(B 22.1 $B0J>e$N(B Emacs $B$KF1:-$5$l$F$$$k(B
+Gnus $B$O(B emacs-w3m $B$r%5%]!<%H$9$k$s$G$9!#$b$7$"$J$?$N(B Emacs $B$,$$$/$i$+8E(B
+$B$$$N$J$i$P!":G?7HG$N(B Gnus $B$r;H$&$N$,NI$$$G$7$g$&!#$=$l$O0J2<$N>l=j$G<j(B
+$B$KF~$j$^$9(B:
+
+`ftp://ftp.gnus.org/pub/gnus/gnus.tar.gz'
+
+   * Emacs-w3m $B$G2?$,$G$-$k$N(B?
+
+     HTML $B$N(B spam $B%a!<%k$r!"(Bemacs-w3m $B$r;H$C$F?M4V$,FI$a$k$h$&$KJQ49$9(B
+     $B$k$3$H$,$G$-$^$9!#$b$A$m$s(B HTML $B$N(B ham $B%a!<%k(B (spam $B$G$O$J$$%a!<%k(B)
+     $B$KBP$7$F$bF/$-!"$I$A$i$N>l9g$G$b(B emacs-w3m $B$O%G%U%)%k%H$NJQ494o$h(B
+     $B$j$b$?$V$sB.$$$G$7$g$&!#DI2C$NA`:n$OI,MW$"$j$^$;$s!#$=$l$OC1$KI=<((B
+     $B$5$l$^$9!#(B
+
+     $B5-;v%P%C%U%!$N(B HTML $B$NItJ,$G$O(B `w3m-minor-mode' $B$,(B on $B$K$J$C$F!"(B
+     emacs-w3m $B$N$HF1$8<gMW$J%-!<$r;H$&$3$H$,$G$-$^$9!#Nc$($P(B `<RET>'
+     $B$O!"8=:_0LCV$N%j%s%/$,;X$7<($9%Z!<%8$K9T$-$^$9!#$=$l$i$N%-!<$OJQ?t(B
+     `w3m-minor-mode-command-alist' $B$GDj5A$5$l$F$$$^$9!#J]0B>e$NM}M3$+(B
+     $B$i!"$$$/$D$+$N%3%^%s%I$O$=$l$K;w$?JL$N%3%^%s%I$GCV$-49$($i$l$F$$$k(B
+     $B$3$H$r?4$KN1$a$F$*$$$F$/$@$5$$(B ($B2<5-;2>H(B)$B!#(B
+
+   * $B2?$r$7$J$1$l$P$$$1$J$$$N(B?
+
+     Gnus $B$N%^%K%e%"%k$rFI$s$G$/$@$5$$(B (*Note Display Customization:
+     (emacs-mime)Display Customization.)$B!#:G$b4JC1$JJ}K!$O!"0J2<$N9T$r(B
+     `~/.gnus.el' $B%U%!%$%k$KF~$l$k$3$H$G$9(B:
+
+          (setq mm-text-html-renderer 'w3m)
+
+     $B$5$i$K!"5-;v%P%C%U%!$G2hA|$rI=<($7$?$$>l9g$O!"0J2<$N9T$rF~$l$F$/$@(B
+     $B$5$$!#(B
+
+          (setq mm-inline-text-html-with-images t)
+
+     $B5-;v%P%C%U%!$G(B emacs-w3m $B$N%-!<$r;H$&I,MW$,L5$$$J$i$P!"0J2<$N9T$b(B
+     $BDI2C$7$F$/$@$5$$(B:
+
+          (setq mm-inline-text-html-with-w3m-keymap nil)
+
+   * $B$4Cm0U(B
+
+     $BA0$K(B spam $B$H(B ham $B$N$3$H$r=q$$$?$N$O$U$6$1$F$$$k$o$1$G$O$J$/$F!"$"(B
+     $B$J$?$NCm0U$r4-5/$9$k$?$a$K$^$5$K$3$3$K$"$k$N$G$9!#(BHTML $B%a!<%k$K$O(B
+     `<img>' $B%?%0$r;H$C$?(B spammers (spam $B$r$P$i$^$/$d$+$i(B) $B$NH\Nt$J0-9*(B
+     $B$_$,4^$^$l$F$$$k$+$b$7$l$^$;$s!#$=$l$O(B `Click Here!' $B%\%?%s$h$j$O(B
+     $B$k$+$KM-32$G$9!#:G$b$"$j$=$&$J$N$O!"$=$s$J$?$A$N0-$$(B spam $B$,$"$J$?(B
+     $B$NL\$K;_$^$C$?$+$I$&$+$r8!::$9$k!"$9$J$o$A$3$N>l9g!"$"$J$?$N%a!<%k(B
+     $B%"%I%l%9$,M-8z$G$"$k$3$H$r3NG'$9$k$?$a$N(B spammer $B$N0U?^$,$"$k$3$H(B
+     $B$G$9!#$=$l$O!"2hA|$rI=<($9$k$H$-$K<+F0E*$K<hF@$7$K9T$/$G$"$m$&(B
+     URL $B$K!"<1JLJ8;zNs$rKd$a9~$`$3$H$K$h$C$F9T$J$o$l$^$9!#JQ?t(B
+     `mm-w3m-safe-url-regexp' $B$,%G%U%)%k%HCM$+$iJQ99$5$l$F$$$J$1$l$P!"(B
+     Gnus $B$,>!<j$K(B spammer $B$N%5%$%H$K@\B3$9$k$3$H$O$"$j$^$;$s!#(B
+
+     `mm-inline-text-html-with-images' $B$r(B `t' $B$K$9$l$P!"5-;v%P%C%U%!$K(B
+     $B%$%s%i%$%s2hA|$rI=<($9$k$3$H$,$G$-$^$9$h$M(B?  $B$$$$$(!"CG$8$F0c$$$^(B
+     $B$9!#$"$J$?$O$^$@<i$i$l$F$$$k$N$G$9!#$"$J$?$N%a!<%k%"%I%l%9$,E~C#2D(B
+     $BG=$@$H$$$&;v<B$,O3$l$k$3$H$r5$$K$7$J$$$N$G$"$l$P!"JQ?t(B
+     `mm-w3m-safe-url-regexp' $B$r(B `nil' $B$K$7$F$/$@$5$$!#(B
+     `mm-w3m-safe-url-regexp' $B$N%G%U%)%k%HCM$O(B `"\\`cid:"' $B$G!"$3$l$O;d(B
+     $B$?$A$,(B `cid:' URL $B$K$h$C$F%a!<%k$K4^$^$l$F$$$k2hA|$,0BA4$@$H9M$($F(B
+     $B$$$k$3$H$r0UL#$7$^$9(B ($B$9$J$o$A!"(B`mm-w3m-safe-url-regexp' $B$rJQ99$7(B
+     $B$J$/$F$b!"$=$N$h$&$J2hA|$OI=<($9$k$3$H$,$G$-$^$9(B)$B!#(B
+
+   * $B$*$^$1(B
+
+     $B35N,%P%C%U%!$K$$$k$H$-$G$b!"5-;v%P%C%U%!$N2hA|I=<($r%H%0%k$K@Z$j49(B
+     $B$($k$3$H$,$G$-$^$9!#$=$l$i$N2hA|$,(B emacs-w3m $B$K$h$C$FI=<($5$l$k>l(B
+     $B9g$@$1$G$9$1$l$I$M!#Nc$G$9(B:
+
+          (defun gnus-summary-w3m-safe-toggle-inline-images (&optional arg)
+            "Toggle displaying of all images in the article buffer.
+          If the prefix arg is given, force displaying of images."
+            (interactive "P")
+            (with-current-buffer gnus-article-buffer
+              (let ((st (point-min))
+                    (nd (point-max))
+                    (w3m-async-exec w3m-async-exec))
+                (save-restriction
+                  (widen)
+                  (if (or (> st (point-min)) (< nd (point-max)))
+                      (setq w3m-async-exec nil))
+                  (article-goto-body)
+                  (goto-char (or (text-property-not-all (point) (point-max)
+                                                        'w3m-safe-url-regexp nil)
+                                 (point)))
+                  (if (interactive-p)
+                      (call-interactively 'w3m-toggle-inline-images)
+                    (w3m-toggle-inline-images arg))))))
+
+          (eval-after-load "gnus-sum"
+            '(define-key gnus-summary-mode-map
+               "\C-i" 'gnus-summary-w3m-safe-toggle-inline-images))
+
+*Note Nnshimbun:: $B$b;2>H$7$F$/$@$5$$!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Mew, Next: SEMI MUAs, Prev: Gnus, Up: Hooking into MUAs
+
+Mew $A$G(B HTML $A%a$B!<$A%k$r$BFI$A$`(B
+========================
+
+Emacs-w3m $B$r;H$&$3$H$K$h$C$F!"(BText/Html $B$r(B Message $B%b!<%I$KI=<($G$-$k$h(B
+$B$&$K$J$j$^$9!#0J2<$N@_Dj$r(B `~/.mew.el' $B%U%!%$%k$K2C$($F$/$@$5$$(B:
+
+     (require 'mew-w3m)
+
+$B$3$l$G!"$"$?$+$b(B Text/Plain $B$G$"$k$+$N$h$&$K!"(BText/Html $B$r(B Message $B%b!<(B
+$B%I$KI=<($G$-$k$h$&$K$J$j$^$9!#$3$N:]$b!"(B`C-c C-e' $B$NA`:n$OM-8z$G(B
+$B$9!#(B
+
+$B$3$N$4$m!"F1$8>pJs$rFs$D4^$s$G$$$k%a!<%k$rHs>o$K$h$/8+$+$1$^$9!#$=$l$i(B
+$B$O(B `text/plain' $B%Q!<%H$H(B `text/html' $B%Q!<%H$NN>J}$+$i@.$k(B ($B2?$A$e$&%P%s(B
+$B%II}$NL5BL;H$$$@(B) `multipart/alternative' $B%U%)!<%^%C%H$r;H$C$F$$$^$9!#(B
+Mew $B$O%G%U%)%k%H$G$O(B `text/plain' $B%Q!<%H$@$1$rI=<($7$^$9!#$"$J$?$O(B
+emacs-w3m $B$r;H$C$F$$$k$N$G$9$+$i!"(B`text/html' $B%Q!<%H$NJ}$rM%@h$7$?$/$J(B
+$B$k$+$b$7$l$^$;$s!#$=$l$J$i$P!"0J2<$N@_Dj$r(B `~/.mew.el' $B%U%!%$%k$K2C$($F(B
+$B$/$@$5$$(B:
+
+     (setq mew-mime-multipart-alternative-list
+           '("Text/Html" "Text/Plain" ".*"))
+
+Mew $B$K4XO"$9$k$$$/$D$+$N%+%9%?%^%$%:2DG=$JJQ?t$,$"$j$^$9(B:
+
+`mew-use-w3m-minor-mode'
+     $BHs(B-`nil' $B$K$9$k$H!"(Btext/html $B%Q!<%H$,I=<($5$l$F$$$k%a%C%;!<%8%P%C(B
+     $B%U%!$K$*$$$F(B `w3m-minor-mode' $B$,(B on $B$K$J$j!"(Bemacs-w3m $B$N$HF1$8<gMW(B
+     $B$J%-!<$r;H$&$3$H$,$G$-$^$9!#Nc$($P(B `<RET>' $B$O!"8=:_0LCV$N%j%s%/$,(B
+     $B;X$7<($9%Z!<%8$K9T$-$^$9!#$=$l$i$N%-!<$OJQ?t(B
+     `w3m-minor-mode-command-alist' $B$GDj5A$5$l$F$$$^$9!#J]0B>e$NM}M3$+(B
+     $B$i!"$$$/$D$+$N%3%^%s%I$O$=$l$K;w$?JL$N%3%^%s%I$GCV$-49$($i$l$F$$$k(B
+     $B$3$H$r?4$KN1$a$F$*$$$F$/$@$5$$!#%G%U%)%k%HCM$O(B `nil' $B$G$9!#(B
+
+`mew-w3m-auto-insert-image'
+     $BHs(B-`nil' $B$K$9$k$H!"(Bmultipart/related $B$J%a%C%;!<%8$rFI$s$G$$$k$H$-(B
+     $B$K!"%a%C%;!<%8%P%C%U%!$G2hA|$r%$%s%i%$%sI=<($5$;$k$3$H$,$G$-$^$9!#(B
+     mew-w3m $B$O!"I=<($9$k$?$a$K(B `cid:' URL $B$K$h$C$F%a!<%k$NK\J8$K4^$^$l(B
+     $B$F$$$k2hA|$@$1(B ($B;d$?$A$O$=$l$i$r0BA4$@$H9M$($F$$$^$9(B) $B$r5v2D$9$k$3(B
+     $B$H$KCm0U$7$F$/$@$5$$!#%G%U%)%k%HCM$O(B `nil' $B$G$9!#(B
+
+     $B$3$3$G!"(B`~/.mew.el' $B$K(B
+
+          (define-key mew-summary-mode-map "T" 'mew-w3m-view-inline-image)
+
+     $B$H=q$/$H!"(B"T" $B$r2!$9$3$H$K$h$C$F!"2hA|I=<($N>uBV$r%H%0%k$9$k$3$H$,(B
+     $B$G$-$^$9!#$^$?!"(B"C-uT" $B$H(B prefix $B$r$D$1$k$H!"%a!<%kK\J8$K4^$^$l$F(B
+     $B$$$J$$2hA|$bI=<($7$^$9!#(B
+
+`mew-w3m-cid-retrieve-hook'
+     `cid:' URL $B$r<h$j=P$7$?8e$G<B9T$5$l$k%U%C%/$G$9!#%G%U%)%k%HCM$O(B
+     `nil' $B$G$9!#(B
+
+*Note Mew Shimbun:: $B$b;2>H$7$F$/$@$5$$!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: SEMI MUAs, Next: VM, Prev: Mew, Up: Hooking into MUAs
+
+SEMI MUA $A$G(B HTML $A%a$B!<$A%k$r$BFI$A$`(B
+=============================
+
+Emacs-w3m $B$H(B SEMI MUA$B!"Nc$($P(B Wanderlust $B$r;H$&$3$H$K$h$C$F!"(BHTML $B%a!<(B
+$B%k$r?M4V$,FI$a$k$h$&$KI=<($9$k$3$H$,$G$-$^$9!#$=$&$$$&(B MUA $B$O(B MIME $B$N5!(B
+$BG=$r(B SEMI ($B$=$7$F$5$i$K(B FLIM) $B$KMj$C$F$$$k$N$G!"0lHL$K$=$l$r(B SEMI MUA
+$B$H8F$s$G$$$^$9!#(BSEMI $B$O(B HTML $B%a!<%k$NIA2h$K%G%U%)%k%H$G(B Emacs/W3 $B$r;H$$(B
+$B$^$9$,!"MF0W$K(B emacs-w3m $B$GCV$-49$($k$3$H$,2DG=$G$9!#$=$l$K$h$C$F$"$J$?(B
+$B$NEEG>@83h$O$h$j2wE,$K$J$k$G$7$g$&!#(B
+
+$BC1$K0J2<$N9T$r(B `~/.emacs' $B%U%!%$%k$KF~$l$l$PNI$$$N$G$9(B:
+
+     (require 'mime-w3m)
+
+`mime-w3m' $B%b%8%e!<%k$H(B `mime-w3' $B%b%8%e!<%k$O!"$4A[A|$NDL$j5!G=E*$K$[(B
+$B$\F1$8$b$N$G$9(B ($BL>A0$b;w$F$$$k$G$7$g$&(B?)$B!#8e<T$O(B SEMI $B%Q%C%1!<%8$K4^$^(B
+$B$l$F$$$^$9!#(B
+
+$B5-;v%P%C%U%!$N(B HTML $B$NItJ,$G$O(B `w3m-minor-mode' $B$,(B on $B$K$J$C$F!"(B
+emacs-w3m $B$N$HF1$8<gMW$J%-!<$r;H$&$3$H$,$G$-$^$9!#Nc$($P(B `<RET>' $B$O!"8=(B
+$B:_0LCV$N%j%s%/$,;X$7<($9%Z!<%8$K9T$-$^$9!#$=$l$i$N%-!<$OJQ?t(B
+`w3m-minor-mode-command-alist' $B$GDj5A$5$l$F$$$^$9!#J]0B>e$NM}M3$+$i!"$$(B
+$B$/$D$+$N%3%^%s%I$O$=$l$K;w$?JL$N%3%^%s%I$GCV$-49$($i$l$F$$$k$3$H$r?4$K(B
+$BN1$a$F$*$$$F$/$@$5$$!#(B
+
+`mime-w3m' $B%b%8%e!<%k$K4XO"$9$k$$$/$D$+$N%+%9%?%^%$%:2DG=$JJQ?t$,$"$j$^(B
+$B$9(B:
+
+`mime-w3m-display-inline-images'
+     $BHs(B-`nil' $B$@$C$?$i!"2hA|$,(B HTML $B%a!<%k$K%$%s%i%$%sI=<($5$l$^$9!#:G(B
+     $B=i$K(B `default' $B$H$$$&%7%s%\%k$@$C$?$i(B ($B$=$l$,%G%U%)%k%H$G$9(B)$B!"$3$N(B
+     $BJQ?t$NCM$O!"JQ?t(B `w3m-default-display-inline-images' $B$NCM$GCV$-49(B
+     $B$($i$l$^$9!#$?$V$s!"$"$J$?$O$3$l$rJQ99$9$kI,MW$OL5$$$G$7$g$&!#(B
+
+`mime-w3m-safe-url-regexp'
+     $B0BA4$G$"$k$H9M$($i$l$k(B URL $B$K%^%C%A$9$k@55,I=8=$G$9!#%G%U%)%k%HCM(B
+     $B$O(B `"\\`cid:"' $B$G!";d$?$A$O(B `cid:' URL $B$K$h$C$F%a!<%k$K4^$^$l$?2h(B
+     $BA|$,0BA4$@$H9M$($F$$$k$3$H$r0UL#$7$^$9!#0-4A$K$h$k967b$K$D$$$F$O(B
+     *Note Gnus:: $B$r;2>H$7$F$/$@$5$$!#(B
+
+`mime-w3m-setup-hook'
+     `mime-w3m' $B%b%8%e!<%k$H(B SEMI $B$N6(D4F0:n$r@_Dj$7$?D>8e$K<B9T$5$l$k(B
+     $B%U%C%/$G$9!#%G%U%)%k%HCM$O(B `nil' $B$G$9!#(B
+
+$B$H$3$m$G!"(Bsummary $B%P%C%U%!$K$$$k$H$-$G$b!"(Barticle $B%P%C%U%!(B (Wanderlust
+$B$N%3%_%e%K%F%#$G$O(B message $B%P%C%U%!$H8F$P$l$F$$$k(B) $B$N2hA|I=<($r%H%0%k$K(B
+$B@Z$j49$($k$3$H$,$G$-$^$9!#$=$l$i$N2hA|$,(B emacs-w3m $B$K$h$C$FI=<($5$l$k>l(B
+$B9g$@$1$G$9$1$l$I$M!#(BWanderlust $BMQ$NNc$G$9(B:
+
+     (defun wl-summary-w3m-safe-toggle-inline-images (&optional arg)
+       "Toggle displaying of all images in the message buffer.
+     If the prefix arg is given, all images are considered to be safe."
+       (interactive "P")
+       (with-current-buffer wl-message-buffer
+         (w3m-toggle-inline-images arg)))
+
+     (eval-after-load "wl-summary"
+       '(define-key wl-summary-mode-map
+          "\M-i" 'wl-summary-w3m-safe-toggle-inline-images))
+
+
+
+File: emacs-w3m-ja.info, Node: VM, Prev: SEMI MUAs, Up: Hooking into MUAs
+
+VM (vieW maiL) $A$O(B Wanderlust $A$K$"$i$:(B
+=====================================
+
+VM $B$G(B html $B%a!<%k$rI=<($9$k5!G=$rDs6!$9$k(B vm-w3m.el $B%b%8%e!<%k$H%Q%C%A(B
+$B$O(B VM $B$N?7$7$$%a%$%s%F%$%J!<$K0z$-7Q$,$l$^$7$?$,!"$^$@(B VM $B$N0BDjHG$K8=(B
+$B$l$F$$$^$;$s!#(BVM $A%[$B!<$A%`%Z$B!<$A%8(B (http://www.nongnu.org/viewmail/) $B$rK,$M(B
+$B$F$_$F$/$@$5$$!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Frequently Asked Questions, Next: Known Problems, Prev: Hooking into MUAs, Up: Top
+
+$A1X$:4p$,$"$k$H$OO^$i$J$$(B
+************************
+
+* Menu:
+
+* General FAQ::                 $B0lHLE*$J<ALd(B
+* Trouble FAQ::                 $B%H%i%V%k(B
+* Shimbun FAQ::                 Shimbun $B$K4X$9$k<ALd(B
+
+
+
+File: emacs-w3m-ja.info, Node: General FAQ, Next: Trouble FAQ, Prev: Frequently Asked Questions, Up: Frequently Asked Questions
+
+$AR;0c5D$J$(Go3YB(B
+============
+
+   * Q. emacs-w3m $B$C$F2?$G$9$+(B?
+
+     w3m $B$r(B Emacs $B>e$GF0$+$9%$%s%?!<%U%'!<%9%W%m%0%i%`$G$9!#(BEmacs $B>e$G(B
+     $BF0$/%&%'%V%V%i%&%6$H$7$F;H$&$3$H$b$G$-$^$9!#$5$i$J$k>pJs$O(B *Note
+     Introduction:: $B$b;2>H$7$F$/$@$5$$!#(B
+
+   * Q. $BF0:n$9$k(B Emacs $B$O(B?
+
+     $B0J2<$N(B Emacsen $B$GF0:n$9$k$3$H$,3NG'$5$l$F$$$^$9!#(B
+
+        * Emacs 21
+        * Emacs 22
+        * XEmacs 21.4.17 $B0J>e!"(BMule $BM-$j(B/$BL5$7(B
+        * XEmacs 21.5-b19 $B0J>e!"(BMule $BM-$j(B/$BL5$7(B
+        * Meadow
+
+     $B$J$*!"(BXEmacs $B$G$O(B APEL $B$,I,MW$H$J$j$^$9!#>\$7$/$O(B *Note Other
+     Requirements:: $B$r3NG'$7$F$/$@$5$$!#(B
+
+   * Q. $BF0:n$9$k(B w3m $B$O(B?
+
+     $B0J2<$N(B w3m $B$GF0:n$9$k$3$H$,3NG'$5$l$F$$$^$9!#(B
+
+        * w3m-0.3
+        * w3mmee-p24-18 + moe-1.5.4
+
+          $BNc$K>e$2$?(B w3mmee $B$O(B `lang=many' $B$G(B configure $B$5$l$F$$$k(B ($B$=(B
+          $B$l$O(B `configure' $B%9%/%j%W%H$,(B `Which language do you
+          prefer?' $B$H?R$M$?$H$-$K(B 3 $B$rF~NO$9$k$3$H$K$h$C$F$G$-$^$9(B) $B$3(B
+          $B$H$KCm0U$7$F$/$@$5$$!#$5$i$K$=$l$O(B `libmoe' $B%Q%C%1!<%8$rI,MW(B
+          $B$H$7$^$9!#(B
+
+   * Q. XEmacs $B$N(B SUMO $B%Q%C%1!<%8$K4^$^$l$F$$$k(B APEL $B$r%$%s%9%H!<%k$7$F(B
+     $B$"$k$N$G$9$,(B?
+
+     XEmacs $B$N(B APEL $B%Q%C%1!<%8(B ($B$9$Y$F$N%b%8%e!<%k$,(B Mule $BIU$-$N(B
+     XEmacs $BMQ$K%3%s%Q%$%k$5$l$F$$$k(B) $B$K$O$$$m$$$mLdBj$,$"$j$^$9!#Nc$((B
+     $B$P(B `std11' $B%b%8%e!<%k$,(B FLIM $B$N$b$N$H$+$A9g$&!"$J$I!#$=$l$G$b(B
+     `apel-1.23-pkg.tar.gz' $B0J>e$N$b$N$@$C$?$i!"$=$7$F(B `shimbun' $B$N5!G=(B
+     $B$N$?$a$K(B FLIM $B$r;H$o$J$$$J$i$P!"(BMule $BIU$-$HL5$7N>J}$N(B XEmacs $B$G;H(B
+     $B$($k$N$G$9$,!"%*%j%8%J%k$N(B APEL $B$GCV$-49$($k$+?75,$K%$%s%9%H!<%k$9(B
+     $B$k$3$H$r4+$a$^$9!#<hF@>l=j$O(B *Note Other Requirements:: $B$r8+$F$/$@(B
+     $B$5$$!#(B
+
+   * Q. CVS $B$G:G?7HG$r<hF@$7$?$N$G$9$,!"(B`configure' $B%9%/%j%W%H$,8+$D$+(B
+     $B$j$^$;$s!#(B
+
+     `autoconf' $B$r<B9T$7$F$/$@$5$$!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Trouble FAQ, Next: Shimbun FAQ, Prev: General FAQ, Up: Frequently Asked Questions
+
+$A%H%i%V%k(B
+========
+
+   * Q. $BG'>Z$NI,MW$J%Z!<%8$N%Q%9%o!<%I$,F~NO$G$-$^$;$s!#(B
+
+     $BJQ?t(B `w3m-async-exec' $B$K(B `nil' $B0J30$NCM$,@_Dj$5$l$F$$$k$3$H$r3NG'(B
+     $B$7$F$/$@$5$$!#(B
+
+   * Q. $BG'>Z$NI,MW$J(B proxy $B%5!<%P!<$N%Q%9%o!<%I$,F~NO$G$-$^$;$s!#(B
+
+     $BJQ?t(B `w3m-async-exec' $B$K(B `nil' $B0J30$NCM$,@_Dj$5$l$F$$$k$3$H$r3NG'(B
+     $B$7$F$/$@$5$$!#(B
+
+   * Q. $B%j%s%/$,$?$I$l$^$;$s!#(B
+
+     `-header' $B%*%W%7%g%s$r<u$1IU$1$k(B w3m $B%3%^%s%I$,I,MW$G$9!#(Bw3m $B$N%P!<(B
+     $B%8%g%s$r3NG'$7$F$/$@$5$$!#(B
+
+   * Q. $BJ8;z2=$1$7$^$9!#(B
+
+     $B$$$/$D$+$N860x$,$"$j$^$9!#(B
+
+       1. HTML $B%U%!%$%k$NLdBj(B
+
+          HTML $B%U%!%$%kCf$G(B `<meta>' $B%?%0$K$h$C$F;XDj$5$l$F$$$kJ8;z%3!<%I$H!"(B
+          $B<B:]$NJ8;z%3!<%I$,0[$J$k$H!"@5>o$KI=<($5$l$^$;$s!#(B
+          `M-x w3m-redisplay-with-charset <RET>' $B$^$?(B
+          $B$O(B `C c' $B%3%^%s%I$r;H$C$F!"@5$7$$J8;z%3!<%I$r;XDj$7$F:FIA2h$7$F(B
+          $B$/$@$5$$!#(B
+
+       2. $BJ8;z%3!<%I(B
+
+          ISO-2022-JP(jis), EUC-JP $B$^$?$O(B SHIFT_JIS $B0J30$NJ8;z%3!<%I$G(B
+          $B5-=R$5$l$?%Z!<%8$K$D$$$F$O!"I=<($G$-$J$$>l9g$,$"$j$^$9!#<!$N(B
+          $B$$$:$l$+$NJ}K!$GBP=h$7$F$/$@$5$$!#(B
+
+            a. Mule-UCS (*Note Other Requirements::) $B$r%$%s%9%H!<%k$9$k(B
+               $B$H!"(BUnicode $B$GDj5A$5$l$F$$$kHO0O$NJ8;z$OI=<($G$-$k$h$&$K(B
+               $B$J$j$^$9!#%$%s%9%H!<%k8e!"JQ?t(B `w3m-use-mule-ucs' $B$,(B
+               `nil' $B0J30$NCM$K@_Dj$5$l$F$$$k$3$H$r3NG'$7$F$/$@$5$$!#$J(B
+               $B$*!"(BEmacs ($B$=$l$K(B emacs-w3m $B$b(B) $B$,(B EUC-JISX0213 $B$*$h$S(B
+               ISO-2022-JP-3 $B$NJ8;z%3!<%I$r07$($k$h$&$K$9$k$K$O!"(B
+               Mule-UCS $B$KImB0$7$F$$$k(B `jisx0213' $B%b%8%e!<%k$r%$%s%9%H!<(B
+               $B%k$9$kI,MW$,$"$j$^$9(B ($B;DG0$J$,$i(B XEmacs $B$G$O;H$($^$;$s(B
+               $B$,(B)$B!#(B
+
+            b. w3mmee $B$d(B w3m-m17n $B$r%$%s%9%H!<%k$7$F!"JQ?t(B
+               `w3m-command' $B$KE,@Z$JCM$r@_Dj$7$F$/$@$5$$!#$3$N$h$&$K@_(B
+               $BDj$9$k$H!"(Bemacs-w3m $B$O$3$l$i$N%W%m%0%i%`$,Ds6!$9$kB?8@8l(B
+               $B5!G=$rMxMQ$9$k$h$&$K$J$j$^$9!#$?$@$7!"(BEmacs $B$,07$($kJ8;z(B
+               $B%3!<%I$K8B$i$l$^$9$N$G!"I,MW$K1~$8$F(B Mule-UCS $B$b%$%s%9%H!<(B
+               $B%k$7$F$/$@$5$$!#(B
+
+       3. Emacsen $B$NLdBj(B
+
+          XEmacs 21.1 $B$G$O(B SHIFT_JIS $B$N%Z!<%8$,2=$1$k$3$H$,$"$j$^$9!#$^(B
+          $B$?!"(BXEmacs 21.2 $B$G$b(B beta36 $B0JA0$G$OLdBj$,$"$j$^$9!#$=$&$$$&(B
+          $B$b$N$r;H$C$F$$$k>l9g$O(B XEmacs $B$r%"%C%W%0%l!<%I$7$F$/$@$5$$!#(B
+
+          XEmacs 21.1 $B$H(B 21.2 $B$O!"$9$G$K8x<0$K$*Lr8fLH$K$J$C$?$3$H$rG'(B
+          $B<1$7$F$/$@$5$$!#(B
+
+       4. `standard-display-european' $B$r;H$o$J$$$G$/$@$5$$(B
+
+          $B$=$l$O$7$P$7$P(B Latin $BJ8;z$r@5$7$/I=<($5$;$J$$$N$G!"35$7$FM-32(B
+          $B$G$9!#Nc$($P!"(B`&#8217' $B$H$7$F%(%s%3!<%I$5$l$?%"%]%9%H%m%U%#J8(B
+          $B;z(B (`'') $B$O!"$=$l$,$"$?$+$b(B `&#249' $B$H$7$F%(%s%3!<%I$5$l$?$+(B
+          $B$N$h$&$K!"Dc%"%/%;%s%H(B (a grave accent) $B$,IU$$$?J8;z(B `u' $B$H$7(B
+          $B$FI=<($5$l$k$G$7$g$&!#$"$J$?$N(B `~/.emacs' $B%U%!%$%k$+!"(BEmacs
+          $B$,5/F0;~$KFI$_9~$`(B site $B%U%!%$%k$K!"2?$+0J2<$N$h$&$J9T$,$"$k(B
+          $B$J$i$P!"$=$l$r<h$j=|$/$3$H$r6/$/4+$a$^$9!#(B
+
+               (standard-display-european 1)
+
+          $B$=$3$G$O!"0z?t$O(B `1' $B$G$O$J$/$F(B `t' $B$+$b$7$l$^$;$s!#(B
+
+   * Q. $B2hA|I=<($G$-$^$;$s!#(B
+
+     $B$$$/$D$+$N860x$,$"$j$^$9!#(B
+
+     $B8E$$%P!<%8%g%s$N(B `libungif' $B%i%$%V%i%j$K$O%P%0$,$"$j$^$9!#(B
+     `libungif-4.1.0b1' $B0J9_$N$b$N$r%$%s%9%H!<%k$7$J$1$l$P$J$j$^$;$s!#(B
+
+     XEmacs $B$G$OI,$:(B `gifsicle' $B%W%m%0%i%`$r%$%s%9%H!<%k$7$F$/$@$5$$!#(B
+     $B8=:_MxMQ$G$-$k$9$Y$F$N(B XEmacs 21.x $B$K$O%P%0$,$"$j!"(Bemacs-w3m $B$G$O(B
+     $B$3$l$r;H$C$FBP:v$7$F$$$^$9(B (*Note Other Requirements::)$B!#(B
+
+     $B8E$$(B w3m $B%3%^%s%I$G$O@5>o$KI=<($G$-$^$;$s!#(Bw3m $B$N%P!<%8%g%s$r3NG'(B
+     $B$7$F$/$@$5$$!#(B
+
+   * Q. Cookie $B$,I,MW$J%Z!<%8$r1\Mw$G$-$^$;$s!#(B
+
+     ($B$^$@<B83E*$J5!G=$G$9!#(B)
+
+     $BJQ?t(B `w3m-use-cookies' $B$K(B `nil' $B0J30$NCM$,@_Dj$5$l$F$$$k$3$H$r3NG'(B
+     $B$7$F$/$@$5$$!#(B
+
+   * Q. $B%U%)!<%`$KF~NO$G$-$^$;$s!#(B
+
+     ($B$^$@<B83E*$J5!G=$G$9!#(B)
+
+     $BJQ?t(B `w3m-use-form' $B$K(B `nil' $B0J30$NCM$,@_Dj$5$l$F$$$k$3$H$r3NG'$7(B
+     $B$F$/$@$5$$!#(B
+
+   * Q. $B%U%)!<%`$rAw?.$G$-$^$;$s!#(B
+
+     ($B$^$@<B83E*$J5!G=$G$9!#(B)
+
+     $BJQ?t(B `w3m-use-form' $B$K(B `nil' $B0J30$NCM$,@_Dj$5$l$F$$$k$3$H$r3NG'$7(B
+     $B$F$/$@$5$$!#$3$N5!G=$r;H$&$K$O!"(B`-post' $B%*%W%7%g%s$rG'<1$9$k(B w3m
+     $B%3%^%s%I$,I,MW$G$9!#(Bw3m $B$N%P!<%8%g%s$r3NG'$7$F$/$@$5$$!#(B
+
+   * Q. $B%U%l!<%`$,%l%s%@%j%s%0$5$l$^$;$s!#(B
+
+     w3mmee $B$r%$%s%9%H!<%k$7$F!"0J2<$N@_Dj$r(B `~/.emacs' $B%U%!%$%k$KF~$l(B
+     $B$F$/$@$5$$(B:
+
+          (setq w3m-command "w3mmee")
+
+   * Q. GNU Emacs $B$N(B tab $B9T$K(B favicon $B$,I=<($5$l$J$$$N$G$9$,!#(B
+
+     Image Magick $B$K4^$^$l$F$$$k(B `convert' $B%W%m%0%i%`$r%$%s%9%H!<%k$7$F(B
+     $B$/$@$5$$!#(B`http://www.imagemagick.org/' $B$+$iF~<j$G$-$^$9!#(B
+
+   * Q. GNU Emacs $B$G(B favicon $B$rI=<($7$h$&$H$7$?$N$G$9$,!"(BEmacs $B$,%m%C%/(B
+     $B$7$^$7$?!#(B
+   * Q. Emacs-w3m $B$rN)$A>e$2$h$&$H$7$?$i!"7c$7$/%G%#%9%/%"%/%;%9$7$?8e!"(B
+     `process convert exited abnormally with code 10' $B$J$I$HI=<($5$l$^(B
+     $B$7$?!#$I$&$J$C$F$$$k$s$G$7$g$&(B?
+
+     $B8E$$%P!<%8%g%s$N(B Image Magick $B$r;H$C$F$$$^$;$s$+(B?
+     ImageMagick-5.2.1 $B$KIUB0$7$F$$$k(B `convert' $B$r;H$C$F$$$k$H!"$=$&$J(B
+     $B$k$3$H$,CN$i$l$F$$$^$9!#(BImageMagick-5.4.0-5 ($B0J>e(B) $B$KIUB0$7$F$$$k(B
+     `convert' $B$G$O!"@5>oF0:n$,3NG'$5$l$F$$$^$9!#(B
+
+     $B$b$7(B ImageMagick $B$,;H$($J$$!"$^$?$O;H$$$?$/$J$$>l9g$O(B
+     `~/.emacs-w3m' $B%U%!%$%k$K(B
+
+          (setq w3m-use-favicon nil)
+
+     $B$N@_Dj$rDI2C$7$F$/$@$5$$!#(B
+
+   * Q. $B$J$<(B emacs-w3m $B$,(B w3mmee $B$GF0:n$7$J$$$N$G$9$+(B?
+
+     $B$b$7(B `lang=en' $B$^$?$O(B `lang=ja' $B$G(B configure $B$5$l$?(B w3mmee $B$r;H$C(B
+     $B$F$$$k$N$J$i$P!"(B`lang=many' $B$G(B configure $B$7D>$7$F(B ($B$=$l$O(B
+     `configure' $B%9%/%j%W%H$,(B `Which language do you prefer?' $B$H?R$M$?(B
+     $B$H$-$K(B 3 $B$rF~NO$9$k$3$H$K$h$C$F$G$-$^$9(B)$B!"(Bw3mmee $B$r:F9=C[$7$F$/$@(B
+     $B$5$$!#(B
+
+   * Q. $B$J$<(B emacs-w3m $B$G(B web $B%Z!<%8$,8+$($J$$$N$G$7$g$&$+(B?  $B%m!<%+%k$J(B
+     html $B%U%!%$%k$r8+$?$j!"AG$N(B w3m $B$r;H$&>l9g$OLdBjL5$$$N$G$9$,!#(B
+
+     $B$"$k(B Linux $B$NG[I[(B ($BNc$($P(B Gentoo Linux) $B$,4^$s$G$$$k(B w3m $B%3%^%s%I(B
+     $B$K$O!"(Basync $B%Q%C%A(B (1) (*Note Trouble FAQ-Footnotes::) $B$H$$$&$b$N(B
+     $B$,Ev$?$C$F$$$^$9!#$=$l$OAG$N(B w3m $B%3%^%s%I$r;H$&$H$-$KM-MQ$J$N$G$9(B
+     $B$,!"(Bemacs-w3m $B$r%O%s%0$5$;$k$+$b$7$l$^$;$s!#$=$l$,5?$o$l$k$J$i$P!"(B
+     w3m $B%3%^%s%I$r%=!<%9$+$i:F%$%s%9%H!<%k$9$k$3$H$r4+$a$^$9!#(B
+
+   * Q. $B$J$<(B emacs-w3m $B$N%U%l!<%`$,%]%C%W%"%C%W$7$J$$$N$G$9$+(B?
+
+     Emacs-w3m $B$N%U%l!<%`$,B>$N%U%l!<%`$N2<$K1#$l$F$$$F$b!"$=$l(B
+     $B$,(B `M-x w3m <RET>' $B%3%^%s%I$G%]%C%W%"%C%W$9$k$N$O!"$+$J$jJX(B
+     $BMx$G$9!#$7$+$7!"(B`metacity' $B%&%#%s%I%&!&%^%M!<%8%c!<$,;H$o$l$k$$$/$D(B
+     $B$+$N%W%i%C%H%U%)!<%`(B ($BNc$($P(B Fedora Linux) $B>e$G:n$i$l$?(B Emacs $B$rAv$i$;$k(B
+     $B>l9g$K!"$=$l$,F/$+$J$$$H$$$&Js9p$,$"$j$^$7$?!#$=$l$i$N%7%9%F%`$G$O!"(B
+     Emacs $B$N%U%l!<%`$r%]%C%W%"%C%W$5$;$kB>$N5!G=$bF0$+$J$$$G$7$g$&!#$b$7$"$J(B
+     $B$?$,$=$s$J;4$a$J6-6x$K$"$k$J$i$P!"0J2<$N(B advice $B$r;n$92ACM$,$"$k$+$b$7$l(B
+     $B$^$;$s!#(B
+
+          (if (or (not window-system) (featurep 'xemacs))
+              nil
+            (defadvice raise-frame
+              (after make-it-work (&optional frame) activate)
+              "Make it work with the aid of wmctrl."
+              (call-process
+               "wmctrl" nil nil nil "-i" "-R"
+               (frame-parameter (or frame (selected-frame))
+                                'outer-window-id))))
+
+     $B$3$3$G(B `wmctrl' $B$O!"0J2<$N>l=j$G<hF@$G$-$k30It%3%^%s%I$G$9!#(B
+
+     `http://sweb.cz/tripie/utils/wmctrl/'
+
+     Advice $B$r(B `~/.emacs' $B%U%!%$%k$K=q$-9~$`A0$K!"(B`wmctrl' $B%3%^%s%I$r%$(B
+     $B%s%9%H!<%k$7$J$1$l$P$J$i$J$$$3$H$K!"Cm0U$7$F$/$@$5$$!#(B
+
+     $B<!$N$b$N$O:#$N$H$3$m(B emacs-w3m $B$G$OITMW$G$9$,!"$"$k<o$N%"%W%j%1!<(B
+     $B%7%g%s$,F0:n$9$k$?$a$KI,MW$G$9!#(B($BA0$N$b$N$,I,MW$J4D6-$G$O!"$3$l$r(B
+     $B2C$($F$b<:$&$b$N$O$"$j$^$;$s!#(B)
+
+          (if (or (not window-system) (featurep 'xemacs))
+              nil
+            (defadvice pop-to-buffer (after enable-it-to-forcus-frame
+                                            activate)
+              "Enable it to focus frame if `pop-up-frames' is non-nil."
+              (when pop-up-frames
+                (let ((id (condition-case nil
+                              (frame-parameter
+                               (window-frame
+                                (get-buffer-window (ad-get-arg 0)))
+                               'outer-window-id)
+                            (error nil))))
+                  (when id
+                    (call-process
+                     "wmctrl" nil nil nil "-i" "-R" id))))))
+
+     $B:G8e$N$b$N$O$?$V$sMW$i$J$$$G$7$g$&!#$7$+$7!"$$$/$D$+$N%W%i%C%H%U%)!<(B
+     $B%`$G$O;n$7$F$_$k2ACM$,$"$k$+$b$7$l$^$;$s!#(B
+
+          (if (or (not window-system) (featurep 'xemacs))
+              nil
+            (defadvice select-frame (around set-input-focus
+                                            (frame) activate)
+              "Run `select-frame-set-input-focus'."
+              (setq ad-return-value (and (framep frame)
+                                         (frame-live-p frame)
+                                         frame))
+              (ad-deactivate 'select-frame)
+              (unwind-protect
+                  (select-frame-set-input-focus frame)
+                (ad-activate 'select-frame))))
+
+     $B$3$l$i$NBP:v$O!"<!$N(B Emacs $B$N%j%j!<%9(B (22.2 $B$^$?$O(B 23.1) $B$G$OITMW(B
+     $B$K$J$k$G$7$g$&!#(B
+
+
+File: emacs-w3m-ja.info  Node: Trouble FAQ-Footnotes, Up: Trouble FAQ
+
+(1) w3m on cygwin (http://www.page.sannet.ne.jp/knabe/w3m/w3m.html)
+
+
+
+File: emacs-w3m-ja.info, Node: Shimbun FAQ, Prev: Trouble FAQ, Up: Frequently Asked Questions
+
+Shimbun $A$K$(IJ=$A$9$k$(Go3YB(B
+====================
+
+   * Q. $B$J$<(B `shimbun' $B%b%8%e!<%k$,%$%s%9%H!<%k$5$l$J$$$N$G$9$+(B?
+
+     FLIM $B%Q%C%1!<%8$,%$%s%9%H!<%k$5$l$F$$$J$$$H!"(B`shimbun' $B%b%8%e!<%k(B
+     (`shimbun/' $B%G%#%l%/%H%j$K$"$k%U%!%$%k72(B) $B$O%$%s%9%H!<%k$5$l$J$$$3(B
+     $B$H$KCm0U$7$F$/$@$5$$!#(B
+
+     `configure' $B%9%/%j%W%H$O<+F0E*$K(B FLIM $B$NM-L5$rH=Dj$9$k$h$&@_7W$5$l(B
+     $B$F$$$^$9$,!"I8=`E*$G$O$J$$%G%#%l%/%H%j$K(B FLIM $B$,%$%s%9%H!<%k$5$l$F(B
+     $B$$$k$H!"H=Dj$K<:GT$7$^$9!#$=$N>l9g$O(B `--with-addpath' $B%*%W%7%g%s$r(B
+     $B;H$C$F!"(BFLIM $B$,%$%s%9%H!<%k$5$l$F$$$k%G%#%l%/%H%j$rL@<(E*$K;XDj$7(B
+     $B$F$/$@$5$$!#Nc$G$9(B:
+
+          % ./configure --with-addpath=$HOME/share/emacs/site-lisp/flim
+
+
+
+File: emacs-w3m-ja.info, Node: Known Problems, Next: Shimbun Library, Prev: Frequently Asked Questions, Up: Top
+
+$A$"$J$?$J$i$-$C$H=b$(GJn$A$G$-$k(B
+**************************
+
+
+
+
+File: emacs-w3m-ja.info, Node: Shimbun Library, Next: Tips, Prev: Known Problems, Up: Top
+
+$A%&%'%VIO$NPB$(GjL$A$r$BFI$A$`$?$a$N5@>_(B
+******************************
+
+$B%&%'%V$G$O!"$^$9$^$9B?$/$N?7J9!"%a!<%j%s%0%j%9%H$N%"!<%+%$%V!"7G<(HD!"(B
+$B$"$k$$$O8D?M$NF|5-(B (hyper nikki system$B!"(Bweblogs $B$^$?$O(B blogs) $B$,8x3+$5(B
+$B$l$F$$$^$9!#(B`Shimbun' $B%i%$%V%i%j$O!"$=$l$i$N%3%s%F%s%D$r5.J}$N9%$_$N%a!<(B
+$B%i!<$GFI$`$3$H$,$G$-$k$h$&$K$7$^$9!#6qBNE*$K$O!"$=$l$i$N%3%s%F%s%D$r!"(B
+$B%a!<%k$N$h$&$K@07A!&@0M}$9$k5!G=$rDs6!$7$^$9!#(B
+
+$B$9$Y$F$N(B `shimbun' $B%b%8%e!<%k$O!"IaDL$N%a!<%k$d%K%e!<%9$N$h$&$KFI$`$3$H(B
+$B$,$G$-$k5-;v$r@8@.$9$k$3$H$rL\I8$K$7$F$$$^$9!#$7$+$7$J$,$i!"%&%'%V%5%$(B
+$B%H$,$=$l$i$N5-;v$N(B html $B$r$7$P$7$PJQ99$9$k$N$G!"$=$NEY$K;d$?$A$O:$Fq$K(B
+$B$V$D$+$j$^$9!#(B
+
+$B$b$7!"L50UL#$J2hA|$d!"5-;v$H$O4X78$NL5$$%F%-%9%H$,8=$l$k$N$K5$$,$D$$$?(B
+$B$i!"(B($B$?$H$(:3:Y$J$b$N$G$b(B) `report-emacs-w3m-bug' (*Note Mailing
+List::) $B$r;H$C$FJs9p$7$F$/$@$5$$!#(B
+
+`Shimbun' $B%i%$%V%i%j$O!"8=:_!"D+F|?7J9!"FIGd%*%s%i%$%s!"(BEmacs Devel$B!"(B
+XEmacs Beta$B!"(BGnus/Mew/Wanderlust $B$J$I$N%a!<%j%s%0%j%9%H!"(BSlashdot$B!"(B
+Slashdot Japan$B!"$*$h$SB>$N$?$/$5$s$N$b$N$KBP1~$7$F$$$^$9!#6qBNE*$K$O!"(B
+*Note Shimbun Sites:: $B$r;2>H$7$F$/$@$5$$!#(B
+
+$B$H$3$m$G!"(B`Shimbun' $B%i%$%V%i%j$rMxMQ$9$k;~$O!"Cx:n8"$K$D$$$FCm0U$,I,MW(B
+$B$G$9!#(B`Shimbun' $B%i%$%V%i%j$K$h$C$F2C9)!&@8@.$5$l$?5-;v$NCx:n8"$O!"$=$N(B
+$B5-;v$r@8@.$9$k85$K$J$C$?%G!<%?$NCx:n<T$K5"B0$7$^$9!#$7$?$,$C$F!"F@$i$l(B
+$B$?5-;v$rMxMQ$9$k>l9g$O!"85$N%G!<%?$NCx:n<T$N8"Mx$r?/32$7$J$$HO0O$r<i$k(B
+$BK!N'>e$N5AL3$,$"$j$^$9!#$D$^$j!"Cx:n8"K!$KDj$a$i$l$?!V;dE*MxMQ!W$NHO0O(B
+$B$r<i$i$J$1$l$P$J$i$J$$!"$H$$$&$3$H$G$9!#(B
+
+`Shimbun' $B%i%$%V%i%j$rMxMQ$7$?$3$H$K$h$C$F!"K|$,0l$"$J$?$,ITMx1W$rHo$C(B
+$B$?$j!"$"$J$?$,B><T$N8"Mx$r?/32$7$?$3$H$K$h$C$F$"$J$?$,AJ$($i$l$?$H$7$F(B
+$B$b!"(Bemacs-w3m $B3+H/%A!<%`$O0l@Z$N@UG$$rIi$$$^$;$s!#(B
+
+`Shimbun' $B%i%$%V%i%j$O$?$/$5$s$N%b%8%e!<%k$N%3%l%/%7%g%s$G!"$=$l$i$N3F!9(B
+$B$OC1FH$G$O2?$NLr$K$bN)$A$^$;$s!#$3$3$G$OBeI=E*$J;0$D$N(B `Shimbun' $B$N%"%W(B
+$B%j%1!<%7%g%s%W%m%0%i%`(B ($B$=$l$i$N$&$A$NFs$D$O(B `Shimbun' $B%i%$%V%i%j$K4^$^(B
+$B$l$F$$$^$9(B) $B$H!"$"$J$?$,<+J,$G(B `Shimbun' $B%b%8%e!<%k$r:n$kJ}K!$K$D$$$F@b(B
+$BL@$7$^$9(B (Emacs Lisp $B%W%m%0%i%`$r=q$/$3$H$,$G$-$kI,MW$,$"$j$^$9(B)$B!#(B
+
+* Menu:
+
+* Nnshimbun::                   Gnus $B$r%&%'%V%V%i%&%6$K$9$k(B!
+* Mew Shimbun::                 Mew $B$G?7J9$rFI$`(B
+* Shimbun with Wanderlust::     Wanderlust $B$G?7J9$rFI$`(B
+* Shimbun local mode::          $B?7J9$N<hF@$K%7%'%k%9%/%j%W%H$r;H$&(B
+* Shimbun Sites::               $B?7J9$,FI$a$k%5%$%H(B
+* Shimbun Basics::              $B?7J9%b%8%e!<%k$N:n$jJ}(B
+
+`Shimbun' $B%i%$%V%i%j$rMxMQ$9$k$?$a$K$O!"(Bemacs-w3m $B$r9=C[$7$F%$%s%9%H!<(B
+$B%k$9$kA0$K(B FLIM $B%Q%C%1!<%8(B ($B2C$($F(B `nnshimbun' $B$r;H$$$?$1$l$P(B Gnus) $B$r(B
+$B%$%s%9%H!<%k$9$kI,MW$,$"$k$3$H$KCm0U$7$F$/$@$5$$!#(BFLIM $B%Q%C%1!<%8$K$O(B
+APEL $B%Q%C%1!<%8$,I,MW$G$9!#$"$J$?$O(B *Note Other Requirements:: $B$b8+$k$Y(B
+$B$-$+$b$7$l$^$;$s!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Nnshimbun, Next: Mew Shimbun, Prev: Shimbun Library, Up: Shimbun Library
+
+Gnus $A$r%&%'%V%V%i%&%6$K$9$k(B!
+============================
+
+`Nnshimbun' $B$O(B Gnus $B$N%P%C%/%(%s%I$G$9!#$7$+$7$J$,$i!"Nc30E*$K(B Gnus $B$G(B
+$B$O$J$/$F(B emacs-w3m $B$H$H$b$KG[I[$5$l$F$$$^$9!#(B`Nnshimbun' $B$O(B Gnus $B$rJB30(B
+$B$l$FJXMx$J%&%'%V%V%i%&%6$K$9$k$3$H$,$G$-$^$9!#$9$Y$F$N9-9p$KHQ$o$5$l$:(B
+$B$K?7J9<R$N%&%'%V%5!<%P$G5-;v$r=&$$FI$_$9$k$3$H$,$G$-$^$9!#%a!<%j%s%0%j(B
+$B%9%H$N5-;v%"!<%+%$%V$r!"$=$N%j%9%H$K9VFIEPO?$7$F$$$k$h$&$KFI$`$3$H$,$G(B
+$B$-$^$9!#7G<(HD$N=q$-9~$_$bFI$`$3$H$,$G$-$^$9!#Ey!9(B... $B$G$b(B Gnus $B$O(B
+`nnshimbun' $B$G%&%'%V$r2p$7$?Ej9F$,$G$-$J$$$N$G!"%U%)%m!<$7$?$$$H$-$O(B
+emacs-w3m $B$r;H$o$J$1$l$P$$$1$J$$$3$H$KCm0U$7$F$/$@$5$$!#(B
+
+$B$5$i$K(B emacs-w3m $B$G(B HTML $B%a%C%;!<%8$r@07A$9$k$K$O(B *Note Gnus:: $B$b;2>H$7(B
+$B$F$/$@$5$$!#(B
+
+`Nnshimbun' $B$r;O$a$k$?$a$N0lHV4JC1$JJ}K!$O!"%0%k!<%W%P%C%U%!$G0J2<$N$h(B
+$B$&$J$3$H$r$9$k$3$H$G$9(B:
+
+`M-x gnus-group-make-shimbun-group <RET> asahi <RET> national <RET>'
+
+`asahi' $B$H(B `national' $B$O!"@\B3$7$?$$%5!<%P!<$KBP1~$7$?%-!<%o!<%I$H6=L#(B
+$B$N$"$k%0%k!<%W$K!"$=$l$>$lCV$-49$($F$/$@$5$$!#(B`<TAB>' $B$+(B `<SPC>' $B$r%?%$(B
+$B%W$9$k$3$H$K$h$C$F!"$=$l$i$NL>A0$rN>J}$H$bJd40$9$k$3$H$,$G$-$^$9!#(B
+
+$B$b$7(B `gnus-group-mode-map' $B$K==J,$J6u$-$,$"$k$J$i$P!"0J2<$N$h$&$J$b$N$r(B
+`~/.gnus.el' $B%U%!%$%k$K2C$($F$/$@$5$$(B:
+
+     (eval-after-load "gnus-group"
+       '(define-key gnus-group-mode-map "Gn"
+          'gnus-group-make-shimbun-group))
+
+$B$9$k$H!"(B`M-x gnus-group-make-shimbun-group' $B$NBe$o$j(B
+$B$K(B `G n' $B$r;H$&$3$H$,$G$-$^$9!#(B
+
+*$(Go!$A$+$3$N%-$B!<$A$r(B Gnus $A%?%o$B!<$A$KSh$(GR|$A$7$F$/$l$^$;$s$+(B?*
+
+
+$B$3$NB>$K!"(B`gnus-group-make-shimbun-groups' $B%3%^%s%I$r;H$C$F!";XDj$7$?%5!<(B
+$B%P!<$N$9$Y$F$N%0%k!<%W$r:n$k$3$H$,$G$-$^$9!#(B
+
+`Nnshimbun' $B$OC1$K%&%'%V%5!<%P$+$i(B HTML $B%3%s%F%s%D$r<h$j4s$;$F!"$=$l$r(B
+$B5-;v$H$7$FI=<($7$^$9$,!"1JB35-;v(B (*Note Persistent Articles:
+(gnus)Persistent Articles.) $B$r:n$k>l9g$r=|$$$F!"%m!<%+%k%U%!%$%k$K5-;v(B
+$B$r%;!<%V$9$k$3$H$O$"$j$^$;$s!#(B`Nnshimbun' $B$O(B NOV $B%U%!%$%k$r!"$=$l$>$l$N(B
+`nnshimbun' $B%0%k!<%W$G;H$$$^$9!#$=$N%P%C%/%(%s%I$O(B `nnml' $B$H$[$\F1$8$G(B
+$B$9!#(B
+
+$B0J2<$N(B `nnshimbun' $B$K4X$9$kJQ?t$r%+%9%?%^%$%:$9$k$3$H$,2DG=$G$9(B:
+
+`nnshimbun-keep-backlog'
+     $B$3$NJQ?t$O(B `nnshimbun' $B%0%k!<%W$G(B `gnus-keep-backlog' $BJQ?t(B (*Note
+     Article Backlog: (gnus)Article Backlog.) $B$r>e=q$-$7$^$9!#$b$7(B
+     `nnshimbun-keep-backlog' $B$r?t;z(B N $B$K@_Dj$9$k$H!"(B`nnshimbun' $B$O:GBg(B
+     $B$G(B N $B$N8E$$5-;v$r8e$N:F<hF@$N$?$a$K%P%C%U%!$KN/$a$F$*$-$^$9!#$3$N(B
+     $BJQ?t$,(B `nil' $B$G$O$J$/!"?t;z$G$b$J$$>l9g!"(B`nnshimbun' $B$O(B *$A$9$Y$F(B*
+     $B$N4{FI5-;v$rC_$($^$9(B ($B$3$l$ONI$$9M$($G$O$"$j$^$;$s(B)$B!#%G%U%)%k%HCM(B
+     $B$O(B 300 $B$G$9!#(B
+
+     `Nnshimbun' $B$O$"$i$+$8$a<hF@$7$?(B (prefetched) $B5-;v$NJ]B8$K(B
+     backlog $B$r;H$&$N$G!">.$5$9$.$kCM$O(B `prefetch-articles' $B5!G=(B ($B2<5-(B
+     $B;2>H(B) $B$rB;$J$&$+$b$7$l$J$$$3$H$KCm0U$7$F$/$@$5$$!#(B
+
+`nnshimbun-directory'
+     `Nnshimbun' $B$,(B NOV $B%U%!%$%k$H0u%U%!%$%k$rJ]B8$9$k%G%#%l%/%H%j$G$9!#(B
+     $B%G%U%)%k%HCM$O(B `~/News/shimbun/' $B$G$9!#$3$l$O%5!<%P!<JQ?t(B (*Note
+     Server Variables: (gnus)Server Variables.) $B$G$9!#(B
+
+`nnshimbun-default-group-level'
+     `gnus-level-default-subscribed' $B$r>e=q$-$9$k!"%G%U%)%k%H$N%0%k!<%W(B
+     $B%l%Y%k$G$9!#?7$?$K:n$i$l$?(B `nnshimbun' $B%0%k!<%W$KE,MQ$5$l$^$9!#%G(B
+     $B%U%)%k%HCM$O(B `nil' $B$G$9!#$3$l$O%5!<%P!<JQ?t(B (*Note Server
+     Variables: (gnus)Server Variables.) $B$G$9!#(B
+
+`nnshimbun-marks-is-evil'
+     $B$b$7(B `nil' $B$G$J$1$l$P!"(BGnus $B$O(B `shimbun' $B%9%W!<%k$N$?$a$K0u(B
+     (marks) $B%U%!%$%k$r:n$j$b;H$$$b$7$^$;$s!#0u%U%!%$%k$r;H$&$3$H$K$h$C(B
+     $B$F!"(B`shimbun' $B%0%k!<%W$r(B `.newsrc.eld' $B$+$i@Z$jJ|$7$F%P%C%/%"%C%W(B
+     $B$7!"I|85$9$k$3$H$,2DG=$K$J$j$^$9!#2?$i$+$NM}M3$G$3$l$r(B `t' $B$K@_Dj(B
+     $B$7$?8e$G!":F$S(B `nil' $B$K$9$k>l9g$O$$$D$b!"%0%k!<%W$N0u%U%!%$%k$r>C(B
+     $B$5$J$1$l$P$J$j$^$;$s(B ($BIaDL$=$l$O(B `shimbun' $B%0%k!<%W$N%G%#%l%/%H%j(B
+     $B$K$"$k(B `.marks' $B$H$$$&L>A0$N%U%!%$%k$G$9$,!"@53N$K$O(B
+     `nnshimbun-marks-file-name' $B$NCM$r;2>H$7$F$/$@$5$$(B)$B!#$=$&$9$l$P(B
+     Gnus $B$K$h$C$F0u%U%!%$%k$,:F@8@.$5$l$k$G$7$g$&!#%G%U%)%k%HCM$O(B
+     `nil' $B$G$9!#$3$l$O%5!<%P!<JQ?t(B (*Note Server Variables:
+     (gnus)Server Variables.) $B$G$9!#(B
+
+`Nnshimbun' $B$O(B Gnus $B$,Ds6!$9$kI8=`$N%0%k!<%W%Q%i%a!<%?(B (1) (*Note
+Nnshimbun-Footnotes::) $B$K2C$($F!"(B`nnshimbun' $B@lMQ$K@_$1$i$l$?%0%k!<(B
+$B%W%Q%i%a!<%?$rMxMQ$9$k$3$H$,$G$-$^$9!#J#?t$N(B `nnshimbun' $BMQ$N%Q%i(B
+$B%a!<%?$,(B `nnshimbun-group-parameters' $B$H$$$&C10l$N%0%k!<%W%Q%i%a!<(B
+$B%?(B ($B$9$Y$F$N%0%k!<%W$G0c$&CM$r;}$D$3$H$,$G$-$k(B) $B$K$^$H$a$i$l$F$$$^$9!#(B
+$B$=$l$O%W%m%Q%F%#%j%9%H$G!"Nc$($P<!$N$h$&$JCM$G$9(B:
+
+     '(index-range all prefetch-articles off encapsulate-images on
+                   expiry-wait 6)
+
+$B0J9_$O$3$l$i$N%0%k!<%W%Q%i%a!<%?$H!"4XO"$9$kJQ?t$N@bL@$G$9!#(B
+
+`prefetch-articles'
+     $B$3$N%0%k!<%W%Q%i%a!<%?$,(B `off' $B$^$?$O(B `nil' $B0J30$N2?$+$K@_Dj$5$l$F(B
+     $B$$$k%0%k!<%W$G$O!"(B`nnshimbun' $B$O?7$7$$5-;v$rC5$9$@$1$G$O$J$/!"$=$l(B
+     $B$i$N5-;v$N%@%&%s%m!<%I$b9T$$$^$9!#$3$l$O?7$7$$5-;v$N8!:w$rCY$/$7$^(B
+     $B$9$,!"5-;v$r1\Mw$9$k$H$-$KBT$?$5$l$^$;$s!#$3$N%0%k!<%W%Q%i%a!<%?$,(B
+     $B@_Dj$5$l$F$$$J$$$+!"$=$NCM$,(B `nil' $B$K$J$C$F$$$k%0%k!<%W$G$O!"Be$o(B
+     $B$j$KJQ?t(B `nnshimbun-pre-fetch-article' $B$NCM(B ($B%G%U%)%k%H$O(B `off')
+     $B$,;H$o$l$^$9!#(B
+
+`encapsulate-images'
+     $B$3$N%0%k!<%W%Q%i%a!<%?$,(B `off' $B$^$?$O(B `nil' $B0J30$N2?$+$K@_Dj$5$l$F(B
+     $B$$$k%0%k!<%W$G$O!"(B`nnshimbun' $B$O85$N5-;v$KKd$a9~$^$l$F$$$k2hA|%G!<(B
+     $B%?$r(B MIME $B$N(B `multipart/related' $B%Q!<%H$H$7$F5-;v$K$O$a9~$_$^$9!#(B
+     $B$3$N%0%k!<%W%Q%i%a!<%?$,@_Dj$5$l$F$$$J$$$+!"$=$NCM$,(B `nil' $B$K$J$C(B
+     $B$F$$$k%0%k!<%W$G$O!"Be$o$j$KJQ?t(B `nnshimbun-encapsulate-images' $B$N(B
+     $BCM$,;H$o$l$^$9!#$3$NJQ?t(B `nnshimbun-encapsulate-images' $B$N%G%U%)%k(B
+     $B%HCM$O!"(B`shimbun' $B%i%$%V%i%j$K$h$C$FDs6!$5$l$kJQ?t(B
+     `shimbun-encapsulate-images' $B$NCM$G$9(B ($B$?$V$s%G%U%)%k%HCM$O(B `t' $B$G(B
+     $B$9(B)$B!#(B
+
+`index-range'
+     $B%0%k!<%W%Q%i%a!<%?(B `index-range' $B$G!"%&%'%V%5!<%P!<$+$i<hF@$5$l$k(B
+     $B5-;v$NHO0O$r;XDj$9$k$3$H$,$G$-$^$9!#HO0O$N;XDj$K$O0J2<$NCM$r;H$C$F(B
+     $B$/$@$5$$(B:
+
+     `nil'
+     `all'
+          $B$9$Y$F$N%Z!<%8(B
+
+     `last'
+          $B:G?7$N%Z!<%8$@$1(B
+
+     `integer N'
+          $B:G?7$N(B N $B%Z!<%8(B
+
+     `Nnshimbun' $B$O%5!<%P!<>e$KB8:_$9$kL\<!%Z!<%8$r2r@O$7$F?7$7$$5-;v$N(B
+     $BM-L5$rD4$Y$^$9!#%5!<%P!<$K$h$C$F$O$=$N$h$&$JL\<!%Z!<%8$,J#?tB8:_$9(B
+     $B$k>l9g$,$"$j$^$9!#Nc$($P!"%a!<%j%s%0%j%9%H$N5-;v$rDs6!$7$F$$$k%5!<(B
+     $B%P!<$N>l9g$O!"$=$N5-;v$,Ej9F$5$l$?F|IU$K$h$C$FJ,N`$5$l$?L\<!$K$J$C(B
+     $B$F$$$k$3$H$,0lHLE*$G$9!#FC$KCY$$2s@~$rMxMQ$7$F$$$k;~$K!"$=$l$i$9$Y(B
+     $B$F$N5pBg$JL\<!$rD4$Y$k$K$O!"AjEv$J;~4V$,$+$+$k$G$7$g$&!#(B
+
+     `Nnshimbun' $B$OA02s$N@\B3;~$KD4$Y$?L\<!$K$D$$$F$O!"$J$k$Y$/D4$Y$:$K(B
+     $B:Q$^$;$k$h$&$K$J$C$F$$$^$9!#99$K;~4V$r@aLs$7$?$$>l9g$O(B `last' $B$r;H$C(B
+     $B$F$/$@$5$$!#$3$l$O(B `nnshimbun' $B$K!":G?7$NL\<!$@$1$r;2>H$7$F?7$7$$(B
+     $B5-;v$N8!::$r9T$J$o$;$^$9!#(B
+
+     $B%0%k!<%W%Q%i%a!<%?(B `index-range' $B$,@_Dj$5$l$F$$$J$$$+!"CM$,(B `nil'
+     $B$K$J$C$F$$$k%0%k!<%W$G$O!"JQ?t(B `nnshimbun-index-range' $B$NCM(B ($B%G%U%)(B
+     $B%k%H$O(B `2') $B$,;H$o$l$^$9!#(B
+
+`nnshimbun-group-parameters-alist'
+     $B$3$l$O(B Emacs Lisp $BJQ?t$G!"%0%k!<%WL>$N@55,I=8=$H(B `nnshimbun' $BMQ%0(B
+     $B%k!<%W%Q%i%a!<%?$NO"A[%j%9%H$G$9!#%G%U%)%k%HCM$O(B `nil' $B$G$9!#3F!9(B
+     $B$NMWAG$O(B `(REGEXP KEYWORD VALUE KEYWORD VALUE...)' $B$N7A<0$r;}$A$^(B
+     $B$9!#Nc$($P(B:
+
+          '("^nnshimbun\\+asahi:" index-range all prefetch-articles off
+            encapsulate-images on expiry-wait 6)
+
+     $B;w$?L>A0$r;}$D(B ($B$9$J$o$A!"8_$$$K;w$?@-3J$r;}$C$F$$$=$&$J(B) $BJ#?t$N%0(B
+     $B%k!<%W$KBP$7$FF1$8(B `nnshimbun' $B%0%k!<%W%Q%i%a!<%?$r;XDj$9$k$3$H$,(B
+     $B$G$-$k$N$G!"8D!9$N%0%k!<%W$KBP$7$F$=$l$>$l%0%k!<%W%Q%i%a!<%?$r@_Dj(B
+     $B$9$kBe$o$j$K;H$&$3$H$,$G$-$FJXMx$G$9!#$b$7%0%k!<%W$G$9$G$K%0%k!<%W(B
+     $B%Q%i%a!<%?$N@_Dj$,9T$J$o$l$F$$$?>l9g$O!"$3$NJQ?t$h$j$b$=$A$i$,M%@h(B
+     $B$5$l$^$9!#(B
+
+`Nnshimbun' $B$K$O5-;v$N4|8B@Z$l>C5n$r9T$J$o$;$k$3$H$,$G$-$^$9(B (2)
+(*Note Nnshimbun-Footnotes::)$B!#5-;v$,4|8B@Z$l>C5n$5$l$k$H8@$C$F$b!"$=$l(B
+$B$,1s3V%5!<%P!<$+$i:o=|$5$l$k$o$1$G$O$J$/!"$=$l$O$:$C$H$=$3$+$i<hF@2DG=(B
+$B$G$"$k$3$H$r3P$($F$*$$$F$/$@$5$$!#>C$($k$N$O$"$J$?<+?H$N(B `nnshimbun' $BMQ(B
+$B$N(B NOV $B%U%!%$%k(B (3) (*Note Nnshimbun-Footnotes::) $B$N!">C5n$5$l$k5-;v$K(B
+$B3:Ev$9$k9T$G$9!#$=$l$K$h$C$F$=$N5-;v$OFsEY$H35N,%P%C%U%!$K8=$l$J$/$J$j(B
+$B$^$9!#(B
+
+`Nnshimbun' $B%0%k!<%W$G5-;v$N4|8B@Z$l>C5n$r9T$J$o$J$$$H(B NOV $B%U%!%$%k$,:](B
+$B8BL5$/B@$jB3$1!"Hs>o$K8E$$5-;v$,$"$?$+$bB8:_$7$F$$$k$h$&$K8+$($k$+$b$7(B
+$B$l$^$;$s(B ($B<B:]$K$O!"$=$l$i$O?7J9<R$N%5!<%P!<$G;0G/A0$K4|8B@Z$l>C5n$5$l(B
+$B$F$7$^$C$F$$$k$+$b$7$l$J$$(B!)$B!#$=$l$rFI$b$&$H$7$F$b5-;v%P%C%U%!$K$O2?$b(B
+$B8=$l$J$$$G$7$g$&!#0lJ}!"%a!<%j%s%0%j%9%H$N5-;v$rDs6!$7$F$$$k$?$$$F$$$N(B
+$B%5!<%P!<$O!"0lHLE*$K2a5n$NA45-;v$rDs6!$7$F$$$^$9!#M+=%$NH`J}$K5n$j$78E(B
+$B$-NI$-;~Be$K!"$"$J$?$,6=$8$?5-;v$r2{$+$7$/$&$k$&$k$7$FFI$_JV$9$3$H$,$G(B
+$B$-$k$h$&$K!"$=$&$$$&%0%k!<%W$G$O4|8B@Z$l>C5n$O$5$;$?$/$J$$$H;W$&$+$b$7(B
+$B$l$^$;$s!#(B
+
+$BB>$N%a!<%k%P%C%/%(%s%I$HF1MM$K!"(B`nnshimbun' $B$N%0%k!<%WKh$K5-;v$K<+F04|(B
+$B8B@Z$l>C5n$N0u$rIU$1$F!";D$7$F$*$/4|4V$r@_Dj$9$k$3$H$,$G$-$^$9!#$?$@$7(B
+`nnshimbun' $B%P%C%/%(%s%I$HB>$N%a!<%k%P%C%/%(%s%I$K$O!">/$70c$$$,$"$j$^(B
+$B$9(B:
+
+   * $BBh0l$K!";D$7$F$*$/4|4V$N%G%U%)%k%HCM$O0J2<$NM%@hEY$G7hDj$5$l$^$9!#(B
+     $B%0%k!<%W$K$h$C$F%G%U%)%k%HCM$,0[$J$k$+$b$7$l$J$$$3$H$KCm0U$7$F$/$@(B
+     $B$5$$!#(B
+
+       1. $B%0%k!<%W$K$*$1$k(B `expiry-wait' $B%0%k!<%W%Q%i%a!<%?$NCM!#(B
+
+       2. $B$=$N%0%k!<%W$rBP>]$H$7$F!"JQ?t(B `nnmail-expiry-wait-function'
+          $B$rI>2A$9$k$3$H$K$h$C$FF@$i$l$?CM!#(B
+
+       3. $B%0%k!<%W$KBP1~$9$k(B `shimbun' $B%b%8%e!<%k$,Ds6!$9$k%G%U%)%k%HCM!#(B
+
+       4. $BJQ?t(B `nnmail-expiry-wait' $B$NCM!#(B
+
+     $BBhFs$K!"JQ?t(B `nnmail-expiry-wait-function' $B$K$h$C$F@_Dj$5$l$k4X?t(B
+     $B$KM?$($i$l$k0z?t$K!"(B"nnshimbun+asahi:national" $B$N$h$&$K%P%C%/%(%s(B
+     $B%I$H%5!<%P!<$NL>A0$,4^$^$l$k$3$H$G$9!#B>$N%a!<%k%P%C%/%(%s%I$N>l9g(B
+     $B$K$O%0%k!<%WL>$@$1$,M?$($i$l$k$N$K!"$G$9!#Nc$r5s$2$^$7$g$&(B:
+
+          (setq nnmail-expiry-wait-function
+                (lambda (group)
+                  (cond ((string-equal group "ding") 7)
+                        ((string-equal group "nnshimbun+ding:ding") 'never))))
+
+     $B$3$l$O!"F1$8(B ding $B%a!<%j%s%0%j%9%HMQ$KFs$D$N%0%k!<%W$,$"$k$3$H$r0U(B
+     $BL#$7$^$9(B: $B0l$D$O%j%9%H$N%a%s%P!<$H$7$F9VFIEPO?$7$F$$$^$9!#$b$&0l$D(B
+     $B$O(B Gnus $B%?%o!<$N%a!<%j%s%0%j%9%H%"!<%+%$%V$+$iFI$`$?$a$N$b$N$G$9!#(B
+     $B$I$&$G$9!"$J$+$J$+8-$$$G$7$g(B?  "ding" $B%0%k!<%W$N%m!<%+%k$J%a!<%k%U%!(B
+     $B%$%k$O<7F|$G4|8B@Z$l>C5n$5$l!"%m!<%+%k%G%#%9%/$NMFNL$,@aLs$5$l$^$9!#(B
+     $B$7$+$7Fs$DL\$N%0%k!<%W$G$O!"A0@$5*$N5-;v$G$5$(FI$`$3$H$,$G$-$^$9(B
+     ($B$=$l$,K\Ev$KI,MW$J$i$P!"$G$9$,(B)$B!#(B
+
+     $BBh;0$K!"$3$l$O$"$J$?$K5?G0$,J($$$?$H$-$K;W$$=P$9$3$H$,$G$-$k$h$&$K(B
+     $B=q$-N1$a$i$l$F$$$^$9(B: `nnshimbun' $B%0%k!<%W$N$9$Y$F$N5-;v$,4|8B@Z$l(B
+     $B>C5n$5$l$k$Y$-$H$-$G$b!":G?7$N0lDL$@$1$O>C$5$:$K;D$7$F$*$-$^$9!#$3(B
+     $B$l$O$"$J$?$NL$N}?4$rK~B-$5$;$k$?$a$G$O$J$/!"<!2s$K$3$N%0%k!<%W$N?7(B
+     $B$7$$5-;v$r<hF@$7$h$&$H$7$?$H$-$K!"(B`nnshimbun' $B$,$I$3$+$i;O$a$k$+$r(B
+     $BCN$C$F!"$9$Y$F$N5-;v$r<hF@$7D>$5$J$$$h$&$K$9$k$?$a$G$9!#(B
+
+`Nnshimbun' $B$N4|8B@Z$l>C5n$K4X78$9$k%0%k!<%W%Q%i%a!<%?$HJQ?t$O0J2<$NDL(B
+$B$j$G$9(B:
+
+`expiry-wait'
+     $B$I$&$+:.Mp$J$5$i$J$$$h$&$K!#(B`expiry-wait' $B%0%k!<%W%Q%i%a!<%?$,(B
+     `nnshimbun' $B@lMQ$K:n$i$l$?%0%k!<%W%Q%i%a!<%?(B
+     `nnshimbun-group-parameters' $B$NMWAG$N0l$D$H$7$FDs6!$5$l$^$9!#$=$l(B
+     $B$OI8=`$N%0%k!<%W%Q%i%a!<%?$HF1$8L>A0$r;}$A!"0UL#$bF1$8$G$9!#$"$J$?(B
+     $B$O$I$A$i$r;H$C$F$b9=$$$^$;$s!#$b$7(B `nnshimbun' $B@lMQ$N$b$N$,(B `nil'
+     $B0J30$NCM$K@_Dj$5$l$k$H!"I8=`$N$b$N$h$j$bM%@h$5$l$^$9!#$3$l$O(B
+     `nnshimbun' $B$K4X78$9$k$b$N$r(B "Gnus Customize" $B%P%C%U%!(B ($B%0%k!<%W%P%C(B
+     $B%U%!$G(B `G c' $B$r%?%$%W$9$k$H8=$l$k(B) $B$N0l2U=j$K=8$a$k$?$a$H!"JQ?t(B
+     `nnshimbun-group-parameters-alist' $B$G0l3g$7$F4IM}$G$-$k$h$&$K$9$k(B
+     $B$3$H$rL\E*$KMQ0U$7$?$b$N$G$9(B (4) (*Note Nnshimbun-Footnotes::)$B!#@_(B
+     $BDj$G$-$kCM$OI8=`$N%0%k!<%W%Q%i%a!<%?$HF1MM$K!";~8B>C5n$NF|?t!"(B
+     `never' $B$^$?$O(B `immediate' $B$G$9!#(B
+
+`nnshimbun-keep-unparsable-dated-articles'
+     $B$3$NJQ?t$NCM$,(B `nil' $B$G$J$$>l9g$O!":n@.$5$l$?(B ($B$^$?$OE~Ce$7$?(B) $B;~(B
+     $B9o$,$o$+$i$J$$5-;v$O4|8B@Z$l>C5n$5$l$^$;$s!#$J$K$7$m$I$N$/$i$$8E$$(B
+     $B$N$+$o$+$i$J$$$s$G$9$+$i!#%G%U%)%k%HCM$O(B `t' $B$G$9!#(B`nil' $B$K@_Dj$9(B
+     $B$k$H!"4|8B@Z$l>C5n$N=hM}$,9T$J$o$l$k$H$-$K!"4|8B$,$o$+$i$J$$5-;v$G(B
+     $B$bL5>r7o$G>C$5$l$F$7$^$$$^$9!#$^$"!"G/$NJk$l$NBgA]=|$NLr$K$ON)$D$3(B
+     $B$H$,H=L@$9$k$+$b$7$l$^$;$s!#(B
+
+
+File: emacs-w3m-ja.info  Node: Nnshimbun-Footnotes, Up: Nnshimbun
+
+(1) $A%0%k$B!<$A%W%Q%i%a$B!<$A%?$r$(G]C$A6($9$k$?$a$NWn$bJV$(I?I$A$J7=7($O!"%0%k$B!<$A%W%P%C%U%!(B
+$A$G!"$(G]C$A6($7$?$$%0%k$B!<$A%W$N$(G^[$AKy$KRF$(GY/$A$7$F$+$i(B `G c' $A$r%?%$%W$9$k$3(B
+$A$H$G$9(B (*Note Group Parameters: (gnus)Group Parameters.)$A!#(B
+
+(2) `Nnshimbun' $A%0%k$B!<$A%W$GWT$(GY/$AFZO^GP$lO{H%$rPP$J$&7=7($OVw$K6~$D$"(B
+$A$j$^$9!#R;$D$O%0%k$B!<$A%WC{$NU}$(G]=$A1m$(G\"(B ("^nnshimbun\\+" $A$GJ<$^$i$J$1$l$P$J(B
+$A$j$^$;$s(B) $A$r$(I+y$AJ}(B `gnus-auto-expirable-newsgroups' $A$KW7<S$7$F!"O{H%(B
+$A$9$k$^$G$NHUJ}$r8w%0%k$B!<$A%W$(I#z$A$K(B `nnmail-expiry-wait-function' $A$GV8(B
+$A6($9$k$3$H$G$9!#$b$&R;$D$O!"WT$(GY/$AFZO^GP$lO{H%$rPP$J$o$;$?$$$?$$$9$Y$F$N(B
+`nnshimbun' $A%0%k$B!<$A%W$G!"%0%k$B!<$A%W%Q%i%a$B!<$A%?(B `auto-expire' $A$r(B
+`t' $A$K$(G]C$A6($7$F!"%0%k$B!<$A%W%Q%i%a$B!<$A%?(B `expiry-wait' $A$GO{H%$9$k$^(B
+$A$G$NFZO^$rV86($9$k$d$j7=$G$9!#$(Gf[$A$7$$$3$H$O(B *Note $A%a$B!<$A%k(B $A$NFZO^GP$lO{H%(B: (gnus-ja)Expiring Mail, $A$r2NUU$7$F$/$@$5$$!#(B
+`expiry-wait' $A%0%k$B!<$A%W%Q%i%a$B!<$A%?$,$(G]C$A6($5$l$F$$$J$$%0%k$B!<$A%W$G$O!"%G(B
+$A%U%)%k%H$N$(I/N$A$,$(GoK$ASC$5$l$^$9!#(B
+
+(3) `Nnshimbun'$ASC$N(B NOV $A%U%!%$%k(B
+$A$O(B~/News/shimbun/asahi/national/.overview" $A$N$h$&$JC{G0$G$9!#(B
+
+(4) $A$J$<(B `auto-expire' $A$J$I$,(B `nnshimbun' $B@l$ASC$N%0%k$B!<$A%W(B
+$A%Q%i%a$B!<$A%?$K:,$^$l$J$$$N(B? $A$H$$$&$(GYB$A$$$K$(I%\$A$9$k4p$($r$9$G$KSCRb$7$F$$(B
+$A$^$9!#$=$N4p$($H$O!"(B`expiry-wait' $A$,(B `nnshimbun' $A%P%C%/(B
+$A%(%s%I$K$h$C$FH!$j$(H$/$A$o$l$k$N$K$(I%\$A$7$F!"(B`auto-expire' $A$O(B Gnus
+$A$NVPJ`$,H!$j$(H$/$A$$$^$9!#$7$?$,$C$F!"(BGnus $A$,R;$D$NLX6($N%P%C%/%(%s%I(B
+$A$N$?$a$K$(I@>$A$/(B ($A$9$J$o$A!"(B`nnshimbun' $B@l$ASC$N%0%k$B!<$A%W%Q%i%a$B!<$A%?(B
+$A$+$i$(I/N$A$r$BFI$A$`(B) $A$h$&$K(B Gnus $A$NVPJ`$(Gq"$AD\$r$(I)/$(GZ/$A$9$k$3$H$O!"(BGnus $A$N$(G]CSS(B
+$A%]%j%7$B!<$A$K74$9$k$N$G$9!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Mew Shimbun, Next: Shimbun with Wanderlust, Prev: Nnshimbun, Up: Shimbun Library
+
+Mew $A$GPB$(GjL$A$r$BFI$A$`(B
+================
+
+Mew Shimbun $B$O(B `shimbun' $B$H(B Mew (version 2.1 $B0J9_(B) $B$H$H$b$K;H$&$3$H$r0U(B
+$B?^$7$?(B Emacs Lisp $B%W%m%0%i%`$G$9!#(BMew, APEL $B$*$h$S(B FLIM $B$b%$%s%9%H!<%k(B
+$B$5$l$F$$$l$P!"(Bemacs-w3m $B$r%$%s%9%H!<%k$9$k$H$-$K0l=o$K%$%s%9%H!<%k$5$l(B
+$B$^$9!#(B
+
+*Note Mew:: $B$b;2>H$9$k$3$H$r$*4+$a$7$^$9!#(B
+
+  1. $B=t@_Dj(B
+
+     $B0J2<$N3F9T$r(B `~/.mew.el' $B%U%!%$%k$N:G8e$K=q$$$F$/$@$5$$(B:
+
+     ;;; mew-shimbun $B$N%m!<%I!"%-!<Dj5A(B
+
+     ;; (setq mew-shimbun-use-unseen t) ;; (1) (*Note Mew
+     Shimbun-Footnotes::)
+     (require 'mew-shimbun)
+     (define-key mew-summary-mode-map "G"  (make-sparse-keymap))
+     (define-key mew-summary-mode-map "Gg" 'mew-shimbun-goto-folder)
+     (define-key mew-summary-mode-map "GG" 'mew-shimbun-goto-unseen-folder)
+     (define-key mew-summary-mode-map "Gi" 'mew-shimbun-retrieve)
+     (define-key mew-summary-mode-map "GI" 'mew-shimbun-retrieve-all)
+     (define-key mew-summary-mode-map "Gr" 'mew-shimbun-re-retrieve)
+     (define-key mew-summary-mode-map "GR" 'mew-shimbun-re-retrieve-all)
+     (define-key mew-summary-mode-map "Ge" 'mew-shimbun-expire)
+     (define-key mew-summary-mode-map "GE" 'mew-shimbun-expire-all)
+
+     ;; `mew-shimbun-folder-groups' $B$K(B Mew $B$G9XFI$9$k(B `shimbun' servers $B5Z$S(B
+     ;; group $B$r@_Dj$7$^$9!#$=$l$>$l$NMWAG$O(B
+     ;; `("folder" ("server.group" . range) ...)' $B$N7A<0$G$9!#(B`range' $B$K$O(B
+     ;; `all', `last', $B$*$h$S?t;z$,;XDj$G$-$^$9!#(B
+
+     (setq mew-shimbun-folder-groups
+           '(;; `+shimbun/yomiuri' $B$H$$$&(B folder $B$K(B `yomiuri.national',
+             ;; `yomiuri.sports' $B$J$I$r0l3g$7$F<hF@$7$^$9!#(B
+             ("yomiuri"
+              ("yomiuri.national" . 2)
+              ("yomiuri.sports". 2)
+              ("yomiuri.world". 2))
+             ;; `+shimbun/security-memo' $B$K(B `security-memo.memo' $B$r<hF@$7$^$9!#(B
+             ("security-memo"
+              ("security-memo.memo" . 2))
+             ("slashdot-jp"
+              ("slashdot-jp.story" . last))
+             ;; $B$3$N$h$&$K!"0[$J$k(B server $B$N(B group $B$b0l$D$N(B folder
+             ;; (`+shimbun/emacs') $B$GFI$`$3$H$,$G$-$^$9!#(B
+             ("emacs"
+              ("airs.wl" . last)
+              ("emacs-w3m.emacs-w3m" . last))
+             ;; `+shimbun/hns/arisawa', `+shimbun/hns/miyoshi' $B$K$=$l$>$l$N(B
+             ;; $BF|5-$r<hF@$7$^$9!#(B
+             ("hns/arisawa"
+              ("hns.arisawa" . last))
+             ("hns/miyoshi"
+              ("hns.miyoshi" . last))))
+
+     $B0J>e$G4pK\E*$J@_Dj$O=*N;$G$9!#B>$N%f!<%6Dj5AJQ?t$O(B `mew-shimbun' $B%0(B
+     $B%k!<%W$r(B `M-x customize-group' $B$9$k$+!"%=!<%9$r8+$F$/$@$5$$!#(B
+
+  2. $B5-;v$N9XFI(B
+
+       a. $B:G=i$N9XFI(B
+
+          $B>e5-$N@_Dj$r$7$?$"$H!"$^$:(B `G I' $B$7$^$7$g(B
+          $B$&(B (`mew-shimbun-retrieve-all')$B!#(B
+          `mew-shimbun-folder-groups' $B$G<o!9$N@_Dj$r9T$J$C$?(B `shimbun'
+          folder $B$,(B `+shimbun' $B0J2<$K=PMh$^$9!#$^$?!"?7$?$K(B group $B$rDI2C$7$?(B
+          $B$H$-$b(B `G I' $B$9$k$HJXMx$G$9!#$J$*!"(B
+          `+shimbun' $B$O(B `mew-shimbun-folder' $B$H$$$&JQ?t$G9%$_$N$b$N$KJQ(B
+          $B99$G$-$^$9!#(B
+
+       b. `shimbun' folder $B$X$N0\F0(B
+
+          $BDL>o$N(B `g' (`mew-summary-goto-folder') $B$G$b(B `shimbun'
+          folder $B$X$N0\F0$O$G$-$^$9$,!"(B
+          `G g' (`mew-shimbun-goto-folder') $B$r;H$&$H(B `shimbun'
+          folder $B8BDj$G0\F0$G$-$^$9!#$^$?(B `C-u G g' $B$H(B prefix $B$r$D$1$?$H$-(B
+          $B$O!"?75,5-;v$N$"$k(B folder ($B$^$@(B scan $B$r$7$F$$$J$$(B folder) $B$N$_I=<($7$^$9!#(B
+          `G G' $B$G$bF1MM$G$9!#(B
+
+       c. folder $BC10L$G$N5-;v$N<hF@(B
+
+          `shimbun' folder $B$G(B `G i' (`mew-shimbun-retrieve') $B$9(B
+          $B$k$H!"8=:_$N(B `shimbun' folder $B$G?75,5-;v$r<hF@$7$^$9!#(B
+
+       d. $B99?7$5$l$?5-;v$N<hF@(B
+
+          $BFCDj$N5-;v$rI=<($7$?>uBV(B
+          $B$G(B `G r' (`mew-shimbun-re-retrieve') $B$9$k$H!"$=$N5-;v$,99?7(B
+          $B$5$l$F$$$?$i99?7$7!"F1;~$K?75,5-;v$b<hF@$7$^$9!#(B`C-u G r' $B$H$9$k(B
+          $B$H!"(B`mew-shimbun-mark-re-retrieve' $B$K;XDj$7$?%^!<%/(B ($B%G%U%)%k%HCM(B
+          $B$O(B `@') $B$N5-;v$N99?7$r;n$_$^$9!#(BCNET $B$J$I$G;H$&$HJXMx$G$7$g$&!#(B
+
+          `G R' (`mew-shimbun-re-retrieve-all') $B$G$O!"$9$Y$F$N5-;v$N(B
+          $B?75,@-$rD4$Y<hF@$7$J$*$7$^$9!#(B`C-u G R' $B$G$O%j!<%8%g%s$G;XDj$7$?(B
+          $BHO0O$N5-;v$rBP>]$H$7$^$9!#$*$=$i$/%O%$%Q!<F|5-%7%9%F%`$,2TF/$7$F$$$kF|5-(B
+          $B%5%$%H$G$OM-0U5A$J%3%^%s%I$G$7$g$&!#(B
+
+  3. $BL$FI4IM}(B
+
+     `~/.mew.el' $B%U%!%$%k$G0J2<$N@_Dj$r9T$J$C$F$$$k$H!"(B
+
+          (setq mew-shimbun-use-unseen t)
+
+     $B?75,$K<hF@$7$?5-;v$K(B `mew-shimbun-mark-unseen' $B$G@_Dj$7$?%^!<%/(B
+     ($B%G%U%)%k%H$O(B `*') $B$,$D$/$h$&$K$J$j!"FI$`$H<+F0E*$K>C$($^$9!#(B
+
+     $BDL>o!"(BMew $B$N(B summary $B%b!<%I$G%^!<%/$r$D$1$k!"$"$k$$$O>C$7$?8e!"(B
+     scan $B$r$7$J$$$H(B `.mew-cache' $B%U%!%$%k$KH?1G$5$l$^$;$s$,!"(B
+     `~/.mew.el' $B%U%!%$%k$G0J2<$N@_Dj$r9T$J$&$3$H$K$h$j!"(B
+
+          (setq mew-shimbun-use-unseen-cache-save t)
+
+     Mew $B$N=*N;;~$d(B folder $B$N(B kill $B;~(B (`C-c C-q' $B$r;H$C$?$H$-(B) $B$K(B
+     `shimbun' folder $B$O<+F0E*$K(B `.mew-cache' $B%U%!%$%k$rJ]B8$9$k$h$&$K(B
+     $B$J$j$^$9!#$?$@$7!"3N<B(B (2) (*Note Mew Shimbun-Footnotes::)$B$KJ]B8$9(B
+     $B$k$o$1$G$O$"$j$^$;$s!#4{FI$K$J$C$?>pJs$r3N<B$K(B cache $B$KJ]B8$9$k$K(B
+     $B$O!"$=$N(B folder $B$rFI$_=*$o$C$?$H$-$K(B `scan update' $B$r$9$k=,47(B
+     $B$r$D$1$k$HNI$$$G$7$g$&!#(B
+
+     $BL$FI$K;H$&%^!<%/$,(B `*' $B$8$c%@%a!"$H$$$&J}$O!"JQ(B
+     $B?t(B `mew-shimbun-mark-unseen' $B$r%+%9%?%^%$%:$7$F$/$@$5$$(B ($B>e=R(B)$B!#(B
+     `C-u N' $B$G$=$N%^!<%/$r;XDj$9$k$H3Z$7$$L$FI%i%$%U$r$*$/$k$3$H$,$G(B
+     $B$-$k$H;W$$$^$9!#(B
+
+  4. $B4|8B@Z$l5-;v$N>C5n(B
+
+     $B;vA0$K(B `mew-shimbun-expires' $B$r@_Dj$7$F$*$/$H!"4|8B@Z$l5-;v$N>C5n(B
+     $B$r9T$J$&$3$H$,$G$-$^$9!#Nc$($P(B:
+
+          (setq mew-shimbun-expires
+                '(("yomiuri" . 7)
+                  ("asahi" . 1)
+                  ("slashdot-jp" . 7)
+                  ("emacs" . 7)))
+
+     $B>e5-$N$h$&$K@_Dj$7$F$*$/$H!"(B`+shimbun/yomiuri' $B$O(B 7$BF|!"(B
+     `+shimbun/asahi' $B$O(B 1$BF|$H4|8B$r@_Dj$9$k$3$H$,$G$-$^$9!#;XDj$5$l$F$$(B
+     $B$J$$(B `shimbun' folder $B$O>C5n$7$^$;$s!#(B`G e'
+     (`mew-shimbun-expire') $B$G$=$N(B folder $B$N4|8B@Z$l5-;v$r>C5n$7$^$9!#(B
+     `G e' (`mew-shimbun-expire') $B$G@_Dj$7$?$9$Y$F$N(B folder $B$G5-(B
+     $B;v$N>C5n$r<B9T$7$^$9!#$J$*!"0lEY>C5n$7$?5-;v$OI|5l=PMh$^$;$s$N$GCm0U$7$F(B
+     $B$/$@$5$$!#(B
+
+  5. $BL$FI%^!<%/$H$7$F(B `$' $B$rDI2C$9$kJ}K!(B
+
+     `$' $B%^!<%/$r?7$?$K:n@.$7!"(B`$' $B%^!<%/$rL$FI%^!<%/$H$7$F;H$&$K$O!"<!(B
+     $B$N5-=R$r(B `~/.mew.el' $B%U%!%$%k$K5-=R$7$F$/$@$5$$!#$J$*!"(B`$' $B0J30$N(B
+     $B5-9f$K$7$?$1$l$P!"(B
+     `http://www.mew.org/ml/mew-dist-2.0/msg01251.html' $B$r;2>H$7$F5-=R(B
+     $B$r@8@.$7$F$/$@$5$$!#(B
+
+     ;;----------------------------------------------------------------------
+     ;;; `$' $B$rL$FI%^!<%/$H$7$F;H$&$?$a$N5-=R(B
+     (setq mew-mark-unseen ?$)
+     (setq mew-shimbun-mark-unseen mew-mark-unseen)
+     (setq mew-mark-show-list (cons mew-mark-unseen mew-mark-show-list))
+     (setq mew-mark-afterstep-spec
+           (cons (cons mew-mark-unseen '(1 0 1 0 0 0 0))
+                 mew-mark-afterstep-spec))
+     (setq mew-mark-spec
+           (cons (list mew-mark-unseen "unseen" 0 nil nil nil nil nil)
+                 mew-mark-spec))
+     (setq mew-highlight-mark-keywords
+           (cons
+            (cons mew-mark-unseen 'mew-face-mark-unseen)
+            mew-highlight-mark-keywords))
+     (defface mew-face-mark-unseen
+       '((((class color) (type tty))
+          (:foreground "green"))
+         (((class color) (background light))
+          (:foreground "deep pink" :bold t :italic t))
+         (((class color) (background dark))
+          (:foreground "thistle"))
+         (t (:bold t)))
+       "*Face to highlight the unseen mark"
+       :group 'mew-highlight)
+     (defun mew-summary-unseen (&optional count)
+       "Put the unseen mark(default is '$') in COUNT times."
+       (interactive "P")
+       (mew-mark-put-mark-loop (function mew-summary-unseen-one) count nil))
+     (defun mew-summary-unseen-one (&optional no-msg)
+       "Put the unseen mark(default is '$') on this message."
+       (mew-mark-put-mark mew-mark-unseen no-msg))
+     (defun mew-summary-mark-unseen ()
+       "Change the '*' mark into the '$' mark."
+       (interactive)
+       (mew-summary-exchange-mark mew-mark-review mew-mark-unseen))
+     (defun mew-thread-mark-unseen ()
+       "Put the '$' mark on all messages of the current sub-thread."
+       (interactive)
+       (mew-thread-mark mew-mark-unseen))
+
+     (define-key mew-summary-mode-map "$"  'mew-summary-unseen)
+     (define-key mew-summary-mode-map "m$" 'mew-summary-mark-unseen)
+     (define-key mew-summary-mode-map "t$" 'mew-thread-mark-unseen)
+     ;;----------------------------------------------------------------------
+
+
+File: emacs-w3m-ja.info  Node: Mew Shimbun-Footnotes, Up: Mew Shimbun
+
+(1) $AN4$BFI$A9\@m$r$9$k$H$-$O%3%a%s%H$rMb$7$F$/$@$5$$!#$3$N$(I+y$AJ}$O1X$:(B
+`(require 'mew-shimbun)' $A$NG0$G$(G]C$A6($7$J$$$H$$$1$^$;$s!#(B
+
+(2) `mew-touch-folder-p' $A$,(B `t' $A$NHK$O$[$\(B 100% $A1#4f$G$-(B
+$A$^$9$,!"(B`nil' $A$NHK$,1#4f$G$-$k?ID\PT$O$[$H$s$I(B 0% $A$@$HK<$o$l(B
+$A$^$9!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Shimbun with Wanderlust, Next: Shimbun local mode, Prev: Mew Shimbun, Up: Shimbun Library
+
+Wanderlust $A$GPB$(GjL$A$r$BFI$A$`(B
+=======================
+
+Wanderlust $B$K$O(B ELMO $B%b%8%e!<%k$N0l$D$H$7$F(B `elmo-shimbun' $B$,4^$^$l$F$$(B
+$B$k$N$G!"L>A0$,(B `@' $B$G;O$^$k%U%)%k%@$K%"%/%;%9$9$k$@$1$G(B `shimbun' $B$rFI(B
+$B$`$3$H$,$G$-$^$9(B (*Note Shimbun Folder: (wl-ja)Shimbun Folder.)$B!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Shimbun local mode, Next: Shimbun Sites, Prev: Shimbun with Wanderlust, Up: Shimbun Library
+
+$APB$(GjL$A$NH!5C$K%7%'%k%9%/%j%W%H$rJ9$&(B
+==================================
+
+$B$?$/$5$s$N?7J9$rFI$s$G$$$k$H!"?7$7$$5-;v$r%A%'%C%/$9$k$N$K$$$/$i$+;~4V(B
+$B$,$+$+$k$G$7$g$&!#$=$l$O(B emacs-w3m $B$,:w0z$r0l$D$:$D<hF@$9$k$+$i$G$9!#$3(B
+$B$l$r9bB.$K9T$J$$$?$$$J$i!":w0z$N<hF@$K%7%'%k%9%/%j%W%H$r;H$&$3$H$,$G$-(B
+$B$^$9!#%9%/%j%W%H$O<jF0$G(B ($BNc$($P(B Emacs $B$NCf$+$i(B) $B:nF0$5$;$F$bNI$$$7!"(B
+cron $B$N$h$&$J%9%1%8%e!<%i$r2p$7$F<+F0$GAv$i$;$k$3$H$b$G$-$^$9!#:w0z$OFC(B
+$BJL$JL>A0$N%U%!%$%k$K%;!<%V$5$l!"$=$N8e(B emacs-w3m $B$O(B w3m $B$r8F$VBe$o$j$K(B
+$B$=$l$i$N%U%!%$%k$r;H$&$h$&$K$J$j$^$9!#(B
+
+$B0J2<$NJQ?t$G!"$=$N!V%m!<%+%k%b!<%I!W$r@)8f$7$^$9(B:
+
+`shimbun-use-local'
+     $B$3$l$r(B `t' $B$K@_Dj$9$k$3$H$K$h$C$F%m!<%+%k%b!<%I$rM-8z$K$7$^$9!#$=(B
+     $B$&$9$k$H!"$b$7%m!<%+%k%U%!%$%k$H$7$F:w0z$,MQ0U$G$-$F$$$l$P!"(B
+     emacs-w3m $B$O:G=i$K$=$l$r%A%'%C%/$7$^$9!#$b$7$=$l$,8+$D$+$i$J$+$C$?(B
+     $B$i!"DL>oDL$j(B w3m $B$rDL$7$F<hF@$7$^$9!#(B
+
+`shimbun-local-path'
+     $B?7J9$N(B ($B:w0z$N(B) $B%U%!%$%k$r3JG<$9$k%G%#%l%/%H%j$G$9!#%G%U%)%k%H$O(B
+     `w3m-default-save-directory' $B$G$9!#(B
+
+$B:w0z$N$?$a$N%U%!%$%k$NL>A0$O!"(BURL $B$N(B MD5 $B$r:G=i$N(B 10 $BJ8;z$K@Z$j5M$a$?$b(B
+$B$N$N8e$m$K(B `_shimbun' $B$H$$$&J8;zNs$r$/$C$D$1$?$b$N$K$J$j$^$9!#<!$N$h$&(B
+$B$K(B Emacs $B$G4JC1$K:w0z$N$?$a$N%U%!%$%k$r@8@.$9$k$3$H$,$G$-$^$9(B:
+
+     (concat (substring (md5 "http://example/feed") 0 10) "_shimbun")
+
+Gnus $B$H(B `nnshimbun' $B$r;H$C$F$$$k?M$?$A$N$?$a$K!"%7%'%k%9%/%j%W%H$r@8@.(B
+$B$9$k4X?t$,$9$G$K$"$j$^$9!#$=$l$r;H$C$F!"8=:_9VFI$7$F$$$k$9$Y$F$N(B
+shimbun $B%0%k!<%W$N:w0z$r%@%&%s%m!<%I$9$k$3$H$,$G$-$^$9!#C1$K(B
+`nnshimbun-generate-download-script' $B$r8F$s$G$/$@$5$$!#$9$k$H?7$7$$%P%C(B
+$B%U%!$K%7%'%k%9%/%j%W%H$,@8@.$5$l$k$N$G!"8e$G%;!<%V$7$F$/$@$5$$!#@\F,0z(B
+$B?t$rIU$1$F$=$N4X?t$r8F$V$H!":w0z$N<hF@$rJB9T$7$F9T$J$&$?$a$K!"$9$Y$F$N(B
+w3m $B8F$S=P$7$K(B `&' $B$rIU$1$^$9!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Shimbun Sites, Next: Shimbun Basics, Prev: Shimbun local mode, Up: Shimbun Library
+
+$APB$(GjL$A$,$BFI$A$a$k%5%$%H(B
+==================
+
+`Shimbun' $B%i%$%V%i%j$,BP1~$7$F$$$k%5%$%H$N0lMwI=$G$9!#(B
+
+* Menu:
+
+* Newspapers Supported by Shimbun::     $B?7J9<R(B
+* News Sites Supported by Shimbun::     $B%K%e!<%9%5%$%H(B
+* Mailing Lists Supported by Shimbun::  $B%a!<%j%s%0%j%9%H(B
+* Sport Sites Supported by Shimbun::    $B%9%]!<%D(B
+* Misc Sites Supported by Shimbun::     $B$=$NB>(B
+
+
+
+File: emacs-w3m-ja.info, Node: Newspapers Supported by Shimbun, Next: News Sites Supported by Shimbun, Prev: Shimbun Sites, Up: Shimbun Sites
+
+$APB$(GjL$AIg(B
+------
+
+`Shimbun' $B%i%$%V%i%j$,BP1~$7$F$$$k?7J9<R$G$9!#(B
+
+$A3/HUPB$(GjL(B (http://www.asahi.com/)
+     asahi.book asahi.book.column asahi.book.news asahi.book.paperback
+     asahi.book.review asahi.book.special asahi.business asahi.car
+     asahi.culture asahi.digital asahi.editorial asahi.edu
+     asahi.english asahi.food asahi.health asahi.housing asahi.igo
+     asahi.international asahi.international.asia
+     asahi.international.column asahi.international.special
+     asahi.international.world asahi.job asahi.kansai
+     asahi.kansai.entertainment asahi.kansai.kokoro asahi.kansai.sumai
+     asahi.kansai.taberu asahi.komimi asahi.life asahi.life.column
+     asahi.national asahi.politics asahi.rss asahi.science
+     asahi.shopping asahi.shopping.column asahi.shopping.yakimono
+     asahi.shougi asahi.sports asahi.sports.baseball
+     asahi.sports.battle asahi.sports.etc asahi.sports.football
+     asahi.sports.golf asahi.sports.rugby asahi.sports.usa
+     asahi.sports.winter asahi.tenjin asahi.travel asahi.wakata
+
+     $B$3$l$i$N%0%k!<%W$O!"%G%U%)%k%H$G%F%-%9%H$@$1$N5-;v$r:n$j$^$9!#$=$l(B
+     $B$i$K!"%F%-%9%H$@$1$G$J$/<L??$r$b4^$`(B HTML $B$N5-;v$r@8@.$5$;$?$$$J$i(B
+     $B$P!"0J2<$N9T$r(B `~/.emacs' $B%U%!%$%k$K2C$($F$/$@$5$$!#(B
+
+          (setq shimbun-asahi-prefer-text-plain nil)
+
+     $B0lJ}!"(BHTML $B$N5-;v$r:n$k$?$a$K(B `asahi-html' $B%P%C%/%(%s%I$r;H$&$3$H(B
+     $B$b$G$-$^$9!#$=$l$r;H$&$K$O!"Nc$($P%0%k!<%WL>$H$7$F(B
+     `asahi.business' $B$NBe$o$j$K(B `asahi-html.business' $B$r;XDj$7$F$/$@$5(B
+     $B$$!#(B
+
+$A3/HUPB$(GjL(B (http://mytown.asahi.com/)
+     asahi-mytown.(hokkaido...okinawa)
+
+     $BF|K\$NA4ETF;I\8)$rLVMe$9$kD+F|?7J9$NCOJ}HG$G$9!#(B
+
+BBC (http://www.bbc.co.uk/)
+     bbc.news
+
+$A%G%#$B!<$A!$%t%'%k%H(B (http://www.welt.de/)
+     welt-de.news
+
+$A%G%#$B!<$A!$%D%!%$%H(B (http://www.zeit.de/)
+     zeit-de.auto zeit-de.computer zeit-de.deutschland
+     zeit-de.feuilleton zeit-de.gesundheit zeit-de.international
+     zeit-de.leben zeit-de.literatur zeit-de.musik zeit-de.news
+     zeit-de.reisen zeit-de.schule zeit-de.sport zeit-de.studium
+     zeit-de.wirtschaft zeit-de.wissen zeit-de.zuender
+
+$A%2%s%@%$%M%C%H(B (http://gendai.net/)
+     gendai-net.today gendai-net.syakai gendai-net.sports
+     gendai-net.geino gendai-net.wadai gendai-net.kenko
+     gendai-net.syoku gendai-net.book
+
+$(I#z$AHU(Bjp (http://mainichi.jp/)
+(2007$ADj(B10$ATB$K(B MSN $A$+$iWTIg%5%$%H$KRFPP(B)
+     mainichi.flash mainichi.sports mainichi.entertainment
+     mainichi.entertainment.art mainichi.mantan mainichi.electronics
+     mainichi.weekly mainichi.opinion.editorial
+     mainichi.opinion.yoroku mainichi.opinion.hasshinbako
+     mainichi.opinion.eye mainichi.opinion.hito mainichi.opinion.kinji
+     mainichi.opinion.yuraku mainichi.opinion.closeup
+     mainichi.opinion.kaisetsu mainichi.opinion.newsup
+
+     $B$3$l$i$N%0%k!<%W$O!"%G%U%)%k%H$G<L??$r$b4^$`(B HTML $B$N5-;v$r:n$j$^$9!#(B
+     $B$=$l$i$K!"%F%-%9%H$@$1$N5-;v$r@8@.$5$;$?$$$J$i$P!"0J2<$N9T$r(B
+     `~/.emacs' $B%U%!%$%k$K2C$($F$/$@$5$$!#(B
+
+          (setq shimbun-mainichi-prefer-text-plain t)
+
+$A%K%e$B!<$A%h$B!<$A%/%?%$%`%:(B (http://www.nytimes.com/)
+     nytimes.homepage nytimes.news.business
+     nytimes.news.business.media&advertising
+     nytimes.news.business.worldbusiness
+     nytimes.news.business.smallbusiness
+     nytimes.news.business.yourmoney nytimes.news.business.dealbook
+     nytimes.news.education nytimes.news.health
+     nytimes.news.health.policy nytimes.news.health.psychology
+     nytimes.news.world nytimes.news.world.africa
+     nytimes.news.world.americas nytimes.news.world.asia
+     nytimes.news.world.europe nytimes.news.world.middleeast
+     nytimes.news.us nytimes.news.newyork nytimes.news.newyork.thecity
+     nytimes.news.newyork.metro nytimes.news.obituaries
+     nytimes.news.science nytimes.news.science.earth
+     nytimes.news.science.nutrition nytimes.news.science.space
+     nytimes.news.sports nytimes.news.sports.basketball.college
+     nytimes.news.sports.football.college nytimes.news.sports.golf
+     nytimes.news.sports.hockey nytimes.news.sports.other
+     nytimes.news.sports.baseball.pro
+     nytimes.news.sports.basketball.pro
+     nytimes.news.sports.football.pro nytimes.news.sports.soccer
+     nytimes.news.technology nytimes.news.technology.bits
+     nytimes.news.technology.circuits nytimes.news.technology.pogue
+     nytimes.news.washington nytimes.features.arts
+     nytimes.features.arts.design nytimes.features.arts.music
+     nytimes.features.arts.television nytimes.features.automobiles
+     nytimes.features.books nytimes.features.books.review
+     nytimes.features.dining&wine nytimes.features.fashion
+     nytimes.features.fashion.thursdaystyles
+     nytimes.features.fashion.weddings nytimes.features.home&garden
+     nytimes.features.jobs nytimes.features.magazine
+     nytimes.features.movie.news nytimes.features.movie.reviews
+     nytimes.features.realestate nytimes.features.theater
+     nytimes.features.travel nytimes.features.travel.escapes
+     nytimes.features.week_in_review nytimes.additional.pop_top
+     nytimes.opinion.editorial
+
+     2007$BG/(B9$B7n(B19$BF|!"%K%e!<%h!<%/%?%$%`%:$OL5NA$G%K%e!<%95-;v$rDs6!$7;O(B
+     $B$a$^$7$?!#(B`charset=iso-8859-1' $B$H8@$C$?$N$K$b$+$+$o$i$:!"$3$N%5%$(B
+     $B%H$O$7$P$7$P(B `iso-8859-1' $B$N>e0L8_49J8;z%;%C%H$G$"$k(B
+     `windows-1252' $B$r;H$$$^$9!#;HMQ$7$F$$$k(B (X)Emacs $B$K(B
+     `windows-1252' coding system $B$,$"$l$P!"(B`shimbun' $B$O(B ($B$=$7$F(B
+     emacs-w3m $B$b(B) $B$=$N$h$&$J>l9g$G$bF0:n$7$^$9!#(B
+
+$AHU?/%9%]$B!<$A%D(B (http://www.nikkansports.com/)
+     nikkansports.flash nikkansports.baseball
+     nikkansports.baseball.highschool nikkansports.baseball.amateur
+     nikkansports.baseball.mlb nikkansports.soccer
+     nikkansports.soccer.japan nikkansports.soccer.world
+     nikkansports.sports nikkansports.sumo nikkansports.nba
+     nikkansports.nfl nikkansports.nhl nikkansports.rugby
+     nikkansports.golf nikkansports.motor nikkansports.battle
+     nikkansports.race nikkansports.race.kka
+     nikkansports.entertainment nikkansports.cinema
+     nikkansports.general
+
+$AHU1>$(I8+6v$APB$(GjL(B (http://www.nikkei.co.jp/)
+     nikkei.top nikkei.main nikkei.keizai nikkei.sangyo nikkei.tento
+     nikkei.kansai nikkei.it.business nikkei.it.busi_gyoukai
+     nikkei.it.biz-system nikkei.it.sox nikkei.it.data
+     nikkei.it.taidan nikkei.it.internet nikkei.it.broad
+     nikkei.it.net_gyoukai nikkei.it.iptel nikkei.it.tele
+     nikkei.it.broadcast nikkei.it.internet-column nikkei.it.contents
+     nikkei.it.ec nikkei.it.policy nikkei.it.e-gov nikkei.it.mobile
+     nikkei.it.mob_gyoukai nikkei.it.mobsoft nikkei.it.mobcon
+     nikkei.it.money nikkei.it.one nikkei.it.security
+     nikkei.it.net_crime nikkei.it.digital nikkei.it.pc nikkei.kokunai
+     nikkei.markets nikkei.kawase nikkei.kinri nikkei.ft nikkei.dj
+     nikkei.ngyoseki nikkei.gyosuuchi nikkei.gyoseki nikkei.china
+     nikkei.market nikkei.kaigai nikkei.seiji nikkei.shakai
+     nikkei.retto nikkei.sports nikkei.newpro nikkei.release
+     nikkei.release.it.comp nikkei.release.it.peri
+     nikkei.release.it.sys nikkei.release.it.cont
+     nikkei.release.it.net nikkei.release.it.lsi
+     nikkei.release.it.game nikkei.release.it.etc
+     nikkei.release.dist.depart nikkei.release.dist.ryohan
+     nikkei.release.dist.zakka nikkei.release.dist.cosme
+     nikkei.release.dist.car nikkei.release.dist.book
+     nikkei.release.dist.record nikkei.release.dist.food
+     nikkei.release.dist.mercha nikkei.release.dist.mail
+     nikkei.release.dist.netshop nikkei.release.dist.etc
+     nikkei.release.money.bank nikkei.release.money.sec
+     nikkei.release.money.am nikkei.release.money.insu
+     nikkei.release.money.etc nikkei.release.maker.chemi
+     nikkei.release.maker.mecha nikkei.release.maker.car
+     nikkei.release.maker.elec nikkei.release.maker.food
+     nikkei.release.maker.sports nikkei.release.maker.apparel
+     nikkei.release.maker.commu nikkei.release.maker.etc
+     nikkei.release.service.medic nikkei.release.service.rest
+     nikkei.release.service.trans nikkei.release.service.energy
+     nikkei.release.service.enter nikkei.release.service.env
+     nikkei.release.service.consul nikkei.release.service.edu
+     nikkei.release.service.haken nikkei.release.service.life
+     nikkei.release.service.media nikkei.release.service.lease
+     nikkei.release.service.travel nikkei.release.service.etc
+     nikkei.release.const.const nikkei.release.const.house
+     nikkei.release.const.etc nikkei.shasetsu
+
+MSN $(I7E8+$A%K%e$B!<$A%9(B (http://sankei.jp.msn.com/)
+(2007$ADj(B10$ATB$+$i(B MSN $A$KRFPP(B)
+     sankei.points sankei.affairs sankei.politics sankei.economy
+     sankei.world sankei.sports sankei.entertainments sankei.life
+     sankei.culture sankei.release sankei.region sankei.usatoday
+     sankei.usatoday.ja sankei.column.sankeisho sankei.column.shucho
+     sankei.column.seiron
+
+Spiegel Online (http://www.spiegel.de/)
+     spiegel.news
+
+$A%9%]%K%A(B (http://www.sponichi.co.jp/)
+     sponichi.baseball sponichi.soccer sponichi.usa sponichi.others
+     sponichi.society sponichi.entertainment sponichi.horseracing
+
+$ADO%I%$%DPB$(GjL(B (http://www.sueddeutsche.de/)
+     sueddeutsche-de.alles sueddeutsche-de.nachrichten
+     sueddeutsche-de.politik sueddeutsche-de.wirtschaft
+     sueddeutsche-de.finanzen sueddeutsche-de.kino
+     sueddeutsche-de.kultur sueddeutsche-de.sport
+     sueddeutsche-de.muenchen sueddeutsche-de.panorama
+     sueddeutsche-de.leben sueddeutsche-de.gesundheit
+     sueddeutsche-de.computer
+
+$(G{t$(I%D$APB$(GjL(B (http://www.yomiuri.co.jp/)
+     yomiuri.atmoney yomiuri.editorial yomiuri.entertainment
+     yomiuri.iryou yomiuri.kyoiku yomiuri.kyoiku.children
+     yomiuri.kyoiku.english yomiuri.kyoiku.qanda
+     yomiuri.kyoiku.renaissance yomiuri.kyoiku.special
+     yomiuri.national yomiuri.politics yomiuri.science yomiuri.sports
+     yomiuri.world
+
+     $B$3$l$i$N%0%k!<%W$O!"%G%U%)%k%H$G%F%-%9%H$@$1$N5-;v$r:n$j$^$9!#$=$l(B
+     $B$i$K!"%F%-%9%H$@$1$G$J$/<L??$r$b4^$`(B HTML $B$N5-;v$r@8@.$5$;$?$$$J$i(B
+     $B$P!"0J2<$N9T$r(B `~/.emacs' $B%U%!%$%k$K2C$($F$/$@$5$$!#(B
+
+          (setq shimbun-yomiuri-prefer-text-plain nil)
+
+     $B0lJ}!"(BHTML $B$N5-;v$r:n$k$?$a$K(B `yomiuri-html' $B%P%C%/%(%s%I$r;H$&$3(B
+     $B$H$b$G$-$^$9!#$=$l$r;H$&$K$O!"Nc$($P%0%k!<%WL>$H$7$F(B
+     `yomiuri.atmoney' $B$NBe$o$j$K(B `yomiuri-html.atmoney' $B$r;XDj$7$F$/$@(B
+     $B$5$$!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: News Sites Supported by Shimbun, Next: Mailing Lists Supported by Shimbun, Prev: Newspapers Supported by Shimbun, Up: Shimbun Sites
+
+$A%K%e$B!<$A%9%5%$%H(B
+--------------
+
+`Shimbun' $B%i%$%V%i%j$,BP1~$7$F$$$k%K%e!<%9%5%$%H$G$9!#(B
+
+Al Jazeera (http://english.aljazeera.net/)
+     aljazeera.news aljazeera.africa aljazeera.america
+     aljazeera.asia-pacific aljazeera.central-asia aljazeera.europe
+     aljazeera.middle-east aljazeera.focus aljazeera.business
+     aljazeera.sport aljazeera.programmes
+
+CNET (http://news.com.com/)
+     cnet.news cnet.enterprise.software cnet.enterprise.hardware
+     cnet.security cnet.networking cnet.personal.technology
+     cnet.newsmakers cnet.perspectives
+
+CNET Japan (http://japan.cnet.com/)
+     cnet-jp.general cnet-jp.news cnet-jp.special cnet-jp.opinion
+     cnet-jp.blog.geetstate cnet-jp.blog.kenn cnet-jp.blog.lessig
+     cnet-jp.blog.matsumura cnet-jp.blog.nakajima cnet-jp.blog.saeki
+     cnet-jp.blog.sakamoto cnet-jp.blog.sasaki cnet-jp.blog.sentan
+     cnet-jp.blog.staff cnet-jp.blog.takawata cnet-jp.blog.watanabe
+
+CNN Japan (http://www.cnn.co.jp/)
+     cnn-jp.business cnn-jp.fringe cnn-jp.science cnn-jp.showbiz
+     cnn-jp.sports cnn-jp.top cnn-jp.usa cnn-jp.world
+
+De-Bug Magazine (http://www.de-bug.de/)
+     debugmagazin-de.frontpage debugmagazin-de.musik
+     debugmagazin-de.reviews debugmagazin-de.magazin
+     debugmagazin-de.medien debugmagazin-de.podcast
+     debugmagazin-de.musiktechnik debugmagazin-de.screen
+     debugmagazin-de.gadgets debugmagazin-de.games
+     debugmagazin-de.mode
+
+Engadget Japanese (http://japanese.engadget.com/)
+     engadget-ja.top
+
+$A%(%-%5%$%H(B $A%K%e$B!<$A%9(B (http://www.excite.co.jp/)
+     excite.bit-koneta excite.world-odd
+
+$AWTSI$(I$b@>$AU_M,CK%I%$%D(B (http://www.fau.org/)
+     fau.news
+
+$A%O%$%<!$%*%s%i%$%s(B (http://www.heise.de/)
+     heise.news heise.telepolis
+
+Infoshop News (http://news.infoshop.org/)
+     infoshop.news
+
+$A%$%s%W%l%9(B (http://www.watch.impress.co.jp/)
+     impress.enterprise impress.pc impress.dc impress.akiba impress.av
+     impress.game impress.k-tai impress.internet impress.bb
+     impress.forest impress.robot impress.kaden impress.car
+
+ITmedia (http://www.itmedia.co.jp/)
+     itmedia.news.bursts itmedia.news.domestic itmedia.news.foreign
+     itmedia.news.products itmedia.news.technology itmedia.news.web20
+     itmedia.news.nettopics itmedia.news.society itmedia.news.security
+     itmedia.news.industry itmedia.news.research itmedia.news.sp_amd
+     itmedia.anchordesk itmedia.bizid itmedia.enterprise
+     itmedia.+D.plusd itmedia.+D.mobile itmedia.+D.pcupdate
+     itmedia.+D.lifestyle itmedia.+D.games itmedia.+D.docomo
+     itmedia.+D.au_kddi itmedia.+D.vodafone itmedia.+D.shopping
+     itmedia.+D.lifestyle.column.asakura
+     itmedia.+D.lifestyle.column.honda
+     itmedia.+D.lifestyle.column.kobayashi
+     itmedia.+D.lifestyle.column.kodera
+     itmedia.+D.lifestyle.column.nishi
+     itmedia.+D.lifestyle.column.ogikubo
+     itmedia.+D.lifestyle.column.tachibana
+     itmedia.+D.lifestyle.column.takemura
+     itmedia.+D.lifestyle.column.unakami
+
+Japan Times (http://www.japantimes.co.jp/)
+     japantimes.general japantimes.business
+
+LAUT AG (http://www.laut.de/)
+     laut-de.news laut-de.platten laut-de.platten_alternative
+     laut-de.platten_dance laut-de.platten_hiphop platten_jazz
+     laut-de.platten_metal laut-de.platten_pop laut-de.platten_rnb
+     laut-de.platten_rock
+
+N24 (http://www.n24.de/)
+     n24-de.boerse n24-de.boulevard n24-de.nachrichten n24-de.netnews
+     n24-de.politik n24-de.sport n24-de.wirtschaft
+
+Open Tech Press (http://opentechpress.jp/)
+     opentechpress-jp.general opentechpress-jp.enterprise
+     opentechpress-jp.opensource opentechpress-jp.security
+     opentechpress-jp.news opentechpress-jp.pr
+
+Perlentaucher ($AUfVi$(GZh$A$j(B) (http://www.perlentaucher.de/)
+     perlentaucher-de.aktuell
+
+Rediff.com (http://www.rediff.com/)
+     rediff.news
+
+Slashdot (http://www.slashdot.org/)
+     slashdot.frontpage slashdot.apple slashdot.askslashdot
+     slashdot.books slashdot.developers slashdot.games
+     slashdot.hardware slashdot.interviews slashdot.IT slashdot.linux
+     slashdot.mobile slashdot.politics slashdot.science
+
+     Slashdot shimbun $B$N%3%a%s%H$NItJ,$r@_Dj$9$k$?$a$N0J2<$NJQ?t$,$"$j(B
+     $B$^$9(B:
+
+     `shimbun-slashdot-get-comments'
+          $B$b$7(B `t' $B$K@_Dj$5$l$F$$$k$H(B ($B$=$l$,%G%U%)%k%H$G$9(B)$B!"$9$Y$F$N(B
+          $B5-;v$N%3%a%s%H$r<hF@$7$^$9!#$=$l$i$O%U%)!<%`%U%#!<%IJ8;z(B
+          ("^L" $B$N$3$H(B) $B$G%$%s%H%m!&%F%-%9%H$+$iJ,N%$5$l$^$9!#$=$l$i$r(B
+          $B8+$k$K$O!"$$$D$b$N$h$&$K5-;v%P%C%U%!$r%9%/%m!<%k$7$F$/$@$5$$(B
+          (Gnus $B$G$O(B "Next page" $B%\%?%s$H(B "Previous page" $B%\%?%s$r;H$&(B
+          $B$3$H$,$G$-$^$9(B)$B!#$3$NJQ?t$r(B `nil' $B$K@_Dj$9$k$H!"5-;v$N%3%a%s(B
+          $B%H$r<hF@$7$J$/$J$j$^$9!#(B
+
+     `shimbun-slashdot-comment-threshold'
+          $BI=<($5$l$k%3%a%s%H$NogCM$G$9(B ($B%G%U%)%k%H$O(B 3)$B!#(B-1 ($B$9$Y$F$N%3(B
+          $B%a%s%H(B) $B$+$i(B 5 ($B:G9b%l!<%H(B) $B$^$G$N4V$N?t$K$7$F$/$@$5$$!#(B
+
+     `shimbun-slashdot-comment-display'
+          $B%3%a%s%H$rI=<($9$k7A<0$G$9(B ($B%G%U%)%k%H$O(B "flat")$B!#(B"flat"$B!"(B
+          thread" $B$^$?$O(B "nested" $B$N$I$l$+$K$7$F$/$@$5$$!#$3$l$O%7%s%\(B
+          $B%k$G$O$J$/J8;zNs$G$J$1$l$P$J$j$^$;$s!#(B
+
+Slashdot Japan (http://slashdot.jp/)
+     slashdot-jp.story slashdot-jp.askslashdot slashdot-jp.bookreview
+     slashdot-jp.bsd slashdot-jp.developers slashdot-jp.interview
+     slashdot-jp.linux slashdot-jp.mac slashdot-jp.mobile
+     slashdot-jp.science slashdot-jp.security slashdot-jp.slash
+     slashdot-jp.it slashdot-jp.hardware slashdot-jp.diary.oliver
+
+     $BJQ?t(B `shimbun-slashdot-jp-group-alist' $B$KE,@Z$J@_Dj$r2C$($k$H!"$=(B
+     $B$NB>$N%f!<%6!<$NF|5-$b1\Mw$G$-$^$9!#(B
+
+Tech-On! $AHU$(I8+(BBP$AIg(B (http://techon.nikkeibp.co.jp/)
+     tech-on.latestnews tech-on.mobile tech-on.bbint tech-on.d-ce
+     tech-on.AT tech-on.edaonline tech-on.device tech-on.lsi
+     tech-on.silicon tech-on.observer tech-on.fpd tech-on.mono
+     tech-on.embedded tech-on.mecha tech-on.MEMS tech-on.nano
+     tech-on.carele tech-on.board tech-on.mcu tech-on.PLM
+     tech-on.memory tech-on.measurement tech-on.column.mot
+
+     Tech-On! $B$OF|7P(BBP$B<R$,Ds6!$9$k5;=Q%K%e!<%9%5%$%H$G$9!#0JA0$O5-;v$N(B
+     $BFbMF$rA4ItFI$`$?$a$K%m%0%$%s!&%"%+%&%s%H(B ($BL5NA(B) $B$,I,MW$G$7$?$,!">/(B
+     $B$J$/$H$b(B 2007$BG/$N=)$K$*$$$F$OMW$i$J$$$h$&$K8+$($^$9!#>-Mh$b$7:F$S(B
+     $BI,MW$K$J$C$?$i(B $A5G$(IS:$A%Z$B!<$A%8(B
+     (http://techon.nikkeibp.co.jp/guide/inf_regi.html) $B$K9T$C$F<hF@$7(B
+     $B$F$/$@$5$$!#<!$NFs$D$NJQ?t$G!"$I$&$d$C$F%m%0%$%s$9$k$+$r@)8f$7$^$9(B:
+
+     `shimbun-tech-on-user-name'
+          Tech-On! $B$K%m%0%$%s$9$k$?$a$N%f!<%6!<L>$G$9!#(B`nil' $B$@$H(B
+          Tech-On! $B$K%m%0%$%s$9$k$H$-$K!"%f!<%6!<L>$NF~NO$rMW5a$5$l$^$9!#(B
+          $BJ8;zNs$@$C$?$i$=$l$,%f!<%6!<L>$H$7$F;H$o$l!"F~NO$rMW5a$5$l$k(B
+          $B$3$H$O$"$j$^$;$s!#(B`nil' $B$G$bJ8;zNs$G$b$J$$>l9g(B ($B$3$l$,%G%U%)(B
+          $B%k%H$G$9(B)$B!"%m%0%$%s$r9T$J$$$^$;$s!#(B
+
+     `shimbun-tech-on-password'
+          Tech-On! $B$K%m%0%$%s$9$k$?$a$N%Q%9%o!<%I$G$9!#(B`nil' $B$@$H(B
+          Tech-On! $B$K%m%0%$%s$9$k$H$-$K!"%Q%9%o!<%I$NF~NO$rMW5a$5$l$^$9!#(B
+          $BJ8;zNs$@$C$?$i$=$l$,%Q%9%o!<%I$H$7$F;H$o$l!"F~NO$rMW5a$5$l$k(B
+          $B$3$H$O$"$j$^$;$s!#(B`nil' $B$G$bJ8;zNs$G$b$J$$>l9g(B ($B$3$l$,%G%U%)(B
+          $B%k%H$G$9(B)$B!"%m%0%$%s$r9T$J$$$^$;$s!#(B
+
+     $B$3$l$i$NF~NO$O!"$=$N(B Emacs $B%;%C%7%g%s$G:G=i$K(B Tech-On! $B$N5-;v$rFI(B
+     $B$_;O$a$k$H$-$K0l2s$@$1MW5a$5$l$^$9!#(B
+
+HotWired Japan (http://hotwired.goo.ne.jp/)
+     wired-jp.news wired-jp.business wired-jp.culture
+     wired-jp.technology wired-jp.blog.ogura wired-jp.blog.sasaki
+     wired-jp.blog.takahashi
+
+Yahoo! Japan (http://headlines.yahoo.co.jp/)
+     yahoo.topnews yahoo.news yahoo.politics yahoo.society
+     yahoo.people yahoo.business-all yahoo.market yahoo.stock
+     yahoo.industry yahoo.international yahoo.entertainment
+     yahoo.sports yahoo.computer yahoo.zenkoku yahoo.hokkaido
+     yahoo.aomori yahoo.iwate yahoo.miyagi yahoo.akita yahoo.yamagata
+     yahoo.fukushima yahoo.tokyo yahoo.kanagawa yahoo.chiba
+     yahoo.saitama yahoo.ibaraki yahoo.tochigi yahoo.gunma
+     yahoo.yamanashi yahoo.nagano yahoo.niigata yahoo.toyama
+     yahoo.ishikawa yahoo.fukui yahoo.aichi yahoo.gifu yahoo.shizuoka
+     yahoo.mie yahoo.osaka yahoo.hyogo yahoo.kyoto yahoo.shiga
+     yahoo.nara yahoo.wakayama yahoo.tottori yahoo.shimane
+     yahoo.okayama yahoo.hiroshima yahoo.yamaguchi yahoo.tokushima
+     yahoo.kagawa yahoo.ehime yahoo.kochi yahoo.fukuoka yahoo.saga
+     yahoo.nagasaki yahoo.kumamoto yahoo.oita yahoo.miyazaki
+     yahoo.kagoshima yahoo.okinawa
+
+     yahoo.news $B%0%k!<%W$O<gMW$J5-;v$H!"$5$i$KB.Js5-;v$r8!:w$7$^$9!#$3(B
+     $B$l$i$N%0%k!<%W$O!"%G%U%)%k%H$G(B HTML $B$N5-;v$r:n$j$^$9!#$=$l$i$K%F%-(B
+     $B%9%H$@$1$N5-;v$r@8@.$5$;$?$$$J$i$P!"0J2<$N9T$r(B `~/.emacs' $B%U%!%$%k(B
+     $B$K2C$($F$/$@$5$$!#(B
+
+          (setq shimbun-yahoo-prefer-text-plain t)
+
+ZDNet Japan (http://japan.zdnet.com/)
+     zdnet-jp.news zdnet-jp.news.network zdnet-jp.news.hardware
+     zdnet-jp.news.software zdnet-jp.news.manage
+     zdnet-jp.news.security zdnet-jp.news.internet zdnet-jp.news.os
+     zdnet-jp.news.db zdnet-jp.news.system zdnet-jp.column
+     zdnet-jp.column.sp1 zdnet-jp.column.netsecurity1
+     zdnet-jp.column.ea1 zdnet-jp.column.btl
+     zdnet-jp.column.solutionIT zdnet-jp.channel.security
+     zdnet-jp.channel.ilm zdnet-jp.blog.iida zdnet-jp.blog.mhatta
+     zdnet-jp.blog.kurei zdnet-jp.blog.opensource zdnet-jp.blog.soa
+     zdnet-jp.blog.dp
+
+The Onion (http://www.theonion.com/)
+     the-onion.news
+
+
+
+File: emacs-w3m-ja.info, Node: Mailing Lists Supported by Shimbun, Next: Sport Sites Supported by Shimbun, Prev: News Sites Supported by Shimbun, Up: Shimbun Sites
+
+$A%a$B!<$A%j%s%0%j%9%H(B
+----------------
+
+$B:G6a$G$O!"%a!<%j%s%0%j%9%H$KEj9F$5$l$?2a5n5-;v$N%"!<%+%$%V$,(B WEB $B>e$K4v(B
+$B$D$b8x3+$5$l$F$$$^$9!#(B`Shimbun' $B%i%$%V%i%j$O!"0J2<$N%"!<%+%$%V$r07$&$3(B
+$B$H$,$G$-$^$9!#(B
+
+Semi-gnus Mailing List in Japan (http://lists.airs.net/semi-gnus/archive/)
+     airs.semi-gnus-ja
+
+Wanderlust Mailing List (http://lists.airs.net/)
+     airs.wl airs.wl-en
+
+Big Brother DataBase Mailing List (http://www.rc.tutrp.tut.ac.jp/bbdb-ml/)
+     bbdb-ml.bbdb-ml
+
+GNOME Mailing List (http://mail.gnome.org/archives/)
+     gnome.balsa-list gnome.calendar-list gnome.cvs-commits-list
+     gnome.foundation-announce gnome.foundation-list gnome.fplan-list
+     gnome.gconf-list gnome.gdome gnome.gnome-1.4-list
+     gnome.gnome-announce-list gnome.gnome-components-list
+     gnome.gnome-db-list gnome.gnome-de gnome.gnome-debugger-list
+     gnome.gnome-devel-list gnome.gnome-doc-list gnome.gnome-gui-list
+     gnome.gnome-hackers gnome.gnome-hackers-readonly
+     gnome.gnome-hackers-test gnome.gnome-i18n gnome.gnome-i18n-tools
+     gnome.gnome-kde-list gnome.gnome-list gnome.gnome-office-list
+     gnome.gnome-pilot-list gnome.gnome-sound-list
+     gnome.gnome-themes-list gnome.gnome-ui-hackers
+     gnome.gnome-web-list gnome.gnome-webmaster-list
+     gnome.gnome-workshop-list gnome.gnomecc-list gnome.gnumeric-list
+     gnome.gtk-app-devel-list gnome.gtk-devel-list gnome.gtk-doc-list
+     gnome.gtk-i18n-list gnome.gtk-list gnome.gtk-perl-list
+     gnome.guppi-list gnome.libart gnome.libart-hackers
+     gnome.orbit-list gnome.vote gnome.wm-spec-list gnome.xml
+     gnome.xslt
+
+Java $A%+%s%U%!%l%s%9(B Mailing List (http://www.java-conf.gr.jp/archives/)
+     javaconf.servlet-ml javaconf.business-ml
+     javaconf.duke-in-the-box-ml javaconf.jfriends-ml javaconf.JGT-ml
+     javaconf.jini-ml javaconf.ejb-ml javaconf.cm-ml javaconf.horb-ml
+     javaconf.talk-ml
+
+LinuxCE JP Mailing List (http://www.peanuts.gr.jp/~kei/ml-archive/)
+     linuxce-jp.users
+
+Mule Mailing List (http://www.m17n.org/)
+     m17n.mule-ja m17n.mule
+
+Meadow Mailing List (http://www.ysnb.net/meadow/)
+     meadow.meadow-develop meadow.meadow-users-jp
+
+Mew Mailing List (http://www.mew.org/ml/)
+     mew.mew-dist mew.mew-win32 mew.mew-int
+
+MagicPoint Mailing List (http://www.mew.org/ml/)
+     mew.mgp-users mew.mgp-users-jp
+
+www.namazu.org Mailing Lists (http://www.namazu.org/cgi-bin/mailman/listinfo)
+     namazu.kakasi-commits namazu.kakasi-dev namazu.migemo
+     namazu.namazu-users-en namazu.namazu-users-ja
+     namazu.namazu-devel-ja namazu.namazu-devel-en
+     namazu.namazu-win32-users-ja namazu.sary
+
+emacs-w3m Mailing List (http://emacs-w3m.namazu.org/ml/)
+     emacs-w3m.emacs-w3m
+
+NetBSD JP Mailing List (http://www.jp.netbsd.org/ja/JP/ml/)
+     netbsd.announce-ja netbsd.junk-ja netbsd.tech-misc-ja
+     netbsd.tech-pkg-ja netbsd.port-arm32-ja netbsd.port-hpcmips-ja
+     netbsd.port-mac68k-ja netbsd.port-mips-ja netbsd.port-powerpc-ja
+     netbsd.hpcmips-changes-ja netbsd.members-ja netbsd.admin-ja
+     netbsd.www-changes-ja
+
+Ruby Mailing List (http://blade.nagaokaut.ac.jp/)
+     ruby.comp.lang.ruby ruby.fj.comp.lang.ruby ruby.ruby-dev
+     ruby.ruby-ext ruby.ruby-list ruby.ruby-math ruby.ruby-talk
+
+Toshiba Linux Users JP Mailing List (http://linux.toshiba-dme.co.jp/ML/tlinux-users-j/)
+     toshiba.linux-users-j
+
+w3m-dev Mailing List (http://mi.med.tohoku.ac.jp/~satodai/w3m-dev/)
+     w3m-dev.w3m-dev w3m-dev.w3m-dev-en
+
+digiko Mailing List (http://yar-3.net/digiko/)
+     digiko.digiko
+
+XEmacs Mailing List (http://list-archive.xemacs.org/)
+     xemacs.xemacs-announce xemacs.xemacs-beta-ja xemacs.xemacs-beta
+     xemacs.xemacs-build-reports xemacs.xemacs-cvs
+     xemacs.xemacs-design xemacs.xemacs-mule xemacs.xemacs-nt
+     xemacs.xemacs-patches xemacs.xemacs-users-ja xemacs.xemacs
+
+$A%;%-%e%j%F%#$B!<(BMEMO Mailing List (http://memo.st.ryukoku.ac.jp/archive/)
+     security-memo.memo security-memo.free-memo
+     security-memo.social-memo
+
+     $B$J$*!"(B`security-memo.*' $B$O%"%I%l%92s<}%m%\%C%HBP:v$G(B userid $B$H(B
+     passowrd $B$r5a$a$i$l$k$N$G(B `~/.w3m/passwd' $B$K(B
+
+          machine memo.st.ryukoku.ac.jp
+          realm input username/password = archives/archives
+          login archives
+          passwd archives
+
+          machine memo.st.ryukoku.ac.jp
+          realm input user: archives / password: archives
+          login archives
+          passwd archives
+
+     $B$H=q$-!">e5-%U%!%$%k$+$i(B group, others $B$N%"%/%;%98"$r<h$j=|$$$F$*(B
+     $B$/I,MW$,$"$j$^$9!#(B
+
+Debian JP Mailing List (http://lists.debian.or.jp/)
+     debian-jp.debian-announce debian-jp.debian-devel
+     debian-jp.debian-www debian-jp.debian-users
+     debian-jp.debian-policy debian-jp.jp-qa
+
+Debian Mailing List (http://lists.debian.org/)
+     debian.debian-announce debian.debian-commercial
+     debian.debian-firewall debian.debian-french debian.debian-isp
+     debian.debian-italian debian.debian-kde debian.debian-laptop
+     debian.debian-news debian.debian-news-german
+     debian.debian-news-portuguese debian.debian-security-announce
+     debian.debian-testing debian.debian-user
+     debian.debian-user-catalan debian.debian-user-french
+     debian.debian-user-polish debian.debian-user-portuguese
+     debian.debian-user-spanish debian.debian-user-swedish
+     debian.debian-admintool debian.debian-apache
+     debian.debian-autobuild debian.debian-beowulf debian.debian-boot
+     debian.debian-cd debian.debian-ctte debian.debian-debbugs
+     debian.debian-devel debian.debian-devel-announce
+     debian.debian-devel-french debian.debian-devel-games
+     debian.debian-devel-spanish debian.debian-doc debian.debian-dpkg
+     debian.debian-emacsen debian.debian-events-eu
+     debian.debian-events-na debian.debian-faq debian.debian-gcc
+     debian.debian-glibc debian.debian-gtk-gnome debian.debian-hams
+     debian.debian-ipv6 debian.debian-java debian.debian-jr
+     debian.debian-med debian.debian-mentors debian.debian-newmaint
+     debian.debian-newmaint-admin debian.debian-ocaml-maint
+     debian.debian-openoffice debian.debian-perl debian.debian-pilot
+     debian.debian-policy debian.debian-pool debian.debian-python
+     debian.debian-qa debian.debian-qa-private debian.debian-release
+     debian.debian-security debian.debian-snapshots
+     debian.debian-tetex-maint debian.debian-toolchain
+     debian.debian-vote debian.debian-wnpp debian.debian-www
+     debian.debian-x debian.deity debian.debian-chinese
+     debian.debian-chinese-big5 debian.debian-chinese-gb
+     debian.debian-esperanto debian.debian-i18n debian.debian-japanese
+     debian.debian-l10n-catalan debian.debian-l10n-dutch
+     debian.debian-l10n-english debian.debian-l10n-french
+     debian.debian-l10n-italian debian.debian-l10n-portuguese
+     debian.debian-l10n-spanish debian.debian-laespiral
+     debian.debian-russian debian.debian-simplified-chinese
+     debian.debian-68k debian.debian-alpha debian.debian-arm
+     debian.debian-bsd debian.debian-hppa debian.debian-hurd
+     debian.debian-ia64 debian.debian-mips debian.debian-parisc
+     debian.debian-powerpc debian.debian-s390 debian.debian-sparc
+     debian.debian-superh debian.debian-ultralinux debian.debian-win32
+     debian.debian-all-changes debian.debian-alpha-changes
+     debian.debian-arm-changes debian.debian-books
+     debian.debian-cd-vendors debian.debian-changes
+     debian.debian-consultants debian.debian-curiosa
+     debian.debian-devel-all-changes debian.debian-devel-alpha-changes
+     debian.debian-devel-arm-changes debian.debian-devel-changes
+     debian.debian-devel-hurd-i386-changes
+     debian.debian-devel-i386-changes debian.debian-devel-m68k-changes
+     debian.debian-devel-powerpc-changes
+     debian.debian-devel-sparc-changes debian.debian-hurd-i386-changes
+     debian.debian-i386-changes debian.debian-legal
+     debian.debian-m68k-changes debian.debian-mirrors
+     debian.debian-powerpc-changes debian.debian-project
+     debian.debian-publicity debian.debian-sgml
+     debian.debian-sparc-changes debian.lcs-eng debian.lsb-confcall
+     debian.lsb-discuss debian.lsb-impl debian.lsb-spec
+     debian.lsb-test debian.spi-announce debian.spi-general
+     debian.vgui-discuss
+
+KDE Mailing List in Japan (http://www.kde.gr.jp/ml/)
+     kde.Kuser kde.Kdeveloper
+
+Geocrawler (http://www.geocrawler.com/)
+     Geocrawler $B$KJ]B8$5$l$F$$$k$9$Y$F$N%a!<%j%s%0%j%9%H$r1\Mw$G$-$^$9!#(B
+     `M-x shimbun-geocrawler-add-group <RET>' $B$H$$$&%3%^%s%I$r;H$C(B
+     $B$F!"1\Mw$7$?$$%0%k!<%W$rJQ?t(B `shimbun-geocrawler-group-alist' $B$KEP(B
+     $BO?$7$F$/$@$5$$!#(B
+
+Mailing list ARChives (http://marc.theaimsgroup.com/)
+     Mailing list ARChives (MARC) $B$KJ]B8$5$l$F$$$k$9$Y$F$N%a!<%j%s%0%j(B
+     $B%9%H$r1\Mw$G$-$^$9!#1\Mw$7$?$$%0%k!<%W$N%0%k!<%WL>$H(B URL $B$r!"JQ?t(B
+     `shimbun-marc-aims-group-alist' $B$KEPO?$7$F$/$@$5$$!#(B
+
+RedHat Mailing List (http://sources.redhat.com/ml/)
+     redhat.automake redhat.bug-automake redhat.automake-prs
+     redhat.automake-cvs redhat.binutils redhat.binutils-cvs
+     redhat.c++-embedded redhat.crossgcc redhat.cgen redhat.cgen-prs
+     redhat.cgen-cvs redhat.cygwin redhat.cygwin-xfree
+     redhat.cygwin-announce redhat.cygwin-xfree-announce
+     redhat.cygwin-apps redhat.cygwin-patches redhat.cygwin-developers
+     redhat.cygwin-cvs redhat.cygwin-apps-cvs
+     redhat.docbook-tools-discuss redhat.docbook-tools-announce
+     redhat.docbook-tools-cvs redhat.docbook redhat.dssslist
+     redhat.sgml-tools redhat.docbook-apps redhat.ecos-announce
+     redhat.ecos-devel redhat.ecos-discuss redhat.ecos-maintainers
+     redhat.ecos-patches redhat.elix redhat.elix-announce redhat.gdb
+     redhat.gdb-announce redhat.gdb-testers redhat.gdb-testresults
+     redhat.gdb-patches redhat.gdb-cvs redhat.bug-gdb redhat.gdb-prs
+     redhat.libc-alpha redhat.libc-hacker redhat.bug-glibc
+     redhat.glibc-cvs redhat.glibc-linux redhat.bug-gnats
+     redhat.gnats-devel redhat.gnats-announce redhat.gnats-cvs
+     redhat.gsl-discuss redhat.gsl-announce redhat.gsl-cvs
+     redhat.guile redhat.guile-emacs redhat.guile-prs redhat.guile-gtk
+     redhat.bug-guile redhat.guile-cvs redhat.guile-emacs-cvs
+     redhat.insight redhat.insight-announce redhat.insight-prs
+     redhat.installshell redhat.inti redhat.kawa redhat.libffi-discuss
+     redhat.libffi-announce redhat.libstdc++ redhat.libstdc++-cvs
+     redhat.libstdc++-prs redhat.mauve-discuss redhat.mauve-announce
+     redhat.newlib redhat.pthreads-win32 redhat.rhdb
+     redhat.rhdb-announce redhat.rhug-rhats redhat.rpm2html-cvs
+     redhat.rpm2html-prs redhat.rpm2html redhat.sid
+     redhat.sid-announce redhat.sid-cvs redhat.sourcenav
+     redhat.sourcenav-announce redhat.sourcenav-prs redhat.win32-x11
+     redhat.xconq7 redhat.xconq-announce redhat.xconq-cvs
+
+MacOSX JP Mailing List (http://www.tech-arts.co.jp/macosx/)
+     macosx-jp.macosx-jp macosx-jp.macosx-dev-jp
+     macosx-jp.macosx-ws-jp macosx-jp.webobjects-jp
+
+SourceForge JP (http://sourceforge.jp)
+     SourceForge JP $B$KJ]B8$5$l$F$$$k%a!<%j%s%0%j%9%H$N$9$Y$F$N8x3+=q8K(B
+     $B$r1\Mw$G$-$^$9!#1\Mw$7$?$$%0%k!<%W$rJQ?t(B
+     `shimbun-sourceforge-jp-mailing-lists' $B$KEPO?$7$F$/$@$5$$!#(B
+
+Elips Mailing List (http://heimat.jp/~nakaji/elips/)
+     elips.elips
+
+Squeak-ja Mailing List (http://lists.squeakfoundation.org/pipermail/squeak-ja/)
+     squeak-ja.main
+
+Smalltalkers' Salon Mailing List (http://www.sra.co.jp/smalltalk/SML/archives/)
+     sml.main
+
+Squeak-dev Mailing List (http://lists.squeakfoundation.org/pipermail/squeak-dev/)
+     squeak-dev.main
+
+Plucker Mailing List (http://www.mail-archive.com/plucker-*@rubberchicken.org/maillist.html)
+     plucker.announce plucker.list plucker.dev
+
+pilot-link Mailing List (http://www.pilot-link.org/pipermail/)
+     pilot-link.announce pilot-link.devel pilot-link.general
+     pilot-link.unix-ng
+
+Coldsync Mailing List (http://www.thedotin.net/maillists/coldsync-hackers/maillist.html)
+     coldsync.main
+
+J-Pilot Mailing List (http://www.jpilot.org/pipermail/jpilot/)
+     jpilot.main
+
+pilot-mailsync Mailing List (http://lists.gnu-designs.com/pipermail/pilot-mailsync/)
+     pilot-mailsync.main
+
+Mozilla Users Mailing List in Japan (http://www.mozilla.gr.jp/ml/logs/moz-users/)
+     mozilla-jp.users
+
+     $B$J$*!"(B`mozilla-jp.users' $B$O%"%I%l%92s<}%m%\%C%HBP:v$G(B userid $B$H(B
+     passowrd $B$r5a$a$i$l$k$N$G(B `~/.w3m/passwd' $B$K(B
+
+          machine www.mozilla.gr.jp
+          realm Please Enter mozilla mozilla
+          login mozilla
+          passwd mozilla
+
+     $B$H=q$-!">e5-%U%!%$%k$+$i(B group, others $B$N%"%/%;%98"$r<h$j=|$$$F$*(B
+     $B$/I,MW$,$"$j$^$9!#(B
+
+tDiary Developers Mailing List in Japan (http://www.tdiary.org/)
+     tdiary-ml.devel tdiary-ml.theme
+
+arch.bluegate.org Mailing Lists (http://arch.bluegate.org/mailman/listinfo)
+     arch-bluegate.subversion-jp arch-bluegate.arch-jp
+     arch-bluegate.mailman arch-bluegate.viewarch
+
+Tigris.org:Open Source Software Engineering (http://www.tigris.org/)
+     Tigris.org $B$KJ]B8$5$l$F$$$k$9$Y$F$N%a!<%j%s%0%j%9%H$r1\Mw$G$-$^$9!#(B
+     $B1\Mw$7$?$$%0%k!<%W$rJQ?t(B `shimbun-tigris-group-alist' $B$KEPO?$7$F$/(B
+     $B$@$5$$!#%0%k!<%WL>$O(B tigris.<project>.<mailinglist> $B$K$J$j$^$9!#(B
+
+www.SciPy.net Mailing Lists (http://www.scipy.net/mailman/listinfo)
+     scipy.astropy scipy.ipython-user scipy.ipython-dev
+     scipy.scipy-user scipy.scipy-dev scipy.scipy-testlog
+     scipy.scipy-chaco scipy.scipy-cvs
+
+
+
+
+File: emacs-w3m-ja.info, Node: Sport Sites Supported by Shimbun, Next: Misc Sites Supported by Shimbun, Prev: Mailing Lists Supported by Shimbun, Up: Shimbun Sites
+
+$A%9%]$B!<$A%D(B
+--------
+
+`Shimbun' $B%i%$%V%i%j$,BP1~$7$F$$$k%9%]!<%D4X78$N%5%$%H$G$9!#(B
+
+makanai (http://www.makanai.com/)
+     makanai.f1news
+
+F1 $A%U%!%s(B (http://www.ksky.ne.jp/~tahara/f1/)
+     f1fan.news
+
+@nifty:$A%b$B!<$A%?$B!<$A%9%]$B!<$A%D(B (http://forum.nifty.com/fmotor/)
+     msports-nifty.F1 msports-nifty.IRL msports-nifty.WRC
+     msports-nifty.Europe msports-nifty.USA
+
+Yahoo!$A%9%]$B!<$A%D(B (http://sports.yahoo.co.jp/)
+     yahoo-sports.F1 yahoo-sports.baseball yahoo-sports.keiba
+     yahoo-sports.NBA yahoo-sports.NFL yahoo-sports.rugby
+
+$B$?$@$7!"(BEmacs-21.4 $B$^$?$O$=$l0JA0$NHG$G(B @nifty: $B%b!<%?!<%9%]!<%D$r1\Mw(B
+$B$9$k$K$O!"(BMule-UCS (*Note Other Requirements::) $B$,I,MW$G$9!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Misc Sites Supported by Shimbun, Prev: Sport Sites Supported by Shimbun, Up: Shimbun Sites
+
+$A$=$NK{(B
+------
+
+`Shimbun' $B%i%$%V%i%j$NBP1~$7$F$$$k$=$NB>$N%5%$%H$G$9!#7G<(HD$d!"O":\5-(B
+$B;v$r<gBN$H$9$k$h$&$J%5%$%H$,4^$^$l$F$$$^$9!#(B
+
+Tea Cup $(I6-$AJ>0e(B (http://www.tcup.com/)
+     Tea Cup Communication $B$K$h$C$FDs6!$5$l$k!"MM!9$J7G<(HD$r9VFI$9$k$3(B
+     $B$H$,$G$-$^$9!#%G%U%)%k%H$G$O!"0J2<$N;0$D$N7G<(HD$,MQ0U$5$l$F$$$^$9!#(B
+
+     tcup.meadow
+          Meadow $(I6-$AJ>0e(B (http://www66.tcup.com/6629/yutopia.html)
+
+     tcup.skk
+          SKK $(I6-$AJ>0e(B (http://www67.tcup.com/6718/yutopia.html)
+
+     tcup.yutopia
+          $A$f$&,Ftopia$(I6-$AJ>0e(B (http://www61.tcup.com/6116/yutopia.html)
+
+     $B?7$?$K7G<(HD$r%j%9%H$KDI2C$9$k$K$O!"$=$l$i$NL>A0$H(B URL $B$rD4$Y$F!"(B
+     `shimbun-tcup-group-alist' $B$rJQ99$7$F$/$@$5$$!#Fs$D$N7G<(HD(B `foo'
+     $B$H(B `bar' $B$rDI2C$9$kNc$G$9!#(B
+
+          (eval-after-load "sb-tcup"
+            '(setq shimbun-tcup-group-alist
+                   (append
+                    '(("foo" "http://MMMM.teacup.com/foo/bbs2")
+                      ("bar" "http://NNNN.teacup.com/bar/bbs2"))
+                    shimbun-tcup-group-alist)))
+
+2ch
+     $B%0%k!<%WL>$H(B URL $B$rD4$Y$F!"0J2<$N$h$&$K@_Dj$7$F;H$$$^$9!#(B
+
+          (setq shimbun-2ch-group-alist
+                '(("Meadow" .
+                   "http://pc.2ch.net/test/read.cgi/software/1005469775")
+                  ("emacs-w3m" .
+                   "http://pc.2ch.net/test/read.cgi/unix/1013710106")))
+
+CGI_Board $A$rJ9$C$F$$$k$(I6-$AJ>0e(B (http://www.math.tohoku.ac.jp/~kuroki/support/)
+
+     CGI_Board $B$r;H$C$F$$$k7G<(HD$N(B URL $B$rD4$Y$F!"(B
+     `shimbun-cgi-board-group-alist' $B$KE,@Z$J@_Dj$r2C$($F;H$$$^$9!#(B
+
+HNS $A$K$h$kHU$(GX4(B
+     $B1\Mw$7$?$$F|5-$N(B URL $B$rD4$Y$F!"0J2<$N$h$&$K@_Dj$7$F;H$$$^$9!#(B
+
+          (setq shimbun-hns-group-alist
+                '(("arisawa"                            ;; $B%0%k!<%WL>(B
+                   "http://nijino.homelinux.net/diary/" ;; URL
+                   "ari@mbf.sphere.ne.jp")              ;; $B%a!<%k%"%I%l%9(B
+                  ("miyoshi"
+                   "http://www.be.wakwak.com/cgi-bin/sbox/~miyoshi/hns/"
+                   "miyoshi@meadowy.org")))
+
+tDiary $A$K$h$kHU$(GX4(B
+     $B1\Mw$7$?$$F|5-$N(B URL $B$rD4$Y$F!"0J2<$N$h$&$K@_Dj$7$F;H$$$^$9!#(B
+
+          (setq shimbun-tdiary-group-alist
+                '(("henahena"                          ;; $B%0%k!<%WL>(B
+                   "http://www.fan.gr.jp/~ring/d/")    ;; URL
+                  ("yoichi"
+                   "http://yoichi.geiin.org/d/")))
+
+$(IA{$ALl$(I"H$(G^[(B (http://plaza.rakuten.co.jp/) $A$NHU$(GX4(B
+     $B1\Mw$7$?$$F|5-$r3+@_$7$F$$$k?M$N3ZE7(B ID $B$H%a!<%k%"%I%l%9$rD4$Y$F!"(B
+     $B0J2<$N$h$&$K@_Dj$7$F;H$$$^$9!#(B
+
+          (setq shimbun-rakuten-group-alist
+                '(("rakuten-id" . "email-address")))
+
+EmacsWiKi (http://www.emacswiki.org/)
+     emacswiki.changes emacswiki.diff
+
+$A%3%s%F%s%D$r:,$`(B RSS $A%U%#$B!<$A%I(B
+     $B1\Mw$7$?$$7G:\%3%s%F%s%D$,4^$^$l$k$h$&$J(B RSS $B%U%#!<%I$rD4$Y$F!"(B
+     `shimbun-rss-hash-group-path-alist' $BJQ?t$r0J2<$N$h$&$K@_Dj$7$F;H$$(B
+     $B$^$9!#%P%C%/%(%s%IL>$O(B `rss-hash' $B$G$9!#<g$K8D?M$N%V%m%0$J$I$,BP>](B
+     $B$K$J$k$G$7$g$&!#(B
+
+     $B%Q%i%a!<%?$O%0%k!<%WL>!"(BRSS $B%"%I%l%9!"%a!<%k%?%$%W(B (`t' $B$G(B html)$B!"(B
+     $B@07A;~$N3+;O@55,I=8=!"@07A;~$N=*N;@55,I=8=$H$J$j$^$9!#%0%k!<%WL>!"(B
+     RSS $B%"%I%l%90J30$O%*%W%7%g%s$G$9!#(B
+
+     $B0J2<$O%5%s%W%k$G$9!#$3$N>l9g$O(B `rss-hash.sampleblog1' $B$*$h$S(B
+     `rss-hash.sampleblog2' $B$H$7$F1\Mw$G$-$^$9!#(B
+
+          (setq shimbun-rss-hash-group-path-alist
+                '(;; text mail
+                  ("sampleblog1" "http://www.example.com/index1.rss")
+                  ;; html mail
+                  ("sampleblog2" "http://www.example.com/index2.rss"
+                   t "</title>" "<!-- start ads")))
+
+$A%3%s%F%s%D$r:,$`(B Atom $A%U%#$B!<$A%I(B
+     $BA09`(B ($B%3%s%F%s%D$r4^$`(B RSS $B%U%#!<%I(B) $B$HF1MM$K!"7G:\$5$l$?%3%s%F%s(B
+     $B%D$r4^$`(B Atom $B%U%#!<%I$b1\Mw$9$k$3$H$,$G$-$^$9!#$=$l$r9T$J$&$K$O!"(B
+     shimbun-rss-hash-* $B$HF1MM$N$d$jJ}$GJQ?t(B
+     `shimbun-atom-hash-group-path-alist' ($B$R$g$C$H$9$k$H(B
+     `shimbun-atom-hash-x-face-alist' $B$J$I$b(B) $B$r@_Dj$7$F$/$@$5$$!#%P%C(B
+     $B%/%(%s%IL>$O(B `atom-hash' $B$G$9!#(B
+
+$A%3%s%F%s%D$N$J$$(B RSS $A%U%#$B!<$A%I(B
+     $BB?$/$N%U%#!<%I$K$O5-;v$N40A4$J%3%s%F%s%D$,L5$$$+!"$^$?$O$$$B$o$k$K(B
+     $B>.=P$7$K$7$^$9!#%5%$%H$,$A$c$s$H5-;v$r=q$+$:$K!"$=$N$h$&$J%U%#!<%I(B
+     $B$7$+Ds6!$7$J$$>l9g$G$b!"B?$/$N>l9g(B `rss-blogs' $B$r;H$C$F@Z$jH4$1$k(B
+     $B$3$H$,$G$-$^$9!#@_Dj$O(B `rss-hash' $B$N$b$N$H;w$F$$$^$9!#Nc$r<($7$^$7$g(B
+     $B$&(B:
+
+          (setq shimbun-rss-blogs-group-url-regexp
+            '(("first-feed" "http://example/wordpressfeed")
+              ("second-feed" "http://example/somefeed"
+               "<div name=\"content\">" "<div name=\"comments\">")
+              ("third-feed" "http://example/someotherfeed" 'none)))
+
+     $B:G=i$NFs$D$N%"%$%F%`$O%U%#!<%I$NL>A0$H(B URL $B$G$9!#$=$N%U%#!<%I$,;X(B
+     $B$7<($9(B HTML $B%Z!<%8$K$*$$$F!"<B:]$N%3%s%F%s%D$N;O$a$H=*$j$rC5$9$?$a(B
+     $B$NFs$D$N@55,I=8=$r!"G$0U$GM?$($k$3$H$,$G$-$^$9!#$=$3$GC1$K(B `none'
+     $B$H$$$&%7%s%\%k$r;H$&$H!"$$$+$J$k_I2a$b9T$J$o$l$^$;$s!#(B
+
+     $B2C$($F!"(B`rss-blogs' $B$O$$$/$D$+$N%]%T%e%i!<$J%V%m%0!&%(%s%8%s$r<+F0(B
+     $BE*$K07$&$3$H$,$G$-$^$9!#$9$J$o$A(B Google $B$N(B Blogger/Blogspot ($B%3%a(B
+     $B%s%H!&%U%#!<%I$r4^$_$^$9(B)$B!"(BWordPress$B!"$*$h$S(B TypePad $B$G$9!#%U%#!<(B
+     $B%I$r<h$j4s$;$k%5%$%H$,$=$l$i$N0l$D$r;H$C$F$$$k$J$i(B (`generator' $B%?(B
+     $B%0$rD/$a$l$P$o$+$j$^$9(B)$B!"C1$KG$0U$N%Q%i%a!<%?$r>JN,$9$k$@$1$G!"<+(B
+     $BF0E*$K%3%s%F%s%D$r@Z$j=P$=$&$H$9$k$G$7$g$&!#(B
+
+Wiki $A%3%s%F%s%D(B
+     $B1\Mw$7$?$$(B Wiki $B$N(B URL $B$rD4$Y$F!"0J2<$N$h$&$K@_Dj$7$F;H$$$^$9!#(B
+     PukiWiki $B$H(B Hiki $B$KBP1~$7$F$$$^$9!#$b$7!"3FFbB&$N%j%9%H$N(B 4 $BHVL\!"(B
+     5 $BHVL\$NMWAG$N@55,I=8=$K2?$r;XDj$7$FNI$$$+J,$+$i$J$$$H$-$O!"(B`nil'
+     $B$r;XDj$9$l$PNI$$$G$7$g$&!#5-;v$N<hF@;~$K@07A$,9T$o$l$:!"$?$@%Z!<%8(B
+     $BA4BN$,8+$($k$@$1$G$9!#(B
+
+          (setq shimbun-wiki-group-alist
+                '(("pukiwiki" ;; $B%0%k!<%WL>(B
+                   "http://pukiwiki.org/index.php?cmd=rss10" ;; URL
+                   "webmaster@pukiwiki.org" ;; $B%a!<%k%"%I%l%9(B
+                   nil ;; X-Face
+                   "\n<h3 id=\"" ;; contents $B$N(B start $B$r<($9(B regexp
+                   "</address>") ;; contents $B$N(B end $B$r<($9(B regexp
+                  ("hiki"
+                   "http://www.namaraii.com/hiki/?c=rss"
+                   "webmaster@fdiary.net"
+                   nil
+                   "<div class=\"section\">"
+                   "<div class=\"sidebar\">")
+                  ("apollo"
+                   "http://wiki.fdiary.net/apollo/?c=rss"
+                   "moriq@moriq.com"
+                   nil
+                   "<div class=\"section\">"
+                   "<div class=\"sidebar\">")
+                  ))
+
+Yahoo!$A%*$B!<$A%/%7%g%s(B (http://auctions.yahoo.co.jp/)
+     $B1\Mw$7$?$$%+%F%4%j$d8!:w7k2L$N(B URL $B$rD4$Y$F!"0J2<$N$h$&$K@_Dj$7$F(B
+     $B;H$$$^$9!#(B
+
+          (setq shimbun-yahoo-auctions-group-alist
+                '(("mp3player" . "http://list3.auctions.yahoo.co.jp/jp/show/catleaf_rss?category=2084039708&alocale=0jp")
+                  ("iPod" . "http://search3.auctions.yahoo.co.jp/search_rss?p=iPod&auccat=2084039708&alocale=0jp&acc=jp")))
+
+VineLinux Errata (http://www.vinelinux.org/)
+     vinelinux.errata.4x.i386 vinelinux.errata.4x.ppc
+     vinelinux.errata.3x.i386 vinelinux.errata.3x.ppc
+     vinelinux.errata.3x.alpha vinelinux.errata.2x.i386
+     vinelinux.errata.2x.ppc vinelinux.errata.2x.sparc
+     vinelinux.errata.2x.alpha vinelinux.errata.1x
+
+$ADZ$(Gk^$A%a$B!<$A%k%^%,%8%s(B (http://www.mmz.kantei.go.jp/)
+     kantei.m-magazine-en kantei.m-magazine-ja
+     kantei.m-magazine-cn.hatoyama kantei.m-magazine-kr.hatoyama
+     kantei.m-magazine-en.hatoyama kantei.m-magazine-ja.hatoyama
+     kantei.m-magazine-en.aso kantei.m-magazine-ja.aso
+     kantei.m-magazine-en.fukuda kantei.m-magazine-ja.fukuda
+     kantei.m-magazine-en.abe kantei.m-magazine-ja.abe
+     kantei.m-magazine-en.koizumi kantei.m-magazine-ja.koizumi
+
+     $B8eJ}8_49@-$N$?$a(B `kantei.m-magazine'$B!"(B`kantei.m-magazine-cn' $B$*$h(B
+     $B$S(B `kantei.m-magazine-kr' $B$bMxMQ2DG=$K$J$C$F$$$^$9!#(B
+
+$ALX$(G]B$(I"G(B (http://www.jpo.go.jp/)
+     jpo.news jpo.revision jpo.lawguide jpo.details
+
+IBM developerWorks (http://www-6.ibm.com/jp/developerworks/)
+     ibm-dev.autonomic ibm-dev.java ibm-dev.linux ibm-dev.opensource
+     ibm-dev.webservices ibm-dev.xml
+
+Pocketgames (http://www.pocketgames.jp/)
+     pocketgames.news
+
+Wincefan (http://www.wince.ne.jp/)
+     wincefan.news
+
+PalmFan (http://www.palmfan.com/)
+     palmfan.news
+
+$(GgY$BG>$A=V$N$(G\"^[$A%l%]$B!<$A%H(B (http://homepage1.nifty.com/akiba/plat.html)
+     dennou.report
+
+PCWEB COLUMN Square (http://pcweb.mycom.co.jp/column/)
+     pcweb-column.jsr pcweb-column.yume pcweb-column.hreceipe
+     pcweb-column.kita pcweb-column.shonanlife pcweb-column.kaden
+     pcweb-column.nemurenai pcweb-column.komono pcweb-column.js
+     pcweb-column.en pcweb-column.motherboard pcweb-column.svalley
+     pcweb-column.architecture pcweb-column.motorlife
+     pcweb-column.nihongoprog pcweb-column.objc pcweb-column.ide
+     pcweb-column.music pcweb-column.itsecurity
+     pcweb-column.soundvisual pcweb-column.osx pcweb-column.sopinion
+     pcweb-column.ebook pcweb-column.orerobo pcweb-column.zsh
+     pcweb-column.rikei pcweb-column.lifehack pcweb-column.world
+     pcweb-column.guutara pcweb-column.volt pcweb-column.textclean
+     pcweb-column.person pcweb-column.web20 pcweb-column.system
+
+     $B8eJ}8_49@-$N$?$a!"0J2<$N%"%$%F%`$bMxMQ2DG=$K$J$C$F$$$^$9!#(B
+     pcweb-column.itshihonron pcweb-column.yetanother
+     pcweb-column.asia pcweb-column.benri pcweb-column.bytes
+     pcweb-column.game pcweb-column.hitech pcweb-column.java
+     pcweb-column.jisakuparts pcweb-column.scramble
+     pcweb-column.toolexp pcweb-column.winvista pcweb-column.winxp
+     pcweb-column.interview pcweb-column.ityougo pcweb-column.kimeuchi
+     pcweb-column.stratesys pcweb-column.toyagain
+
+$A%N$B!<$A%D$(G]s$AAP$(Gs((B (http://tsuruo.dominohosting.biz/members/tsuruo/)
+     lotusex.news lotusex.library lotusex.operation lotusex.primer
+     lotusex.tips lotusex.practical lotusex.qanda lotusex.lounge
+     lotusex.bbs
+
+$A#@(BIT$A%U%)$B!<$A%i%`(B (http://www.atmarkit.co.jp)
+     atmarkit.news atmarkit.fwin2k atmarkit.fdotnet atmarkit.fsys
+     atmarkit.fxml atmarkit.fdb atmarkit.flinux atmarkit.fnetwork
+     atmarkit.fjava atmarkit.fsecurity atmarkit.farc atmarkit.fbiz
+     atmarkit.fwcr atmarkit.jibun
+
+TeX Q&A $(I6-$AJ>0e(B (http://www.matsusaka-u.ac.jp/~okumura/texfaq/qa/)
+     texfaq.qanda
+
+X51.org (http://x51.org/)
+     x51.anima x51.art x51.auction x51.blow x51.cabal x51.crime
+     x51.disaster x51.edge x51.enema x51.ghost x51.homme x51.info
+     x51.life x51.love x51.media x51.medical x51.military
+     x51.northkorea x51.oparts x51.phallic x51.psychics x51.religion
+     x51.science x51.top x51.ufo x51.uma x51.xfiles
+
+eXperts Connection (eXConn) (http://www.exconn.net/)
+     exconn.news
+
+MSDN (http://msdn.microsoft.com/)
+     msdn.all msdn.netframework msdn.architecture msdn.asp.net
+     msdn.data msdn.longhorn msdn.mobility msdn.subscriptions
+     msdn.msdntv msdn.office msdn.security msdn.sql msdn.theshow
+     msdn.vbasic msdn.vcsharp msdn.visualc msdn.vfoxpro msdn.vjsharp
+     msdn.vstudio msdn.vs2005 msdn.webservices msdn.embedded msdn.xml
+     msdn.japan.msdn msdn.japan.msdn-us
+
+Haiku OS (http://haiku-os.org/)
+     haiku-os.news haiku-os.forums haiku-os.newsletters
+
+Foundation for a Free Information Infrastructure (http://www.ffii.org/)
+     ffii.en.software-patents ffii.en.software-patents.ffii
+     ffii.en.information-infrastructure ffii.en.project
+     ffii.de.software-patente ffii.de.software-patente.ffii
+     ffii.de.informations-infrastruktur ffii.fr.brevets-logiciels
+     ffii.fr.brevets-logiciels.ffii ffii.nl.softwarepatenten
+     ffii.nl.softwarepatenten.ffii
+
+
+
+File: emacs-w3m-ja.info, Node: Shimbun Basics, Prev: Shimbun Sites, Up: Shimbun Library
+
+$APB$(GjL$A%b%8%e$B!<$A%k$NWw$j7=(B
+======================
+
+`Shimbun' $B$O(B emacs-w3m $B$NIUB0%i%$%V%i%j$G!"(BGnus $B$d(B Wanderlust$B!"(BMew $B$J$I(B
+$B$N(B MUA $B$rMxMQ$7!"%&%'%V%3%s%F%s%D$r%a!<%k$HF1$8%f!<%6%$%s%?!<%U%'!<%9$G(B
+$BFI$`$3$H$r2DG=$K$9$k$b$N$G$9!#$3$3$G$O(B `shimbun' $B%b%8%e!<%k$r:n@.$9$kE5(B
+$B7?E*$JJ}K!$r@bL@$7$^$9!#(B
+
+* Menu:
+
+* Overview::                    $B35N,(B
+* Getting web page and header information::  $B%&%'%V%Z!<%8$N%=!<%95Z$S%X%C%@>pJs$r<hF@$9$k(B
+* Displaying an article::       $B5-;v$NI=<((B
+* Inheriting shimbun module::   shimbun $B%b%8%e!<%k$N7Q>5(B
+* Making text/plain articles::  text/plain $B$N5-;v$r:n$k$K$O(B
+* Zenkaku to hankaku conversion:: $BA43QJ8;z$rH>3QJ8;z$KJQ49$9$k(B
+* Coding convention of Shimbun:: $B%3!<%G%#%s%05,Ls(B
+
+
+
+File: emacs-w3m-ja.info, Node: Overview, Next: Getting web page and header information, Prev: Shimbun Basics, Up: Shimbun Basics
+
+$A8EBT(B
+----
+
+`http://www.foobar.net' $B$N%3%s%F%s%D$r1\Mw$9$k?7$?$J(B `shimbun' $B%b%8%e!<(B
+$B%k(B `foobar' $B$r:n@.$9$k$H$7$F!"$^$::G=i$K5.J}$,$7$J$l$P$J$i$J$$$3$H$O!"(B
+`sb-foobar.el' $B$NKAF,$K(B
+
+     (require 'shimbun)
+     (luna-define-class shimbun-foobar (shimbun) ())
+
+$B$N$h$&$J@k8@$rF~$l$F$*$/$3$H$G$9!#=y!9$KJ,$+$k$H;W$$$^$9$N$G!":#$O$*$^(B
+$B$8$J$$$H;W$C$F$*$$$F$/$@$5$$!#Cm0U$9$Y$-$3$H$O!"(B`shimbun' $B%b%8%e!<%k$r(B
+$BF~$l$k%U%!%$%kL>$N(B `sb-foobar.el' $B$N(B `foobar' $B$NL>A0$H!"(B
+`luna-define-class' $B$NBh0l0z?t$N(B `shimbun-foobar' $B$N(B `foobar' $B$NL>A0$O(B
+$B9g$o$;$F$*$/I,MW$,$"$k$3$H$G$9!#(B
+
+`Shimbun' $B%b%8%e!<%k(B `shimbun-foobar' $B$,$3$J$9$Y$-;E;v$OBg$-$/;M$D$"$j(B
+$B$^$9(B ($B$"$J$?$,(B Gnus $B$N%f!<%6$J$i$P!"!V%U%)%k%@!W$r!V%0%k!<%W!W$KFI$_49(B
+$B$($F$/$@$5$$(B):
+
+  1. MUA $B$,(B `foobar' $B%U%)%k%@$r3+$$$?$i!"5-;v$NI8Bj$J$I$r%j%9%H%"%C%W$9(B
+     $B$k$?$a$K(B `http://www.foobar.net' $B$+$i%&%'%V%Z!<%8$N%=!<%9$r<hF@$9(B
+     $B$k$3$H!#(B
+
+  2. $B<hF@$7$?%&%'%V%Z!<%8$N%=!<%9$KBP$7!"5-;v$N8+=P$7$KI,MW$J$$$/$D$+$N(B
+     $B>pJs$H$H$b$K<hF@$7$F!"(B`headers' $B$H$$$&%j%9%H$KBeF~$7$FJV$9$3$H!#(B
+
+  3. MUA $B$,(B `foobar' $B%U%)%k%@$N5-;v$N1\Mw$rMW5a$7$?$i!"<B:]$N5-;vFbMF$r(B
+     $B5-:\$7$?%&%'%V%Z!<%8$N%=!<%9$r(B ($BNc$($P(B
+     `http://www.foobar.net/030530.html' $B$+$i(B) $B<hF@$9$k$3$H!#(B
+
+  4. `http://www.foobar.net/030530.html' $B$+$i<hF@$7$?%&%'%V%Z!<%8$N%=!<(B
+     $B%9$r!"I,MW$K1~$81\Mw$7$d$9$$$h$&$K@07A$9$k$3$H!#(B
+
+$B:G=i$N:n6H$O(B `shimbun.el' $B$N(B `shimbun-headers' $B$,!"FsHVL\$N:n6H$O(B
+`shimbun-get-headers' $B$,C4Ev$7$^$9!#$=$7$F;0HVL\$N:n6H$O(B
+`shimbun-article' $B$,!":G8e$N:n6H$O(B `shimbun-make-contents' $B$,C4Ev$7$^$9!#(B
+
+`shimbun.el' $B$NCf$r$4Mw$/$@$5$$!#(B`defun' $B$K$h$k4X?tDj5A$NB>$K!"(B
+$B8+47$l$J$$(B `luna-define-generic', `luna-define-method' $B$J$I$N(B
+$B@k8@$,$"$j$^$9$h$M!#$I$&$b;HMQJ}K!$O(B `defun' $B$N$=$l$H;w$F$$$k$h$&$G(B
+$B$9!#$=$7$F!"A0<T$O2?$@$+(B doc-string $B$@$1$r=q$$$F$"$k$h$&$G!"F1L>$N%7%s%\(B
+$B%k$K$D$$$F8e<T$K$h$C$F:FEY@k8@$7$F$$$k$h$&$K8+$($^$9!#99$K!"$"$k%7%s%\%k(B
+$B$K$D$$$F!"(B`luna-define-generic' $B$N@k8@$@$1$,$"$C$F!"(B
+`luna-define-method' $B$N@k8@$,$J$$$b$N$b$"$j$^$9!#(B
+
+$B<B$O!"(B`shimbun.el' $B5Z$S3F(B `shimbun' $B%b%8%e!<%k$O!"(BEmacs Lisp $B$K$F%*%V%8%'(B
+$B%/%H;X8~%W%m%0%i%_%s%0$r2DG=$H$9$k(B `luna.el' (1) (*Note
+Overview-Footnotes::) $B$rMxMQ$7$F=q$+$l$F$$$^$9!#(B
+
+`shimbun.el' $B$NCf$G$O!"(B`shimbun-headers' $B$,$"$k(B URL $B$N%&%'%V%Z!<%8$N%=!<(B
+$B%9$r<hF@$7!"(B`shimbun-get-headers' $B$,$=$N%&%'%V%Z!<%8$N%=!<%9$+$iI8Bj$J(B
+$B$I$rH4$-=P$7(B... $B$H$$$&A0=R$N<j=g$,%O!<%I%3!<%G%#%s%0$5$l$F$$$^$9!#$7$+(B
+$B$7!"7h$aBG$A$9$k$@$1$G$O!"@i:9K|JL$N%&%'%V%Z!<%8$N%=!<%9$r!"$=$N9=B$$K(B
+$B9g$o$;$FJQ2=$5$;$k$3$H$,$G$-$^$;$s!#(B
+
+$B$=$3$G(B `luna' $B$K$h$j!"%a%=%C%I$,%3!<%k$5$l$k<j=g$@$17h$a$F$*$$$F!"(B
+`shimbun' $B$K$h$jJQ2=$5$;$k$Y$-%a%=%C%I$N<BBNDj5A$r3F(B `shimbun' $B%b%8%e!<(B
+$B%k$KG$$;$F$$$k$N$G$9!#3F(B `shimbun' $B%b%8%e!<%k$G6&DL$G;H$($=$&$J%a%=%C%I(B
+$B$O(B `shimbun.el' $B$NCf$K%a%=%C%I$N<BBN$bDj5A$7$F$"$j$^$9$,!"$=$l$9$i3F(B
+`shimbun' $B%b%8%e!<%k$K$*$$$F:FDj5A$r$9$k$3$H$,2DG=$G$9!#(B
+
+$B$b$&$*J,$+$j$N$h$&$K!"(B`luna-define-generic' $B$O!"8@$o$P]W$@$1$N@k8@!"(B
+`luna-define-method' $B$O(B `shimbun' $B%b%8%e!<%kKh$K:n@.$G$-$k<BBN$N@k8@!#(B
+$B$=$7$F(B `sb-foobar.el' $B$NKAF,$KF~$l$?(B `luna-define-class' $B$G$N@k8@$O!"(B
+`luna' $B>e$G$N?7$?$J%/%i%9$N@k8@$@$C$?$o$1$G$9!#(B
+
+
+File: emacs-w3m-ja.info  Node: Overview-Footnotes, Up: Overview
+
+(1) FLIM $A$K:,$^$l$F$$$^$9!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Getting web page and header information, Next: Displaying an article, Prev: Overview, Up: Shimbun Basics
+
+$A%&%'%V%Z$B!<$A%8$N%=$B!<$A%9<0$S%X%C%@Gi$(G^^$A$rH!5C$9$k(B
+--------------------------------------------
+
+$B$^$:5-;v8+=P$7$r<hF@$9$kBP>]$H$J$k%&%'%V%Z!<%8$r7h$a$k$3$H$+$i;O$a$^$9!#(B
+$B%U%l!<%`I=<($5$l$F$$$k>l9g$O!"%U%l!<%`$NCf$GI,MW$J%Z!<%8$@$1$rC1FH$G;X(B
+$B$7<($9(B URL $B$rFCDj$9$k$Y$-$G$9!#FCDj$G$-$?$i!"?7$?$K:n@.$9$k(B `shimbun'
+$B%b%8%e!<%k$NCf$G(B `luna-define-method' $B$r;H$$!"(B`shimbun-index-url' $B$NDj(B
+$B5A$r:n@.$7$^$7$g$&!#C1=c$K(B URL $B$rJV$9$h$&$K$9$l$PNI$$$G$9$h!#8e$G@bL@$7(B
+$B$^$9$N$G!"JQ?t(B `shimbun-foobar-groups' $B$bMQ0U$7$F$*$-$^$7$g$&(B (1)
+(*Note Getting web page and header information-Footnotes::)$B!#(B
+
+     (defvar shimbun-foobar-url "http://www.foobar.net")
+
+     (luna-define-method shimbun-index-url ((shimbun shimbun-foobar))
+       shimbun-foobar-url)
+
+     (defvar shimbun-foobar-groups '("news"))
+
+`shimbun-headers' $B%a%=%C%I$O(B `shimbun.el' $B$NCf$K4{$KDj5A$5$l$F$$$^$9$+(B
+$B$i!"(B`sb-foobar.el' $B$G(B `shimbun-index-url' $B%a%=%C%I$NDj5A$r:n@.$9$l$P%&%'(B
+$B%V%Z!<%8$N%=!<%9$N<hF@$,$G$-$k$h$&$K$J$j$^$9!#(B`shimbun-headers' $B$O%&%'(B
+$B%V%Z!<%8$N%=!<%9$r<hF@$7$?8e!"(B`shimbun-get-headers' $B%a%=%C%I$r8F$S!"%X%C(B
+$B%@>pJs$N<}=8$KF~$j$^$9!#(B`shimbun.el' $B$NCf$K$O(B `shimbun-get-headers' $B$N(B
+$B%a%=%C%I@k8@$,$"$j$;$s$+$i!"(B`sb-foobar.el' $B$NCf$GFH<+$K%a%=%C%I$r:n@.$7(B
+$B$J$1$l$P$J$j$^$;$s!#(B
+
+`sb-foobar.el' $B$K(B `shimbun-get-headers' $B$N%a%=%C%I$r:n@.$9$k$?$a$K!"<h(B
+$BF@$7$?%Z!<%8$N%=!<%9$rJ,@O$7$^$7$g$&!#$I$N$h$&$J@55,I=8=$G5-;v$N%X%C%@(B
+$B>pJs$r<}=8$9$k$+$r8!F$$7$^$9!#5-;v$N8+=P$7$H$7$FFC$KI,MW$J>pJs$O!"I8Bj!"(B
+$BF|IU!":n@.<T!"$=$N5-;v$N(B URL$B!"$=$7$F(B `message-id' $B$G$9!#$3$l$i$N>pJs$O!"(B
+$B$=$l$>$l$N(B MUA $B$K$*$$$F!"(BSubject, Date, From, Xref, Message-ID $B$H$7$FI=(B
+$B<($5$l$^$9!#Nc$($P!"2<5-$N(B
+
+     <a href="030530.html">5$B7n(B30$BF|$NOCBj(B($BEj9F<T(B-$B$_$-$*(B &lt;foo@bar.net&gt;)</a>
+
+$B$N$h$&$J9T$r=8$a$F5-;v$K$7$?$$$N$G$7$?$i!"(B
+
+     "<a href=\"\\(\\([0-9][0-9][0-9][0-9]\\)[0-9][0-9]\\.html\\)\">\\([^<(]+\\)($BEj9F<T(B-\\([^<]+\\))<\/a>"
+
+$B$N$h$&$J@55,I=8=$K$J$k$G$7$g$&!#$=$7$F5-;v$N(B Xref $B$NCM$O(B
+`(match-string 1)' $B$G<hF@$G$-$^$9!"(BDate $B$O(B
+`(match-string 2)' $B$NCM$r2C9)$9$l$PNI$$$G$7$g$&!#(BSubject $B$O(B
+`(match-string 3)' $B$G<hF@$G$-$^$9$M!#(BFrom $B$O(B
+`(match-string 4)' $B$r2C9)$9$l$PNI$$$G$7$g$&!#$3$l$i$NCM(B
+$B$O(B MUA $B$G8+0W$$$h$&$K99$K2C9)$7$F$b9=$$$^$;$s!#(B
+
+$B>e5-$N$h$&$K5-;v$N(B URL $B$,AjBP%Q%9I=<($5$l$F$$$k>l9g$O!"(B
+`shimbun-expand-url' $B$r;HMQ$7!"@dBP%Q%9I=<($KJQ99$7$F$+$i%X%C%@$K<}$a$^(B
+$B$7$g$&!#5-;v$N(B URL $B$,%X%C%@$N(B URL $B$HF1$8!"$D$^$j5-;vKh$K8DJL$K(B URL $B$r;}(B
+$B$?$J$$9=B$$N%&%'%V%Z!<%8$b$"$j$^$9!#$3$N>l9g$O>/$7$d$C$+$$$G!"%X%C%@>p(B
+$BJs<hF@$NCJ3,$G!"5-;v$NFbMF$b<hF@$7$F$*$-!"(BEmacs $B$N%a%b%j$K<}$a$F$*$/I,(B
+$BMW$,$"$j$^$9!#6qBNE*$K$O(B `sb-palmfan.el', `sb-dennou.el', `sb-tcup.el'
+$B$N(B `shimbun-headers' $B%a%=%C%I$NDj5A$r;2>H$7$F$/$@$5$$!#(B
+
+$B%&%'%V%Z!<%8$K$h$C$F$O(B Date $B$,FCDj$G$-$J$$$b$N$,$"$j$^$9!#$=$&$$$&>l9g(B
+$B$OL5M}$KFCDj$;$:$H$b(B `""' $B$rF~$l$F$*$1$P(B OK $B$G$9!#5-;v$NFbMF$r8+$F=i$a(B
+$B$F(B Date $B$,FCDj$G$-$k$J$i!"(B`shimbun-make-contents' $B%a%=%C%I$NCf$G2~$a$F(B
+$B%X%C%@$K(B Date $B$N>pJs$rF~$l$F$b(B OK $B$G$9!#$=$l$+$i!"(BFrom $B$r7h$aBG$A$7$F$b(B
+$BNI$$>l9g$b$"$j$^$9!#(B
+
+`message-id' $B$N:n@.$K$OCm0U$rMW$7$^$9!#0lIt$N5-;v$,FI$a$J$+$C$?$j$7$^$9(B
+$B$N$G(B (2) (*Note Getting web page and header information-Footnotes::)$B!"(B
+$BI,$:C10l@-(B (uniqueness) $B$rJ]>Z$7$J$1$l$P$J$j$^$;$s!#F|IU$d%I%a%$%s!"$=(B
+$B$N%Z!<%8$N(B URL $B$N0lIt$r;H$C$FJ8;zNs$r@8@.$9$k$3$H$GC10l@-$r3NJ]$7$^$7$g(B
+$B$&!#$=$NB>!"(B`message-id' $B$N0lIt$KI,$:(B `@' $B$r4^$a$k$h$&$K$7!"5U$K(B `:' $B$O(B
+$B4^$^$J$$$h$&$K$7$^$7$g$&!#$3$N%k!<%k$r<i$i$J$$$H%$%s%i%$%s2hA|$,$-$A$s(B
+$B$H=PNO$5$l$^$;$s$h!#>\$7$/$O(B RFC2387, RFC822 $B$r;2>H$7$F$/$@$5$$!#(B
+
+$B6lO+$7$F<hF@$7$?$3$l$i$N>pJs$O(B `shimbun-create-header' $B$H$$$&4X?t$rMxMQ(B
+$B$7$F%X%C%@$K<}$a$^$9!#(B
+
+$B7k6I(B `sb-foobar.el' $B$NCf$G$N(B `shimbun-get-headers' $B$NDj5A$N9|AH$_$O$3$s(B
+$B$JIw$K$J$j$^$9$M!#(B
+
+     (luna-define-method shimbun-get-headers ((shimbun shimbun-foobar)
+                                              &optional range)
+       (let ((regexp "....")
+             subject from date id url headers)
+         ...
+         (catch 'stop
+           (while (re-search-forward regexp nil t nil)
+             ...
+             (when (shimbun-search-id shimbun id)
+               (throw 'stop nil))
+             (push (shimbun-create-header
+                    0 subject from date id "" 0 0 url)
+                   headers)))
+         headers))
+
+$B$J$*!"$3$N%a%=%C%I$NCf$G$O(B `shimbun' $B$H$$$&0l;~JQ?t$G!"(B`shimbun' $B%b%8%e!<(B
+$B%k(B `shimbun-foobar' $B$N%$%s%9%?%s%9$K%"%/%;%9$G$-$^$9!#(B
+
+$B$H$3$m$G!"@hDxJ]N1$K$7$?JQ?t(B `shimbun-foobar-groups' $B$K$D$$$F@bL@$7$^$7$g(B
+$B$&!#(B
+
+$B2>$K(B `http://www.foobar.net' $B$NCf$KFI$_$?$$5-;v%0%k!<%W$,Fs$D$"$C(B
+$B$F!"$=$l$>$l$N5-;v$N%X%C%@>pJs$rF@$k%&%'%V%Z!<%8$,JL!9$N>l=j$K$"$C$?$H$7(B
+$B$^$7$g$&!#(B`http://www.foobar.net/whatsnew/index.hmtl' $B$K%5%$%H(B
+$B$N99?7>pJs$,!"(B`http://www.foobar.net/ml/index.html' $B$K(B ML $B$N5-(B
+$B;v%"!<%+%$%V$N0lMw$,$"$k$H$-$J$I$G$9!#$3$&$$$&>l9g$O!"(B`shimbun' $B%b(B
+$B%8%e!<%k(B `foobar' $B$N%0%k!<%W$H$7$F!"(B`foobar.whatsnew',
+`foobar.ml' $B$H$7$F%"%/%;%9$G$-$k$HJXMx$G$9$h$M!#$=$&$$$&>l9g$O2<5-(B
+$B$N$h$&$K$7$F$_$^$7$g$&!#(B
+
+     (defvar shimbun-foobar-url "http://www.foobar.net")
+
+     (defvar shimbun-foobar-group-path-alist
+       '(("whatsnew" . "/whatsnew/index.html")
+         ("ml" . "/ml/index.html")))
+
+     (defvar shimbun-foobar-groups
+       (mapcar 'car shimbun-foobar-group-path-alist))
+
+     (luna-define-method shimbun-index-url ((shimbun shimbun-foobar))
+       (concat shimbun-foobar-url
+               (cdr (assoc (shimbun-current-group-internal shimbun)
+                           shimbun-foobar-group-path-alist))))
+
+$B8=:_%f!<%6$,%"%/%;%9$7$F$$$k%0%k!<%W$K$O(B
+`shimbun-current-group-internal' $B$r;H$($PJ,$+$j$^$9!#(B
+`shimbun-get-headers' $B$J$I$G$b%0%k!<%W$,0c$($P:n6HFbMF$,0c$C$F$/$k2DG=(B
+$B@-$b$"$j$^$9$M!#(B
+
+$B$J$*!"(B`shimbun' $B%b%8%e!<%k0l$D$K$D$-!":GDc$G$b0l$D$N%0%k!<%W$,I,MW$G$9!#(B
+$B%0%k!<%W$NL>A0$N7h$aJ}$KFC$K7h$^$j$O$"$j$^$;$s$,!"%0%k!<%WL>$KG:$s$@$i!"(B
+`news' $B$H$+(B `main' $B$J$I$HIU$1$F$*$-$^$7$g$&!#(B
+
+
+File: emacs-w3m-ja.info  Node: Getting web page and header information-Footnotes, Up: Getting web page and header information
+
+(1) `Shimbun' $A%b%8%e$B!<$A%kR;$D$K$D$-!"Wn5M$G$bR;$D$N%0%k$B!<$A%W$,1XR*$G(B
+$A$9!#(B
+
+(2) shimbun $A$NR;2?$N$(GX4$AJB$,$BFI$A$a$J$$$@$1$J$i$^$@$7$b!"OBJV$K(B
+`message-id' $A$rWw3I$9$k$H!"$(Gb8$A7=$,J\$(Gkk$A$9$k4sJB$J%a$B!<$A%k$N$=$l$H$+$A(B
+$A:O$C$F$7$^$$!"$=$N%a$B!<$A%k$,$BFI$A$a$J$/$J$k?ID\PT$9$i$"$j$^$9!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Displaying an article, Next: Inheriting shimbun module, Prev: Getting web page and header information, Up: Shimbun Basics
+
+$(GX4$AJB$N1mJ>(B
+----------
+
+`shimbun.el' $B$KDj5A$5$l$?(B `shimbun-article' $B%a%=%C%I$O!"%X%C%@>pJs$+$i(B
+Xref $B$r<h$j=P$7!"$=$N(B URL $B$N%&%'%V%Z!<%8$N%=!<%9$r<hF@$7$?8e$K!"$=$N%=!<(B
+$B%9$rF~$l$?%o!<%-%s%0%P%C%U%!$NCf$G(B `shimbun-make-contents' $B$r8F$S$^$9!#(B
+$B6qBNE*$J5-;v$N2C9)$O(B `shimbun-make-contents' $B$N;E;v$G$9!#(B
+
+$B5-;v$H$J$k%&%'%V%Z!<%8$N%=!<%9$,!"$I$P$C$H%o!<%-%s%0%P%C%U%!$K$V$A$^$1(B
+$B$i$l$F$$$k$HA[A|$7$F$/$@$5$$!#(B`shimbun.el' $B$NI8=`$N(B
+`shimbun-make-contents' $B$O!"$=$N%P%C%U%!$N@hF,$K$^$:%X%C%@>pJs$rA^F~$7!"(B
+$B$=$ND>8e$K(B `<html>' $B$d(B `<body>' $B$J$I$r!"$^$?!"%P%C%U%!$NKvHx$K(B
+`</body>', `</html>' $B$rA^F~$7$F$/$l$^$9!#$=$&$d$C$F(B HTML $B%a!<%k$H$7$FI=(B
+$B<($5$;$k$N$G$9!#(B
+
+     HTML $B$N5-;v$@$1$G$J$/!"(B`text/plain' $B7A<0$N5-;v$,@8@.$5$l$k$h$&$K$9(B
+     $B$k$3$H$b$G$-$^$9!#(B*Note Making text/plain articles::.
+
+$B5-;v$r2?$b2C9)$9$kI,MW$,$J$1$l$P(B `sb-foobar.el' $B$NCf$G$O(B
+`shimbun-make-contents' $B$K$D$$$F?7$?$KDj5A$9$kI,MW$O$"$j$^$;$s!#(B
+
+$BC1=c$K5-;v$NA08e$K<N$F$?$$ItJ,$,$"$k$@$1$J$i$P!"(B
+`shimbun-foobar-content-start', `shimbun-foobar-content-end' $B$K<N$F$?$$(B
+$BItJ,$r8!:w2DG=$J@55,I=8=$r;XDj$7$F$*$-$^$7$g$&!#(B
+
+     (defvar shimbun-foobar-content-start "^<body>$")
+     (defvar shimbun-foobar-content-end "^<\/body>$")
+
+$BI8=`$N(B `shimbun-make-contents' $B$+$i8F$S=P$5$l$?(B
+`shimbun-clear-contents' $B$O!"$3$l$i$N@55,I=8=$rMxMQ$7$F!"(B`point-min' $B$+(B
+$B$i(B `shimbun-foobar-content-start' $B$^$G!"(B`shimbun-foobar-content-end' $B$+(B
+$B$i(B `point-max' $B$^$G$r@Z$j<N$F$F$/$l$^$9$h!#C"$7!"$3$l$iFs$D$N%^%C%A$O$$(B
+$B$:$l$+$,@.8y$7$J$$$H@Z$j<N$F$O9T$o$l$^$;$s$N$GCm0U$,I,MW$G$9!#(B
+
+$B9-9p$J$I$NITMW$J>pJs$,$"$C$F!"$=$l$r:Y$+$/8!:w$7$F<N$F$?$$>l9g$O!"(B
+`sb-foobar.el' $B$NCf$GFH<+$N(B `shimbun-clear-contents' $B$rDj5A$7$F$*$-$^$9!#(B
+
+     (luna-define-method shimbun-clear-contents :around ((shimbun shimbun-foobar)
+                                                         header)
+       ;; cleaning up
+       (while (re-search-forward "..." nil t nil)
+         (delete-region (match-beginning 0) (match-end 0)))
+       (luna-call-next-method))
+
+$B$h$j6qBNE*$JJ}K!$O!"(B`sb-ibm-dev.el' $B$,;29M$K$J$k$+$b$7$l$^$;$s!#(B
+
+$B@hDx!"(B*Note Getting web page and header information:: $B$N@a$G!"5-;vKh$K(B
+$B8DJL$K(B URL $B$r;}$?$J$$9=B$$N%&%'%V%Z!<%8$N>l9g!"%X%C%@>pJs<hF@$NCJ3,$G!"(B
+$B5-;v$NFbMF$b<hF@$7$F$*$-!"(BEmacs $B$N%a%b%j$K<}$a$F$*$/I,MW$,$"$k$H?=$7>e(B
+$B$2$^$7$?!#$3$N>l9g!"(B`shimbun-article' $B$G$O>e5-$N$h$&$J(B Xref $B>pJs$+$i$N(B
+web page $B$N<hF@$OI,MW$K$J$j$^$;$s$N$G!"$?$@(B Emacs $B$N%a%b%j$+$i<h$j=P$7(B
+$B$F!"%P%C%U%!$K@07A$7$FA^F~$9$l$PB-$j$^$9!#6qBNE*$K$O(B `sb-palmfan.el',
+`sb-dennou.el', `sb-tcup.el' $B$N(B `shimbun-article' $B%a%=%C%I$NDj5A$r;2>H(B
+$B$7$F$/$@$5$$!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Inheriting shimbun module, Next: Making text/plain articles, Prev: Displaying an article, Up: Shimbun Basics
+
+Shimbun $A%b%8%e$B!<$A%k$N$(ICc$A3P(B
+------------------------
+
+$B%a!<%j%s%0%j%9%H%^%M!<%8%c(B ($B%"!<%+%$%P(B) $B$H$7$FM-L>$J$b$N$,$$$/$D$+$"$j(B
+$B$^$9!#(B
+
+   * Mailman The GNU Mailing List Manager. $B0JA0$O(B `pipermail' $B$H8F$P$l(B
+     $B$F$$$^$7$?!#>\:Y$O(B
+     `http://www.gnu.org/software/mailman/index.html' $B$r$4Mw$/$@$5$$!#(B
+
+   * MHonArc$B>\:Y$O(B `http://www.oac.uci.edu/indiv/ehood/mhonarc.html' $B$r(B
+     $B$4Mw$/$@$5$$!#(B
+
+   * fml fml mailing list server/manager.  $B>\:Y$O(B
+     `http://www.fml.org/software/fml/' $B$r$4Mw$/$@$5$$!#(B
+
+   * mailarc$B>\:Y$O(B `http://cvs.namazu.org/mailarc/' $B$r$4Mw$/$@$5$$!#(B
+
+$B5.J}$,(B *Note Getting web page and header information:: $B$N%9%F%C%W$G<hF@(B
+$B$7$?%&%'%V%Z!<%8$N%=!<%9$rJ,@O$7$F$$$k$H$-$K!"$=$N%=!<%9$NCf$K$3$l$i%a!<(B
+$B%j%s%0%j%9%H%^%M!<%8%c$NL>A0$r8+$D$1$?$i(B (1) (*Note Inheriting shimbun
+module-Footnotes::)$B!"$=$l$O$9$4$/%i%C%-!<$J$3$H$G$9!#(B`sb-mailman.el',
+`sb-mhonarc.el', `sb-fml.el', `sb-mailarc.el' $B$K4{$K(B
+`shimbun-get-headers' $B$J$I$NI,MW$J%a%=%C%I$,Dj5A$5$l$F$$$^$9!#$3$l$i$r(B
+$BMxMQ$7$F$J$*B-$j$J$$ItJ,$@$1$N:9J,%W%m%0%i%_%s%0$r$9$l$P!"5.J}$N(B
+`sb-foobar.el' $B$OAaB.F0$-$^$9!#(B
+
+$BNc$($P(B `sb-mailman.el' $B$rMxMQ$9$k$J$i(B `sb-foobar.el' $B$NKAF,$O!"(B
+
+     (require 'sb-mailman)
+     (luna-define-class shimbun-foobar (shimbun-mailman) ())
+
+$B$3$s$JIw$K$J$j$^$9!#$3$l$G(B `shimbun' $B%b%8%e!<%k(B `shimbun-foobar' $B$O(B
+`shimbun-mailman' $B%/%i%9$r7Q>5$7(B (2) (*Note Inheriting shimbun
+module-Footnotes::)$B!"(B`shimbun-foobar' $B$NCf$G$O!"(B`sb-mailman.el' $B$NCf$G(B
+$BDj5A$5$l$F$$$k%a%=%C%I$,I8=`$G;HMQ$5$l$k$3$H$H$J$j$^$9(B ($B99$K%a%=%C%I$N(B
+$B0lIt$r>e=q$-$9$k$3$H$b2DG=$G$9(B)$B!#(B
+
+`sb-mailman.el' $B$r<B:]$KMxMQ$7$?%5%s%W%k$H$7$F!"(B`sb-pilot-mailsync.el'
+$B$J$I$r$4Mw$/$@$5$$!#G!2?$K3Z$,$G$-$k$+$,$*J,$+$j$K$J$k$G$7$g$&!#(B
+
+$B5$$rIU$1$k$3$H$,0l$D$"$k$H$9$l$P!"$3$l$i$N%a!<%j%s%0%j%9%H%^%M!<%8%c$N(B
+$BCf$K$OCO0h2=(B (localize) $B$5$l$F!"Nc$($PF|IUI=<($rF|K\8l$G9T$&$h$&$K2~B$(B
+$B$5$l$F$$$k$b$N$,$"$k$3$H$G$9!#(B`sb-mailman.el', `sb-mhonarc.el',
+`sb-fml.el', `sb-mailarc.el' $B$O$$$:$l$bI8=`$N!"1Q8lHG$N$b$N$KBP1~$7$F$$(B
+$B$^$9!#$3$l$iCO0h2=$5$l$?%a!<%j%s%0%j%9%H%^%M!<%8%c$rMxMQ$7$F$$$k%&%'%V(B
+$B%5%$%H$r(B `shimbun' $B$GFI$_$?$$$H$-$O!"$$$/$D$+$N%a%=%C%I$r>e=q$-$7$J$1$l(B
+$B$P$J$i$J$$$+$b$7$l$^$;$s!#(B
+
+
+File: emacs-w3m-ja.info  Node: Inheriting shimbun module-Footnotes, Up: Inheriting shimbun module
+
+(1) $A%&%'%V%Z$B!<$A%8$N%=$B!<$A%9$NVP$K$3$l$i%a$B!<$A%j%s%0%j%9%H%^%M$B!<$A%8%c$NC{G0$,(B
+$A1mJ>$5$l$F$$$k$3$H$,6`$$$G$9!#(B
+
+(2) $A$D$^$j(B `shimbun-mailman' $A%/%i%9$,$(Gr5$A%/%i%9$K$J$j$^$9!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Making text/plain articles, Next: Zenkaku to hankaku conversion, Prev: Inheriting shimbun module, Up: Shimbun Basics
+
+text/plain $A$N$(GX4$AJB$rWw$k$K$O(B
+---------------------------
+
+$B$?$H$((B MUA $B$,(B HTML $B$N5-;v$rFI$`$3$H$,$G$-$k$h$&$K(B emacs-w3m $B$K$h$C$F6/(B
+$B2=$5$l$F$$$F$b!"$$$/$D$+$N>l9g$K$O(B `text/plain' $B$N5-;v$,JXMx$J$3$H$b$"(B
+$B$k$+$b$7$l$^$;$s!#(B`sb-foobar' $B%b%8%e!<%k$K(B `text/html' $B$G$O$J$/$F(B
+`text/plain' $B$N5-;v$r:n$i$;$k$K$O!"Fs$D$NJ}K!$,$"$j$^$9!#(B
+
+   * $B0l$D$O(B `sb-foobar' $B%b%8%e!<%k$K(B `sb-text' $B%b%8%e!<%k$r7Q>5$5$;$k(B
+     (*Note Inheriting shimbun module::) $B$3$H$G$9!#0J2<$O(B `sb-foobar'
+     $B%b%8%e!<%k$NKAF,$KCV$/$3$H$,$G$-$kNc$G$9!#(B
+
+          (require 'sb-text)
+          (luna-define-class shimbun-foobar (shimbun-text) ())
+
+     `sb-text' $B%b%8%e!<%k$O!"(B`text/plain' $B7A<0$G5-;v$r@8@.$9$k(B
+     `shimbun-make-contents' $B%a%=%C%I$rDs6!$7$^$9!#%F%-%9%H$@$1$N5-;v$r(B
+     $B7G<($9$k%5%$%H$r07$&(B `shimbun' $B%b%8%e!<%k$K$O!"Lr$KN)$D$G$7$g$&!#(B
+
+   * $B$b$&0l$D$O!"JQ?t(B `shimbun-foobar-prefer-text-plain' $B$rHs(B-`nil' $B$K(B
+     $B@_Dj$9$k$3$H$G$9!#$3$l$O(B `shimbun-make-contents' $B%a%=%C%I$K!"(B
+     `text/plain' $B7A<0$G5-;v$r@8@.$5$;$^$9(B ($B<B:]$K$O!"$=$l$O(B `sb-text'
+     $B%b%8%e!<%k$,Ds6!$9$k4X?t$r;H$$$^$9(B)$B!#$3$l$O!"%G%U%)%k%H$N(B
+     `shimbun-make-contents' $B$r7Q>5$9$k%b%8%e!<%k$@$1$K8z2L$,$"$k$3$H$K(B
+     $BCm0U$7$F$/$@$5$$(B ($BFC$K(B `sb-text' $B%b%8%e!<%k$r7Q>5$9$k%b%8%e!<%k$O!"(B
+     $B1F6A$5$l$^$;$s(B)$B!#$3$NJ}<0$NMxE@$O!"%f!<%6$,4JC1$K(B `text/plain' $B$N(B
+     $B5-;v$H(B `text/html' $B$N5-;v$r@Z$jBX$($k$3$H$,$G$-$k$3$H$G$9!#(B
+
+     $B$=$l$,L$Dj5A$G$"$k>l9g!"JQ?t(B `shimbun-foobar-prefer-text-plain' $B$N(B
+     $B%G%U%)%k%HCM$O(B `nil' $B$G$9!#$7$?$,$C$F!"(B`sb-asahi.el' $B$*$h$S(B
+     `sb-yomiuri.el' $B0J30$N$"$i$f$k(B `shimbun' $B%b%8%e!<%k$K$*$$$F!"$=$N(B
+     $B%G%U%)%k%HCM$O(B `nil' $B$G$9!#(B
+
+     $B2C$($F!"(Bweb $B%Z!<%8$+$i0UL#$N$"$k%F%-%9%H$r@Z$j=P$9$?$a$K!"JQ?t(B
+     `shimbun-foobar-content-start' $B$*$h$S(B
+     `shimbun-foobar-content-end' $B$NBe$o$j$K!"(B
+     `shimbun-foobar-text-content-start' $B$*$h$S(B
+     `shimbun-foobar-text-content-end' $B$r;H$&$3$H$,$G$-$^$9(B (*Note
+     Displaying an article::)$B!#A0<T$,L$Dj5A$@$C$?$i!"$=$l$i$NCM$O%G%U%)(B
+     $B%k%H$G8e<T$NCM$K$J$j$^$9!#(B
+
+$B$I$A$i$NJ}<0$r;H$&$K$7$F$b!"(B`text/plain' $B$N5-;v$O!"2hA|$d%j%s%/$J$I$r4^(B
+$B$`$3$H$,$G$-$J$$$3$H$KCm0U$7$F$/$@$5$$!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Zenkaku to hankaku conversion, Next: Coding convention of Shimbun, Prev: Making text/plain articles, Up: Shimbun Basics
+
+$AH+=GNDWV$r0k=GNDWV$K$(I+y$(G_P$A$9$k(B
+----------------------------
+
+$B!VA43Q!W$^$?$O!VA43QJ8;z!W$O!"I}$,9-$$F|K\8l$NJ8;z$r8F$V$?$a$NB/>N$G$9!#(B
+$B$^$?!VH>3Q!W$O!"DL>o$N(B ASCII $BJ8;z$N$?$a$NBP8l$G$9!#>/$J$/$H$b(B ASCII $BJ8(B
+$B;z%;%C%H$KBP1~$9$k!"A43QJ8;z$N40A4$J%;%C%H$,$"$j$^$9!#(B
+
+$B$$$/$D$+$NF|K\$N%&%'%V%5%$%H$OA43QJ8;z$rB?MQ$9$k798~$,$"$j!"$=$l$i$N5-(B
+$B;v$OI,$:$7$bFI$_0W$/$J$$$+$b$7$l$^$;$s!#$b$7$=$&46$8$?$i!"$=$l$iA43Q$N(B
+$B1Q?t;z$rH>3Q$KJQ49$9$k$3$N5!G=$r;H$&$3$H$,$G$-$^$9!#$=$l$K$O(B
+`shimbun-foobar-japanese-hankaku' $BJQ?t$r(B `t' $B$K@_Dj$7$F$/$@$5$$!#$3$3$G(B
+`foobar' $B$O!"?7J9$N5-;v$r9VFI$9$k%5!<%P!<L>$G$9!#$D$^$j!"%5!<%P!<Kh$K$=(B
+$B$&$7$J$1$l$P$J$i$J$$$H$$$&$3$H$G$9!#(B
+
+$BA43Q$+$iH>3Q$X$NJQ49$r5-;v$N%\%G%#$@$1$G9T$J$o$;$?$$$J$i$P!"(B`t' $B$NBe$o(B
+$B$j$KCM(B `body' $B$r;H$C$F$/$@$5$$!#5U$KCM(B `header' $B$^$?$O(B `subject' $B$O!"%5(B
+$B%V%8%'%/%H$@$1$G$=$l$r9T$J$&$3$H$r;XDj$7$^$9!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Coding convention of Shimbun, Prev: Zenkaku to hankaku conversion, Up: Shimbun Basics
+
+Shimbun $A%i%$%V%i%j$N%3$B!<$A%G%#%s%0$(G]=R|(B
+------------------------------------
+
+   * `shimbun.el' $B$G$O!"(Bemacs-w3m $B$N4X?t$r(B*$AWTSI$K(B*$B;H$C$FNI$$!#(B
+
+   * `sb-*.el' $B$G$O!"$3$l$^$G$HF1MM$K(B emacs-w3m $B$N4X?t$rD>@\8F$S=P$9$3(B
+     $B$H$O$7$J$$!#(B`sb-*.el' $B$GI,MW$K$J$k(B emacs-w3m $B$N4X?t$K$D$$$F$O(B
+     `shimbun.el' $B$K%9%?%V$rMQ0U$9$k!#(B
+
+   * SpeedBar $B$GMxMQ$5$l$F$$$k%U%!%$%kL>$OHr$1$J$1$l$P$J$i$J$$!#(B
+     `speedbar-0.14beta4' $B$GMQ$$$i$l$F$$$k%U%!%$%kL>$r0J2<$K<($9!#(B
+
+     sb-ant.el     sb-html.el    sb-info.el    sb-texinfo.el
+     sb-gud.el     sb-image.el   sb-rmail.el   sb-w3.el
+
+   * $B;2>H$7$F$$$k(B WEB $B%5!<%P$N(B URI $B$rO"A[$5$;$k$h$&$J%U%!%$%kL>$rA*$V$Y(B
+     $B$-$G$"$k!#$?$@$7!"[#Kf$K$J$i$J$$HO0O$G!"9qJL%3!<%I(B
+     (Ex. jp,de,uk,etc) $B$d!"AH?%%3!<%I(B (Ex. edu,com,org,net,etc)$B!"M>J,(B
+     $B$JItJ,(B (Ex. www) $B$r<h$j=|$$$F$bNI$$!#(B
+
+   * $B%0%k!<%WL>$K$O(B USENET $B$K;w$?7A<0$N$b$N$rA*$V$Y$-$G$"$k!#$9$J$o$A!"(B
+     $B%0%k!<%WL>$K$O>.J8;z$,9%$^$l$k!#$^$?!"%0%k!<%W$N3,AX9=B$$rI=$9$?$a(B
+     $B$N6h@Z$jJ8;z$H$7$F$O!"%T%j%*%I(B (.) $B$,9%$^$l$k!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Tips, Next: Mailing List, Prev: Shimbun Library, Up: Top
+
+Emacs-w3m $A$rJ9$&HwBd$?P!No$?$A(B
+******************************
+
+$BB>$N(B Emacs $B$N1~MQ5!G=$H$H$b$K(B emacs-w3m $B$rJXMx$K;H$&$?$a$N%R%s%H=8$G$9!#(B
+
+   * browse-url
+
+     `browse-url' $B$N5!G=$H$H$b$K(B emacs-w3m $B$r;H$&$3$H$,$G$-$^$9!#Nc$($P!"(B
+     $B0J2<$N9T$r(B `~/.emacs' $B%U%!%$%k$KF~$l$F$/$@$5$$(B:
+
+          (setq browse-url-browser-function 'w3m-browse-url)
+          (global-set-key "\C-xm" 'browse-url-at-point)
+
+     $B$3$&$9$k$3$H$K$h$C$F!"(BEmacs $B$N$I$N%P%C%U%!$G$b!"(BURL $B$N$h$&$JJ8;zNs$N>e(B
+     $B$G(B `C-x m' $B%-!<$r%?%$%W$9$k$H!"(Bemacs-w3m $B$,5/F0$5$l$^$9!#2C$($F!"(B
+     `C-c C-v' $B%-!<$r%?%$%W$9$k$3$H$K$h$C$F!"$^$5$KJT=8Cf$N(B HTML $B%U%!(B
+     $B%$%k$r(B emacs-w3m $B$G2<8+(B (preview) $B$9$k$3$H$,$G$-$^$9(B (HTML $B%U%!%$%k$NJT(B
+     $B=8$K!"(BEmacs $B$H(B `html-mode' $B%a%8%c!<%b!<%I$r;H$&I,MW$,$"$j$^$9(B)$B!#(B
+
+     Emacs-w3m $B$N%P%C%U%!$K$$$k$H$-$K!"(B`C-x m' $B%-!<$r%?%$%W$9$k$3$H$K(B
+     $B$h$C$F!"(Bemacs-w3m $B$NBe$o$j$KB>$N%&%'%V%V%i%&%6$r;H$$$?$$>l9g$O(B ($B$=$s$J$3(B
+     $B$H$r$7$?$$?M$,$$$k$N$+$J(B?)$B!"0J2<$N%"%I%P%$%9$r(B `~/.emacs' $B%U%!%$%k(B
+     $B$K2C$($F$/$@$5$$(B:
+
+          (defadvice browse-url-at-point
+            (around change-browse-url-browser-function activate)
+            "Use Netscape only when it is invoked in an emacs-w3m buffer."
+            (let ((browse-url-browser-function
+                   (if (eq major-mode 'w3m-mode)
+                       'browse-url-netscape
+                     'w3m-browse-url)))
+              ad-do-it))
+
+   * dired
+
+     `dired' $B$N%P%C%U%!$G(B `C-x m' $B%-!<$r%?%$%W$9$k$3$H$K$h$C$F!"(B
+     emacs-w3m $B$r;H$C$F(B HTML $B%U%!%$%k$r1\Mw$9$k$3$H$,$G$-$^$9!#(B
+     `~/.emacs' $B%U%!%$%k$G!"0J2<$N@_Dj$r;H$C$F$/$@$5$$(B:
+
+          (eval-after-load "dired"
+            '(define-key dired-mode-map "\C-xm" 'dired-w3m-find-file))
+
+          (defun dired-w3m-find-file ()
+            (interactive)
+            (require 'w3m)
+            (let ((file (dired-get-filename)))
+              (if (y-or-n-p (format "Use emacs-w3m to browse %s? "
+                                    (file-name-nondirectory file)))
+                  (w3m-find-file file))))
+
+   * hnf-mode
+
+     $B%O%$%Q!<F|5-%7%9%F%`$H(B emacs-w3m $B$r;H$C$F!":G?7$NF|5-$r8+$k$3$H$,$G$-$^(B
+     $B$9!#0J2<$N9T$r(B `~/.emacs' $B%U%!%$%k$KF~$l$F!"(B`hnf-mode' $B$N%P%C(B
+     $B%U%!$G(B `C-c C-b' $B%-!<$r%?%$%W$7$F$/$@$5$$(B:
+
+          (defun w3m-hnf-browse-url-w3m (url &optional new-window)
+            (interactive (browse-url-interactive-arg "URL: "))
+            (save-selected-window
+              (pop-to-buffer (get-buffer-create "*w3m*"))
+              (w3m-browse-url url new-window)))
+          (setq hnf-browse-url-browser-function #'w3m-hnf-browse-url-w3m)
+
+   * Gnus
+
+     $B$"$J$?$,(B Gnus $B$N%f!<%6$G!"$3$N9`$,$3$N(B Info $B$G=i$a$FFI$`%Y!<%8$G$"(B
+     $B$k$N$J$i$P!"$"$J$?$OF~$j8}$r4V0c$($^$7$?$M!#:G=i$K(B *Note Hooking
+     into MUAs:: $B$r8+$F$/$@$5$$!#(B
+
+     $B%G%U%)%k%H$G$O!"(BGnus $B$ONc$($P(B `gnus-treat-strip-banner' $B$N$h$&$J(B
+     treatment $BJQ?t$r(B `text/html' $B%Q!<%H$KE,MQ$7$^$;$s!#<+F0E*$K9T$J$o(B
+     $B$;$k$K$OFs$D$NJ}K!$,$"$j$^$9(B:
+
+          ;; $B$9$Y$F$N(B treatment $B$r(B text/html $B%Q!<%H$KE,MQ$9$k!#(B
+          (eval-after-load "gnus-art"
+            '(add-to-list 'gnus-article-treat-types "text/html"))
+
+          ;; $BFCDj$N(B treatment $B$r(B text/html $B%Q!<%H$KE,MQ$9$k!#(B
+          (setq gnus-treat-strip-banner '(or t (typep "text/html")))
+
+     $B>\$7$$$3$H$O(B *Note Customizing Articles: (gnus)Customizing
+     Articles, $B$r8+$F$/$@$5$$!#(B
+
+     $B2C$($F!"0J2<$N<B83E*$J%3!<%I$O(B `multipart/related' $B$J3($r8+$k$?$a(B
+     $B$N$b$N$G$9!#I=<($5$l$k>l=j$KFq$,$"$j$^$9!#(B
+
+          (eval-after-load "gnus-art"
+            '(or (assoc "multipart/related" gnus-mime-multipart-functions)
+                 (setq gnus-mime-multipart-functions
+                       (cons
+                        (cons
+                         "multipart/related"
+                         (byte-compile
+                          (lambda (handle)
+                            (gnus-mime-display-mixed (cdr handle)))))
+                        gnus-mime-multipart-functions))))
+
+   * yahtml-mode
+
+     Emacs-w3m $B$r;H$C$F!"(B`yahtml-mode' $B$G$^$5$KJT=8Cf$N(B HTML $B%U%!%$%k$r(B
+     $B2<8+(B (preview) $B$9$k$3$H$,$G$-$^$9!#Nc$G$9(B:
+
+          (defadvice yahtml-browse-html
+            (around w3m-yahtml-browse-html activate compile)
+            (w3m-goto-url (ad-get-arg 0) t))
+
+   * jisx0213
+
+     Emacs $B$G$O(B Mule-UCS $B%Q%C%1!<%8$K4^$^$l$F$$$k(B `jis0213' $B%b%8%e!<%k(B
+     $B$r;H$&$3$H$K$h$C$F!"(BJIS X 0213 $BJ8;z%;%C%H$r;H$&$3$H$,$G$-$^$9!#(B
+     `decode-char' $B4X?t$,(B `mucs' $B$K$h$C$F>e=q$-$5$l$F$7$^$&(B (`jis0213'
+     $B$,(B `mucs' $B$rFI$_9~$`(B) $B$?$a$K!"(B`ucs' CCS $B$KBP$7$F@5$7$/F0:n$7$J$/$J$C(B
+     $B$F$7$^$$$^$9$,!"$5$i$K(B `unicode' $B%b%8%e!<%k$rFI$_9~$`$3$H$K$h$C$F!"(B
+     $B$=$NLdBj$,2r7h$5$l$k$h$&$K8+$($k$H$$$&Js9p$,$"$j$^$7$?!#M}M3$O$^$@(B
+     $B2rL@$5$l$F$$$^$;$s!#(B`~/.emacs' $B%U%!%$%kMQ$NNc$G$9(B:
+
+          (require 'unicode)
+          (require 'un-define)
+          (require 'jisx0213)
+
+
+
+File: emacs-w3m-ja.info, Node: Mailing List, Next: Emacs-w3m Functions, Prev: Tips, Up: Top
+
+$A%a$B!<$A%j%s%0%j%9%H!"%P%0%j%]$B!<$A%H(B
+******************************
+
+Emacs-w3m $B$K4X$9$k$9$Y$F$N$3$H$,$i$rOC$79g$&$?$a$N%a!<%j%s%0%j%9%H$,MQ(B
+$B0U$5$l$F$$$^$9!#9VFI$7$F$$$J$$?M$bEj9F$G$-$^$9!#%P%0$r8+$D$1$?$j!"$3$s(B
+$B$J5!G=$,M_$7$$$J$H;W$C$?$j!"$"$k$$$O%3!<%I$r=q$-$^$7$?$H$$$&?M$O$I$&$>(B
+$BEj9F$7$F$/$@$5$$!#C1$J$k%f!<%6$@$1$l$I$b%W%m%0%i%`$K6=L#$,$"$k$H$$$&?M(B
+$B$b!"$<$R;22C$7$F$/$@$5$$!#%"%I%l%9$O0J2<$NDL$j$G$9(B:
+
+     Emacs-w3m $B%a!<%j%s%0%j%9%H(B <emacs-w3m@namazu.org>
+
+$B$b$7(B `mail-user-agent' $B$r@5$7$/F0:n$9$k$h$&$K@_Dj$7$F$"$l$P!"(B
+`report-emacs-w3m-bug' $B%3%^%s%I(B ($B$^$?$O(B `C-c C-b' $B%-!<(B) $B$r(B
+$B;H$C$F%P%0%j%]!<%H$rAw$k$3$H$b$G$-$^$9!#(B
+
+$B$3$N%j%9%H$KEj9F$9$k$H$-$O!"F|K\8l$+1Q8l$r;H$C$F$/$@$5$$!#B?$/$N%a%s%P!<(B
+$B$OF|K\?M$G$9!#Ej9F$5$l$?5-;v$O8x3+$5$l$F$$$F!"%&%'%V(B
+(`http://emacs-w3m.namazu.org/ml/') $B$d(B NetNews ($B%5!<%P(B
+`news.gmane.org' $B>e$N(B `gmane.emacs.w3m' $B$H$$$&%0%k!<%W(B) $B$G$bFI$`$3$H$,(B
+$B$G$-$^$9!#(B
+
+$B$3$N%j%9%H$N%a%C%;!<%8$r%a!<%k$G<u$1<h$j$?$$?M$O!"K\J8$K(B
+
+     subscribe ANATANO Namae
+
+$B$N$h$&$K=q$$$F(B ($B%a!<%k%"%I%l%9$G$O$J$/$F$"$J$?$NL>A0$r=q$-$^$9(B)$B!"(B
+`emacs-w3m-ctl@namazu.org' $B08$K%a!<%k$rAw$k$H%a!<%j%s%0%j%9%H$KEPO?$5$l(B
+$B$^$9!#$^$?!"%a!<%k$r<u$1<h$k$N$r$d$a$k$K$O!"K\J8$K(B
+
+     # bye
+
+$B$H=q$$$?%a!<%k$r(B `emacs-w3m-ctl@namazu.org' $B08$KAw$C$F$/$@$5$$!#(B
+
+
+
+File: emacs-w3m-ja.info, Node: Emacs-w3m Functions, Next: External Packages, Prev: Mailing List, Up: Top
+
+Emacs-w3m $A$N$(IJ=$AJ}$N$(Gf[$A$7$$$(IIf$ACw(B
+****************************
+
+
+
+
+File: emacs-w3m-ja.info, Node: External Packages, Next: Authors, Prev: Emacs-w3m Functions, Up: Top
+
+$A$*VY$(Gbf$A$N%Q%C%1$B!<$A%8$?$A(B
+**********************
+
+Emacs-w3m $B$O=aBt$J5!G=$rDs6!$7$^$9$,!"$5$i$KJXMx$K$9$k$?$a$K0J2<$N30It(B
+$B%Q%C%1!<%8$r;H$&$N$bNI$$$+$b$7$l$^$;$s!#(B
+
+   * w3m-type-ahead.el
+
+     w3m-type-ahead.el $B%Q%C%1!<%8$O(B "type ahead" $B8!:w5!G=(B (Mozilla $B%V%i(B
+     $B%&%6$KF1$8L>A0$N;w$?5!G=$,$"$j$^$9(B) $B$rDs6!$7$^$9!#$=$l$O(B isearch
+     $B$K;w$?A`:n$G%"%s%+!<$rC5$9$3$H(B ($B$?$@$77k2L$O%P%C%U%!Fb$N%"%s%+!<$K(B
+     $B8BDj$5$l$^$9(B) $B$r2DG=$K$7$^$9!#(B
+
+     w3m-type-ahead.el $B$N%@%&%s%m!<%I(B:
+     `http://alioth.debian.org/project/showfiles.php?group_id=30594'
+
+   * newsticker.el
+
+     Emacs 22 $B0J>e$GAH$_9~$^$l$F$$$k(B newsticker.el $B$O(B rss $B%U%#!<%I$d$5(B
+     $B$i$K(B atom $B%U%#!<%I$rD/$a$k$?$a$NF;6q$G$9!#0J2<$O(B emacs-w3m $B$H$H$b(B
+     $B$K(B newsticker.el $B$r;H$&$?$a$N@_DjNc$G$9(B (`~/.emacs' $B%U%!%$%k$KCV$$(B
+     $B$F$/$@$5$$(B):
+
+          (require 'w3m-load)
+          (setq newsticker-html-renderer 'w3m-region
+                browse-url-browser-function 'w3m-browse-url)
+
+     $B>\$7$/$O(B: *Note Top: (Newsticker)Top.
+
+
+
+File: emacs-w3m-ja.info, Node: Authors, Next: Index, Prev: External Packages, Up: Top
+
+$A$3$N%^%K%e%"%k$r$(GUs$A$$$?HK$?$A(B
+****************************
+
+   * $BGr0f(B $B=(9T(B
+   * $BEZ20(B $B2mL-(B
+   * $BCfEg(B $B44IW(B
+   * $BCf;3(B $BMN0l(B
+   * Romain Francoise
+   * $B;32,(B $B9nH~(B
+   * $BBgOB(B $B@5Ip(B
+   * $B@DED(B $BD>Bg(B
+
+
+
+File: emacs-w3m-ja.info, Node: Index, Prev: Authors, Up: Top
+
+$AKwR}(B
+****
+
+* Menu:
+
+* Concept Index::               $B35G0:w0z(B
+* Key Index::                   $B%-!<%P%$%s%I:w0z(B
+* Variable Index::              $BJQ?t:w0z(B
+* Function Index::              $B4X?t:w0z(B
+
+
+
+File: emacs-w3m-ja.info, Node: Concept Index, Next: Key Index, Prev: Index, Up: Index
+
+$A8EDnKwR}(B
+========
+
+* Menu:
+
+* about://antenna/:             Using Antenna.          (line   5)
+* $A%/%C%-$B!<$A$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B:       Cookie Variables.       (line   5)
+* Adding a bookmark:            Adding Bookmarks.       (line   5)
+* Adding autoload settings:     Minimal Settings.       (line  12)
+* Adding new search engines:    Adding New Search Engines.  (line   5)
+* $A$=$NK{$N$(I+y$AJ}(B:                 Other Variables.        (line   5)
+* Antenna:                      Using Antenna.          (line   5)
+* $A;-Oq$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B:           Image Variables.        (line   5)
+* APEL package:                 Other Requirements.     (line   5)
+* $AR;0c5D$J$(I+y$AJ}(B:                 General Variables.      (line   5)
+* Arrived URLs:                 Tracing History.        (line   5)
+* article expiry:               Nnshimbun.              (line 168)
+* $A%U%)$B!<$A%`$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B:       Form Variables.         (line   5)
+* $A%U%C%/(B:                       Hooks.                  (line   5)
+* auto-expire:                  Nnshimbun.              (line 168)
+* $A%V%C%/%^$B!<$A%/$K$(IJ=$(G]Y$A$7$?$(I+y$AJ}(B:   Bookmark Variables.     (line   5)
+* Bookmarks:                    Managing Bookmarks.     (line   5)
+* Browsing history:             Tracing History.        (line   5)
+* codepage-ex:                  Other Requirements.     (line   5)
+* Consulting bookmarks:         Consulting Bookmarks.   (line   5)
+* Creating new buffers:         Creating and killing buffers.  (line   5)
+* Customizing user options:     Customizable Variables.  (line   5)
+* Displaying images:            Inline Images.          (line   5)
+* Downloading files:            Downloading.            (line   5)
+* Editing bookmarks:            Editing Bookmarks.      (line   5)
+* expiry-wait:                  Nnshimbun.              (line 168)
+* expiry-wait:                  Nnshimbun.              (line 234)
+* Firewall:                     Minimal Settings.       (line  33)
+* FLIM package:                 Other Requirements.     (line   5)
+* Functions details:            Emacs-w3m Functions.    (line   5)
+* Getting started:              Getting Started.        (line   5)
+* Gifsicle program:             Other Requirements.     (line   5)
+* group parameters:             Nnshimbun.              (line  89)
+* Grouping URLs:                Grouping URLs.          (line   5)
+* ImageMagick package:          Other Requirements.     (line   5)
+* Info-like keymap:             Key Binding.            (line   5)
+* Installing emacs-w3m:         Installing Emacs-w3m.   (line   5)
+* Installing on non-UNIX-like systems: Non-UNIX-like systems.  (line   5)
+* Introduction:                 Introduction.           (line   5)
+* Key binding:                  Key Binding.            (line   5)
+* Killing buffers:              Creating and killing buffers.  (line   5)
+* Lynx-like keymap:             Key Binding.            (line   5)
+* Moving in a page:             Moving in a page.       (line   5)
+* Mule-UCS package:             Other Requirements.     (line   5)
+* nnshimbun:                    Nnshimbun.              (line   5)
+* Possible Emacs versions:      Required Emacs Version.  (line   5)
+* Proxy gateways:               Minimal Settings.       (line  33)
+* Proxy servers:                Minimal Settings.       (line  33)
+* Quick Searching:              Quick Searching.        (line   5)
+* Reading HTML mails in Gnus:   Gnus.                   (line   5)
+* Reporting bugs:               Mailing List.           (line   5)
+* rfc2368.el:                   Other Requirements.     (line   5)
+* Saving images:                Inline Images.          (line  74)
+* Search engines:               Using Search Engines.   (line   5)
+* Searching:                    The Search Interface.   (line   5)
+* Shimbun library:              Shimbun Library.        (line   5)
+* `shimbun.el':                 Shimbun Basics.         (line   5)
+* Showing the tree structure of local directories: Showing Directory Tree.  (line   5)
+* Special URLs:                 Quick Searching.        (line   5)
+* Starting up:                  Getting Started.        (line   5)
+* Startup file:                 Minimal Settings.       (line  24)
+* Subscribing to the emacs-w3m mailing list: Mailing List.  (line   5)
+* Switching buffers using the buffer list: Selecting buffers.  (line  46)
+* Switching buffers using the minibuffer: Selecting buffers.  (line  41)
+* The Antenna interface:        Daily web tracking.     (line   5)
+* Tips:                         Tips.                   (line   5)
+* Tracking changes in web pages: Using Antenna.         (line   5)
+* Using emacs-w3m as a batch command: Launching and Jumping.  (line  20)
+* Variables related to antenna: Antenna Variables.      (line   5)
+* Variables related to namazu:  Namazu Variables.       (line   5)
+* Variables related to perldoc: Perldoc Variables.      (line   5)
+* Variables related to searching the web: Search Variables.  (line   5)
+* Variables related to session manager: Session Manager Variables.  (line   5)
+* Variables related to the dtree feature: Dtree Variables.  (line   5)
+* Variables related to the octet feature: Octet Variables.  (line   5)
+* Variables related to weather information: Weather Variables.  (line   5)
+* Viewing images:               Inline Images.          (line  70)
+* w3m:                          You Need w3m.           (line   5)
+* Web Newspaper:                Nnshimbun.              (line   5)
+* Zooming images:               Inline Images.          (line  79)
+
+
+
+File: emacs-w3m-ja.info, Node: Key Index, Next: Variable Index, Prev: Concept Index, Up: Index
+
+$A%-$B!<$A%P%$%s%IKwR}(B
+================
+
+* Menu:
+
+* \:                            HTML File Information.  (line  28)
+* =:                            HTML File Information.  (line  33)
+* |:                            HTML File Information.  (line  58)
+* >:                            Moving in a page.       (line  41)
+* <:                            Moving in a page.       (line  47)
+* ]:                            Moving in a page.       (line  93)
+* [:                            Moving in a page.       (line  98)
+* }:                            Moving in a page.       (line 103)
+* {:                            Moving in a page.       (line 108)
+* ^:                            Moving over pages.      (line  46)
+* +:                            Setting up Antenna.     (line  14)
+* . (Lynx-like $A%-$B!<$A%^%C%W(B):     Moving in a page.       (line  55)
+* , (Lynx-like $A%-$B!<$A%^%C%W(B):     Moving in a page.       (line  63)
+* a:                            Adding Bookmarks.       (line   5)
+* A:                            Daily web tracking.     (line  35)
+* b:                            Moving in a page.       (line  35)
+* b:                            Moving over pages.      (line 118)
+* B (Lynx-like $A%-$B!<$A%^%C%W(B):     Moving over pages.      (line  24)
+* <backspace>:                  Moving in a page.       (line  35)
+* <backspace>:                  Moving over pages.      (line 118)
+* <backtab>:                    Moving in a page.       (line  88)
+* C-?:                          Moving in a page.       (line  35)
+* C-?:                          Moving over pages.      (line 118)
+* c (Lynx-like $A%-$B!<$A%^%C%W(B):     Launching and Jumping.  (line  97)
+* C-c C-@:                      Tracing History.        (line  61)
+* C-c C-a:                      Selecting buffers.      (line  41)
+* C-c C-n:                      Moving across buffers.  (line  28)
+* C-c C-p:                      Moving across buffers.  (line  22)
+* C-c C-s:                      Selecting buffers.      (line  46)
+* C-c C-<SPC>:                  Tracing History.        (line  61)
+* C-c C-t:                      Creating and killing buffers.  (line  19)
+* C-c C-v:                      Tracing History.        (line  65)
+* C-c C-w:                      Creating and killing buffers.  (line  25)
+* C-c M-w:                      Creating and killing buffers.  (line  29)
+* C-S-l (Info-like $A%-$B!<$A%^%C%W(B): Launching and Jumping.  (line 110)
+* C-u a:                        Adding Bookmarks.       (line   5)
+* C-u o (Info-like $A%-$B!<$A%^%C%W(B): Tracing History.        (line  53)
+* C-u s (Lynx-like $A%-$B!<$A%^%C%W(B): Tracing History.        (line  53)
+* D (Info-like $A%-$B!<$A%^%C%W(B):     Downloading.            (line  23)
+* d (Info-like $A%-$B!<$A%^%C%W(B):     Downloading.            (line  30)
+* d (Lynx-like $A%-$B!<$A%^%C%W(B):     Downloading.            (line  23)
+* D (Lynx-like $A%-$B!<$A%^%C%W(B):     Showing Directory Tree.  (line  51)
+* <DEL>:                        Moving in a page.       (line  35)
+* <DEL>:                        Moving over pages.      (line 118)
+* <down> (Lynx-like $A%-$B!<$A%^%C%W(B): Moving in a page.      (line  77)
+* e (Info-like $A%-$B!<$A%^%C%W(B):     HTML File Information.  (line  40)
+* E (Info-like $A%-$B!<$A%^%C%W(B):     HTML File Information.  (line  46)
+* E (Lynx-like $A%-$B!<$A%^%C%W(B):     HTML File Information.  (line  40)
+* e (Lynx-like $A%-$B!<$A%^%C%W(B):     HTML File Information.  (line  46)
+* g:                            Launching and Jumping.  (line  79)
+* G:                            Launching and Jumping.  (line  86)
+* H:                            Moving over pages.      (line  40)
+* I (Info-like $A%-$B!<$A%^%C%W(B):     Inline Images.          (line  31)
+* i (Info-like $A%-$B!<$A%^%C%W(B):     Inline Images.          (line  54)
+* I (Lynx-like $A%-$B!<$A%^%C%W(B):     Inline Images.          (line  70)
+* l (Info-like $A%-$B!<$A%^%C%W(B):     Moving over pages.      (line  24)
+* <left> (Lynx-like $A%-$B!<$A%^%C%W(B): Moving over pages.     (line  24)
+* M:                            HTML File Information.  (line  51)
+* M-[:                          Inline Images.          (line  81)
+* M-]:                          Inline Images.          (line  86)
+* M-a:                          Adding Bookmarks.       (line   5)
+* M-d (Lynx-like $A%-$B!<$A%^%C%W(B):   Downloading.            (line  30)
+* M-i:                          Inline Images.          (line  74)
+* M-I (Info-like $A%-$B!<$A%^%C%W(B):   Inline Images.          (line  65)
+* M-l:                          Moving in a page.       (line  69)
+* M-n:                          Creating and killing buffers.  (line  19)
+* mouse-2:                      Browsing With Mouse Operations.  (line  20)
+* `M-S':                        Session Manager.        (line   8)
+* `M-s':                        Session Manager.        (line  11)
+* M-T (Lynx-like $A%-$B!<$A%^%C%W(B):   Inline Images.          (line  65)
+* M-<TAB>:                      Moving in a page.       (line  88)
+* n (Info-like $A%-$B!<$A%^%C%W(B):     Moving over pages.      (line  32)
+* N (Lynx-like $A%-$B!<$A%^%C%W(B):     Moving over pages.      (line  32)
+* o (Info-like $A%-$B!<$A%^%C%W(B):     Tracing History.        (line  53)
+* p (Info-like $A%-$B!<$A%^%C%W(B):     Moving over pages.      (line  24)
+* q:                            Going back to daily hacking and/or daily writing.  (line  19)
+* Q:                            Going back to daily hacking and/or daily writing.  (line  24)
+* R:                            Launching and Jumping.  (line 110)
+* <RET>:                        Launching and Jumping.  (line  58)
+* <RET>:                        Launching and Jumping.  (line  70)
+* <right> (Lynx-like $A%-$B!<$A%^%C%W(B): Launching and Jumping.  (line  58)
+* s (Info-like $A%-$B!<$A%^%C%W(B):     The Search Interface.   (line  32)
+* S (Lynx-like $A%-$B!<$A%^%C%W(B):     The Search Interface.   (line  32)
+* s (Lynx-like $A%-$B!<$A%^%C%W(B):     Tracing History.        (line  53)
+* S-<left> (Info-like $A%-$B!<$A%^%C%W(B): Moving in a page.    (line  55)
+* S-<mouse-2>:                  Browsing With Mouse Operations.  (line  25)
+* <SPC>:                        Moving in a page.       (line  21)
+* <SPC>:                        Moving over pages.      (line  63)
+* S-<right> (Info-like $A%-$B!<$A%^%C%W(B): Moving in a page.   (line  63)
+* S-<SPC>:                      Moving in a page.       (line  35)
+* S-<SPC>:                      Moving over pages.      (line 118)
+* S-<TAB>:                      Moving in a page.       (line  88)
+* T (Info-like $A%-$B!<$A%^%C%W(B):     Showing Directory Tree.  (line  51)
+* T (Lynx-like $A%-$B!<$A%^%C%W(B):     Inline Images.          (line  31)
+* t (Lynx-like $A%-$B!<$A%^%C%W(B):     Inline Images.          (line  54)
+* <TAB>:                        Moving in a page.       (line  77)
+* u (Info-like $A%-$B!<$A%^%C%W(B):     Moving over pages.      (line  46)
+* u (Lynx-like $A%-$B!<$A%^%C%W(B):     Launching and Jumping.  (line 104)
+* <up> (Lynx-like $A%-$B!<$A%^%C%W(B):  Moving in a page.       (line  88)
+* v:                            Consulting Bookmarks.   (line   5)
+* y (Info-like $A%-$B!<$A%^%C%W(B):     Launching and Jumping.  (line  97)
+* Y (Info-like $A%-$B!<$A%^%C%W(B):     Launching and Jumping.  (line 104)
+
+
+
+File: emacs-w3m-ja.info, Node: Variable Index, Next: Function Index, Prev: Key Index, Up: Index
+
+$(I+y$AJ}KwR}(B
+========
+
+* Menu:
+
+* gnus-keep-backlog:            Nnshimbun.              (line  54)
+* mm-inline-text-html-with-images: Gnus.                (line   5)
+* mm-inline-text-html-with-w3m-keymap: Gnus.            (line   5)
+* mm-text-html-renderer:        Gnus.                   (line   5)
+* nnmail-expiry-wait:           Nnshimbun.              (line 168)
+* nnmail-expiry-wait-function:  Nnshimbun.              (line 168)
+* nnshimbun-default-group-level: Nnshimbun.             (line  74)
+* nnshimbun-directory:          Nnshimbun.              (line  68)
+* nnshimbun-encapsulate-images: Nnshimbun.              (line 113)
+* nnshimbun-group-parameters-alist: Nnshimbun.          (line 157)
+* nnshimbun-index-range:        Nnshimbun.              (line 125)
+* nnshimbun-keep-backlog:       Nnshimbun.              (line  54)
+* nnshimbun-keep-unparsable-dated-articles: Nnshimbun.  (line 249)
+* nnshimbun-marks-is-evil:      Nnshimbun.              (line  81)
+* nnshimbun-pre-fetch-article:  Nnshimbun.              (line 103)
+* shimbun-local-path:           Shimbun local mode.     (line  25)
+* shimbun-slashdot-comment-display: News Sites Supported by Shimbun.  (line 146)
+* shimbun-slashdot-comment-threshold: News Sites Supported by Shimbun.  (line 141)
+* shimbun-slashdot-get-comments: News Sites Supported by Shimbun.  (line 131)
+* shimbun-tech-on-password:     News Sites Supported by Shimbun.  (line 184)
+* shimbun-tech-on-user-name:    News Sites Supported by Shimbun.  (line 176)
+* shimbun-use-local:            Shimbun local mode.     (line  18)
+* w3m-accept-languages:         General Variables.      (line   8)
+* w3m-add-referer:              General Variables.      (line  14)
+* w3m-add-user-agent:           General Variables.      (line  42)
+* w3m-after-cursor-move-hook:   Hooks.                  (line   8)
+* w3m-antenna-file:             Antenna Variables.      (line   8)
+* w3m-antenna-html-skelton:     Antenna Variables.      (line  14)
+* w3m-antenna-refresh-interval: Antenna Variables.      (line  18)
+* w3m-antenna-refresh-interval: Daily web tracking.     (line  30)
+* w3m-antenna-sites:            Setting up Antenna.     (line   5)
+* w3m-antenna-sort-changed-sites-function: Antenna Variables.  (line  29)
+* w3m-antenna-sort-unchanged-sites-function: Antenna Variables.  (line  35)
+* w3m-arrived-file:             General Variables.      (line  47)
+* w3m-async-exec:               Other Variables.        (line   8)
+* w3m-auto-show:                General Variables.      (line  51)
+* w3m-bookmark-default-section: Bookmark Variables.     (line  21)
+* w3m-bookmark-file:            Bookmark Variables.     (line   8)
+* w3m-bookmark-file-coding-system: Bookmark Variables.  (line  12)
+* w3m-bookmark-menu-open-new-session: Bookmark Variables.  (line  25)
+* w3m-bookmark-mode-hook:       Hooks.                  (line  71)
+* w3m-broken-proxy-cache:       Other Variables.        (line  13)
+* w3m-charset-coding-system-alist: General Variables.   (line  62)
+* w3m-coding-system:            General Variables.      (line  67)
+* w3m-coding-system-priority-list: General Variables.   (line  72)
+* w3m-command:                  General Variables.      (line  76)
+* w3m-command-arguments:        Minimal Settings.       (line  33)
+* w3m-command-arguments-alist:  General Variables.      (line  94)
+* w3m-command-environment:      General Variables.      (line 115)
+* w3m-confirm-leaving-secure-page: General Variables.   (line 119)
+* w3m-content-type-alist:       General Variables.      (line 126)
+* w3m-cookie-accept-bad-cookies: Cookie Variables.      (line   8)
+* w3m-cookie-accept-domains:    Cookie Variables.       (line  13)
+* w3m-cookie-file:              Cookie Variables.       (line  17)
+* w3m-cookie-reject-domains:    Cookie Variables.       (line  21)
+* w3m-correct-charset-alist:    General Variables.      (line 154)
+* w3m-db-history-display-size:  General Variables.      (line 158)
+* w3m-decoder-alist:            General Variables.      (line 162)
+* w3m-default-coding-system:    Quick Searching.        (line   5)
+* w3m-default-content-type:     General Variables.      (line 171)
+* w3m-default-directory:        General Variables.      (line 176)
+* w3m-default-display-inline-images: Image Variables.   (line   8)
+* w3m-default-save-directory:   General Variables.      (line 189)
+* w3m-delete-buffer-hook:       Hooks.                  (line  14)
+* w3m-delete-duplicated-empty-lines: General Variables.  (line 193)
+* w3m-dirlist-cgi-program:      General Variables.      (line 197)
+* w3m-display-hook:             Hooks.                  (line  18)
+* w3m-do-cleanup-temp-files:    General Variables.      (line 718)
+* w3m-doc-view-content-types:   General Variables.      (line 202)
+* w3m-dtree-default-allfiles:   Dtree Variables.        (line   8)
+* w3m-dtree-directory-depth:    Dtree Variables.        (line  15)
+* w3m-dtree-indent-strings:     Dtree Variables.        (line  21)
+* w3m-dtree-stop-strings:       Dtree Variables.        (line  26)
+* w3m-edit-function:            General Variables.      (line 207)
+* w3m-edit-function-alist:      General Variables.      (line 212)
+* w3m-enable-google-feeling-lucky: General Variables.   (line 220)
+* w3m-encoding-type-alist:      General Variables.      (line 226)
+* w3m-favicon-cache-expire-wait: Image Variables.       (line  14)
+* w3m-favicon-cache-file:       Image Variables.        (line  19)
+* w3m-favicon-default-background: Image Variables.      (line  38)
+* w3m-favicon-size:             Image Variables.        (line  25)
+* w3m-favicon-type:             Image Variables.        (line  30)
+* w3m-favicon-use-cache-file:   Image Variables.        (line  34)
+* w3m-file-coding-system:       General Variables.      (line 230)
+* w3m-file-name-coding-system:  General Variables.      (line 235)
+* w3m-fill-column:              General Variables.      (line 240)
+* w3m-follow-redirection:       General Variables.      (line 247)
+* w3m-fontify-after-hook:       Hooks.                  (line  24)
+* w3m-fontify-before-hook:      Hooks.                  (line  29)
+* w3m-form-input-map-buffer-lines: Form Variables.      (line   8)
+* w3m-form-input-map-mode-hook: Hooks.                  (line  34)
+* w3m-form-input-map-set-hook:  Hooks.                  (line  38)
+* w3m-form-input-select-buffer-lines: Form Variables.   (line  12)
+* w3m-form-input-select-mode-hook: Hooks.               (line  42)
+* w3m-form-input-select-set-hook: Hooks.                (line  46)
+* w3m-form-input-textarea-buffer-lines: Form Variables.  (line  16)
+* w3m-form-input-textarea-mode-hook: Hooks.             (line  50)
+* w3m-form-input-textarea-set-hook: Hooks.              (line  54)
+* w3m-form-mouse-face:          Form Variables.         (line  20)
+* w3m-form-textarea-directory:  Form Variables.         (line  32)
+* w3m-form-treat-textarea-size: Form Variables.         (line  24)
+* w3m-form-use-fancy-faces:     Form Variables.         (line  28)
+* w3m-form-use-textarea-backup: Form Variables.         (line  32)
+* w3m-history-minimize-in-new-session: Other Variables.  (line  23)
+* w3m-history-reuse-history-elements: Other Variables.  (line  30)
+* w3m-home-page:                Launching and Jumping.  (line  20)
+* w3m-horizontal-scroll-columns: Moving in a page.      (line  41)
+* w3m-horizontal-scroll-columns: Moving in a page.      (line  47)
+* w3m-horizontal-scroll-division: General Variables.    (line 264)
+* w3m-horizontal-shift-columns: Moving in a page.       (line  55)
+* w3m-horizontal-shift-columns: Moving in a page.       (line  63)
+* w3m-icon-directory:           Image Variables.        (line  45)
+* w3m-image-default-background: Image Variables.        (line 123)
+* w3m-imagick-convert-program:  Image Variables.        (line  49)
+* w3m-imitate-widget-button:    General Variables.      (line 286)
+* w3m-init-file:                Customizable Variables.  (line   5)
+* w3m-init-file:                Minimal Settings.       (line  24)
+* w3m-input-coding-system:      General Variables.      (line 302)
+* w3m-keep-arrived-urls:        General Variables.      (line 309)
+* w3m-keep-cache-size:          General Variables.      (line 313)
+* w3m-key-binding:              Key Binding.            (line   5)
+* w3m-language:                 General Variables.      (line 323)
+* w3m-local-directory-view-method: General Variables.   (line 327)
+* w3m-local-find-file-function: General Variables.      (line 334)
+* w3m-local-find-file-regexps:  General Variables.      (line 346)
+* w3m-mailto-url-function:      General Variables.      (line 371)
+* w3m-mailto-url-popup-function-alist: General Variables.  (line 378)
+* w3m-make-new-session:         General Variables.      (line 389)
+* w3m-mbconv-command:           General Variables.      (line 399)
+* w3m-menu-on-forefront:        General Variables.      (line 683)
+* w3m-minor-mode:               Gnus.                   (line   5)
+* w3m-minor-mode-command-alist: Gnus.                   (line   5)
+* w3m-minor-mode-hook:          Hooks.                  (line  58)
+* w3m-mode-hook:                Hooks.                  (line  62)
+* w3m-namazu-arguments:         Namazu Variables.       (line  12)
+* w3m-namazu-command:           Namazu Variables.       (line   8)
+* w3m-namazu-default-index:     Namazu Variables.       (line  20)
+* w3m-namazu-default-index:     Using Namazu.           (line  38)
+* w3m-namazu-index-alist:       Namazu Variables.       (line  29)
+* w3m-namazu-index-alist:       Using Namazu.           (line  23)
+* w3m-namazu-input-coding-system: Namazu Variables.     (line  34)
+* w3m-namazu-output-coding-system: Namazu Variables.    (line  40)
+* w3m-namazu-page-max:          Namazu Variables.       (line  46)
+* w3m-new-session-in-background: General Variables.     (line 713)
+* w3m-no-proxy-domains:         Minimal Settings.       (line  33)
+* w3m-output-coding-system:     General Variables.      (line 411)
+* w3m-perldoc-command:          Perldoc Variables.      (line   8)
+* w3m-perldoc-input-coding-system: Perldoc Variables.   (line  13)
+* w3m-perldoc-output-coding-system: Perldoc Variables.  (line  20)
+* w3m-perldoc-pod2html-arguments: Perldoc Variables.    (line  30)
+* w3m-perldoc-pod2html-command: Perldoc Variables.      (line  25)
+* w3m-pixels-per-character:     Image Variables.        (line  66)
+* w3m-pixels-per-line:          Image Variables.        (line  75)
+* w3m-popup-frame-parameters:   General Variables.      (line 434)
+* w3m-pop-up-frames:            General Variables.      (line 415)
+* w3m-pop-up-windows:           General Variables.      (line 424)
+* w3m-prefer-cache:             General Variables.      (line 440)
+* w3m-process-connection-type:  Other Variables.        (line  52)
+* w3m-process-modeline-format:  Other Variables.        (line  57)
+* w3m-profile-directory:        General Variables.      (line 445)
+* w3m-quick-start:              Launching and Jumping.  (line  20)
+* w3m-quick-start:              Moving over pages.      (line  40)
+* w3m-redirect-with-get:        General Variables.      (line 459)
+* w3m-refresh-minimum-interval: General Variables.      (line 672)
+* w3m-relationship-estimate-rules: General Variables.   (line 471)
+* w3m-resize-images:            Image Variables.        (line  89)
+* w3m-resize-image-scale:       Image Variables.        (line  85)
+* w3m-search-default-engine:    The Search Interface.   (line  32)
+* w3m-search-engine-alist:      Quick Searching.        (line   5)
+* w3m-search-thing-at-point-arg: Search Variables.      (line  29)
+* w3m-search-word-at-point:     Search Variables.       (line  23)
+* w3m-select-buffer-hook:       Hooks.                  (line  67)
+* w3m-select-buffer-horizontal-window: General Variables.  (line 476)
+* w3m-select-buffer-window-ratio: General Variables.    (line 481)
+* w3m-session-automatic-keep-number: Session Manager Variables.  (line  32)
+* w3m-session-automatic-save:   Session Manager.        (line  40)
+* w3m-session-automatic-title:  Session Manager Variables.  (line  16)
+* w3m-session-crash-recovery:   Session Manager.        (line  54)
+* w3m-session-crash-recovery-title: Session Manager Variables.  (line  20)
+* w3m-session-deleted-keep-number: Session Manager Variables.  (line  28)
+* w3m-session-deleted-save:     Session Manager.        (line  40)
+* w3m-session-deleted-title:    Session Manager Variables.  (line  24)
+* w3m-session-file:             Session Manager Variables.  (line   8)
+* w3m-session-load-crashed-sessions: Session Manager.   (line  54)
+* w3m-session-load-last-sessions: Session Manager.      (line  46)
+* w3m-session-time-format:      Session Manager Variables.  (line  12)
+* w3m-session-unknown-title:    Session Manager Variables.  (line  36)
+* w3m-show-current-title-in-buffer-tab: Other Variables.  (line  63)
+* w3m-show-decoded-url:         General Variables.      (line 487)
+* w3m-show-error-information:   General Variables.      (line 527)
+* w3m-show-graphic-icons-in-header-line: Image Variables.  (line  93)
+* w3m-show-graphic-icons-in-mode-line: Image Variables.  (line 100)
+* w3m-space-before-favicon:     General Variables.      (line 533)
+* w3m-space-before-modeline-icon: General Variables.    (line 539)
+* w3m-submit-form-safety-check: General Variables.      (line 647)
+* w3m-tab-mouse-position-adjuster: Using Tabs.          (line  63)
+* w3m-tab-track-mouse:          Using Tabs.             (line  56)
+* w3m-terminal-coding-system:   General Variables.      (line 545)
+* w3m-toggle-inline-images-permanently: Image Variables.  (line 106)
+* w3m-touch-command:            General Variables.      (line 553)
+* w3m-track-mouse:              General Variables.      (line 559)
+* w3m-treat-image-size:         Image Variables.        (line  53)
+* w3m-uri-replace-alist:        Quick Searching.        (line   5)
+* w3m-url-local-directory-alist: General Variables.     (line 615)
+* w3m-use-ange-ftp:             General Variables.      (line 624)
+* w3m-use-cookies:              Cookie Variables.       (line  25)
+* w3m-use-cygdrive:             General Variables.      (line 629)
+* w3m-use-favicon:              Image Variables.        (line 117)
+* w3m-use-filter:               General Variables.      (line 634)
+* w3m-use-form:                 General Variables.      (line 642)
+* w3m-use-header-line:          General Variables.      (line 652)
+* w3m-use-header-line-title:    General Variables.      (line 656)
+* w3m-use-mule-ucs:             General Variables.      (line 662)
+* w3m-user-agent:               General Variables.      (line 708)
+* w3m-use-refresh:              General Variables.      (line 666)
+* w3m-use-symbol:               General Variables.      (line 677)
+* w3m-use-tab:                  Using Tabs.             (line  47)
+* w3m-use-tab-menubar:          General Variables.      (line 695)
+* w3m-use-title-buffer-name:    General Variables.      (line 523)
+* w3m-use-toolbar:              General Variables.      (line 704)
+* w3m-weather-default-area:     Weather Variables.      (line   8)
+* w3m-weather-filter-functions: Weather Variables.      (line  13)
+
+
+
+File: emacs-w3m-ja.info, Node: Function Index, Prev: Variable Index, Up: Index
+
+$(IJ=$AJ}KwR}(B
+========
+
+* Menu:
+
+* gnus-group-make-shimbun-group: Nnshimbun.             (line  18)
+* gnus-group-make-shimbun-groups: Nnshimbun.            (line  40)
+* nnshimbun-generate-download-script: Shimbun local mode.  (line  32)
+* octet-find-file:              Octet.                  (line   5)
+* w3m:                          Launching and Jumping.  (line  20)
+* w3m-antenna:                  Daily web tracking.     (line  35)
+* w3m-antenna-add-current-url:  Setting up Antenna.     (line  14)
+* w3m-bookmark-add-current-url: Adding Bookmarks.       (line   5)
+* w3m-bookmark-add-this-url:    Adding Bookmarks.       (line   5)
+* w3m-bookmark-edit:            Editing Bookmarks.      (line  24)
+* w3m-bookmark-kill-entry:      Editing Bookmarks.      (line  20)
+* w3m-bookmark-undo:            Editing Bookmarks.      (line  29)
+* w3m-bookmark-view:            Consulting Bookmarks.   (line   5)
+* w3m-browse-url:               Launching and Jumping.  (line  41)
+* w3m-close-window:             Going back to daily hacking and/or daily writing.  (line  19)
+* w3m-copy-buffer:              Creating and killing buffers.  (line  19)
+* w3m-delete-buffer:            Creating and killing buffers.  (line  25)
+* w3m-delete-other-buffers:     Creating and killing buffers.  (line  29)
+* w3m-download:                 Downloading.            (line  30)
+* w3m-download-this-url:        Downloading.            (line  23)
+* w3m-dtree:                    Showing Directory Tree.  (line  51)
+* w3m-edit-current-url:         HTML File Information.  (line  40)
+* w3m-edit-this-url:            HTML File Information.  (line  46)
+* w3m-fb-mode:                  Frame Local Buffers.    (line  10)
+* w3m-find-file:                Launching and Jumping.  (line  36)
+* w3m-gohome:                   Moving over pages.      (line  40)
+* w3m-goto-url:                 Launching and Jumping.  (line  79)
+* w3m-goto-url-new-session:     Launching and Jumping.  (line  86)
+* w3m-history:                  Tracing History.        (line  53)
+* w3m-history-restore-position: Tracing History.        (line  65)
+* w3m-history-store-position:   Tracing History.        (line  61)
+* w3m-horizontal-recenter:      Moving in a page.       (line  69)
+* w3m-mouse-view-this-url:      Browsing With Mouse Operations.  (line  20)
+* w3m-mouse-view-this-url-new-session: Browsing With Mouse Operations.  (line  25)
+* w3m-next-anchor:              Moving in a page.       (line  77)
+* w3m-next-buffer:              Moving across buffers.  (line  28)
+* w3m-next-form:                Moving in a page.       (line  93)
+* w3m-next-image:               Moving in a page.       (line 103)
+* w3m-pattern-uri-replace:      General Variables.      (line 601)
+* w3m-pipe-source:              HTML File Information.  (line  58)
+* w3m-previous-anchor:          Moving in a page.       (line  88)
+* w3m-previous-buffer:          Moving across buffers.  (line  22)
+* w3m-previous-form:            Moving in a page.       (line  98)
+* w3m-previous-image:           Moving in a page.       (line 108)
+* w3m-print-current-url:        Launching and Jumping.  (line  97)
+* w3m-print-this-url:           Launching and Jumping.  (line 104)
+* w3m-quit:                     Going back to daily hacking and/or daily writing.  (line  24)
+* w3m-reload-this-page:         Launching and Jumping.  (line 110)
+* w3m-save-image:               Inline Images.          (line  74)
+* w3m-scroll-down-or-previous-url: Moving in a page.    (line  35)
+* w3m-scroll-down-or-previous-url: Moving over pages.   (line 118)
+* w3m-scroll-left:              Moving in a page.       (line  41)
+* w3m-scroll-right:             Moving in a page.       (line  47)
+* w3m-scroll-up-or-next-url:    Moving in a page.       (line  21)
+* w3m-scroll-up-or-next-url:    Moving over pages.      (line  63)
+* w3m-search:                   The Search Interface.   (line  32)
+* w3m-search-uri-replace:       General Variables.      (line 607)
+* w3m-select-buffer:            Selecting buffers.      (line  46)
+* w3m-session-select:           Session Manager.        (line  11)
+* w3m-session-select-delete:    Session Manager.        (line  26)
+* w3m-session-select-next:      Session Manager.        (line  38)
+* w3m-session-select-open-session-group: Session Manager.  (line  21)
+* w3m-session-select-previous:  Session Manager.        (line  42)
+* w3m-session-select-quit:      Session Manager.        (line  46)
+* w3m-session-select-rename:    Session Manager.        (line  30)
+* w3m-session-select-save:      Session Manager.        (line  34)
+* w3m-session-select-select:    Session Manager.        (line  17)
+* w3m-shift-left:               Moving in a page.       (line  55)
+* w3m-shift-right:              Moving in a page.       (line  63)
+* w3m-switch-buffer:            Selecting buffers.      (line  41)
+* w3m-tab-move-left:            Moving across buffers.  (line  45)
+* w3m-tab-move-right:           Moving across buffers.  (line  37)
+* w3m-toggle-inline-image:      Inline Images.          (line  54)
+* w3m-toggle-inline-images:     Inline Images.          (line  31)
+* w3m-turnoff-inline-images:    Inline Images.          (line  65)
+* w3m-view-header:              HTML File Information.  (line  33)
+* w3m-view-image:               Inline Images.          (line  70)
+* w3m-view-next-page:           Moving over pages.      (line  32)
+* w3m-view-parent-page:         Moving over pages.      (line  46)
+* w3m-view-previous-page:       Moving over pages.      (line  24)
+* w3m-view-source:              HTML File Information.  (line  28)
+* w3m-view-this-url:            Launching and Jumping.  (line  58)
+* w3m-view-this-url:            Launching and Jumping.  (line  70)
+* w3m-view-url-with-external-browser: HTML File Information.  (line  51)
+* w3m-zoom-in-image:            Inline Images.          (line  86)
+* w3m-zoom-out-image:           Inline Images.          (line  81)
+
+Tag table:
+Node: Top514
+Node: Introduction5491
+Node: Getting Started6129
+Node: Required Emacs Version6775
+Node: You Need w3m7575
+Node: Other Requirements7988
+Node: Installing Emacs-w3m11664
+Node: Non-UNIX-like systems14254
+Node: Minimal Settings14817
+Node: Basic Usage16589
+Node: Browsing Web Pages17142
+Node: Key Binding17704
+Node: Launching and Jumping18681
+Node: Moving in a page21862
+Node: Moving over pages24555
+Node: Browsing With Mouse Operations28005
+Node: Going back to daily hacking and/or daily writing29388
+Node: Inline Images30140
+Node: Tracing History32421
+Node: Managing Bookmarks35729
+Node: Adding Bookmarks36170
+Node: Consulting Bookmarks37129
+Node: Editing Bookmarks37644
+Node: Using Tabs38340
+Node: Working with buffers40675
+Node: Creating and killing buffers41101
+Node: Moving across buffers41818
+Node: Selecting buffers43436
+Node: Downloading44976
+Node: Submitting Forms45826
+Node: HTML File Information46965
+Node: Pretty Good Features48506
+Node: Using Search Engines49160
+Node: The Search Interface50133
+Node: Quick Searching51166
+Node: Adding New Search Engines52715
+Node: Grouping URLs54492
+Node: Weather Information55252
+Node: Using Antenna55415
+Node: Setting up Antenna55887
+Node: Daily web tracking56360
+Node: Showing Directory Tree57303
+Node: Viewing Perl Documents58556
+Node: Using Namazu58734
+Node: Octet60152
+Node: Frame Local Buffers60517
+Node: Session Manager61553
+Node: Customizable Variables63162
+Node: General Variables65218
+Node: Image Variables87455
+Node: Form Variables91362
+Node: Cookie Variables92256
+Node: Bookmark Variables92877
+Node: Search Variables93673
+Node: Weather Variables94821
+Node: Dtree Variables95405
+Node: Antenna Variables96362
+Node: Perldoc Variables97641
+Node: Namazu Variables98553
+Node: Octet Variables100257
+Node: Session Manager Variables100500
+Node: Hooks101157
+Node: Other Variables102954
+Node: Hooking into MUAs105435
+Node: Gnus106233
+Node: Mew109701
+Node: SEMI MUAs111348
+Node: VM113295
+Node: Frequently Asked Questions113596
+Node: General FAQ113886
+Node: Trouble FAQ115287
+Node: Shimbun FAQ122292
+Node: Known Problems122850
+Node: Shimbun Library123009
+Node: Nnshimbun124779
+Node: Mew Shimbun133784
+Node: Shimbun with Wanderlust141257
+Node: Shimbun local mode141580
+Node: Shimbun Sites142771
+Node: Newspapers Supported by Shimbun143193
+Node: News Sites Supported by Shimbun152877
+Node: Mailing Lists Supported by Shimbun161380
+Node: Sport Sites Supported by Shimbun174370
+Node: Misc Sites Supported by Shimbun175115
+Node: Shimbun Basics185379
+Node: Overview186002
+Node: Getting web page and header information188280
+Node: Displaying an article192952
+Node: Inheriting shimbun module194967
+Node: Making text/plain articles196855
+Node: Zenkaku to hankaku conversion198522
+Node: Coding convention of Shimbun199165
+Node: Tips200009
+Node: Mailing List204115
+Node: Emacs-w3m Functions205005
+Node: External Packages205165
+Node: Authors206032
+Node: Index206267
+Node: Concept Index206503
+Node: Key Index212227
+Node: Variable Index219805
+Node: Function Index234946
+
+End tag table

=== added file 'share/info/emacs-w3m.info'
--- share/info/emacs-w3m.info	1970-01-01 00:00:00 +0000
+++ share/info/emacs-w3m.info	2010-09-13 10:14:52 +0000
@@ -0,0 +1,7014 @@
+This is emacs-w3m.info, produced by makeinfo version 4.13 from
+emacs-w3m.texi.
+
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+2009 TSUCHIYA Masatoshi
+
+     Permission is granted to copy, distribute and/or modify this
+     document under the terms of the GNU General Public License,
+     Version 2 or any later version published by the Free Software
+     Foundation.
+
+     This document is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with this document; see the file COPYING.  If not, write to
+     the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+     Floor, Boston, MA 02110-1301, USA.
+
+INFO-DIR-SECTION GNU Emacs Lisp
+START-INFO-DIR-ENTRY
+* Emacs-w3m: (emacs-w3m).  An Emacs interface to w3m
+END-INFO-DIR-ENTRY
+
+   This file documents emacs-w3m, an Emacs interface to w3m.
+
+   This edition is for emacs-w3m version 1.4.413.
+
+
+File: emacs-w3m.info,  Node: Top,  Next: Introduction,  Up: (dir)
+
+Emacs-w3m User's Manual
+***********************
+
+                                         The emacs-w3m development team
+
+   This manual corresponds to emacs-w3m version 1.4.413.
+
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+2009 TSUCHIYA Masatoshi
+
+     Permission is granted to copy, distribute and/or modify this
+     document under the terms of the GNU General Public License,
+     Version 2 or any later version published by the Free Software
+     Foundation.
+
+     This document is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with this document; see the file COPYING.  If not, write to
+     the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+     Floor, Boston, MA 02110-1301, USA.
+
+* Menu:
+
+* Introduction::                Preliminary remarks
+* Getting Started::             It's so easy to begin to use emacs-w3m
+* Basic Usage::                 Basic usage
+* Pretty Good Features::        Pretty good features
+* Customizable Variables::      Customizable variables
+* Hooking into MUAs::           Hooking emacs-w3m into mail/newsreaders
+* Frequently Asked Questions::  There isn't always an answer
+* Known Problems::              You can surely solve it
+* Shimbun Library::             A tool for reading a web newspaper
+* Tips::                        Some knick-knacks using emacs-w3m
+* Mailing List::                Mailing list and submitting bug reports
+* Emacs-w3m Functions::         Details of some emacs-w3m functions
+* External Packages::           Companion packages you might need
+* Authors::                     People who wrote this manual
+* Index::                       Index
+
+ --- The Detailed Node Listing ---
+
+Getting Started
+
+* Required Emacs Version::      What version of Emacs can be used?
+* You Need w3m::                Using w3m: the reason why emacs-w3m is fast
+* Other Requirements::          Things required to run emacs-w3m
+* Installing Emacs-w3m::        Installing emacs-w3m
+* Non-UNIX-like systems::       Installing on non-UNIX-like systems
+* Minimal Settings::            Minimal settings to run emacs-w3m
+
+Basic Usage
+
+* Browsing Web Pages::          Let's go netsurfing!
+* Inline Images::               Toggle displaying inline images
+* Tracing History::             Going back through time and space
+* Managing Bookmarks::          That's a favorite with me!
+* Using Tabs::                  Everybody likes tabs
+* Working with buffers::        Creating, killing and moving across buffers
+* Downloading::                 Downloading a file
+* Submitting Forms::            Filling in HTML forms
+* HTML File Information::       Support for web page editing and hacking
+
+Pretty Good Features
+
+* Using Search Engines::        A convenient way to search the web
+* Grouping URLs::               Visiting several web pages in one URL
+* Weather Information::         It will be fine tomorrow
+* Using Antenna::               Raise your antenna
+* Showing Directory Tree::      Showing the tree structure of local directories
+* Viewing Perl Documents::      Viewing Perl Documents
+* Using Namazu::                Searching files with Namazu
+* Octet::                       Viewing data in various octal form
+* Frame Local Buffers::         Grouping sessions into separate frames
+* Session Manager::             Saving and loading sessions
+
+Customizable Variables
+
+* General Variables::           General variables
+* Image Variables::             Variables related to images
+* Form Variables::              Variables related to forms
+* Cookie Variables::            Variables related to cookies
+* Bookmark Variables::          Variables related to bookmarks
+* Search Variables::            Variables related to searching the web
+* Weather Variables::           Variables related to weather information
+* Dtree Variables::             Variables related to the dtree feature
+* Antenna Variables::           Variables related to antenna
+* Perldoc Variables::           Variables related to perldoc
+* Namazu Variables::            Variables related to namazu
+* Octet Variables::             Variables related to the octet feature
+* Session Manager Variables::   Variables related to session manager
+* Hooks::                       Hooks
+* Other Variables::             Other variables
+
+Hooking into MUAs
+
+* Gnus::                        Reading HTML mails in Gnus
+* Mew::                         Reading HTML mails in Mew
+* SEMI MUAs::                   Reading HTML mails in SEMI MUAs
+* VM::                          VM (vieW maiL) is not Wanderlust
+
+Frequently Asked Questions
+
+* General FAQ::                 General Questions
+* Trouble FAQ::                 Troubleshooting
+* Shimbun FAQ::                 Questions of Shimbun Library
+
+Known Problems
+
+Shimbun Library
+
+* Nnshimbun::                   Turning Gnus into a web browser!
+* Mew Shimbun::                 Reading web newspapers with Mew
+* Shimbun with Wanderlust::     Reading web newspapers with Wanderlust
+* Shimbun local mode::          Use a shell script to fetch shimbun feeds
+* Shimbun Sites::               Sites supported by Shimbun
+* Shimbun Basics::              How to make a new shimbun module
+
+Tips
+
+Mailing List
+
+Emacs-w3m Functions
+
+
+File: emacs-w3m.info,  Node: Introduction,  Next: Getting Started,  Prev: Top,  Up: Top
+
+1 Preliminary remarks
+*********************
+
+Emacs/W3 (http://www.cs.indiana.edu/elisp/w3/docs.html) once was the
+most popular web browser on Emacs.  However, it worked so slowly that
+we wanted a speedy alternative.  On the other hand, w3m
+(http://w3m.sourceforge.net/) was a pager with WWW capability,
+developed by Akinori ITO.  Although it was a pager, it was possible to
+use it as a text-mode WWW browser, so we started developing an Emacs
+interface to w3m.
+
+   Our special thanks go to Akinori ITO and the w3m team for the
+excellent w3m program.  We would also like to thank everybody who has
+submitted comments, suggestions, and bug fixes.  Even though we're not
+aware of any problems, all responsibility for this program is ours (the
+emacs-w3m development team), but there is absolutely no warranty.  The
+emacs-w3m program was first created by TSUCHIYA Masatoshi in June 2000.
+
+   See also the emacs-w3m official page (http://emacs-w3m.namazu.org/).
+
+
+File: emacs-w3m.info,  Node: Getting Started,  Next: Basic Usage,  Prev: Introduction,  Up: Top
+
+2 It's so easy to begin to use emacs-w3m
+****************************************
+
+Emacs-w3m may have already been installed on your system, in which case
+you can skip this section and begin to use the program at once.  If
+you're not that lucky, read on to learn how to install emacs-w3m.
+
+* Menu:
+
+* Required Emacs Version::      What version of Emacs can be used?
+* You Need w3m::                Using w3m: the reason why emacs-w3m is fast
+* Other Requirements::          Things required to run emacs-w3m
+* Installing Emacs-w3m::        Installing emacs-w3m
+* Non-UNIX-like systems::       Installing on non-UNIX-like systems
+* Minimal Settings::            Minimal settings to run emacs-w3m
+
+
+File: emacs-w3m.info,  Node: Required Emacs Version,  Next: You Need w3m,  Up: Getting Started
+
+2.1 What version of Emacs can be used?
+======================================
+
+You can run emacs-w3m in various versions of Emacsen listed below:
+
+`Emacs 21.1 or greater'
+     No additional packages are required.
+
+`XEmacs 21.x'
+     First of all, you should note that emacs-w3m supports only XEmacs
+     21.4.17 and later and XEmacs 21.5-b19 and later.  In addition, you
+     need to have installed the latest xemacs-base package including the
+     `timer-funcs.el' module.
+
+     The APEL package and the `gifsicle' program are required.  In
+     addition, it would be better to have installed the `rfc2368.el'
+     module which parses `mailto' urls (*note Other Requirements::).
+
+`Emacs 20.x, Emacs 19.34 (including Mule 2.3)'
+     Emacs-w3m no longer supports those Emacs versions.
+
+
+   If you use the development version of GNU Emacs, perhaps you should
+run the CVS version of emacs-w3m on it.  In that case, it is strongly
+recommended that you join the *note Mailing List::.
+
+
+File: emacs-w3m.info,  Node: You Need w3m,  Next: Other Requirements,  Prev: Required Emacs Version,  Up: Getting Started
+
+2.2 Using w3m: the reason why emacs-w3m is fast
+===============================================
+
+Emacs-w3m uses the external w3m program as a back-end to retrieve web
+contents and as an HTML rendering engine; that's how we could create an
+accelerated Emacs web browser with asynchronous operation.
+
+   You must install the latest w3m, it is available at:
+
+   `http://prdownloads.sourceforge.net/w3m/'
+
+
+File: emacs-w3m.info,  Node: Other Requirements,  Next: Installing Emacs-w3m,  Prev: You Need w3m,  Up: Getting Started
+
+2.3 Things required to run emacs-w3m
+====================================
+
+Depending on the Emacs version you're using, third party packages may be
+required.  This section provides resources to help you find and install
+them.
+
+`APEL'
+     Indispensable to XEmacs.  You should install APEL before building
+     emacs-w3m.  APEL is available at:
+
+     `http://kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/apel/'
+
+     Note that you must not use the APEL XEmacs package (which is
+     contained in SUMO) of the versions older than 1.32.  If you have
+     already installed such a version, you should upgrade it or use the
+     following directives to replace it with APEL which is linked above
+     (you can also use the same directives in order to newly install
+     APEL):
+
+          % rm -fr /usr/local/lib/xemacs/xemacs-packages/lisp/apel
+          % cd apel-10.7
+          % make install-package XEMACS=xemacs-21.4.x\
+            PACKAGEDIR=/usr/local/lib/xemacs/xemacs-packages
+
+`gifsicle'
+     Indispensable to XEmacs.  There is a known bug in all XEmacs 21.x
+     series that won't let it display optimized animated gifs correctly
+     or may make it crash when some kind of an interlaced gif image is
+     displayed.  Emacs-w3m uses the `gifsicle' program to convert gif
+     data in order to make it possible to be handled by XEmacs 21.x.
+     It is available at:
+
+     `http://www.lcdf.org/gifsicle/'
+
+`ImageMagick'
+     If the `convert' program bundled with the ImageMagick package is
+     available on your system, emacs-w3m will use it to resize images
+     or to convert `favicon' images into a format Emacs can handle.
+     Emacs-w3m will work without ImageMagick, but installing it will
+     improve your surfing experience.  You can get the ImageMagick
+     package from:
+
+     `ftp://ftp.imagemagick.org/pub/ImageMagick/'
+
+     To manipulate `favicon' images, we recommend version 5.4.0-5 and
+     later, previous versions may work but we didn't check them
+     thoroughly.
+
+`FLIM'
+     The FLIM package is required to use the `shimbun' library.  The
+     `shimbun' library is a collection of tools for reading web
+     newspapers, you can use it with Gnus, Mew or Wanderlust.  *Note
+     Shimbun Library::.
+
+     Note that the FLIM package requires the APEL package regardless of
+     the version of Emacs you are using.  Therefore, you must install
+     both APEL and FLIM if you would like to use the `shimbun' library.
+     The FLIM package is available at:
+
+     `http://kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/flim/flim-1.14/'
+
+`Mule-UCS'
+     If you use XEmacs 21.4, or need to read Chinese text, Japanese
+     text, Korean text, etc. using Emacs 21, we recommend you install
+     the Mule-UCS Emacs Lisp package so as to enable emacs-w3m to
+     display pages encoded by UTF-8, which is the typical coding system
+     of the Unicode system.  Note that Emacs 21 supports the Unicode
+     system partially (e.g., for Latin text) and Emacs 22 or greater
+     fully supports it.  The Mule-UCS Emacs Lisp package is available
+     at:
+
+     `http://unit.aist.go.jp/itri/itri-gist/ftp.m17n.org/pub/mule/Mule-UCS/test/Mule-UCS-current.tar.gz'
+
+     (The official page for Mule-UCS will open in the near future in
+     `http://www.meadowy.org/'.)
+
+     If you use it with Emacs 21.2, it is necessary to apply this patch
+     (http://www.m17n.org/mlarchive/mule/200203/msg00000.html) before
+     installation.
+
+     If you are an XEmacs 21.4 user, the compiled package is here:
+
+     `ftp://ftp.xemacs.org/xemacs/packages/mule-ucs-1.14-pkg.tar.gz'
+
+     (You don't need to install it in addition to Mule SUMO, that
+     contains it.)
+
+`codepage-ex'
+     Some web sites in Europe specify a `charset=ISO-8859-1' encoding,
+     but really use `windows-1252'.  Since `iso-8859-1' is insufficient
+     to decode that, emacs-w3m uses `windows-1252' as a superset of
+     `iso-8859-1' if it is available.  The `windows-1252' coding system
+     is built-in since Emacs 22.  Even in Emacs 21, you can enable to
+     use it using the module called `codepage-ex'.  See the following
+     page:
+
+     `http://nijino.homelinux.net/emacs/codepage-ex.html'
+
+`rfc2368.el'
+     Install it if you'd like to enable emacs-w3m running with XEmacs to
+     parse `mailto' urls properly.  You can find the `rfc2368.el'
+     module which can be used with XEmacs in the `attic' directory in
+     the emacs-w3m distribution.  To install it, copy the `rfc2368.el'
+     file to the directory belonging to the `load-path', and perform the
+     following command:
+
+          % xemacs -batch -vanilla -f batch-byte-compile rfc2368.el
+
+
+File: emacs-w3m.info,  Node: Installing Emacs-w3m,  Next: Non-UNIX-like systems,  Prev: Other Requirements,  Up: Getting Started
+
+2.4 Installing emacs-w3m
+========================
+
+See the official page `http://emacs-w3m.namazu.org/' for instructions
+on how to get the latest emacs-w3m.  Is everything ready?  Now, let's
+begin.
+
+   In order to install emacs-w3m on non-UNIX-like systems (or any system
+lacking the ability to execute the `configure' script or has no `make'
+command), skip this section and go to the next section *Note
+Non-UNIX-like systems::.
+
+  1. First, extract a tarball of the emacs-w3m distribution and enter
+     the top directory as follows:
+
+          % tar zxf emacs-w3m-1.4.413.tar.gz
+          % cd emacs-w3m-1.4.413
+
+     If you've checked out emacs-w3m from CVS, you have to run
+     `autoconf' with no argument to generate the `configure' script.
+
+  2. Run the `configure' script.
+
+          % ./configure
+
+     _Important notice to Gnus users_:
+
+     If multiple versions of Gnus are installed on your system (it is
+     likely that there are the released version and the development
+     version of Gnus), make sure that the `load-path' contains the
+     directory where the version you use is installed (check for the
+     `gnus.elc' file).  You can ensure that with the `--with-addpath'
+     option as follows:
+
+          % ./configure --with-addpath=/usr/local/share/emacs/site-lisp/gnus
+
+     If you've installed APEL, FLIM or something in
+
+     non-standard directories other than the default `load-path', you
+     must specify them using the `--with-addpath' option as follows (you
+     may also include the Gnus directory in it separated with `:'):
+
+          % ./configure --with-addpath=/opt/share/apel:/opt/share/flim
+
+  3. Just run `make' and `make install'.  See also the next step if you
+     are using XEmacs.
+
+          % make
+          % make install
+
+     All Lisp and info files will be installed in the appropriate
+     directories.  Now, how do you know what files will go where?  To
+     know it beforehand, use this:
+
+          % make what-where
+
+     If you are using Emacs or XEmacs capable of displaying images, you
+     had better install icon image files.  To do this:
+
+          % make install-icons
+
+     or
+
+          % make install-icons30
+
+     The later is for using the slightly larger icon images.
+
+  4. You can also install emacs-w3m as an XEmacs package using `make
+     install-package' instead of `make install' as follows:
+
+          % make
+          % make install-package
+
+     In this case, you don't have to execute `make install-icons' nor
+     `make install-icons30'.
+
+     If you need to specify the package directory, there are two ways
+     to do that:
+
+        * Use the `configure' option `--with-packagedir='.  For example:
+
+               % ./configure --with-packagedir=/opt/xemacs/xemacs-packages
+               % make what-where
+               % make
+               % make install-package
+
+        * Use the `PACKAGEDIR' variable.  For example:
+
+               % ./configure
+               % make what-where PACKAGEDIR=/opt/xemacs/xemacs-packages
+               % make
+               % make install-package PACKAGEDIR=/opt/xemacs/xemacs-packages
+
+
+
+
+File: emacs-w3m.info,  Node: Non-UNIX-like systems,  Next: Minimal Settings,  Prev: Installing Emacs-w3m,  Up: Getting Started
+
+2.5 Installing on non-UNIX-like systems
+=======================================
+
+If you cannot execute the `configure' script on your system, or if no
+`make' command is available, cast the following spell:
+
+     % emacs -batch -q -no-site-file -l w3mhack.el NONE -f w3mhack-nonunix-install
+
+   If APEL, FLIM (or any other library) aren't installed in the
+ordinary places, the installer will leave them out.  In such a case, it
+is necessary to tell those places to the installer as shown below:
+
+     % emacs -batch -q -no-site-file -l w3mhack.el //c/share/apel://c/share/flim -f w3mhack-nonunix-install
+
+
+File: emacs-w3m.info,  Node: Minimal Settings,  Prev: Non-UNIX-like systems,  Up: Getting Started
+
+2.6 Minimal settings to run emacs-w3m
+=====================================
+
+This section mentions some fundamental settings for emacs-w3m.  If you
+want to fine-tune your installation, you'll find many customizable
+variables in *note Customizable Variables::.
+
+`Autoloads'
+     You don't need this if you've installed emacs-w3m as an XEmacs
+     package (*note Installing Emacs-w3m::) because the
+     `w3m/auto-autoloads.el' takes care of setting up autoloads.
+
+     In all other cases, put the following line in your `~/.emacs' file:
+
+          (require 'w3m-load)
+
+`Startup File'
+     We recommend using the `~/.emacs-w3m' file (which is the default
+     value of `w3m-init-file') if you need to twiddle some emacs-w3m
+     variables.  This file is similar to `~/.emacs', but is read when
+     emacs-w3m starts.  Note that some options shouldn't be modified
+     there, for example, `w3m-command'.
+
+`Proxy Gateway'
+     If you are behind a firewall and access the Internet through a
+     proxy gateway, you need to instruct w3m to use it.
+
+     There are several ways to do this, one is to set the `http_proxy'
+     environment variable globally in the shell something like:
+
+          setenv http_proxy http://proxy.hogege.com:8000/
+
+     Another way is to customize the `w3m-command-arguments' variable to
+     add the options `-o' and
+     `http_proxy=http://PROXY_SERVER_NAME:PORT/'.
+
+     This can also be done in your `~/.emacs-w3m' file as shown below:
+
+          (setq w3m-command-arguments
+                (nconc w3m-command-arguments
+                       '("-o" "http_proxy=http://proxy.hogege.com:8000/")))
+
+     To specify hosts for which the proxy shouldn't be used (Intranet
+     sites and the like), set the `no_proxy' (note that it is not
+     `no-proxy') environment variable to a comma-separated list of
+     hostnames.  Alternatively, you can set the `w3m-no-proxy-domains'
+     variable to a list of domain names (not host names) as follows:
+
+          (setq w3m-no-proxy-domains '("local.com" "neighbor.com"))
+
+     See also the documentation of the `w3m-command-arguments-alist'
+     variable for instructions on how to use regexps to specify
+     `no_proxy' hosts.
+
+
+
+File: emacs-w3m.info,  Node: Basic Usage,  Next: Pretty Good Features,  Prev: Getting Started,  Up: Top
+
+3 Basic usage
+*************
+
+* Menu:
+
+* Browsing Web Pages::          Let's go netsurfing!
+* Inline Images::               Toggle displaying inline images
+* Tracing History::             Going back through time and space
+* Managing Bookmarks::          That's a favorite with me!
+* Using Tabs::                  Everybody likes tabs
+* Working with buffers::        Creating, killing and moving across buffers
+* Downloading::                 Downloading a file
+* Submitting Forms::            Filling in HTML forms
+* HTML File Information::       Support for web page editing and hacking
+
+
+File: emacs-w3m.info,  Node: Browsing Web Pages,  Next: Inline Images,  Up: Basic Usage
+
+3.1 Let's go netsurfing!
+========================
+
+You can, by the keys, let emacs-w3m do all the web browsing operations.
+Emacs-w3m uses the `Lynx-like' keymap (*note Key Binding::) by default.
+Of course, you can use the mouse buttons, too.
+
+* Menu:
+
+* Key Binding::                 There are two types of the key bindings
+* Launching and Jumping::       Go ahead, just try it
+* Moving in a page::            Moving from place to place in a page
+* Moving over pages::           Moving from page to page
+* Browsing with Mouse Operations:: Surfing using the mouse
+* Going Back to Daily Hacking and/or Daily Writing:: Return to an Ordinary Life
+
+
+File: emacs-w3m.info,  Node: Key Binding,  Next: Launching and Jumping,  Up: Browsing Web Pages
+
+3.1.1 There are two types of the key bindings
+---------------------------------------------
+
+Since emacs-w3m is a late-coming web browser in the history of Emacs web
+browsers, we offer two types of the key bindings in order that users can
+get used to the new web browser easily.  One is called the `Lynx-like'
+keymap, the other is the `Info-like' keymap.  You can see what they
+mean from those names, can't you?  The former is similar to that of
+`Lynx' which is the text-based web browser, and the later is similar to
+that of `Info' which is GNU's official document browser.  By default,
+the `Lynx-like' keymap is used.  If you would like to use the
+`Info-like' keymap, type
+
+     M-x customize-option <RET> w3m-key-binding <RET>
+
+choose the `Info-like' keymap, and save the changed state.  Otherwise,
+add the following snippet to your `~/.emacs' file, not
+`~/.emacs-w3m.el' file:
+
+     (setq w3m-key-binding 'info)
+
+   To change the key binding one by one, modify the `w3m-mode-map'
+variable in your `~/.emacs-w3m.el' file like the following:
+
+     (define-key w3m-mode-map [up] 'previous-line)
+     (define-key w3m-mode-map [down] 'next-line)
+     (define-key w3m-mode-map [left] 'backward-char)
+     (define-key w3m-mode-map [right] 'forward-char)
+
+
+File: emacs-w3m.info,  Node: Launching and Jumping,  Next: Moving in a page,  Prev: Key Binding,  Up: Browsing Web Pages
+
+3.1.2 Go ahead, just try it
+---------------------------
+
+You can invoke emacs-w3m using three different commands, listed below.
+Try one of these commands: a web page is displayed in an Emacs buffer
+named "*w3m*", meaning that it is an emacs-w3m buffer.  As you will
+probably notice, the major mode for an emacs-w3m buffer is `w3m-mode',
+there are also minor modes (*note Managing Bookmarks::).
+
+   This section explains the most fundamental usage of these commands,
+see *note Emacs-w3m Functions:: for more information on them.  See also
+*note Customizable Variables:: for variables you can use to customize
+emacs-w3m's behavior.
+
+`w3m'
+     Start emacs-w3m, displaying the homepage specified in the
+     `w3m-home-page' variable.  The default value for `w3m-home-page'
+     is "about:".  Set the `w3m-quick-start' variable to `nil' if you
+     want to input a target URL every time you start emacs-w3m.
+
+     You can also use this as an argument when starting emacs.
+     Examples:
+
+          % emacs -f w3m
+
+     To specify a URL, you could also use:
+
+          % emacs -f w3m http://emacs-w3m.namazu.org/
+
+`w3m-find-file'
+     Prompt for a local file name in the minibuffer, and display it in
+     emacs-w3m.
+
+`w3m-browse-url'
+     Prompt for a URL in the minibuffer, and display it in emacs-w3m.
+     This command is provided, if anything, in order to start emacs-w3m
+     from other application programs.
+
+   Moving in an emacs-w3m buffer won't be painful if you're an Emacs
+user already, since many of the standard keys work as intended.  For
+instance, `C-n', `C-v' and `C-s' (which are commonly used to move down
+one line, one page, or search downwards for a word) are valid keys in
+an emacs-w3m buffer.
+
+   To follow a link, use the `<RET>' key.  You have to move the point
+to a link to do this; links are easily recognizable in a buffer because
+they are not displayed like ordinary text: they can be underlined, or
+have a different color.  The face `w3m-anchor' controls how they are to
+be displayed (*note Customizable Variables::).
+
+`<RET>'
+`<right>' (Lynx-like keymap only)
+     Display the page pointed by the link under point
+     (`w3m-view-this-url').
+
+     The exact behavior of this command depends on the properties of
+     the link under point, and on whether you give it a prefix argument
+     or not.  See *note Emacs-w3m Functions:: for details.
+
+   As mentioned above, you can be prompted for a URL when you use the
+command `M-x w3m', by setting the `w3m-quick-start' variable to `nil'.
+In an emacs-w3m buffer, there are also two popular ways to go to new
+pages by entering their URLs, see below.
+
+`<RET>'
+     In an emacs-w3m buffer, you can be prompted for a URL in the
+     minibuffer and make emacs-w3m display the corresponding page by
+     hitting `<RET>' after moving the point to the URL displayed in the
+     `header-line'.  This feature will feel familiar to you if you are
+     used to GUI-based web browsers like Mozilla.  Detailed explanations
+     about this can be found in *note Emacs-w3m Functions::
+     (`w3m-view-this-url').
+
+`g'
+     Prompt for a URL in the minibuffer and make emacs-w3m display the
+     corresponding page (independently of the position of the point) in
+     an emacs-w3m buffer.  This binding will be familiar to you if you
+     already use Gnus or Mew (`w3m-goto-url').
+
+`G'
+     Prompt for a URL in the minibuffer, and display it in a new
+     session.  This function works just like `g' (`M-x w3m-goto-url')),
+     except that it opens a new session.  Unless you are using
+     emacs-w3m on the character terminal, opening a new session means
+     displaying the page in a new tab.  For more information about
+     tabs, please refer to *note Using Tabs::
+     (`w3m-goto-url-new-session').
+
+`c' (Lynx-like keymap)
+`y' (Info-like keymap)
+     Display the URL of the page being displayed in the echo area and
+     put it in the `kill-ring' (`w3m-print-current-url').
+
+`u' (Lynx-like keymap)
+`Y' (Info-like keymap)
+     Display the target URL of the link under point in the echo area
+     and put it in the `kill-ring' (`w3m-print-this-url').
+
+   If the page you're reading is today's news or someone's diary, it may
+have been updated since you loaded it.  You can refresh the page using
+the following command.  (This command can also be useful to force a full
+redisplay of the page if it looks broken.)
+
+`R'
+`C-S-l' (Info-like keymap only)
+     Reload the page (`w3m-reload-this-page').
+
+
+File: emacs-w3m.info,  Node: Moving in a page,  Next: Moving over pages,  Prev: Launching and Jumping,  Up: Browsing Web Pages
+
+3.1.3 Moving from place to place in a page
+------------------------------------------
+
+Being able to use familiar Emacs movement bindings while browsing a web
+page probably fascinates you already.  Believe it or not, there is
+more!  Since we value your time, we have added keys to move the point,
+scroll the page or find links in a very fast way.  When you master
+them, you will understand how handy they are.
+
+   The keys are assigned so that scroll commands can be called using
+shorter keystrokes than standard Emacs key bindings.  And since places
+where you can input text are pretty specific in web pages (*note
+Submitting Forms::), most keys have special meanings and aren't
+assigned to `self-insert-command' anymore.
+
+`<SPC>'
+     Scroll downwards.  You may be used to this binding if you use the
+     `more' or `less' commands, or Emacs's `view-mode'
+     (`w3m-scroll-up-or-next-url').
+
+`<DEL>'
+`b'
+`<backspace>'
+`S-<SPC>'
+`C-?'
+     Scroll upwards.  You may be used to this binding if you use the
+     `less' command or Emacs's `view-mode'
+     (`w3m-scroll-down-or-previous-url').
+
+`>'
+     Scroll to the left.  The scroll step is given by the
+     `w3m-horizontal-scroll-columns' variable, default 10
+     (`w3m-scroll-left').
+
+`<'
+     Scroll to the right.  The scroll step is given by the
+     `w3m-horizontal-scroll-columns' variable, default 10
+     (`w3m-scroll-right').
+
+`.' (Lynx-like keymap)
+`S-<left>' (Info-like keymap)
+     Shift to the left (a fine level horizontal scrolling).  The shift
+     step is given by the `w3m-horizontal-shift-columns' variable,
+     default 2 (`w3m-shift-left').
+
+`,' (Lynx-like keymap)
+`S-<right>' (Info-like keymap)
+     Shift to the right (a fine level horizontal scrolling).  The shift
+     step is given by the `w3m-horizontal-shift-columns' variable,
+     default 2 (`w3m-shift-right').
+
+`M-l'
+     Scroll horizontally so that the current position is centered
+     (`w3m-horizontal-recenter').
+
+   The `w3m-mode' major mode defines commands to move to various kinds
+of things; namely links, forms, and images (whether they are displayed
+or not).
+
+   Let's consider this simple example: suppose we want to search for a
+word on the widely-known Google search engine.  Step one: open
+`http://www.google.com' in emacs-w3m.  Step two: once the page is
+loaded, hit `]'.  Tadaa!  The point has moved to the first form input
+in the page, you can now hit `<RET>' to enter something in it, and then
+`C-c C-c' to submit.  Without this command, you would have had to move
+into the page using `C-n', `C-f' and so forth, it would have been a
+real pain.
+
+`<TAB>'
+`<down>' (Lynx-like keymap only)
+     Move the point to the next link (an "anchor" in emacs-w3m lingo).
+     More strictly speaking, move the point forwards to the nearest
+     anchor.
+
+`M-<TAB>'
+`S-<TAB>'
+`<backtab>'
+`<up>' (Lynx-like keymap only)
+     Move the point to the previous anchor.  More strictly speaking,
+     move the point backwards to the nearest anchor
+     (`w3m-previous-anchor').
+
+`]'
+     Move the point to the next form.  More strictly speaking, move the
+     point forwards to the nearest form (`w3m-next-form').
+
+`['
+     Move the point to the previous form.  More strictly speaking, move
+     the point backwards to the nearest form (`w3m-previous-form').
+
+`}'
+     Move the point to the next image.  More strictly speaking, move the
+     point forwards to the nearest image (`w3m-next-image').
+
+`{'
+     Move the point to the previous image.  More strictly speaking,
+     move the point backwards to the nearest image
+     (`w3m-previous-image').
+
+
+File: emacs-w3m.info,  Node: Moving over pages,  Next: Browsing with Mouse Operations,  Prev: Moving in a page,  Up: Browsing Web Pages
+
+3.1.4 Moving from page to page
+------------------------------
+
+This section explains how to move from page to page, but not by
+following links or inputing URLs (these ways of moving are explained in
+*note Launching and Jumping::).
+
+   This includes commands to move backwards and forwards in history (the
+familiar "Back" and "Forward" from other browsers), and the obligatory
+"Go to the home page" feature.  You will probably understand this
+better after reading the *note Tracing History:: section.
+
+`B' (Lynx-like keymap)
+`<left>' (Lynx-like keymap)
+`l' (Info-like keymap)
+`p' (Info-like keymap)
+     Move back one page in history (`w3m-view-previous-page').  With a
+     numeric argument ARG, move back ARG pages.  This is the preferred
+     way to go back in time.
+
+`N' (Lynx-like keymap)
+`n' (Info-like keymap)
+     Move forward one page in history (`w3m-view-next-page').  Of
+     course, this will work only if you've used `B' (`l' for the
+     `Info-like' keymap) to move back in history.  If called with a
+     numeric argument ARG, move forward ARG pages. This command actually
+     allows you to go back to the future!
+
+`H'
+     Move to the home page (`w3m-gohome').  You can specify the URL of
+     the home page by customizing the `w3m-home-page' variable
+     ("about:" by default).
+
+   These commands are exclusive features of emacs-w3m, we were able to
+obtain patents on them, so you won't find them anywhere else.  That's
+why you must learn to use them today!  (Just kidding.)
+
+`^'
+`u' (Info-like keymap only)
+     Attempt to move to the parent directory of the page currently
+     displayed.  For instance, it will attempt to move to
+     "http://foo/bar/" when "http://foo/bar/baz" is displayed.  This
+     function has been implemented because of the following
+     observation: users of web browsers often have to move up one level
+     of directories because the information they're looking for isn't
+     displayed on the current page (either because it has been deleted,
+     or because a search engine took them to the wrong page).
+
+     When you use another web browser, you usually need to remove the
+     last component from the URL by using the `<DEL>' key, etc. several
+     times manually.  In emacs-w3m, this operation can be performed in
+     only one keystroke, by typing `^'!
+
+     Also, you type this command with prefix as "2 ^", you visit the
+     upper directory according to input number. you type "0 ^", you
+     visit the top of this site.
+
+`<SPC>'
+     When the current point is located at the end of the buffer and you
+     cannot scroll down further, hit the `<SPC>' key to go on to the
+     "next page" (`w3m-scroll-up-or-next-url').  Here, "next page"
+     means the page referred to in the special "next" header of the
+     current page (read on).  This feature has nothing to do with the
+     history.
+
+     You probably noticed that some websites split their contents over
+     several small pages, partly because it's not comfortable for users
+     to wait for huge contents to transfer in one go.  For example,
+     search results of search engines often appear like that.  On such
+     sites, users often need to follow links manually from one page to
+     the next in order the access all the information.
+
+     Hopefully emacs-w3m attempts to enable you to browse a series of
+     contents over pages as if you were viewing them as a single page,
+     by combining two operations: explicitly following links and
+     scrolling.
+
+     That's how it works: these kinds of websites often have fields
+     such as "next", "prev" or "previous" in the headers of their web
+     pages.  These fields contain information about links between
+     divided pages.  Emacs-w3m uses these fields to know what to follow.
+
+     Let's take an example with Google again to explain how the two
+     operations (following links and scrolling) are combined.  Open
+     `http://www.google.com' and search for a word.  If you search for a
+     very common word (e.g. "hamburger"), you will get tons of search
+     results.  Google returns the first page of search results, after
+     having sorted them using its own algorithm and divided them into
+     several pages.  Use `<SPC>' to scroll through this first page.
+     Keep scrolling until you see the end of the web page in the
+     window.  Here, a surprise is waiting for you.  If you use a web
+     browser other than emacs-w3m and want to see the rest of the
+     search results, you would have to click on any of the numbers
+     listed under
+
+          Gooooooogle
+
+          1 2 3 4 5 6 7 8...
+
+     to follow the link.  But with emacs-w3m, you can follow the link
+     by just typing `<SPC>', just as if you were scrolling!
+
+`<DEL>'
+`b'
+`<backspace>'
+`S-<SPC>'
+`C-?'
+     When the point is located at the beginning of the buffer and you
+     cannot scroll upward, hit the `<DEL>' to go to the "previous" page
+     (`w3m-scroll-down-or-previous-url').  Here, the "previous" page
+     means the page which is assigned to the "prev" or "previous" fields
+     in the header of the current page.  This function has nothing to
+     do with the history, and works like `<SPC>'
+     (w3m-scroll-up-or-next-url).
+
+
+File: emacs-w3m.info,  Node: Browsing with Mouse Operations,  Next: Going Back to Daily Hacking and/or Daily Writing,  Prev: Moving over pages,  Up: Browsing Web Pages
+
+3.1.5 Surfing using the mouse
+-----------------------------
+
+The emacs-w3m developers went to some trouble to ensure that normal
+people who aren't Emacs otaku can also use emacs-w3m.  You can perform
+most web browsing operations using only the mouse except for entering
+text, e.g. URL, forms, etc.  Note that sometimes you might still need to
+use modifier keys since the emacs-w3m developers are all Emacs otaku...
+
+   Use `mouse-2' to "follow links" (the first basic of web browsing).
+Under Emacs 22.1 and newer, you can also follow links using `mouse-1',
+depending of the value of `mouse-1-click-follows-link'.
+
+`mouse-2'
+     Follow the link under the mouse pointer
+     (`w3m-mouse-view-this-url').
+
+`S-<mouse-2>'
+     Follow the link under the mouse pointer in a new session
+     (`w3m-mouse-view-this-url-new-session').
+
+   Scrollbar, menubar and toolbar are helpful in emacs-w3m when you use
+a mouse (your Emacs must support them, and you must have enabled them).
+You can scroll an emacs-w3m window using the scrollbar.  You can invoke
+many emacs-w3m commands described in this manual from the "w3m" menu
+which appears at the top of the Emacs frame.  Note: it's not necessary
+to use the menubar for most emacs-w3m commands, you can use the toolbar
+icons instead.
+
+   To switch between buffers in an emacs-w3m window using "Tabs" (*note
+Using Tabs::), click on the topmost line in an emacs-w3m window
+directory using `mouse-2' or choose one from the "Tab" menu which
+appears next but one to the "w3m" menu.
+
+
+File: emacs-w3m.info,  Node: Going Back to Daily Hacking and/or Daily Writing,  Prev: Browsing with Mouse Operations,  Up: Browsing Web Pages
+
+3.1.6 Return to an Ordinary Life
+--------------------------------
+
+Think back.  You probably didn't start Emacs to browse the web, but to,
+say, replace some editor's built-in interpreter with scheme, write Info
+documentation or put into print your opinion on software patents...
+who knows?  While you were using Emacs, you ran into the need to browse
+the web for your work.  But you happened to be able to see the web page
+without leaving Emacs at all.  Wow.
+
+   Now the time has come to return to work.  Keep it up or the world
+won't change!  Type `q' if you think you might need to browse the web
+again.  Type `Q' if you don't have any intention to go back to
+emacs-w3m for a while.
+
+`q'
+     Close an emacs-w3m window and select the other buffer
+     (`w3m-close-window').
+
+`Q'
+     Save the "arrived URLs" list to disk (*note Tracing History::),
+     save cookies (*note Cookie Variables::) and really quit emacs-w3m
+     (`w3m-quit').
+
+
+File: emacs-w3m.info,  Node: Inline Images,  Next: Tracing History,  Prev: Browsing Web Pages,  Up: Basic Usage
+
+3.2 Toggle displaying inline images
+===================================
+
+If the Emacs version you're using is capable of displaying images in
+buffers, then emacs-w3m can display them in web pages, just like
+"graphical" browsers like Mozilla do.  You should make sure your Emacs
+is correctly setup for images before trying to use any of the following
+commands (*note Required Emacs Version::).
+
+   To toggle displaying of images in the current buffer, use `T' (`I'
+for the `Info-like' keymap).  It makes emacs-w3m fetch the images from
+the server, then display them in the buffer, at the position they would
+have in a "graphical" browser. If you hit the key again, images will
+disappear from the buffer.
+
+   By default, emacs-w3m won't display images, but you can change its
+behavior and choose to always display images, for this you need to
+customize the `w3m-default-display-inline-images' variable and change
+its value from `nil' to `t'.  *Note Customizable Variables::.
+
+   Emacs-w3m also comes with nifty features that let you zoom an image
+in or out, save it to a file, or view it in a external viewer.  See also
+*note Moving in a page:: for instructions on how to move from image to
+image in an emacs-w3m buffer.
+
+`T' (Lynx-like keymap)
+`I' (Info-like keymap)
+     Toggle displaying of all the inline images in this buffer
+     (`w3m-toggle-inline-images').  If and only if
+     `transient-mark-mode' is turned on and the region is active, only
+     the images within the region will be turned on.
+
+     Note1: whether to display inline images in a page from the start
+     when you first visit the page is controlled by the value of the
+     variable `w3m-default-display-inline-images' (the default is off)
+     as mentioned above.  But the visibility of images in pages that
+     you visit from this buffer inherits the last status of the
+     visibility in this buffer if
+     `w3m-toggle-inline-images-permanently' is non-`nil' (default=`t').
+     If `w3m-toggle-inline-images-permanently' is `nil',
+     `w3m-default-display-inline-images' always controls it.
+
+     Note2: this command deactivates the region, so you have to set it
+     again if you want to turn on only the images in a certain area
+     again.
+
+`t' (Lynx-like keymap)
+`i' (Info-like keymap)
+     Toggle displaying of the single inline image under the cursor
+     (`w3m-toggle-inline-image').  If and only if `transient-mark-mode'
+     is turned on and the region is active, only the images within the
+     region will be turned on.  For the `Info-like keymap', this key is
+     bound to the command (`w3m-view-image') that launches the external
+     viewer if Emacs does not support displaying images.
+
+`M-S-t' (Lynx-like keymap)
+`M-S-i' (Info-like keymap)
+     Turn off displaying of all the inline images in this buffer.
+     (`w3m-turnoff-inline-images').
+
+`I' (Lynx-like keymap)
+     View the image under point in an external viewer
+     (`w3m-view-image').
+
+`M-i'
+     Save the image under point to an external file.  The default name
+     will be the original name of the image, so most of the time
+     `M-i <RET>' will save the image with the right name
+     (`w3m-save-image').
+
+`M-['
+     Zoom out the image under point (`w3m-zoom-out-image').
+
+`M-]'
+     Zoom in the image under point (`w3m-zoom-in-image').
+
+
+File: emacs-w3m.info,  Node: Tracing History,  Next: Managing Bookmarks,  Prev: Inline Images,  Up: Basic Usage
+
+3.3 Going back through time and space
+=====================================
+
+Emacs-w3m has several ways to present you with a list of all the pages
+you visited before.  The first way is simply called the "emacs-w3m
+history", it is a list of the pages you visited in this session,
+presented hierarchically, that is: when you follow a link, the page
+you're leaving becomes the "parent" of the page you're going to.  It is
+a very nice to keep track of the pages you visited, and remember from
+where you came if the history gets too long.
+
+   Here is an example of this feature in action, after a short visit to
+the GNU Project's homepage:
+
+     GNU's Not Unix! - the GNU Project and the Free Software Foundation (FSF)
+       Philosophy of the GNU Project - Free Software Foundation (FSF)
+         GNU Emacs - GNU Project - Free Software Foundation (FSF)
+          Order from the Free Software Foundation (FSF)
+       Links to Other Free Software Sites - GNU Project - Free Software Fo...
+         EFF: Homepage
+
+   (In fact, this example is slightly edited to fit in 72 columns; the
+URLs won't be cut in the actual emacs-w3m buffer.)
+
+   You can get this kind of history using the `s' key (the `o' key for
+the `Info-like' keymap) in any emacs-w3m buffer.
+
+   Please note that this history is buffer-local, i.e. specific to an
+emacs-w3m buffer.  But emacs-w3m has a unique feature: when you visit a
+new page, the history is copied over to the new buffer, so that you can
+still access the pages you visited so far.  This is different from the
+way Mozilla and others work; in these browsers the history always starts
+from scratch in new buffers.
+
+   Emacs-w3m can do more than just record which pages you visited, it
+can also save specific locations in those pages, in case you want to go
+back to the exact same place in the page.  Press `C-c C-@', and the
+location of the cursor will be stored in history.  In order to go back
+to that particular location within the page, press `C-c C-v' in the
+emacs-w3m buffer visiting the page.
+
+`s' (Lynx-like keymap)
+`C-u s' (Lynx-like keymap)
+`o' (Info-like keymap)
+`C-u o' (Info-like keymap)
+     Display the list of URLs visited in this session.  If called with a
+     prefix argument (see below), show the list of arrived URLs instead
+     (`w3m-history').
+
+`C-c C-@'
+`C-c C-<SPC>'
+     Record the position of the cursor in the page in history.
+
+`C-c C-v'
+     Move to the position which has been marked with `C-c C-@'
+     (`w3m-history-store-position') in the currently displayed page.
+
+   The other way to have information about past pages is the "arrived
+URLs" list: it is a list of the last 500 URLs you have visited in
+emacs-w3m.  The list is ordered by date, the most recent coming first,
+and for each page the time of visit is displayed.  Here's an example
+(edited):
+
+     Order from the Free Software Foundation (FSF)             22:53:25
+     GNU Emacs - GNU Project - Free Software Foundation (FS    22:53:05
+     Philosophy of the GNU Project - Free Software Foundati... 22:52:46
+     Philosophy of the GNU Project - Free Software Foundati... 22:52:39
+     EFF: Homepage                                             22:52:18
+     Links to Other Free Software Sites - GNU Project - Fre... 22:52:07
+     Links to Other Free Software Sites - GNU Project - Fre... 22:52:07
+     GNU's Not Unix! - the GNU Project and the Free Softwar... 22:51:32
+     Bookmarks                                                 22:51:02
+     The DICT Development Group- upwards                       2003-01-08
+     the monkey puzzle: new debian packages as an rss feed     2003-01-08
+     new-debian-packages.rss                                   2003-01-07
+     it's a miracle                                            2003-01-06
+
+   You can get this history by passing a prefix argument to the previous
+command, i.e. using `C-u s' (`C-u o' for the `Info-like' keymap).  The
+number of URLs showed in this page is customizable, see the
+`w3m-keep-arrived-urls' variable.  It cannot exceed 500 by default.
+*Note Customizable Variables::.
+
+   Of course, in all cases all the lines showed in the examples are
+links, you can go to any of the pages you visited previously just like
+if you were visiting a regular page, by following the link.
+
+   Also see the *note Moving over pages:: section, it explains how to
+move in the history with simple keybindings, i.e. the "Back" and "Next"
+features.
+
+
+File: emacs-w3m.info,  Node: Managing Bookmarks,  Next: Using Tabs,  Prev: Tracing History,  Up: Basic Usage
+
+3.4 That's a favorite with me!
+==============================
+
+Like all modern browsers, emacs-w3m has advanced features related to
+bookmarks: it lets you classify them in categories, edit them and of
+course, browse them easily.
+
+* Menu:
+
+* Adding Bookmarks::            Adding a URL to your favorites
+* Consulting Bookmarks::        Browse your bookmarks
+* Editing Bookmarks::           How to change your bookmarks
+
+
+File: emacs-w3m.info,  Node: Adding Bookmarks,  Next: Consulting Bookmarks,  Up: Managing Bookmarks
+
+3.4.1 Adding a URL to your favorites
+------------------------------------
+
+There are several ways to add a URL to your bookmarks.  The first one is
+to use the `a' key (or call the `w3m-bookmark-add-current-url' command)
+to add the page you're currently browsing: it will prompt you for a
+section to where the bookmark should go (completion is available with
+the `<TAB>' key) and will let you edit the title of the bookmark (the
+default being the title of the current page).  Complete these two
+steps, validating each with `<RET>', and you will see the message
+"Added" in the minibuffer, which means (surprise!) that the page has
+been added to your bookmarks.
+
+   Another way to add a bookmark is to use the `M-a' key (or call the
+`w3m-bookmark-add-this-url' command): it adds the URL under point (that
+means, the URL you would be taken to if you followed the link) to the
+bookmarks.  As before, you will have to input the section for this
+bookmark and its title, the default being this time the name of the
+link itself.
+
+   The third and final way to do this is to use `C-u a', this time you
+will be prompted for the URL to add, its section, and the title to use
+for it in the bookmarks.
+
+`a'
+     Add the current page to the bookmarks, or if called with a prefix
+     argument, prompt for a URL and add it
+     (`w3m-bookmark-add-current-url').
+
+`M-a'
+     Add the URL under point to the bookmarks
+     (`w3m-bookmark-add-this-url').
+
+
+File: emacs-w3m.info,  Node: Consulting Bookmarks,  Next: Editing Bookmarks,  Prev: Adding Bookmarks,  Up: Managing Bookmarks
+
+3.4.2 Browse your bookmarks
+---------------------------
+
+The easiest way to see the bookmarks is to use the `v' key in an
+emacs-w3m buffer; another possibility is to go to the special URL
+`about://bookmark/'.  You will see your bookmarks, organized by
+section, each line being one bookmark.  You can browse them exactly
+like you would browse any other page.
+
+   On the bookmarks page a w3m minor mode is activated, the bookmark
+mode.  It adds key bindings to edit the bookmarks.  *Note Editing
+Bookmarks::.
+
+`v'
+     Visit the bookmarks page (`w3m-bookmark-view').
+
+
+File: emacs-w3m.info,  Node: Editing Bookmarks,  Prev: Consulting Bookmarks,  Up: Managing Bookmarks
+
+3.4.3 How to change your bookmarks
+----------------------------------
+
+The bookmark minor mode (*note Consulting Bookmarks::) offers several
+key bindings related to bookmark edition, most noticeably `C-k' to kill
+(i.e. delete) a bookmark, and `E' (`e' for the `Info-like' keymap) to
+edit the bookmark file.
+
+   Bookmarks are kept in an HTML file, so you can edit the file by hand,
+but be very careful: if you erase the comments emacs-w3m needs to
+recognize section names, things can break easily.  If you know the
+basics of HTML, the file should otherwise be quite self-explanatory.
+
+`C-k'
+     Kill the bookmark under point (`w3m-bookmark-kill-entry').
+
+`E'
+     Visit the bookmarks file (`w3m-bookmark-edit').
+
+`C-_'
+     Undo the last changes (`w3m-bookmark-undo').
+
+
+File: emacs-w3m.info,  Node: Using Tabs,  Next: Working with buffers,  Prev: Managing Bookmarks,  Up: Basic Usage
+
+3.5 Everybody likes tabs
+========================
+
+Unlike most other text-based browsers, emacs-w3m has support for tabbed
+browsing.  What is tabbed browsing, you might ask?  It's very simple: it
+is a way to represent all active emacs-w3m buffers in a single window,
+by showing a line at the top which shows all the buffers in a simple and
+self-explaining way, each buffer being shown as a "tab".  This line
+stays visible all the time and does not scroll with the rest of the
+buffer, so that you can switch to another buffer, or use the feedback it
+provides at any moment.
+
+   The easiest way to get the feeling of it is to just try, so go on and
+open an emacs-w3m session.  If you didn't change anything to the
+configuration, the tabs line is active by default, it is this bright
+line at the top with a smaller rectangle that shows the title of the
+current page.  Now create another w3m buffer (with `G', for example):
+now you have two of these rectangles.  These are tabs.
+
+   The most obvious use of tabs is switching: by clicking with the
+`mouse-1' button on a tab, you make the buffer it represents active.
+It also works with the `mouse-2' button, or with rolling the mouse
+wheel if you are using GNU Emacs.  It's a very quick and easy way to
+work with several emacs-w3m buffers, you just have to point and click,
+or to roll the mouse wheel.  (Yeah yeah, I hear you.  You want to switch
+using the keyboard.  Don't worry, it's also possible.  It's explained in
+the next section.  Now keep quiet and read on!)
+
+   Another nifty feature is the feedback it provides.  If you are on a
+color terminal or window system, emacs-w3m shows the text in the tab in
+different colors to show the status of the page(1).  For example, when
+the page is being loaded, the text is in red, and goes back to its
+default color (usually black) when the loading is complete.  This way
+you can tell with a single glance at the tabs line if the page you're
+waiting for has arrived or not.
+
+   Finally, if the web page provides a favicon, it will be shown in the
+tab as well(2).  More eye-candy for the emacs-w3m user!
+
+   User options:
+
+`w3m-use-tab'
+     Whether to activate tabbed browsing or not.
+
+   If you are a GNU Emacs user, the mouse wheel allows you not only to
+go to an adjacent buffer but also to move a buffer to the adjacent
+place.  To do that, press and hold down the control key while you roll
+the mouse wheel on the tabs line.  There are two variables that control
+how emacs-w3m behaves by the mouse wheel:
+
+`w3m-tab-track-mouse'
+     This variable controls whether to make the mouse track the
+     selected tab.  The default value is `t'.  You may want to set this
+     to `nil' if you use a proportional font for the tab faces.  See
+     also `w3m-tab-mouse-position-adjuster'.
+
+`w3m-tab-mouse-position-adjuster'
+     This variable contains the values used to adjust the mouse
+     position on tabs when the mouse pointer tracks the selected tab.
+     The default value is `(0.5 . -4)'.  It consists of the cons of a
+     floating point number M and an integer N that are applied to
+     calculating of the mouse position, which is given in pixel units,
+     as follows:
+
+          (TAB_WIDTH + M) * ORDER + N
+
+     Where TAB_WIDTH is the pixel width of a tab and ORDER is the order
+     number in tabs.  The result is rounded towards zero.
+
+     Note that the calculation will always fail if you use a
+     proportional font for the tab faces.  See also
+     `w3m-tab-track-mouse'.
+
+   ---------- Footnotes ----------
+
+   (1) Although XEmacs shows all tabs in the same colors at every
+moment, you can easily distinguish the selected tab and others and see
+the status of the current page in the modeline.
+
+   (2) Under XEmacs, favicons will currently not be shown in the tabs
+line.
+
+
+File: emacs-w3m.info,  Node: Working with buffers,  Next: Downloading,  Prev: Using Tabs,  Up: Basic Usage
+
+3.6 Creating, killing and moving across buffers
+===============================================
+
+Sooner or later, you will be addicted to emacs-w3m, and you'll have to
+manage all your browsing needs with it.  To help you with this daunting
+task, we have imagined many different ways to work with emacs-w3m
+buffers.
+
+* Menu:
+
+* Creating and killing buffers:: Creating and killing buffers
+* Moving across buffers::        Moving across buffers
+* Selecting buffers::            Selecting buffers from a list
+
+
+File: emacs-w3m.info,  Node: Creating and killing buffers,  Next: Moving across buffers,  Up: Working with buffers
+
+3.6.1 Creating and killing buffers
+----------------------------------
+
+It is sometimes useful to just create a new buffer without opening a web
+page in it.  This operation is called "creating a twin copy" of a
+buffer, in emacs-w3m lingo.  It will simply create a new buffer whose
+contents are identical to the currently active buffer.
+
+   The opposite of this is closing buffers: you can just close one
+buffer (because you're not interested in its contents anymore) or you
+can decide to close all buffers but the current one.  Emacs-w3m lets
+you do this with the following commands:
+
+`C-c C-t'
+`M-n'
+     Create an identical copy of the currently active buffer, under a
+     new name.  This is used to start a new session without loading a
+     web page in the new buffer (`w3m-copy-buffer').
+
+`C-c C-w'
+     Close the current emacs-w3m buffer (`w3m-delete-buffer').
+
+`C-c M-w'
+     Close all emacs-w3m buffers, but the active one
+     (`w3m-delete-other-buffers').
+
+
+File: emacs-w3m.info,  Node: Moving across buffers,  Next: Selecting buffers,  Prev: Creating and killing buffers,  Up: Working with buffers
+
+3.6.2 Moving across buffers
+---------------------------
+
+The commands you will probably use most often are those who allow you
+to go to an adjacent buffer; that is a buffer just "after" or "before"
+the current one.  The meaning of this will be obvious if you use tabs:
+the next buffer is the one just after the active one, on the right, and
+the previous buffer is the one on the left.  However, XEmacs displays
+tabs in random order unfortunately, so you need to pay attention to the
+number which is displayed in each tab in order to know what is the
+adjacent buffer if you are using XEmacs.  The key bindings for these
+commands are `C-c C-p' and `C-c C-n'.
+
+   These commands understand the numeric argument convention, i.e. if
+you call them with a number N as argument, you will be taken N buffers
+away from the current one.  For example, to go two buffers on the right
+from the current position, use `2 C-c C-n'(1).
+
+`C-c C-p'
+     Move to the previous emacs-w3m buffer.  This is usually the next
+     buffer to the left in the tabs line.  If called with a numeric
+     argument N, move N buffers to the previous (`w3m-previous-buffer').
+
+`C-c C-n'
+     Move to the next emacs-w3m buffer.  This is usually the next
+     buffer to the right in the tabs line.  If called with a numeric
+     argument N, move N buffers to the next (`w3m-next-buffer').
+
+   If you are a GNU Emacs user, you can also move an emacs-w3m buffer to
+the adjacent place on the tabs line using the following commands:
+
+`C-c C-.'
+`C-c C->'
+     Move the selected emacs-w3m buffer to the right hand adjacent
+     place on the tabs line.  If called with a numeric argument N, move
+     N tabs to the right (`w3m-tab-move-right').
+
+`C-c C-,'
+`C-c C-<'
+     Move the selected emacs-w3m buffer to the left hand adjacent place
+     on the tabs line.  If called with a numeric argument N, move N
+     tabs to the left (`w3m-tab-move-left').
+
+   Also note that if these commands don't fit you well despite our
+efforts, you might find what you need in "generalist" buffer management
+packages such as ibuffer or iswitchb--since emacs-w3m buffers are
+regular Emacs buffers, they will work fine too.
+
+   ---------- Footnotes ----------
+
+   (1) You can use `C-u 2 C-c C-n' instead of `2 C-c C-n' as usual.  But
+keep in mind all numeric keys and minus-sign are assigned to the numeric
+prefix arguments in emacs-w3m buffers.
+
+
+File: emacs-w3m.info,  Node: Selecting buffers,  Prev: Moving across buffers,  Up: Working with buffers
+
+3.6.3 Selecting buffers from a list
+-----------------------------------
+
+There are two ways to select emacs-w3m buffers from a list.  The first
+one is a minibuffer-based interface, called with `C-c C-a'.  You can
+choose the buffer you want to display using the `M-p' and `M-n' keys
+(or the <up> and <down> arrow keys), they will make you cycle through
+the list.  You can also edit the prompt and type the title of an
+existing web page, using `<TAB>' for completion.  For example, if you
+have a "Google Search" page opened, you can type "Goo" then hit `<TAB>'
+and the page title will be completed.  After the page name, the buffer
+name is given (between brackets).  Then use `<RET>' to switch to the
+buffer you have chosen.
+
+   The second and more sophisticated interface is called the emacs-w3m
+buffer list, it is invoked with `C-c C-s'.  It shows you the list of
+all opened buffers in a separate window (either a vertical or a
+horizontal window--`C-c C-s' toggles between the two modes) and allows
+you to view the buffers in real-time: when you move the point in the
+buffer list, the buffer under point is displayed in the main window,
+which allows you to have direct visual feedback of the buffer you're
+switching to.
+
+   To move in the buffer list, you can use the `p' and `n' keys (or the
+arrow keys).  In the buffer list, `<DEL>' and `<SPC>' allow you to
+scroll the buffer displayed in the main window, which is handy if you
+want to check that you're seeing the right buffer.  To select the
+buffer under point, you can use the `<RET>' key, in which case the
+buffer list will be buried, or the `w' key, in which case the buffer
+list will remain visible and the focus given to the main window.
+
+   You can also close and create buffers from this menu, using the same
+bindings as the one used in regular buffers (*note Creating and killing
+buffers::).
+
+   Finally, the `?' key shows a short help, `g' refreshes the list and
+the `q' key exits the buffer list, not changing the active buffer.
+
+`C-c C-a'
+     Prompt for a buffer name in the minibuffer.  `M-p' and `M-n' cycle
+     through the list of existing buffers and `<TAB>' completes
+     (`w3m-switch-buffer').
+
+`C-c C-s'
+     Show the buffer list in a separate window (`w3m-select-buffer').
+     In this window, `C-c C-s' toggles between horizontal and vertical
+     modes, `<RET>' selects the buffer under point and buries the
+     buffer list, `w' selects the buffer under point and gives it the
+     focus, `n', `p' and the arrow keys can be used to move down or up.
+
+
+File: emacs-w3m.info,  Node: Downloading,  Next: Submitting Forms,  Prev: Working with buffers,  Up: Basic Usage
+
+3.7 Downloading a file
+======================
+
+It is possible to download (i.e. fetch, but not display) any web page or
+file with emacs-w3m: just put the point on the link you want to
+download and hit `d'.  You will be prompted for a filename under which
+to save the file locally, by default it will be the name of the file on
+the remote server.  Confirm with `<RET>'.  The download will be
+asynchronous and not block your Emacs session, you can continue your
+emacs-w3m browsing in another buffer if you want.
+
+   Please note that this download mechanism uses w3m to download things,
+you might want to use the more powerful wget downloader instead.  Have a
+look at our friend project "emacs-wget", its homepage is at
+`http://pop-club.hp.infoseek.co.jp/emacs/emacs-wget/'.
+
+`d' (Lynx-like keymap)
+`D' (Info-like keymap)
+     Download the file or the page pointed to by the link under point
+     (`w3m-download-this-url').
+
+`M-d' (Lynx-like keymap)
+`d' (Info-like keymap)
+     Download the contents of URL to a local file (`w3m-download').  You
+     will be prompted for the URL and the name of a local file.
+
+
+File: emacs-w3m.info,  Node: Submitting Forms,  Next: HTML File Information,  Prev: Downloading,  Up: Basic Usage
+
+3.8 Filling in HTML forms
+=========================
+
+These emacs-w3m commands let you move between forms and fill in fields,
+using simple key bindings and optionally prompting you for values in
+Emacs windows or in the minibuffer.
+
+   The main key binding to remember is `<RET>'.  It has different
+meanings, depending on the thing under point: for textareas, you will be
+prompted for a value in the minibuffer.  For select tags, you will be
+given a list of choices in an electric Emacs window (you can move using
+the arrow keys, and pick one with the `<RET>' key).  For radio and
+checkbox buttons, the `<RET>' key selects one of the elements.
+
+   When in the minibuffer or in the electric window, you can cancel with
+the `C-c C-q' sequence.  To submit the form, use `C-c C-c'.
+
+`]'
+     Jump to the next form (`w3m-next-form').
+
+`['
+     Jump to the previous form (`w3m-previous-form').
+
+`C-c C-c'
+     Submit form at point (`w3m-submit-form').
+
+`<RET>'
+     Edit the value of the form item under point.
+
+`<RET>' (w3m-form-*-keymap)
+     Accept the value.
+
+`C-c C-q' (w3m-form-*-keymap)
+     Quit editing the form item, leaving changes.
+
+   Unless `w3m-form-use-textarea-backup' is set to `nil', emacs-w3m
+stores the text you input in textareas in backup files for later reuse.
+When you start editing a form and there is backup text available, you
+will be asked whether you want to use it or not.  Files to save text
+are stored in the directory specified by the
+`w3m-form-textarea-directory' variable.
+
+
+File: emacs-w3m.info,  Node: HTML File Information,  Prev: Submitting Forms,  Up: Basic Usage
+
+3.9 Support for web page editing and hacking
+============================================
+
+For those who usually use Emacs to write documentation or programs, it's
+very convenient to be able to browse the web in the same Emacs session.
+For example, if you are editing a HTML file in Emacs, you can preview it
+without launching an external browser.  You can also quickly copy sample
+code from technical documentation during a programming marathon...
+
+   How about the opposite?  (That is, being able to edit the source of a
+web page in a web browser.)  Wouldn't that be cool?  Imagine you found
+an error in your document after previewing it in emacs-w3m; you probably
+want to fix it right away.  Or if you are a programmer specialized in
+web technology, sometimes you might want to see the raw HTML file for
+the current web page... especially if you are the author of a Shimbun
+module (*note Shimbun Basics::).
+
+   It is usually possible to switch to an Emacs buffer visiting an HTML
+file by using the buffer name, but emacs-w3m adds a specific keybinding
+for this.  Emacs-w3m knows the URL of the web page it is visiting, so
+why not take advantage of this?
+
+`\'
+     Display the current web page in the raw HTML
+     format(`w3m-view-source').
+
+`='
+     Show the information about currently displayed web page. It
+     includes title, URL, document type, last modified
+     date(`w3m-view-header').
+
+`E' (Lynx-like keymap)
+`e' (Info-like keymap)
+     Edit the local file pointed by URL of current
+     page(`w3m-edit-current-url').
+
+`e' (Lynx-like keymap)
+`E' (Info-like keymap)
+     Edit the local file pointed by URL under
+     point(`w3m-edit-this-url').
+
+`M'
+     Launch an external browser (other than emacs-w3m) and display the
+     same web page as currently displayed in
+     emacs-w3m(`w3m-view-url-with-external-browser').  The external
+     browser to be used is defined by the variable
+     `w3m-content-type-alist', depending on the kind of URL.
+
+`|'
+     Pipe the source of the web page to a command.  You will be
+     prompted for the command (`w3m-pipe-source').
+
+   The (*note Tips::) section gives more examples on how to integrate
+emacs-w3m with other commands and Emacs subsystems.
+
+
+File: emacs-w3m.info,  Node: Pretty Good Features,  Next: Customizable Variables,  Prev: Basic Usage,  Up: Top
+
+4 Pretty good features
+**********************
+
+* Menu:
+
+* Using Search Engines::        Convenient ways to search the web
+* Grouping URLs::               Visiting several web pages in one URL
+* Weather Information::         It will be fine tomorrow
+* Using Antenna::               Raise your antenna
+* Showing Directory Tree::      Showing the tree structure of local directories
+* Viewing Perl Documents::      Viewing Perl Documents
+* Using Namazu::                Searching files with Namazu
+* Octet::                       Viewing data in various octal form
+* Frame Local Buffers::         Grouping sessions into separate frames
+* Session Manager::             Saving and loading sessions
+
+
+File: emacs-w3m.info,  Node: Using Search Engines,  Next: Grouping URLs,  Up: Pretty Good Features
+
+4.1 Convenient ways to search the web
+=====================================
+
+Emacs-w3m comes with advanced features related to search engines, they
+are accessible through three interfaces:
+
+   * The regular search interface, invoked by the `S' key (the `s' key
+     for the `Info-like' keymap) in any emacs-w3m buffer.  It is a
+     simple interactive way to choose which search engine to use and
+     input a search term; see *note The Search Interface::.
+
+   * The Quicksearch interface: it is a faster (yet more complicated)
+     way to use search engines, by going to specially crafted URLs.
+     For more information about this feature, see *note Quick
+     Searching::.
+
+   * The "I'm feeling lucky" feature: if it's enabled
+     (`w3m-enable-google-feeling-lucky'), entering words instead of a
+     regular URL at the URL prompt will begin a Google search for the
+     words automatically, and display the most relevant result.  This
+     is useful if you actually want to fetch the most relevant page, it
+     does not display a list of search results.
+
+* Menu:
+
+* The Search Interface::        How to search with emacs-w3m
+* Quick Searching::             An alternative (and fast) way to search the web
+* Adding New Search Engines::   Using your favorite engines
+
+
+File: emacs-w3m.info,  Node: The Search Interface,  Next: Quick Searching,  Up: Using Search Engines
+
+4.1.1 How to search with emacs-w3m
+----------------------------------
+
+You can fire up the regular search interface by using the `S' key (the
+`s' key for the `Info-like' keymap) in an emacs-w3m buffer.  You will
+see a prompt in the minibuffer, asking for a search term.  Type one or
+several words at the prompt, then hit `<RET>'.  The result page of your
+search in the engine appears, you can then browse the results, just as
+if you had used the normal web based entry point to the engine.
+
+   You probably noticed that you have not been given a chance to choose
+which engine you want to search with.  By default, emacs-w3m will use
+the Google search engine, you can change this behavior by customizing
+the `w3m-search-default-engine' variable (see *note Customizable
+Variables::), or you can specify the search engine each time you use the
+command.
+
+   To specify which engine to use, you have to give the command a prefix
+argument (usually, this means hitting `C-u' before the command, e.g.
+`C-u S' (`C-u s' for the `Info-like' keymap).  Emacs-w3m will prompt
+you for an engine, you can choose one by typing its name (completion is
+also available with the `<TAB>' key).  Once you have made your choice,
+hit the `<RET>' key.  You can then type your search term, hit `<RET>',
+and you will see the search results.
+
+`S' (Lynx-like keymap)
+`s' (Info-like keymap)
+     Begin a new search.  If called with a prefix argument, prompt for
+     the engine to use (`w3m-search').
+
+
+File: emacs-w3m.info,  Node: Quick Searching,  Next: Adding New Search Engines,  Prev: The Search Interface,  Up: Using Search Engines
+
+4.1.2 An alternative (and fast) way to search the web
+-----------------------------------------------------
+
+If you're a "Web Power User" (and since you're reading this, you
+probably are), you need a quick and efficient way to perform searches.
+The Quick Searching feature is one.
+
+   What does it do?  It lets you launch web searches by simply going to
+a special URL such as `gg:emacs'.  The advantages of this mode of
+operation are:
+
+   * It's fast.  You just have to type a URL to choose the engine and
+     the search word(s), in one go.
+
+   * It's convenient.  With this feature, you can easily open a new
+     emacs-w3m tab or window, and launch a search in it, using for
+     example, the `G' key to open a URL in a new window, and going to a
+     Quicksearch URL.  You can also bookmark searches just by
+     bookmarking the special Quicksearch URL.
+
+   * It works with the grouping feature.  You can launch two searches
+     at the same time, with a URL like `group:gg:emacs&ya:w3m'.  This
+     would for instance launch a search for "emacs" on Google and for
+     "w3m" on Yahoo!.  *Note Grouping URLs::.
+
+   Using it is very simple: suppose you want to search for the word
+"gnu" on Google and get a list of results.  Hit `g' to go to a new URL,
+and type "gg:gnu".  The first part of this expression, "gg" indicates
+that we want to use the Google search engine.  The second term is the
+word we will be searching for.  The prefix and the search term must be
+separated by a colon.  Hit `<RET>', and you will see the results of
+your search.  Note that you can input several words by separating them
+with spaces.  `<SPC>' is a self-inserting key in the minibuffer if the
+"Feeling Lucky" feature is enabled (it is by default; see
+`w3m-enable-google-feeling-lucky').  If it's disabled, then hit `C-q'
+first, i.e. `C-q <SPC>'.
+
+   The default configuration of emacs-w3m includes several prefixes you
+can use, they are defined in the `w3m-uri-replace-alist' variable.
+There's for example "gg" for Google, "ggg" for Google Groups, "ya" for
+Yahoo!, "al" for Altavista, "alc" for Eijirou on the web to name a few.
+You can also add prefixes for the search engines you define, *Note
+Adding New Search Engines::.
+
+   Instead of prefixes, you can also use full engine names in
+Quicksearch URLs, such as "google" or "yahoo".  These names are defined
+in the `w3m-search-engine-alist' variable.
+
+
+File: emacs-w3m.info,  Node: Adding New Search Engines,  Prev: Quick Searching,  Up: Using Search Engines
+
+4.1.3 Using your favorite engines
+---------------------------------
+
+Emacs-w3m has a number of built-in search engines you can use.  What if
+you want to use your favorite search engine and it's not listed in the
+known search engines?  You have to add it to the list of search
+engines, and it's quite easy:
+
+  1. First, you have to find what's the entry point of the search
+     engine you want to add, for example:
+
+     `http://my.searchengine.com/?query=foobar'
+
+     where foobar is the term you want to search for.
+
+  2. Once you have this information, add this to your `~/.emacs-w3m'
+     file:
+
+          (eval-after-load "w3m-search"
+            '(add-to-list 'w3m-search-engine-alist
+                          '("My engine"
+                            "http://my.searchengine.com/?query=%s"
+                            nil)))
+
+     Replace the first field "My engine" with the description of your
+     engine, the second field with the entry point (the `%s' is
+     important, it will be replaced by the search term when you issue
+     the search), and the third field is the encoding to use, `nil' or
+     omitting this field means to use the value of
+     `w3m-default-coding-system' as a regular encoding.
+
+     For English search engines, you rarely have to worry about this.
+     However, for some Japanese search engines, you may need to specify
+     something (e.g. `euc-japan') there.
+
+  3. You can now use this engine to search, using the normal `S' key
+     (the `s' key for the `Info-like' keymap) in emacs-w3m.  If you use
+     this engine often, you can also add it to the Quicksearch (see
+     *note Quick Searching::) engines and give it a small prefix, by
+     adding this to your `~/.emacs-w3m' file instead:
+
+          (eval-after-load "w3m-search"
+            '(progn
+               (add-to-list 'w3m-search-engine-alist
+                            '("My engine"
+                              "http://my.searchengine.com/?query=%s"
+                              nil))
+               (add-to-list 'w3m-uri-replace-alist
+                            '("\\`my:" w3m-search-uri-replace "My engine"))))
+
+     This way you can also use a URL like `my:foobar' to search for the
+     term "foobar" with your engine.
+
+
+File: emacs-w3m.info,  Node: Grouping URLs,  Next: Weather Information,  Prev: Using Search Engines,  Up: Pretty Good Features
+
+4.2 Visiting several web pages in one URL
+=========================================
+
+Emacs-w3m can manipulate "group URLs": special URLs that contain
+several real URLs.  When you open these group URLs, emacs-w3m will open
+one buffer for each URL in the group, allowing you to open several pages
+in one go.
+
+   To build group URLs, you just have to put together (i.e. concatenate)
+all the addresses you want to open, separating them with the ampersand
+symbol (that's "&"), and prefixing the grouped URLs with "group:".  For
+example, suppose you want to visit the GNU Project's homepage,
+`http://www.gnu.org/', and the Savannah homepage,
+`http://savannah.nongnu.org/': the group URL would be
+
+   `group:http://www.gnu.org/&http://savannah.nongnu.org/'
+
+   Since this syntax can be quite hard to use on a daily basis, this
+feature will be most useful when used with very short URLs (Quicksearch
+URLs for example, see *note Quick Searching::); or in non-interactive
+contexts.
+
+
+File: emacs-w3m.info,  Node: Weather Information,  Next: Using Antenna,  Prev: Grouping URLs,  Up: Pretty Good Features
+
+4.3 It will be fine tomorrow
+============================
+
+
+File: emacs-w3m.info,  Node: Using Antenna,  Next: Showing Directory Tree,  Prev: Weather Information,  Up: Pretty Good Features
+
+4.4 Raise your antenna
+======================
+
+Antenna is a tool to keep track of changes in web pages.  Using Antenna,
+you can periodically check if particular pages have been updated, and if
+they haven't, know the last time you saw them.
+
+   You can start Antenna using the `A' key in any emacs-w3m buffer.
+Alternatively, you can go to the special URL `about://antenna/'; it
+does the same thing.
+
+* Menu:
+
+* Setting up Antenna::          How to add your web sites to Antenna
+* Daily web tracking::          Tracking changes with Antenna
+
+
+File: emacs-w3m.info,  Node: Setting up Antenna,  Next: Daily web tracking,  Up: Using Antenna
+
+4.4.1 How to add your web sites to Antenna
+------------------------------------------
+
+If you want to add the visiting web site to Antenna, type the `+' key.
+You will be taken to the customization buffer of `w3m-antenna-sites',
+with all fields already set up for you.  You just have to hit the
+buttons "Save for future sessions" and "Finish".
+
+`+'
+     Add a URL to the Antenna database.  If called with a prefix
+     argument, ask for a URL instead of adding the current page
+     (`w3m-antenna-add-current-url').
+
+
+File: emacs-w3m.info,  Node: Daily web tracking,  Prev: Setting up Antenna,  Up: Using Antenna
+
+4.4.2 Tracking changes with Antenna
+-----------------------------------
+
+On the Antenna page, you will see two sections: one called "Updated"
+and another called "Visited".  In the "Updated" section, you will find
+websites which have changed since the last Antenna update, and in the
+"Visited" section, the websites which haven't.  In each section, each
+line stands for one website of the Antenna database, and has the
+following structure:
+
+   `  * 2002/12/15 16:43  (T)  My website'
+
+   The first part is the last time the website was updated, or if this
+information is not available, the last time Antenna noticed a change in
+this page.
+
+   The `(T)' stands for "Time", it means that the change was detected
+because the last modification time of that page has changed since the
+last Antenna update.  Another possible value here is `S' (for "Size"),
+which means that the change has been detected because the size of the
+page has changed.
+
+   The last part of this line is the title you gave to this website when
+you added it to the database.
+
+   Please note that the Antenna database doesn't get automatically
+updated, you have to update it each time you want to check if the sites
+have changed, either by hitting `R' in the Antenna page, or by passing a
+prefix argument to the command (start Antenna with `C-u A', for
+example).
+
+   If you want to make the Antenna database get updated automatically,
+set the value of the `w3m-antenna-refresh-interval' variable to a
+positive integer which is an interval time in seconds.
+
+`A'
+     Visit the Antenna page.  If called with a prefix argument, update
+     the Antenna database before displaying it (`w3m-antenna').
+
+
+File: emacs-w3m.info,  Node: Showing Directory Tree,  Next: Viewing Perl Documents,  Prev: Using Antenna,  Up: Pretty Good Features
+
+4.5 Showing the tree structure of local directories
+===================================================
+
+Using the `w3m-dtree' command, you can display a tree of all
+subdirectories of a local directory, and browse it like a regular web
+page.  The emacs-w3m buffer you get when you use this feature is very
+similar to the output of the external "tree" utility, hence the name.
+Emacs-w3m adds a bonus: if you call the command with a prefix argument,
+it will display files as well, turning emacs-w3m into a full-featured
+file browser.
+
+   Here is an example of what an emacs-w3m dtree run looks like:
+
+     /home/romain/.elisp/emacs-w3m/
+      |-CVS/
+      |-attic/
+      |  +-CVS/
+      |-autom4te.cache/
+      |-doc/
+      |  |-CVS/
+      |  +-emacs-w3m/
+      |-icons/
+      |  +-CVS/
+      |-patches/
+      |  +-CVS/
+      +-shimbun/
+         +-CVS/
+
+   And with a prefix argument, you get something like this instead:
+
+     /home/romain/.elisp/emacs-w3m/ (allfiles)
+      |-(f).cvsignore
+      |-(f)BUGS.ja
+      |-(f)COPYING
+      |-[d]CVS/
+      |  |-(f)Entries
+      |  |-(f)Repository
+      |  +-(f)Root
+      |-(f)ChangeLog
+      |-(f)ChangeLog.1
+      |-(f)Makefile
+      |-(f)Makefile.in
+      |-(f)README
+      |-(f)README.ja
+
+`D' (Lynx-like keymap)
+`T' (Info-like keymap)
+     Prompt for a local directory in the minibuffer, then display its
+     tree structure.  If called with a prefix argument (e.g. `C-u D', or
+     `C-u T' for the `Info-like' keymap), show files in the directories
+     as well (`w3m-dtree').
+
+
+File: emacs-w3m.info,  Node: Viewing Perl Documents,  Next: Using Namazu,  Prev: Showing Directory Tree,  Up: Pretty Good Features
+
+4.6 Viewing perl documents
+==========================
+
+
+File: emacs-w3m.info,  Node: Using Namazu,  Next: Octet,  Prev: Viewing Perl Documents,  Up: Pretty Good Features
+
+4.7 Searching files with Namazu
+===============================
+
+(under translation)
+
+
+File: emacs-w3m.info,  Node: Octet,  Next: Frame Local Buffers,  Prev: Using Namazu,  Up: Pretty Good Features
+
+4.8 Viewing data in various octal form
+======================================
+
+(under construction)
+
+   These following lines in your `~/.emacs' may help you to browse
+octet data files which are opened with `octet-find-file'.
+
+     (add-hook 'octet-find-file-hook 'view-mode)
+     (add-hook 'octet-find-file-hook 'w3m-minor-mode)
+
+
+File: emacs-w3m.info,  Node: Frame Local Buffers,  Next: Session Manager,  Prev: Octet,  Up: Pretty Good Features
+
+4.9 Grouping sessions into separate frames
+==========================================
+
+It is possible to manage groups of emacs-w3m sessions in separate
+frames.  One use for this would be to have two emacs-w3m frames, where
+one contains sessions visiting search engines, and the other sessions
+visiting news sites.
+
+   Emacs-w3m offers some convenient features that allow you to visit
+many web pages at the same time.  For instance, you can use tabs (*note
+Using Tabs::) to visit many pages in new sessions, or do so using a
+special URL beginning with `group:' (*note Grouping URLs::).  However,
+you may want to group them into separate frames if there are too many
+pages.  If so, the `w3m-fb-mode' command is for you.  Note that you
+have to set the `w3m-use-tab' variable to non-`nil' (`t' by default)
+and set the `w3m-pop-up-frames' variable to `nil' (the default) in
+order to use it (*note General Variables::).
+
+   Typing `M-x w3m-fb-mode' toggles the mode, but you can turn the mode
+on by giving a positive integer as a prefix argument to the command
+(zero or less turns it off).
+
+   When the `w3m-fb-mode' is turned on, the sessions that you start in
+the current frame will be associated with only that frame.  Other
+sessions that are opened in other frames will similarly only appear in
+those frames.  In other words, sessions associated with one frame don't
+appear in other frames.  `w3m-fb-mode' doesn't create any new frames,
+so you need to make them yourself in some way.
+
+
+File: emacs-w3m.info,  Node: Session Manager,  Prev: Frame Local Buffers,  Up: Pretty Good Features
+
+4.10 Saving and loading sessions
+================================
+
+It is possible to save and load the emacs-w3m sessions sets.
+
+   You can save the set of the currently opened sessions for the future
+use.  Just hit `M-S' and name the set.
+
+   Then you will ask how to take the saved sessions set back, won't you?
+Hit `M-s' to open the sessions selection menu.  The available command
+keys include:
+
+`<RET>'
+     Open all the sessions of the selected sessions set.
+
+`M-s'
+     Open the detail menu for the selected sessions set.  You can open
+     the sessions one by one in that menu.
+
+`d'
+     Delete the selected sessions set or the session.
+
+`r'
+     Rename the selected sessions set.
+
+`s'
+     Save all the opened sessions.  So does `M-S'.
+
+`n'
+     Move the cursor to the next sessions set.
+
+`p'
+     Move the cursor to the previous sessions set.
+
+`q'
+     Quit the sessions selection menu.
+
+   Emacs-w3m saves some sessions automatically.  If
+`w3m-session-deleted-save' is non-`nil', emacs-w3m saves the closed
+sessions automatically.  This would be helpful for recovering a session
+that has been closed inadvertently.  If `w3m-session-automatic-save' is
+non-`nil', emacs-w3m saves the opened sessions automatically when
+quitting emacs-w3m.
+
+   Sometimes you might forget the URLs of the pages you viewed with the
+interest.  Of course emacs-w3m helps you even in such a case.  If
+`w3m-session-load-last-sessions' is non-`nil', emacs-w3m automatically
+opens the sessions set viewed last.  If it is `ask', you will be asked
+whether to take the set back (default `nil').
+
+   You may have had a bad experience with a crash. It makes you
+disappointing, and makes displayed web pages lost. Emacs-w3m helps you
+also in such a case. If `w3m-session-crash-recovery' is non-`nil',
+emacs-w3m saves displayed sessions set to use for crash recovering
+automatically and recovers saved sessions when emacs-w3m (or emacs,
+etc) crashes (default `t'). If `w3m-session-load-crashed-sessions' is
+non-`nil', emacs-w3m automatically recovers the crashed sessions set.
+If it is `ask', you will be asked whether to recover the set (default
+`ask').
+
+
+File: emacs-w3m.info,  Node: Customizable Variables,  Next: Hooking into MUAs,  Prev: Pretty Good Features,  Up: Top
+
+5 Customizable variables
+************************
+
+A lot of emacs-w3m variables are customizable via the Custom mechanism,
+a graphical Emacs interface to define user options.  Custom offers
+several methods to define your customizations, you can use for example
+`M-x customize-option' for a single option (i.e. an Emacs Lisp
+variable) or `M-x customize-group' to see all available options
+(including variables and faces) for a "group" and change them; in which
+case the group to use is `w3m'.
+
+   Alternatively (if you don't want to use Custom), you can put
+arbitrary Emacs Lisp expressions in your emacs-w3m initialization file,
+which is `~/.emacs-w3m' by default.  This example:
+
+     (setq w3m-home-page "http://emacs-w3m.namazu.org/")
+
+would set the default homepage to `http://emacs-w3m.namazu.org/'.  The
+syntax to use is the same as in your `~/.emacs' file.  *Note Init File:
+(emacs)Init File.
+
+   Please note that some variables from external modules could be
+undefined at the time the `~/.emacs-w3m' file is loaded, thus making
+them impossible to modify (of course if you don't care about the default
+value, you can override them completely in your `~/.emacs-w3m') file.
+The `w3m-search-engine-alist' variable is a typical example (*note
+Search Variables::).
+
+`w3m-init-file'
+     When emacs-w3m starts, it will read the `w3m-init-file' file.  The
+     default value is `~/.emacs-w3m'.  You probably don't need to change
+     this.  This is a normal Emacs Lisp file and can be used to avoid
+     cluttering your `~/.emacs' and `site-init' files with emacs-w3m
+     stuff.  Emacs-w3m will also check for files with the same names as
+     this, but with `.elc' and `.el' extensions (in other words,
+     `~/.emacs-w3m.elc', `~/.emacs-w3m.el' and `~/.emacs-w3m', in this
+     order).
+
+* Menu:
+
+* General Variables::           General variables
+* Image Variables::             Variables related to images
+* Form Variables::              Variables related to forms
+* Cookie Variables::            Variables related to cookies
+* Bookmark Variables::          Variables related to bookmarks
+* Search Variables::            Variables related to searching the web
+* Weather Variables::           Variables related to weather information
+* Dtree Variables::             Variables related to the dtree feature
+* Antenna Variables::           Variables related to antenna
+* Perldoc Variables::           Variables related to perldoc
+* Namazu Variables::            Variables related to namazu
+* Octet Variables::             Variables related to the octet feature
+* Session Manager Variables::   Variables related to session manager
+* Hooks::                       Hooks
+* Other Variables::             Other variables
+
+
+File: emacs-w3m.info,  Node: General Variables,  Next: Image Variables,  Up: Customizable Variables
+
+5.1 General variables
+=====================
+
+`w3m-accept-languages'
+     List of acceptable languages in descending order of priority.  The
+     default value is set according to the `accept_language' entry of
+     the `w3m' configuration file (normally `~/.w3m/config').
+
+`w3m-add-referer'
+     Rule of sending referers.  There are five choices as the valid
+     values of this option.
+
+       1. `nil': this means that emacs-w3m never send referers.
+
+       2. `t': this means that emacs-w3m always send referers.
+
+       3. `lambda': this means that emacs-w3m send referers only when
+          both the current page and the target page are provided by the
+          same server.
+
+       4. a cons cell keeping two regular expressions: this means that
+          emacs-w3m send referers when the url of the current page
+          matches the first regular expression and does not match the
+          second regular expression.  `Nil' for the regexp matches any
+          url.
+
+       5. a function: emacs-w3m send referers when this function which
+          has two arguments, URL and REFERER, returns non-`nil'.
+
+     If you're nervous about leaking private WEB browsing history
+     information, set this option to `nil' or `lambda'.  If your
+     computer belongs to a secret network, you may set a pair of
+     regular expressions to inhibit sending referers which will
+     disclose your private information, as follows:
+
+          (setq w3m-add-referer
+                '("\\`http:\"
+                  . "\\`http://\\([^./]+\\.\\)*example\\.net/"))
+
+`w3m-add-user-agent'
+     Non-`nil' means add the User-Agent field to the request header.
+     The value of `w3m-user-agent' is used for the field body.
+
+`w3m-arrived-file'
+     Name of the file to keep the arrived URLs database.
+
+`w3m-auto-show'
+     Non-`nil' means provide the ability to horizontally scroll the
+     window.  Automatic horizontal scrolling happens when the point
+     gets away from both ends of the window, but nothing occurs if
+     `truncate-lines' is set to `nil'.
+
+     This feature works with specific emacs-w3m code; usual
+     `auto-hscroll-mode', `automatic-hscrolling', `auto-show-mode' or
+     `hscroll-mode' will all be invalidated in emacs-w3m buffers.
+
+`w3m-charset-coding-system-alist'
+     Alist of MIME charsets and coding systems.  Both charsets and
+     coding systems must be symbols.
+
+`w3m-coding-system'
+     Default coding system used to communicate with the `w3m' command.
+
+`w3m-coding-system-priority-list'
+     Coding systems in order of priority used for emacs-w3m sessions.
+
+`w3m-command'
+     Name of the executable file of the `w3m' command.  You normally
+     don't have to specify the value, since emacs-w3m looks for the
+     existing commands `w3m', `w3mmee' and `w3m-m17n' (in this order)
+     in the `exec-path' directories in order if it is `nil' in the
+     beginning.
+
+     If you want to use the other `w3m' command, specify the value of
+     this variable explicitly in the .emacs file or customize the value
+     and save it.  In this case, you need to restart Emacs and
+     emacs-w3m: there is currently no way to apply the changing of the
+     `w3m' command to all the emacs-w3m programs safely after loading
+     the `w3m.elc' module.
+
+`w3m-command-arguments'
+     List of the default arguments passed to the `w3m' command.  See
+     also `w3m-command-arguments-alist'.
+
+`w3m-command-arguments-alist'
+     Alist of regexps matching urls and additional arguments passed to
+     `w3m'.  A typical usage of this variable is to specify whether to
+     use a proxy server for particular hosts.  The first match made
+     will be used.  Here is an example of how to set this variable:
+
+          (setq w3m-command-arguments-alist
+                '(;; Don't use the proxy server to visit local web pages.
+                  ("^http://\\([^/]*\\.\\)*your-company\\.com\\(/\\|$\\)"
+                   "-no-proxy")
+                  ;; Use the proxy server to visit any foreign urls.
+                  (""
+                   "-o" "http_proxy=http://proxy.your-company.com:8080/")))
+
+     Here the first element matches any url where the scheme is `http'
+     and the hostname is either `your-company.com' or a name ending with
+     `.your-company.com'; the proxy server is not used for those hosts.
+     If you are a regexp novice, you can use the `w3m-no-proxy-domains'
+     variable instead.
+
+`w3m-command-environment'
+     Alist of environment variables for subprocesses to inherit.
+
+`w3m-confirm-leaving-secure-page'
+     If non-`nil', you'll be asked for confirmation when leaving secure
+     pages.  It is STRONGLY recommended to set a non-nil value to this
+     option.  You MUST understand what you want to do completely before
+     switching off this option.  The default value is `t'.
+
+`w3m-content-type-alist'
+     Alist of content types, regexps, commands to view, and filters.
+     Each element is a list which consists of the following data:
+
+       1. Content type.
+
+       2. Regexp matching a url or a file name.
+
+       3. Method to view contents.  The following three types may be
+          used:
+
+            a. Lisp function which takes the url to view as an argument.
+
+            b. ("COMMAND" [ARG...]) - where "COMMAND" is the external
+               command and ARG's are the arguments passed to the command
+               if any.  The symbols `file' and `url' that appear in
+               ARG's will be replaced respectively with the name of a
+               temporary file which contains the contents and the
+               string of the url to view.
+
+            c. `nil' which means to download the url into the local
+               file.
+
+       4. Content type that overrides the one specified by `1. Content
+          type'.  Valid values include:
+
+            a. Lisp function that takes three arguments URL,
+               CONTENT-TYPE, and CHARSET, and returns a content type.
+
+            b. String that specifies a content type.
+
+            c. `nil' that means not to override the content type.
+
+`w3m-correct-charset-alist'
+     Alist of MIME charsets; strange ones and standard ones.
+
+`w3m-db-history-display-size'
+     Maximum number of arrived URLs which are displayed per page.
+
+`w3m-decoder-alist'
+     Alist of encoding types, decoder commands, and arguments.
+
+`w3m-default-coding-system'
+     Default coding system used to encode url strings and post-data.
+
+`w3m-default-content-type'
+     Default value assumed as the content type of local files.
+
+`w3m-default-directory'
+     Directory used as the current directory in emacs-w3m buffers.  The
+     valid values include a string specifying an existing directory, a
+     symbol of which the value specifies an existing directory, a
+     function which takes a url as an argument and returns a directory,
+     and `nil' (which is the default).  If the specified directory does
+     not exist or it is `nil', the value of `w3m-profile-directory' is
+     used.
+
+     Note that there is an exception: if a page visits a local file or
+     visits a remote file using ftp, the directory in which the file
+     exists is used as the current directory instead.
+
+`w3m-default-save-directory'
+     Default directory where downloaded files will be saved to.
+
+`w3m-delete-duplicated-empty-lines'
+     Non-`nil' means display two or more continuous empty lines into
+     single.
+
+`w3m-dirlist-cgi-program'
+     Name of the CGI program to list a local directory.  If it is
+     `nil', the dirlist.cgi module of the `w3m' command will be used.
+
+`w3m-doc-view-content-types'
+     List of content types for which to use `doc-view-mode' to view
+     contents.  This overrides `w3m-content-type-alist'.
+
+`w3m-edit-function'
+     Function used for editing local files.  It is used when the
+     `w3m-edit-current-url' command or the `w3m-edit-this-url' command
+     is invoked.
+
+`w3m-edit-function-alist'
+     Alist of functions used for editing pages.  This option is
+     referred to decide which function should be used to edit a
+     specified page, when either `w3m-edit-current-url' or
+     `w3m-edit-this-url' is invoked.  When no suitable function is
+     found from this alist, `w3m-edit-function' is used.
+
+`w3m-enable-google-feeling-lucky'
+     Non-`nil' enables you to enter any words as well as a url when
+     prompted.  In that case, emacs-w3m uses Google to search for the
+     words.  The default value is `t'.
+
+`w3m-encoding-type-alist'
+     Alist of file suffixes and content encoding types.
+
+`w3m-file-coding-system'
+     Coding system used when writing configuration files.  This value
+     will be referred to by the `w3m-save-list' function.
+
+`w3m-file-name-coding-system'
+     Coding system used to convert pathnames when emacs-w3m accesses
+     files.
+
+`w3m-fill-column'
+     Integer used as the value for `fill-column' in emacs-w3m buffers.
+     If it is positive, pages will be displayed within the columns of
+     that number.  If it is zero or negative, the number of columns
+     which subtracted that number from the window width is applied to
+     the maximum width of pages.  Note that XEmacs does not always obey
+     this setting.
+
+`w3m-follow-redirection'
+     Maximum number of redirections which emacs-w3m honors and follows.
+     If `nil', redirections are followed by the `w3m' command.  Don't
+     set it to `nil' if you allow to use cookies (i.e., you have set
+     `w3m-use-cookies' to non-`nil') since cookies may be shared among
+     many redirected pages.
+
+`w3m-home-page'
+     This variable specifies the url string to open when emacs-w3m
+     starts.  Don't say HP, it's the abbreviated name of a certain
+     company. ;-)
+
+`w3m-horizontal-scroll-columns'
+     Number of steps in columns used when scrolling a window
+     horizontally.
+
+`w3m-horizontal-scroll-division'
+     Integer used by the program making the point certainly visible.
+     The cursor definitely does not go missing even when it has been
+     driven out of the window while wandering around anchors and forms
+     in an emacs-w3m buffer.
+
+     Suppose that the value of this variable is N.  When the point is
+     outside the left of the window, emacs-w3m scrolls the window so
+     that the point may be displayed on the position within 1/N of the
+     width of the window from the left.  Similarly, when the point is
+     outside the right of the window, emacs-w3m scrolls the window so
+     that the point may be displayed on the position of 1/N of the
+     width of the window from the right.
+
+     This feature doesn't work if `w3m-auto-show' is `nil'.  The value
+     must be a larger integer than 1.
+
+`w3m-horizontal-shift-columns'
+     Number of steps in columns used when shifting a window
+     horizontally.  The term `shifting' means a fine level scrolling.
+
+`w3m-imitate-widget-button'
+     If non-`nil', imitate the widget buttons on link (anchor) buttons.
+     It is useful for moving about in a Gnus article buffer using
+     `<TAB>' key.  It can also be any Lisp form that should return a
+     boolean value.
+
+`w3m-init-file'
+     Your emacs-w3m startup file name.  If a file with the `.el' or
+     `.elc' suffixes exists, it will be read instead.
+
+     Note: This file is used as the startup configuration _NOT_ for the
+     `w3m' command but for emacs-w3m.  In order to modify configurations
+     for the `w3m' command, edit the file named `~/.w3m/config'
+     normally.
+
+`w3m-input-coding-system'
+     Coding system used when writing to `w3m' processes.  It overrides
+     `coding-system-for-write' if it is not `binary'.  Otherwise, the
+     value of the `w3m-current-coding-system' variable is used instead.
+
+`w3m-keep-arrived-urls'
+     Maximum number of URLs which the arrived URLs database keeps.
+
+`w3m-keep-cache-size'
+     Maximum number of pages to be cached in emacs-w3m.
+
+`w3m-key-binding'
+     Type of key binding set used in emacs-w3m sessions.  The valid
+     values include `info' which provides `Info-like' keys, and `nil'
+     which provides `Lynx-like' keys.
+
+`w3m-language'
+     Your preferred language used in emacs-w3m sessions.
+
+`w3m-local-directory-view-method'
+     Symbol of the method to view a local directory tree.  The valid
+     values include `w3m-cgi' using the CGI program specified by the
+     `w3m-dirlist-cgi-program' variable (which see), and `w3m-dtree'
+     using the w3m-dtree Lisp module.
+
+`w3m-local-find-file-function'
+     Function used to open local files.  If a url of the `file:' scheme
+     in which you entered agrees with the rule of the
+     `w3m-local-find-file-regexps' variable (which see), it is used to
+     open the file.
+
+     Function should take one argument, the string naming the local
+     file.  It can also be any Lisp form returning a function.  Set
+     this to `nil' if you want to always use emacs-w3m to see local
+     files.
+
+`w3m-local-find-file-regexps'
+     `Cons' of two regexps matching and not matching with local file
+     names.  If a url of the `file:' scheme in which you entered matches
+     the first form and does not match the latter form, it will be
+     opened by the function specified by the
+     `w3m-local-find-file-function' variable.  `Nil' for the regexp
+     matches any file names.
+
+     For instance, the value `(nil . "\\.html?\\'")' allows
+     `file:///some/where/w3m.el', not `file:///any/where/index.html',
+     to open by the function specified by
+     `w3m-local-find-file-function'.  The latter will be opened as a
+     normal web page.  Furthermore, if you would like to view some
+     types of contents in the local system using the viewers specified
+     by the `w3m-content-type-alist' variable, you can add regexps
+     matching those file names to the second element of this variable.
+     For example:
+
+          (setq w3m-local-find-file-regexps
+                '(nil . "\\.\\(?:[sx]?html?\\|dvi\\|ps\\|pdf\\)\\'"))
+
+     It is effective only when the `w3m-local-find-file-function'
+     variable is set properly.
+
+`w3m-mailto-url-function'
+     Function used to handle the `mailto' urls.  Function is called with
+     one argument, just a url.  If it is `nil', a function specified by
+     the `mail-user-agent' variable will be used for composing mail
+     messages.
+
+`w3m-mailto-url-popup-function-alist'
+     Alist of `(MAJOR-MODE . FUNCTION)' pairs used to pop a mail buffer
+     up.  If a user clicks on a `mailto' url and a mail buffer is
+     composed by `mail-user-agent' with the `MAJOR-MODE', `FUNCTION'
+     will be called with a mail buffer as an argument.  Note that the
+     variables `special-display-buffer-names',
+     `special-display-regexps', `same-window-buffer-names' and
+     `same-window-regexps' will be bound to `nil' while popping to a
+     buffer up.
+
+`w3m-make-new-session'
+     Non-`nil' means making new emacs-w3m buffers when visiting new
+     pages.  If it is non-`nil' and there are already emacs-w3m buffers,
+     the `w3m' command makes a new emacs-w3m buffer if a user specifies
+     a url string in the minibuffer, and the `w3m-safe-view-this-url'
+     command also makes a new buffer if a user invokes it in a buffer
+     not being running the `w3m-mode'.  The default value is `nil'.
+
+`w3m-mbconv-command'
+     Name of the `mbconv' command provided by the `libmoe' package.
+     The `libmoe' package is used when you use the `w3mmee' command
+     instead of the `w3m' command.  See also `w3m-command'.
+
+`w3m-no-proxy-domains'
+     List of domain names for which emacs-w3m will not use a proxy
+     server.  Each element should be exactly a domain name which means
+     the latter common part of the host names, not a regexp.
+
+`w3m-output-coding-system'
+     Coding system used when reading from `w3m' processes.
+
+`w3m-pop-up-frames'
+     Non-`nil' means pop to a new frame up for an emacs-w3m session.
+     This variable is similar to `pop-up-frames' and does override
+     `w3m-pop-up-windows'.  If `w3m-use-tab' is non-`nil' or there is
+     the buffers selection window (for the `w3m-select-buffer'
+     feature), this variable is ignored when creating the second or more
+     emacs-w3m session.
+
+`w3m-pop-up-windows'
+     Non-`nil' means split the windows when a new emacs-w3m session is
+     created.  This variable is similar to `pop-up-windows' and quite
+     overridden by `w3m-pop-up-frames' as if `pop-up-frames'
+     influences.  Furthermore, if `w3m-use-tab' is non-`nil' or there
+     is the buffers selection window (for the `w3m-select-buffer'
+     feature), this variable is ignored when creating the second or more
+     emacs-w3m session.
+
+`w3m-popup-frame-parameters'
+     Alist of frame parameters used when creating a new emacs-w3m
+     frame.  It allows not only the alist form but also XEmacs' plist
+     form.
+
+`w3m-prefer-cache'
+     Non-`nil' means that cached contents are used without checking
+     headers.
+
+`w3m-profile-directory'
+     Directory where emacs-w3m config files are loaded from or saved to.
+
+`w3m-quick-start'
+     Non-`nil' means let emacs-w3m start quickly w/o requiring
+     confirmation.  When you invoke the `w3m' command, it attempts to
+     visit the page of a string like url around the cursor or the value
+     of `w3m-home-page'.  You won't be asked for the confirmation then
+     if this value is non-`nil'.  Otherwise, you will be prompted for
+     that url with the editing form.
+
+`w3m-redirect-with-get'
+     If non-`nil', use the GET method after redirection.  It controls
+     how emacs-w3m works when a server responds the code 301 or 302.
+     Here is an extract from RFC2616:
+
+     Note: RFC 1945 and RFC 2068 specify that the client is not allowed
+     to change the method on the redirected request.  However, most
+     existing user agent implementations treat 302 as if it were a 303
+     response, performing a GET on the Location field-value regardless
+     of the original request method.
+
+`w3m-relationship-estimate-rules'
+     Rules to estimate relationships between a retrieved page and
+     others.
+
+`w3m-select-buffer-horizontal-window'
+     Non-`nil' means split windows horizontally to open the selection
+     window.
+
+`w3m-select-buffer-window-ratio'
+     The percentage of the selection window to the whole frame.  The
+     car is used when splitting windows horizontally and the cdr is for
+     splitting windows vertically.
+
+`w3m-show-decoded-url'
+     Non-`nil' means show decoded URIs in the echo area, the balloon,
+     etc.  This variable can take one of the following five kinds of
+     forms:
+
+       1. t
+
+          Decode URIs using the encoding guessed from the value of
+          `w3m-coding-system-priority-list'.
+
+       2. Coding system
+
+          Decode URIs using this value.
+
+       3. List of coding systems
+
+          Decode URIs using the encoding assumed based on this list.
+
+       4. Alist of predicates and forms described below:
+
+          Each element looks like the `(PREDICATE . ENCODING)' form.
+          `PREDICATE' should be a regexp, a function or a Lisp form, and
+          `ENCODING' should be one of the forms described here
+          excluding this form.  If `PREDICATE' is a regexp, it will be
+          tested whether it matches to the target url.  If it is a
+          function, it will be called with the target url.  If it is a
+          Lisp form, it will be simply evaluated.  Elements are tested
+          in turn until the result of the test of the predicate is true
+          and the encoding which is associated to the predicate is used
+          for decoding URIs.
+
+       5. nil
+
+          Don't decode URIs.
+
+`w3m-use-title-buffer-name'
+     Non-`nil' means use name of buffer included current title.
+
+`w3m-show-error-information'
+     Non-`nil' means show an error information as a web page.  Page is
+     made when the foreign server doesn't respond to a request to
+     retrieve data.
+
+`w3m-space-before-favicon'
+     String of space char(s) to be put in front of favicon in the
+     mode-line.  It may be better to use two or more spaces if you are
+     using oblique or italic font in the modeline.
+
+`w3m-space-before-modeline-icon'
+     String of space character(s) to be put in front of the modeline
+     icon.  It may be better to use one or more spaces if you are using
+     oblique or italic font in the modeline.
+
+`w3m-terminal-coding-system'
+     Default coding system used when writing to `w3m' processes.  It is
+     just a default value to set process' coding system initially.
+     (This variable name is analogically derived from the behavior of
+     the `w3m' command which accepts data from Emacs just like reads
+     from the terminal.)
+
+`w3m-touch-command'
+     Name of the executable file of the touch command.  Note that the
+     command is required to be able to modify file's timestamp with the
+     `-t' option.
+
+`w3m-track-mouse'
+     Whether to track the mouse and message the url under the mouse.
+     See also `show-help-function' if you are using GNU Emacs.
+
+     A tip for XEmacs users:
+
+     You can also use the `balloon-help' feature by the
+     `M-x balloon-help-mode' command with arg 1.  If the window manager
+     decorates the balloon-help frame, and that is not to your taste,
+     you may strip it off with the following directives:
+
+          For ol[v]wm use this in .Xdefaults:
+             olvwm.NoDecor: balloon-help
+               or
+             olwm.MinimalDecor: balloon-help
+
+          For fvwm version 1 use this in your .fvwmrc:
+             NoTitle balloon-help
+          or
+             Style "balloon-help" NoTitle, NoHandles, BorderWidth 0
+
+          For twm use this in your .twmrc:
+             NoTitle { "balloon-help" }
+
+     See the `balloon-help.el' file for more information.
+
+`w3m-uri-replace-alist'
+     Alist of regexps matching URIs, and some types of replacements.
+     It can be used universally to replace URI strings in the local
+     rule to the valid forms in the Internet.
+
+     Each element looks like the `(REGEXP FUNCTION OPTIONS...)' form.
+     `FUNCTION' takes one or more arguments, a uri and `OPTIONS'.  You
+     can use the grouping constructs `\\(...\\)' in `REGEXP', and they
+     can be referred by the `\N' forms in a replacement (which is one
+     of `OPTIONS').
+
+     Here are some predefined functions which can be used for those
+     ways:
+
+    `w3m-pattern-uri-replace'
+          Replace a URI using PATTERN (which is just an `OPTION').  It
+          is allowed that PATTERN contains the `\N' forms in the same
+          manner of `replace-match'.
+
+    `w3m-search-uri-replace'
+          Generate valid URLs to query words on some specified search
+          engines.  For example, the element
+
+               ("\\`gg:" w3m-search-uri-replace "google")
+
+          makes it possible to replace the URI `gg:emacs' to a query
+          for the word `emacs' on the Google search engine.
+
+`w3m-url-local-directory-alist'
+     Alist of URLs and local directories.  If directory names of a
+     given URL and the car of an element are the same, emacs-w3m
+     assumes that the file exists in the local directory where the cdr
+     of an element points to.  The default value will be set to a value
+     of the `yahtml-path-url-alist' variable which exchanged the car
+     and the cdr in each element if it is available.
+
+`w3m-use-ange-ftp'
+     Non-`nil' means that `ange-ftp' or `efs' is used to access FTP
+     servers.
+
+`w3m-use-cygdrive'
+     If non-`nil', use the `/cygdrive/' rule when performing
+     `expand-file-name'.
+
+`w3m-use-filter'
+     Non-`nil' means use filter programs to convert web contents.  See
+     also `w3m-filter-rules' (the `w3m-filter.elc' module provides it
+     but might have never been loaded.  In that case, to see the default
+     value and the documentation of `w3m-filter-rules', type
+     `M-x load-library <RET> w3m-filter <RET>').
+
+`w3m-use-form'
+     Non-`nil' means make it possible to use form extensions.
+     _(EXPERIMENTAL)_
+
+`w3m-submit-form-safety-check'
+     Non-`nil' means ask you for confirmation when submitting a form.
+     The default value is `nil'.
+
+`w3m-use-header-line'
+     Non-`nil' means display the header line.
+
+`w3m-use-header-line-title'
+     Non-`nil' means display the current title at the header line. This
+     variable is effective only when `w3m-use-tab' is `nil'.
+
+`w3m-use-mule-ucs'
+     Non-`nil' means use the multi-script support with Mule-UCS.
+
+`w3m-use-refresh'
+     Non-`nil' means honor the REFRESH attribute in META tags.
+     Emacs-w3m arbitrarily takes you to a url specified by that
+     attribute.  Note that they may be malicious traps.
+
+`w3m-refresh-minimum-interval'
+     Minimum seconds to wait for refresh, when visiting a page by
+     history-back or history-next.
+
+`w3m-use-symbol'
+     Non-`nil' means replace symbols that the `<_SYMBOL>' tags lead
+     into.  It is meaningful only when the `w3m-m17n' command is used
+     and (X)Emacs handles unicode charsets.
+
+`w3m-menu-on-forefront'
+     Non-`nil' means place the emacs-w3m menus on the forefront of the
+     menu bar.  The default value is `nil'.
+
+`w3m-use-tab'
+     Non-`nil' means make emacs-w3m a tab browser.  It makes it possible
+     to show all emacs-w3m buffers in a single window with the tabs
+     line, and you can choose one by clicking a mouse on it.  See also
+     `w3m-use-tab-menubar'.
+
+`w3m-use-tab-menubar'
+     Non-`nil' means use the TAB pull-down menu in the menubar.  It
+     makes it possible to show all emacs-w3m buffers in a single
+     window, and you can choose one by clicking a mouse on it.  This
+     feature requires that Emacs has been built to be able to display
+     multilingual text in the menubar if you often visit web sites
+     written in non-ascii text.  See also `w3m-use-tab'.
+
+`w3m-use-toolbar'
+     Non-`nil' activates toolbar of `w3m'.
+
+`w3m-user-agent'
+     String used for the User-Agent field.  See also
+     `w3m-add-user-agent'.
+
+`w3m-new-session-in-background'
+     Say whether not to focus on a new tab or a new session in target.
+     It influences only when a new emacs-w3m buffer is created.
+
+`w3m-do-cleanup-temp-files'
+     Non-`nil' enables emacs-w3m's auto cleanig forgotten temporary
+     files feature. The default is `nil'.
+
+
+File: emacs-w3m.info,  Node: Image Variables,  Next: Form Variables,  Prev: General Variables,  Up: Customizable Variables
+
+5.2 Variables related to images
+===============================
+
+`w3m-default-display-inline-images'
+     Non-`nil' means display images inline in emacs-w3m buffers.  You
+     can toggle the visibility of images with the
+     `w3m-toggle-inline-images' command.  See also
+     `w3m-toggle-inline-images-permanently'.
+
+`w3m-favicon-cache-expire-wait'
+     The cache will be expired after specified seconds passed since
+     retrieval.  If this variable is `nil', never expired.
+
+`w3m-favicon-cache-file'
+     Filename of saving favicon cache.  It defaults to the file named
+     `.favicon' under the directory specified by the
+     `w3m-profile-directory' variable.
+
+`w3m-favicon-size'
+     Size of favicon. This value is used as geometry argument for
+     `convert'.
+
+`w3m-favicon-type'
+     Image type of display favicon.
+
+`w3m-favicon-use-cache-file'
+     If non-`nil', use favicon cache file.
+
+`w3m-favicon-default-background'
+     Color name used as transparent color of favicon image.  `Nil' means
+     to use the background color of the Emacs frame.  The null string
+     "" is special, that will be replaced with the background color of
+     the header line or the mode line on which the favicon is
+     displayed.  Note that this value is effective only with Emacs 22
+     and greater.
+
+`w3m-icon-directory'
+     Directory where emacs-w3m should find icon files.
+
+`w3m-imagick-convert-program'
+     Program name of ImageMagick's `convert'.
+
+`w3m-treat-image-size'
+     Non-`nil' means let the `w3m' command mind the ratio of the size
+     of images and text.  The default value is `t'.
+
+     If it is non-`nil', the `w3m' command will make a `halfdump' which
+     reserves rectangle spaces in which images will be put, and also
+     `alt' texts will be truncated or padded with spaces so that their
+     display width will be the same as the width of images.
+
+     See also `w3m-pixels-per-character' and `w3m-pixels-per-line'.
+     Those values will be passed to the `w3m' command in order to
+     compute columns and lines which images occupy.
+
+`w3m-pixels-per-character'
+     Integer used for the `-ppc' argument of the `w3m' command.  If
+     `nil', the width of the default face is used.  It is valid only
+     when `w3m-treat-image-size' is non-`nil'.  The default value is
+     `nil'.  If you want to use emacs-w3m in a character terminal and
+     make `w3m-treat-image-size' effective, you need to set this
+     variable properly.
+
+`w3m-pixels-per-line'
+     Integer used for the `-ppl' argument of the `w3m' command.  If
+     `nil', the height of the default face is used.  It is valid only
+     when `w3m-treat-image-size' is non-`nil'.  Note that a small value
+     may not induce a good result.  The default value is `64'.  If you
+     want to use emacs-w3m in a character terminal and make
+     `w3m-treat-image-size' effective, you need to set this variable
+     properly.
+
+`w3m-resize-image-scale'
+     Number of steps in percent used when resizing images.
+
+`w3m-resize-images'
+     If non-`nil', resize images to the specified width and height.
+
+`w3m-show-graphic-icons-in-header-line'
+     Non-`nil' means show graphic status indicators in the header-line.
+     If it is `nil', also the favicon won't be shown in the header-line
+     even if `w3m-use-favicon' is non-`nil'.  This variable is
+     currently meaningless under XEmacs.
+
+`w3m-show-graphic-icons-in-mode-line'
+     Non-`nil' means show graphic status indicators in the mode-line.
+     If it is `nil', also the favicon won't be shown in the mode-line
+     even if `w3m-use-favicon' is non-`nil'.
+
+`w3m-toggle-inline-images-permanently'
+     Non-`nil' means let the visibility of images continue permanently.
+     The visibility of images is initialized according to
+     `w3m-default-display-inline-images' at the first time, and except
+     that it may be toggled by the `w3m-toggle-inline-images' command,
+     it does not change hereafter, if it is non-`nil'.  Otherwise,
+     whether images are visible is initialized according to
+     `w3m-default-display-inline-images' whenever you visit a new page
+     or reload the current page in an emacs-w3m buffer.
+
+`w3m-use-favicon'
+     Non-`nil' means show favicon images if they are available.  It will
+     be set to `nil' automatically if ImageMagick's `convert' program
+     does not support the ico format.
+
+`w3m-image-default-background'
+     Color name used as transparent color of image.  `Nil' means to use
+     the background color of the Emacs frame.  The null string "" is
+     special, that will be replaced with the background color of the
+     buffer. Note that this value is effective only with Emacs 22 and
+     greater.
+
+
+File: emacs-w3m.info,  Node: Form Variables,  Next: Cookie Variables,  Prev: Image Variables,  Up: Customizable Variables
+
+5.3 Variables related to forms
+==============================
+
+`w3m-form-input-map-buffer-lines'
+     Buffer lines for form select map buffer.
+
+`w3m-form-input-select-buffer-lines'
+     Buffer lines for form select buffer.
+
+`w3m-form-input-textarea-buffer-lines'
+     Buffer lines for form textarea buffer.
+
+`w3m-form-mouse-face'
+     Mouse face to highlight selected value.
+
+`w3m-form-treat-textarea-size'
+     Non-`nil' means to process textarea size (treat textarea rows).
+
+`w3m-form-use-fancy-faces'
+     Use fancy faces to fontify `<form>' tags.
+
+`w3m-form-use-textarea-backup'
+     Non-`nil' means save and restore backup text saved when you last
+     edited this textarea.  Files to save text are stored in the
+     directory specified by the `w3m-form-textarea-directory' variable.
+
+
+File: emacs-w3m.info,  Node: Cookie Variables,  Next: Bookmark Variables,  Prev: Form Variables,  Up: Customizable Variables
+
+5.4 Variables related to cookies
+================================
+
+`w3m-cookie-accept-bad-cookies'
+     If `nil', don't accept bad cookies.  If `t', accept bad cookies.
+     If ask, ask user whether accept bad cookies or not.
+
+`w3m-cookie-accept-domains'
+     A list of trusted domain name string.
+
+`w3m-cookie-file'
+     File in which cookies are kept.
+
+`w3m-cookie-reject-domains'
+     A list of untrusted domain name string.
+
+`w3m-use-cookies'
+     Non-`nil' means enable emacs-w3m to use cookies.  _(EXPERIMENTAL)_
+
+
+File: emacs-w3m.info,  Node: Bookmark Variables,  Next: Search Variables,  Prev: Cookie Variables,  Up: Customizable Variables
+
+5.5 Variables related to bookmarks
+==================================
+
+`w3m-bookmark-file'
+     Bookmark file of w3m.
+
+`w3m-bookmark-file-coding-system'
+     Coding system for a created bookmark file.  This option is used
+     when a new bookmark file is created, or when an existing bookmark
+     file includes ASCII characters only.  If the coding system which
+     is used to encode your using bookmark file is different from the
+     value of this option, emacs-w3m does not change the encoding of
+     your bookmark file.
+
+`w3m-bookmark-default-section'
+     Default section to add new entry.
+
+`w3m-bookmark-menu-open-new-session'
+     If non-`nil', "Bookmark" menu item open new session.
+
+
+File: emacs-w3m.info,  Node: Search Variables,  Next: Weather Variables,  Prev: Bookmark Variables,  Up: Customizable Variables
+
+5.6 Variables related to searching the web
+==========================================
+
+`w3m-search-default-engine'
+     Name of the default search engine.  The default is `google'.
+
+`w3m-search-engine-alist'
+     An alist of search engines.  Each element looks like `(ENGINE
+     ACTION CODING POST-DATA)'.  ENGINE is a string, the name of the
+     search engine.  ACTION is a string, the URL that performs a
+     search.  ACTION must contain a `"%s"', which is substituted by a
+     query string.  CODING is optional value which is coding system for
+     query string.  POST-DATA is optional value which is a string for
+     POST method search engine.  If CODING is omitted, it defaults to
+     `w3m-default-coding-system'.
+
+`w3m-search-word-at-point'
+     Non-`nil' means that the word at point is used as an initial
+     string.  If `transient-mark-mode', this option is ignored and the
+     region is used as an initial string.  The default is `t'.
+
+`w3m-search-thing-at-point-arg'
+     Argument for `thing-at-point' used in `w3m-search-read-query'. The
+     default is `word'.
+
+
+File: emacs-w3m.info,  Node: Weather Variables,  Next: Dtree Variables,  Prev: Search Variables,  Up: Customizable Variables
+
+5.7 Variables related to weather information
+============================================
+
+`w3m-weather-default-area'
+     Default region to check weather.  The default is the southern part
+     of Kyoto city.
+
+`w3m-weather-filter-functions'
+     Filter functions to remove useless tags.  The default value is a
+     list that contains the following function symbols in this order:
+
+     `w3m-weather-extract-contents' `w3m-weather-adjust-contents'
+     `w3m-weather-expand-anchors' `w3m-weather-insert-title'
+
+
+File: emacs-w3m.info,  Node: Dtree Variables,  Next: Antenna Variables,  Prev: Weather Variables,  Up: Customizable Variables
+
+5.8 Variables related to the dtree feature
+==========================================
+
+`w3m-dtree-default-allfiles'
+     If non-`nil', invert the meaning of the prefix argument given to
+     the `w3m-dtree' command, i.e., the command shows not only
+     directories but also files even if you don't give a prefix
+     argument.  The default is `nil'.
+
+`w3m-dtree-directory-depth'
+     Integer that controls how deep `w3m-dtree' shows subdirectories.
+     If it is `nil', files in all subdirectories are shown.  The default
+     is `8'.
+
+`w3m-dtree-indent-strings'
+     Vector containing strings used for the indentation.  The default is
+     `["|-" "+-" "|  " "   "]'.
+
+`w3m-dtree-stop-strings'
+     Vector containing strings used to indent directories under which
+     there are subdirectories hidden because of
+     `w3m-dtree-directory-depth'.  The default is `["|=" "+="]'.
+
+
+File: emacs-w3m.info,  Node: Antenna Variables,  Next: Perldoc Variables,  Prev: Dtree Variables,  Up: Customizable Variables
+
+5.9 Variables related to antenna
+================================
+
+`w3m-antenna-file'
+     Name of the file containing antenna URLs.  The default value is
+     `~/.w3m/.antenna', where `~/.w3m' is the default value of
+     `w3m-profile-directory' (*note General Variables::).
+
+`w3m-antenna-html-skelton'
+     Skeleton used for making the html contents of antenna pages.
+
+`w3m-antenna-make-summary-function'
+     Function used to make the summary of the site information.  The
+     default is `w3m-antenna-make-summary-like-natsumican'.  The other
+     ready-made function is `w3m-antenna-make-summary'.
+
+`w3m-antenna-sites'
+     List of web sites that `w3m-antenna' watches.  The default is
+     `nil'.
+
+`w3m-antenna-sort-changed-sites-function'
+     Function used to sort a list of sites having been changed.  The
+     default is `w3m-antenna-sort-sites-by-time'.  The other ready-made
+     function is `w3m-antenna-sort-sites-by-title'.
+
+`w3m-antenna-sort-unchanged-sites-function'
+     Function used to sort a list of sites having not been changed.  The
+     default is `w3m-antenna-sort-sites-by-time'.  The other ready-made
+     function is `w3m-antenna-sort-sites-by-title'.
+
+
+File: emacs-w3m.info,  Node: Perldoc Variables,  Next: Namazu Variables,  Prev: Antenna Variables,  Up: Customizable Variables
+
+5.10 Variables related to perldoc
+=================================
+
+`w3m-perldoc-command'
+     Name of the executable file of `perldoc'.  The default is
+     `"perldoc"'.
+
+`w3m-perldoc-input-coding-system'
+     Coding system used when writing to the `perldoc' command.  The
+     default value is `euc-japan' if you are in the Japanese language
+     environment.  Otherwise it is `utf-8' if it is available, or
+     `iso-latin-1'.
+
+`w3m-perldoc-output-coding-system'
+     Coding system used when reading from the `perldoc' command.  The
+     default is `undecided'.
+
+`w3m-perldoc-pod2html-command'
+     Name of the executable file of `pod2html'.  The default is
+     `"pod2html"'.
+
+`w3m-perldoc-pod2html-arguments'
+     Lisp of arguments passed to the `pod2html' command.  The default is
+     `("--noindex")'.
+
+
+File: emacs-w3m.info,  Node: Namazu Variables,  Next: Octet Variables,  Prev: Perldoc Variables,  Up: Customizable Variables
+
+5.11 Variables related to namazu
+================================
+
+`w3m-namazu-command'
+     Name of the executable file of Namazu.  The default is `namazu'.
+
+`w3m-namazu-arguments'
+     List of arguments passed to Namazu.  The default value is `("-h"
+     "-H" "-n" w3m-namazu-page-max "-w" whence)'.  The symbols
+     `w3m-namazu-page-max' and `whence' will be replaced respectively
+     with the value of that variable and a proper value that the
+     program determines properly.
+
+`w3m-namazu-default-index'
+     An alias for the default index, or the directory name of it.  If
+     this is `nil', you will be prompted for the directory name
+     whenever you invoke the `w3m-namazu' command with no prefix
+     argument.  The default is the value of `namazu-default-dir' if it
+     exists and `namazu-always-query-index-directory' is `nil'.
+     Otherwise `nil'.
+
+`w3m-namazu-index-alist'
+     Alist of aliases and index directories.  The default value is
+     determined due to `namazu-dir-alist' if any or `nil'.
+
+`w3m-namazu-input-coding-system'
+     Coding system used when reading from the namazu process.  The
+     default is the value of `namazu-cs-read' if it exists, or
+     `undecided'.
+
+`w3m-namazu-output-coding-system'
+     Coding system used when writing to the namazu process.  The
+     default is the value of `namazu-cs-write' if it exists, or is
+     determined to `shift_jis-dos' or `euc-japan-unix' due to the
+     system type.
+
+`w3m-namazu-page-max'
+     The maximum number of documents retrieved in one search.  The
+     default is the value of `namazu-search-num' if any, or `30'.
+
+
+File: emacs-w3m.info,  Node: Octet Variables,  Next: Session Manager Variables,  Prev: Namazu Variables,  Up: Customizable Variables
+
+5.12 Variables related to the octet feature
+===========================================
+
+There is no user option for the moment.
+
+
+File: emacs-w3m.info,  Node: Session Manager Variables,  Next: Hooks,  Prev: Octet Variables,  Up: Customizable Variables
+
+5.13 Variables related to session manager
+=========================================
+
+`w3m-session-file'
+     File name to keep sessions.
+
+`w3m-session-time-format'
+     Format of saved time.
+
+`w3m-session-automatic-title'
+     String of title to save session automatically.
+
+`w3m-session-deleted-title'
+     String of title to save session when buffer delete.
+
+`w3m-session-crash-recovery-title'
+     String of title to save session to use for crash recovering.
+
+`w3m-session-deleted-keep-number'
+     Number to keep sessions when buffers delete.
+
+`w3m-session-automatic-keep-number'
+     Number to keep sessions automatically.
+
+`w3m-session-unknown-title'
+     String of title to use when title is not specified.
+
+
+File: emacs-w3m.info,  Node: Hooks,  Next: Other Variables,  Prev: Session Manager Variables,  Up: Customizable Variables
+
+5.14 Hooks
+==========
+
+`w3m-after-cursor-move-hook'
+     Hook run each time after the cursor moves in emacs-w3m buffers.
+     This hook is called by the `w3m-check-current-position' function
+     by way of `post-command-hook'.
+
+`w3m-delete-buffer-hook'
+     Hook run when every emacs-w3m buffer is deleted.
+
+`w3m-display-hook'
+     Hook run after displaying pages in emacs-w3m buffers.  Each
+     function is called with a url string as the argument.  This hook
+     is evaluated by the `w3m-goto-url' function.
+
+`w3m-fontify-after-hook'
+     Hook run after fontifying emacs-w3m buffers.  This hook is
+     evaluated by the `w3m-fontify' function.
+
+`w3m-fontify-before-hook'
+     Hook run when starting to fontify emacs-w3m buffers.  This hook is
+     evaluated by the `w3m-fontify' function.
+
+`w3m-form-input-map-mode-hook'
+     A hook called after w3m-form-input-map-mode.
+
+`w3m-form-input-map-set-hook'
+     A Hook called before w3m-form-input-map-set.
+
+`w3m-form-input-select-mode-hook'
+     A hook called after w3m-form-input-select-mode.
+
+`w3m-form-input-select-set-hook'
+     A Hook called before w3m-form-input-select-set.
+
+`w3m-form-input-textarea-mode-hook'
+     A hook called after w3m-form-input-textarea-mode.
+
+`w3m-form-input-textarea-set-hook'
+     A Hook called before w3m-form-input-textarea-set.
+
+`w3m-minor-mode-hook'
+     Hook run after `w3m-minor-mode' initialization.
+
+`w3m-mode-hook'
+     Hook run after `w3m-mode' initialization.  This hook is evaluated
+     by the `w3m-mode' function.
+
+`w3m-select-buffer-hook'
+     Hook run when a different emacs-w3m buffer is selected.
+
+`w3m-bookmark-mode-hook'
+     Hook run at the end of function `w3m-bookmark-mode'.
+
+
+File: emacs-w3m.info,  Node: Other Variables,  Prev: Hooks,  Up: Customizable Variables
+
+5.15 Other variables
+====================
+
+`w3m-async-exec'
+     Non-`nil' means execute the `w3m' command asynchronously in Emacs
+     process.
+
+`w3m-broken-proxy-cache'
+     Set it to `t' if the proxy server seems not to work properly in
+     caching.  Note that this may be the double-edged sword; setting it
+     to `t' will likely be harmful if the proxy server sends bad
+     requests (e.g., not including the Host header, see RFC2616 section
+     14.23) to foreign servers when the `w3m' command specifies the
+     `no-cache' directive.  Also note that it may not be effective if
+     you are using old `w3m' command.
+
+`w3m-history-minimize-in-new-session'
+     Non-`nil' means minimize copied history so that there's only
+     current page.  This variable is effective when creating of the new
+     session by copying (i.e., `w3m-copy-buffer').  The default value is
+     `nil'.
+
+`w3m-history-reuse-history-elements'
+     Non-`nil' means reuse the history element when re-visiting the
+     page.  Otherwise, a new history element will be created even if
+     there are elements for the same url in the history.
+
+     Emacs-w3m used to operate as the case in which it is non-`nil',
+     however it sometimes brought about users' dissatisfaction.  For
+     example, if a user visited the pages A -> B -> C -> B in order,
+     performing BACK on the second B would let a user visit A.  The
+     reason why a user was taken to A rather than C is that the
+     `w3m-history' variable only had the list `(A B C)' as a history
+     and B was the current position at that time.
+
+     The default value for this variable is `nil' which allows the
+     `w3m-history' variable to have the list `(A B C B)'.  Where
+     contents of two B's are the identical Lisp objects.  So, too much
+     wasting the Lisp resources will be avoided.
+
+     See the documentation for the variables `w3m-history' and
+     `w3m-history-flat' for more information.
+
+`w3m-process-connection-type'
+     Value for `process-connection-type' used when communicating with
+     `w3m'.
+
+`w3m-process-modeline-format'
+     Format used when displaying the progress of the external `w3m'
+     process.  It shows a percentage of the data loaded from the web
+     server.
+
+`w3m-show-current-title-in-buffer-tab'
+     If non-`nil', show the title strings in the buffers tab.  It has no
+     effect if your XEmacs does not support the gutter items.
+
+
+File: emacs-w3m.info,  Node: Hooking into MUAs,  Next: Frequently Asked Questions,  Prev: Customizable Variables,  Up: Top
+
+6 Hooking emacs-w3m into mail/newsreaders
+*****************************************
+
+This section introduces three Message User Agents (MUAs).  All those
+MUAs can display HTML mails properly using emacs-w3m.  You'll find here
+HowTo's and some notes about setting up and using emacs-w3m with each
+of these MUAs.
+
+   Quick note about the conventions we use: what does `message' mean?
+When a Gnus user says `message', it often means a draft of a message to
+be sent as mail or news.  However, it is the term used by Mew or
+Wanderlust users for received mail.  They use `draft' for the draft of
+a message to be sent.  On the other hand, a received message is called
+an `article' by Gnus users.
+
+* Menu:
+
+* Gnus::                        Reading HTML mails in Gnus
+* Mew::                         Reading HTML mails in Mew
+* SEMI MUAs::                   Reading HTML mails in SEMI MUAs
+* VM::                          VM (vieW maiL) is not Wanderlust
+
+
+File: emacs-w3m.info,  Node: Gnus,  Next: Mew,  Up: Hooking into MUAs
+
+6.1 Reading HTML mails in Gnus
+==============================
+
+Did you know that Gnus, the Emacs newsreader, supports emacs-w3m?
+Actually, Gnus bundled with Emacs of which the version is 22.1 or
+greater supports emacs-w3m.  If your Emacs is somewhat old, you'd better
+use the latest version of Gnus.  It is available at:
+
+   `ftp://ftp.gnus.org/pub/gnus/gnus.tar.gz'
+
+   * What can you do with emacs-w3m?
+
+     You can convert HTML spam mails to be human-readable using
+     emacs-w3m.  Of course, it works for HTML ham (non-spam) mails as
+     well, and for both emacs-w3m is probably faster than the default
+     converter.  You don't need to perform any additional operation.
+     It will simply be displayed.
+
+     On HTML parts of an article buffer, the `w3m-minor-mode' is turned
+     on and you can use the same main keys as the keys of emacs-w3m, for
+     instance, `<RET>' is for visiting a page which a link in the
+     current position points to.  Those keys are defined in the
+     `w3m-minor-mode-command-alist' variable.  Keep in mind that some
+     commands are replaced by others similar to them, for security
+     reasons (see below).
+
+   * What do you have to do?
+
+     Read the Gnus manual (*note Display Customization:
+     (emacs-mime)Display Customization.).  The easiest way is to put
+     the following line in your `~/.gnus.el' file:
+
+          (setq mm-text-html-renderer 'w3m)
+
+     Also put the following line if you want to show images inline in
+     article buffers:
+
+          (setq mm-inline-text-html-with-images t)
+
+     If you don't need to use emacs-w3m keys in article buffers, add the
+     following line too:
+
+          (setq mm-inline-text-html-with-w3m-keymap nil)
+
+   * Notes
+
+     The above description about spam and ham is not for kidding, it's
+     just here to get your attention.  Some HTML mails might contain a
+     nasty trick used by spammers, using the `<img>' tag which is far
+     more evil than the `Click Here!' button.  It is most likely
+     intended to check whether the ominous spam mail has reached your
+     eyes or not, in which case the spammer knows for sure that your
+     email address is valid.  It is done by embedding an identifier
+     string into a URL that you might automatically retrieve when
+     displaying the image.  If the `mm-w3m-safe-url-regexp' variable
+     has not been changed from the default value, Gnus will never
+     connect to the spammer's site arbitrarily.
+
+     You can display images inline in an article buffer if you set
+     `mm-inline-text-html-with-images' to `t', can't you?  No, not
+     exactly: you're still being protected.  If you don't care about
+     leaking information (i.e. the fact that your mail address is
+     reachable), set the `mm-w3m-safe-url-regexp' variable to `nil'.
+     The default value for `mm-w3m-safe-url-regexp' is `"\\`cid:"'
+     which means we consider that images included in a mail with the
+     `cid:' URL are safe (that is, you can display such images without
+     modifying the `mm-w3m-safe-url-regexp' variable).
+
+   * Giveaway
+
+     Even when you are in the summary buffer, you can toggle displaying
+     of images in the article buffer.  It is effective only when those
+     images are displayed by emacs-w3m, though.  Here's an example:
+
+          (defun gnus-summary-w3m-safe-toggle-inline-images (&optional arg)
+            "Toggle displaying of all images in the article buffer.
+          If the prefix arg is given, force displaying of images."
+            (interactive "P")
+            (with-current-buffer gnus-article-buffer
+              (let ((st (point-min))
+                    (nd (point-max))
+                    (w3m-async-exec w3m-async-exec))
+                (save-restriction
+                  (widen)
+                  (if (or (> st (point-min)) (< nd (point-max)))
+                      (setq w3m-async-exec nil))
+                  (article-goto-body)
+                  (goto-char (or (text-property-not-all (point) (point-max)
+                                                        'w3m-safe-url-regexp nil)
+                                 (point)))
+                  (if (interactive-p)
+                      (call-interactively 'w3m-toggle-inline-images)
+                    (w3m-toggle-inline-images arg))))))
+
+          (eval-after-load "gnus-sum"
+            '(define-key gnus-summary-mode-map
+               "\C-i" 'gnus-summary-w3m-safe-toggle-inline-images))
+
+See also *note Nnshimbun::.
+
+
+File: emacs-w3m.info,  Node: Mew,  Next: SEMI MUAs,  Prev: Gnus,  Up: Hooking into MUAs
+
+6.2 Reading HTML mails in Mew
+=============================
+
+By using emacs-w3m with Mew, you can see HTML mails as it intended to be
+displayed.  To do so, put the following line in the `~/.mew.el' file:
+
+     (require 'mew-w3m)
+
+With just this, an HTML mail will be displayed in the message window as
+if it were a plain text.  You can still use the `C-c C-e' command
+(`mew-summary-execute-external') there.
+
+   It is also quite common these days to see mails containing the same
+information twice, they use the `multipart/alternative' format which
+consists of both a `text/plain' part and a `text/html' part (what a
+waste of bandwidth it is).  Mew displays only the `text/plain' part of
+such a mail by default.  However, you perhaps want to see the
+`text/html' part since you are using emacs-w3m.  If so, add the
+following lines to the `~/.mew.el' file:
+
+     (setq mew-mime-multipart-alternative-list
+           '("Text/Html" "Text/Plain" ".*"))
+
+There are some customizable variables related to Mew:
+
+`mew-use-w3m-minor-mode'
+     If non-`nil', the `w3m-minor-mode' is turned on in the message
+     buffer where a text/html part is displayed, and you can use the
+     same main keys as the keys of emacs-w3m, for instance, `<RET>' is
+     for visiting a page which a link in the current position points
+     to.  Those keys are defined in the `w3m-minor-mode-command-alist'
+     variable.  Keep in mind that some commands are replaced by others
+     similar to them, for security reasons.  The default value is `nil'.
+
+`mew-w3m-auto-insert-image'
+     If non-`nil', you can see images inline in the message buffer when
+     you read a multipart/related message.  Note that mew-w3m only
+     allows images contained in the message body with a `cid:' URL to be
+     displayed (as we consider them safe).  The default value is `nil'.
+
+     To activate this feature, add following in your `~/.mew.el'.
+
+          (define-key mew-summary-mode-map "T" 'mew-w3m-view-inline-image)
+
+     Press "T", toggle the visibility of the images included its message
+     only.  Press "C-uT", display the all images included its Text/Html
+     part.
+
+`mew-w3m-cid-retrieve-hook'
+     A hook run just after retrieving a `cid:' URL.  The default value
+     is `nil'.
+
+See also *note Mew Shimbun::.
+
+
+File: emacs-w3m.info,  Node: SEMI MUAs,  Next: VM,  Prev: Mew,  Up: Hooking into MUAs
+
+6.3 Reading HTML mails in SEMI MUAs
+===================================
+
+You can display HTML mails as human-readable, using emacs-w3m and SEMI
+MUA, for example, Wanderlust.  Since that MUA depends on SEMI (and also
+FLIM) for MIME functions, we generically call it SEMI MUA.  Although
+SEMI uses Emacs/W3 for rendering HTML mails by default, it can easily
+be altered to emacs-w3m and it will make your cyber life still more
+comfortable.
+
+You simply need to put the following line in `~/.emacs' file:
+
+     (require 'mime-w3m)
+
+   The `mime-w3m' and `mime-w3' modules are functionally alike, as you
+might have guessed (see how the names sound alike?).  The latter is
+included in the SEMI package.
+
+   On HTML parts of an article buffer, the `w3m-minor-mode' is turned
+on and you can use the same main keys as the keys of emacs-w3m, for
+instance, `<RET>' is for visiting a page which a link in the current
+position points to.  Those keys are defined in the
+`w3m-minor-mode-command-alist' variable.  Keep in mind that some
+commands are replaced by others similar to them, for security reasons.
+
+   There are some customizable variables related to the `mime-w3m'
+module:
+
+`mime-w3m-display-inline-images'
+     If it is non-`nil', images will be displayed inline in HTML mails.
+     If it is the symbol `default' (which is the default) at the first
+     time, the value of this variable will be replaced with the value
+     of the `w3m-default-display-inline-images' variable.  You probably
+     don't need to change this.
+
+`mime-w3m-safe-url-regexp'
+     Regexp matching URLs which are considered to be safe.  The default
+     value is `"\\`cid:"' which means we consider that images included
+     in a mail with the `cid:' URLs are safe.  See also *note Gnus::
+     about rogue attacks.
+
+`mime-w3m-setup-hook'
+     A hook run just after setting up the cooperation of the `mime-w3m'
+     module and SEMI.  The default value is `nil'.
+
+   By the way, even when you are in the summary buffer, you can toggle
+displaying of images in the article buffer (which is what is called the
+message buffer in the Wanderlust community).  It is effective only when
+those images are displayed by emacs-w3m, though.  Here's an example for
+Wanderlust:
+
+     (defun wl-summary-w3m-safe-toggle-inline-images (&optional arg)
+       "Toggle displaying of all images in the message buffer.
+     If the prefix arg is given, all images are considered to be safe."
+       (interactive "P")
+       (with-current-buffer wl-message-buffer
+         (w3m-toggle-inline-images arg)))
+
+     (eval-after-load "wl-summary"
+       '(define-key wl-summary-mode-map
+          "\M-i" 'wl-summary-w3m-safe-toggle-inline-images))
+
+
+File: emacs-w3m.info,  Node: VM,  Prev: SEMI MUAs,  Up: Hooking into MUAs
+
+6.4 VM (vieW maiL) is not Wanderlust
+====================================
+
+The module vm-w3m.el that provides the feature for VM to display html
+mails and a patch have been handed over to the new VM maintainer,
+although it has not appeared in the stable version of VM yet.  Try
+visiting the VM home page (http://www.nongnu.org/viewmail/).
+
+
+File: emacs-w3m.info,  Node: Frequently Asked Questions,  Next: Known Problems,  Prev: Hooking into MUAs,  Up: Top
+
+7 There isn't always an answer
+******************************
+
+* Menu:
+
+* General FAQ::                 General Questions
+* Trouble FAQ::                 Troubleshooting
+* Shimbun FAQ::                 Questions of Shimbun Library
+
+
+File: emacs-w3m.info,  Node: General FAQ,  Next: Trouble FAQ,  Up: Frequently Asked Questions
+
+7.1 General Questions
+=====================
+
+   * Q. What's emacs-w3m?
+
+     It is an interface program on Emacs which controls w3m.  For more
+     information, see *note Introduction::.
+
+   * Q. Which emacs versions are supported?
+
+     The following Emacsen have been checked for emacs-w3m support:
+
+        * Emacs 21
+
+        * Emacs 22
+
+        * XEmacs 21.4.17 and later with/without Mule
+
+        * XEmacs 21.5-b19 and later with/without Mule
+
+        * Meadow
+
+     Note that you're required to use APEL if you'd like to run
+     emacs-w3m under XEmacs.  For more information, see *note Other
+     Requirements::.
+
+   * Q. Which w3m versions are supported?
+
+     The following w3m versions have been checked for emacs-w3m support:
+
+        * w3m-0.3 and later
+
+        * w3mmee-p24-18 + moe-1.5.4
+
+          Note that w3mmee mentioned as the example is configured with
+          the `lang=many' option (it can be done by entering 3, when the
+          `configure' script prompts you, "Which language do you
+          prefer?").  It also requires the `libmoe' package.
+
+   * Q. I've already installed APEL in the XEmacs SUMO package, is it
+     ok?
+
+     There are some problems in the XEmacs APEL package (all modules
+     have been compiled for XEmacs with Mule); for instance, the
+     `std11' modules conflict with the FLIM's one, etc.  Even though
+     you can use `apel-1.23-pkg.tar.gz' or later for both XEmacs with
+     Mule and non-Mule XEmacs if you don't use FLIM for the `shimbun'
+     features, we recommend you replace it or newly install the
+     original APEL package.  See *note Other Requirements:: where to
+     get it from.
+
+   * Q. I've gotten the developing version of emacs-w3m with CVS,
+     however I'm missing `configure' script.
+
+     It is necessary to run `autoconf' first, to generate `configure'
+     script.
+
+
+File: emacs-w3m.info,  Node: Trouble FAQ,  Next: Shimbun FAQ,  Prev: General FAQ,  Up: Frequently Asked Questions
+
+7.2 Troubleshooting
+===================
+
+   * Q. Why can't I enter a password on pages which require
+     authentication?
+
+     Make sure the `w3m-async-exec' variable is set to a value other
+     than `nil'.
+
+   * Q. Why can't I enter a password for a proxy server which requires
+     authentication?
+
+     Make sure the `w3m-async-exec' variable is set to a value other
+     than `nil'.
+
+   * Q. Why can't I follow links?
+
+     Emacs-w3m requires a version of w3m which recognizes the `-header'
+     option.  Check what version of w3m you use.
+
+   * Q. Why do garbage characters appear?
+
+     It could be caused by the following reasons:
+
+       1. Bad HTML file
+
+          If the character set specified by the `<meta>' tag differs
+          from the actual contents in an HTML file, it will not be
+          displayed correctly.  Use the command
+          `M-x w3m-redisplay-with-charset <RET>' or `C c' to set the
+          correct character set and to force redisplay of the page.
+
+       2. Limitation of the character sets
+
+          A page written by a character set other than
+          ISO-2022-JP(jis), EUC-JP, or SHIFT_JIS may not be displayed
+          correctly.  Try one of the following ways:
+
+            a. Any characters defined in Unicode will be displayed
+               correctly if you install the Mule-UCS package (*note
+               Other Requirements::).  You need to make sure that the
+               value of the `w3m-use-mule-ucs' variable is set to a
+               value other than `nil' after installing the Mule-UCS
+               package.  In addition, if you want to make Emacs (and
+               also emacs-w3m) handle the character sets EUC-JISX0213
+               and ISO-2022-JP-3, you have to install the `jisx0213'
+               module which is contained in the Mule-UCS package
+               (though it doesn't work under XEmacs unfortunately).
+
+            b. Install w3mmee or w3m-m17n, and set the `w3m-command'
+               variable to the appropriate value.  And emacs-w3m will
+               use the multi-lingual features provided by one of those
+               programs.  However, a page written by a coding system
+               which Emacs doesn't support may not be displayed
+               correctly. So please install Mule-UCS package if
+               necessary.
+
+       3. Emacsen incompatibility
+
+          Under XEmacs 21.1, pages written by the SHIFT_JIS character
+          set may not be displayed correctly.  There is also a problem
+          in XEmacs 21.2 prior to the beta 36 version.  You should
+          upgrade your XEmacs if you use such one.
+
+          You should notice that XEmacs versions 21.1 and 21.2 have
+          already been retired officially.
+
+       4. Don't use `standard-display-european'
+
+          It is generally harmful since it often makes Latin characters
+          get displayed incorrectly.  For instance, the apostrophe
+          character (`'') which was encoded as `&#8217' will be
+          displayed as the character `u' with a grave accent as if it
+          had been encoded as `&#249'.  If the line something like the
+          following is in your `~/.emacs' file or site files which
+          Emacs loads when starting up, we strongly recommend you to
+          remove it.
+
+               (standard-display-european 1)
+
+          There the argument might be `t', not `1'.
+
+   * Q. Why can't images be shown?
+
+     It could be caused by the following reasons:
+
+     There is a bug in the earlier versions of the `libungif' library.
+     You have to install `libungif-4.1.0b1' and later.
+
+     You must install the `gifsicle' program if you want to run
+     emacs-w3m under XEmacs.  *Note Other Requirements::.
+
+     Emacs-w3m doesn't support the old versions of w3m.  Check what
+     version of w3m you use.
+
+   * Q. Why can't I browse pages which require cookies?
+
+     (This is still an experimental feature.)
+
+     Make sure the `w3m-use-cookies' variable is set to a value other
+     than `nil'.
+
+   * Q. Why can't I fill in the form?
+
+     (This is still an experimental feature.)
+
+     Make sure the `w3m-use-form' variable is set to a value other than
+     `nil'.
+
+   * Q. Why can't I submit a form?
+
+     (This is still an experimental feature.)
+
+     Make sure the `w3m-use-form' variable is set to a value other than
+     `nil'.  You also need to use a version of w3m which recognizes the
+     `-post' option in order to use this function.  Check what version
+     of w3m you use.
+
+   * Q. Why are frames not rendered?
+
+     Install w3mmee and put the following line in your `~/.emacs' file:
+
+          (setq w3m-command "w3mmee")
+
+   * Q. Why are favicon images not displayed in the tabs line on GNU
+     Emacs?
+
+     Install the `convert' program which is included in ImageMagick.
+     It is available from: `http://www.imagemagick.org/'
+
+   * Q. Why does GNU Emacs get locked when a favicon image is going to
+     be displayed?
+
+   * Q. My computer accesses the disk drive violently and says `process
+     convert exited abnormally with code 10'.  What's the story?
+
+     Do you use an old version of ImageMagick?  As far as we know, it
+     happens when you use the `convert' program bundled with
+     ImageMagick 5.2.1.  It has been confirmed that the `convert'
+     program bundled with ImageMagick 5.4.0-5 (and later) works fine.
+
+     If you don't want to use ImageMagick, or if you can't use its most
+     recent version, add the following line in your `~/.emacs-w3m' file:
+
+          (setq w3m-use-favicon nil)
+
+   * Q. Why does not emacs-w3m work with w3mmee?
+
+     If you are using w3mmee configured with the option `lang=en' or
+     `lang=ja', reconfigure w3mmee with the option `lang=many' (it can
+     be done by entering 3, when the `configure' script prompts you,
+     "Which language do you prefer?"), and rebuild w3mmee.
+
+   * Q. Why I cannot visit web pages using emacs-w3m?  There is no
+     problem when visiting local html files or using w3m barefoot,
+     though.
+
+     What is called the asynch patch(1) is applied to the w3m command
+     which some Linux distribution (e.g. Gentoo Linux) contains.  It is
+     useful when using w3m barefoot, however it might make emacs-w3m
+     hang.  If it is suspected, we recommend you reinstall the w3m
+     command from the original source.
+
+   * Q. Why doesn't the emacs-w3m frame pop up to the front?
+
+     It is quite convenient that the `M-x w3m <RET>' command makes the
+     emacs-w3m frame pop to the front even if it is hidden under the
+     other frames.  However, it was reported that it does not work when
+     running Emacs which has been built on some platforms (e.g., Fedora
+     Linux) in which the `metacity' window manager is used.  In those
+     systems, other features which raise the Emacs frames will not work,
+     either.  If you are in such a miserable circumstance, it might be
+     worth trying the following advice:
+
+          (if (or (not window-system) (featurep 'xemacs))
+              nil
+            (defadvice raise-frame
+              (after make-it-work (&optional frame) activate)
+              "Make it work with the aid of wmctrl."
+              (call-process
+               "wmctrl" nil nil nil "-i" "-R"
+               (frame-parameter (or frame (selected-frame))
+                                'outer-window-id))))
+
+     Where `wmctrl' is the external command which you can get from:
+
+     `http://sweb.cz/tripie/utils/wmctrl/'
+
+     Note that you have to install the `wmctrl' command before putting
+     the advice into the `~/.emacs' file.
+
+     The following one is currently unnecessary for emacs-w3m, but a
+     certain application needs it to work.  (You will lose nothing by
+     adding it if you are in the platform in which the previous one is
+     needed.)
+
+          (if (or (not window-system) (featurep 'xemacs))
+              nil
+            (defadvice pop-to-buffer (after enable-it-to-forcus-frame
+                                            activate)
+              "Enable it to focus frame if `pop-up-frames' is non-nil."
+              (when pop-up-frames
+                (let ((id (condition-case nil
+                              (frame-parameter
+                               (window-frame
+                                (get-buffer-window (ad-get-arg 0)))
+                               'outer-window-id)
+                            (error nil))))
+                  (when id
+                    (call-process
+                     "wmctrl" nil nil nil "-i" "-R" id))))))
+
+     The last one is perhaps unnecessary but it might be worth trying
+     in some platforms.
+
+          (if (or (not window-system)(featurep 'xemacs))
+              nil
+            (defadvice select-frame (around set-input-focus
+                                            (frame) activate)
+              "Run `select-frame-set-input-focus'."
+              (setq ad-return-value (and (framep frame)
+                                         (frame-live-p frame)
+                                         frame))
+              (ad-deactivate 'select-frame)
+              (unwind-protect
+                  (select-frame-set-input-focus frame)
+                (ad-activate 'select-frame))))
+
+     These workarounds will become unnecessary in subsequent Emacs
+     releases (22.2 or 23.1).
+
+   ---------- Footnotes ----------
+
+   (1) w3m on cygwin (http://www.page.sannet.ne.jp/knabe/w3m/w3m.html)
+
+
+File: emacs-w3m.info,  Node: Shimbun FAQ,  Prev: Trouble FAQ,  Up: Frequently Asked Questions
+
+7.3 Questions of Shimbun Library
+================================
+
+   * Q. Why are the `shimbun' modules not installed?
+
+     Note that the `shimbun' modules (files under the `shimbun/'
+     directory) won't be installed if the FLIM package has not been
+     installed in your system.
+
+     The `configure' script determines automatically whether the FLIM
+     package is installed or not.  If the FLIM package is installed in
+     a non-standard directory, the determination fails.  In this case,
+     you can use the `--with-addpath' configure option to explicitly
+     set the directory name where the FLIM package has been installed.
+     Here's an example:
+
+          % ./configure --with-addpath=$HOME/share/emacs/site-lisp/flim
+
+
+File: emacs-w3m.info,  Node: Known Problems,  Next: Shimbun Library,  Prev: Frequently Asked Questions,  Up: Top
+
+8 You can surely solve it
+*************************
+
+
+File: emacs-w3m.info,  Node: Shimbun Library,  Next: Tips,  Prev: Known Problems,  Up: Top
+
+9 A tool for reading a newspaper
+********************************
+
+More and more newspapers, mailing list archives, bulletin boards, and
+individual diaries (such as hyper nikki system, weblogs and blogs) are
+published on the web.  `Shimbun' library enables you to read those
+contents with your favorite mail/news reader.  Actually, `Shimbun'
+library provides functions to convert those contents into articles like
+common e-mails.
+
+     `Shimbun' is pronounced "she-n-boon" (but actually vowels
+     shouldn't be prolonged), it means "newspaper" in Japanese.
+
+   The `shimbun' module has the goal to generate articles that are as
+readable as normal mail or news posting.  This goal is often difficult
+to achieve as web sites change the html of their articles.
+
+   If you notice (even small) annoyances like nonsense images within the
+text or any other text that is not related to the article please report
+them using `report-emacs-w3m-bug' (*note Mailing List::).
+
+   `Shimbun' library currently supports Asahi Shimbun, Yomiuri On-line,
+many mailing list archives such as Emacs Devel, XEmacs Beta, Gnus, Mew,
+and Wanderlust, Slashdot, Slashdot Japan, and a lot of others.  For
+more detail, see *note Shimbun Sites::.
+
+   By the way, you have to pay attention to copyright when using
+`Shimbun' library.  Copyrights of articles generated with `Shimbun'
+library are reserved by copyright holders of those original contents.
+Therefore, you are obliged not to violate rights of copyright holders,
+when you enjoy generated articles.  It means that you can enjoy
+generated articles on "fair use" that is described in the copyright law.
+
+   We, emacs-w3m development team, give no warranty to you, if
+`Shimbun' library causes a damage to you, or if you face a lawsuit
+about violation of copyrights.
+
+   `Shimbun' library is a collection of many modules, but each of them
+serves no useful purpose alone.  This section explains three typical
+`Shimbun' applications (two of which are included in the `Shimbun'
+library) and how to make `Shimbun' modules by yourself (you need to be
+able to write Emacs Lisp programs).
+
+* Menu:
+
+* Nnshimbun::                   Turning Gnus into a web browser!
+* Mew Shimbun::                 Reading web newspapers with Mew
+* Shimbun with Wanderlust::     Reading web newspapers with Wanderlust
+* Shimbun local mode::          Use a shell script to fetch shimbun feeds
+* Shimbun Sites::               Sites supported by Shimbun
+* Shimbun Basics::              How to make a new shimbun module
+
+   Note that you need to have installed the FLIM package (and Gnus if
+you'd like to use `nnshimbun') before building and installing
+emacs-w3m.  The FLIM package requires the APEL package.  You might also
+want to see *Note Other Requirements::.
+
+
+File: emacs-w3m.info,  Node: Nnshimbun,  Next: Mew Shimbun,  Up: Shimbun Library
+
+9.1 Turning Gnus into a web browser!
+====================================
+
+`Nnshimbun' is a Gnus back end, but it is distributed with emacs-w3m,
+not Gnus, exceptionally.  `Nnshimbun' allows you to turn Gnus into an
+exceptionally useful web browser.  You can skim through the articles on
+a newspaper's web server without having to see all the advertisement.
+You can read articles in mailing list archives as if you were
+subscribed to the list.  You can also read submissions in bulletin
+boards, etc...  Note that if you want to followup, you still need to use
+emacs-w3m as Gnus can't post via the web with `nnshimbun'.
+
+   See also *note Gnus:: for rendering HTML messages with emacs-w3m if
+you use Gnus.
+
+   The easiest way to get started with `nnshimbun' is to use something
+like the following in the Group buffer:
+
+   `M-x gnus-group-make-shimbun-group <RET> asahi <RET> national <RET>'
+
+Replace `asahi' and `national' with the keyword corresponding to the
+server you'd like to connect to and the group you're interested in
+respectively.  You can complete both of those names by using `<TAB>' or
+`<SPC>'.
+
+   You can also bind that to a key if there's enough room in the
+`gnus-group-mode-map' map, you can add something like the following in
+your `~/.gnus.el' file:
+
+     (eval-after-load "gnus-group"
+       '(define-key gnus-group-mode-map "Gn"
+          'gnus-group-make-shimbun-group))
+
+Then, you can use `G n' instead of `M-x gnus-group-make-shimbun-group'.
+
+   _Could someone book this keystroke at the Gnus Tower?_
+
+Besides this, you can use the `gnus-group-make-shimbun-groups' command
+in order to make all groups for the specified server.
+
+   `Nnshimbun' simply fetches HTML contents from the web server and
+displays them as an article, but it will never save articles in the
+local file system, except if you use persistent articles (*note
+Persistent Articles: (gnus)Persistent Articles.).  `Nnshimbun' uses NOV
+files for each `nnshimbun' group, and its back end is almost the same as
+`nnml'.
+
+   The following `nnshimbun' variables can be customized:
+
+`nnshimbun-keep-backlog'
+     This variable overrides the `gnus-keep-backlog' variable (*note
+     Article Backlog: (gnus)Article Backlog.) in `nnshimbun' groups.
+     If you set `nnshimbun-keep-backlog' to a number N, `nnshimbun'
+     will store at most N old articles in a buffer for later
+     re-fetching.  If this variable is non-`nil' and is not a number,
+     `nnshimbun' will store _all_ read articles (this is not a good
+     idea).  The default value is 300.
+
+     Note that smaller values may spoil the `prefetch-articles' feature
+     (see below), since `nnshimbun' uses the backlog to keep the
+     prefetched articles.
+
+`nnshimbun-directory'
+     Directory where `nnshimbun' saves NOV and marks files.  The
+     default value is `~/News/shimbun/'.  This is a server variable
+     (*note Server Variables: (gnus)Server Variables.).
+
+`nnshimbun-default-group-level'
+     The default group level overriding `gnus-level-default-subscribed'.
+     It will be applied to newly created `nnshimbun' groups.  The
+     default value is `nil'.  This is a server variable (*note Server
+     Variables: (gnus)Server Variables.).
+
+`nnshimbun-marks-is-evil'
+     If non-`nil', Gnus will never generate and use marks file for
+     `shimbun' spools.  Using marks files makes it possible to backup
+     and restore `shimbun' groups separately from `.newsrc.eld'.  If
+     you have, for some reason, set this to `t', and want to set it to
+     `nil' again, you should always remove the corresponding marks file
+     (usually named `.marks' in the `shimbun' group directory, but see
+     `nnshimbun-marks-file-name') for the group.  Then the marks file
+     will be regenerated properly by Gnus.  The default value is `nil'.
+     This is a server variable (*note Server Variables: (gnus)Server
+     Variables.).
+
+   You can use the specially made group parameter for `nnshimbun' in
+addition to the standard group parameters provided by Gnus(1).  Several
+parameters for `nnshimbun' are collected into the single group
+parameter `nnshimbun-group-parameters' which is a property list (the
+values can be different for every group).  Here's an example:
+
+     '(index-range all prefetch-articles off encapsulate-images on
+                   expiry-wait 6)
+
+   Below is the documentation for those group parameters and related
+variables.
+
+`prefetch-articles'
+     In a group where this group parameter is set to something else than
+     `off' or `nil', `nnshimbun' not only checks for new articles, but
+     also downloads them.  Though it will slow checking of new articles
+     down, you won't be kept waiting when reading articles.  In the
+     group where this group parameter is not set or its value is `nil',
+     the value of the `nnshimbun-pre-fetch-article' variable (`off' by
+     default) is used instead.
+
+`encapsulate-images'
+     In a group where this group parameter is set to something else than
+     `off' or `nil', `nnshimbun' will put image data embedded in the
+     original contents into an article as `multipart/related' parts of
+     the MIME format.  In the group where this group parameter is not
+     set or its value is `nil', the value of the
+     `nnshimbun-encapsulate-images' variable is used instead.  The
+     default value for the `nnshimbun-encapsulate-images' variable is
+     the value of the `shimbun-encapsulate-images' variable which is
+     provided in the `shimbun' library (the default value is probably
+     `t').
+
+`index-range'
+     You can specify the range of articles to be fetched from the web
+     server using the `index-range' group parameter.  To specify the
+     range, use the following values:
+
+    `nil'
+    `all'
+          all pages
+
+    `last'
+          only the latest page
+
+    `integer N'
+          the latest N pages
+
+     `Nnshimbun' checks whether there are new articles by parsing the
+     index page of the server.  It is possible that there are two or
+     more index pages on the server.  For instance, in the case of the
+     mailing list servers, index pages are generally classified
+     according to the date on which the article was posted.  It would
+     take a considerable amount of time to check all those huge index
+     pages especially if you are connecting via a slow line.
+
+     If it is possible, `nnshimbun' won't check index pages which have
+     already been checked at the last connection.  If you want to save
+     even more time, use `last'.  It makes `nnshimbun' refer to only the
+     latest index page for checking new articles.
+
+     In the group where the `index-range' group parameter is not set or
+     its value is `nil', the value of the `nnshimbun-index-range'
+     variable (`2' by default) is used.
+
+`nnshimbun-group-parameters-alist'
+     This is an Emacs Lisp variable, an alist of regexp of group names
+     and `nnshimbun' group parameters.  The default value is `nil'.
+     Each element may have the form `(REGEXP KEYWORD VALUE KEYWORD
+     VALUE...)', for example:
+
+          '("^nnshimbun\\+asahi:" index-range all prefetch-articles off
+            encapsulate-images on expiry-wait 6)
+
+     Since you can use this variable to specify the same `nnshimbun'
+     group parameters for two or more groups which have similar names
+     (i.e., those groups are likely to have similar characteristics
+     each other), it is useful that it can be used instead of
+     specifying the `nnshimbun' group parameters to several groups
+     respectively.  If the group parameter has already been set in a
+     group, that takes precedence over this variable.
+
+   You can instruct `nnshimbun' to expire articles(2).  Keep in mind
+that when an article is expired, it is not deleted from the remote
+server, it's still available there.  What is deleted is the line in
+your own NOV file for `nnshimbun'(3) corresponding to the article to be
+expired.  Then the article won't appear in the Summary buffer, forever
+and ever.
+
+   If you don't expire articles in `nnshimbun' groups, the NOV files
+will continue to grow fat indefinitely and you may see very old
+articles in the Summary buffer as if they were existing (in fact, they
+might have expired three years ago on the remote server!).  Even if you
+try to read such an article, nothing will appear in the article buffer.
+On the other hand, most mailing list servers generally offer all the
+past articles.  You may not feel like expiring articles in such groups
+in order to look back with nostalgia to the good old days and to be
+able to read, eyes filled with tears, articles which you thought long
+gone.
+
+   You can mark `nnshimbun' articles as expirable and specify the
+expiry period in each `nnshimbun' group as well as the other mail back
+ends.  However, there are a little differences between `nnshimbun' and
+the other mail back ends:
+
+   * First of all, the expiry period is determined with the following
+     priorities.  Note that the default value might be different from
+     group to group.
+
+       1. The value of the `expiry-wait' group parameter in a group.
+
+       2. The value produced by evaluating the
+          `nnmail-expiry-wait-function' variable for a group.
+
+       3. The default value provided by the `shimbun' module
+          corresponding to a group.
+
+       4. The value of the `nnmail-expiry-wait' variable.
+
+   * Second of all, the argument to be passed to the function specified
+     by the `nnmail-expiry-wait-function' variable will contain the
+     names of the back end and the server like
+     "nnshimbun+asahi:national", while only the group name will be
+     given in the case of the other mail back ends.  Here's an example:
+
+          (setq nnmail-expiry-wait-function
+                (lambda (group)
+                  (cond ((string-equal group "ding") 7)
+                        ((string-equal group "nnshimbun+ding:ding") 'never))))
+
+     This means that there are two groups for the same ding mailing
+     list; one is subscribed as a list member, the other is for reading
+     from the mailing list archive at the Gnus Towers.  Ahem, isn't it
+     clever?  The local mail files in the "ding" group will be expired
+     in seven days and your local disk space will be saved, but you can
+     read even the articles of the last century in the second group (if
+     it is really needed, though).
+
+   * Third of all, and this is written down so that you can remember it
+     when you're filled with doubt: even when all articles from a
+     `nnshimbun' group should be expired, the most recent one will be
+     kept.  This is not to satisfy your indecisive heart, it's because
+     the next time you fetch new articles for this group, `nnshimbun'
+     will know where to begin and not fetch all the articles all over
+     again.
+
+   The group parameters and the variables related to expiring
+`nnshimbun' articles are:
+
+`expiry-wait'
+     Don't be confused, please.  The `expiry-wait' group parameter is
+     provided as one of the elements of `nnshimbun-group-parameters',
+     the specially made group parameter for `nnshimbun'.  It has the
+     same name and the same meaning as the standard group parameter.
+     You may use whichever you like.  If nnshimbun's one is set to
+     non-`nil' value, it takes precedence over the standard one.  It is
+     provided in order to concentrate things related to `nnshimbun' at
+     one place of the "Gnus Customize" buffer (which will appear by
+     typing `G c' in the group buffer) and to realize managing
+     collectively by the `nnshimbun-group-parameters-alist' variable(4).
+     The values which can be used are a number of expiry period, `never'
+     or `immediate' as well as the standard group parameter.
+
+`nnshimbun-keep-unparsable-dated-articles'
+     If this variable is non-`nil', the articles of which the time of
+     creation (or the time of arrival) is unknown will never be expired,
+     since their age is unknown.  The default is `t'.  If you set this
+     variable to `nil', the articles of which the time is unknown will
+     also be expired unconditionally when the time to expire has come.
+     Well, it might prove useful for a general cleaning at the end of a
+     year.
+
+   ---------- Footnotes ----------
+
+   (1) The easiest way to specify group parameters is to type `G c' in
+the group buffer after moving the point to the group you'd like to
+customize (*note Group Parameters: (gnus)Group Parameters.).
+
+   (2) There are mainly two ways to expire articles automatically in
+the `nnshimbun' groups.  One is to add a group name regular expression
+(it should begin with "^nnshimbun\\+") to the
+`gnus-auto-expirable-newsgroups' variable and to put the expiry period
+for each group into the `nnmail-expiry-wait-function' variable.
+Another is to set the `auto-expire' group parameter to `t' and to set
+the expiry period with the `expiry-wait' group parameter in every
+`nnshimbun' group which you want to expire automatically.  See *Note
+Expiring Mail: (gnus)Expiring Mail, for more information.  In the group
+to which the `expiry-wait' group parameter is not specified, a default
+expiry period will be applied.
+
+   (3) The NOV file for `nnshimbun' is named something like
+"~/News/shimbun/asahi/national/.overview".
+
+   (4) We've already prepared the answer to the question that why
+`auto-expire' etc. aren't included in the nnshimbun's special group
+parameter?  The answer is, `expiry-wait' is handled by the `nnshimbun'
+back end, but `auto-expire' is handled by the Gnus core.  Therefore, it
+is contrary to the design policy of Gnus to extend the Gnus core
+functions so that it may work for one particular back end (i.e. reading
+a value from the nnshimbun's special group parameter).
+
+
+File: emacs-w3m.info,  Node: Mew Shimbun,  Next: Shimbun with Wanderlust,  Prev: Nnshimbun,  Up: Shimbun Library
+
+9.2 Reading web newspapers with Mew
+===================================
+
+Mew Shimbun is an Emacs Lisp program meant to be used with `shimbun'
+and Mew (version 2.1 and later).  The `mew-shimbun' module will be
+installed together with emacs-w3m if Mew, APEL, and FLIM are also
+installed.
+
+   We recommend you also see *note Mew::.
+
+  1. Setting things up
+
+     Put the following lines in the last of the `~/.mew.el' file:
+
+     ;;; Loading mew-shimbun, defining keys.
+     ;; (setq mew-shimbun-use-unseen t)              ;;; (1)
+     (require 'mew-shimbun)
+     (define-key mew-summary-mode-map "G"  (make-sparse-keymap))
+     (define-key mew-summary-mode-map "Gg" 'mew-shimbun-goto-folder)
+     (define-key mew-summary-mode-map "GG" 'mew-shimbun-goto-unseen-folder)
+     (define-key mew-summary-mode-map "Gi" 'mew-shimbun-retrieve)
+     (define-key mew-summary-mode-map "GI" 'mew-shimbun-retrieve-all)
+     (define-key mew-summary-mode-map "Gr" 'mew-shimbun-re-retrieve)
+     (define-key mew-summary-mode-map "GR" 'mew-shimbun-re-retrieve-all)
+     (define-key mew-summary-mode-map "Ge" 'mew-shimbun-expire)
+     (define-key mew-summary-mode-map "GE" 'mew-shimbun-expire-all)
+
+     ;; Specifying `shimbun' servers and groups to be read with Mew in the
+     ;; `mew-shimbun-folder-groups' variable.  Each element has the form
+     ;; `("folder" ("server.group" . range) ...)'.  You can use `all',
+     ;; `last', and a number for the `range' item.
+
+     (setq mew-shimbun-folder-groups
+           '(;; Fetching `yomiuri.national', `yomiuri.sports', etc.
+             ;; into the `+shimbun/yomiuri' folder collectively.
+             ("yomiuri"
+              ("yomiuri.national" . 2)
+              ("yomiuri.sports". 2)
+              ("yomiuri.world". 2))
+             ;; Fetching `security-memo.memo'
+             ;; into `+shimbun/security-memo'.
+             ("security-memo"
+              ("security-memo.memo" . 2))
+             ("slashdot-jp"
+              ("slashdot-jp.story" . last))
+             ;; You can read several groups in one folder (`+shimbun/emacs')
+             ;; as follows even if each group comes from a different server.
+             ("emacs"
+              ("airw.wl" . last)
+              ("emacs-w3m.emacs-w3m" . last))
+             ;; Fetching diaries into `+shimbun/hns/arisawa' and
+             ;; `+shimbun/hns/miyoshi' respectively.
+             ("hns/arisawa"
+              ("hns.arisawa" . last))
+             ("hns/miyoshi"
+              ("hns.miyoshi" . last))))
+
+     You did the fundamental setups.  For the other user definable
+     variables, use `M-x customize-group' for the `mew-shimbun' group or
+     see the source code.
+
+  2. Reading `shimbun' messages
+
+       a. Getting started
+
+          Type `G I' (`mew-shimbun-retrieve-all') first, after setting
+          things up as mentioned above.  The `shimbun' folders
+          specified by the `mew-shimbun-folder-groups' variable will be
+          created under the `+shimbun' parent folder.  Typing `G I' is
+          also useful when you have added new groups.  You can change
+          the name of the parent folder (`+shimbun' by default) by
+          customizing the `mew-shimbun-folder' variable.
+
+       b. Moving into a `shimbun' folder
+
+          You can move to any folder (including `shimbun') by typing `g'
+          (`mew-summary-goto-folder'), but `G g'
+          (`mew-shimbun-goto-folder') is restricted to moving to only
+          the `shimbun' folder.  In addition, folders which have new
+          messages (in other words, folders which have not been
+          scanned) will be displayed when using a prefix argument with
+          `G g' (i.e.  `C-u G g').  A prefix argument similarly affects
+          `G G' as well.
+
+       c. Fetching messages in each folder
+
+          You can fetch new messages for the current folder exclusively
+          by typing `G i' (`mew-shimbun-retrieve') in a `shimbun'
+          folder.
+
+       d. Fetching updated messages
+
+          If you perform the `G r' command (`mew-shimbun-re-retrieve')
+          when a particular message is being displayed, the message
+          will be updated if it is possible, and new messages will be
+          fetched.  With a prefix argument (i.e.  `C-u G r'), it will
+          attempt to update messages which are marked with the mark
+          specified by the `mew-shimbun-mark-re-retrieve' variable (`@'
+          by default).  It would be useful for CNET, etc.
+
+          The `G R' command (`mew-shimbun-re-retrieve-all') checks the
+          freshness of all messages and re-fetches the updated
+          messages.  If a prefix argument is given (i.e. `C-u G R'),
+          the messages within the region will be processed.  It is
+          probably worthwhile if the site is running the hyper nikki
+          system (`nikki' means "diary" in Japanese).
+
+  3. Managing unseen messages
+
+     If you have the following setting in the `~/.mew.el' file,
+
+          (setq mew-shimbun-use-unseen t)
+
+     newly fetched messages will be marked with the mark specified by
+     the `mew-shimbun-mark-unseen' variable (`*' by default), and it
+     will disappear automatically after reading the message.
+
+     Normally, the unseen marks will not be saved in the `.mew-cache'
+     file if scanning is not performed after adding or deleting marks
+     in the Mew summary mode, but if you add the following line to the
+     `~/.mew.el' file,
+
+          (setq mew-shimbun-use-unseen-cache-save t)
+
+     the unseen marks will be saved in the `.mew-cache' file
+     automatically for the `shimbun' groups when exiting Mew or killing
+     a folder (using `C-c C-q').  However, it is not securely saved
+     (2).  To do this securely, you had better have the habit of
+     performing the `scan update' command after reading the folder.
+
+     If you don't like the `*' mark for unseen messages, customize the
+     `mew-shimbun-mark-unseen' variable (see above).  By specifying the
+     mark by `C-u N', you will be able to lead a better life with
+     taking care of unseen messages.
+
+  4. Expiring messages
+
+     You can expire messages if you set the `mew-shimbun-expires'
+     variable beforehand.  For example:
+
+          (setq mew-shimbun-expires
+                '(("yomiuri" . 7)
+                  ("asahi" . 1)
+                  ("slashdot-jp" . 7)
+                  ("emacs" . 7)))
+
+     If you set this variable as shown above, you can specify the expiry
+     period; 7 days for `+shimbun/yomiuri', 1 day for `+shimbun/asahi'.
+     Messages in the `shimbun' folder where the expiry period is not
+     specified will never be expired.  You can use the `G e' command
+     (`mew-shimbun-expire') to expire the expirable messages in the
+     current folder.  The `G E' command (`mew-shimbun-expire-all') is
+     for expiring the expirable messages in all the `shimbun' folders.
+     Note that once the messages have been expired, you cannot recover
+     them.
+
+  5. How to mark messages with `$' as unseen
+
+     Put the following lines in the `~/.mew.el' file in order to define
+     the `$' mark and use `$' for the mark of unseen.  See
+     `http://www.mew.org/ml/mew-dist-2.0/msg01251.html' if you would
+     like to replace the `$' mark with another.
+
+     ;;---------------------------------------------------------------------
+     ;;; Code for using `$' as the unseen mark.
+     (setq mew-mark-unseen ?$)
+     (setq mew-shimbun-mark-unseen mew-mark-unseen)
+     (setq mew-mark-show-list (cons mew-mark-unseen mew-mark-show-list))
+     (setq mew-mark-afterstep-spec
+           (cons (cons mew-mark-unseen '(1 0 1 0 0 0 0))
+                 mew-mark-afterstep-spec))
+     (setq mew-mark-spec
+           (cons (list mew-mark-unseen "unseen" 0 nil nil nil nil nil)
+                 mew-mark-spec))
+     (setq mew-highlight-mark-keywords
+           (cons
+            (cons mew-mark-unseen 'mew-face-mark-unseen)
+            mew-highlight-mark-keywords))
+     (defface mew-face-mark-unseen
+       '((((class color) (type tty))
+          (:foreground "green"))
+         (((class color) (background light))
+          (:foreground "deep pink" :bold t :italic t))
+         (((class color) (background dark))
+          (:foreground "thistle"))
+         (t (:bold t)))
+       "*Face to highlight the unseen mark"
+       :group 'mew-highlight)
+     (defun mew-summary-unseen (&optional count)
+       "Put the unseen mark(default is '$') in COUNT times."
+       (interactive "P")
+       (mew-mark-put-mark-loop (function mew-summary-unseen-one) count nil))
+     (defun mew-summary-unseen-one (&optional no-msg)
+       "Put the unseen mark(default is '$') on this message."
+       (mew-mark-put-mark mew-mark-unseen no-msg))
+     (defun mew-summary-mark-unseen ()
+       "Change the '*' mark into the '$' mark."
+       (interactive)
+       (mew-summary-exchange-mark mew-mark-review mew-mark-unseen))
+     (defun mew-thread-mark-unseen ()
+       "Put the '$' mark on all messages of the current sub-thread."
+       (interactive)
+       (mew-thread-mark mew-mark-unseen))
+
+     (define-key mew-summary-mode-map "$"  'mew-summary-unseen)
+     (define-key mew-summary-mode-map "m$" 'mew-summary-mark-unseen)
+     (define-key mew-summary-mode-map "t$" 'mew-thread-mark-unseen)
+     ;;---------------------------------------------------------------------
+
+   ---------- Footnotes ----------
+
+   (1) Uncomment this line if you'd like to manage unseen messages.  It
+must be placed before the `(require 'mew-shimbun)' line.
+
+   (2) People who have set the `mew-touch-folder-p' variable to `t'
+will succeed 100% in saving marks, but people who use `nil' value seem
+not to be 0% successful.
+
+
+File: emacs-w3m.info,  Node: Shimbun with Wanderlust,  Next: Shimbun local mode,  Prev: Mew Shimbun,  Up: Shimbun Library
+
+9.3 Reading web newspapers with Wanderlust
+==========================================
+
+Wanderlust includes `elmo-shimbun' as an ELMO module, so you can read
+`shimbun' by just accessing a folder beginning with `@' (*note Shimbun
+Folder: (wl)Shimbun Folder.).
+
+
+File: emacs-w3m.info,  Node: Shimbun local mode,  Next: Shimbun Sites,  Prev: Shimbun with Wanderlust,  Up: Shimbun Library
+
+9.4 Using a shell script to fetch shimbun feeds
+===============================================
+
+If you read lots of `shimbuns', checking those for new articles can
+take some time due to emacs-w3m retrieving the feeds one by one.  If you
+want to speed this up, you can use a shell script to retrieve the feeds,
+which you can either call manually (e.g. from within Emacs) or
+automatically through schedulers like cron.  The feeds must be saved in
+specially named files, and emacs-w3m will then use those files instead
+of calling w3m.
+
+   The following variables control the local mode:
+
+`shimbun-use-local'
+     Setting this to `t' will activate the local mode, meaning that
+     emacs-w3m will first check if a feed is available as a local file.
+     If it cannot be found, it will be retrieved through w3m as usual.
+
+`shimbun-local-path'
+     This is the directory where the shimbun files are stored.  The
+     default value is `w3m-default-save-directory'.
+
+   The file name for a feed is expected to be the MD5 of the URL,
+truncated to the first 10 characters, appended with the string
+`_shimbun'.  You can easily generate the file name for a feed in Emacs
+through
+
+     (concat (substring (md5 "http://example/feed") 0 10) "_shimbun")
+
+   If you use Gnus with `nnshimbun', there is already a function which
+will generate a download shell script for all currently subscribed
+shimbun groups.  Just call `nnshimbun-generate-download-script', and it
+will generate the shell script in a new buffer which you can save
+afterwards.  If you call the function with a prefix, it will put an
+ampersand after each w3m call, so that the feeds are retrieved in
+parallel.
+
+
+File: emacs-w3m.info,  Node: Shimbun Sites,  Next: Shimbun Basics,  Prev: Shimbun local mode,  Up: Shimbun Library
+
+9.5 Sites supported by Shimbun
+==============================
+
+This section provides the list of sites supported by `shimbun' library.
+Unfortunately for people who cannot understand Japanese, almost of
+supported sites are written in Japanese.
+
+* Menu:
+
+* Newspapers Supported by Shimbun::
+* News Sites Supported by Shimbun::
+* Mailing Lists Supported by Shimbun::
+* Sport Sites Supported by Shimbun::
+* Misc Sites Supported by Shimbun::
+
+
+File: emacs-w3m.info,  Node: Newspapers Supported by Shimbun,  Next: News Sites Supported by Shimbun,  Up: Shimbun Sites
+
+9.5.1 Newspapers Supported by Shimbun
+-------------------------------------
+
+These are newspapers that are supported by `shimbun' library.
+
+Asahi Shimbun (http://www.asahi.com/)
+     asahi.book asahi.book.column asahi.book.news asahi.book.paperback
+     asahi.book.review asahi.book.special asahi.business asahi.car
+     asahi.culture asahi.digital asahi.editorial asahi.edu asahi.english
+     asahi.food asahi.health asahi.housing asahi.igo asahi.international
+     asahi.international.asia asahi.international.column
+     asahi.international.special asahi.international.world asahi.job
+     asahi.kansai asahi.kansai.entertainment asahi.kansai.kokoro
+     asahi.kansai.sumai asahi.kansai.taberu asahi.komimi asahi.life
+     asahi.life.column asahi.national asahi.politics asahi.rss
+     asahi.science asahi.shopping asahi.shopping.column
+     asahi.shopping.yakimono asahi.shougi asahi.sports
+     asahi.sports.baseball asahi.sports.battle asahi.sports.etc
+     asahi.sports.football asahi.sports.golf asahi.sports.rugby
+     asahi.sports.usa asahi.sports.winter asahi.tenjin asahi.travel
+     asahi.wakata
+
+     Those groups generate articles containing only text by default.
+     If you would like to make them generate HTML articles that contain
+     not only text but also photographs, add the following line to your
+     `~/.emacs' file:
+
+          (setq shimbun-asahi-prefer-text-plain nil)
+
+     On the other hand, you can also use the `asahi-html' back end to
+     generate HTML articles.  In order to use it, specify
+     `asahi-html.business' instead of `asahi.business' as the group
+     name for example.
+
+Asahi Shimbun (http://mytown.asahi.com/)
+     asahi-mytown.(hokkaido...okinawa)
+
+     The Asahi Shimbun local-news sections including all the
+     prefectures of Japan.
+
+BBC (http://www.bbc.co.uk/)
+     bbc.news
+
+Die Welt (http://www.welt.de/)
+     welt-de.news
+
+Die Zeit (http://www.zeit.de/)
+     zeit-de.auto zeit-de.computer zeit-de.deutschland
+     zeit-de.feuilleton zeit-de.gesundheit zeit-de.international
+     zeit-de.leben zeit-de.literatur zeit-de.musik zeit-de.news
+     zeit-de.reisen zeit-de.schule zeit-de.sport zeit-de.studium
+     zeit-de.wirtschaft zeit-de.wissen zeit-de.zuender
+
+Gendai Net (http://gendai.net/)
+     gendai-net.today gendai-net.syakai gendai-net.sports
+     gendai-net.geino gendai-net.wadai gendai-net.kenko
+     gendai-net.syoku gendai-net.book
+
+Mainichi jp (http://mainichi.jp/)
+(This site has been shifted from MSN in October, 2007)
+     mainichi.flash mainichi.sports mainichi.entertainment
+     mainichi.entertainment.art mainichi.mantan mainichi.electronics
+     mainichi.weekly mainichi.opinion.editorial mainichi.opinion.yoroku
+     mainichi.opinion.hasshinbako mainichi.opinion.eye
+     mainichi.opinion.hito mainichi.opinion.kinji
+     mainichi.opinion.yuraku mainichi.opinion.closeup
+     mainichi.opinion.kaisetsu mainichi.opinion.newsup
+
+     Those groups generate HTML articles containing photographs by
+     default.  If you would like to make them generate articles that
+     contain only text, add the following line to your `~/.emacs' file:
+
+          (setq shimbun-mainichi-prefer-text-plain t)
+
+The New York Times (http://www.nytimes.com/)
+     nytimes.homepage nytimes.news.business
+     nytimes.news.business.media&advertising
+     nytimes.news.business.worldbusiness
+     nytimes.news.business.smallbusiness
+     nytimes.news.business.yourmoney nytimes.news.business.dealbook
+     nytimes.news.education nytimes.news.health
+     nytimes.news.health.policy nytimes.news.health.psychology
+     nytimes.news.world nytimes.news.world.africa
+     nytimes.news.world.americas nytimes.news.world.asia
+     nytimes.news.world.europe nytimes.news.world.middleeast
+     nytimes.news.us nytimes.news.newyork nytimes.news.newyork.thecity
+     nytimes.news.newyork.metro nytimes.news.obituaries
+     nytimes.news.science nytimes.news.science.earth
+     nytimes.news.science.nutrition nytimes.news.science.space
+     nytimes.news.sports nytimes.news.sports.basketball.college
+     nytimes.news.sports.football.college nytimes.news.sports.golf
+     nytimes.news.sports.hockey nytimes.news.sports.other
+     nytimes.news.sports.baseball.pro nytimes.news.sports.basketball.pro
+     nytimes.news.sports.football.pro nytimes.news.sports.soccer
+     nytimes.news.technology nytimes.news.technology.bits
+     nytimes.news.technology.circuits nytimes.news.technology.pogue
+     nytimes.news.washington nytimes.features.arts
+     nytimes.features.arts.design nytimes.features.arts.music
+     nytimes.features.arts.television nytimes.features.automobiles
+     nytimes.features.books nytimes.features.books.review
+     nytimes.features.dining&wine nytimes.features.fashion
+     nytimes.features.fashion.thursdaystyles
+     nytimes.features.fashion.weddings nytimes.features.home&garden
+     nytimes.features.jobs nytimes.features.magazine
+     nytimes.features.movie.news nytimes.features.movie.reviews
+     nytimes.features.realestate nytimes.features.theater
+     nytimes.features.travel nytimes.features.travel.escapes
+     nytimes.features.week_in_review nytimes.additional.pop_top
+     nytimes.opinion.editorial
+
+     The New York Times began to offer news articles for free on
+     September 19, 2007.  In spite of having said `charset=iso-8859-1',
+     this site often uses the `windows-1252' charset that is a superset
+     of `iso-8859-1'.  `Shimbun' (and also emacs-w3m) works in even
+     such a case if the `windows-1252' coding system is available in
+     your (X)Emacs.
+
+Nikkan Sports (http://www.nikkansports.com/)
+     nikkansports.flash nikkansports.baseball
+     nikkansports.baseball.highschool nikkansports.baseball.amateur
+     nikkansports.baseball.mlb nikkansports.soccer
+     nikkansports.soccer.japan nikkansports.soccer.world
+     nikkansports.sports nikkansports.sumo nikkansports.nba
+     nikkansports.nfl nikkansports.nhl nikkansports.rugby
+     nikkansports.golf nikkansports.motor nikkansports.battle
+     nikkansports.race nikkansports.race.kka nikkansports.entertainment
+     nikkansports.cinema nikkansports.general
+
+Nihon Keizai Shimbun (http://www.nikkei.co.jp/)
+     nikkei.top nikkei.main nikkei.keizai nikkei.sangyo nikkei.tento
+     nikkei.kansai nikkei.it.business nikkei.it.busi_gyoukai
+     nikkei.it.biz-system nikkei.it.sox nikkei.it.data nikkei.it.taidan
+     nikkei.it.internet nikkei.it.broad nikkei.it.net_gyoukai
+     nikkei.it.iptel nikkei.it.tele nikkei.it.broadcast
+     nikkei.it.internet-column nikkei.it.contents nikkei.it.ec
+     nikkei.it.policy nikkei.it.e-gov nikkei.it.mobile
+     nikkei.it.mob_gyoukai nikkei.it.mobsoft nikkei.it.mobcon
+     nikkei.it.money nikkei.it.one nikkei.it.security
+     nikkei.it.net_crime nikkei.it.digital nikkei.it.pc nikkei.kokunai
+     nikkei.markets nikkei.kawase nikkei.kinri nikkei.ft nikkei.dj
+     nikkei.ngyoseki nikkei.gyosuuchi nikkei.gyoseki nikkei.china
+     nikkei.market nikkei.kaigai nikkei.seiji nikkei.shakai nikkei.retto
+     nikkei.sports nikkei.newpro nikkei.release nikkei.release.it.comp
+     nikkei.release.it.peri nikkei.release.it.sys nikkei.release.it.cont
+     nikkei.release.it.net nikkei.release.it.lsi nikkei.release.it.game
+     nikkei.release.it.etc nikkei.release.dist.depart
+     nikkei.release.dist.ryohan nikkei.release.dist.zakka
+     nikkei.release.dist.cosme nikkei.release.dist.car
+     nikkei.release.dist.book nikkei.release.dist.record
+     nikkei.release.dist.food nikkei.release.dist.mercha
+     nikkei.release.dist.mail nikkei.release.dist.netshop
+     nikkei.release.dist.etc nikkei.release.money.bank
+     nikkei.release.money.sec nikkei.release.money.am
+     nikkei.release.money.insu nikkei.release.money.etc
+     nikkei.release.maker.chemi nikkei.release.maker.mecha
+     nikkei.release.maker.car nikkei.release.maker.elec
+     nikkei.release.maker.food nikkei.release.maker.sports
+     nikkei.release.maker.apparel nikkei.release.maker.commu
+     nikkei.release.maker.etc nikkei.release.service.medic
+     nikkei.release.service.rest nikkei.release.service.trans
+     nikkei.release.service.energy nikkei.release.service.enter
+     nikkei.release.service.env nikkei.release.service.consul
+     nikkei.release.service.edu nikkei.release.service.haken
+     nikkei.release.service.life nikkei.release.service.media
+     nikkei.release.service.lease nikkei.release.service.travel
+     nikkei.release.service.etc nikkei.release.const.const
+     nikkei.release.const.house nikkei.release.const.etc nikkei.shasetsu
+
+MSN Sankei News (http://sankei.jp.msn.com/)
+(This site has been shifted to MSN in October, 2007)
+     sankei.news.shakai sankei.news.kokusai sankei.news.seiji
+     sankei.news.keizai sankei.news.seikatsu sankei.news.kyouiku
+     sankei.news.sports sankei.news.cutlure sankei.news.chiho
+     sankei.special.komori sankei.special.kuroda sankei.special.ito
+     sankei.special.tamura sankei.special.jieitai sankei.special.kenpo
+     sankei.special.kyouiku sankei.special.kiko sankei.ronsetsu.shucho
+     sankei.ronsetsu.sankeisho sankei.ronsetsu.seiron
+
+Spiegel Online (http://www.spiegel.de/)
+     spiegel.news
+
+Sponichi (http://www.sponichi.co.jp/)
+     sponichi.baseball sponichi.soccer sponichi.usa sponichi.others
+     sponichi.society sponichi.entertainment sponichi.horseracing
+
+Sueddeutsche Zeitung (http://www.sueddeutsche.de/)
+     sueddeutsche-de.alles sueddeutsche-de.nachrichten
+     sueddeutsche-de.politik sueddeutsche-de.wirtschaft
+     sueddeutsche-de.finanzen sueddeutsche-de.kino
+     sueddeutsche-de.kultur sueddeutsche-de.sport
+     sueddeutsche-de.muenchen sueddeutsche-de.panorama
+     sueddeutsche-de.leben sueddeutsche-de.gesundheit
+     sueddeutsche-de.computer
+
+Yomiuri Shimbun (http://www.yomiuri.co.jp/)
+     yomiuri.atmoney yomiuri.editorial yomiuri.entertainment
+     yomiuri.iryou yomiuri.kyoiku yomiuri.kyoiku.children
+     yomiuri.kyoiku.english yomiuri.kyoiku.qanda
+     yomiuri.kyoiku.renaissance yomiuri.kyoiku.special yomiuri.national
+     yomiuri.politics yomiuri.science yomiuri.sports yomiuri.world
+
+     Those groups generate articles containing only text by default.
+     If you would like to make them generate HTML articles that contain
+     not only text but also photographs, add the following line to your
+     `~/.emacs' file:
+
+          (setq shimbun-yomiuri-prefer-text-plain nil)
+
+     On the other hand, you can also use the `yomiuri-html' back end to
+     generate HTML articles.  In order to use it, specify
+     `yomiuri-html.atmoney' instead of `yomiuri.atmoney' as the group
+     name for example.
+
+
+File: emacs-w3m.info,  Node: News Sites Supported by Shimbun,  Next: Mailing Lists Supported by Shimbun,  Prev: Newspapers Supported by Shimbun,  Up: Shimbun Sites
+
+9.5.2 News Sites Supported by Shimbun
+-------------------------------------
+
+These are news sites that are supported by `shimbun' library.
+
+Al Jazeera (http://english.aljazeera.net/)
+     aljazeera.news aljazeera.africa aljazeera.america
+     aljazeera.asia-pacific aljazeera.central-asia aljazeera.europe
+     aljazeera.middle-east aljazeera.focus aljazeera.business
+     aljazeera.sport aljazeera.programmes
+
+CNET (http://news.com.com/)
+     cnet.news cnet.enterprise.software cnet.enterprise.hardware
+     cnet.security cnet.networking cnet.personal.technology
+     cnet.newsmakers cnet.perspectives
+
+CNET Japan (http://japan.cnet.com/)
+     cnet-jp.general cnet-jp.news cnet-jp.special cnet-jp.opinion
+     cnet-jp.blog.geetstate cnet-jp.blog.kenn cnet-jp.blog.lessig
+     cnet-jp.blog.matsumura cnet-jp.blog.nakajima cnet-jp.blog.saeki
+     cnet-jp.blog.sakamoto cnet-jp.blog.sasaki cnet-jp.blog.sentan
+     cnet-jp.blog.staff cnet-jp.blog.takawata cnet-jp.blog.watanabe
+
+CNN Japan (http://www.cnn.co.jp/)
+     cnn-jp.business cnn-jp.fringe cnn-jp.science cnn-jp.showbiz
+     cnn-jp.sports cnn-jp.top cnn-jp.usa cnn-jp.world
+
+De-Bug Magazine (http://www.de-bug.de/)
+     debugmagazin-de.frontpage debugmagazin-de.musik
+     debugmagazin-de.reviews debugmagazin-de.magazin
+     debugmagazin-de.medien debugmagazin-de.podcast
+     debugmagazin-de.musiktechnik debugmagazin-de.screen
+     debugmagazin-de.gadgets debugmagazin-de.games debugmagazin-de.mode
+
+Engadget Japanese (http://japanese.engadget.com/)
+     engadget-ja.top
+
+Excite News (http://www.excite.co.jp/)
+     excite.bit-koneta excite.world-odd
+
+FAU-IAA (http://www.fau.org/)
+     fau.news
+
+Heise Online (http://www.heise.de/)
+     heise.news heise.telepolis
+
+Infoshop News (http://news.infoshop.org/)
+     infoshop.news
+
+Impress (http://www.watch.impress.co.jp/)
+     impress.enterprise impress.pc impress.dc impress.akiba impress.av
+     impress.game impress.k-tai impress.internet impress.bb
+     impress.forest impress.robot impress.kaden impress.car
+
+ITmedia (http://www.itmedia.co.jp/)
+     itmedia.news.bursts itmedia.news.domestic itmedia.news.foreign
+     itmedia.news.products itmedia.news.technology itmedia.news.web20
+     itmedia.news.nettopics itmedia.news.society itmedia.news.security
+     itmedia.news.industry itmedia.news.research itmedia.news.sp_amd
+     itmedia.anchordesk itmedia.bizid itmedia.enterprise
+     itmedia.+D.plusd itmedia.+D.mobile itmedia.+D.pcupdate
+     itmedia.+D.lifestyle itmedia.+D.games itmedia.+D.docomo
+     itmedia.+D.au_kddi itmedia.+D.vodafone itmedia.+D.shopping
+     itmedia.+D.lifestyle.column.asakura
+     itmedia.+D.lifestyle.column.honda
+     itmedia.+D.lifestyle.column.kobayashi
+     itmedia.+D.lifestyle.column.kodera
+     itmedia.+D.lifestyle.column.nishi
+     itmedia.+D.lifestyle.column.ogikubo
+     itmedia.+D.lifestyle.column.tachibana
+     itmedia.+D.lifestyle.column.takemura
+     itmedia.+D.lifestyle.column.unakami
+
+Japan Times (http://www.japantimes.co.jp/)
+     japantimes.general japantimes.business
+
+LAUT AG (http://www.laut.de/)
+     laut-de.news laut-de.platten laut-de.platten_alternative
+     laut-de.platten_dance laut-de.platten_hiphop platten_jazz
+     laut-de.platten_metal laut-de.platten_pop laut-de.platten_rnb
+     laut-de.platten_rock
+
+N24 (http://www.n24.de/)
+     n24-de.boerse n24-de.boulevard n24-de.nachrichten n24-de.netnews
+     n24-de.politik n24-de.sport n24-de.wirtschaft
+
+Open Tech Press (http://opentechpress.jp/)
+     opentechpress-jp.general opentechpress-jp.enterprise
+     opentechpress-jp.opensource opentechpress-jp.security
+     opentechpress-jp.news opentechpress-jp.pr
+
+Perlentaucher (http://www.perlentaucher.de/)
+     perlentaucher-de.aktuell
+
+Rediff.com (http://www.rediff.com/)
+     rediff.news
+
+Slashdot (http://www.slashdot.org/)
+     slashdot.frontpage slashdot.apple slashdot.askslashdot
+     slashdot.books slashdot.developers slashdot.games
+     slashdot.hardware slashdot.interviews slashdot.IT slashdot.linux
+     slashdot.mobile slashdot.politics slashdot.science
+
+     The following variables are available for configuring the comment
+     section of the Slashdot shimbun:
+
+    `shimbun-slashdot-get-comments'
+          If set to `t' (the default), comments will be retrieved for
+          every article.  They are separated from the intro text
+          through a formfeed character (i.e. "^L"); you can access them
+          by scrolling the article buffer as usual (for Gnus you can
+          use the "Next page" button and the "Previous page" button).
+          Setting this variable to `nil' will deactivate retrieval of
+          comments.
+
+    `shimbun-slashdot-comment-threshold'
+          Threshold for displayed comments (default: 3).  Can be a
+          number between -1 (all comments) and 5 (highest rating).
+
+    `shimbun-slashdot-comment-display'
+          Type of display for the comments (default: "flat").  Can be
+          either "flat", "thread" or "nested".  Note that this must be
+          a string, not a symbol.
+
+Slashdot Japan (http://slashdot.jp/)
+     slashdot-jp.story slashdot-jp.askslashdot slashdot-jp.bookreview
+     slashdot-jp.bsd slashdot-jp.developers slashdot-jp.interview
+     slashdot-jp.linux slashdot-jp.mac slashdot-jp.mobile
+     slashdot-jp.science slashdot-jp.security slashdot-jp.slash
+     slashdot-jp.it slashdot-jp.hardware slashdot-jp.diary.oliver
+
+     Add appropriate configurations to the variable
+     `shimbun-slashdot-jp-group-alist', you can browse other diaries
+     provided at `http://slashdot.jp/'.
+
+Tech-On! by NikkeiBP (http://techon.nikkeibp.co.jp/)
+     tech-on.latestnews tech-on.mobile tech-on.bbint tech-on.d-ce
+     tech-on.AT tech-on.edaonline tech-on.device tech-on.lsi
+     tech-on.silicon tech-on.observer tech-on.fpd tech-on.mono
+     tech-on.embedded tech-on.mecha tech-on.MEMS tech-on.nano
+     tech-on.carele tech-on.board tech-on.mcu tech-on.PLM
+     tech-on.memory tech-on.measurement tech-on.column.mot
+
+     Tech-On! is a technology news site brought by NikkeiBP.  At least
+     in autumn 2007, it doesn't seem to be, but a login account (that's
+     for free) was needed to read the whole contents of articles
+     formerly.  If it becomes required again in the future, visit the
+     registration page
+     (http://techon.nikkeibp.co.jp/guide/inf_regi.html) to have it.
+     The following two variables control how you log in:
+
+    `shimbun-tech-on-user-name'
+          User name to log in on Tech-On! with.  If it is `nil', you
+          will be prompted for a user name when logging in on Tech-On!
+          with.  If it is a string, it will be used as a user name and
+          you will never be prompted.  If it is neither `nil' nor a
+          string (that is the default), you will never log in.
+
+    `shimbun-tech-on-password'
+          Password to use to log in on Tech-On! with.  If it is `nil',
+          you will be prompted for a password when logging in on
+          Tech-On! with.  If it is a string, it will be used as a
+          password and you will never be prompted.  If it is neither
+          `nil' nor a string (that is the default), you will never log
+          in.
+
+     Entering them is required only once in the Emacs session at the
+     first time to start reading a Tech-On! article.
+
+HotWired Japan (http://hotwired.goo.ne.jp/)
+     wired-jp.news wired-jp.business wired-jp.culture
+     wired-jp.technology wired-jp.blog.ogura wired-jp.blog.sasaki
+     wired-jp.blog.takahashi
+
+Yahoo! Japan (http://headlines.yahoo.co.jp/)
+     yahoo.topnews yahoo.news yahoo.politics yahoo.society yahoo.people
+     yahoo.business-all yahoo.market yahoo.stock yahoo.industry
+     yahoo.international yahoo.entertainment yahoo.sports yahoo.computer
+     yahoo.zenkoku yahoo.hokkaido yahoo.aomori yahoo.iwate yahoo.miyagi
+     yahoo.akita yahoo.yamagata yahoo.fukushima yahoo.tokyo
+     yahoo.kanagawa yahoo.chiba yahoo.saitama yahoo.ibaraki
+     yahoo.tochigi yahoo.gunma yahoo.yamanashi yahoo.nagano
+     yahoo.niigata yahoo.toyama yahoo.ishikawa yahoo.fukui yahoo.aichi
+     yahoo.gifu yahoo.shizuoka yahoo.mie yahoo.osaka yahoo.hyogo
+     yahoo.kyoto yahoo.shiga yahoo.nara yahoo.wakayama yahoo.tottori
+     yahoo.shimane yahoo.okayama yahoo.hiroshima yahoo.yamaguchi
+     yahoo.tokushima yahoo.kagawa yahoo.ehime yahoo.kochi yahoo.fukuoka
+     yahoo.saga yahoo.nagasaki yahoo.kumamoto yahoo.oita yahoo.miyazaki
+     yahoo.kagoshima yahoo.okinawa
+
+     The yahoo.news group retrieves the headline news and also the
+     flash news.  Those groups generate HTML articles by default.  If
+     you would like to make them generate articles containing only
+     text, add the following line to your `~/.emacs' file:
+
+          (setq shimbun-yahoo-prefer-text-plain t)
+
+ZDNet Japan (http://japan.zdnet.com/)
+     zdnet-jp.news zdnet-jp.news.network zdnet-jp.news.hardware
+     zdnet-jp.news.software zdnet-jp.news.manage zdnet-jp.news.security
+     zdnet-jp.news.internet zdnet-jp.news.os zdnet-jp.news.db
+     zdnet-jp.news.system zdnet-jp.column zdnet-jp.column.sp1
+     zdnet-jp.column.netsecurity1 zdnet-jp.column.ea1
+     zdnet-jp.column.btl zdnet-jp.column.solutionIT
+     zdnet-jp.channel.security zdnet-jp.channel.ilm zdnet-jp.blog.iida
+     zdnet-jp.blog.mhatta zdnet-jp.blog.kurei zdnet-jp.blog.opensource
+     zdnet-jp.blog.soa zdnet-jp.blog.dp
+
+The Onion (http://www.theonion.com/)
+     the-onion.news
+
+
+File: emacs-w3m.info,  Node: Mailing Lists Supported by Shimbun,  Next: Sport Sites Supported by Shimbun,  Prev: News Sites Supported by Shimbun,  Up: Shimbun Sites
+
+9.5.3 Mailing Lists Supported by Shimbun
+----------------------------------------
+
+These are mailing list archives supported by `shimbun' library.
+
+Semi-gnus Mailing List in Japan (http://lists.airs.net/semi-gnus/archive/)
+     airs.semi-gnus-ja
+
+Wanderlust Mailing List (http://lists.airs.net/)
+     airs.wl airs.wl-en
+
+Big Brother DataBase Mailing List (http://www.rc.tutrp.tut.ac.jp/bbdb-ml/)
+     bbdb-ml.bbdb-ml
+
+GNOME Mailing List (http://mail.gnome.org/archives/)
+     gnome.balsa-list gnome.calendar-list gnome.cvs-commits-list
+     gnome.foundation-announce gnome.foundation-list gnome.fplan-list
+     gnome.gconf-list gnome.gdome gnome.gnome-1.4-list
+     gnome.gnome-announce-list gnome.gnome-components-list
+     gnome.gnome-db-list gnome.gnome-de gnome.gnome-debugger-list
+     gnome.gnome-devel-list gnome.gnome-doc-list gnome.gnome-gui-list
+     gnome.gnome-hackers gnome.gnome-hackers-readonly
+     gnome.gnome-hackers-test gnome.gnome-i18n gnome.gnome-i18n-tools
+     gnome.gnome-kde-list gnome.gnome-list gnome.gnome-office-list
+     gnome.gnome-pilot-list gnome.gnome-sound-list
+     gnome.gnome-themes-list gnome.gnome-ui-hackers
+     gnome.gnome-web-list gnome.gnome-webmaster-list
+     gnome.gnome-workshop-list gnome.gnomecc-list gnome.gnumeric-list
+     gnome.gtk-app-devel-list gnome.gtk-devel-list gnome.gtk-doc-list
+     gnome.gtk-i18n-list gnome.gtk-list gnome.gtk-perl-list
+     gnome.guppi-list gnome.libart gnome.libart-hackers gnome.orbit-list
+     gnome.vote gnome.wm-spec-list gnome.xml gnome.xslt
+
+Java Conference Mailing List (http://www.java-conf.gr.jp/archives/)
+     javaconf.servlet-ml javaconf.business-ml
+     javaconf.duke-in-the-box-ml javaconf.jfriends-ml javaconf.JGT-ml
+     javaconf.jini-ml javaconf.ejb-ml javaconf.cm-ml javaconf.horb-ml
+     javaconf.talk-ml
+
+LinuxCE JP Mailing List (http://www.peanuts.gr.jp/~kei/ml-archive/)
+     linuxce-jp.users
+
+Mule Mailing List (http://www.m17n.org/)
+     m17n.mule-ja m17n.mule
+
+Meadow Mailing List (http://www.ysnb.net/meadow/)
+     meadow.meadow-develop meadow.meadow-users-jp
+
+Mew Mailing List (http://www.mew.org/ml/)
+     mew.mew-dist mew.mew-win32 mew.mew-int
+
+MagicPoint Mailing List (http://www.mew.org/ml/)
+     mew.mgp-users mew.mgp-users-jp
+
+www.namazu.org Mailing Lists (http://www.namazu.org/cgi-bin/mailman/listinfo)
+     namazu.kakasi-commits namazu.kakasi-dev namazu.migemo
+     namazu.namazu-users-en namazu.namazu-users-ja
+     namazu.namazu-devel-ja namazu.namazu-devel-en
+     namazu.namazu-win32-users-ja namazu.sary
+
+emacs-w3m Mailing List (http://emacs-w3m.namazu.org/ml/)
+     emacs-w3m.emacs-w3m
+
+NetBSD JP Mailing List (http://www.jp.netbsd.org/ja/JP/ml/)
+     netbsd.announce-ja netbsd.junk-ja netbsd.tech-misc-ja
+     netbsd.tech-pkg-ja netbsd.port-arm32-ja netbsd.port-hpcmips-ja
+     netbsd.port-mac68k-ja netbsd.port-mips-ja netbsd.port-powerpc-ja
+     netbsd.hpcmips-changes-ja netbsd.members-ja netbsd.admin-ja
+     netbsd.www-changes-ja
+
+Ruby Mailing List (http://blade.nagaokaut.ac.jp/)
+     ruby.comp.lang.ruby ruby.fj.comp.lang.ruby ruby.ruby-dev
+     ruby.ruby-ext ruby.ruby-list ruby.ruby-math ruby.ruby-talk
+
+Toshiba Linux Users JP Mailing List (http://linux.toshiba-dme.co.jp/ML/tlinux-users-j/)
+     toshiba.linux-users-j
+
+w3m-dev Mailing List (http://mi.med.tohoku.ac.jp/~satodai/w3m-dev/)
+     w3m-dev.w3m-dev w3m-dev.w3m-dev-en
+
+digiko Mailing List (http://yar-3.net/digiko/)
+     digiko.digiko
+
+XEmacs Mailing List (http://list-archive.xemacs.org/)
+     xemacs.xemacs-announce xemacs.xemacs-beta-ja xemacs.xemacs-beta
+     xemacs.xemacs-build-reports xemacs.xemacs-cvs xemacs.xemacs-design
+     xemacs.xemacs-mule xemacs.xemacs-nt xemacs.xemacs-patches
+     xemacs.xemacs-users-ja xemacs.xemacs
+
+Security MEMO Mailing List (http://memo.st.ryukoku.ac.jp/archive/)
+     security-memo.memo security-memo.free-memo
+     security-memo.social-memo
+
+     Please note that userid and passowrd are required for
+     `security-memo.*' so you have to write;
+
+          machine memo.st.ryukoku.ac.jp
+          realm input username/password = archives/archives
+          login archives
+          passwd archives
+
+          machine memo.st.ryukoku.ac.jp
+          realm input user: archives / password: archives
+          login archives
+          passwd archives
+
+     in `~/.w3m/passwd' and remove group and others access permissions
+     from the file.
+
+Debian JP Mailing List (http://lists.debian.or.jp/)
+     debian-jp.debian-announce debian-jp.debian-devel
+     debian-jp.debian-www debian-jp.debian-users debian-jp.debian-policy
+     debian-jp.jp-qa
+
+Debian Mailing List (http://lists.debian.org)
+     debian.debian-announce debian.debian-commercial
+     debian.debian-firewall debian.debian-french debian.debian-isp
+     debian.debian-italian debian.debian-kde debian.debian-laptop
+     debian.debian-news debian.debian-news-german
+     debian.debian-news-portuguese debian.debian-security-announce
+     debian.debian-testing debian.debian-user debian.debian-user-catalan
+     debian.debian-user-french debian.debian-user-polish
+     debian.debian-user-portuguese debian.debian-user-spanish
+     debian.debian-user-swedish debian.debian-admintool
+     debian.debian-apache debian.debian-autobuild debian.debian-beowulf
+     debian.debian-boot debian.debian-cd debian.debian-ctte
+     debian.debian-debbugs debian.debian-devel
+     debian.debian-devel-announce debian.debian-devel-french
+     debian.debian-devel-games debian.debian-devel-spanish
+     debian.debian-doc debian.debian-dpkg debian.debian-emacsen
+     debian.debian-events-eu debian.debian-events-na debian.debian-faq
+     debian.debian-gcc debian.debian-glibc debian.debian-gtk-gnome
+     debian.debian-hams debian.debian-ipv6 debian.debian-java
+     debian.debian-jr debian.debian-med debian.debian-mentors
+     debian.debian-newmaint debian.debian-newmaint-admin
+     debian.debian-ocaml-maint debian.debian-openoffice
+     debian.debian-perl debian.debian-pilot debian.debian-policy
+     debian.debian-pool debian.debian-python debian.debian-qa
+     debian.debian-qa-private debian.debian-release
+     debian.debian-security debian.debian-snapshots
+     debian.debian-tetex-maint debian.debian-toolchain
+     debian.debian-vote debian.debian-wnpp debian.debian-www
+     debian.debian-x debian.deity debian.debian-chinese
+     debian.debian-chinese-big5 debian.debian-chinese-gb
+     debian.debian-esperanto debian.debian-i18n debian.debian-japanese
+     debian.debian-l10n-catalan debian.debian-l10n-dutch
+     debian.debian-l10n-english debian.debian-l10n-french
+     debian.debian-l10n-italian debian.debian-l10n-portuguese
+     debian.debian-l10n-spanish debian.debian-laespiral
+     debian.debian-russian debian.debian-simplified-chinese
+     debian.debian-68k debian.debian-alpha debian.debian-arm
+     debian.debian-bsd debian.debian-hppa debian.debian-hurd
+     debian.debian-ia64 debian.debian-mips debian.debian-parisc
+     debian.debian-powerpc debian.debian-s390 debian.debian-sparc
+     debian.debian-superh debian.debian-ultralinux debian.debian-win32
+     debian.debian-all-changes debian.debian-alpha-changes
+     debian.debian-arm-changes debian.debian-books
+     debian.debian-cd-vendors debian.debian-changes
+     debian.debian-consultants debian.debian-curiosa
+     debian.debian-devel-all-changes debian.debian-devel-alpha-changes
+     debian.debian-devel-arm-changes debian.debian-devel-changes
+     debian.debian-devel-hurd-i386-changes
+     debian.debian-devel-i386-changes debian.debian-devel-m68k-changes
+     debian.debian-devel-powerpc-changes
+     debian.debian-devel-sparc-changes debian.debian-hurd-i386-changes
+     debian.debian-i386-changes debian.debian-legal
+     debian.debian-m68k-changes debian.debian-mirrors
+     debian.debian-powerpc-changes debian.debian-project
+     debian.debian-publicity debian.debian-sgml
+     debian.debian-sparc-changes debian.lcs-eng debian.lsb-confcall
+     debian.lsb-discuss debian.lsb-impl debian.lsb-spec debian.lsb-test
+     debian.spi-announce debian.spi-general debian.vgui-discuss
+
+KDE Mailing List in Japan (http://www.kde.gr.jp/ml/)
+     kde.Kuser kde.Kdeveloper
+
+Geocrawler (http://www.geocrawler.com/)
+     All archives of Geocrawler are supported by `shimbun' library.  You
+     can use the command `M-x shimbun-geocrawler-add-group <RET>', to
+     add your favorite archive to the variable
+     `shimbun-geocrawler-group-alist'.
+
+Mailing list ARChives (http://marc.theaimsgroup.com/)
+     Mailing list ARChives (MARC) are supported by `shimbun' library.
+     Add a group name of your favorite archive and its URL to the
+     variable `shimbun-marc-aims-group-alist', and you can browse it.
+
+RedHat Mailing List (http://sources.redhat.com/ml/)
+     redhat.automake redhat.bug-automake redhat.automake-prs
+     redhat.automake-cvs redhat.binutils redhat.binutils-cvs
+     redhat.c++-embedded redhat.crossgcc redhat.cgen redhat.cgen-prs
+     redhat.cgen-cvs redhat.cygwin redhat.cygwin-xfree
+     redhat.cygwin-announce redhat.cygwin-xfree-announce
+     redhat.cygwin-apps redhat.cygwin-patches redhat.cygwin-developers
+     redhat.cygwin-cvs redhat.cygwin-apps-cvs
+     redhat.docbook-tools-discuss redhat.docbook-tools-announce
+     redhat.docbook-tools-cvs redhat.docbook redhat.dssslist
+     redhat.sgml-tools redhat.docbook-apps redhat.ecos-announce
+     redhat.ecos-devel redhat.ecos-discuss redhat.ecos-maintainers
+     redhat.ecos-patches redhat.elix redhat.elix-announce redhat.gdb
+     redhat.gdb-announce redhat.gdb-testers redhat.gdb-testresults
+     redhat.gdb-patches redhat.gdb-cvs redhat.bug-gdb redhat.gdb-prs
+     redhat.libc-alpha redhat.libc-hacker redhat.bug-glibc
+     redhat.glibc-cvs redhat.glibc-linux redhat.bug-gnats
+     redhat.gnats-devel redhat.gnats-announce redhat.gnats-cvs
+     redhat.gsl-discuss redhat.gsl-announce redhat.gsl-cvs redhat.guile
+     redhat.guile-emacs redhat.guile-prs redhat.guile-gtk
+     redhat.bug-guile redhat.guile-cvs redhat.guile-emacs-cvs
+     redhat.insight redhat.insight-announce redhat.insight-prs
+     redhat.installshell redhat.inti redhat.kawa redhat.libffi-discuss
+     redhat.libffi-announce redhat.libstdc++ redhat.libstdc++-cvs
+     redhat.libstdc++-prs redhat.mauve-discuss redhat.mauve-announce
+     redhat.newlib redhat.pthreads-win32 redhat.rhdb
+     redhat.rhdb-announce redhat.rhug-rhats redhat.rpm2html-cvs
+     redhat.rpm2html-prs redhat.rpm2html redhat.sid redhat.sid-announce
+     redhat.sid-cvs redhat.sourcenav redhat.sourcenav-announce
+     redhat.sourcenav-prs redhat.win32-x11 redhat.xconq7
+     redhat.xconq-announce redhat.xconq-cvs
+
+MacOSX JP Mailing List (http://www.tech-arts.co.jp/macosx/)
+     macosx-jp.macosx-jp macosx-jp.macosx-dev-jp macosx-jp.macosx-ws-jp
+     macosx-jp.webobjects-jp
+
+SourceForge JP (http://sourceforge.jp)
+     All archives served by SourceForge JP are supported by `shimbun'
+     library.  Add a group name of your favorite archive to the variable
+     `shimbun-sourceforge-jp-mailing-lists', and you can browse it.
+
+Elips Mailing List (http://heimat.jp/~nakaji/elips/)
+     elips.elips
+
+Squeak-ja Mailing List (http://lists.squeakfoundation.org/pipermail/squeak-ja/)
+     squeak-ja.main
+
+Smalltalkers' Salon Mailing List (http://www.sra.co.jp/smalltalk/SML/archives/)
+     sml.main
+
+Squeak-dev Mailing List (http://lists.squeakfoundation.org/pipermail/squeak-dev/)
+     squeak-dev.main
+
+Plucker Mailing List (http://www.mail-archive.com/plucker-*@rubberchicken.org/maillist.html)
+     plucker.announce plucker.list plucker.dev
+
+pilot-link Mailing List (http://www.pilot-link.org/pipermail/)
+     pilot-link.announce pilot-link.devel pilot-link.general
+     pilot-link.unix-ng
+
+Coldsync Mailing List (http://www.thedotin.net/maillists/coldsync-hackers/maillist.html)
+     coldsync.main
+
+J-Pilot Mailing List (http://www.jpilot.org/pipermail/jpilot/)
+     jpilot.main
+
+pilot-mailsync Mailing List (http://lists.gnu-designs.com/pipermail/pilot-mailsync/)
+     pilot-mailsync.main
+
+Mozilla Users Mailing List in Japan (http://www.mozilla.gr.jp/ml/logs/moz-users/)
+     mozilla-jp.users
+
+     Please note that userid and passowrd are required for
+     `mozilla-jp.users' so you have to write;
+
+          machine www.mozilla.gr.jp
+          realm Please Enter mozilla mozilla
+          login mozilla
+          passwd mozilla
+
+     in `~/.w3m/passwd' and remove group and others access permissions
+     from the file.
+
+tDiary Developers Mailing List in Japan (http://www.tdiary.org/)
+     tdiary-ml.devel tdiary-ml.theme
+
+arch.bluegate.org Mailing Lists (http://arch.bluegate.org/mailman/listinfo)
+     arch-bluegate.subversion-jp arch-bluegate.arch-jp
+     arch-bluegate.mailman arch-bluegate.viewarch
+
+Tigris.org:Open Source Software Engineering (http://www.tigris.org/)
+     All archives served by Tigris.org are supported by `shimbun'
+     library.  Add a group name of your favorite archive to the variable
+     `shimbun-tigris-group-alist', and you can browse it.  Group name
+     is tigris.<project>.<mailinglist>.
+
+www.SciPy.net Mailing Lists (http://www.scipy.net/mailman/listinfo)
+     scipy.astropy scipy.ipython-user scipy.ipython-dev scipy.scipy-user
+     scipy.scipy-dev scipy.scipy-testlog scipy.scipy-chaco
+     scipy.scipy-cvs
+
+
+
+File: emacs-w3m.info,  Node: Sport Sites Supported by Shimbun,  Next: Misc Sites Supported by Shimbun,  Prev: Mailing Lists Supported by Shimbun,  Up: Shimbun Sites
+
+9.5.4 Sport Sites Supported by Shimbun
+--------------------------------------
+
+These are sport sites supported by `shimbun' library.
+
+makanai (http://www.makanai.com/)
+     makanai.f1news
+
+F1 FAN (http://www.ksky.ne.jp/~tahara/f1/)
+     f1fan.news
+
+@nifty:motorsports (http://forum.nifty.com/fmotor/)
+     msports-nifty.F1 msports-nifty.IRL msports-nifty.WRC
+     msports-nifty.Europe msports-nifty.USA
+
+Yahoo!SPORTS (http://sports.yahoo.co.jp/)
+     yahoo-sports.F1 yahoo-sports.baseball yahoo-sports.keiba
+     yahoo-sports.NBA yahoo-sports.NFL yahoo-sports.rugby
+
+   @nifty:motorsports requires the Mule-UCS package (*note Other
+Requirements::) for Emacs-21.4 or any previous versions.
+
+
+File: emacs-w3m.info,  Node: Misc Sites Supported by Shimbun,  Prev: Sport Sites Supported by Shimbun,  Up: Shimbun Sites
+
+9.5.5 Misc Sites Supported by Shimbun
+-------------------------------------
+
+These are misc sites supported by `shimbun' library.  WEB BBS and
+serial publications are included.
+
+Tea Cup Bulletin Boards (http://www.tcup.com/)
+     You can subscribe to various bulletin boards provided by Tea Cup
+     Communication.  By default, there are three pre-configured boards
+     listed below:
+
+    tcup.yutopia
+          Yutopia BBS (http://www61.tcup.com/6116/yutopia.html)
+
+    tcup.meadow
+          Meadow BBS (http://www66.tcup.com/6629/yutopia.html)
+
+    tcup.skk
+          SKK BBS (http://www67.tcup.com/6718/yutopia.html)
+
+     To add new boards to the list, look up the names and the urls and
+     modify the `shimbun-tcup-group-alist' variable.  The following
+     form is an example to add two boards, `foo' and `bar', to the list:
+
+          (eval-after-load "sb-tcup"
+            '(setq shimbun-tcup-group-alist
+                   (append
+                    '(("foo" "http://MMMM.teacup.com/foo/bbs2")
+                      ("bar" "http://NNNN.teacup.com/bar/bbs2"))
+                    shimbun-tcup-group-alist)))
+
+2ch
+     This is an example to browse Meadow BBS and emacs-w3m BBS on 2ch.
+          (setq shimbun-2ch-group-alist
+                '(("Meadow" .
+                   "http://pc.2ch.net/test/read.cgi/software/1005469775")
+                  ("emacs-w3m" .
+                   "http://pc.2ch.net/test/read.cgi/unix/1013710106")))
+
+Bulletin Board Systems using CGI_Board (http://www.math.tohoku.ac.jp/~kuroki/support/)
+     Set your favorite browse bulletin board systems using CGI_Board to
+     `shimbun-cgi-board-group-alist', and you can browse them.
+
+HNS
+     This is an example to use `sb-hns'.
+          (setq shimbun-hns-group-alist
+                '(("arisawa"                            ;; Group Name
+                   "http://nijino.homelinux.net/diary/" ;; URL
+                   "ari@mbf.sphere.ne.jp")              ;; E-Mail Address
+                  ("miyoshi"
+                   "http://www.be.wakwak.com/cgi-bin/sbox/~miyoshi/hns/"
+                   "miyoshi@meadowy.org")))
+
+tDiary
+     This is an example to use `sb-tdiary'.
+          (setq shimbun-tdiary-group-alist
+                '(("henahena"                          ;; Group Name
+                   "http://www.fan.gr.jp/~ring/d/")    ;; URL
+                  ("yoichi"
+                   "http://yoichi.geiin.org/d/")))
+
+Diaries at Rakuten Plaza (http://plaza.rakuten.co.jp/)
+     This is an example to use `sb-rakuten'.
+          (setq shimbun-rakuten-group-alist
+                '(("rakuten-id" . "email-address")))
+
+EmacsWiKi (http://www.emacswiki.org/)
+     emacswiki.changes emacswiki.diff
+
+RSS feeds containing contents
+     To use this back end, look for the RSS feeds containing contents
+     which you would like to read, and add those groups to the
+     `shimbun-rss-hash-group-path-alist' variable by the following way.
+     The name of the back end is `rss-hash'.  You may use this back end
+     for reading mainly personal blogs.
+
+     The parameters for each group configuration consist of the name of
+     the group, the address of the RSS feed, the type of the mail (`t'
+     for html), the regexp matching the start of contents, and the
+     regexp matching the end of contents.  The parameters other than
+     the name of the group and the address of the RSS feed are optional.
+
+     Here is an example of setting `shimbun-rss-hash-group-path-alist'.
+     In this case, you can browse those groups as `rss-hash.sampleblog1'
+     and `rss-hash.sampleblog2':
+
+          (setq shimbun-rss-hash-group-path-alist
+                '(;; text mail
+                  ("sampleblog1" "http://www.example.com/index1.rss")
+                  ;; html mail
+                  ("sampleblog2" "http://www.example.com/index2.rss"
+                   t "</title>" "<!-- start ads")))
+
+Atom feeds containing contents
+     As well as the previous section (RSS feeds containing contents),
+     you can also read the Atom feeds which contain published contents.
+     To do that, configure the variable
+     `shimbun-atom-hash-group-path-alist' (and possibly
+     `shimbun-atom-hash-x-face-alist', etc.) in the way similar to
+     shimbun-rss-hash-*.  The name of the back end is `atom-hash'.
+
+RSS feeds without published content
+     Many feeds do not contain the full content of the articles, or
+     only so called teasers, i.e. quick summaries.  If a site publishes
+     such a feed, instead of writing a special shimbun for it, you can
+     in many cases use the `rss-blogs' back end.  The setup is similar
+     to the `rss-hash' shimbun; here is an example:
+
+          (setq shimbun-rss-blogs-group-url-regexp
+            '(("first-feed" "http://example/wordpressfeed")
+              ("second-feed" "http://example/somefeed"
+               "<div name=\"content\">" "<div name=\"comments\">")
+              ("third-feed" "http://example/someotherfeed" 'none)))
+
+     The first two items are the name and the URL of the feed.
+     Optionally, you can give two regular expressions denoting the
+     start and end of the actual content on the HTML pages the feed is
+     pointing to.  If you just use the symbol `none' here, no filtering
+     will be done whatsoever.  Additionally, the `rss-blogs' shimbun
+     can deal automatically with some popular blogging engines, namely
+     Google's Blogger/Blogspot (including comment feeds), WordPress,
+     and TypePad.  If your feed is from a site using one of those
+     (which you can see by looking at the `generator' tag), just omit
+     the optional parameters and the code will try to extract the
+     content automatically for you.
+
+Wiki contents
+     This is an example to use `sb-wiki'.  `sb-wiki' support PukiWiki
+     and Hiki.  If you don't know which regexps to set to 4th and 5th
+     elements of an inner list, just set `nil' and you'll just see all
+     contents of a page.
+          (setq shimbun-wiki-group-alist
+                '(("pukiwiki" ;; Group Name
+                   "http://pukiwiki.org/index.php?cmd=rss10" ;; URL
+                   "webmaster@pukiwiki.org" ;; E-Mail Address
+                   nil ;; X-Face
+                   "\n<h3 id=\"" ;; regexp to represent contents start
+                   "</address>") ;; regexp to represent contents end
+                  ("hiki"
+                   "http://www.namaraii.com/hiki/?c=rss"
+                   "webmaster@fdiary.net"
+                   nil
+                   "<div class=\"section\">"
+                   "<div class=\"sidebar\">")
+                  ("apollo"
+                   "http://wiki.fdiary.net/apollo/?c=rss"
+                   "moriq@moriq.com"
+                   nil
+                   "<div class=\"section\">"
+                   "<div class=\"sidebar\">")
+                  ))
+
+Yahoo! AUCTIONS (http://auctions.yahoo.co.jp/)
+     This is an example to use `sb-yahoo-auctions'.
+          (setq shimbun-yahoo-auctions-group-alist
+                '(("mp3player" . "http://list3.auctions.yahoo.co.jp/jp/show/catleaf_rss?category=2084039708&alocale=0jp")
+                  ("iPod" . "http://search3.auctions.yahoo.co.jp/search_rss?p=iPod&auccat=2084039708&alocale=0jp&acc=jp")))
+
+VineLinux Errata (http://www.vinelinux.org)
+     vinelinux.errata.4x.i386 vinelinux.errata.4x.ppc
+     vinelinux.errata.3x.i386 vinelinux.errata.3x.ppc
+     vinelinux.errata.3x.alpha vinelinux.errata.2x.i386
+     vinelinux.errata.2x.ppc vinelinux.errata.2x.sparc
+     vinelinux.errata.2x.alpha vinelinux.errata.1x
+
+Japan's Cabinet Mail Magazine (http://www.mmz.kantei.go.jp/)
+     kantei.m-magazine-en kantei.m-magazine-ja
+     kantei.m-magazine-cn.hatoyama kantei.m-magazine-kr.hatoyama
+     kantei.m-magazine-en.hatoyama kantei.m-magazine-ja.hatoyama
+     kantei.m-magazine-en.aso kantei.m-magazine-ja.aso
+     kantei.m-magazine-en.fukuda kantei.m-magazine-ja.fukuda
+     kantei.m-magazine-en.abe kantei.m-magazine-ja.abe
+     kantei.m-magazine-en.koizumi kantei.m-magazine-ja.koizumi
+
+     `kantei.m-magazine', `kantei.m-magazine-cn' and
+     `kantei.m-magazine-kr' are also available for the backward
+     compatibility.
+
+Patent Office in Japan (http://www.jpo.go.jp/)
+     jpo.news jpo.revision jpo.lawguide jpo.details
+
+IBM developerWorks (http://www-6.ibm.com/jp/developerworks/) (in Japanese)
+     ibm-dev.autonomic ibm-dev.java ibm-dev.linux ibm-dev.opensource
+     ibm-dev.webservices ibm-dev.xml
+
+Pocketgames (http://www.pocketgames.jp/)
+     pocketgames.news
+
+Wincefan (http://www.wince.ne.jp/)
+     wincefan.news
+
+PalmFan (http://www.palmfan.com/)
+     palmfan.news
+
+Report of Electrical Stores Street (http://homepage1.nifty.com/akiba/plat.html) (in Japanese)
+     dennou.report
+
+PCWEB COLUMN Square (http://pcweb.mycom.co.jp/column/)
+     pcweb-column.jsr pcweb-column.yume pcweb-column.hreceipe
+     pcweb-column.kita pcweb-column.shonanlife pcweb-column.kaden
+     pcweb-column.nemurenai pcweb-column.komono pcweb-column.js
+     pcweb-column.en pcweb-column.motherboard pcweb-column.svalley
+     pcweb-column.architecture pcweb-column.motorlife
+     pcweb-column.nihongoprog pcweb-column.objc pcweb-column.ide
+     pcweb-column.music pcweb-column.itsecurity pcweb-column.soundvisual
+     pcweb-column.osx pcweb-column.sopinion pcweb-column.ebook
+     pcweb-column.orerobo pcweb-column.zsh pcweb-column.rikei
+     pcweb-column.lifehack pcweb-column.world pcweb-column.guutara
+     pcweb-column.volt pcweb-column.textclean pcweb-column.person
+     pcweb-column.web20 pcweb-column.system
+
+     below items are also available for the backward compatibility.
+     pcweb-column.itshihonron pcweb-column.yetanother pcweb-column.asia
+     pcweb-column.benri pcweb-column.bytes pcweb-column.game
+     pcweb-column.hitech pcweb-column.java pcweb-column.jisakuparts
+     pcweb-column.scramble pcweb-column.toolexp pcweb-column.winvista
+     pcweb-column.winxp pcweb-column.interview pcweb-column.ityougo
+     pcweb-column.kimeuchi pcweb-column.stratesys pcweb-column.toyagain
+
+Notes Exhibition (http://tsuruo.dominohosting.biz/members/tsuruo/)
+     lotusex.news lotusex.library lotusex.operation lotusex.primer
+     lotusex.tips lotusex.practical lotusex.qanda lotusex.lounge
+     lotusex.bbs
+
+@IT forum (http://www.atmarkit.co.jp)
+     atmarkit.news atmarkit.fwin2k atmarkit.fdotnet atmarkit.fsys
+     atmarkit.fxml atmarkit.fdb atmarkit.flinux atmarkit.fnetwork
+     atmarkit.fjava atmarkit.fsecurity atmarkit.farc atmarkit.fbiz
+     atmarkit.fwcr atmarkit.jibun
+
+TeX Q&A Bulletin Board (http://www.matsusaka-u.ac.jp/~okumura/texfaq/qa/)
+     texfaq.qanda
+
+X51.org (http://x51.org/)
+     x51.anima x51.art x51.auction x51.blow x51.cabal x51.crime
+     x51.disaster x51.edge x51.enema x51.ghost x51.homme x51.info
+     x51.life x51.love x51.media x51.medical x51.military
+     x51.northkorea x51.oparts x51.phallic x51.psychics x51.religion
+     x51.science x51.top x51.ufo x51.uma x51.xfiles
+
+eXperts Connection (eXConn) (http://www.exconn.net/)
+     exconn.news
+
+MSDN (http://msdn.microsoft.com/)
+     msdn.all msdn.netframework msdn.architecture msdn.asp.net msdn.data
+     msdn.longhorn msdn.mobility msdn.subscriptions msdn.msdntv
+     msdn.office msdn.security msdn.sql msdn.theshow msdn.vbasic
+     msdn.vcsharp msdn.visualc msdn.vfoxpro msdn.vjsharp msdn.vstudio
+     msdn.vs2005 msdn.webservices msdn.embedded msdn.xml msdn.japan.msdn
+     msdn.japan.msdn-us
+
+Haiku OS (http://haiku-os.org/)
+     haiku-os.news haiku-os.forums haiku-os.newsletters
+
+Foundation for a Free Information Infrastructure (http://www.ffii.org/)
+     ffii.en.software-patents ffii.en.software-patents.ffii
+     ffii.en.information-infrastructure ffii.en.project
+     ffii.de.software-patente ffii.de.software-patente.ffii
+     ffii.de.informations-infrastruktur ffii.fr.brevets-logiciels
+     ffii.fr.brevets-logiciels.ffii ffii.nl.softwarepatenten
+     ffii.nl.softwarepatenten.ffii
+
+
+File: emacs-w3m.info,  Node: Shimbun Basics,  Prev: Shimbun Sites,  Up: Shimbun Library
+
+9.6 How to make a new shimbun module
+====================================
+
+`Shimbun' is a library set of emacs-w3m that enables you to read
+certain web contents using Gnus, Wanderlust, or Mew as if they were
+email messages.  Here we will explain how to make a new `shimbun'
+module.
+
+* Menu:
+
+* Overview::
+* Getting web page and header information::
+* Displaying an article::
+* Inheriting shimbun module::
+* Making text/plain articles::
+* Zenkaku to hankaku conversion::
+* Coding convention of Shimbun::
+
+
+File: emacs-w3m.info,  Node: Overview,  Next: Getting web page and header information,  Up: Shimbun Basics
+
+9.6.1 Overview
+--------------
+
+When you make a new `shimbun' module `foobar' for reading contents of
+`http://www.foobar.net', what you have to do first is to put the
+following S expressions in the first part of the `sb-foobar.el' file:
+
+     (require 'shimbun)
+     (luna-define-class shimbun-foobar (shimbun) ())
+
+We will explain what they are below, so you can understand they are just
+incantations now.  You have to use the same suffix `foobar' in the file
+name (`sb-foobar.el') and the class name (`shimbun-foobar') as the
+second argument for the `luna-define-class' macro.
+
+   Major jobs of the `shimbun-foobar' module can be classified broadly
+into the following four categories (note that you may rephrase "folder"
+with "group" if you are a Gnus user):
+
+  1. Getting a page source from `http://www.foobar.net' in order to
+     gather articles' subjects etc. when a MUA opens the `foobar'
+     folder.
+
+  2. Gathering subjects and other necessary informations from the page
+     source in order to make headlines of articles and returning them
+     as the structured list called `headers'.
+
+  3. Getting a page source for an article from the web site, for
+     example, `http://www.foobar.net/053003.html', when MUA requires to
+     display an article in the `foobar' folder, and
+
+  4. Removing cruft, e.g. advertisements, from the page source and
+     formatting a raw article.
+
+`shimbun-headers' of `shimbun.el' does the first job,
+`shimbun-get-headers' does the second, `shimbun-article' does the third
+and `shimbun-make-contents' does the last.
+
+   The `shimbun-headers' method does the first job, the
+`shimbun-get-headers' method does the second, the `shimbun-article'
+method does the third and the `shimbun-make-contents' method does the
+last thing.  The default methods for those categories are defined in
+the `shimbun.el' module.
+
+   Open the `shimbun.el' file.  You may see unfamiliar definitions like
+`luna-define-generic' or `luna-define-method' there.  Hm, they look
+like `defun', don't you?  You may also see there's just a doc-string in
+the former definition and the same symbol is declared again in the
+later form.  And further, there are some symbols only declared by the
+`luna-define-generic' form, not by the `luna-define-method' form.  What
+on earth are we seeing?  Isn't the program not written in the
+Emacs-Lisp language?
+
+   The truth is that the `shimbun' modules use the `luna.el' module
+provided by FLIM which enables you to write object oriented programs in
+the Emacs-Lisp language.
+
+   There are method programs defined rigidly for the specific purposes
+in the `shimbun.el' module.  The `shimbun-headers' method gets a page
+source from a certain URL, the `shimbun-get-headers' method gathers
+subjects and other informations, etc... (see above).  They do routine
+works, so they cannot take proper method to meet various web contents
+in the world.  Eh?  Oh, you shouldn't believe in a heresy!
+
+   The `shimbun.el' module only provides the default method functions.
+Remember the `defadvice' feature.  There are three ways to modify the
+behavior of a function: `:before', `:around' and `:after'.  Similarly,
+each default `shimbun' method function can be modified for a certain
+purpose (note that the `:around' method-qualifier can be omitted).  And
+it should be written specially that the modification will be effective
+only when the specified `shimbun' module is selected.
+
+   Now as you may have understood that the `luna-define-generic' form
+provides only a husk in a sense, the `luna-define-method' form defines
+an actual function which can be different for each `shimbun' module,
+and the `luna-define-class' form declares the `shimbun' class in the
+first part of the `sb-foobar.el' module.
+
+
+File: emacs-w3m.info,  Node: Getting web page and header information,  Next: Displaying an article,  Prev: Overview,  Up: Shimbun Basics
+
+9.6.2 Getting web page and header information
+---------------------------------------------
+
+Let's identify a target web page URL to gather subjects and other
+informations first.  If a web site uses a frame, a target is only one
+of the web pages.  Second, lets create a body of the
+`shimbun-index-url' method function using the `luna-define-method' form
+in your `sb-foobar.el' file.  And make the user customizable variable
+`shimbun-foobar-groups', which we will explain later(1).
+
+     (defvar shimbun-foobar-url "http://www.foobar.net")
+
+     (luna-define-method shimbun-index-url ((shimbun shimbun-foobar))
+       shimbun-foobar-url)
+
+     (defvar shimbun-foobar-groups '("news"))
+
+   After you create a body of the `shimbun-index-url' method, the
+`shimbun-headers' method can get a web page source since the
+`shimbun.el' module already has the default `shimbun-headers' method.
+After the `shimbun-headers' method gets a web page source, it calls the
+`shimbun-get-headers' method to gather headers information.  As the
+`shimbun.el' module does not have the `shimbun-get-headers' method, you
+have to create it in your `sb-foobar.el' file.
+
+   Now look carefully in the page source and create the
+`shimbun-get-headers' method in your `sb-foobar.el' file.
+
+   Create a regular expression that can gather headers information.
+Minimally necessary information are subject, date, author, URL and
+`message-id' of an article.  They are used in MUA as Subject, Date,
+From, Xref and Message-ID.
+
+   If you want to make an article from a line in a web page source,
+like:
+
+     <a href="053003.html">some talks on May 30(posted by Mikio &lt;foo@bar.net&gt;)</a>
+
+use the following regexp:
+
+     "<a href=\"\\(\\([0-9][0-9][0-9][0-9]\\)[0-9][0-9]\\.html\\)\">\\([^<(]+\\)(posted by \\([^<]+\\))<\/a>"
+
+You can get a value for Xref by `(match-string 1)'.  You can get a
+value for Date by modifying a value of `(match-string 2)'.  Subject by
+`(match-string 3)' and From from `(match-string 4)'.  You can modify
+them further for showing additional information in MUA.
+
+   If URL of an article is a relative path like above, use
+`shimbun-expand-url' to expand it before putting information to header.
+If each article doesn't have a each unique URLs (i.e. URL of headers
+and URL of articles are just same), you have to ask Emacs to remember
+body of an article when gathering headers information, For more detail
+see the files `sb-palmfan.el', `sb-dennou.el' and `sb-tcup.el'.
+
+   Sometimes you cannot identify Date information when gathering headers
+information only from a web page source.  If so, leave it, just set a
+null string, `""' to its value.  If you can identify Date only when you
+see contents of an article, you can set it at that time by using
+`shimbun-make-contents' method.  And you may use a fixed From for a web
+site (e.x. "webmaster@foobar.net").
+
+   Be careful when you build a message-id.  Make sure it has uniqueness
+otherwise you may not be able to read some articles in the
+`shimbun'(2).  Assure uniqueness by building message-id using date
+information, a domain of the page and/or a part of URL of the page.
+And use `@' but `:' as a part of message-id in order to display inline
+images.  See RFC2387 and RFC822 for more detail.
+
+   Put these information to header using function
+`shimbun-create-header' of the `shimbun.el' module.
+
+   A bare bone of `shimbun-get-headers' in your `sb-foobar.el' file is
+as follows:
+
+     (luna-define-method shimbun-get-headers ((shimbun shimbun-foobar)
+                                              &optional range)
+       (let ((regexp "....")
+             subject from date id url headers)
+         ...
+         (catch 'stop
+           (while (re-search-forward regexp nil t nil)
+             ...
+             (when (shimbun-search-id shimbun id)
+               (throw 'stop nil))
+             (push (shimbun-create-header
+                    0 subject from date id "" 0 0 url)
+                   headers)))
+         headers))
+
+Note that you can access `shimbun-foobar' instance via temporary
+variable `shimbun' in the method.
+
+   Now we will explain a user variable `shimbun-foobar-groups'.
+
+   Assume that you have two groups of articles in
+`http://www.foobar.net' and there are two different web pages for such
+groups in where `shimbun' module gathers header information.  For
+examples, there are what's new information of the web site in
+`http://www.foobar.net/whatsnew/index.hmtl', and there are archive
+lists of email messages posted to ML in
+`http://www.foobar.net/ml/index.html'.  In such case you may want to
+access the group by `shimbun' folders `foobar.whatsnew' and
+`foobar.ml'.  If so, put the following S expressions to the
+`sb-foobar.el' file.
+
+     (defvar shimbun-foobar-url "http://www.foobar.net")
+
+     (defvar shimbun-foobar-group-path-alist
+       '(("whatsnew" . "/whatsnew/index.html")
+         ("ml" . "/ml/index.html")))
+
+     (defvar shimbun-foobar-groups
+       (mapcar 'car shimbun-foobar-group-path-alist))
+
+     (luna-define-method shimbun-index-url ((shimbun shimbun-foobar))
+       (concat shimbun-foobar-url
+               (cdr (assoc (shimbun-current-group-internal shimbun)
+                           shimbun-foobar-group-path-alist))))
+
+You can get the current group by using
+`shimbun-current-group-internal'.  You can use it in
+`shimbun-get-headers' method (or others) in order to change its
+behavior in accordance with the current group.
+
+   Each `shimbun' module needs at least one group.  There is not a
+special rule for naming a group, but if you don't find out a good name,
+use `news' or `main'.
+
+   ---------- Footnotes ----------
+
+   (1) At least one group is necessary for each `shimbun' module even
+if you don't want it.
+
+   (2) And more, you may not be able to read actual email messages from
+someone when message-ids conflict!
+
+
+File: emacs-w3m.info,  Node: Displaying an article,  Next: Inheriting shimbun module,  Prev: Getting web page and header information,  Up: Shimbun Basics
+
+9.6.3 Displaying an article
+---------------------------
+
+`shimbun-article' method defined in the `shimbun.el' module gets URL
+from Xref information of header, get a web page source from the URL,
+and call `shimbun-make-contents' in working buffer of the source.
+Major job of `shimbun-make-contents' is to process such HTML.  Imagine
+that a working buffer has a web page source of an article.
+`shimbun-make-contents' defined in the `shimbun.el' module insert (i)
+header information to top of the buffer, (ii) `<html>', `<body>' and
+etc. right after the information, and (iii) `</body>' and `</html>' to
+end of the buffer.  MUA displays an article as a HTML mail.
+
+     Not only HTML articles, but also articles in the `text/plain'
+     format can be generated.  *Note Making text/plain articles::.
+
+   If you don't want to process an article, you don't have to define
+`shimbun-make-contents' in the `sb-foobar.el' module.
+
+   If you want to remove some part of a web page source of an article at
+its top and its end, set regexp to `shimbun-foobar-content-start' that
+matches content start and `shimbun-foobar-content-end' that matches
+content end.
+
+     (defvar shimbun-foobar-content-start "^<body>$")
+     (defvar shimbun-foobar-content-end "^<\/body>$")
+
+`shimbun-clear-contents', which is called by `shimbun-make-contents'
+defined in the `shimbun.el' module, will remove HTML source from
+`point-min' to `shimbun-foobar-content-start' and from
+`shimbun-foobar-content-end' to `point-max' using the regexps.  Note
+that it will not remove any HTML source when either of the regexp
+searches fails.
+
+   If you want to remove more unnecessary parts (e.x. advertisements)
+diligently, define `shimbun-clear-contents' in your new `sb-foobar.el'
+file as follows:
+
+     (luna-define-method shimbun-clear-contents :around ((shimbun shimbun-foobar)
+                                                         header)
+       ;; cleaning up
+       (while (re-search-forward "..." nil t nil)
+         (delete-region (match-beginning 0) (match-end 0)))
+       (luna-call-next-method))
+
+For more details see `shimbun-make-contents' in the `sb-ibm-dev.el'
+file.
+
+   I said in the subsection of *note Getting web page and header
+information:: that if each article doesn't have a each unique URLs you
+have to ask Emacs to remember body of an article when gathering headers
+information,  In such case you don't have to get a web page from URL of
+Xref in `shimbun-article' method.  Just get texts from Emacs memories
+and put them with pretty printing.  For more detail see definitions of
+`shimbun-article' method of `sb-palmfan.el', `sb-dennou.el' or
+`sb-tcup.el'.
+
+
+File: emacs-w3m.info,  Node: Inheriting shimbun module,  Next: Making text/plain articles,  Prev: Displaying an article,  Up: Shimbun Basics
+
+9.6.4 Inheriting shimbun module
+-------------------------------
+
+There are some famous mailing list manager (or archiver).
+
+   * Mailman The GNU Mailing List Manager, formerly called as
+     `pipermail'.  See `http://www.gnu.org/software/mailman/index.html'
+     for detail.
+
+   * MHonArc See `http://www.oac.uci.edu/indiv/ehood/mhonarc.html' for
+     detail.
+
+   * fml fml mailing list server/manager.  See
+     `http://www.fml.org/software/fml/' for detail.
+
+   * mailarc See `http://cvs.namazu.org/mailarc/' for detail.
+
+   If you find out one of such mailing list managers' names in a web
+page source when you analyze it in the step of *Note Getting web page
+and header information::, you are very lucky(1).  The modules
+`sb-mailman.el', `sb-mhonarc.el', `sb-fml.el' and `sb-mailarc.el' have
+the `shimbun-get-headers' method, etc, already, when you write small
+code that is not defined in such `shimbun' modules, your new
+`sb-foobar.el' module works!
+
+   If you use the `sb-mailman.el' module, write the following S
+expressions to the top of the `sb-foobar.el' file:
+
+     (require 'sb-mailman)
+     (luna-define-class shimbun-foobar (shimbun-mailman) ())
+
+Those above mean that `shimbun' module `shimbun-foobar' inherits
+shimbun-mailman class(2) and methods defined in the `sb-mailman.el'
+module will be used in `shimbun-foobar' by default.  You can overwrite
+some of parent methods, if necessary.
+
+   See the `sb-pilot-mailsync.el' file as a sample that uses the
+`sb-mailman.el' module.  You can feel how easy to create a new
+`shimbun' module by using such parent modules.
+
+   Note that there are some localized version of such mailing list
+manager, for examples, some of them show Date information in Japanese.
+The modules `sb-mailman.el', `sb-mhonarc.el', `sb-fml.el' and
+`sb-mailarc.el' assumes that mailing list managers are not localized.
+
+   If you want to read via `shimbun' a web site that uses localized
+mailing list manager, you may have to overwrite some methods in the
+parent module.
+
+   ---------- Footnotes ----------
+
+   (1) Such mailing list managers often show their own name in an
+archive list page
+
+   (2) i.e. shimbun-mailman class is a parent class.
+
+
+File: emacs-w3m.info,  Node: Making text/plain articles,  Next: Zenkaku to hankaku conversion,  Prev: Inheriting shimbun module,  Up: Shimbun Basics
+
+9.6.5 Making text/plain articles
+--------------------------------
+
+Even if the MUA is reinforced by emacs-w3m so as to be able to read HTML
+articles, `text/plain' articles might be more convenient in some cases.
+To make the `sb-foobar' module generate `text/plain' articles rather
+than `text/html' articles, there are two ways to do that.
+
+   * The one is to make the `sb-foobar' module inherit (*note
+     Inheriting shimbun module::) the `sb-text' module.  Here's an
+     example you may put in the beginning of the `sb-foobar' module.
+
+          (require 'sb-text)
+          (luna-define-class shimbun-foobar (shimbun-text) ())
+
+     The `sb-text' module provides the `shimbun-make-contents' method
+     which generates the articles in the `text/plain' format.  This
+     will be useful for the `shimbun' modules handling the web sites
+     which put up only text articles.
+
+   * The other is to set the `shimbun-foobar-prefer-text-plain' variable
+     to non-`nil'.  This makes the `shimbun-make-contents' method
+     generate the articles in the `text/plain' format (actually, it uses
+     the functions provided by the `sb-text' module).  Note that this is
+     effective only to the modules which inherit the default
+     `shimbun-make-contents' method (especially the modules which
+     inherit the `sb-text' module are not affected).  The advantage of
+     this way is that users can easily switch `text/plain' articles and
+     `text/html' articles.
+
+     The default value for the `shimbun-foobar-prefer-text-plain'
+     variable is `nil' if it is not defined.  So, it defaults to `nil'
+     in every `shimbun' module except for the modules `sb-asahi.el' and
+     `sb-yomiuri.el'.
+
+     In addition, you can use the variables
+     `shimbun-foobar-text-content-start' and
+     `shimbun-foobar-text-content-end' instead of
+     `shimbun-foobar-content-start' and `shimbun-foobar-content-end' to
+     extract significant text in web pages (*note Displaying an
+     article::).  If the formers are not defined, those values default
+     to the latter values.
+
+Whichever the ways you use, you should note that the `text/plain'
+articles cannot contain images, links, etc.
+
+
+File: emacs-w3m.info,  Node: Zenkaku to hankaku conversion,  Next: Coding convention of Shimbun,  Prev: Making text/plain articles,  Up: Shimbun Basics
+
+9.6.6 Zenkaku to hankaku conversion
+-----------------------------------
+
+"Zenkaku" or "zenkaku character(s)" is a term commonly used to call
+Japanese wide characters, and "hankaku" is an opposite term for
+ordinary ASCII characters.  There is a complete set of zenkaku
+characters corresponding to at least the ASCII character set.
+
+   Some Japanese web sites tend to use zenkaku characters a lot, and
+those articles might not necessarily be comfortable to read.  If you
+feel so, you can use this feature that converts those zenkaku ASCII
+characters into hankaku.  To do that, set the
+`shimbun-foobar-japanese-hankaku' variable to `t'.  Where `foobar' is a
+server name to which you subscribe for shimbun articles.  That is, you
+have to use it per server.
+
+   If you prefer to convert zenkaku to hankaku only in the body of
+articles, use the value `body' instead of `t'.  Contrarily the value
+`header' or `subject' specifies to perform it only in subjects.
+
+
+File: emacs-w3m.info,  Node: Coding convention of Shimbun,  Prev: Zenkaku to hankaku conversion,  Up: Shimbun Basics
+
+9.6.7 Coding convention of Shimbun
+----------------------------------
+
+   * You can use all functions defined in emacs-w3m in `shimbun.el'.
+
+   * You can use no functions defined in emacs-w3m in `sb-*.el'.  If you
+     want to use emacs-w3m functions in `sb-*.el', you must add their
+     stubs to `shimbun.el'.
+
+   * You must avoid file names that have already used in SpeedBar.
+     Here is a list of file names used in `speedbar-0.14beta4'.
+
+     sb-ant.el     sb-html.el    sb-info.el    sb-texinfo.el
+     sb-gud.el     sb-image.el   sb-rmail.el   sb-w3.el
+
+   * You should select file names which remind their referring WEB
+     servers' URIs.  It is allowed to remove country parts (Ex.
+     jp,de,uk,etc), organization parts (Ex. edu,com,org,net,etc) and
+     redundant parts (Ex. www) if removing does not increase vagueness.
+
+   * You should select group names in USENET style.  It means that small
+     characters are preferred in group names, and that period(.)  is
+     preferred as an delimiter to show hierarchical structure in groups.
+
+
+File: emacs-w3m.info,  Node: Tips,  Next: Mailing List,  Prev: Shimbun Library,  Up: Top
+
+10 Some knick-knacks using emacs-w3m
+************************************
+
+Here are some handy tips to use emacs-w3m with other Emacs facilities.
+
+   * browse-url
+
+     You can use emacs-w3m with the `browse-url' feature.  For instance,
+     put the following lines in your `~/.emacs' file:
+
+          (setq browse-url-browser-function 'w3m-browse-url)
+          (global-set-key "\C-xm" 'browse-url-at-point)
+
+     Emacs-w3m will now be invoked when you type the `C-x m' key on a
+     string which looks like a URL in any Emacs buffer.  In addition,
+     you can use emacs-w3m to preview an HTML file that you are just
+     editing by typing the `C-c C-v' key (note that you need to use
+     Emacs and the `html-mode' major mode to edit the HTML file).
+
+     If you'd like to use another web browser than emacs-w3m when using
+     the `C-x m' key when you are in an emacs-w3m buffer (who wants to
+     do so?), add the following advice to `~/.emacs' file:
+
+          (defadvice browse-url-at-point
+            (around change-browse-url-browser-function activate)
+            "Use Netscape only when it is invoked in an emacs-w3m buffer."
+            (let ((browse-url-browser-function
+                   (if (eq major-mode 'w3m-mode)
+                       'browse-url-netscape
+                     'w3m-browse-url)))
+              ad-do-it))
+
+   * dired
+
+     You can use emacs-w3m to browse an HTML file in a `dired' buffer by
+     typing the `C-x m' key.  Use the following settings in your
+     `~/.emacs' file:
+
+          (eval-after-load "dired"
+            '(define-key dired-mode-map "\C-xm" 'dired-w3m-find-file))
+
+          (defun dired-w3m-find-file ()
+            (interactive)
+            (require 'w3m)
+            (let ((file (dired-get-filename)))
+              (if (y-or-n-p (format "Use emacs-w3m to browse %s? "
+                                    (file-name-nondirectory file)))
+                  (w3m-find-file file))))
+
+   * hnf-mode
+
+     You can see the newest diary using emacs-w3m and the hyper nikki
+     system.  Put the following lines in your `~/.emacs' file and type
+     the `C-c C-b' key in an `hnf-mode' buffer:
+
+          (defun w3m-hnf-browse-url-w3m (url &optional new-window)
+            (interactive (browse-url-interactive-arg "URL: "))
+            (save-selected-window
+              (pop-to-buffer (get-buffer-create "*w3m*"))
+              (w3m-browse-url url new-window)))
+          (setq hnf-browse-url-browser-function #'w3m-hnf-browse-url-w3m)
+
+   * Gnus
+
+     You've mistaken the entrance if you are a Gnus user and this
+     section is the first page you read in this Info.  See *note
+     Hooking into MUAs:: first.
+
+     By default, Gnus will not apply the treatment variables, for
+     instance `gnus-treat-strip-banner', to `text/html' parts.  To have
+     them applied to `text/html' parts automatically, there are two
+     ways to do that:
+
+          ;; Apply all the treatments to text/html parts.
+          (eval-after-load "gnus-art"
+            '(add-to-list 'gnus-article-treat-types "text/html"))
+
+          ;; Apply a certain treatment to text/html parts.
+          (setq gnus-treat-strip-banner '(or t (typep "text/html")))
+
+     Also *Note Customizing Articles: (gnus)Customizing Articles, for
+     details.
+
+     In addition, the experimental code below is used to display
+     `multipart/related' pictures.  The place might be something wrong.
+
+          (eval-after-load "gnus-art"
+            '(or (assoc "multipart/related" gnus-mime-multipart-functions)
+                 (setq gnus-mime-multipart-functions
+                       (cons
+                        (cons
+                         "multipart/related"
+                         (byte-compile
+                          (lambda (handle)
+                            (gnus-mime-display-mixed (cdr handle)))))
+                        gnus-mime-multipart-functions))))
+
+   * yahtml-mode
+
+     You can use emacs-w3m to preview an HTML file that just you are
+     editing with the `yahtml-mode'.  Here is an example:
+
+          (defadvice yahtml-browse-html
+            (around w3m-yahtml-browse-html activate compile)
+            (w3m-goto-url (ad-get-arg 0) t))
+
+   * jisx0213
+
+     You can use JIS X 0213 character set in Emacs using the `jis0213'
+     module which is bundled in the Mule-UCS package.  Although the
+     `decode-char' function is overridden by `mucs' (`jis0213' loads
+     `mucs') and it stops working properly for the `ucs' coded
+     character set, it has been reported that also to load the
+     `unicode' module seems to solve the problem. The reason has not
+     been made clear yet.  Here is an example for the `~/.emacs' file:
+
+          (require 'unicode)
+          (require 'un-define)
+          (require 'jisx0213)
+
+
+File: emacs-w3m.info,  Node: Mailing List,  Next: Emacs-w3m Functions,  Prev: Tips,  Up: Top
+
+11 Mailing list and submitting bug reports
+******************************************
+
+We have set up a mailing list to discuss all things emacs-w3m.  You can
+post without subscribing.  If you find a bug, have a feature request, or
+have written some code, don't hesitate to post to the list.  And if
+you're just a user and like the program, please tell us too!
+
+   The address is:
+
+     Emacs-w3m Mailing List <emacs-w3m@namazu.org>
+
+   You can also send a bug report using the `report-emacs-w3m-bug'
+command (or the `C-c C-b' key) if you have set the `mail-user-agent'
+variable that will work properly.
+
+   English and Japanese can be used when posting to this list, since
+many of its members are Japanese.  Articles posted to the list are
+opened to the public and you can read them on the web (at
+`http://emacs-w3m.namazu.org/ml/'), or in NetNews (group
+`gmane.emacs.w3m' on the server `news.gmane.org').
+
+   If you want to receive articles by mail, send a mail containing
+
+     subscribe Your Name
+
+   (please write your name, not your email address) in its body to
+`emacs-w3m-ctl@namazu.org', then you can subscribe to the list.  To
+unsubscribe from it, send a mail containing just
+
+     # bye
+
+   in its body to `emacs-w3m-ctl@namazu.org'.
+
+
+File: emacs-w3m.info,  Node: Emacs-w3m Functions,  Next: External Packages,  Prev: Mailing List,  Up: Top
+
+12 Details of some emacs-w3m functions
+**************************************
+
+
+File: emacs-w3m.info,  Node: External Packages,  Next: Authors,  Prev: Emacs-w3m Functions,  Up: Top
+
+13 Companion packages you might need
+************************************
+
+Even though emacs-w3m provides a wealth of features, you may want to
+check out the following external packages for even more usability:
+
+   * w3m-type-ahead.el
+
+     The w3m-type-ahead.el package provides "type ahead" searching,
+     similar to the feature by the same name from Mozilla browsers.  It
+     allows you to find anchors using an interface similar to isearch,
+     but results are limited to anchors in the buffer.
+
+     Download w3m-type-ahead.el from
+     `http://alioth.debian.org/project/showfiles.php?group_id=30594'.
+
+   * newsticker.el
+
+     newsticker.el that has been incorporated in Emacs 22 and greater
+     is a rowse rss feeds and also atom feeds.  Here is a configuration
+     example to use newsticker.el together with emacs-w3m (put it in
+     the `~/.emacs' file):
+
+          (require 'w3m-load)
+          (setq newsticker-html-renderer 'w3m-region
+                browse-url-browser-function 'w3m-browse-url)
+
+     *note Top: (Newsticker)Top, for details.
+
+
+File: emacs-w3m.info,  Node: Authors,  Next: Index,  Prev: External Packages,  Up: Top
+
+14 People who wrote this manual
+*******************************
+
+   * Romain Francoise
+
+   * NAKAJIMA Mikio
+
+   * Yoichi NAKAYAMA
+
+   * Ryoko NARITOKU(Translation only)
+
+   * Hideyuki SHIRAI
+
+   * TSUCHIYA Masatoshi
+
+   * Katsumi Yamaoka
+
+   * Masatake YAMATO
+
+   * Naohiro Aota
+
+
+File: emacs-w3m.info,  Node: Index,  Prev: Authors,  Up: Top
+
+Index
+*****
+
+* Menu:
+
+* Concept Index::               Concept Index
+* Key Index::                   Key Index
+* Variable Index::              Variable Index
+* Function Index::              Function Index
+
+
+File: emacs-w3m.info,  Node: Concept Index,  Next: Key Index,  Up: Index
+
+Concept Index
+=============
+
+[index]
+* Menu:
+
+* about://antenna/:                      Using Antenna.       (line   6)
+* Adding a bookmark:                     Adding Bookmarks.    (line   6)
+* Adding autoload settings:              Minimal Settings.    (line  11)
+* Adding new search engines:             Adding New Search Engines.
+                                                              (line   6)
+* Antenna:                               Using Antenna.       (line   6)
+* APEL package:                          Other Requirements.  (line   6)
+* Arrived URLs:                          Tracing History.     (line   6)
+* article expiry:                        Nnshimbun.           (line 170)
+* auto-expire:                           Nnshimbun.           (line 170)
+* Bookmarks:                             Managing Bookmarks.  (line   6)
+* Browsing history:                      Tracing History.     (line   6)
+* codepage-ex:                           Other Requirements.  (line   6)
+* Consulting bookmarks:                  Consulting Bookmarks.
+                                                              (line   6)
+* Creating new buffers:                  Creating and killing buffers.
+                                                              (line   6)
+* Customizing user options:              Customizable Variables.
+                                                              (line   6)
+* Displaying images:                     Inline Images.       (line   6)
+* Downloading files:                     Downloading.         (line   6)
+* Editing bookmarks:                     Editing Bookmarks.   (line   6)
+* expiry-wait:                           Nnshimbun.           (line 170)
+* Firewall:                              Minimal Settings.    (line  27)
+* FLIM package:                          Other Requirements.  (line   6)
+* Functions details:                     Emacs-w3m Functions. (line   6)
+* General variables:                     General Variables.   (line   6)
+* Getting started:                       Getting Started.     (line   6)
+* Gifsicle program:                      Other Requirements.  (line   6)
+* group parameters:                      Nnshimbun.           (line  88)
+* Grouping URLs:                         Grouping URLs.       (line   6)
+* Hooks:                                 Hooks.               (line   6)
+* ImageMagick package:                   Other Requirements.  (line   6)
+* Info-like keymap:                      Key Binding.         (line   6)
+* Installing emacs-w3m:                  Installing Emacs-w3m.
+                                                              (line   6)
+* Installing on non-UNIX-like systems:   Non-UNIX-like systems.
+                                                              (line   6)
+* Introduction:                          Introduction.        (line   6)
+* Key binding:                           Key Binding.         (line   6)
+* Killing buffers:                       Creating and killing buffers.
+                                                              (line   6)
+* Lynx-like keymap:                      Key Binding.         (line   6)
+* Moving in a page:                      Moving in a page.    (line   6)
+* Mule-UCS package:                      Other Requirements.  (line   6)
+* nnshimbun:                             Nnshimbun.           (line   6)
+* Other variables:                       Other Variables.     (line   6)
+* Possible Emacs versions:               Required Emacs Version.
+                                                              (line   6)
+* Proxy gateways:                        Minimal Settings.    (line  27)
+* Proxy servers:                         Minimal Settings.    (line  27)
+* Quick Searching:                       Quick Searching.     (line   6)
+* Reading HTML mails in Gnus:            Gnus.                (line   6)
+* Reporting bugs:                        Mailing List.        (line   6)
+* rfc2368.el:                            Other Requirements.  (line   6)
+* Saving images:                         Inline Images.       (line  68)
+* Search engines:                        Using Search Engines.
+                                                              (line   6)
+* Searching:                             The Search Interface.
+                                                              (line   6)
+* Shimbun library:                       Shimbun Library.     (line   6)
+* shimbun.el:                            Shimbun Basics.      (line   6)
+* Showing the tree structure of local directories: Showing Directory Tree.
+                                                              (line   6)
+* Special URLs:                          Quick Searching.     (line   6)
+* Starting up:                           Getting Started.     (line   6)
+* Startup file:                          Minimal Settings.    (line  20)
+* Subscribing to the emacs-w3m mailing list: Mailing List.    (line   6)
+* Switching buffers using the buffer list: Selecting buffers. (line  47)
+* Switching buffers using the minibuffer: Selecting buffers.  (line  42)
+* The Antenna interface:                 Daily web tracking.  (line   6)
+* Tips:                                  Tips.                (line   6)
+* Tracking changes in web pages:         Using Antenna.       (line   6)
+* Using emacs-w3m as a batch command:    Launching and Jumping.
+                                                              (line  18)
+* Variables related to antenna:          Antenna Variables.   (line   6)
+* Variables related to bookmarks:        Bookmark Variables.  (line   6)
+* Variables related to cookies:          Cookie Variables.    (line   6)
+* Variables related to forms:            Form Variables.      (line   6)
+* Variables related to images:           Image Variables.     (line   6)
+* Variables related to namazu:           Namazu Variables.    (line   6)
+* Variables related to perldoc:          Perldoc Variables.   (line   6)
+* Variables related to searching the web: Search Variables.   (line   6)
+* Variables related to session manager:  Session Manager Variables.
+                                                              (line   6)
+* Variables related to the dtree feature: Dtree Variables.    (line   6)
+* Variables related to the octet feature: Octet Variables.    (line   6)
+* Variables related to weather information: Weather Variables.
+                                                              (line   6)
+* Viewing images:                        Inline Images.       (line  64)
+* w3m:                                   You Need w3m.        (line   6)
+* Web Newspaper:                         Nnshimbun.           (line   6)
+* Zooming images:                        Inline Images.       (line  73)
+
+
+File: emacs-w3m.info,  Node: Key Index,  Next: Variable Index,  Prev: Concept Index,  Up: Index
+
+Key Index
+=========
+
+[index]
+* Menu:
+
+* +:                                     Setting up Antenna.  (line  12)
+* , (Lynx-like keymap):                  Moving in a page.    (line  50)
+* . (Lynx-like keymap):                  Moving in a page.    (line  44)
+* <:                                     Moving in a page.    (line  38)
+* <backspace> <1>:                       Moving over pages.   (line 110)
+* <backspace>:                           Moving in a page.    (line  28)
+* <backtab>:                             Moving in a page.    (line  81)
+* <DEL> <1>:                             Moving over pages.   (line 110)
+* <DEL>:                                 Moving in a page.    (line  28)
+* <down> (Lynx-like keymap):             Moving in a page.    (line  73)
+* <left> (Lynx-like keymap):             Moving over pages.   (line  19)
+* <RET>:                                 Launching and Jumping.
+                                                              (line  55)
+* <right> (Lynx-like keymap):            Launching and Jumping.
+                                                              (line  55)
+* <SPC> <1>:                             Moving over pages.   (line  61)
+* <SPC>:                                 Moving in a page.    (line  19)
+* <TAB>:                                 Moving in a page.    (line  73)
+* <up> (Lynx-like keymap):               Moving in a page.    (line  81)
+* =:                                     HTML File Information.
+                                                              (line  30)
+* >:                                     Moving in a page.    (line  33)
+* [:                                     Moving in a page.    (line  90)
+* \:                                     HTML File Information.
+                                                              (line  26)
+* ]:                                     Moving in a page.    (line  86)
+* ^:                                     Moving over pages.   (line  42)
+* A:                                     Daily web tracking.  (line  39)
+* a:                                     Adding Bookmarks.    (line   6)
+* b <1>:                                 Moving over pages.   (line 110)
+* b:                                     Moving in a page.    (line  28)
+* B (Lynx-like keymap):                  Moving over pages.   (line  19)
+* c (Lynx-like keymap):                  Launching and Jumping.
+                                                              (line  93)
+* C-? <1>:                               Moving over pages.   (line 110)
+* C-?:                                   Moving in a page.    (line  28)
+* C-c C-<SPC>:                           Tracing History.     (line  54)
+* C-c C-@:                               Tracing History.     (line  54)
+* C-c C-a:                               Selecting buffers.   (line  42)
+* C-c C-n:                               Moving across buffers.
+                                                              (line  27)
+* C-c C-p:                               Moving across buffers.
+                                                              (line  22)
+* C-c C-s:                               Selecting buffers.   (line  47)
+* C-c C-t:                               Creating and killing buffers.
+                                                              (line  18)
+* C-c C-v:                               Tracing History.     (line  57)
+* C-c C-w:                               Creating and killing buffers.
+                                                              (line  23)
+* C-c M-w:                               Creating and killing buffers.
+                                                              (line  26)
+* C-S-l (Info-like keymap):              Launching and Jumping.
+                                                              (line 108)
+* C-u a:                                 Adding Bookmarks.    (line   6)
+* C-u o (Info-like keymap):              Tracing History.     (line  48)
+* C-u s (Lynx-like keymap):              Tracing History.     (line  48)
+* d (Info-like keymap):                  Downloading.         (line  26)
+* D (Info-like keymap):                  Downloading.         (line  21)
+* D (Lynx-like keymap):                  Showing Directory Tree.
+                                                              (line  50)
+* d (Lynx-like keymap):                  Downloading.         (line  21)
+* E (Info-like keymap):                  HTML File Information.
+                                                              (line  41)
+* e (Info-like keymap):                  HTML File Information.
+                                                              (line  36)
+* e (Lynx-like keymap):                  HTML File Information.
+                                                              (line  41)
+* E (Lynx-like keymap):                  HTML File Information.
+                                                              (line  36)
+* G:                                     Launching and Jumping.
+                                                              (line  83)
+* g:                                     Launching and Jumping.
+                                                              (line  77)
+* H:                                     Moving over pages.   (line  32)
+* i (Info-like keymap):                  Inline Images.       (line  51)
+* I (Info-like keymap):                  Inline Images.       (line  30)
+* I (Lynx-like keymap):                  Inline Images.       (line  64)
+* l (Info-like keymap):                  Moving over pages.   (line  19)
+* M:                                     HTML File Information.
+                                                              (line  45)
+* M-<TAB>:                               Moving in a page.    (line  81)
+* M-[:                                   Inline Images.       (line  74)
+* M-]:                                   Inline Images.       (line  77)
+* M-a:                                   Adding Bookmarks.    (line   6)
+* M-d (Lynx-like keymap):                Downloading.         (line  26)
+* M-i:                                   Inline Images.       (line  68)
+* M-I (Info-like keymap):                Inline Images.       (line  60)
+* M-l:                                   Moving in a page.    (line  55)
+* M-n:                                   Creating and killing buffers.
+                                                              (line  18)
+* M-s:                                   Session Manager.     (line  11)
+* M-S:                                   Session Manager.     (line   8)
+* M-T (Lynx-like keymap):                Inline Images.       (line  60)
+* mouse-2:                               Browsing with Mouse Operations.
+                                                              (line  17)
+* n (Info-like keymap):                  Moving over pages.   (line  25)
+* N (Lynx-like keymap):                  Moving over pages.   (line  25)
+* o (Info-like keymap):                  Tracing History.     (line  48)
+* p (Info-like keymap):                  Moving over pages.   (line  19)
+* Q:                                     Going Back to Daily Hacking and/or Daily Writing.
+                                                              (line  23)
+* q:                                     Going Back to Daily Hacking and/or Daily Writing.
+                                                              (line  19)
+* R:                                     Launching and Jumping.
+                                                              (line 108)
+* s (Info-like keymap):                  The Search Interface.
+                                                              (line  30)
+* S (Lynx-like keymap):                  The Search Interface.
+                                                              (line  30)
+* s (Lynx-like keymap):                  Tracing History.     (line  48)
+* S-<left> (Info-like keymap):           Moving in a page.    (line  44)
+* S-<mouse-2>:                           Browsing with Mouse Operations.
+                                                              (line  21)
+* S-<right> (Info-like keymap):          Moving in a page.    (line  50)
+* S-<SPC> <1>:                           Moving over pages.   (line 110)
+* S-<SPC>:                               Moving in a page.    (line  28)
+* S-<TAB>:                               Moving in a page.    (line  81)
+* T (Info-like keymap):                  Showing Directory Tree.
+                                                              (line  50)
+* t (Lynx-like keymap):                  Inline Images.       (line  51)
+* T (Lynx-like keymap):                  Inline Images.       (line  30)
+* u (Info-like keymap):                  Moving over pages.   (line  42)
+* u (Lynx-like keymap):                  Launching and Jumping.
+                                                              (line  98)
+* v:                                     Consulting Bookmarks.
+                                                              (line   6)
+* Y (Info-like keymap):                  Launching and Jumping.
+                                                              (line  98)
+* y (Info-like keymap):                  Launching and Jumping.
+                                                              (line  93)
+* {:                                     Moving in a page.    (line  98)
+* |:                                     HTML File Information.
+                                                              (line  52)
+* }:                                     Moving in a page.    (line  94)
+
+
+File: emacs-w3m.info,  Node: Variable Index,  Next: Function Index,  Prev: Key Index,  Up: Index
+
+Variable Index
+==============
+
+[index]
+* Menu:
+
+* gnus-keep-backlog:                     Nnshimbun.           (line  53)
+* mm-inline-text-html-with-images:       Gnus.                (line   6)
+* mm-inline-text-html-with-w3m-keymap:   Gnus.                (line   6)
+* mm-text-html-renderer:                 Gnus.                (line   6)
+* nnmail-expiry-wait:                    Nnshimbun.           (line 170)
+* nnmail-expiry-wait-function:           Nnshimbun.           (line 170)
+* nnshimbun-default-group-level:         Nnshimbun.           (line  71)
+* nnshimbun-directory:                   Nnshimbun.           (line  66)
+* nnshimbun-encapsulate-images:          Nnshimbun.           (line 110)
+* nnshimbun-group-parameters-alist:      Nnshimbun.           (line 154)
+* nnshimbun-index-range:                 Nnshimbun.           (line 122)
+* nnshimbun-keep-backlog:                Nnshimbun.           (line  53)
+* nnshimbun-keep-unparsable-dated-articles: Nnshimbun.        (line 252)
+* nnshimbun-marks-is-evil:               Nnshimbun.           (line  77)
+* nnshimbun-pre-fetch-article:           Nnshimbun.           (line 101)
+* shimbun-local-path:                    Shimbun local mode.  (line  22)
+* shimbun-slashdot-comment-display:      News Sites Supported by Shimbun.
+                                                              (line 123)
+* shimbun-slashdot-comment-threshold:    News Sites Supported by Shimbun.
+                                                              (line 119)
+* shimbun-slashdot-get-comments:         News Sites Supported by Shimbun.
+                                                              (line 110)
+* shimbun-tech-on-password:              News Sites Supported by Shimbun.
+                                                              (line 162)
+* shimbun-tech-on-user-name:             News Sites Supported by Shimbun.
+                                                              (line 155)
+* shimbun-use-local:                     Shimbun local mode.  (line  17)
+* w3m-accept-languages:                  General Variables.   (line   7)
+* w3m-add-referer:                       General Variables.   (line  12)
+* w3m-add-user-agent:                    General Variables.   (line  43)
+* w3m-after-cursor-move-hook:            Hooks.               (line   7)
+* w3m-antenna-file:                      Antenna Variables.   (line   7)
+* w3m-antenna-html-skelton:              Antenna Variables.   (line  12)
+* w3m-antenna-refresh-interval <1>:      Antenna Variables.   (line  15)
+* w3m-antenna-refresh-interval:          Daily web tracking.  (line  34)
+* w3m-antenna-sites:                     Setting up Antenna.  (line   6)
+* w3m-antenna-sort-changed-sites-function: Antenna Variables. (line  24)
+* w3m-antenna-sort-unchanged-sites-function: Antenna Variables.
+                                                              (line  29)
+* w3m-arrived-file:                      General Variables.   (line  47)
+* w3m-async-exec:                        Other Variables.     (line   7)
+* w3m-auto-show:                         General Variables.   (line  50)
+* w3m-bookmark-default-section:          Bookmark Variables.  (line  18)
+* w3m-bookmark-file:                     Bookmark Variables.  (line   7)
+* w3m-bookmark-file-coding-system:       Bookmark Variables.  (line  10)
+* w3m-bookmark-menu-open-new-session:    Bookmark Variables.  (line  21)
+* w3m-bookmark-mode-hook:                Hooks.               (line  56)
+* w3m-broken-proxy-cache:                Other Variables.     (line  11)
+* w3m-charset-coding-system-alist:       General Variables.   (line  60)
+* w3m-coding-system:                     General Variables.   (line  64)
+* w3m-coding-system-priority-list:       General Variables.   (line  67)
+* w3m-command:                           General Variables.   (line  70)
+* w3m-command-arguments:                 Minimal Settings.    (line  27)
+* w3m-command-arguments-alist:           General Variables.   (line  88)
+* w3m-command-environment:               General Variables.   (line 108)
+* w3m-confirm-leaving-secure-page:       General Variables.   (line 111)
+* w3m-content-type-alist:                General Variables.   (line 117)
+* w3m-cookie-accept-bad-cookies:         Cookie Variables.    (line   7)
+* w3m-cookie-accept-domains:             Cookie Variables.    (line  11)
+* w3m-cookie-file:                       Cookie Variables.    (line  14)
+* w3m-cookie-reject-domains:             Cookie Variables.    (line  17)
+* w3m-correct-charset-alist:             General Variables.   (line 150)
+* w3m-db-history-display-size:           General Variables.   (line 153)
+* w3m-decoder-alist:                     General Variables.   (line 156)
+* w3m-default-coding-system:             Quick Searching.     (line   6)
+* w3m-default-content-type:              General Variables.   (line 162)
+* w3m-default-directory:                 General Variables.   (line 165)
+* w3m-default-display-inline-images:     Image Variables.     (line   7)
+* w3m-default-save-directory:            General Variables.   (line 178)
+* w3m-delete-buffer-hook:                Hooks.               (line  12)
+* w3m-delete-duplicated-empty-lines:     General Variables.   (line 181)
+* w3m-dirlist-cgi-program:               General Variables.   (line 185)
+* w3m-display-hook:                      Hooks.               (line  15)
+* w3m-do-cleanup-temp-files:             General Variables.   (line 642)
+* w3m-doc-view-content-types:            General Variables.   (line 189)
+* w3m-dtree-default-allfiles:            Dtree Variables.     (line   7)
+* w3m-dtree-directory-depth:             Dtree Variables.     (line  13)
+* w3m-dtree-indent-strings:              Dtree Variables.     (line  18)
+* w3m-dtree-stop-strings:                Dtree Variables.     (line  22)
+* w3m-edit-function:                     General Variables.   (line 193)
+* w3m-edit-function-alist:               General Variables.   (line 198)
+* w3m-enable-google-feeling-lucky:       General Variables.   (line 205)
+* w3m-encoding-type-alist:               General Variables.   (line 210)
+* w3m-favicon-cache-expire-wait:         Image Variables.     (line  13)
+* w3m-favicon-cache-file:                Image Variables.     (line  17)
+* w3m-favicon-default-background:        Image Variables.     (line  32)
+* w3m-favicon-size:                      Image Variables.     (line  22)
+* w3m-favicon-type:                      Image Variables.     (line  26)
+* w3m-favicon-use-cache-file:            Image Variables.     (line  29)
+* w3m-file-coding-system:                General Variables.   (line 213)
+* w3m-file-name-coding-system:           General Variables.   (line 217)
+* w3m-fill-column:                       General Variables.   (line 221)
+* w3m-follow-redirection:                General Variables.   (line 229)
+* w3m-fontify-after-hook:                Hooks.               (line  20)
+* w3m-fontify-before-hook:               Hooks.               (line  24)
+* w3m-form-input-map-buffer-lines:       Form Variables.      (line   7)
+* w3m-form-input-map-mode-hook:          Hooks.               (line  28)
+* w3m-form-input-map-set-hook:           Hooks.               (line  31)
+* w3m-form-input-select-buffer-lines:    Form Variables.      (line  10)
+* w3m-form-input-select-mode-hook:       Hooks.               (line  34)
+* w3m-form-input-select-set-hook:        Hooks.               (line  37)
+* w3m-form-input-textarea-buffer-lines:  Form Variables.      (line  13)
+* w3m-form-input-textarea-mode-hook:     Hooks.               (line  40)
+* w3m-form-input-textarea-set-hook:      Hooks.               (line  43)
+* w3m-form-mouse-face:                   Form Variables.      (line  16)
+* w3m-form-textarea-directory:           Form Variables.      (line  25)
+* w3m-form-treat-textarea-size:          Form Variables.      (line  19)
+* w3m-form-use-fancy-faces:              Form Variables.      (line  22)
+* w3m-form-use-textarea-backup:          Form Variables.      (line  25)
+* w3m-history-minimize-in-new-session:   Other Variables.     (line  20)
+* w3m-history-reuse-history-elements:    Other Variables.     (line  26)
+* w3m-home-page:                         Launching and Jumping.
+                                                              (line  18)
+* w3m-horizontal-scroll-columns:         Moving in a page.    (line  33)
+* w3m-horizontal-scroll-division:        General Variables.   (line 245)
+* w3m-horizontal-shift-columns:          Moving in a page.    (line  44)
+* w3m-icon-directory:                    Image Variables.     (line  40)
+* w3m-image-default-background:          Image Variables.     (line 108)
+* w3m-imagick-convert-program:           Image Variables.     (line  43)
+* w3m-imitate-widget-button:             General Variables.   (line 266)
+* w3m-init-file <1>:                     Customizable Variables.
+                                                              (line   6)
+* w3m-init-file:                         Minimal Settings.    (line  20)
+* w3m-input-coding-system:               General Variables.   (line 281)
+* w3m-keep-arrived-urls:                 General Variables.   (line 286)
+* w3m-keep-cache-size:                   General Variables.   (line 289)
+* w3m-key-binding:                       Key Binding.         (line   6)
+* w3m-language:                          General Variables.   (line 297)
+* w3m-local-directory-view-method:       General Variables.   (line 300)
+* w3m-local-find-file-function:          General Variables.   (line 306)
+* w3m-local-find-file-regexps:           General Variables.   (line 317)
+* w3m-mailto-url-function:               General Variables.   (line 341)
+* w3m-mailto-url-popup-function-alist:   General Variables.   (line 347)
+* w3m-make-new-session:                  General Variables.   (line 357)
+* w3m-mbconv-command:                    General Variables.   (line 365)
+* w3m-menu-on-forefront:                 General Variables.   (line 613)
+* w3m-minor-mode:                        Gnus.                (line   6)
+* w3m-minor-mode-command-alist:          Gnus.                (line   6)
+* w3m-minor-mode-hook:                   Hooks.               (line  46)
+* w3m-mode-hook:                         Hooks.               (line  49)
+* w3m-namazu-arguments:                  Namazu Variables.    (line  10)
+* w3m-namazu-command:                    Namazu Variables.    (line   7)
+* w3m-namazu-default-index:              Namazu Variables.    (line  17)
+* w3m-namazu-index-alist:                Namazu Variables.    (line  25)
+* w3m-namazu-input-coding-system:        Namazu Variables.    (line  29)
+* w3m-namazu-output-coding-system:       Namazu Variables.    (line  34)
+* w3m-namazu-page-max:                   Namazu Variables.    (line  40)
+* w3m-new-session-in-background:         General Variables.   (line 638)
+* w3m-no-proxy-domains:                  Minimal Settings.    (line  27)
+* w3m-output-coding-system:              General Variables.   (line 375)
+* w3m-perldoc-command:                   Perldoc Variables.   (line   7)
+* w3m-perldoc-input-coding-system:       Perldoc Variables.   (line  11)
+* w3m-perldoc-output-coding-system:      Perldoc Variables.   (line  17)
+* w3m-perldoc-pod2html-arguments:        Perldoc Variables.   (line  25)
+* w3m-perldoc-pod2html-command:          Perldoc Variables.   (line  21)
+* w3m-pixels-per-character:              Image Variables.     (line  59)
+* w3m-pixels-per-line:                   Image Variables.     (line  67)
+* w3m-pop-up-frames:                     General Variables.   (line 378)
+* w3m-pop-up-windows:                    General Variables.   (line 386)
+* w3m-popup-frame-parameters:            General Variables.   (line 395)
+* w3m-prefer-cache:                      General Variables.   (line 400)
+* w3m-process-connection-type:           Other Variables.     (line  47)
+* w3m-process-modeline-format:           Other Variables.     (line  51)
+* w3m-profile-directory:                 General Variables.   (line 404)
+* w3m-quick-start <1>:                   Moving over pages.   (line  32)
+* w3m-quick-start:                       Launching and Jumping.
+                                                              (line  18)
+* w3m-redirect-with-get:                 General Variables.   (line 415)
+* w3m-refresh-minimum-interval:          General Variables.   (line 604)
+* w3m-relationship-estimate-rules:       General Variables.   (line 426)
+* w3m-resize-image-scale:                Image Variables.     (line  76)
+* w3m-resize-images:                     Image Variables.     (line  79)
+* w3m-search-default-engine:             The Search Interface.
+                                                              (line  30)
+* w3m-search-engine-alist:               Quick Searching.     (line   6)
+* w3m-search-thing-at-point-arg:         Search Variables.    (line  25)
+* w3m-search-word-at-point:              Search Variables.    (line  20)
+* w3m-select-buffer-hook:                Hooks.               (line  53)
+* w3m-select-buffer-horizontal-window:   General Variables.   (line 430)
+* w3m-select-buffer-window-ratio:        General Variables.   (line 434)
+* w3m-session-automatic-keep-number:     Session Manager Variables.
+                                                              (line  25)
+* w3m-session-automatic-save:            Session Manager.     (line  40)
+* w3m-session-automatic-title:           Session Manager Variables.
+                                                              (line  13)
+* w3m-session-crash-recovery:            Session Manager.     (line  53)
+* w3m-session-crash-recovery-title:      Session Manager Variables.
+                                                              (line  19)
+* w3m-session-deleted-keep-number:       Session Manager Variables.
+                                                              (line  22)
+* w3m-session-deleted-save:              Session Manager.     (line  40)
+* w3m-session-deleted-title:             Session Manager Variables.
+                                                              (line  16)
+* w3m-session-file:                      Session Manager Variables.
+                                                              (line   7)
+* w3m-session-load-crashed-sessions:     Session Manager.     (line  53)
+* w3m-session-load-last-sessions:        Session Manager.     (line  47)
+* w3m-session-time-format:               Session Manager Variables.
+                                                              (line  10)
+* w3m-session-unknown-title:             Session Manager Variables.
+                                                              (line  28)
+* w3m-show-current-title-in-buffer-tab:  Other Variables.     (line  56)
+* w3m-show-decoded-url:                  General Variables.   (line 439)
+* w3m-show-error-information:            General Variables.   (line 477)
+* w3m-show-graphic-icons-in-header-line: Image Variables.     (line  82)
+* w3m-show-graphic-icons-in-mode-line:   Image Variables.     (line  88)
+* w3m-space-before-favicon:              General Variables.   (line 482)
+* w3m-space-before-modeline-icon:        General Variables.   (line 487)
+* w3m-submit-form-safety-check:          General Variables.   (line 585)
+* w3m-tab-mouse-position-adjuster:       Using Tabs.          (line  60)
+* w3m-tab-track-mouse:                   Using Tabs.          (line  54)
+* w3m-terminal-coding-system:            General Variables.   (line 492)
+* w3m-toggle-inline-images-permanently:  Image Variables.     (line  93)
+* w3m-touch-command:                     General Variables.   (line 499)
+* w3m-track-mouse:                       General Variables.   (line 504)
+* w3m-treat-image-size:                  Image Variables.     (line  46)
+* w3m-uri-replace-alist:                 Quick Searching.     (line   6)
+* w3m-url-local-directory-alist:         General Variables.   (line 558)
+* w3m-use-ange-ftp:                      General Variables.   (line 566)
+* w3m-use-cookies:                       Cookie Variables.    (line  20)
+* w3m-use-cygdrive:                      General Variables.   (line 570)
+* w3m-use-favicon:                       Image Variables.     (line 103)
+* w3m-use-filter:                        General Variables.   (line 574)
+* w3m-use-form:                          General Variables.   (line 581)
+* w3m-use-header-line:                   General Variables.   (line 589)
+* w3m-use-header-line-title:             General Variables.   (line 592)
+* w3m-use-mule-ucs:                      General Variables.   (line 596)
+* w3m-use-refresh:                       General Variables.   (line 599)
+* w3m-use-symbol:                        General Variables.   (line 608)
+* w3m-use-tab:                           Using Tabs.          (line  45)
+* w3m-use-tab-menubar:                   General Variables.   (line 623)
+* w3m-use-title-buffer-name:             General Variables.   (line 474)
+* w3m-use-toolbar:                       General Variables.   (line 631)
+* w3m-user-agent:                        General Variables.   (line 634)
+* w3m-weather-default-area:              Weather Variables.   (line   7)
+* w3m-weather-filter-functions:          Weather Variables.   (line  11)
+
+
+File: emacs-w3m.info,  Node: Function Index,  Prev: Variable Index,  Up: Index
+
+Function Index
+==============
+
+[index]
+* Menu:
+
+* gnus-group-make-shimbun-group:         Nnshimbun.           (line  18)
+* gnus-group-make-shimbun-groups:        Nnshimbun.           (line  40)
+* nnshimbun-generate-download-script:    Shimbun local mode.  (line  32)
+* octet-find-file:                       Octet.               (line   6)
+* w3m:                                   Launching and Jumping.
+                                                              (line  18)
+* w3m-antenna:                           Daily web tracking.  (line  39)
+* w3m-antenna-add-current-url:           Setting up Antenna.  (line  12)
+* w3m-bookmark-add-current-url:          Adding Bookmarks.    (line   6)
+* w3m-bookmark-add-this-url:             Adding Bookmarks.    (line   6)
+* w3m-bookmark-edit:                     Editing Bookmarks.   (line  20)
+* w3m-bookmark-kill-entry:               Editing Bookmarks.   (line  17)
+* w3m-bookmark-undo:                     Editing Bookmarks.   (line  23)
+* w3m-bookmark-view:                     Consulting Bookmarks.
+                                                              (line   6)
+* w3m-browse-url:                        Launching and Jumping.
+                                                              (line  37)
+* w3m-close-window:                      Going Back to Daily Hacking and/or Daily Writing.
+                                                              (line  19)
+* w3m-copy-buffer:                       Creating and killing buffers.
+                                                              (line  18)
+* w3m-delete-buffer:                     Creating and killing buffers.
+                                                              (line  23)
+* w3m-delete-other-buffers:              Creating and killing buffers.
+                                                              (line  26)
+* w3m-download:                          Downloading.         (line  26)
+* w3m-download-this-url:                 Downloading.         (line  21)
+* w3m-dtree:                             Showing Directory Tree.
+                                                              (line  50)
+* w3m-edit-current-url:                  HTML File Information.
+                                                              (line  36)
+* w3m-edit-this-url:                     HTML File Information.
+                                                              (line  41)
+* w3m-fb-mode:                           Frame Local Buffers. (line  11)
+* w3m-find-file:                         Launching and Jumping.
+                                                              (line  33)
+* w3m-gohome:                            Moving over pages.   (line  32)
+* w3m-goto-url:                          Launching and Jumping.
+                                                              (line  77)
+* w3m-goto-url-new-session:              Launching and Jumping.
+                                                              (line  83)
+* w3m-history:                           Tracing History.     (line  48)
+* w3m-history-restore-position:          Tracing History.     (line  57)
+* w3m-history-store-position:            Tracing History.     (line  54)
+* w3m-horizontal-recenter:               Moving in a page.    (line  55)
+* w3m-mouse-view-this-url:               Browsing with Mouse Operations.
+                                                              (line  17)
+* w3m-mouse-view-this-url-new-session:   Browsing with Mouse Operations.
+                                                              (line  21)
+* w3m-next-anchor:                       Moving in a page.    (line  73)
+* w3m-next-buffer:                       Moving across buffers.
+                                                              (line  27)
+* w3m-next-form:                         Moving in a page.    (line  86)
+* w3m-next-image:                        Moving in a page.    (line  94)
+* w3m-pattern-uri-replace:               General Variables.   (line 544)
+* w3m-pipe-source:                       HTML File Information.
+                                                              (line  52)
+* w3m-previous-anchor:                   Moving in a page.    (line  81)
+* w3m-previous-buffer:                   Moving across buffers.
+                                                              (line  22)
+* w3m-previous-form:                     Moving in a page.    (line  90)
+* w3m-previous-image:                    Moving in a page.    (line  98)
+* w3m-print-current-url:                 Launching and Jumping.
+                                                              (line  93)
+* w3m-print-this-url:                    Launching and Jumping.
+                                                              (line  98)
+* w3m-quit:                              Going Back to Daily Hacking and/or Daily Writing.
+                                                              (line  23)
+* w3m-reload-this-page:                  Launching and Jumping.
+                                                              (line 108)
+* w3m-save-image:                        Inline Images.       (line  68)
+* w3m-scroll-down-or-previous-url <1>:   Moving over pages.   (line 110)
+* w3m-scroll-down-or-previous-url:       Moving in a page.    (line  28)
+* w3m-scroll-left:                       Moving in a page.    (line  33)
+* w3m-scroll-right:                      Moving in a page.    (line  38)
+* w3m-scroll-up-or-next-url <1>:         Moving over pages.   (line  61)
+* w3m-scroll-up-or-next-url:             Moving in a page.    (line  19)
+* w3m-search:                            The Search Interface.
+                                                              (line  30)
+* w3m-search-uri-replace:                General Variables.   (line 549)
+* w3m-select-buffer:                     Selecting buffers.   (line  47)
+* w3m-session-select:                    Session Manager.     (line  11)
+* w3m-session-select-delete:             Session Manager.     (line  23)
+* w3m-session-select-next:               Session Manager.     (line  32)
+* w3m-session-select-open-session-group: Session Manager.     (line  19)
+* w3m-session-select-previous:           Session Manager.     (line  35)
+* w3m-session-select-quit:               Session Manager.     (line  38)
+* w3m-session-select-rename:             Session Manager.     (line  26)
+* w3m-session-select-save:               Session Manager.     (line  29)
+* w3m-session-select-select:             Session Manager.     (line  16)
+* w3m-shift-left:                        Moving in a page.    (line  44)
+* w3m-shift-right:                       Moving in a page.    (line  50)
+* w3m-switch-buffer:                     Selecting buffers.   (line  42)
+* w3m-tab-move-left:                     Moving across buffers.
+                                                              (line  42)
+* w3m-tab-move-right:                    Moving across buffers.
+                                                              (line  36)
+* w3m-toggle-inline-image:               Inline Images.       (line  51)
+* w3m-toggle-inline-images:              Inline Images.       (line  30)
+* w3m-turnoff-inline-images:             Inline Images.       (line  60)
+* w3m-view-header:                       HTML File Information.
+                                                              (line  30)
+* w3m-view-image:                        Inline Images.       (line  64)
+* w3m-view-next-page:                    Moving over pages.   (line  25)
+* w3m-view-parent-page:                  Moving over pages.   (line  42)
+* w3m-view-previous-page:                Moving over pages.   (line  19)
+* w3m-view-source:                       HTML File Information.
+                                                              (line  26)
+* w3m-view-this-url:                     Launching and Jumping.
+                                                              (line  55)
+* w3m-view-url-with-external-browser:    HTML File Information.
+                                                              (line  45)
+* w3m-zoom-in-image:                     Inline Images.       (line  77)
+* w3m-zoom-out-image:                    Inline Images.       (line  74)
+
+
+
+Tag Table:
+Node: Top1134
+Node: Introduction6654
+Node: Getting Started7702
+Node: Required Emacs Version8496
+Node: You Need w3m9574
+Node: Other Requirements10101
+Node: Installing Emacs-w3m14843
+Node: Non-UNIX-like systems18082
+Node: Minimal Settings18816
+Node: Basic Usage21112
+Node: Browsing Web Pages21807
+Node: Key Binding22542
+Node: Launching and Jumping23893
+Node: Moving in a page28471
+Node: Moving over pages32180
+Node: Browsing with Mouse Operations37518
+Node: Going Back to Daily Hacking and/or Daily Writing39203
+Node: Inline Images40289
+Node: Tracing History43704
+Node: Managing Bookmarks48235
+Node: Adding Bookmarks48765
+Node: Consulting Bookmarks50304
+Node: Editing Bookmarks50999
+Node: Using Tabs51873
+Ref: Using Tabs-Footnote-155507
+Ref: Using Tabs-Footnote-255693
+Node: Working with buffers55770
+Node: Creating and killing buffers56386
+Node: Moving across buffers57471
+Ref: Moving across buffers-Footnote-159812
+Node: Selecting buffers59998
+Node: Downloading62634
+Node: Submitting Forms63858
+Node: HTML File Information65477
+Node: Pretty Good Features67777
+Node: Using Search Engines68585
+Node: The Search Interface69960
+Node: Quick Searching71535
+Node: Adding New Search Engines74061
+Node: Grouping URLs76405
+Node: Weather Information77508
+Node: Using Antenna77690
+Node: Setting up Antenna78362
+Node: Daily web tracking78976
+Node: Showing Directory Tree80737
+Node: Viewing Perl Documents82399
+Node: Using Namazu82588
+Node: Octet82791
+Node: Frame Local Buffers83236
+Node: Session Manager84837
+Node: Customizable Variables87071
+Node: General Variables89907
+Node: Image Variables116138
+Node: Form Variables120939
+Node: Cookie Variables121855
+Node: Bookmark Variables122503
+Node: Search Variables123328
+Node: Weather Variables124542
+Node: Dtree Variables125181
+Node: Antenna Variables126189
+Node: Perldoc Variables127500
+Node: Namazu Variables128441
+Node: Octet Variables130179
+Node: Session Manager Variables130445
+Node: Hooks131285
+Node: Other Variables133093
+Node: Hooking into MUAs135595
+Node: Gnus136667
+Node: Mew141202
+Node: SEMI MUAs143574
+Node: VM146348
+Node: Frequently Asked Questions146765
+Node: General FAQ147115
+Node: Trouble FAQ149060
+Ref: Trouble FAQ-Footnote-1158521
+Node: Shimbun FAQ158593
+Node: Known Problems159426
+Node: Shimbun Library159595
+Node: Nnshimbun162448
+Ref: Nnshimbun-Footnote-1174745
+Ref: Nnshimbun-Footnote-2174945
+Ref: Nnshimbun-Footnote-3175646
+Ref: Nnshimbun-Footnote-4175750
+Node: Mew Shimbun176220
+Ref: Mew Shimbun-Footnote-1185688
+Ref: Mew Shimbun-Footnote-2185818
+Node: Shimbun with Wanderlust185983
+Node: Shimbun local mode186367
+Node: Shimbun Sites188155
+Node: Newspapers Supported by Shimbun188711
+Node: News Sites Supported by Shimbun199396
+Node: Mailing Lists Supported by Shimbun208955
+Node: Sport Sites Supported by Shimbun222358
+Node: Misc Sites Supported by Shimbun223216
+Node: Shimbun Basics235220
+Node: Overview235815
+Node: Getting web page and header information239650
+Ref: Getting web page and header information-Footnote-1245410
+Ref: Getting web page and header information-Footnote-2245503
+Node: Displaying an article245611
+Node: Inheriting shimbun module248410
+Ref: Inheriting shimbun module-Footnote-1250593
+Ref: Inheriting shimbun module-Footnote-2250678
+Node: Making text/plain articles250732
+Node: Zenkaku to hankaku conversion253062
+Node: Coding convention of Shimbun254172
+Node: Tips255344
+Node: Mailing List260202
+Node: Emacs-w3m Functions261544
+Node: External Packages261732
+Node: Authors262898
+Node: Index263268
+Node: Concept Index263537
+Node: Key Index270357
+Node: Variable Index280083
+Node: Function Index297384
+
+End Tag Table
------------------------------------------------------------
revno: 101417
committer: Michael Albinus <michael.albinus@gmx.de>
branch nick: trunk
timestamp: Mon 2010-09-13 06:39:36 +0200
message:
  * notifications.el (notifications-notify): Add support for
  image-path and sound-name.
  (notifications-specification-version): Add this variable.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-12 14:35:37 +0000
+++ lisp/ChangeLog	2010-09-13 04:39:36 +0000
@@ -1,3 +1,9 @@
+2010-09-13  Julien Danjou  <julien@danjou.info>
+
+	* notifications.el (notifications-notify): Add support for
+	image-path and sound-name.
+	(notifications-specification-version): Add this variable.
+
 2010-09-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* subr.el (y-or-n-p): New function, moved from src/fns.c.  Use read-key.

=== modified file 'lisp/notifications.el'
--- lisp/notifications.el	2010-06-10 12:56:11 +0000
+++ lisp/notifications.el	2010-09-13 04:39:36 +0000
@@ -42,6 +42,9 @@
 
 (require 'dbus)
 
+(defconst notifications-specification-version "1.1"
+  "The version of the Desktop Notifications Specification implemented.")
+
 (defconst notifications-application-name "Emacs"
   "Default application name.")
 
@@ -151,7 +154,14 @@
  :image-data     This is a raw data image format which describes the width,
                  height, rowstride, has alpha, bits per sample, channels and
                  image data respectively.
+ :image-path     This is represented either as a URI (file:// is the
+                 only URI schema supported right now) or a name
+                 in a freedesktop.org-compliant icon theme.
  :sound-file     The path to a sound file to play when the notification pops up.
+ :sound-name     A themeable named sound from the freedesktop.org sound naming
+                 specification to play when the notification pops up.
+                 Similar to icon-name,only for sounds. An example would
+                 be \"message-new-instant\".
  :suppress-sound Causes the server to suppress playing any sounds, if it has
                  that ability.
  :x              Specifies the X location on the screen that the notification
@@ -186,7 +196,9 @@
         (category (plist-get params :category))
         (desktop-entry (plist-get params :desktop-entry))
         (image-data (plist-get params :image-data))
+        (image-path (plist-get params :image-path))
         (sound-file (plist-get params :sound-file))
+        (sound-name (plist-get params :sound-name))
         (suppress-sound (plist-get params :suppress-sound))
         (x (plist-get params :x))
         (y (plist-get params :y))
@@ -211,10 +223,18 @@
       (add-to-list 'hints `(:dict-entry
                             "image_data"
                             (:variant :struct ,image-data)) t))
+    (when image-path
+      (add-to-list 'hints `(:dict-entry
+                            "image_path"
+                            (:variant :string ,image-path)) t))
     (when sound-file
       (add-to-list 'hints `(:dict-entry
                             "sound-file"
                             (:variant :string ,sound-file)) t))
+    (when sound-name
+      (add-to-list 'hints `(:dict-entry
+                            "sound-name"
+                            (:variant :string ,sound-name)) t))
     (when suppress-sound
       (add-to-list 'hints `(:dict-entry
                             "suppress-sound"
------------------------------------------------------------
revno: 101416
committer: Lars Magne Ingebrigtsen <larsi@gnus.org>
branch nick: trunk
timestamp: Sun 2010-09-12 19:16:25 +0200
message:
  * xml.c (Fhtml_parse_string, Fxml_parse_string): Mention BASE-URL.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-09-12 14:35:37 +0000
+++ src/ChangeLog	2010-09-12 17:16:25 +0000
@@ -1,3 +1,7 @@
+2010-09-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* xml.c (Fhtml_parse_string, Fxml_parse_string): Mention BASE-URL.
+
 2010-09-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* fns.c (Fy_or_n_p): Move to lisp/subr.el.

=== modified file 'src/xml.c'
--- src/xml.c	2010-09-10 17:45:22 +0000
+++ src/xml.c	2010-09-12 17:16:25 +0000
@@ -109,7 +109,9 @@
 
 DEFUN ("html-parse-string", Fhtml_parse_string, Shtml_parse_string,
        0, 2, 0,
-       doc: /* Parse the string as an HTML document and return the parse tree.*/)
+       doc: /* Parse the string as an HTML document and return the parse tree.
+If BASE-URL is non-nil, it will be used to expand relative URLs in
+the HTML document.*/)
   (Lisp_Object string, Lisp_Object base_url)
 {
   return parse_buffer (string, base_url, 1);
@@ -117,7 +119,9 @@
 
 DEFUN ("xml-parse-string", Fxml_parse_string, Sxml_parse_string,
        0, 2, 0,
-       doc: /* Parse the string as an XML document and return the parse tree.*/)
+       doc: /* Parse the string as an XML document and return the parse tree.
+If BASE-URL is non-nil, it will be used to expand relative URLs in
+the XML document.*/)
   (Lisp_Object string, Lisp_Object base_url)
 {
   return parse_buffer (string, base_url, 0);
------------------------------------------------------------
revno: 101415
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Sun 2010-09-12 16:35:37 +0200
message:
  * lisp/subr.el (y-or-n-p): New function, moved from src/fns.c.  Use read-key.
  * src/fns.c (Fy_or_n_p): Move to lisp/subr.el.
  (syms_of_fns): Don't defsubr Sy_or_n_p.
  * src/lisp.h: Don't declare Fy_or_n_p.
  * src/fileio.c (barf_or_query_if_file_exists): Fy_or_n_p -> y-or-n-p.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-12 11:06:19 +0000
+++ lisp/ChangeLog	2010-09-12 14:35:37 +0000
@@ -1,3 +1,7 @@
+2010-09-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* subr.el (y-or-n-p): New function, moved from src/fns.c.  Use read-key.
+
 2010-09-12  Leo  <sdl.web@gmail.com>
 
 	* net/rcirc.el (rcirc-server-commands, rcirc-client-commands)

=== modified file 'lisp/subr.el'
--- lisp/subr.el	2010-08-30 13:03:05 +0000
+++ lisp/subr.el	2010-09-12 14:35:37 +0000
@@ -3358,6 +3358,52 @@
     (overlay-put ol2 'evaporate t)
     (overlay-put ol2 'text-clones dups)))
 
+;;;; Misc functions moved over from the C side.
+
+(defun y-or-n-p (prompt)
+  "Ask user a \"y or n\" question.  Return t if answer is \"y\".
+The argument PROMPT is the string to display to ask the question.
+It should end in a space; `y-or-n-p' adds `(y or n) ' to it.
+No confirmation of the answer is requested; a single character is enough.
+Also accepts Space to mean yes, or Delete to mean no.  \(Actually, it uses
+the bindings in `query-replace-map'; see the documentation of that variable
+for more information.  In this case, the useful bindings are `act', `skip',
+`recenter', and `quit'.\)
+
+Under a windowing system a dialog box will be used if `last-nonmenu-event'
+is nil and `use-dialog-box' is non-nil."
+  ;; ¡Beware! when I tried to edebug this code, Emacs got into a weird state
+  ;; where all the keys were unbound (i.e. it somehow got triggered
+  ;; within read-key, apparently).  I had to kill it.
+  (let ((answer 'none)
+        (xprompt prompt))
+    (if (and (display-popup-menus-p)
+             (listp last-nonmenu-event)
+             use-dialog-box)
+        (setq answer
+              (x-popup-dialog t `(,prompt ("yes" . act) ("No" . skip))))
+      (while
+          (let* ((key
+                  (let ((cursor-in-echo-area t))
+                    (when minibuffer-auto-raise
+                      (raise-frame (window-frame (minibuffer-window))))
+                    (read-key (propertize xprompt 'face 'minibuffer-prompt)))))
+            (setq answer (lookup-key query-replace-map (vector key) t))
+            (cond
+             ((memq answer '(skip act)) nil)
+             ((eq answer 'recenter) (recenter) t)
+             ((memq answer '(exit-prefix quit)) (signal 'quit nil) t)
+             (t t)))
+        (ding)
+        (discard-input)
+        (setq xprompt
+              (if (eq answer 'recenter) prompt
+                (concat "Please answer y or n.  " prompt)))))
+    (let ((ret (eq answer 'act)))
+      (unless noninteractive
+        (message "%s %s" prompt (if ret "y" "n")))
+      ret)))
+
 ;;;; Mail user agents.
 
 ;; Here we include just enough for other packages to be able

=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-09-10 16:44:35 +0000
+++ src/ChangeLog	2010-09-12 14:35:37 +0000
@@ -1,3 +1,10 @@
+2010-09-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* fns.c (Fy_or_n_p): Move to lisp/subr.el.
+	(syms_of_fns): Don't defsubr Sy_or_n_p.
+	* lisp.h: Don't declare Fy_or_n_p.
+	* fileio.c (barf_or_query_if_file_exists): Fy_or_n_p -> y-or-n-p.
+
 2010-09-09  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* xml.c (Fxml_parse_buffer): New function to parse XML files.
@@ -70,8 +77,8 @@
 	characters.
 
 	* term.c (encode_terminal_code): Fix the previous change.
-	(produce_glyphs): Don't set it->char_to_display here.  Don't
-	handle unibyte-display-via-language-environment here.
+	(produce_glyphs): Don't set it->char_to_display here.
+	Don't handle unibyte-display-via-language-environment here.
 	(produce_special_glyphs): Set temp_it.char_to_display before
 	calling produce_glyphs.
 
@@ -114,7 +121,7 @@
 2010-08-29  Kenichi Handa  <handa@m17n.org>
 
 	* term.c (encode_terminal_code): Encode byte chars to the
-	correspnding bytes.
+	corresponding bytes.
 
 2010-08-29  Jan Djärv  <jan.h.d@swipnet.se>
 

=== modified file 'src/fileio.c'
--- src/fileio.c	2010-08-09 09:35:21 +0000
+++ src/fileio.c	2010-09-12 14:35:37 +0000
@@ -1842,7 +1842,7 @@
       tem = format2 ("File %s already exists; %s anyway? ",
 		     absname, build_string (querystring));
       if (quick)
-	tem = Fy_or_n_p (tem);
+	tem = call1 (intern ("y-or-n-p"), tem);
       else
 	tem = do_yes_or_no_p (tem);
       UNGCPRO;

=== modified file 'src/fns.c'
--- src/fns.c	2010-08-14 21:13:49 +0000
+++ src/fns.c	2010-09-12 14:35:37 +0000
@@ -2444,146 +2444,6 @@
   return sequence;
 }
 
-/* Anything that calls this function must protect from GC!  */
-
-DEFUN ("y-or-n-p", Fy_or_n_p, Sy_or_n_p, 1, 1, 0,
-       doc: /* Ask user a "y or n" question.  Return t if answer is "y".
-Takes one argument, which is the string to display to ask the question.
-It should end in a space; `y-or-n-p' adds `(y or n) ' to it.
-No confirmation of the answer is requested; a single character is enough.
-Also accepts Space to mean yes, or Delete to mean no.  \(Actually, it uses
-the bindings in `query-replace-map'; see the documentation of that variable
-for more information.  In this case, the useful bindings are `act', `skip',
-`recenter', and `quit'.\)
-
-Under a windowing system a dialog box will be used if `last-nonmenu-event'
-is nil and `use-dialog-box' is non-nil.  */)
-  (Lisp_Object prompt)
-{
-  register Lisp_Object obj, key, def, map;
-  register int answer;
-  Lisp_Object xprompt;
-  Lisp_Object args[2];
-  struct gcpro gcpro1, gcpro2;
-  int count = SPECPDL_INDEX ();
-
-  specbind (Qcursor_in_echo_area, Qt);
-
-  map = Fsymbol_value (intern ("query-replace-map"));
-
-  CHECK_STRING (prompt);
-  xprompt = prompt;
-  GCPRO2 (prompt, xprompt);
-
-#ifdef HAVE_WINDOW_SYSTEM
-  if (display_hourglass_p)
-    cancel_hourglass ();
-#endif
-
-  while (1)
-    {
-
-#ifdef HAVE_MENUS
-      if (FRAME_WINDOW_P (SELECTED_FRAME ())
-          && (NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))
-	  && use_dialog_box
-	  && have_menus_p ())
-	{
-	  Lisp_Object pane, menu;
-	  redisplay_preserve_echo_area (3);
-	  pane = Fcons (Fcons (build_string ("Yes"), Qt),
-			Fcons (Fcons (build_string ("No"), Qnil),
-			       Qnil));
-	  menu = Fcons (prompt, pane);
-	  obj = Fx_popup_dialog (Qt, menu, Qnil);
-	  answer = !NILP (obj);
-	  break;
-	}
-#endif /* HAVE_MENUS */
-      cursor_in_echo_area = 1;
-      choose_minibuf_frame ();
-
-      {
-	Lisp_Object pargs[3];
-
-	/* Colorize prompt according to `minibuffer-prompt' face.  */
-	pargs[0] = build_string ("%s(y or n) ");
-	pargs[1] = intern ("face");
-	pargs[2] = intern ("minibuffer-prompt");
-	args[0] = Fpropertize (3, pargs);
-	args[1] = xprompt;
-	Fmessage (2, args);
-      }
-
-      if (minibuffer_auto_raise)
-	{
-	  Lisp_Object mini_frame;
-
-	  mini_frame = WINDOW_FRAME (XWINDOW (minibuf_window));
-
-	  Fraise_frame (mini_frame);
-	}
-
-      temporarily_switch_to_single_kboard (SELECTED_FRAME ());
-      obj = read_filtered_event (1, 0, 0, 0, Qnil);
-      cursor_in_echo_area = 0;
-      /* If we need to quit, quit with cursor_in_echo_area = 0.  */
-      QUIT;
-
-      key = Fmake_vector (make_number (1), obj);
-      def = Flookup_key (map, key, Qt);
-
-      if (EQ (def, intern ("skip")))
-	{
-	  answer = 0;
-	  break;
-	}
-      else if (EQ (def, intern ("act")))
-	{
-	  answer = 1;
-	  break;
-	}
-      else if (EQ (def, intern ("recenter")))
-	{
-	  Frecenter (Qnil);
-	  xprompt = prompt;
-	  continue;
-	}
-      else if (EQ (def, intern ("quit")))
-	Vquit_flag = Qt;
-      /* We want to exit this command for exit-prefix,
-	 and this is the only way to do it.  */
-      else if (EQ (def, intern ("exit-prefix")))
-	Vquit_flag = Qt;
-
-      QUIT;
-
-      /* If we don't clear this, then the next call to read_char will
-	 return quit_char again, and we'll enter an infinite loop.  */
-      Vquit_flag = Qnil;
-
-      Fding (Qnil);
-      Fdiscard_input ();
-      if (EQ (xprompt, prompt))
-	{
-	  args[0] = build_string ("Please answer y or n.  ");
-	  args[1] = prompt;
-	  xprompt = Fconcat (2, args);
-	}
-    }
-  UNGCPRO;
-
-  if (! noninteractive)
-    {
-      cursor_in_echo_area = -1;
-      message_with_string (answer ? "%s(y or n) y" : "%s(y or n) n",
-			   xprompt, 0);
-    }
-
-  unbind_to (count, Qnil);
-  return answer ? Qt : Qnil;
-}
-
 /* This is how C code calls `yes-or-no-p' and allows the user
    to redefined it.
 
@@ -5058,7 +4918,6 @@
   defsubr (&Smapcar);
   defsubr (&Smapc);
   defsubr (&Smapconcat);
-  defsubr (&Sy_or_n_p);
   defsubr (&Syes_or_no_p);
   defsubr (&Sload_average);
   defsubr (&Sfeaturep);

=== modified file 'src/lisp.h'
--- src/lisp.h	2010-09-10 16:44:35 +0000
+++ src/lisp.h	2010-09-12 14:35:37 +0000
@@ -2516,7 +2516,6 @@
 EXFUN (Fnconc, MANY);
 EXFUN (Fmapcar, 2);
 EXFUN (Fmapconcat, 3);
-EXFUN (Fy_or_n_p, 1);
 extern Lisp_Object do_yes_or_no_p (Lisp_Object);
 EXFUN (Frequire, 3);
 EXFUN (Fprovide, 2);
------------------------------------------------------------
revno: 101414
author: Leo <sdl.web@gmail.com>
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Sun 2010-09-12 13:06:19 +0200
message:
  * lisp/net/rcirc.el (rcirc-server-commands, rcirc-client-commands)
  (rcirc-completion-start): New variables.
  (rcirc-nick-completions): Rename to rcirc-completions.
  (rcirc-nick-completion-start-offset): Delete.
  (rcirc-completion-at-point): New function for constructing
  completion data for both nicks and irc commands.  Add to
  completion-at-point-functions in rcirc mode.
  (rcirc-complete): Rename from rcirc-nick-complete; use
  rcirc-completion-at-point.
  (defun-rcirc-command): Update rcirc-client-commands.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-11 18:52:04 +0000
+++ lisp/ChangeLog	2010-09-12 11:06:19 +0000
@@ -1,3 +1,16 @@
+2010-09-12  Leo  <sdl.web@gmail.com>
+
+	* net/rcirc.el (rcirc-server-commands, rcirc-client-commands)
+	(rcirc-completion-start): New variables.
+	(rcirc-nick-completions): Rename to rcirc-completions.
+	(rcirc-nick-completion-start-offset): Delete.
+	(rcirc-completion-at-point): New function for constructing
+	completion data for both nicks and irc commands.  Add to
+	completion-at-point-functions in rcirc mode.
+	(rcirc-complete): Rename from rcirc-nick-complete; use
+	rcirc-completion-at-point.
+	(defun-rcirc-command): Update rcirc-client-commands.
+
 2010-09-11  Glenn Morris  <rgm@gnu.org>
 
 	* emacs-lisp/bytecomp.el (byte-compile-file): Create .elc files

=== modified file 'lisp/net/rcirc.el'
--- lisp/net/rcirc.el	2010-09-01 07:13:21 +0000
+++ lisp/net/rcirc.el	2010-09-12 11:06:19 +0000
@@ -774,42 +774,64 @@
     (setq rcirc-input-ring-index (1- rcirc-input-ring-index))
     (insert (rcirc-prev-input-string -1))))
 
-(defvar rcirc-nick-completions nil)
-(defvar rcirc-nick-completion-start-offset nil)
-
-(defun rcirc-complete-nick ()
-  "Cycle through nick completions from list of nicks in channel."
+(defvar rcirc-server-commands
+  '("/admin"   "/away"   "/connect" "/die"      "/error"   "/info"
+    "/invite"  "/ison"   "/join"    "/kick"     "/kill"    "/links"
+    "/list"    "/lusers" "/mode"    "/motd"     "/names"   "/nick"
+    "/notice"  "/oper"   "/part"    "/pass"     "/ping"    "/pong"
+    "/privmsg" "/quit"   "/rehash"  "/restart"  "/service" "/servlist"
+    "/server"  "/squery" "/squit"   "/stats"    "/summon"  "/time"
+    "/topic"   "/trace"  "/user"    "/userhost" "/users"   "/version"
+    "/wallops" "/who"    "/whois"   "/whowas")
+  "A list of user commands by IRC server.
+The value defaults to RFCs 1459 and 2812.")
+
+;; /me and /ctcp are not defined by `defun-rcirc-command'.
+(defvar rcirc-client-commands '("/me" "/ctcp")
+  "A list of user commands defined by IRC client rcirc.
+The list is updated automatically by `defun-rcirc-command'.")
+
+(defun rcirc-completion-at-point ()
+  "Function used for `completion-at-point-functions' in `rcirc-mode'."
+  (let* ((beg (save-excursion
+		(if (re-search-backward " " rcirc-prompt-end-marker t)
+		    (1+ (point))
+		  rcirc-prompt-end-marker)))
+	 (table (if (and (= beg rcirc-prompt-end-marker)
+			 (eq (char-after beg) ?/))
+		    (delete-dups
+		     (nconc
+		      (sort (copy-sequence rcirc-client-commands) 'string-lessp)
+		      (sort (copy-sequence rcirc-server-commands) 'string-lessp)))
+		  (rcirc-channel-nicks (rcirc-buffer-process) rcirc-target))))
+    (list beg (point) table)))
+
+(defvar rcirc-completions nil)
+(defvar rcirc-completion-start nil)
+
+(defun rcirc-complete ()
+  "Cycle through completions from list of nicks in channel or IRC commands.
+IRC command completion is performed only if '/' is the first input char."
   (interactive)
   (if (eq last-command this-command)
-      (setq rcirc-nick-completions
-            (append (cdr rcirc-nick-completions)
-                    (list (car rcirc-nick-completions))))
-    (setq rcirc-nick-completion-start-offset
-          (- (save-excursion
-               (if (re-search-backward " " rcirc-prompt-end-marker t)
-                   (1+ (point))
-                 rcirc-prompt-end-marker))
-             rcirc-prompt-end-marker))
-    (setq rcirc-nick-completions
-          (let ((completion-ignore-case t))
-            (all-completions
-	     (buffer-substring
-	      (+ rcirc-prompt-end-marker
-		 rcirc-nick-completion-start-offset)
-	      (point))
-	     (mapcar (lambda (x) (cons x nil))
-		     (rcirc-channel-nicks (rcirc-buffer-process)
-					  rcirc-target))))))
-  (let ((completion (car rcirc-nick-completions)))
+      (setq rcirc-completions
+	    (append (cdr rcirc-completions) (list (car rcirc-completions))))
+    (let ((completion-ignore-case t)
+	  (table (rcirc-completion-at-point)))
+      (setq rcirc-completion-start (car table))
+      (setq rcirc-completions
+	    (all-completions (buffer-substring rcirc-completion-start
+					       (cadr table))
+			     (nth 2 table)))))
+  (let ((completion (car rcirc-completions)))
     (when completion
-      (delete-region (+ rcirc-prompt-end-marker
-			rcirc-nick-completion-start-offset)
-		     (point))
-      (insert (concat completion
-                      (if (= (+ rcirc-prompt-end-marker
-                                rcirc-nick-completion-start-offset)
-                             rcirc-prompt-end-marker)
-                          ": "))))))
+      (delete-region rcirc-completion-start (point))
+      (insert
+       (concat completion
+	       (cond
+		((= (aref completion 0) ?/) " ")
+		((= rcirc-completion-start rcirc-prompt-end-marker) ": ")
+		(t "")))))))
 
 (defun set-rcirc-decode-coding-system (coding-system)
   "Set the decode coding system used in this channel."
@@ -827,7 +849,7 @@
 (define-key rcirc-mode-map (kbd "RET") 'rcirc-send-input)
 (define-key rcirc-mode-map (kbd "M-p") 'rcirc-insert-prev-input)
 (define-key rcirc-mode-map (kbd "M-n") 'rcirc-insert-next-input)
-(define-key rcirc-mode-map (kbd "TAB") 'rcirc-complete-nick)
+(define-key rcirc-mode-map (kbd "TAB") 'rcirc-complete)
 (define-key rcirc-mode-map (kbd "C-c C-b") 'rcirc-browse-url)
 (define-key rcirc-mode-map (kbd "C-c C-c") 'rcirc-edit-multiline)
 (define-key rcirc-mode-map (kbd "C-c C-j") 'rcirc-cmd-join)
@@ -948,6 +970,9 @@
 				       rcirc-buffer-alist))))
     (rcirc-update-short-buffer-names))
 
+  (add-hook 'completion-at-point-functions
+            'rcirc-completion-at-point nil 'local)
+
   (run-hooks 'rcirc-mode-hook))
 
 (defun rcirc-update-prompt (&optional all)
@@ -2004,16 +2029,18 @@
 ;; containing the text following the /cmd.
 
 (defmacro defun-rcirc-command (command argument docstring interactive-form
-                                       &rest body)
+				       &rest body)
   "Define a command."
-  `(defun ,(intern (concat "rcirc-cmd-" (symbol-name command)))
-     (,@argument &optional process target)
-     ,(concat docstring "\n\nNote: If PROCESS or TARGET are nil, the values given"
-              "\nby `rcirc-buffer-process' and `rcirc-target' will be used.")
-     ,interactive-form
-     (let ((process (or process (rcirc-buffer-process)))
-           (target (or target rcirc-target)))
-       ,@body)))
+  `(progn
+     (add-to-list 'rcirc-client-commands ,(concat "/" (symbol-name command)))
+     (defun ,(intern (concat "rcirc-cmd-" (symbol-name command)))
+       (,@argument &optional process target)
+       ,(concat docstring "\n\nNote: If PROCESS or TARGET are nil, the values given"
+		"\nby `rcirc-buffer-process' and `rcirc-target' will be used.")
+       ,interactive-form
+       (let ((process (or process (rcirc-buffer-process)))
+	     (target (or target rcirc-target)))
+	 ,@body))))
 
 (defun-rcirc-command msg (message)
   "Send private MESSAGE to TARGET."
------------------------------------------------------------
revno: 101413
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Sat 2010-09-11 12:33:52 -0700
message:
  * lisp/emacs-lisp/bytecomp.el (byte-compile-file): Tweak previous change.
  Write out the name of the .elc file, rather than the temp-file.
diff:
=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- lisp/emacs-lisp/bytecomp.el	2010-09-11 18:52:04 +0000
+++ lisp/emacs-lisp/bytecomp.el	2010-09-11 19:33:52 +0000
@@ -1706,7 +1706,7 @@
 		      (tempfile (make-temp-name target-file)))
 		  (if (memq system-type '(ms-dos 'windows-nt))
 		      (setq buffer-file-type t))
-		  (write-region (point-min) (point-max) tempfile)
+		  (write-region (point-min) (point-max) tempfile nil 1)
 		  ;; This has the intentional side effect that any
 		  ;; hard-links to target-file continue to
 		  ;; point to the old file (this makes it possible
@@ -1715,7 +1715,8 @@
 		  ;; emacs-lisp files in the build tree are
 		  ;; recompiled).  Previously this was accomplished by
 		  ;; deleting target-file before writing it.
-		  (rename-file tempfile target-file t))
+		  (rename-file tempfile target-file t)
+		  (message "Wrote %s" target-file))
 	      ;; This is just to give a better error message than write-region
 	      (signal 'file-error
 		      (list "Opening output file"
------------------------------------------------------------
revno: 101412
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Sat 2010-09-11 11:52:04 -0700
message:
  Close bug#4196.
  * lisp/emacs-lisp/bytecomp.el (byte-compile-file): Create .elc files
  atomically, to avoid parallel build errors.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-11 03:17:02 +0000
+++ lisp/ChangeLog	2010-09-11 18:52:04 +0000
@@ -1,3 +1,8 @@
+2010-09-11  Glenn Morris  <rgm@gnu.org>
+
+	* emacs-lisp/bytecomp.el (byte-compile-file): Create .elc files
+	atomically, to avoid parallel build errors.  (Bug#4196)
+
 2010-09-11  Michael R. Mauger  <mmaug@yahoo.com>
 
 	* progmodes/sql.el: Version 2.6

=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- lisp/emacs-lisp/bytecomp.el	2010-09-08 16:02:38 +0000
+++ lisp/emacs-lisp/bytecomp.el	2010-09-11 18:52:04 +0000
@@ -1698,17 +1698,24 @@
 	  (insert "\n")			; aaah, unix.
 	    (if (file-writable-p target-file)
 		;; We must disable any code conversion here.
-		(let ((coding-system-for-write 'no-conversion))
+		(let ((coding-system-for-write 'no-conversion)
+		      ;; Write to a tempfile so that if another Emacs
+		      ;; process is trying to load target-file (eg in a
+		      ;; parallel bootstrap), it does not risk getting a
+		      ;; half-finished file.  (Bug#4196)
+		      (tempfile (make-temp-name target-file)))
 		  (if (memq system-type '(ms-dos 'windows-nt))
 		      (setq buffer-file-type t))
-		  (when (file-exists-p target-file)
-		    ;; Remove the target before writing it, so that any
-		    ;; hard-links continue to point to the old file (this makes
-		    ;; it possible for installed files to share disk space with
-		    ;; the build tree, without causing problems when emacs-lisp
-		    ;; files in the build tree are recompiled).
-		    (delete-file target-file))
-		  (write-region (point-min) (point-max) target-file))
+		  (write-region (point-min) (point-max) tempfile)
+		  ;; This has the intentional side effect that any
+		  ;; hard-links to target-file continue to
+		  ;; point to the old file (this makes it possible
+		  ;; for installed files to share disk space with
+		  ;; the build tree, without causing problems when
+		  ;; emacs-lisp files in the build tree are
+		  ;; recompiled).  Previously this was accomplished by
+		  ;; deleting target-file before writing it.
+		  (rename-file tempfile target-file t))
 	      ;; This is just to give a better error message than write-region
 	      (signal 'file-error
 		      (list "Opening output file"
------------------------------------------------------------
revno: 101411
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Sat 2010-09-11 15:58:57 +0200
message:
  * doc/lispref/syntax.texi (Syntax Flags): Document new `c' flag.
diff:
=== modified file 'doc/lispref/ChangeLog'
--- doc/lispref/ChangeLog	2010-09-09 02:18:38 +0000
+++ doc/lispref/ChangeLog	2010-09-11 13:58:57 +0000
@@ -1,3 +1,7 @@
+2010-09-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* syntax.texi (Syntax Flags): Document new `c' flag.
+
 2010-09-09  Glenn Morris  <rgm@gnu.org>
 
 	* display.texi (ImageMagick Images): General cleanup.

=== modified file 'doc/lispref/syntax.texi'
--- doc/lispref/syntax.texi	2010-06-23 03:36:56 +0000
+++ doc/lispref/syntax.texi	2010-09-11 13:58:57 +0000
@@ -292,19 +292,21 @@
 @cindex syntax flags
 
   In addition to the classes, entries for characters in a syntax table
-can specify flags.  There are seven possible flags, represented by the
-characters @samp{1}, @samp{2}, @samp{3}, @samp{4}, @samp{b}, @samp{n},
-and @samp{p}.
+can specify flags.  There are eight possible flags, represented by the
+characters @samp{1}, @samp{2}, @samp{3}, @samp{4}, @samp{b}, @samp{c},
+@samp{n}, and @samp{p}.
 
-  All the flags except @samp{n} and @samp{p} are used to describe
-multi-character comment delimiters.  The digit flags indicate that a
-character can @emph{also} be part of a comment sequence, in addition to
-the syntactic properties associated with its character class.  The flags
-are independent of the class and each other for the sake of characters
-such as @samp{*} in C mode, which is a punctuation character, @emph{and}
-the second character of a start-of-comment sequence (@samp{/*}),
-@emph{and} the first character of an end-of-comment sequence
-(@samp{*/}).
+  All the flags except @samp{p} are used to describe comment
+delimiters.  The digit flags are used for comment delimiters made up
+of 2 characters.  They indicate that a character can @emph{also} be
+part of a comment sequence, in addition to the syntactic properties
+associated with its character class.  The flags are independent of the
+class and each other for the sake of characters such as @samp{*} in
+C mode, which is a punctuation character, @emph{and} the second
+character of a start-of-comment sequence (@samp{/*}), @emph{and} the
+first character of an end-of-comment sequence (@samp{*/}).  The flags
+@samp{b}, @samp{c}, and @samp{n} are used to qualify the corresponding
+comment delimiter.
 
   Here is a table of the possible flags for a character @var{c},
 and what they mean:
@@ -325,63 +327,62 @@
 @samp{4} means @var{c} is the second character of such a sequence.
 
 @item
-@c Emacs 19 feature
 @samp{b} means that @var{c} as a comment delimiter belongs to the
-alternative ``b'' comment style.
-
-Emacs supports two comment styles simultaneously in any one syntax
-table.  This is for the sake of C++.  Each style of comment syntax has
-its own comment-start sequence and its own comment-end sequence.  Each
-comment must stick to one style or the other; thus, if it starts with
-the comment-start sequence of style ``b,'' it must also end with the
-comment-end sequence of style ``b.''
-
-The two comment-start sequences must begin with the same character; only
-the second character may differ.  Mark the second character of the
-``b''-style comment-start sequence with the @samp{b} flag.
-
-A comment-end sequence (one or two characters) applies to the ``b''
-style if its first character has the @samp{b} flag set; otherwise, it
-applies to the ``a'' style.
-
-The appropriate comment syntax settings for C++ are as follows:
+alternative ``b'' comment style.  For a two-character comment starter,
+this flag is only significant on the second char, and for a 2-character
+comment ender it is only significant on the first char.
+
+@item
+@samp{c} means that @var{c} as a comment delimiter belongs to the
+alternative ``c'' comment style.  For a two-character comment
+delimiter, @samp{c} on either character makes it of style ``c''.
+
+@item
+@samp{n} on a comment delimiter character specifies
+that this kind of comment can be nested.  For a two-character
+comment delimiter, @samp{n} on either character makes it
+nestable.
+
+Emacs supports several comment styles simultaneously in any one syntax
+table.  A comment style is a set of flags @samp{b}, @samp{c}, and
+@samp{n}, so there can be up to 8 different comment styles.
+Each comment delimiter has a style and only matches comment delimiters
+of the same style.  Thus if a comment starts with the comment-start
+sequence of style ``bn'', it will extend until the next matching
+comment-end sequence of style ``bn''.
+
+The appropriate comment syntax settings for C++ can be as follows:
 
 @table @asis
 @item @samp{/}
-@samp{124b}
+@samp{124}
 @item @samp{*}
-@samp{23}
+@samp{23b}
 @item newline
-@samp{>b}
+@samp{>}
 @end table
 
 This defines four comment-delimiting sequences:
 
 @table @asis
 @item @samp{/*}
-This is a comment-start sequence for ``a'' style because the
-second character, @samp{*}, does not have the @samp{b} flag.
+This is a comment-start sequence for ``b'' style because the
+second character, @samp{*}, has the @samp{b} flag.
 
 @item @samp{//}
-This is a comment-start sequence for ``b'' style because the second
-character, @samp{/}, does have the @samp{b} flag.
+This is a comment-start sequence for ``a'' style because the second
+character, @samp{/}, does not have the @samp{b} flag.
 
 @item @samp{*/}
-This is a comment-end sequence for ``a'' style because the first
-character, @samp{*}, does not have the @samp{b} flag.
+This is a comment-end sequence for ``b'' style because the first
+character, @samp{*}, does have the @samp{b} flag.
 
 @item newline
-This is a comment-end sequence for ``b'' style, because the newline
-character has the @samp{b} flag.
+This is a comment-end sequence for ``a'' style, because the newline
+character does not have the @samp{b} flag.
 @end table
 
 @item
-@samp{n} on a comment delimiter character specifies
-that this kind of comment can be nested.  For a two-character
-comment delimiter, @samp{n} on either character makes it
-nestable.
-
-@item
 @c Emacs 19 feature
 @samp{p} identifies an additional ``prefix character'' for Lisp syntax.
 These characters are treated as whitespace when they appear between

=== modified file 'etc/NEWS'
--- etc/NEWS	2010-09-11 03:17:02 +0000
+++ etc/NEWS	2010-09-11 13:58:57 +0000
@@ -492,6 +492,7 @@
 
 ** New hook post-self-insert-hook run at the end of self-insert-command.
 
++++
 ** Syntax tables support a new "comment style c" additionally to style b.
 ** frame-local variables cannot be let-bound any more.
 ** prog-mode is a new major-mode meant to be the parent of programming mode.
------------------------------------------------------------
revno: 101410
committer: Michael Mauger <mmaug@yahoo.com>
branch nick: trunk
timestamp: Fri 2010-09-10 23:17:02 -0400
message:
  SQL Mode, Version 2.6
  
  	* progmodes/sql.el: Version 2.6
  	(sql-dialect): Synonym for "sql-product".
  	(sql-find-sqli-buffer, sql-set-sqli-buffer-generally)
  	(sql-set-sqli-buffer, sql-show-sqli-buffer, sql-interactive-mode):
  	Set "sql-buffer" to buffer name not buffer object so multiple sql
  	interactive buffers work properly.  Reverts misguided changes in
  	earlier work.
  	(sql-comint): Make sure different buffer name is used if "*SQL*"
  	buffer is for a different product.
  	(sql-make-alternate-buffer-name): Fix bug with "sql-database"
  	login param.
  	(sql-oracle, sql-sybase, sql-informix, sql-sqlite, sql-mysql)
  	(sql-solid, sql-ingres, sql-ms, sql-postgres, sql-interbase)
  	(sql-db2, sql-linter, sql-product-interactive, sql-rename-buffer):
  	Accept new buffer name or prompt for one.
  	(sql-port): Default to zero.
  	(sql-comint-mysql): Handle "sql-port" as a numeric.
  	(sql-port-history): Delete unused variable.
  	(sql-get-login): Default "sql-port" to a number.
  	(sql-product-alist): Correct Postgres prompt and terminator
  	regexp.
  	(sql-sqlite-program): Dynamically detect presence of "sqlite" or
  	"sqlite3" executables.
  	(sql-sqlite-login-params): Add "*.sqlite[23]?" database name
  	pattern.
  	(sql-buffer-live-p): New function.
  	(sql-mode-menu, sql-send-string): Use it.
  	(sql-mode-oracle-font-lock-keywords): Improve SQL*Plus REMARK
  	syntax pattern.
  	(sql-mode-postgres-font-lock-keywords): Support Postgres V9.
  	(sql-mode-sqlite-font-lock-keywords): Hilight sqlite commands.
diff:
=== modified file 'etc/NEWS'
--- etc/NEWS	2010-09-10 23:13:42 +0000
+++ etc/NEWS	2010-09-11 03:17:02 +0000
@@ -317,10 +317,24 @@
 variables `sql-product', `sql-user', `sql-server', `sql-database' and
 `sql-port' can now be safely used as local variables.
 
+*** `sql-dialect' is a synonym for `sql-product'.
+
 *** Added ability to login with a port on MySQL.
 The custom variable `sql-port' can be specified for connection to
 MySQL servers.
 
+*** Dynamic selection of product in an SQL interactive session.
+If you use `sql-product-interactive' to start an SQL interactive
+session it uses the current value of `sql-product'.  Preceding the
+invocation with C-u will force it to ask for the product before
+creating the session.
+
+*** Renaming a SQL interactive buffer when it is created.
+Prefixing the SQL interactive commands (`sql-sqlite', `sql-postgres',
+`sql-mysql', etc.) with C-u will force a new interactive session to be
+started and will prompt for the new name.  This will reduce the need
+for `sql-rename-buffer' is most common use cases.
+
 *** Command continuation prompts in SQL interactive mode are suppressed.
 Multiple line commands in SQL interactive mode, generate command
 continuation prompts which needlessly confuse the output.  These

=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-11 00:36:27 +0000
+++ lisp/ChangeLog	2010-09-11 03:17:02 +0000
@@ -1,3 +1,37 @@
+2010-09-11  Michael R. Mauger  <mmaug@yahoo.com>
+
+	* progmodes/sql.el: Version 2.6
+	(sql-dialect): Synonym for "sql-product".
+	(sql-find-sqli-buffer, sql-set-sqli-buffer-generally)
+	(sql-set-sqli-buffer, sql-show-sqli-buffer, sql-interactive-mode):
+	Set "sql-buffer" to buffer name not buffer object so multiple sql
+	interactive buffers work properly.  Reverts misguided changes in
+	earlier work.
+	(sql-comint): Make sure different buffer name is used if "*SQL*"
+	buffer is for a different product.
+	(sql-make-alternate-buffer-name): Fix bug with "sql-database"
+	login param.
+	(sql-oracle, sql-sybase, sql-informix, sql-sqlite, sql-mysql)
+	(sql-solid, sql-ingres, sql-ms, sql-postgres, sql-interbase)
+	(sql-db2, sql-linter, sql-product-interactive, sql-rename-buffer):
+	Accept new buffer name or prompt for one.
+	(sql-port): Default to zero.
+	(sql-comint-mysql): Handle "sql-port" as a numeric.
+	(sql-port-history): Delete unused variable.
+	(sql-get-login): Default "sql-port" to a number.
+	(sql-product-alist): Correct Postgres prompt and terminator
+	regexp.
+	(sql-sqlite-program): Dynamically detect presence of "sqlite" or
+	"sqlite3" executables.
+	(sql-sqlite-login-params): Add "*.sqlite[23]?" database name
+	pattern.
+	(sql-buffer-live-p): New function.
+	(sql-mode-menu, sql-send-string): Use it.
+	(sql-mode-oracle-font-lock-keywords): Improve SQL*Plus REMARK
+	syntax pattern.
+	(sql-mode-postgres-font-lock-keywords): Support Postgres V9.
+	(sql-mode-sqlite-font-lock-keywords): Hilight sqlite commands.
+
 2010-09-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* net/netrc.el (netrc-credentials): New conveniency function.

=== modified file 'lisp/progmodes/sql.el'
--- lisp/progmodes/sql.el	2010-08-10 23:04:32 +0000
+++ lisp/progmodes/sql.el	2010-09-11 03:17:02 +0000
@@ -5,7 +5,7 @@
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Michael Mauger <mmaug@yahoo.com>
-;; Version: 2.5
+;; Version: 2.6
 ;; Keywords: comm languages processes
 ;; URL: http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/progmodes/sql.el
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?SqlMode
@@ -187,10 +187,10 @@
 
 ;; 6) Define a convienence function to invoke the SQL interpreter.
 
-;;     (defun my-sql-xyz ()
+;;     (defun my-sql-xyz (&optional buffer)
 ;;       "Run ixyz by XyzDB as an inferior process."
-;;       (interactive)
-;;       (sql-product-interactive 'xyz))
+;;       (interactive "P")
+;;       (sql-product-interactive 'xyz buffer))
 
 ;;; To Do:
 
@@ -275,8 +275,8 @@
   :group 'SQL
   :safe 'stringp)
 
-(defcustom sql-port nil
-  "Default server or host."
+(defcustom sql-port 0
+  "Default port."
   :version "24.1"
   :type 'number
   :group 'SQL
@@ -430,9 +430,9 @@
      :sqli-comint-func sql-comint-postgres
      :prompt-regexp "^.*=[#>] "
      :prompt-length 5
-     :prompt-cont-regexp "^.*-[#>] "
+     :prompt-cont-regexp "^.*[-(][#>] "
      :input-filter sql-remove-tabs-filter
-     :terminator ("\\(^[\\]g\\|;\\)" . ";"))
+     :terminator ("\\(^\\s-*\\\\g\\|;\\)" . ";"))
 
     (solid
      :name "Solid"
@@ -551,7 +551,6 @@
 (defvar sql-indirect-features
   '(:font-lock :sqli-program :sqli-options :sqli-login))
 
-;;;###autoload
 (defcustom sql-connection-alist nil
   "An alist of connection parameters for interacting with a SQL
   product.
@@ -600,7 +599,6 @@
   :version "24.1"
   :group 'SQL)
 
-;;;###autoload
 (defcustom sql-product 'ansi
   "Select the SQL database product used so that buffers can be
 highlighted properly when you open them."
@@ -613,6 +611,7 @@
                     sql-product-alist))
   :group 'SQL
   :safe 'symbolp)
+(defvaralias 'sql-dialect 'sql-product)
 
 ;; misc customization of sql.el behaviour
 
@@ -788,7 +787,9 @@
 
 ;; Customization for SQLite
 
-(defcustom sql-sqlite-program "sqlite3"
+(defcustom sql-sqlite-program (or (executable-find "sqlite3")
+                                  (executable-find "sqlite")
+                                  "sqlite")
   "Command to start SQLite.
 
 Starts `sql-interactive-mode' after doing some setup."
@@ -801,7 +802,7 @@
   :version "20.8"
   :group 'SQL)
 
-(defcustom sql-sqlite-login-params '((database :file ".*\\.db"))
+(defcustom sql-sqlite-login-params '((database :file ".*\\.\\(db\\|sqlite[23]?\\)"))
   "List of login parameters needed to connect to SQLite."
   :type 'sql-login-params
   :version "24.1"
@@ -1022,9 +1023,6 @@
 (defvar sql-server-history nil
   "History of servers used.")
 
-(defvar sql-port-history nil
-  "History of ports used.")
-
 ;; Passwords are not kept in a history.
 
 (defvar sql-buffer nil
@@ -1054,6 +1052,12 @@
 
 Used by `sql-rename-buffer'.")
 
+(defun sql-buffer-live-p (buffer)
+  "Returns non-nil if the process associated with buffer is live."
+  (and buffer
+       (buffer-live-p (get-buffer buffer))
+       (get-buffer-process buffer)))
+
 ;; Keymap for sql-interactive-mode.
 
 (defvar sql-interactive-mode-map
@@ -1091,15 +1095,11 @@
  sql-mode-menu sql-mode-map
  "Menu for `sql-mode'."
  `("SQL"
-   ["Send Paragraph" sql-send-paragraph (and (buffer-live-p sql-buffer)
-					     (get-buffer-process sql-buffer))]
+   ["Send Paragraph" sql-send-paragraph (sql-buffer-live-p sql-buffer)]
    ["Send Region" sql-send-region (and mark-active
-				       (buffer-live-p sql-buffer)
-				       (get-buffer-process sql-buffer))]
-   ["Send Buffer" sql-send-buffer (and (buffer-live-p sql-buffer)
-				       (get-buffer-process sql-buffer))]
-   ["Send String" sql-send-string (and (buffer-live-p sql-buffer)
-				       (get-buffer-process sql-buffer))]
+				       (sql-buffer-live-p sql-buffer))]
+   ["Send Buffer" sql-send-buffer (sql-buffer-live-p sql-buffer)]
+   ["Send String" sql-send-string (sql-buffer-live-p sql-buffer)]
    "--"
    ["Start SQLi session" sql-product-interactive
     :visible (not sql-connection-alist)
@@ -1364,7 +1364,7 @@
      ;; Oracle SQL*Plus Commands
      (cons
       (concat
-       "^\\(?:\\(?:" (regexp-opt '(
+       "^\\s-*\\(?:\\(?:" (regexp-opt '(
 "@" "@@" "accept" "append" "archive" "attribute" "break"
 "btitle" "change" "clear" "column" "connect" "copy" "define"
 "del" "describe" "disconnect" "edit" "execute" "exit" "get" "help"
@@ -1403,7 +1403,7 @@
        "\\)\\b.*"
        )
       'font-lock-doc-face)
-     '("^[ \t]*rem\\(?:ark\\)?.*" . font-lock-comment-face)
+     '("^\\s-*rem\\(?:ark\\)?\\>.*" . font-lock-comment-face)
 
      ;; Oracle Functions
      (sql-font-lock-keywords-builder 'font-lock-builtin-face nil
@@ -1585,81 +1585,153 @@
 (defvar sql-mode-postgres-font-lock-keywords
   (eval-when-compile
     (list
-     ;; Postgres Functions
+     ;; Postgres psql commands
+     '("^\\s-*\\\\.*$" . font-lock-doc-face)
+
+     ;; Postgres unreserved words but may have meaning
+     (sql-font-lock-keywords-builder 'font-lock-builtin-face nil "a"
+"abs" "absent" "according" "ada" "alias" "allocate" "are" "array_agg"
+"asensitive" "atomic" "attribute" "attributes" "avg" "base64"
+"bernoulli" "bit_length" "bitvar" "blob" "blocked" "bom" "breadth" "c"
+"call" "cardinality" "catalog_name" "ceil" "ceiling" "char_length"
+"character_length" "character_set_catalog" "character_set_name"
+"character_set_schema" "characters" "checked" "class_origin" "clob"
+"cobol" "collation" "collation_catalog" "collation_name"
+"collation_schema" "collect" "column_name" "columns"
+"command_function" "command_function_code" "completion" "condition"
+"condition_number" "connect" "connection_name" "constraint_catalog"
+"constraint_name" "constraint_schema" "constructor" "contains"
+"control" "convert" "corr" "corresponding" "count" "covar_pop"
+"covar_samp" "cube" "cume_dist" "current_default_transform_group"
+"current_path" "current_transform_group_for_type" "cursor_name"
+"datalink" "datetime_interval_code" "datetime_interval_precision" "db"
+"defined" "degree" "dense_rank" "depth" "deref" "derived" "describe"
+"descriptor" "destroy" "destructor" "deterministic" "diagnostics"
+"disconnect" "dispatch" "dlnewcopy" "dlpreviouscopy" "dlurlcomplete"
+"dlurlcompleteonly" "dlurlcompletewrite" "dlurlpath" "dlurlpathonly"
+"dlurlpathwrite" "dlurlscheme" "dlurlserver" "dlvalue" "dynamic"
+"dynamic_function" "dynamic_function_code" "element" "empty"
+"end-exec" "equals" "every" "exception" "exec" "existing" "exp" "file"
+"filter" "final" "first_value" "flag" "floor" "fortran" "found" "free"
+"fs" "fusion" "g" "general" "generated" "get" "go" "goto" "grouping"
+"hex" "hierarchy" "host" "id" "ignore" "implementation" "import"
+"indent" "indicator" "infix" "initialize" "instance" "instantiable"
+"integrity" "intersection" "iterate" "k" "key_member" "key_type" "lag"
+"last_value" "lateral" "lead" "length" "less" "library" "like_regex"
+"link" "ln" "locator" "lower" "m" "map" "matched" "max"
+"max_cardinality" "member" "merge" "message_length"
+"message_octet_length" "message_text" "method" "min" "mod" "modifies"
+"modify" "module" "more" "multiset" "mumps" "namespace" "nclob"
+"nesting" "new" "nfc" "nfd" "nfkc" "nfkd" "nil" "normalize"
+"normalized" "nth_value" "ntile" "nullable" "number"
+"occurrences_regex" "octet_length" "octets" "old" "open" "operation"
+"ordering" "ordinality" "others" "output" "overriding" "p" "pad"
+"parameter" "parameter_mode" "parameter_name"
+"parameter_ordinal_position" "parameter_specific_catalog"
+"parameter_specific_name" "parameter_specific_schema" "parameters"
+"pascal" "passing" "passthrough" "percent_rank" "percentile_cont"
+"percentile_disc" "permission" "pli" "position_regex" "postfix"
+"power" "prefix" "preorder" "public" "rank" "reads" "recovery" "ref"
+"referencing" "regr_avgx" "regr_avgy" "regr_count" "regr_intercept"
+"regr_r2" "regr_slope" "regr_sxx" "regr_sxy" "regr_syy" "requiring"
+"respect" "restore" "result" "return" "returned_cardinality"
+"returned_length" "returned_octet_length" "returned_sqlstate" "rollup"
+"routine" "routine_catalog" "routine_name" "routine_schema"
+"row_count" "row_number" "scale" "schema_name" "scope" "scope_catalog"
+"scope_name" "scope_schema" "section" "selective" "self" "sensitive"
+"server_name" "sets" "size" "source" "space" "specific"
+"specific_name" "specifictype" "sql" "sqlcode" "sqlerror"
+"sqlexception" "sqlstate" "sqlwarning" "sqrt" "state" "static"
+"stddev_pop" "stddev_samp" "structure" "style" "subclass_origin"
+"sublist" "submultiset" "substring_regex" "sum" "system_user" "t"
+"table_name" "tablesample" "terminate" "than" "ties" "timezone_hour"
+"timezone_minute" "token" "top_level_count" "transaction_active"
+"transactions_committed" "transactions_rolled_back" "transform"
+"transforms" "translate" "translate_regex" "translation"
+"trigger_catalog" "trigger_name" "trigger_schema" "trim_array"
+"uescape" "under" "unlink" "unnamed" "unnest" "untyped" "upper" "uri"
+"usage" "user_defined_type_catalog" "user_defined_type_code"
+"user_defined_type_name" "user_defined_type_schema" "var_pop"
+"var_samp" "varbinary" "variable" "whenever" "width_bucket" "within"
+"xmlagg" "xmlbinary" "xmlcast" "xmlcomment" "xmldeclaration"
+"xmldocument" "xmlexists" "xmliterate" "xmlnamespaces" "xmlquery"
+"xmlschema" "xmltable" "xmltext" "xmlvalidate"
+)
+
+     ;; Postgres non-reserved words
      (sql-font-lock-keywords-builder 'font-lock-builtin-face nil
-"abbrev" "abs" "acos" "age" "area" "ascii" "asin" "atab2" "atan"
-"atan2" "avg" "bit_length" "both" "broadcast" "btrim" "cbrt" "ceil"
-"center" "char_length" "chr" "coalesce" "col_description" "convert"
-"cos" "cot" "count" "current_database" "current_date" "current_schema"
-"current_schemas" "current_setting" "current_time" "current_timestamp"
-"current_user" "currval" "date_part" "date_trunc" "decode" "degrees"
-"diameter" "encode" "exp" "extract" "floor" "get_bit" "get_byte"
-"has_database_privilege" "has_function_privilege"
-"has_language_privilege" "has_schema_privilege" "has_table_privilege"
-"height" "host" "initcap" "isclosed" "isfinite" "isopen" "leading"
-"length" "ln" "localtime" "localtimestamp" "log" "lower" "lpad"
-"ltrim" "masklen" "max" "min" "mod" "netmask" "network" "nextval"
-"now" "npoints" "nullif" "obj_description" "octet_length" "overlay"
-"pclose" "pg_client_encoding" "pg_function_is_visible"
-"pg_get_constraintdef" "pg_get_indexdef" "pg_get_ruledef"
-"pg_get_userbyid" "pg_get_viewdef" "pg_opclass_is_visible"
-"pg_operator_is_visible" "pg_table_is_visible" "pg_type_is_visible"
-"pi" "popen" "position" "pow" "quote_ident" "quote_literal" "radians"
-"radius" "random" "repeat" "replace" "round" "rpad" "rtrim"
-"session_user" "set_bit" "set_byte" "set_config" "set_masklen"
-"setval" "sign" "sin" "split_part" "sqrt" "stddev" "strpos" "substr"
-"substring" "sum" "tan" "timeofday" "to_ascii" "to_char" "to_date"
-"to_hex" "to_number" "to_timestamp" "trailing" "translate" "trim"
-"trunc" "upper" "variance" "version" "width"
+"abort" "absolute" "access" "action" "add" "admin" "after" "aggregate"
+"also" "alter" "always" "assertion" "assignment" "at" "backward"
+"before" "begin" "between" "by" "cache" "called" "cascade" "cascaded"
+"catalog" "chain" "characteristics" "checkpoint" "class" "close"
+"cluster" "coalesce" "comment" "comments" "commit" "committed"
+"configuration" "connection" "constraints" "content" "continue"
+"conversion" "copy" "cost" "createdb" "createrole" "createuser" "csv"
+"current" "cursor" "cycle" "data" "database" "day" "deallocate" "dec"
+"declare" "defaults" "deferred" "definer" "delete" "delimiter"
+"delimiters" "dictionary" "disable" "discard" "document" "domain"
+"drop" "each" "enable" "encoding" "encrypted" "enum" "escape"
+"exclude" "excluding" "exclusive" "execute" "exists" "explain"
+"external" "extract" "family" "first" "float" "following" "force"
+"forward" "function" "functions" "global" "granted" "greatest"
+"handler" "header" "hold" "hour" "identity" "if" "immediate"
+"immutable" "implicit" "including" "increment" "index" "indexes"
+"inherit" "inherits" "inline" "inout" "input" "insensitive" "insert"
+"instead" "invoker" "isolation" "key" "language" "large" "last"
+"lc_collate" "lc_ctype" "least" "level" "listen" "load" "local"
+"location" "lock" "login" "mapping" "match" "maxvalue" "minute"
+"minvalue" "mode" "month" "move" "name" "names" "national" "nchar"
+"next" "no" "nocreatedb" "nocreaterole" "nocreateuser" "noinherit"
+"nologin" "none" "nosuperuser" "nothing" "notify" "nowait" "nullif"
+"nulls" "object" "of" "oids" "operator" "option" "options" "out"
+"overlay" "owned" "owner" "parser" "partial" "partition" "password"
+"plans" "position" "preceding" "prepare" "prepared" "preserve" "prior"
+"privileges" "procedural" "procedure" "quote" "range" "read"
+"reassign" "recheck" "recursive" "reindex" "relative" "release"
+"rename" "repeatable" "replace" "replica" "reset" "restart" "restrict"
+"returns" "revoke" "role" "rollback" "row" "rows" "rule" "savepoint"
+"schema" "scroll" "search" "second" "security" "sequence" "sequences"
+"serializable" "server" "session" "set" "setof" "share" "show"
+"simple" "stable" "standalone" "start" "statement" "statistics"
+"stdin" "stdout" "storage" "strict" "strip" "substring" "superuser"
+"sysid" "system" "tables" "tablespace" "temp" "template" "temporary"
+"transaction" "treat" "trigger" "trim" "truncate" "trusted" "type"
+"unbounded" "uncommitted" "unencrypted" "unknown" "unlisten" "until"
+"update" "vacuum" "valid" "validator" "value" "values" "version"
+"view" "volatile" "whitespace" "work" "wrapper" "write"
+"xmlattributes" "xmlconcat" "xmlelement" "xmlforest" "xmlparse"
+"xmlpi" "xmlroot" "xmlserialize" "year" "yes"
 )
+
      ;; Postgres Reserved
      (sql-font-lock-keywords-builder 'font-lock-keyword-face nil
-"abort" "access" "add" "after" "aggregate" "alignment" "all" "alter"
-"analyze" "and" "any" "as" "asc" "assignment" "authorization"
-"backward" "basetype" "before" "begin" "between" "binary" "by" "cache"
-"called" "cascade" "case" "cast" "characteristics" "check"
-"checkpoint" "class" "close" "cluster" "column" "comment" "commit"
-"committed" "commutator" "constraint" "constraints" "conversion"
-"copy" "create" "createdb" "createuser" "cursor" "cycle" "database"
-"deallocate" "declare" "default" "deferrable" "deferred" "definer"
-"delete" "delimiter" "desc" "distinct" "do" "domain" "drop" "each"
-"element" "else" "encoding" "encrypted" "end" "escape" "except"
-"exclusive" "execute" "exists" "explain" "extended" "external" "false"
-"fetch" "finalfunc" "for" "force" "foreign" "forward" "freeze" "from"
-"full" "function" "grant" "group" "gtcmp" "handler" "hashes" "having"
-"immediate" "immutable" "implicit" "in" "increment" "index" "inherits"
-"initcond" "initially" "input" "insensitive" "insert" "instead"
-"internallength" "intersect" "into" "invoker" "is" "isnull"
-"isolation" "join" "key" "language" "leftarg" "level" "like" "limit"
-"listen" "load" "local" "location" "lock" "ltcmp" "main" "match"
-"maxvalue" "merges" "minvalue" "mode" "move" "natural" "negator"
-"next" "nocreatedb" "nocreateuser" "none" "not" "nothing" "notify"
-"notnull" "null" "of" "offset" "oids" "on" "only" "operator" "or"
-"order" "output" "owner" "partial" "passedbyvalue" "password" "plain"
-"prepare" "primary" "prior" "privileges" "procedural" "procedure"
-"public" "read" "recheck" "references" "reindex" "relative" "rename"
-"reset" "restrict" "returns" "revoke" "rightarg" "rollback" "row"
-"rule" "schema" "scroll" "security" "select" "sequence" "serializable"
-"session" "set" "sfunc" "share" "show" "similar" "some" "sort1"
-"sort2" "stable" "start" "statement" "statistics" "storage" "strict"
-"stype" "sysid" "table" "temp" "template" "temporary" "then" "to"
-"transaction" "trigger" "true" "truncate" "trusted" "type"
-"unencrypted" "union" "unique" "unknown" "unlisten" "until" "update"
-"usage" "user" "using" "vacuum" "valid" "validator" "values"
-"variable" "verbose" "view" "volatile" "when" "where" "with" "without"
-"work"
+"all" "analyse" "analyze" "and" "any" "array" "asc" "as" "asymmetric"
+"authorization" "binary" "both" "case" "cast" "check" "collate"
+"column" "concurrently" "constraint" "create" "cross"
+"current_catalog" "current_date" "current_role" "current_schema"
+"current_time" "current_timestamp" "current_user" "default"
+"deferrable" "desc" "distinct" "do" "else" "end" "except" "false"
+"fetch" "foreign" "for" "freeze" "from" "full" "grant" "group"
+"having" "ilike" "initially" "inner" "in" "intersect" "into" "isnull"
+"is" "join" "leading" "left" "like" "limit" "localtime"
+"localtimestamp" "natural" "notnull" "not" "null" "off" "offset"
+"only" "on" "order" "or" "outer" "overlaps" "over" "placing" "primary"
+"references" "returning" "right" "select" "session_user" "similar"
+"some" "symmetric" "table" "then" "to" "trailing" "true" "union"
+"unique" "user" "using" "variadic" "verbose" "when" "where" "window"
+"with"
 )
 
      ;; Postgres Data Types
      (sql-font-lock-keywords-builder 'font-lock-type-face nil
-"anyarray" "bigint" "bigserial" "bit" "boolean" "box" "bytea" "char"
-"character" "cidr" "circle" "cstring" "date" "decimal" "double"
-"float4" "float8" "inet" "int2" "int4" "int8" "integer" "internal"
-"interval" "language_handler" "line" "lseg" "macaddr" "money"
-"numeric" "oid" "opaque" "path" "point" "polygon" "precision" "real"
-"record" "regclass" "regoper" "regoperator" "regproc" "regprocedure"
-"regtype" "serial" "serial4" "serial8" "smallint" "text" "time"
-"timestamp" "varchar" "varying" "void" "zone"
+"bigint" "bigserial" "bit" "bool" "boolean" "box" "bytea" "char"
+"character" "cidr" "circle" "date" "decimal" "double" "float4"
+"float8" "inet" "int" "int2" "int4" "int8" "integer" "interval" "line"
+"lseg" "macaddr" "money" "numeric" "path" "point" "polygon"
+"precision" "real" "serial" "serial4" "serial8" "smallint" "text"
+"time" "timestamp" "timestamptz" "timetz" "tsquery" "tsvector"
+"txid_snapshot" "uuid" "varbit" "varchar" "varying" "without"
+"xml" "zone"
 )))
 
   "Postgres SQL keywords used by font-lock.
@@ -1979,6 +2051,9 @@
 (defvar sql-mode-sqlite-font-lock-keywords
   (eval-when-compile
     (list
+     ;; SQLite commands
+     '("^[.].*$" . font-lock-doc-face)
+
      ;; SQLite Keyword
      (sql-font-lock-keywords-builder 'font-lock-keyword-face nil
 "abort" "action" "add" "after" "all" "alter" "analyze" "and" "as"
@@ -2493,16 +2568,18 @@
 
           ((eq token 'port)		; port
            (setq sql-port
-                 (read-number "Port: " sql-port))))))
-       what))
+                 (read-number "Port: " (if (numberp sql-port)
+                                           sql-port
+                                         0)))))))
+     what))
 
 (defun sql-find-sqli-buffer ()
-  "Returns the current default SQLi buffer or nil.
-In order to qualify, the SQLi buffer must be alive,
-be in `sql-interactive-mode' and have a process."
-  (let ((default-buffer (default-value 'sql-buffer)))
-    (if (and (buffer-live-p default-buffer)
-	     (get-buffer-process default-buffer))
+  "Returns the name of the current default SQLi buffer or nil.
+In order to qualify, the SQLi buffer must be alive, be in
+`sql-interactive-mode' and have a process."
+  (let ((default-buffer (default-value 'sql-buffer))
+        (current-product sql-product))
+    (if (sql-buffer-live-p default-buffer)
 	default-buffer
       (save-current-buffer
 	(let ((buflist (buffer-list))
@@ -2511,9 +2588,10 @@
 			  found))
 	    (let ((candidate (car buflist)))
 	      (set-buffer candidate)
-	      (if (and (derived-mode-p 'sql-interactive-mode)
-		       (get-buffer-process candidate))
-		  (setq found candidate))
+	      (if (and (sql-buffer-live-p candidate)
+                       (derived-mode-p 'sql-interactive-mode)
+                       (eq sql-product current-product))
+		  (setq found (buffer-name candidate)))
 	      (setq buflist (cdr buflist))))
 	  found)))))
 
@@ -2527,15 +2605,15 @@
   (interactive)
   (save-excursion
     (let ((buflist (buffer-list))
-	  (default-sqli-buffer (sql-find-sqli-buffer)))
-      (setq-default sql-buffer default-sqli-buffer)
+	  (default-buffer (sql-find-sqli-buffer)))
+      (setq-default sql-buffer default-buffer)
       (while (not (null buflist))
 	(let ((candidate (car buflist)))
 	  (set-buffer candidate)
 	  (if (and (derived-mode-p 'sql-mode)
 		   (not (buffer-live-p sql-buffer)))
 	      (progn
-		(setq sql-buffer default-sqli-buffer)
+		(setq sql-buffer default-buffer)
 		(run-hooks 'sql-set-sqli-hook))))
 	(setq buflist (cdr buflist))))))
 
@@ -2561,11 +2639,11 @@
       (if (null (get-buffer-process new-buffer))
 	  (error "Buffer %s has no process" (buffer-name new-buffer)))
       (if (null (with-current-buffer new-buffer
-		  (equal major-mode 'sql-interactive-mode)))
+		  (derived-mode-p 'sql-interactive-mode)))
 	  (error "Buffer %s is no SQLi buffer" (buffer-name new-buffer)))
       (if new-buffer
 	  (progn
-	    (setq sql-buffer new-buffer)
+	    (setq sql-buffer (buffer-name new-buffer))
 	    (run-hooks 'sql-set-sqli-hook))))))
 
 (defun sql-show-sqli-buffer ()
@@ -2574,11 +2652,11 @@
 This is the buffer SQL strings are sent to.  It is stored in the
 variable `sql-buffer'.  See `sql-help' on how to create such a buffer."
   (interactive)
-  (if (null (buffer-live-p sql-buffer))
+  (if (null (buffer-live-p (get-buffer sql-buffer)))
       (message "%s has no SQLi buffer set." (buffer-name (current-buffer)))
     (if (null (get-buffer-process sql-buffer))
-	(message "Buffer %s has no process." (buffer-name sql-buffer))
-      (message "Current SQLi buffer is %s." (buffer-name sql-buffer)))))
+	(message "Buffer %s has no process." sql-buffer)
+      (message "Current SQLi buffer is %s." sql-buffer))))
 
 (defun sql-make-alternate-buffer-name ()
   "Return a string that can be used to rename a SQLi buffer.
@@ -2610,8 +2688,9 @@
                               (unless (string= "" sql-user)
                                 (list "/" sql-user)))
                              ((eq token 'port)
-                              (unless (= 0 sql-port)
-                                (list ":" sql-port)))
+                              (unless (or (not (numberp sql-port))
+                                          (= 0 sql-port))
+                                (list ":" (number-to-string sql-port))))
                              ((eq token 'server)
                               (unless (string= "" sql-server)
                                 (list "."
@@ -2619,7 +2698,7 @@
                                           (file-name-nondirectory sql-server)
                                         sql-server))))
                              ((eq token 'database)
-                              (when (string= "" sql-database)
+                              (unless (string= "" sql-database)
                                 (list "@"
                                       (if (eq type :file)
                                          (file-name-nondirectory sql-database)
@@ -2649,10 +2728,32 @@
         ;; Use the name we've got
         name))))
 
-(defun sql-rename-buffer ()
-  "Rename a SQLi buffer."
-  (interactive)
-  (rename-buffer (format "*SQL: %s*" sql-alternate-buffer-name) t))
+(defun sql-rename-buffer (&optional new-name)
+  "Rename a SQL interactive buffer.
+
+Prompts for the new name if command is preceeded by
+\\[universal-argument].  If no buffer name is provided, then the
+`sql-alternate-buffer-name' is used.
+
+The actual buffer name set will be \"*SQL: NEW-NAME*\".  If
+NEW-NAME is empty, then the buffer name will be \"*SQL*\"."
+  (interactive "P")
+
+  (if (not (derived-mode-p 'sql-interactive-mode))
+      (message "Current buffer is not a SQL interactive buffer")
+
+    (cond
+     ((stringp new-name)
+      (setq sql-alternate-buffer-name new-name))
+     ((listp new-name)
+      (setq sql-alternate-buffer-name
+            (read-string "Buffer name (\"*SQL: XXX*\"; enter `XXX'): "
+                         sql-alternate-buffer-name))))
+
+    (rename-buffer (if (string= "" sql-alternate-buffer-name)
+                       "*SQL*"
+                     (format "*SQL: %s*" sql-alternate-buffer-name))
+                   t)))
 
 (defun sql-copy-column ()
   "Copy current column to the end of buffer.
@@ -2801,7 +2902,7 @@
 
   (let ((comint-input-sender-no-newline nil)
         (s (replace-regexp-in-string "[[:space:]\n\r]+\\'" "" str)))
-    (if (buffer-live-p sql-buffer)
+    (if (sql-buffer-live-p sql-buffer)
 	(progn
 	  ;; Ignore the hoping around...
 	  (save-excursion
@@ -2814,7 +2915,7 @@
 	      (if sql-send-terminator
 		  (sql-send-magic-terminator sql-buffer s sql-send-terminator))
 
-	      (message "Sent string to buffer %s." (buffer-name sql-buffer))))
+	      (message "Sent string to buffer %s." sql-buffer)))
 
 	  ;; Display the sql buffer
 	  (if sql-pop-to-buffer-after-send-region
@@ -3063,7 +3164,7 @@
   (setq local-abbrev-table sql-mode-abbrev-table)
   (setq abbrev-all-caps 1)
   ;; Exiting the process will call sql-stop.
-  (set-process-sentinel (get-buffer-process sql-buffer) 'sql-stop)
+  (set-process-sentinel (get-buffer-process (current-buffer)) 'sql-stop)
   ;; Save the connection name
   (make-local-variable 'sql-connection)
   ;; Create a usefull name for renaming this buffer later.
@@ -3248,49 +3349,60 @@
 ;;; Entry functions for different SQL interpreters.
 
 ;;;###autoload
-(defun sql-product-interactive (&optional product)
+(defun sql-product-interactive (&optional product new-name)
   "Run PRODUCT interpreter as an inferior process.
 
 If buffer `*SQL*' exists but no process is running, make a new process.
 If buffer exists and a process is running, just switch to buffer `*SQL*'.
 
+To specify the SQL product, prefix the call with
+\\[universal-argument].  To set the buffer name as well, prefix
+the call to \\[sql-product-interactive] with
+\\[universal-argument] \\[universal-argument].
+
 \(Type \\[describe-mode] in the SQL buffer for a list of commands.)"
   (interactive "P")
 
+  ;; Handle universal arguments if specified
+  (when (not (or executing-kbd-macro noninteractive))
+    (when (and (listp product)
+               (not (cdr product))
+               (numberp (car product)))
+      (when (>= (car product) 16)
+        (when (not new-name)
+          (setq new-name '(4)))
+        (setq product '(4)))))
+
+  ;; Get the value of product that we need
   (setq product
         (cond
-         ((equal product '(4))          ; Universal arg, prompt for product
+         ((equal product '(4))          ; C-u, prompt for product
           (intern (completing-read "SQL product: "
                                    (mapcar (lambda (info) (symbol-name (car info)))
                                            sql-product-alist)
                                    nil 'require-match
-                                   (or (and sql-product (symbol-name sql-product)) "ansi"))))
+                                   (or (and sql-product
+                                            (symbol-name sql-product))
+                                       "ansi"))))
          ((and product                  ; Product specified
                (symbolp product)) product)
          (t sql-product)))              ; Default to sql-product
 
+  ;; If we have a product and it has a interactive mode
   (if product
       (when (sql-get-product-feature product :sqli-comint-func)
-        (if (and sql-buffer
-                 (buffer-live-p sql-buffer)
-                 (comint-check-proc sql-buffer))
+        ;; If no new name specified, fall back on sql-buffer if its for
+        ;; the same product
+        (if (and (not new-name)
+                 sql-buffer
+                 (sql-buffer-live-p sql-buffer)
+                 (comint-check-proc sql-buffer)
+                 (eq product (with-current-buffer sql-buffer sql-product)))
             (pop-to-buffer sql-buffer)
 
-          ;; Is the current buffer in sql-mode and
-          ;; there is a buffer local setting of sql-buffer
-          (let* ((start-buffer
-                  (and (derived-mode-p 'sql-mode)
-                       (current-buffer)))
-                 (start-sql-buffer
-                  (and start-buffer
-                       (let (found)
-                         (dolist (var (buffer-local-variables))
-                           (and (consp var)
-                                (eq (car var) 'sql-buffer)
-                                (buffer-live-p (cdr var))
-                                (get-buffer-process (cdr var))
-                                (setq found (cdr var))))
-                         found)))
+          ;; We have a new name or sql-buffer doesn't exist or match
+          ;; Start by remembering where we start
+          (let* ((start-buffer (current-buffer))
                  new-sqli-buffer)
 
             ;; Get credentials.
@@ -3303,15 +3415,18 @@
                      (sql-get-product-feature product :sqli-options))
 
             ;; Set SQLi mode.
-            (setq sql-interactive-product product
-                  new-sqli-buffer (current-buffer)
-                  sql-buffer new-sqli-buffer)
-            (sql-interactive-mode)
+            (setq new-sqli-buffer (current-buffer))
+            (let ((sql-interactive-product product))
+              (sql-interactive-mode))
+
+            ;; Set the new buffer name
+            (when new-name
+              (sql-rename-buffer new-name))
 
             ;; Set `sql-buffer' in the start buffer
-            (when (and start-buffer (not start-sql-buffer))
-              (with-current-buffer start-buffer
-                (setq sql-buffer new-sqli-buffer)))
+            (setq sql-buffer (buffer-name new-sqli-buffer))
+            (with-current-buffer start-buffer
+              (setq sql-buffer (buffer-name new-sqli-buffer)))
 
             ;; All done.
             (message "Login...done")
@@ -3323,12 +3438,22 @@
 
 PRODUCT is the SQL product.  PARAMS is a list of strings which are
 passed as command line arguments."
-  (let ((program (sql-get-product-feature product :sqli-program)))
+  (let ((program (sql-get-product-feature product :sqli-program))
+        (buf-name "SQL"))
+    ;; Make sure buffer name is unique
+    (when (get-buffer (format "*%s*" buf-name))
+      (setq buf-name (format "SQL-%s" product))
+      (when (get-buffer (format "*%s*" buf-name))
+        (let ((i 1))
+          (while (get-buffer (format "*%s*"
+                                     (setq buf-name
+                                           (format "SQL-%s%d" product i))))
+            (setq i (1+ i))))))
     (set-buffer
-     (apply 'make-comint "SQL" program nil params))))
+     (apply 'make-comint buf-name program nil params))))
 
 ;;;###autoload
-(defun sql-oracle ()
+(defun sql-oracle (&optional buffer)
   "Run sqlplus by Oracle as an inferior process.
 
 If buffer `*SQL*' exists but no process is running, make a new process.
@@ -3343,6 +3468,11 @@
 The buffer is put in SQL interactive mode, giving commands for sending
 input.  See `sql-interactive-mode'.
 
+To set the buffer name directly, use \\[universal-argument]
+before \\[sql-oracle].  Once session has started,
+\\[sql-rename-buffer] can be called separately to rename the
+buffer.
+
 To specify a coding system for converting non-ASCII characters
 in the input and output to the process, use \\[universal-coding-system-argument]
 before \\[sql-oracle].  You can also specify this with \\[set-buffer-process-coding-system]
@@ -3351,8 +3481,8 @@
 `default-process-coding-system'.
 
 \(Type \\[describe-mode] in the SQL buffer for a list of commands.)"
-  (interactive)
-  (sql-product-interactive 'oracle))
+  (interactive "P")
+  (sql-product-interactive 'oracle buffer))
 
 (defun sql-comint-oracle (product options)
   "Create comint buffer and connect to Oracle."
@@ -3375,7 +3505,7 @@
 
 
 ;;;###autoload
-(defun sql-sybase ()
+(defun sql-sybase (&optional buffer)
   "Run isql by Sybase as an inferior process.
 
 If buffer `*SQL*' exists but no process is running, make a new process.
@@ -3390,6 +3520,11 @@
 The buffer is put in SQL interactive mode, giving commands for sending
 input.  See `sql-interactive-mode'.
 
+To set the buffer name directly, use \\[universal-argument]
+before \\[sql-sybase].  Once session has started,
+\\[sql-rename-buffer] can be called separately to rename the
+buffer.
+
 To specify a coding system for converting non-ASCII characters
 in the input and output to the process, use \\[universal-coding-system-argument]
 before \\[sql-sybase].  You can also specify this with \\[set-buffer-process-coding-system]
@@ -3398,8 +3533,8 @@
 `default-process-coding-system'.
 
 \(Type \\[describe-mode] in the SQL buffer for a list of commands.)"
-  (interactive)
-  (sql-product-interactive 'sybase))
+  (interactive "P")
+  (sql-product-interactive 'sybase buffer))
 
 (defun sql-comint-sybase (product options)
   "Create comint buffer and connect to Sybase."
@@ -3419,7 +3554,7 @@
 
 
 ;;;###autoload
-(defun sql-informix ()
+(defun sql-informix (&optional buffer)
   "Run dbaccess by Informix as an inferior process.
 
 If buffer `*SQL*' exists but no process is running, make a new process.
@@ -3432,6 +3567,11 @@
 The buffer is put in SQL interactive mode, giving commands for sending
 input.  See `sql-interactive-mode'.
 
+To set the buffer name directly, use \\[universal-argument]
+before \\[sql-informix].  Once session has started,
+\\[sql-rename-buffer] can be called separately to rename the
+buffer.
+
 To specify a coding system for converting non-ASCII characters
 in the input and output to the process, use \\[universal-coding-system-argument]
 before \\[sql-informix].  You can also specify this with \\[set-buffer-process-coding-system]
@@ -3440,8 +3580,8 @@
 `default-process-coding-system'.
 
 \(Type \\[describe-mode] in the SQL buffer for a list of commands.)"
-  (interactive)
-  (sql-product-interactive 'informix))
+  (interactive "P")
+  (sql-product-interactive 'informix buffer))
 
 (defun sql-comint-informix (product options)
   "Create comint buffer and connect to Informix."
@@ -3456,7 +3596,7 @@
 
 
 ;;;###autoload
-(defun sql-sqlite ()
+(defun sql-sqlite (&optional buffer)
   "Run sqlite as an inferior process.
 
 SQLite is free software.
@@ -3473,6 +3613,11 @@
 The buffer is put in SQL interactive mode, giving commands for sending
 input.  See `sql-interactive-mode'.
 
+To set the buffer name directly, use \\[universal-argument]
+before \\[sql-sqlite].  Once session has started,
+\\[sql-rename-buffer] can be called separately to rename the
+buffer.
+
 To specify a coding system for converting non-ASCII characters
 in the input and output to the process, use \\[universal-coding-system-argument]
 before \\[sql-sqlite].  You can also specify this with \\[set-buffer-process-coding-system]
@@ -3481,8 +3626,8 @@
 `default-process-coding-system'.
 
 \(Type \\[describe-mode] in the SQL buffer for a list of commands.)"
-  (interactive)
-  (sql-product-interactive 'sqlite))
+  (interactive "P")
+  (sql-product-interactive 'sqlite buffer))
 
 (defun sql-comint-sqlite (product options)
   "Create comint buffer and connect to SQLite."
@@ -3498,7 +3643,7 @@
 
 
 ;;;###autoload
-(defun sql-mysql ()
+(defun sql-mysql (&optional buffer)
   "Run mysql by TcX as an inferior process.
 
 Mysql versions 3.23 and up are free software.
@@ -3515,6 +3660,11 @@
 The buffer is put in SQL interactive mode, giving commands for sending
 input.  See `sql-interactive-mode'.
 
+To set the buffer name directly, use \\[universal-argument]
+before \\[sql-mysql].  Once session has started,
+\\[sql-rename-buffer] can be called separately to rename the
+buffer.
+
 To specify a coding system for converting non-ASCII characters
 in the input and output to the process, use \\[universal-coding-system-argument]
 before \\[sql-mysql].  You can also specify this with \\[set-buffer-process-coding-system]
@@ -3523,8 +3673,8 @@
 `default-process-coding-system'.
 
 \(Type \\[describe-mode] in the SQL buffer for a list of commands.)"
-  (interactive)
-  (sql-product-interactive 'mysql))
+  (interactive "P")
+  (sql-product-interactive 'mysql buffer))
 
 (defun sql-comint-mysql (product options)
   "Create comint buffer and connect to MySQL."
@@ -3535,7 +3685,7 @@
 	(setq params (append (list sql-database) params)))
     (if (not (string= "" sql-server))
 	(setq params (append (list (concat "--host=" sql-server)) params)))
-    (if (and sql-port (numberp sql-port))
+    (if (not (= 0 sql-port))
 	(setq params (append (list (concat "--port=" (number-to-string sql-port))) params)))
     (if (not (string= "" sql-password))
 	(setq params (append (list (concat "--password=" sql-password)) params)))
@@ -3547,7 +3697,7 @@
 
 
 ;;;###autoload
-(defun sql-solid ()
+(defun sql-solid (&optional buffer)
   "Run solsql by Solid as an inferior process.
 
 If buffer `*SQL*' exists but no process is running, make a new process.
@@ -3561,6 +3711,11 @@
 The buffer is put in SQL interactive mode, giving commands for sending
 input.  See `sql-interactive-mode'.
 
+To set the buffer name directly, use \\[universal-argument]
+before \\[sql-solid].  Once session has started,
+\\[sql-rename-buffer] can be called separately to rename the
+buffer.
+
 To specify a coding system for converting non-ASCII characters
 in the input and output to the process, use \\[universal-coding-system-argument]
 before \\[sql-solid].  You can also specify this with \\[set-buffer-process-coding-system]
@@ -3569,8 +3724,8 @@
 `default-process-coding-system'.
 
 \(Type \\[describe-mode] in the SQL buffer for a list of commands.)"
-  (interactive)
-  (sql-product-interactive 'solid))
+  (interactive "P")
+  (sql-product-interactive 'solid buffer))
 
 (defun sql-comint-solid (product options)
   "Create comint buffer and connect to Solid."
@@ -3588,7 +3743,7 @@
 
 
 ;;;###autoload
-(defun sql-ingres ()
+(defun sql-ingres (&optional buffer)
   "Run sql by Ingres as an inferior process.
 
 If buffer `*SQL*' exists but no process is running, make a new process.
@@ -3601,6 +3756,11 @@
 The buffer is put in SQL interactive mode, giving commands for sending
 input.  See `sql-interactive-mode'.
 
+To set the buffer name directly, use \\[universal-argument]
+before \\[sql-ingres].  Once session has started,
+\\[sql-rename-buffer] can be called separately to rename the
+buffer.
+
 To specify a coding system for converting non-ASCII characters
 in the input and output to the process, use \\[universal-coding-system-argument]
 before \\[sql-ingres].  You can also specify this with \\[set-buffer-process-coding-system]
@@ -3609,8 +3769,8 @@
 `default-process-coding-system'.
 
 \(Type \\[describe-mode] in the SQL buffer for a list of commands.)"
-  (interactive)
-  (sql-product-interactive 'ingres))
+  (interactive "P")
+  (sql-product-interactive 'ingres buffer))
 
 (defun sql-comint-ingres (product options)
   "Create comint buffer and connect to Ingres."
@@ -3624,7 +3784,7 @@
 
 
 ;;;###autoload
-(defun sql-ms ()
+(defun sql-ms (&optional buffer)
   "Run osql by Microsoft as an inferior process.
 
 If buffer `*SQL*' exists but no process is running, make a new process.
@@ -3639,6 +3799,11 @@
 The buffer is put in SQL interactive mode, giving commands for sending
 input.  See `sql-interactive-mode'.
 
+To set the buffer name directly, use \\[universal-argument]
+before \\[sql-ms].  Once session has started,
+\\[sql-rename-buffer] can be called separately to rename the
+buffer.
+
 To specify a coding system for converting non-ASCII characters
 in the input and output to the process, use \\[universal-coding-system-argument]
 before \\[sql-ms].  You can also specify this with \\[set-buffer-process-coding-system]
@@ -3647,8 +3812,8 @@
 `default-process-coding-system'.
 
 \(Type \\[describe-mode] in the SQL buffer for a list of commands.)"
-  (interactive)
-  (sql-product-interactive 'ms))
+  (interactive "P")
+  (sql-product-interactive 'ms buffer))
 
 (defun sql-comint-ms (product options)
   "Create comint buffer and connect to Microsoft SQL Server."
@@ -3675,7 +3840,7 @@
 
 
 ;;;###autoload
-(defun sql-postgres ()
+(defun sql-postgres (&optional buffer)
   "Run psql by Postgres as an inferior process.
 
 If buffer `*SQL*' exists but no process is running, make a new process.
@@ -3690,6 +3855,11 @@
 The buffer is put in SQL interactive mode, giving commands for sending
 input.  See `sql-interactive-mode'.
 
+To set the buffer name directly, use \\[universal-argument]
+before \\[sql-postgres].  Once session has started,
+\\[sql-rename-buffer] can be called separately to rename the
+buffer.
+
 To specify a coding system for converting non-ASCII characters
 in the input and output to the process, use \\[universal-coding-system-argument]
 before \\[sql-postgres].  You can also specify this with \\[set-buffer-process-coding-system]
@@ -3703,8 +3873,8 @@
 					     '(comint-strip-ctrl-m)))
 
 \(Type \\[describe-mode] in the SQL buffer for a list of commands.)"
-  (interactive)
-  (sql-product-interactive 'postgres))
+  (interactive "P")
+  (sql-product-interactive 'postgres buffer))
 
 (defun sql-comint-postgres (product options)
   "Create comint buffer and connect to Postgres."
@@ -3725,7 +3895,7 @@
 
 
 ;;;###autoload
-(defun sql-interbase ()
+(defun sql-interbase (&optional buffer)
   "Run isql by Interbase as an inferior process.
 
 If buffer `*SQL*' exists but no process is running, make a new process.
@@ -3739,6 +3909,11 @@
 The buffer is put in SQL interactive mode, giving commands for sending
 input.  See `sql-interactive-mode'.
 
+To set the buffer name directly, use \\[universal-argument]
+before \\[sql-interbase].  Once session has started,
+\\[sql-rename-buffer] can be called separately to rename the
+buffer.
+
 To specify a coding system for converting non-ASCII characters
 in the input and output to the process, use \\[universal-coding-system-argument]
 before \\[sql-interbase].  You can also specify this with \\[set-buffer-process-coding-system]
@@ -3747,8 +3922,8 @@
 `default-process-coding-system'.
 
 \(Type \\[describe-mode] in the SQL buffer for a list of commands.)"
-  (interactive)
-  (sql-product-interactive 'interbase))
+  (interactive "P")
+  (sql-product-interactive 'interbase buffer))
 
 (defun sql-comint-interbase (product options)
   "Create comint buffer and connect to Interbase."
@@ -3766,7 +3941,7 @@
 
 
 ;;;###autoload
-(defun sql-db2 ()
+(defun sql-db2 (&optional buffer)
   "Run db2 by IBM as an inferior process.
 
 If buffer `*SQL*' exists but no process is running, make a new process.
@@ -3784,6 +3959,11 @@
 `comint-input-sender' back to `comint-simple-send' by writing an after
 advice.  See the elisp manual for more information.
 
+To set the buffer name directly, use \\[universal-argument]
+before \\[sql-db2].  Once session has started,
+\\[sql-rename-buffer] can be called separately to rename the
+buffer.
+
 To specify a coding system for converting non-ASCII characters
 in the input and output to the process, use \\[universal-coding-system-argument]
 before \\[sql-db2].  You can also specify this with \\[set-buffer-process-coding-system]
@@ -3792,8 +3972,8 @@
 `default-process-coding-system'.
 
 \(Type \\[describe-mode] in the SQL buffer for a list of commands.)"
-  (interactive)
-  (sql-product-interactive 'db2))
+  (interactive "P")
+  (sql-product-interactive 'db2 buffer))
 
 (defun sql-comint-db2 (product options)
   "Create comint buffer and connect to DB2."
@@ -3801,11 +3981,9 @@
   ;; make-comint.
   (sql-comint product options)
 )
-;;   ;; Properly escape newlines when DB2 is interactive.
-;;   (setq comint-input-sender 'sql-escape-newlines-and-send))
 
 ;;;###autoload
-(defun sql-linter ()
+(defun sql-linter (&optional buffer)
   "Run inl by RELEX as an inferior process.
 
 If buffer `*SQL*' exists but no process is running, make a new process.
@@ -3827,9 +4005,14 @@
 The buffer is put in SQL interactive mode, giving commands for sending
 input.  See `sql-interactive-mode'.
 
+To set the buffer name directly, use \\[universal-argument]
+before \\[sql-linter].  Once session has started,
+\\[sql-rename-buffer] can be called separately to rename the
+buffer.
+
 \(Type \\[describe-mode] in the SQL buffer for a list of commands.)"
-  (interactive)
-  (sql-product-interactive 'linter))
+  (interactive "P")
+  (sql-product-interactive 'linter buffer))
 
 (defun sql-comint-linter (product options)
   "Create comint buffer and connect to Linter."
------------------------------------------------------------
revno: 101409
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Fri 2010-09-10 19:06:11 -0700
message:
  Remove some obsolete files from etc/.
  * emacs.bash, emacs.csh, ms-kermit: Remove obsolete files (use
  emacsclient -a instead of the first two).
diff:
=== modified file 'etc/ChangeLog'
--- etc/ChangeLog	2010-09-10 17:51:48 +0000
+++ etc/ChangeLog	2010-09-11 02:06:11 +0000
@@ -1,3 +1,8 @@
+2010-09-11  Glenn Morris  <rgm@gnu.org>
+
+	* emacs.bash, emacs.csh, ms-kermit: Remove obsolete files (use
+	emacsclient -a instead of the first two).
+
 2010-09-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* NEWS: Mention the new libxml2 functions.

=== removed file 'etc/emacs.bash'
--- etc/emacs.bash	2010-01-13 08:35:10 +0000
+++ etc/emacs.bash	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-### emacs.bash --- contact/resume an existing Emacs, or start a new one
-
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-##   Free Software Foundation, Inc.
-
-## Author: Noah Friedman
-
-## This file is part of GNU Emacs.
-
-## GNU Emacs is free software: you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-
-## GNU Emacs is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-### Commentary:
-
-## This file is obsolete.  Use emacsclient -a instead.
-
-## This defines a bash command named `edit' which contacts/resumes an
-## existing emacs or starts a new one if none exists.
-
-## One way or another, any arguments are passed to emacs to specify files
-## (provided you have loaded `resume.el').
-
-## This function assumes the emacs program is named `emacs' and is somewhere
-## in your load path.  If either of these is not true, the most portable
-## (and convenient) thing to do is to make an alias called emacs which
-## refers to the real program, e.g.
-##
-##        alias emacs=/usr/local/bin/gemacs
-
-function edit ()
-{
- local windowsys="${WINDOW_PARENT+sun}"
-
- windowsys="${windowsys:-${DISPLAY+x}}"
-
- if [ -n "${windowsys:+set}" ]; then
-    # Do not just test if these files are sockets.  On some systems
-    # ordinary files or fifos are used instead.  Just see if they exist.
-    if [ -e "${HOME}/.emacs_server" -o -e "/tmp/emacs${UID}/server" ]; then
-       emacsclient "$@"
-       return $?
-    else
-       echo "edit: starting emacs in background..." 1>&2
-    fi
-
-    case "${windowsys}" in
-      x ) (emacs "$@" &) ;;
-      sun ) echo "unsupported window system"; return 1 ;;
-    esac
- else
-    if jobs %emacs 2> /dev/null ; then
-       echo "$(pwd)" "$@" >| ${HOME}/.emacs_args && fg %emacs
-    else
-       emacs "$@"
-    fi
- fi
-}
-
-
-# arch-tag: 1e1b74b9-bf2c-4b23-870f-9eebff7515cb
-### emacs.bash ends here

=== removed file 'etc/emacs.csh'
--- etc/emacs.csh	2010-01-04 05:35:18 +0000
+++ etc/emacs.csh	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-### emacs.csh
-
-## Add legal notice if non-trivial amounts of code are added.
-
-## Author: Michael DeCorte
-
-### Commentary:
-
-## This file is obsolete.  Use emacsclient -a instead.
-
-## This defines a csh command named `edit' which resumes an
-## existing Emacs or starts a new one if none exists.
-## One way or another, any arguments are passed to Emacs to specify files
-## (provided you have loaded `resume.el').
-
-## These are the possible values of $whichjob
-## 1 = new ordinary emacs (the -nw is so that it doesn't try to do X)
-## 2 = resume emacs
-## 3 = new emacs under X (-i is so that you get a reasonable icon)
-## 4 = resume emacs under X
-set EMACS_PATTERN="^\[[0-9]\]  . Stopped ............ $EMACS"
-
-alias edit 'set emacs_command=("emacs -nw \!*" "fg %emacs" "emacs -i \!* &"\
- "emacsclient \!* &") ; \
- jobs >! $HOME/.jobs; grep "$EMACS_PATTERN" < $HOME/.jobs >& /dev/null; \
- @ isjob = ! $status; \
- @ whichjob = 1 + $isjob + $?DISPLAY * 2 + $?WINDOW_PARENT * 4; \
- test -S ~/.emacs_server && emacsclient \!* \
- || echo `pwd` \!* >! ~/.emacs_args && eval $emacs_command[$whichjob]'
-
-# arch-tag: 433d58df-15b9-446f-ad37-f0393e3a23d4

=== removed file 'etc/ms-kermit'
--- etc/ms-kermit	2010-01-04 05:35:18 +0000
+++ etc/ms-kermit	1970-01-01 00:00:00 +0000
@@ -1,172 +0,0 @@
-;;; The code here is forced by the interface, and is not subject to
-;;; copyright, constituting the only possible expression of the algorithm
-;;; in this format.
-
-;;; This file is designed for an 8-bit connection.
-;;; Use the file ms-7bkermit if you have a 7-bit connection.
-
-;; Meta key mappings for EMACS
-;; By Robert Earl (rearl@watnxt3.ucr.edu)
-;; May 13, 1990
-;;
-;; WARNING:
-;;  requires an 8-bit path to host.  many dialups and lans won't pass the
-;;  eighth bit by default and may require a special command to turn this
-;;  off.  `screen' is known to mask the eighth bit of input as well.
-
-set term controls 8-bit
-set translation key off
-
-;; control keys
-set key \3449 \128	;; m-c-@
-set key \3358 \129	;; m-c-a
-set key \3376 \130	;; m-c-b
-set key \3374 \131	;; m-c-c
-set key \3360 \132	;; m-c-d
-set key \3346 \133	;; m-c-e
-set key \3361 \134	;; m-c-f
-set key \3362 \135	;; m-c-g
-set key \3342 \136	;; m-bs
-set key \3363 \136	;; m-c-h (sends same code as above)
-set key \2469 \137	;; m-tab
-set key \3351 \137	;; m-c-i (same as above)
-set key \3364 \138	;; m-c-j
-set key \3365 \139	;; m-c-k
-set key \3366 \140	;; m-c-l
-;set key \3378 \141	;; m-c-m
-set key \2332 \141	;; m-ret (sends same code as above)
-set key \3377 \142	;; m-c-n
-set key \3352 \143	;; m-c-o
-set key \3353 \144	;; m-c-p
-set key \3344 \145	;; m-c-q
-set key \3347 \146	;; m-c-r
-set key \3359 \147	;; m-c-s
-set key \3348 \148	;; m-c-t
-set key \3350 \149	;; m-c-u
-set key \3375 \150	;; m-c-v
-set key \3345 \151	;; m-c-w
-set key \3373 \152	;; m-c-x
-set key \3349 \153	;; m-c-y
-set key \3372 \154	;; m-c-z
-
-;; misc keys
-;set key \3354 \155	;; m-c-[
-set key \2305 \155	;; m-esc (sends same as above)
-set key \3371 \156	;; m-c-\
-set key \3355 \157	;; m-c-]
-set key \3453 \158	;; m-c-^
-set key \3458 \159	;; m-c-_
-
-;; \160 is conspicuously missing here--
-;; alt-spc doesn't generate a distinct scan code...
-;; neither do shift-spc and ctrl-spc.
-;; no idea why.
-
-set key \2936 \161	;; m-!
-set key \2856 \162	;; m-"
-set key \2938 \163	;; m-#
-set key \2939 \164	;; m-$
-set key \2940 \165	;; m-%
-set key \2942 \166	;; m-&
-set key \2344 \167	;; m-'
-set key \2944 \168	;; m-(
-set key \2945 \169	;; m-)
-set key \2943 \170	;; m-*
-set key \2947 \171	;; m-+
-set key \2355 \172	;; m-,
-set key \2434 \173	;; m--
-set key \2356 \174	;; m-.
-set key \2357 \175	;; m-/
-
-;; number keys
-set key \2433 \176	;; m-0
-set key \2424 \177	;; m-1
-set key \2425 \178
-set key \2426 \179
-set key \2427 \180
-set key \2428 \181
-set key \2429 \182
-set key \2430 \183
-set key \2431 \184
-set key \2432 \185	;; m-9
-
-set key \2855 \186	;; m-:
-set key \2343 \187	;; m-;
-set key \2867 \188	;; m-<
-set key \2435 \189	;; m-=
-set key \2868 \190	;; m->
-set key \2869 \191	;; m-?
-set key \2937 \192	;; m-@
-
-;; shifted A-Z
-set key \2846 \193	;; m-A
-set key \2864 \194
-set key \2862 \195
-set key \2848 \196
-set key \2834 \197
-set key \2849 \198
-set key \2850 \199
-set key \2851 \200
-set key \2839 \201
-set key \2852 \202
-set key \2853 \203
-set key \2854 \204
-set key \2866 \205
-set key \2865 \206
-set key \2840 \207
-set key \2841 \208
-set key \2832 \209
-set key \2835 \210
-set key \2847 \211
-set key \2836 \212
-set key \2838 \213
-set key \2863 \214
-set key \2833 \215
-set key \2861 \216
-set key \2837 \217
-set key \2860 \218	;; m-Z
-
-set key \2330 \219	;; m-[
-set key \2347 \220	;; m-\
-set key \2331 \221	;; m-]
-set key \2941 \222	;; m-^
-set key \2946 \223	;; m-_
-set key \2345 \224	;; m-`
-
-;; lowercase a-z
-set key \2334 \225	;; m-a
-set key \2352 \226
-set key \2350 \227
-set key \2336 \228
-set key \2322 \229
-set key \2337 \230
-set key \2338 \231
-set key \2339 \232
-set key \2327 \233
-set key \2340 \234
-set key \2341 \235
-set key \2342 \236
-set key \2354 \237
-set key \2353 \238
-set key \2328 \239
-set key \2329 \240
-set key \2320 \241
-set key \2323 \242
-set key \2335 \243
-set key \2324 \244
-set key \2326 \245
-set key \2351 \246
-set key \2321 \247
-set key \2349 \248
-set key \2325 \249
-set key \2348 \250	;; m-z
-
-;; more shifted misc. keys
-set key \2842 \251	;; m-{
-set key \2859 \252	;; m-|
-set key \2843 \253	;; m-}
-set key \2857 \254	;; m-~
-set key \2318 \255	;; m-del
-
-
-;;; arch-tag: 93cefb0a-2b07-4d09-ae78-4d807b15645d
------------------------------------------------------------
revno: 101408
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Fri 2010-09-10 18:58:42 -0700
message:
  lisp/url tiny fixes.
  
  * url-cache.el, url-gw.el, url-history.el, url-irc.el, url-util.el:
  * url-vars.el: Remove leading `*' from defcustom docs.
diff:
=== modified file 'lisp/url/ChangeLog'
--- lisp/url/ChangeLog	2010-07-27 02:10:05 +0000
+++ lisp/url/ChangeLog	2010-09-11 01:58:42 +0000
@@ -1,3 +1,8 @@
+2010-09-11  Glenn Morris  <rgm@gnu.org>
+
+	* url-cache.el, url-gw.el, url-history.el, url-irc.el, url-util.el:
+	* url-vars.el: Remove leading `*' from defcustom docs.
+
 2010-07-27  Michael Albinus  <michael.albinus@gmx.de>
 
 	* url-http (url-http-parse-headers): Disable file name handlers at

=== modified file 'lisp/url/url-cache.el'
--- lisp/url/url-cache.el	2010-01-13 08:35:10 +0000
+++ lisp/url/url-cache.el	2010-09-11 01:58:42 +0000
@@ -1,7 +1,7 @@
 ;;; url-cache.el --- Uniform Resource Locator retrieval tool
 
-;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004, 2005, 2006, 2007, 2008,
+;;   2009, 2010  Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
@@ -28,7 +28,7 @@
 
 (defcustom url-cache-directory
   (expand-file-name "cache" url-configuration-directory)
-  "*The directory where cache files should be stored."
+  "The directory where cache files should be stored."
   :type 'directory
   :group 'url-file)
 
@@ -165,7 +165,7 @@
 				url-cache-directory))))))
 
 (defcustom url-cache-creation-function 'url-cache-create-filename-using-md5
-  "*What function to use to create a cached filename."
+  "What function to use to create a cached filename."
   :type '(choice (const :tag "MD5 of filename (low collision rate)"
 			:value url-cache-create-filename-using-md5)
 		 (const :tag "Human readable filenames (higher collision rate)"

=== modified file 'lisp/url/url-gw.el'
--- lisp/url/url-gw.el	2010-01-13 08:35:10 +0000
+++ lisp/url/url-gw.el	2010-09-11 01:58:42 +0000
@@ -37,50 +37,50 @@
   :group 'url)
 
 (defcustom url-gateway-local-host-regexp nil
-  "*A regular expression specifying local hostnames/machines."
+  "A regular expression specifying local hostnames/machines."
   :type '(choice (const nil) regexp)
   :group 'url-gateway)
 
 (defcustom url-gateway-prompt-pattern
   "^[^#$%>;]*[#$%>;] *" ;; "bash\\|\$ *\r?$\\|> *\r?"
-  "*A regular expression matching a shell prompt."
+  "A regular expression matching a shell prompt."
   :type 'regexp
   :group 'url-gateway)
 
 (defcustom url-gateway-rlogin-host nil
-  "*What hostname to actually rlog into before doing a telnet."
+  "What hostname to actually rlog into before doing a telnet."
   :type '(choice (const nil) string)
   :group 'url-gateway)
 
 (defcustom url-gateway-rlogin-user-name nil
-  "*Username to log into the remote machine with when using rlogin."
+  "Username to log into the remote machine with when using rlogin."
   :type '(choice (const nil) string)
   :group 'url-gateway)
 
 (defcustom url-gateway-rlogin-parameters '("telnet" "-8")
-  "*Parameters to `url-open-rlogin'.
+  "Parameters to `url-open-rlogin'.
 This list will be used as the parameter list given to rsh."
   :type '(repeat string)
   :group 'url-gateway)
 
 (defcustom url-gateway-telnet-host nil
-  "*What hostname to actually login to before doing a telnet."
+  "What hostname to actually login to before doing a telnet."
   :type '(choice (const nil) string)
   :group 'url-gateway)
 
 (defcustom url-gateway-telnet-parameters '("exec" "telnet" "-8")
-  "*Parameters to `url-open-telnet'.
+  "Parameters to `url-open-telnet'.
 This list will be executed as a command after logging in via telnet."
   :type '(repeat string)
   :group 'url-gateway)
 
 (defcustom url-gateway-telnet-login-prompt "^\r*.?login:"
-  "*Prompt that tells us we should send our username when loggin in w/telnet."
+  "Prompt that tells us we should send our username when loggin in w/telnet."
   :type 'regexp
   :group 'url-gateway)
 
 (defcustom url-gateway-telnet-password-prompt "^\r*.?password:"
-  "*Prompt that tells us we should send our password when loggin in w/telnet."
+  "Prompt that tells us we should send our password when loggin in w/telnet."
   :type 'regexp
   :group 'url-gateway)
 
@@ -95,7 +95,7 @@
   :group 'url-gateway)
 
 (defcustom url-gateway-broken-resolution nil
-  "*Whether to use nslookup to resolve hostnames.
+  "Whether to use nslookup to resolve hostnames.
 This should be used when your version of Emacs cannot correctly use DNS,
 but your machine can.  This usually happens if you are running a statically
 linked Emacs under SunOS 4.x."
@@ -103,7 +103,7 @@
   :group 'url-gateway)
 
 (defcustom url-gateway-nslookup-program "nslookup"
-  "*If non-nil then a string naming nslookup program."
+  "If non-nil then a string naming nslookup program."
   :type '(choice (const :tag "None" :value nil) string)
   :group 'url-gateway)
 

=== modified file 'lisp/url/url-history.el'
--- lisp/url/url-history.el	2010-01-13 08:35:10 +0000
+++ lisp/url/url-history.el	2010-09-11 01:58:42 +0000
@@ -1,7 +1,7 @@
 ;;; url-history.el --- Global history tracking for URL package
 
-;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004, 2005, 2006, 2007, 2008,
+;;   2009, 2010  Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
@@ -35,7 +35,7 @@
   :group 'url)
 
 (defcustom url-history-track nil
-  "*Controls whether to keep a list of all the URLs being visited.
+  "Controls whether to keep a list of all the URLs being visited.
 If non-nil, the URL package will keep track of all the URLs visited.
 If set to t, then the list is saved to disk at the end of each Emacs
 session."
@@ -49,14 +49,14 @@
   :group 'url-history)
 
 (defcustom url-history-file nil
-  "*The global history file for the URL package.
+  "The global history file for the URL package.
 This file contains a list of all the URLs you have visited.  This file
 is parsed at startup and used to provide URL completion."
   :type '(choice (const :tag "Default" :value nil) file)
   :group 'url-history)
 
 (defcustom url-history-save-interval 3600
-  "*The number of seconds between automatic saves of the history list.
+  "The number of seconds between automatic saves of the history list.
 Default is 1 hour.  Note that if you change this variable outside of
 the `customize' interface after `url-do-setup' has been run, you need
 to run the `url-history-setup-save-timer' function manually."

=== modified file 'lisp/url/url-irc.el'
--- lisp/url/url-irc.el	2010-01-13 08:35:10 +0000
+++ lisp/url/url-irc.el	2010-09-11 01:58:42 +0000
@@ -1,7 +1,7 @@
 ;;; url-irc.el --- IRC URL interface
 
-;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004, 2005, 2006, 2007, 2008,
+;;   2009, 2010  Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
@@ -22,7 +22,8 @@
 
 ;;; Commentary:
 
-;; IRC URLs are defined in http://www.w3.org/Addressing/draft-mirashi-url-irc-01.txt
+;; IRC URLs are defined in
+;; http://www.w3.org/Addressing/draft-mirashi-url-irc-01.txt
 
 ;;; Code:
 
@@ -32,7 +33,7 @@
 (defconst url-irc-default-port 6667 "Default port for IRC connections.")
 
 (defcustom url-irc-function 'url-irc-rcirc
-  "*Function to actually open an IRC connection.
+  "Function to actually open an IRC connection.
 The function should take the following arguments:
     HOST - the hostname of the IRC server to contact
     PORT - the port number of the IRC server to contact

=== modified file 'lisp/url/url-util.el'
--- lisp/url/url-util.el	2010-05-19 15:23:53 +0000
+++ lisp/url/url-util.el	2010-09-11 01:58:42 +0000
@@ -43,7 +43,7 @@
 
 ;;;###autoload
 (defcustom url-debug nil
-  "*What types of debug messages from the URL library to show.
+  "What types of debug messages from the URL library to show.
 Debug messages are logged to the *URL-DEBUG* buffer.
 
 If t, all messages will be logged.

=== modified file 'lisp/url/url-vars.el'
--- lisp/url/url-vars.el	2010-06-16 20:08:41 +0000
+++ lisp/url/url-vars.el	2010-09-11 01:58:42 +0000
@@ -1,7 +1,7 @@
 ;;; url-vars.el --- Variables for Uniform Resource Locator tool
 
-;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004, 2005, 2006, 2007,
+;;   2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
@@ -68,7 +68,7 @@
 	))
 
 (defcustom url-honor-refresh-requests t
-  "*Whether to do automatic page reloads.
+  "Whether to do automatic page reloads.
 These are done at the request of the document author or the server via
 the `Refresh' header in an HTTP response.  If nil, no refresh
 requests will be honored.  If t, all refresh requests will be honored.
@@ -79,14 +79,14 @@
   :group 'url-hairy)
 
 (defcustom url-automatic-caching nil
-  "*If non-nil, all documents will be automatically cached to the local disk."
+  "If non-nil, all documents will be automatically cached to the local disk."
   :type 'boolean
   :group 'url-cache)
 
 ;; Fixme: sanitize this.
 (defcustom url-cache-expired
   (lambda (t1 t2) (>= (- (car t2) (car t1)) 5))
-  "*A function determining if a cached item has expired.
+  "A function determining if a cached item has expired.
 It takes two times (numbers) as its arguments, and returns non-nil if
 the second time is 'too old' when compared to the first time."
   :type 'function
@@ -96,14 +96,14 @@
   "Where to send bug reports.")
 
 (defcustom url-personal-mail-address nil
-  "*Your full email address.
+  "Your full email address.
 This is what is sent to HTTP servers as the FROM field in an HTTP
 request."
   :type '(choice (const :tag "Unspecified" nil) string)
   :group 'url)
 
 (defcustom url-directory-index-file "index.html"
-  "*The filename to look for when indexing a directory.
+  "The filename to look for when indexing a directory.
 If this file exists, and is readable, then it will be viewed instead of
 using `dired' to view the directory."
   :type 'string
@@ -166,14 +166,14 @@
 				    (".hqx" . "x-hqx")
 				    (".Z"  . "x-compress")
 				    (".bz2"  . "x-bzip2"))
-  "*An alist of file extensions and appropriate content-transfer-encodings."
+  "An alist of file extensions and appropriate content-transfer-encodings."
   :type '(repeat (cons :format "%v"
 		       (string :tag "Extension")
 		       (string :tag "Encoding")))
   :group 'url-mime)
 
 (defcustom url-mail-command 'compose-mail
-  "*This function will be called whenever URL needs to send mail.
+  "This function will be called whenever URL needs to send mail.
 It should enter a mail-mode-like buffer in the current window.
 The commands `mail-to' and `mail-subject' should still work in this
 buffer, and it should use `mail-header-separator' if possible."
@@ -181,7 +181,7 @@
   :group 'url)
 
 (defcustom url-proxy-services nil
-  "*An alist of schemes and proxy servers that gateway them.
+  "An alist of schemes and proxy servers that gateway them.
 Looks like ((\"http\" . \"hostname:portnumber\") ...).  This is set up
 from the ACCESS_proxy environment variables."
   :type '(repeat (cons :format "%v"
@@ -190,7 +190,7 @@
   :group 'url)
 
 (defcustom url-standalone-mode nil
-  "*Rely solely on the cache?"
+  "Rely solely on the cache?"
   :type 'boolean
   :group 'url-cache)
 
@@ -202,7 +202,7 @@
 
 (defcustom url-bad-port-list
   '("25" "119" "19")
-  "*List of ports to warn the user about connecting to.
+  "List of ports to warn the user about connecting to.
 Defaults to just the mail, chargen, and NNTP ports so you cannot be
 tricked into sending fake mail or forging messages by a malicious HTML
 document."
@@ -255,7 +255,7 @@
 
 ;; Fixme: set from the locale.
 (defcustom url-mime-language-string nil
-  "*String to send in the Accept-language: field in HTTP requests.
+  "String to send in the Accept-language: field in HTTP requests.
 
 Specifies the preferred language when servers can serve documents in
 several languages.  Use RFC 1766 abbreviations, e.g.: `en' for
@@ -284,20 +284,20 @@
   "What OS we are on.")
 
 (defcustom url-max-password-attempts 5
-  "*Maximum number of times a password will be prompted for.
+  "Maximum number of times a password will be prompted for.
 Applies when a protected document is denied by the server."
   :type 'integer
   :group 'url)
 
 (defcustom url-temporary-directory (or (getenv "TMPDIR") "/tmp")
-  "*Where temporary files go."
+  "Where temporary files go."
   :type 'directory
   :group 'url-file)
 (make-obsolete-variable 'url-temporary-directory
 			'temporary-file-directory "23.1")
 
 (defcustom url-show-status t
-  "*Whether to show a running total of bytes transferred.
+  "Whether to show a running total of bytes transferred.
 Can cause a large hit if using a remote X display over a slow link, or
 a terminal with a slow modem."
   :type 'boolean
@@ -308,7 +308,7 @@
 http://www.example.com/")
 
 (defcustom url-news-server nil
-  "*The default news server from which to get newsgroups/articles.
+  "The default news server from which to get newsgroups/articles.
 Applies if no server is specified in the URL.  Defaults to the
 environment variable NNTPSERVER or \"news\" if NNTPSERVER is
 undefined."
@@ -320,13 +320,13 @@
   "A regular expression that will match an absolute URL.")
 
 (defcustom url-max-redirections 30
-  "*The maximum number of redirection requests to honor in a HTTP connection.
+  "The maximum number of redirection requests to honor in a HTTP connection.
 A negative number means to honor an unlimited number of redirection requests."
   :type 'integer
   :group 'url)
 
 (defcustom url-confirmation-func 'y-or-n-p
-  "*What function to use for asking yes or no functions.
+  "What function to use for asking yes or no functions.
 Possible values are `yes-or-no-p' or `y-or-n-p', or any function that
 takes a single argument (the prompt), and returns t only if a positive
 answer is given."
@@ -336,7 +336,7 @@
   :group 'url-hairy)
 
 (defcustom url-gateway-method 'native
-  "*The type of gateway support to use.
+  "The type of gateway support to use.
 Should be a symbol specifying how to get a connection from the local machine.
 
 Currently supported methods:
------------------------------------------------------------
revno: 101407
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Sat 2010-09-11 00:36:27 +0000
message:
  Merge changes made in Gnus trunk.
  
  gnus-sum.el: Avoid calling a hook function per summary line;
  Call `gnus-summary-highlight-line' directly from all places that used to call it indirectly.
  
  netrc.el (netrc-credentials): New conveniency function.
  
  gnus-start.el (gnus-read-active-file-1): If gnus-agent isn't set, then do request scans from the backends.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-10 23:13:42 +0000
+++ lisp/ChangeLog	2010-09-11 00:36:27 +0000
@@ -1,3 +1,7 @@
+2010-09-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* net/netrc.el (netrc-credentials): New conveniency function.
+
 2010-09-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* textmodes/texinfo.el (texinfo-syntax-propertize-function): New fun

=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-10 05:32:25 +0000
+++ lisp/gnus/ChangeLog	2010-09-11 00:36:27 +0000
@@ -1,3 +1,14 @@
+2010-09-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus-start.el (gnus-read-active-file-1): If gnus-agent isn't set,
+	then do request scans from the backends.
+
+	* gnus-sum.el (gnus-summary-update-hook): Change default to nil, to
+	avoid running a hook per line, since this takes a lot of time,
+	profiling shows.
+	(gnus-summary-prepare-threads): Call `gnus-summary-highlight-line'
+	directly if gnus-visual-p is true.
+
 2010-09-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-start.el (gnus-read-active-for-groups): Check only subscribed

=== modified file 'lisp/gnus/gnus-start.el'
--- lisp/gnus/gnus-start.el	2010-09-10 05:32:25 +0000
+++ lisp/gnus/gnus-start.el	2010-09-11 00:36:27 +0000
@@ -2048,8 +2048,9 @@
     (gnus-message 5 mesg)
     (when (gnus-check-server method)
       ;; Request that the backend scan its incoming messages.
-      (when (and gnus-agent
-		 (gnus-online method)
+      (when (and (or (and gnus-agent
+			  (gnus-online method))
+		     (not gnus-agent))
 		 (gnus-check-backend-function 'request-scan (car method)))
 	(if infos
 	    (dolist (info infos)

=== modified file 'lisp/gnus/gnus-sum.el'
--- lisp/gnus/gnus-sum.el	2010-09-06 00:37:02 +0000
+++ lisp/gnus/gnus-sum.el	2010-09-11 00:36:27 +0000
@@ -985,8 +985,7 @@
   :group 'gnus-various
   :type 'hook)
 
-(defcustom gnus-summary-update-hook
-  (list 'gnus-summary-highlight-line)
+(defcustom gnus-summary-update-hook nil
   "*A hook called when a summary line is changed.
 The hook will not be called if `gnus-visual' is nil.
 
@@ -3753,6 +3752,7 @@
       (error (gnus-message 5 "Error updating the summary line")))
     (when (gnus-visual-p 'summary-highlight 'highlight)
       (forward-line -1)
+      (gnus-summary-highlight-line)
       (gnus-run-hooks 'gnus-summary-update-hook)
       (forward-line 1))))
 
@@ -3785,6 +3785,7 @@
 	 'score))
       ;; Do visual highlighting.
       (when (gnus-visual-p 'summary-highlight 'highlight)
+	(gnus-summary-highlight-line)
 	(gnus-run-hooks 'gnus-summary-update-hook)))))
 
 (defvar gnus-tmp-new-adopts nil)
@@ -5363,7 +5364,9 @@
                'gnus-number number)
 	      (when gnus-visual-p
 		(forward-line -1)
-		(gnus-run-hooks 'gnus-summary-update-hook)
+		(gnus-summary-highlight-line)
+		(when gnus-summary-update-hook
+		  (gnus-run-hooks 'gnus-summary-update-hook))
 		(forward-line 1))
 
 	      (setq gnus-tmp-prev-subject simp-subject)))
@@ -10734,6 +10737,7 @@
 	 (t gnus-no-mark))
    'replied)
   (when (gnus-visual-p 'summary-highlight 'highlight)
+    (gnus-summary-highlight-line)
     (gnus-run-hooks 'gnus-summary-update-hook))
   t)
 

=== modified file 'lisp/net/netrc.el'
--- lisp/net/netrc.el	2010-09-02 01:42:32 +0000
+++ lisp/net/netrc.el	2010-09-11 00:36:27 +0000
@@ -54,12 +54,19 @@
  "Netrc configuration."
  :group 'comm)
 
+(defcustom netrc-file "~/.authinfo"
+  "File where user credentials are stored."
+  :type 'file
+  :group 'netrc)
+
 (defvar netrc-services-file "/etc/services"
   "The name of the services file.")
 
-(defun netrc-parse (file)
+(defun netrc-parse (&optional file)
   (interactive "fFile to Parse: ")
   "Parse FILE and return a list of all entries in the file."
+  (unless file
+    (setq file netrc-file))
   (if (listp file)
       file
     (when (file-exists-p file)
@@ -221,6 +228,19 @@
 			  (eq type (car (cddr service)))))))
     (cadr service)))
 
+(defun netrc-credentials (machine &rest ports)
+  "Return a user name/password pair.
+Port specifications will be prioritised in the order they are
+listed in the PORTS list."
+  (let ((list (netrc-parse))
+	found)
+    (while (and ports
+		(not found))
+      (setq found (netrc-machine list machine (pop ports))))
+    (when found
+      (list (cdr (assoc "login" found))
+	    (cdr (assoc "password" found))))))
+
 (provide 'netrc)
 
 ;;; netrc.el ends here
------------------------------------------------------------
revno: 101406
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Sat 2010-09-11 01:13:42 +0200
message:
  New syntax-propertize functionality.
  * lisp/font-lock.el (font-lock-syntactic-keywords): Make obsolete.
  (font-lock-fontify-syntactic-keywords-region): Move handling of
  font-lock-syntactically-fontified to...
  (font-lock-default-fontify-region): ...here.
  Let syntax-propertize-function take precedence.
  (font-lock-fontify-syntactically-region): Cal syntax-propertize.
  
  * lisp/emacs-lisp/regexp-opt.el (regexp-opt-depth): Skip named groups.
  
  * lisp/emacs-lisp/syntax.el (syntax-propertize-function)
  (syntax-propertize-chunk-size, syntax-propertize--done)
  (syntax-propertize-extend-region-functions): New vars.
  (syntax-propertize-wholelines, syntax-propertize-multiline)
  (syntax-propertize--shift-groups, syntax-propertize-via-font-lock)
  (syntax-propertize): New functions.
  (syntax-propertize-rules): New macro.
  (syntax-ppss-flush-cache): Set syntax-propertize--done.
  (syntax-ppss): Call syntax-propertize.
  
  * lisp/progmodes/ada-mode.el (ada-set-syntax-table-properties)
  (ada-after-change-function, ada-initialize-syntax-table-properties)
  (ada-handle-syntax-table-properties): Only define when
  syntax-propertize is not available.
  (ada-mode): Use syntax-propertize-function.
  
  * lisp/progmodes/autoconf.el (autoconf-mode):
  Use syntax-propertize-function.
  (autoconf-font-lock-syntactic-keywords): Remove.
  
  * lisp/progmodes/cfengine.el (cfengine-mode):
  Use syntax-propertize-function.
  (cfengine-font-lock-syntactic-keywords): Remove.
  
  * lisp/progmodes/cperl-mode.el (cperl-mode): Use syntax-propertize-function.
  
  * lisp/progmodes/fortran.el (fortran-mode): Use syntax-propertize-function.
  (fortran--font-lock-syntactic-keywords): New var.
  (fortran-line-length): Update syntax-propertize-function and
  fortran--font-lock-syntactic-keywords.
  
  * lisp/progmodes/gud.el (gdb-script-syntax-propertize-function): New var;
  replaces gdb-script-font-lock-syntactic-keywords.
  (gdb-script-mode): Use it.
  
  * lisp/progmodes/js.el (js--regexp-literal): Define while compiling.
  (js-syntax-propertize-function): New var; replaces
  js-font-lock-syntactic-keywords.
  (js-mode): Use it.
  
  * lisp/progmodes/make-mode.el (makefile-syntax-propertize-function):
  New var; replaces makefile-font-lock-syntactic-keywords.
  (makefile-mode): Use it.
  (makefile-imake-mode): Adjust.
  
  * lisp/progmodes/mixal-mode.el (mixal-syntax-propertize-function): New var;
  replaces mixal-font-lock-syntactic-keywords.
  (mixal-mode): Use it.
  
  * lisp/progmodes/octave-mod.el (octave-syntax-propertize-sqs): New function
  to replace octave-font-lock-close-quotes.
  (octave-syntax-propertize-function): New function to replace
  octave-font-lock-syntactic-keywords.
  (octave-mode): Use it.
  
  * lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): New fun to
  replace perl-font-lock-syntactic-keywords.
  (perl-syntax-propertize-special-constructs): New fun to replace
  perl-font-lock-special-syntactic-constructs.
  (perl-font-lock-syntactic-face-function): New fun.
  (perl-mode): Use it.
  
  * lisp/progmodes/python.el (python-syntax-propertize-function): New var to
  replace python-font-lock-syntactic-keywords.
  (python-mode): Use it.
  (python-quote-syntax): Simplify and adjust to new use.
  
  * lisp/progmodes/ruby-mode.el (ruby-here-doc-beg-re):
  Define while compiling.
  (ruby-here-doc-end-re, ruby-here-doc-beg-match)
  (ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
  (syntax-ppss, ruby-in-ppss-context-p, ruby-in-here-doc-p)
  (ruby-here-doc-find-end, ruby-here-doc-beg-syntax)
  (ruby-here-doc-end-syntax): Only define when
  syntax-propertize is not available.
  (ruby-syntax-propertize-function, ruby-syntax-propertize-heredoc):
  New functions.
  (ruby-in-ppss-context-p): Update to new syntax of heredocs.
  (electric-indent-chars): Silence bytecompiler.
  (ruby-mode): Use prog-mode, syntax-propertize-function, and
  electric-indent-chars.
  
  * lisp/progmodes/sh-script.el (sh-st-symbol): Remove.
  (sh-font-lock-close-heredoc, sh-font-lock-open-heredoc): Add eol arg.
  (sh-font-lock-flush-syntax-ppss-cache, sh-font-lock-here-doc): Remove.
  (sh-font-lock-quoted-subshell): Assume we've already matched $(.
  (sh-font-lock-paren): Set syntax-multiline.
  (sh-font-lock-syntactic-keywords): Remove.
  (sh-syntax-propertize-function): New function to replace it.
  (sh-mode): Use it.
  
  * lisp/progmodes/simula.el (simula-syntax-propertize-function): New var to
  replace simula-font-lock-syntactic-keywords.
  (simula-mode): Use it.
  
  * lisp/progmodes/tcl.el (tcl-syntax-propertize-function): New var to
  replace tcl-font-lock-syntactic-keywords.
  (tcl-mode): Use it.
  
  * lisp/progmodes/vhdl-mode.el (vhdl-mode): Use syntax-propertize-function
  if available.
  (vhdl-fontify-buffer): Adjust.
  
  * lisp/textmodes/bibtex.el (bibtex-mode): Use syntax-propertize-function.
  
  * lisp/textmodes/reftex.el (font-lock-syntactic-keywords): Don't declare
  since we don't use it.
  
  * lisp/textmodes/sgml-mode.el (sgml-syntax-propertize-function): New var to
  replace sgml-font-lock-syntactic-keywords.
  (sgml-mode): Use it.
  
  * lisp/textmodes/tex-mode.el (tex-common-initialization, doctex-mode):
  Use syntax-propertize-function.
  
  * lisp/textmodes/texinfo.el (texinfo-syntax-propertize-function): New fun
  to replace texinfo-font-lock-syntactic-keywords.
  (texinfo-mode): Use it.
  
  * test/indent/octave.m: Remove some `fixindent' not needed any more.
diff:
=== modified file 'etc/NEWS'
--- etc/NEWS	2010-09-10 17:51:48 +0000
+++ etc/NEWS	2010-09-10 23:13:42 +0000
@@ -466,6 +466,16 @@
 
 * Lisp changes in Emacs 24.1
 
+** New variable syntax-propertize-function to set syntax-table properties.
+Replaces font-lock-syntactic-keywords which are now obsolete.
+This allows syntax-table properties to be set independently from font-lock:
+just call syntax-propertize to make sure the text is propertized.
+Together with this new variable come a new hook
+syntax-propertize-extend-region-functions, as well as two helper functions:
+syntax-propertize-via-font-lock to reuse old font-lock-syntactic-keywords
+as-is; and syntax-propertize-rules which provides a new way to specify
+syntactic rules.
+
 ** New hook post-self-insert-hook run at the end of self-insert-command.
 
 ** Syntax tables support a new "comment style c" additionally to style b.

=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-10 11:20:51 +0000
+++ lisp/ChangeLog	2010-09-10 23:13:42 +0000
@@ -1,3 +1,133 @@
+2010-09-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* textmodes/texinfo.el (texinfo-syntax-propertize-function): New fun
+	to replace texinfo-font-lock-syntactic-keywords.
+	(texinfo-mode): Use it.
+
+	* textmodes/tex-mode.el (tex-common-initialization, doctex-mode):
+	Use syntax-propertize-function.
+
+	* textmodes/sgml-mode.el (sgml-syntax-propertize-function): New var to
+	replace sgml-font-lock-syntactic-keywords.
+	(sgml-mode): Use it.
+
+	* textmodes/reftex.el (font-lock-syntactic-keywords): Don't declare
+	since we don't use it.
+
+	* textmodes/bibtex.el (bibtex-mode): Use syntax-propertize-function.
+
+	* progmodes/vhdl-mode.el (vhdl-mode): Use syntax-propertize-function
+	if available.
+	(vhdl-fontify-buffer): Adjust.
+
+	* progmodes/tcl.el (tcl-syntax-propertize-function): New var to
+	replace tcl-font-lock-syntactic-keywords.
+	(tcl-mode): Use it.
+
+	* progmodes/simula.el (simula-syntax-propertize-function): New var to
+	replace simula-font-lock-syntactic-keywords.
+	(simula-mode): Use it.
+
+	* progmodes/sh-script.el (sh-st-symbol): Remove.
+	(sh-font-lock-close-heredoc, sh-font-lock-open-heredoc): Add eol arg.
+	(sh-font-lock-flush-syntax-ppss-cache, sh-font-lock-here-doc): Remove.
+	(sh-font-lock-quoted-subshell): Assume we've already matched $(.
+	(sh-font-lock-paren): Set syntax-multiline.
+	(sh-font-lock-syntactic-keywords): Remove.
+	(sh-syntax-propertize-function): New function to replace it.
+	(sh-mode): Use it.
+
+	* progmodes/ruby-mode.el (ruby-here-doc-beg-re):
+	Define while compiling.
+	(ruby-here-doc-end-re, ruby-here-doc-beg-match)
+	(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
+	(syntax-ppss, ruby-in-ppss-context-p, ruby-in-here-doc-p)
+	(ruby-here-doc-find-end, ruby-here-doc-beg-syntax)
+	(ruby-here-doc-end-syntax): Only define when
+	syntax-propertize is not available.
+	(ruby-syntax-propertize-function, ruby-syntax-propertize-heredoc):
+	New functions.
+	(ruby-in-ppss-context-p): Update to new syntax of heredocs.
+	(electric-indent-chars): Silence bytecompiler.
+	(ruby-mode): Use prog-mode, syntax-propertize-function, and
+	electric-indent-chars.
+
+	* progmodes/python.el (python-syntax-propertize-function): New var to
+	replace python-font-lock-syntactic-keywords.
+	(python-mode): Use it.
+	(python-quote-syntax): Simplify and adjust to new use.
+
+	* progmodes/perl-mode.el (perl-syntax-propertize-function): New fun to
+	replace perl-font-lock-syntactic-keywords.
+	(perl-syntax-propertize-special-constructs): New fun to replace
+	perl-font-lock-special-syntactic-constructs.
+	(perl-font-lock-syntactic-face-function): New fun.
+	(perl-mode): Use it.
+
+	* progmodes/octave-mod.el (octave-syntax-propertize-sqs): New function
+	to replace octave-font-lock-close-quotes.
+	(octave-syntax-propertize-function): New function to replace
+	octave-font-lock-syntactic-keywords.
+	(octave-mode): Use it.
+
+	* progmodes/mixal-mode.el (mixal-syntax-propertize-function): New var;
+	replaces mixal-font-lock-syntactic-keywords.
+	(mixal-mode): Use it.
+
+	* progmodes/make-mode.el (makefile-syntax-propertize-function):
+	New var; replaces makefile-font-lock-syntactic-keywords.
+	(makefile-mode): Use it.
+	(makefile-imake-mode): Adjust.
+
+	* progmodes/js.el (js--regexp-literal): Define while compiling.
+	(js-syntax-propertize-function): New var; replaces
+	js-font-lock-syntactic-keywords.
+	(js-mode): Use it.
+
+	* progmodes/gud.el (gdb-script-syntax-propertize-function): New var;
+	replaces gdb-script-font-lock-syntactic-keywords.
+	(gdb-script-mode): Use it.
+
+	* progmodes/fortran.el (fortran-mode): Use syntax-propertize-function.
+	(fortran--font-lock-syntactic-keywords): New var.
+	(fortran-line-length): Update syntax-propertize-function and
+	fortran--font-lock-syntactic-keywords.
+
+	* progmodes/cperl-mode.el (cperl-mode): Use syntax-propertize-function.
+
+	* progmodes/cfengine.el (cfengine-mode):
+	Use syntax-propertize-function.
+	(cfengine-font-lock-syntactic-keywords): Remove.
+
+	* progmodes/autoconf.el (autoconf-mode):
+	Use syntax-propertize-function.
+	(autoconf-font-lock-syntactic-keywords): Remove.
+
+	* progmodes/ada-mode.el (ada-set-syntax-table-properties)
+	(ada-after-change-function, ada-initialize-syntax-table-properties)
+	(ada-handle-syntax-table-properties): Only define when
+	syntax-propertize is not available.
+	(ada-mode): Use syntax-propertize-function.
+
+	* font-lock.el (font-lock-syntactic-keywords): Make obsolete.
+	(font-lock-fontify-syntactic-keywords-region): Move handling of
+	font-lock-syntactically-fontified to...
+	(font-lock-default-fontify-region): ...here.
+	Let syntax-propertize-function take precedence.
+	(font-lock-fontify-syntactically-region): Cal syntax-propertize.
+
+	* emacs-lisp/syntax.el (syntax-propertize-function)
+	(syntax-propertize-chunk-size, syntax-propertize--done)
+	(syntax-propertize-extend-region-functions): New vars.
+	(syntax-propertize-wholelines, syntax-propertize-multiline)
+	(syntax-propertize--shift-groups, syntax-propertize-via-font-lock)
+	(syntax-propertize): New functions.
+	(syntax-propertize-rules): New macro.
+	(syntax-ppss-flush-cache): Set syntax-propertize--done.
+	(syntax-ppss): Call syntax-propertize.
+
+	* emacs-lisp/regexp-opt.el (regexp-opt-depth): Skip named groups.
+
 2010-09-10  Agustín Martín  <agustin.martin@hispalinux.es>
 
 	* textmodes/ispell.el (ispell-init-process): Improve comments.
@@ -6,8 +136,8 @@
 
 2010-09-09  Michael Albinus  <michael.albinus@gmx.de>
 
-	* net/tramp-cache.el (tramp-parse-connection-properties): Set
-	tramp-autoload cookie.
+	* net/tramp-cache.el (tramp-parse-connection-properties):
+	Set tramp-autoload cookie.
 
 2010-09-09  Glenn Morris  <rgm@gnu.org>
 

=== modified file 'lisp/ansi-color.el'
--- lisp/ansi-color.el	2010-06-01 02:34:49 +0000
+++ lisp/ansi-color.el	2010-09-10 23:13:42 +0000
@@ -244,9 +244,9 @@
   (when (boundp 'font-lock-syntactic-keywords)
     (remove-text-properties beg end '(syntax-table nil)))
   ;; instead of just using (remove-text-properties beg end '(face
-  ;; nil)), we find regions with a non-nil face test-property, skip
+  ;; nil)), we find regions with a non-nil face text-property, skip
   ;; positions with the ansi-color property set, and remove the
-  ;; remaining face test-properties.
+  ;; remaining face text-properties.
   (while (setq beg (text-property-not-all beg end 'face nil))
     (setq beg (or (text-property-not-all beg end 'ansi-color t) end))
     (when (get-text-property beg 'face)

=== modified file 'lisp/emacs-lisp/regexp-opt.el'
--- lisp/emacs-lisp/regexp-opt.el	2010-01-13 08:35:10 +0000
+++ lisp/emacs-lisp/regexp-opt.el	2010-09-10 23:13:42 +0000
@@ -120,7 +120,7 @@
     (string-match regexp "")
     ;; Count the number of open parentheses in REGEXP.
     (let ((count 0) start last)
-      (while (string-match "\\\\(\\(\\?:\\)?" regexp start)
+      (while (string-match "\\\\(\\(\\?[0-9]*:\\)?" regexp start)
 	(setq start (match-end 0))	      ; Start of next search.
 	(when (and (not (match-beginning 1))
 		   (subregexp-context-p regexp (match-beginning 0) last))

=== modified file 'lisp/emacs-lisp/syntax.el'
--- lisp/emacs-lisp/syntax.el	2010-09-04 22:51:39 +0000
+++ lisp/emacs-lisp/syntax.el	2010-09-10 23:13:42 +0000
@@ -34,7 +34,6 @@
 
 ;; - do something about the case where the syntax-table is changed.
 ;;   This typically happens with tex-mode and its `$' operator.
-;; - move font-lock-syntactic-keywords in here.  Then again, maybe not.
 ;; - new functions `syntax-state', ... to replace uses of parse-partial-state
 ;;   with something higher-level (similar to syntax-ppss-context).
 ;; - interaction with mmm-mode.
@@ -47,6 +46,249 @@
 
 (defvar font-lock-beginning-of-syntax-function)
 
+;;; Applying syntax-table properties where needed.
+
+(defvar syntax-propertize-function nil
+  ;; Rather than a -functions hook, this is a -function because it's easier
+  ;; to do a single scan than several scans: with multiple scans, one cannot
+  ;; assume that the text before point has been propertized, so syntax-ppss
+  ;; gives unreliable results (and stores them in its cache to boot, so we'd
+  ;; have to flush that cache between each function, and we couldn't use
+  ;; syntax-ppss-flush-cache since that would not only flush the cache but also
+  ;; reset syntax-propertize--done which should not be done in this case).
+  "Mode-specific function to apply the syntax-table properties.
+Called with 2 arguments: START and END.")
+
+(defvar syntax-propertize-chunk-size 500)
+
+(defvar syntax-propertize-extend-region-functions
+  '(syntax-propertize-wholelines)
+  "Special hook run just before proceeding to propertize a region.
+This is used to allow major modes to help `syntax-propertize' find safe buffer
+positions as beginning and end of the propertized region.  Its most common use
+is to solve the problem of /identification/ of multiline elements by providing
+a function that tries to find such elements and move the boundaries such that
+they do not fall in the middle of one.
+Each function is called with two arguments (START and END) and it should return
+either a cons (NEW-START . NEW-END) or nil if no adjustment should be made.
+These functions are run in turn repeatedly until they all return nil.
+Put first the functions more likely to cause a change and cheaper to compute.")
+;; Mark it as a special hook which doesn't use any global setting
+;; (i.e. doesn't obey the element t in the buffer-local value).
+(make-variable-buffer-local 'syntax-propertize-extend-region-functions)
+
+(defun syntax-propertize-wholelines (start end)
+  (goto-char start)
+  (cons (line-beginning-position)
+        (progn (goto-char end)
+               (if (bolp) (point) (line-beginning-position 2)))))
+
+(defun syntax-propertize-multiline (beg end)
+  "Let `syntax-propertize' pay attention to the syntax-multiline property."
+  (when (and (> beg (point-min))
+	     (get-text-property (1- beg) 'syntax-multiline))
+    (setq beg (or (previous-single-property-change beg 'syntax-multiline)
+		  (point-min))))
+  ;;
+  (when (get-text-property end 'font-lock-multiline)
+    (setq end (or (text-property-any end (point-max)
+				     'syntax-multiline nil)
+		  (point-max))))
+  (cons beg end))
+
+(defvar syntax-propertize--done -1
+  "Position upto which syntax-table properties have been set.")
+(make-variable-buffer-local 'syntax-propertize--done)
+
+(defun syntax-propertize--shift-groups (re n)
+  (replace-regexp-in-string
+   "\\\\(\\?\\([0-9]+\\):"
+   (lambda (s)
+     (replace-match
+      (number-to-string (+ n (string-to-number (match-string 1 s))))
+      t t s 1))
+   re t t))
+
+(defmacro syntax-propertize-rules (&rest rules)
+  "Make a function that applies RULES for use in `syntax-propertize-function'.
+The function will scan the buffer, applying the rules where they match.
+The buffer is scanned a single time, like \"lex\" would, rather than once
+per rule.
+
+Each rule has the form (REGEXP HIGHLIGHT1 ... HIGHLIGHTn), where REGEXP
+is an expression (evaluated at time of macro-expansion) that returns a regexp,
+and where HIGHLIGHTs have the form (NUMBER SYNTAX) which means to
+apply the property SYNTAX to the chars matched by the subgroup NUMBER
+of the regular expression, if NUMBER did match.
+SYNTAX is an expression that returns a value to apply as `syntax-table'
+property.  Some expressions are handled specially:
+- if SYNTAX is a string, then it is converted with `string-to-syntax';
+- if SYNTAX has the form (prog1 EXP . EXPS) then the value returned by EXP
+  will be applied to the buffer before running EXPS and if EXP is a string it
+  is also converted with `string-to-syntax'.
+The SYNTAX expression is responsible to save the `match-data' if needed
+for subsequent HIGHLIGHTs.
+Also SYNTAX is free to move point, in which case RULES may not be applied to
+some parts of the text or may be applied several times to other parts.
+
+Note: back-references in REGEXPs do not work."
+  (declare (debug (&rest (form &rest
+                               (numberp
+                                [&or stringp
+                                     ("prog1" [&or stringp def-form] def-body)
+                                     def-form])))))
+  (let* ((offset 0)
+         (branches '())
+         ;; We'd like to use a real DFA-based lexer, usually, but since Emacs
+         ;; doesn't have one yet, we fallback on building one large regexp
+         ;; and use groups to determine which branch of the regexp matched.
+         (re
+          (mapconcat
+           (lambda (rule)
+             (let ((re (eval (car rule))))
+               (when (and (assq 0 rule) (cdr rules))
+                 ;; If there's more than 1 rule, and the rule want to apply
+                 ;; highlight to match 0, create an extra group to be able to
+                 ;; tell when *this* match 0 has succeeded.
+                 (incf offset)
+                 (setq re (concat "\\(" re "\\)")))
+               (setq re (syntax-propertize--shift-groups re offset))
+               (let ((code '())
+                     (condition
+                      (cond
+                       ((assq 0 rule) (if (zerop offset) t
+                                        `(match-beginning ,offset)))
+                       ((null (cddr rule))
+                        `(match-beginning ,(+ offset (car (cadr rule)))))
+                       (t
+                        `(or ,@(mapcar
+                                (lambda (case)
+                                  `(match-beginning ,(+ offset (car case))))
+                                (cdr rule))))))
+                     (nocode t)
+                     (offset offset))
+                 ;; If some of the subgroup rules include Elisp code, then we
+                 ;; need to set the match-data so it's consistent with what the
+                 ;; code expects.  If not, then we can simply use shifted
+                 ;; offset in our own code.
+                 (unless (zerop offset)
+                   (dolist (case (cdr rule))
+                     (unless (stringp (cadr case))
+                       (setq nocode nil)))
+                   (unless nocode
+                     (push `(let ((md (match-data 'ints)))
+                              ;; Keep match 0 as is, but shift everything else.
+                              (setcdr (cdr md) (nthcdr ,(* (1+ offset) 2) md))
+                              (set-match-data md))
+                           code)
+                     (setq offset 0)))
+                 ;; Now construct the code for each subgroup rules.
+                 (dolist (case (cdr rule))
+                   (assert (null (cddr case)))
+                   (let* ((gn (+ offset (car case)))
+                          (action (nth 1 case))
+                          (thiscode
+                           (cond
+                            ((stringp action)
+                             `((put-text-property
+                                (match-beginning ,gn) (match-end ,gn)
+                                'syntax-table
+                                ',(string-to-syntax action))))
+                            ((eq (car-safe action) 'ignore)
+                             (cdr action))
+                            ((eq (car-safe action) 'prog1)
+                             (if (stringp (nth 1 action))
+                                 `((put-text-property
+                                    (match-beginning ,gn) (match-end ,gn)
+                                    'syntax-table
+                                    ',(string-to-syntax (nth 1 action)))
+                                   ,@(nthcdr 2 action))
+                               `((let ((mb (match-beginning ,gn))
+                                       (me (match-end ,gn))
+                                       (syntax ,(nth 1 action)))
+                                   (if syntax
+                                       (put-text-property
+                                        mb me 'syntax-table syntax))
+                                   ,@(nthcdr 2 action)))))
+                            (t
+                             `((let ((mb (match-beginning ,gn))
+                                     (me (match-end ,gn))
+                                     (syntax ,action))
+                                 (if syntax
+                                     (put-text-property
+                                      mb me 'syntax-table syntax))))))))
+                               
+                     (if (or (not (cddr rule)) (zerop gn))
+                         (setq code (nconc (nreverse thiscode) code))
+                       (push `(if (match-beginning ,gn)
+                                  ;; Try and generate clean code with no
+                                  ;; extraneous progn.
+                                  ,(if (null (cdr thiscode))
+                                       (car thiscode)
+                                     `(progn ,@thiscode)))
+                             code))))
+                 (push (cons condition (nreverse code))
+                       branches))
+               (incf offset (regexp-opt-depth re))
+               re))
+           rules
+           "\\|")))
+    `(lambda (start end)
+       (goto-char start)
+       (while (and (< (point) end)
+                   (re-search-forward ,re end t))
+         (cond ,@(nreverse branches))))))
+
+(defun syntax-propertize-via-font-lock (keywords)
+  "Propertize for syntax in START..END using font-lock syntax.
+KEYWORDS obeys the format used in `font-lock-syntactic-keywords'.
+The return value is a function suitable for `syntax-propertize-function'."
+  (lexical-let ((keywords keywords))
+    (lambda (start end)
+      (with-no-warnings
+        (let ((font-lock-syntactic-keywords keywords))
+          (font-lock-fontify-syntactic-keywords-region start end)
+          ;; In case it was eval'd/compiled.
+          (setq keywords font-lock-syntactic-keywords))))))
+
+(defun syntax-propertize (pos)
+  "Ensure that syntax-table properties are set upto POS."
+  (when (and syntax-propertize-function
+             (< syntax-propertize--done pos))
+    ;; (message "Needs to syntax-propertize from %s to %s"
+    ;;          syntax-propertize--done pos)
+    (set (make-local-variable 'parse-sexp-lookup-properties) t)
+    (save-excursion
+      (with-silent-modifications
+        (let* ((start (max syntax-propertize--done (point-min)))
+               (end (max pos
+                         (min (point-max)
+                              (+ start syntax-propertize-chunk-size))))
+               (funs syntax-propertize-extend-region-functions))
+          (while funs
+            (let ((new (funcall (pop funs) start end)))
+              (if (or (null new)
+                      (and (>= (car new) start) (<= (cdr new) end)))
+                  nil
+                (setq start (car new))
+                (setq end (cdr new))
+                ;; If there's been a change, we should go through the
+                ;; list again since this new position may
+                ;; warrant a different answer from one of the funs we've
+                ;; already seen.
+                (unless (eq funs
+                            (cdr syntax-propertize-extend-region-functions))
+                  (setq funs syntax-propertize-extend-region-functions)))))
+          ;; Move the limit before calling the function, so the function
+          ;; can use syntax-ppss.
+          (setq syntax-propertize--done end)
+          ;; (message "syntax-propertizing from %s to %s" start end)
+          (remove-text-properties start end
+                                  '(syntax-table nil syntax-multiline nil))
+          (funcall syntax-propertize-function start end))))))
+
+;;; Incrementally compute and memoize parser state.
+
 (defsubst syntax-ppss-depth (ppss)
   (nth 0 ppss))
 
@@ -92,6 +334,8 @@
 (defalias 'syntax-ppss-after-change-function 'syntax-ppss-flush-cache)
 (defun syntax-ppss-flush-cache (beg &rest ignored)
   "Flush the cache of `syntax-ppss' starting at position BEG."
+  ;; Set syntax-propertize to refontify anything past beg.
+  (setq syntax-propertize--done (min beg syntax-propertize--done))
   ;; Flush invalid cache entries.
   (while (and syntax-ppss-cache (> (caar syntax-ppss-cache) beg))
     (setq syntax-ppss-cache (cdr syntax-ppss-cache)))
@@ -128,6 +372,7 @@
 Point is at POS when this function returns."
   ;; Default values.
   (unless pos (setq pos (point)))
+  (syntax-propertize pos)
   ;;
   (let ((old-ppss (cdr syntax-ppss-last))
 	(old-pos (car syntax-ppss-last))

=== modified file 'lisp/font-lock.el'
--- lisp/font-lock.el	2010-09-08 16:21:23 +0000
+++ lisp/font-lock.el	2010-09-10 23:13:42 +0000
@@ -544,6 +544,8 @@
  contexts will not be affected.
 
 This is normally set via `font-lock-defaults'.")
+(make-obsolete-variable 'font-lock-syntactic-keywords
+                        'syntax-propertize-function "24.1")
 
 (defvar font-lock-syntax-table nil
   "Non-nil means use this syntax table for fontifying.
@@ -1133,8 +1135,14 @@
           (setq beg font-lock-beg end font-lock-end))
         ;; Now do the fontification.
         (font-lock-unfontify-region beg end)
-        (when font-lock-syntactic-keywords
-          (font-lock-fontify-syntactic-keywords-region beg end))
+        (when (and font-lock-syntactic-keywords
+                   (null syntax-propertize-function))
+          ;; Ensure the beginning of the file is properly syntactic-fontified.
+          (let ((start beg))
+            (when (< font-lock-syntactically-fontified start)
+              (setq start (max font-lock-syntactically-fontified (point-min)))
+              (setq font-lock-syntactically-fontified end))
+            (font-lock-fontify-syntactic-keywords-region start end)))
         (unless font-lock-keywords-only
           (font-lock-fontify-syntactically-region beg end loudly))
         (font-lock-fontify-keywords-region beg end loudly)))))
@@ -1437,11 +1445,6 @@
     ;; We wouldn't go through so much trouble if we didn't intend to use those
     ;; properties, would we?
     (set (make-local-variable 'parse-sexp-lookup-properties) t))
-  ;; Ensure the beginning of the file is properly syntactic-fontified.
-  (when (and font-lock-syntactically-fontified
-	     (< font-lock-syntactically-fontified start))
-    (setq start (max font-lock-syntactically-fontified (point-min)))
-    (setq font-lock-syntactically-fontified end))
   ;; If `font-lock-syntactic-keywords' is a symbol, get the real keywords.
   (when (symbolp font-lock-syntactic-keywords)
     (setq font-lock-syntactic-keywords (font-lock-eval-keywords
@@ -1487,6 +1490,7 @@
 (defun font-lock-fontify-syntactically-region (start end &optional loudly)
   "Put proper face on each string and comment between START and END.
 START should be at the beginning of a line."
+  (syntax-propertize end)  ; Apply any needed syntax-table properties.
   (let ((comment-end-regexp
 	 (or font-lock-comment-end-skip
 	     (regexp-quote

=== modified file 'lisp/progmodes/ada-mode.el'
--- lisp/progmodes/ada-mode.el	2010-09-08 16:21:23 +0000
+++ lisp/progmodes/ada-mode.el	2010-09-10 23:13:42 +0000
@@ -834,10 +834,7 @@
 ;;
 ;; On Emacs, this is done through the `syntax-table' text property.  The
 ;; corresponding action is applied automatically each time the buffer
-;; changes.  If `font-lock-mode' is enabled (the default) the action is
-;; set up by `font-lock-syntactic-keywords'.  Otherwise, we do it
-;; manually in `ada-after-change-function'.  The proper method is
-;; installed by `ada-handle-syntax-table-properties'.
+;; changes via syntax-propertize-function.
 ;;
 ;; on XEmacs, the `syntax-table' property does not exist and we have to use a
 ;; slow advice to `parse-partial-sexp' to do the same thing.
@@ -937,6 +934,12 @@
 	    (insert (caddar change))
 	    (setq change (cdr change)))))))
 
+(unless (eval-when-compile (fboundp 'syntax-propertize-via-font-lock))
+  ;; Before `syntax-propertize', we had to use font-lock to apply syntax-table
+  ;; properties, and in some cases we even had to do it manually (in
+  ;; `ada-after-change-function').  `ada-handle-syntax-table-properties'
+  ;; decides which method to use.
+
 (defun ada-set-syntax-table-properties ()
   "Assign `syntax-table' properties in accessible part of buffer.
 In particular, character constants are said to be strings, #...#
@@ -991,6 +994,8 @@
     ;; Take care of `syntax-table' properties manually.
     (ada-initialize-syntax-table-properties)))
 
+) ;;(not (fboundp 'syntax-propertize))
+
 ;;------------------------------------------------------------------
 ;;  Testing the grammatical context
 ;;------------------------------------------------------------------
@@ -1187,8 +1192,13 @@
        '(ada-font-lock-keywords
 	 nil t
 	 ((?\_ . "w") (?# . "."))
-	 beginning-of-line
-	 (font-lock-syntactic-keywords . ada-font-lock-syntactic-keywords)))
+	 beginning-of-line))
+
+  (if (eval-when-compile (fboundp 'syntax-propertize-via-font-lock))
+      (set (make-local-variable 'syntax-propertize-function)
+           (syntax-propertize-via-font-lock ada-font-lock-syntactic-keywords))
+    (set (make-local-variable 'font-lock-syntactic-keywords)
+         ada-font-lock-syntactic-keywords))
 
   ;; Set up support for find-file.el.
   (set (make-local-variable 'ff-other-file-alist)
@@ -1331,7 +1341,8 @@
   ;;  Run this after the hook to give the users a chance to activate
   ;;  font-lock-mode
 
-  (unless (featurep 'xemacs)
+  (unless (or (eval-when-compile (fboundp 'syntax-propertize-via-font-lock))
+              (featurep 'xemacs))
     (ada-initialize-syntax-table-properties)
     (add-hook 'font-lock-mode-hook 'ada-handle-syntax-table-properties nil t))
 

=== modified file 'lisp/progmodes/autoconf.el'
--- lisp/progmodes/autoconf.el	2010-01-13 08:35:10 +0000
+++ lisp/progmodes/autoconf.el	2010-09-10 23:13:42 +0000
@@ -43,9 +43,6 @@
 (defvar autoconf-mode-hook nil
   "Hook run by `autoconf-mode'.")
 
-(defconst autoconf-font-lock-syntactic-keywords
-  '(("\\<dnl\\>" 0 '(11))))
-
 (defconst autoconf-definition-regexp
   "AC_\\(SUBST\\|DEFINE\\(_UNQUOTED\\)?\\)(\\[*\\(\\sw+\\)\\]*")
 
@@ -94,8 +91,8 @@
        "^[ \t]*A[CM]_\\(\\sw\\|\\s_\\)+")
   (set (make-local-variable 'comment-start) "dnl ")
   (set (make-local-variable 'comment-start-skip) "\\(?:\\<dnl\\|#\\) +")
-  (set (make-local-variable 'font-lock-syntactic-keywords)
-       autoconf-font-lock-syntactic-keywords)
+  (set (make-local-variable 'syntax-propertize-function)
+       (syntax-propertize-rules ("\\<dnl\\>" (0 "<"))))
   (set (make-local-variable 'font-lock-defaults)
        `(autoconf-font-lock-keywords nil nil (("_" . "w"))))
   (set (make-local-variable 'imenu-generic-expression)

=== modified file 'lisp/progmodes/cfengine.el'
--- lisp/progmodes/cfengine.el	2010-01-13 08:35:10 +0000
+++ lisp/progmodes/cfengine.el	2010-09-10 23:13:42 +0000
@@ -83,12 +83,6 @@
     ;; File, acl &c in group:   { token ... }
     ("{[ \t]*\\([^ \t\n]+\\)" 1 font-lock-constant-face)))
 
-(defconst cfengine-font-lock-syntactic-keywords
-  ;; In the main syntax-table, backslash is marked as a punctuation, because
-  ;; of its use in DOS-style directory separators.  Here we try to recognize
-  ;; the cases where backslash is used as an escape inside strings.
-  '(("\\(\\(?:\\\\\\)+\\)\"" 1 "\\")))
-
 (defvar cfengine-imenu-expression
   `((nil ,(concat "^[ \t]*" (eval-when-compile
 			      (regexp-opt cfengine-actions t))
@@ -237,13 +231,15 @@
   (set (make-local-variable 'fill-paragraph-function)
        #'cfengine-fill-paragraph)
   (define-abbrev-table 'cfengine-mode-abbrev-table cfengine-mode-abbrevs)
-  ;; Fixme: Use `font-lock-syntactic-keywords' to set the args of
-  ;; functions in evaluated classes to string syntax, and then obey
-  ;; syntax properties.
   (setq font-lock-defaults
-	'(cfengine-font-lock-keywords nil nil nil beginning-of-line
-          (font-lock-syntactic-keywords
-           . cfengine-font-lock-syntactic-keywords)))
+	'(cfengine-font-lock-keywords nil nil nil beginning-of-line))
+  ;; Fixme: set the args of functions in evaluated classes to string
+  ;; syntax, and then obey syntax properties.
+  (set (make-local-variable 'syntax-propertize-function)
+       ;; In the main syntax-table, \ is marked as a punctuation, because
+       ;; of its use in DOS-style directory separators.  Here we try to
+       ;; recognize the cases where \ is used as an escape inside strings.
+       (syntax-propertize-rules ("\\(\\(?:\\\\\\)+\\)\"" (1 "\\"))))
   (setq imenu-generic-expression cfengine-imenu-expression)
   (set (make-local-variable 'beginning-of-defun-function)
        #'cfengine-beginning-of-defun)

=== modified file 'lisp/progmodes/cperl-mode.el'
--- lisp/progmodes/cperl-mode.el	2010-05-07 03:21:06 +0000
+++ lisp/progmodes/cperl-mode.el	2010-09-10 23:13:42 +0000
@@ -1840,7 +1840,13 @@
   (make-local-variable 'cperl-syntax-state)
   (setq cperl-syntax-state nil)		; reset syntaxification cache
   (if cperl-use-syntax-table-text-property
-      (progn
+      (if (boundp 'syntax-propertize-function)
+          (progn
+            ;; Reset syntaxification cache.
+            (set (make-local-variable 'cperl-syntax-done-to) nil)
+            (set (make-local-variable 'syntax-propertize-function)
+                 (lambda (start end)
+                   (goto-char start) (cperl-fontify-syntaxically end))))
 	(make-local-variable 'parse-sexp-lookup-properties)
 	;; Do not introduce variable if not needed, we check it!
 	(set 'parse-sexp-lookup-properties t)

=== modified file 'lisp/progmodes/fortran.el'
--- lisp/progmodes/fortran.el	2010-09-08 16:21:23 +0000
+++ lisp/progmodes/fortran.el	2010-09-10 23:13:42 +0000
@@ -483,6 +483,7 @@
   "Maximum highlighting for Fortran mode.
 Consists of level 3 plus all other intrinsics not already highlighted.")
 
+(defvar fortran--font-lock-syntactic-keywords)
 ;; Comments are real pain in Fortran because there is no way to
 ;; represent the standard comment syntax in an Emacs syntax table.
 ;; (We can do so for F90-style).  Therefore an unmatched quote in a
@@ -887,9 +888,11 @@
           fortran-font-lock-keywords-3
           fortran-font-lock-keywords-4)
          nil t ((?/ . "$/") ("_$" . "w"))
-         fortran-beginning-of-subprogram
-         (font-lock-syntactic-keywords
-          . fortran-font-lock-syntactic-keywords)))
+         fortran-beginning-of-subprogram))
+  (set (make-local-variable 'fortran--font-lock-syntactic-keywords)
+       (fortran-make-syntax-propertize-function))
+  (set (make-local-variable 'syntax-propertize-function)
+       (syntax-propertize-via-font-lock fortran--font-lock-syntactic-keywords))
   (set (make-local-variable 'imenu-case-fold-search) t)
   (set (make-local-variable 'imenu-generic-expression)
        fortran-imenu-generic-expression)
@@ -917,10 +920,13 @@
               (when (eq major-mode 'fortran-mode)
                 (setq fortran-line-length nchars
                       fill-column fortran-line-length
-                      new (fortran-font-lock-syntactic-keywords))
+                      new (fortran-make-syntax-propertize-function))
                 ;; Refontify only if necessary.
-                (unless (equal new font-lock-syntactic-keywords)
-                  (setq font-lock-syntactic-keywords new)
+                (unless (equal new fortran--font-lock-syntactic-keywords)
+                  (setq fortran--font-lock-syntactic-keywords new)
+                  (setq syntax-propertize-function
+                        (syntax-propertize-via-font-lock new))
+                  (syntax-ppss-flush-cache (point-min))
                   (if font-lock-mode (font-lock-mode 1))))))
           (if global
               (buffer-list)

=== modified file 'lisp/progmodes/gud.el'
--- lisp/progmodes/gud.el	2010-07-28 10:08:16 +0000
+++ lisp/progmodes/gud.el	2010-09-10 23:13:42 +0000
@@ -3123,10 +3123,12 @@
     ("\\$\\(\\w+\\)" (1 font-lock-variable-name-face))
     ("^\\s-*\\(\\w\\(\\w\\|\\s_\\)*\\)" (1 font-lock-keyword-face))))
 
-(defvar gdb-script-font-lock-syntactic-keywords
-  '(("^document\\s-.*\\(\n\\)" (1 "< b"))
-    ("^end\\>"
-     (0 (unless (eq (match-beginning 0) (point-min))
+(defconst gdb-script-syntax-propertize-function
+  (syntax-propertize-rules
+   ("^document\\s-.*\\(\n\\)" (1 "< b"))
+   ("^end\\(\\>\\)"
+    (1 (ignore
+        (unless (eq (match-beginning 0) (point-min))
           ;; We change the \n in front, which is more difficult, but results
           ;; in better highlighting.  If the doc is empty, the single \n is
           ;; both the beginning and the end of the docstring, which can't be
@@ -3138,10 +3140,9 @@
                              'syntax-table (eval-when-compile
                                              (string-to-syntax "> b")))
           ;; Make sure that rehighlighting the previous line won't erase our
-          ;; syntax-table property.
+          ;; syntax-table property and that modifying `end' will.
           (put-text-property (1- (match-beginning 0)) (match-end 0)
-                             'font-lock-multiline t)
-          nil)))))
+                             'syntax-multiline t)))))))
 
 (defun gdb-script-font-lock-syntactic-face (state)
   (cond
@@ -3239,10 +3240,13 @@
        #'gdb-script-end-of-defun)
   (set (make-local-variable 'font-lock-defaults)
        '(gdb-script-font-lock-keywords nil nil ((?_ . "w")) nil
-	 (font-lock-syntactic-keywords
-	  . gdb-script-font-lock-syntactic-keywords)
 	 (font-lock-syntactic-face-function
-	  . gdb-script-font-lock-syntactic-face))))
+	  . gdb-script-font-lock-syntactic-face)))
+  ;; Recognize docstrings.
+  (set (make-local-variable 'syntax-propertize-function)
+       gdb-script-syntax-propertize-function)
+  (add-hook 'syntax-propertize-extend-region-functions
+            #'syntax-propertize-multiline 'append 'local))
 
 
 ;;; tooltips for GUD

=== modified file 'lisp/progmodes/js.el'
--- lisp/progmodes/js.el	2010-09-08 16:21:23 +0000
+++ lisp/progmodes/js.el	2010-09-10 23:13:42 +0000
@@ -1660,18 +1660,19 @@
 ;; XXX: Javascript can continue a regexp literal across lines so long
 ;; as the newline is escaped with \. Account for that in the regexp
 ;; below.
-(defconst js--regexp-literal
+(eval-and-compile
+  (defconst js--regexp-literal
   "[=(,:]\\(?:\\s-\\|\n\\)*\\(/\\)\\(?:\\\\/\\|[^/*]\\)\\(?:\\\\/\\|[^/]\\)*\\(/\\)"
   "Regexp matching a JavaScript regular expression literal.
 Match groups 1 and 2 are the characters forming the beginning and
-end of the literal.")
-
-;; we want to match regular expressions only at the beginning of
-;; expressions
-(defconst js-font-lock-syntactic-keywords
-  `((,js--regexp-literal (1 "|") (2 "|")))
-  "Syntactic font lock keywords matching regexps in JavaScript.
-See `font-lock-keywords'.")
+end of the literal."))
+
+
+(defconst js-syntax-propertize-function
+  (syntax-propertize-rules
+   ;; We want to match regular expressions only at the beginning of
+   ;; expressions.
+   (js--regexp-literal (1 "\"") (2 "\""))))
 
 ;;; Indentation
 
@@ -3303,10 +3304,9 @@
 
   (set (make-local-variable 'open-paren-in-column-0-is-defun-start) nil)
   (set (make-local-variable 'font-lock-defaults)
-       (list js--font-lock-keywords
-	     nil nil nil nil
-	     '(font-lock-syntactic-keywords
-               . js-font-lock-syntactic-keywords)))
+       '(js--font-lock-keywords))
+  (set (make-local-variable 'syntax-propertize-function)
+       js-syntax-propertize-function)
 
   (set (make-local-variable 'parse-sexp-ignore-comments) t)
   (set (make-local-variable 'parse-sexp-lookup-properties) t)

=== modified file 'lisp/progmodes/make-mode.el'
--- lisp/progmodes/make-mode.el	2010-08-22 20:02:16 +0000
+++ lisp/progmodes/make-mode.el	2010-09-10 23:13:42 +0000
@@ -505,15 +505,16 @@
    cpp-font-lock-keywords))
 
 
-(defconst makefile-font-lock-syntactic-keywords
-  ;; From sh-script.el.
-  ;; A `#' begins a comment in sh when it is unquoted and at the beginning
-  ;; of a word.  In the shell, words are separated by metacharacters.
-  ;; The list of special chars is taken from the single-unix spec of the
-  ;; shell command language (under `quoting') but with `$' removed.
-  '(("[^|&;<>()`\\\"' \t\n]\\(#+\\)" 1 "_")
-    ;; Change the syntax of a quoted newline so that it does not end a comment.
-    ("\\\\\n" 0 ".")))
+(defconst makefile-syntax-propertize-function
+  (syntax-propertize-rules
+   ;; From sh-script.el.
+   ;; A `#' begins a comment in sh when it is unquoted and at the beginning
+   ;; of a word.  In the shell, words are separated by metacharacters.
+   ;; The list of special chars is taken from the single-unix spec of the
+   ;; shell command language (under `quoting') but with `$' removed.
+   ("[^|&;<>()`\\\"' \t\n]\\(#+\\)" (1 "_"))
+   ;; Change the syntax of a quoted newline so that it does not end a comment.
+   ("\\\\\n" (0 "."))))
 
 (defvar makefile-imenu-generic-expression
   `(("Dependencies" makefile-previous-dependency 1)
@@ -872,9 +873,9 @@
        '(makefile-font-lock-keywords
          nil nil
          ((?$ . "."))
-         backward-paragraph
-         (font-lock-syntactic-keywords
-          . makefile-font-lock-syntactic-keywords)))
+         backward-paragraph))
+  (set (make-local-variable 'syntax-propertize-function)
+       makefile-syntax-propertize-function)
 
   ;; Add-log.
   (set (make-local-variable 'add-log-current-defun-function)
@@ -943,15 +944,9 @@
 (define-derived-mode makefile-imake-mode makefile-mode "Imakefile"
   "An adapted `makefile-mode' that knows about imake."
   :syntax-table makefile-imake-mode-syntax-table
-  (let ((base `(makefile-imake-font-lock-keywords ,@(cdr font-lock-defaults)))
-	new)
-    ;; Remove `font-lock-syntactic-keywords' entry from font-lock-defaults.
-    (mapc (lambda (elt)
-	    (unless (and (consp elt)
-			 (eq (car elt) 'font-lock-syntactic-keywords))
-	      (setq new (cons elt new))))
-	  base)
-    (setq font-lock-defaults (nreverse new))))
+  (set (make-local-variable 'syntax-propertize-function) nil)
+  (setq font-lock-defaults
+        `(makefile-imake-font-lock-keywords ,@(cdr font-lock-defaults))))
 
 
 

=== modified file 'lisp/progmodes/mixal-mode.el'
--- lisp/progmodes/mixal-mode.el	2010-03-14 21:15:02 +0000
+++ lisp/progmodes/mixal-mode.el	2010-09-10 23:13:42 +0000
@@ -89,7 +89,7 @@
 (defvar mixal-mode-syntax-table
   (let ((st (make-syntax-table)))
     ;; We need to do a bit more to make fontlocking for comments work.
-    ;; See mixal-font-lock-syntactic-keywords.
+    ;; See use of syntax-propertize-function.
     ;; (modify-syntax-entry ?* "<" st)
     (modify-syntax-entry ?\n ">" st)
     st)
@@ -1028,13 +1028,14 @@
 
 
 ;;; Font-locking:
-(defvar mixal-font-lock-syntactic-keywords
-  ;; Normal comments start with a * in column 0 and end at end of line.
-  '(("^\\*" (0 '(11)))                  ;(string-to-syntax "<") == '(11)
-    ;; Every line can end with a comment which is placed after the operand.
-    ;; I assume here that mnemonics without operands can not have a comment.
-    ("^[[:alnum:]]*[ \t]+[[:alnum:]]+[ \t]+[^ \n\t]+[ \t]*\\([ \t]\\)[^\n \t]"
-     (1 '(11)))))
+(defconst mixal-syntax-propertize-function
+  (syntax-propertize-rules
+   ;; Normal comments start with a * in column 0 and end at end of line.
+   ("^\\*" (0 "<"))
+   ;; Every line can end with a comment which is placed after the operand.
+   ;; I assume here that mnemonics without operands can not have a comment.
+   ("^[[:alnum:]]*[ \t]+[[:alnum:]]+[ \t]+[^ \n\t]+[ \t]*\\([ \t]\\)[^\n \t]"
+    (1 "<"))))
 
 (defvar mixal-font-lock-keywords
   `(("^\\([A-Z0-9a-z]+\\)"
@@ -1110,9 +1111,9 @@
   (set (make-local-variable 'comment-start) "*")
   (set (make-local-variable 'comment-start-skip) "^\\*[ \t]*")
   (set (make-local-variable 'font-lock-defaults)
-       `(mixal-font-lock-keywords nil nil nil nil
-         (font-lock-syntactic-keywords . ,mixal-font-lock-syntactic-keywords)
-         (parse-sexp-lookup-properties . t)))
+       `(mixal-font-lock-keywords))
+  (set (make-local-variable 'syntax-propertize-function)
+       mixal-syntax-propertize-function)
   ;; might add an indent function in the future
   ;;  (set (make-local-variable 'indent-line-function) 'mixal-indent-line)
   (set (make-local-variable 'compile-command) (concat "mixasm "

=== modified file 'lisp/progmodes/octave-mod.el'
--- lisp/progmodes/octave-mod.el	2010-09-08 16:21:23 +0000
+++ lisp/progmodes/octave-mod.el	2010-09-10 23:13:42 +0000
@@ -179,38 +179,28 @@
 	 '(3 font-lock-function-name-face nil t)))
   "Additional Octave expressions to highlight.")
 
-(defvar octave-font-lock-syntactic-keywords
+(defun octave-syntax-propertize-function (start end)
+  (goto-char start)
+  (octave-syntax-propertize-sqs end)
+  (funcall (syntax-propertize-rules
   ;; Try to distinguish the string-quotes from the transpose-quotes.
-  '(("[[({,; ]\\('\\)" (1 "\"'"))
-    (octave-font-lock-close-quotes)))
+            ("[[({,; ]\\('\\)"
+             (1 (prog1 "\"'" (octave-syntax-propertize-sqs end)))))
+           (point) end))
 
-(defun octave-font-lock-close-quotes (limit)
-  "Fix the syntax-table of the closing quotes of single-quote strings."
-  ;; Freely inspired from perl-font-lock-special-syntactic-constructs.
-  (let ((state (syntax-ppss)))
-    (while (< (point) limit)
-      (cond
-       ((eq (nth 3 state) ?\')
+(defun octave-syntax-propertize-sqs (end)
+  "Propertize the content/end of single-quote strings."
+  (when (eq (nth 3 (syntax-ppss)) ?\')
         ;; A '..' string.
-        (save-excursion
-          (when (re-search-forward "\\(?:\\=\\|[^']\\)\\(?:''\\)*\\('\\)[^']"
-                                   nil t)
-            (goto-char (1- (point)))
-            ;; Remove any syntax-table property we may have applied to
-            ;; some of the (doubled) single quotes within the string.
-            ;; Since these are the only chars on which we place properties,
-            ;; we take a shortcut and just remove all properties.
-            (remove-text-properties (1+ (nth 8 state)) (match-beginning 1)
-                                    '(syntax-table nil))
+    (when (re-search-forward
+           "\\(?:\\=\\|[^']\\)\\(?:''\\)*\\('\\)\\($\\|[^']\\)" end 'move)
+      (goto-char (match-beginning 2))
             (when (eq (char-before (match-beginning 1)) ?\\)
               ;; Backslash cannot escape a single quote.
               (put-text-property (1- (match-beginning 1)) (match-beginning 1)
                                  'syntax-table (string-to-syntax ".")))
             (put-text-property (match-beginning 1) (match-end 1)
-                               'syntax-table (string-to-syntax "\"'"))))))
-
-      (setq state (parse-partial-sexp (point) limit nil nil state
-				      'syntax-table)))))
+                         'syntax-table (string-to-syntax "\"'")))))
 
 (defcustom inferior-octave-buffer "*Inferior Octave*"
   "Name of buffer for running an inferior Octave process."
@@ -684,9 +674,10 @@
   (set (make-local-variable 'normal-auto-fill-function) 'octave-auto-fill)
 
   (set (make-local-variable 'font-lock-defaults)
-       '(octave-font-lock-keywords nil nil nil nil
-         (font-lock-syntactic-keywords . octave-font-lock-syntactic-keywords)
-         (parse-sexp-lookup-properties . t)))
+       '(octave-font-lock-keywords))
+
+  (set (make-local-variable 'syntax-propertize-function)
+       #'octave-syntax-propertize-function)
 
   (set (make-local-variable 'imenu-generic-expression)
        octave-mode-imenu-generic-expression)

=== modified file 'lisp/progmodes/perl-mode.el'
--- lisp/progmodes/perl-mode.el	2010-01-13 08:35:10 +0000
+++ lisp/progmodes/perl-mode.el	2010-09-10 23:13:42 +0000
@@ -250,59 +250,76 @@
 ;; y /.../.../
 ;;
 ;; <file*glob>
-(defvar perl-font-lock-syntactic-keywords
-  ;; TODO: here-documents ("<<\\(\\sw\\|['\"]\\)")
-  `(;; Turn POD into b-style comments
-    ("^\\(=\\)\\sw" (1 "< b"))
-    ("^=cut[ \t]*\\(\n\\)" (1 "> b"))
-    ;; Catch ${ so that ${var} doesn't screw up indentation.
-    ;; This also catches $' to handle 'foo$', although it should really
-    ;; check that it occurs inside a '..' string.
-    ("\\(\\$\\)[{']" (1 ". p"))
-    ;; Handle funny names like $DB'stop.
-    ("\\$ ?{?^?[_a-zA-Z][_a-zA-Z0-9]*\\('\\)[_a-zA-Z]" (1 "_"))
-    ;; format statements
-    ("^[ \t]*format.*=[ \t]*\\(\n\\)" (1 '(7)))
-    ;; Funny things in `sub' arg-specs like `sub myfun ($)' or `sub ($)'.
-    ;; Be careful not to match "sub { (...) ... }".
-    ("\\<sub\\(?:[[:space:]]+[^{}[:punct:][:space:]]+\\)?[[:space:]]*(\\([^)]+\\))"
-     1 '(1))
-    ;; Regexp and funny quotes.  Distinguishing a / that starts a regexp
-    ;; match from the division operator is ...interesting.
-    ;; Basically, / is a regexp match if it's preceded by an infix operator
-    ;; (or some similar separator), or by one of the special keywords
-    ;; corresponding to builtin functions that can take their first arg
-    ;; without parentheses.  Of course, that presume we're looking at the
-    ;; *opening* slash.  We can afford to mis-match the closing ones
-    ;; here, because they will be re-treated separately later in
-    ;; perl-font-lock-special-syntactic-constructs.
-    (,(concat "\\(?:\\(?:\\(?:^\\|[^$@&%[:word:]]\\)"
-              (regexp-opt '("split" "if" "unless" "until" "while" "split"
-                            "grep" "map" "not" "or" "and"))
-              "\\)\\|[?:.,;=!~({[]\\|\\(^\\)\\)[ \t\n]*\\(/\\)")
-     (2 (if (and (match-end 1)
-                 (save-excursion
-                   (goto-char (match-end 1))
-                   ;; Not 100% correct since we haven't finished setting up
-                   ;; the syntax-table before point, but better than nothing.
-                   (forward-comment (- (point-max)))
-                   (put-text-property (point) (match-end 2)
-                                      'jit-lock-defer-multiline t)
-                   (not (memq (char-before)
-                              '(?? ?: ?. ?, ?\; ?= ?! ?~ ?\( ?\[)))))
-            nil ;; A division sign instead of a regexp-match.
-          '(7))))
-    ("\\(^\\|[?:.,;=!~({[ \t]\\)\\([msy]\\|q[qxrw]?\\|tr\\)\\>\\s-*\\([^])}> \n\t]\\)"
-     ;; Nasty cases:
-     ;; /foo/m  $a->m  $#m $m @m %m
-     ;; \s (appears often in regexps).
-     ;; -s file
-     (3 (if (assoc (char-after (match-beginning 3))
-		   perl-quote-like-pairs)
-	    '(15) '(7))))
-    ;; Find and mark the end of funny quotes and format statements.
-    (perl-font-lock-special-syntactic-constructs)
-    ))
+(defun perl-syntax-propertize-function (start end)
+  (let ((case-fold-search nil))
+    (goto-char start)
+    (perl-syntax-propertize-special-constructs end)
+    ;; TODO: here-documents ("<<\\(\\sw\\|['\"]\\)")
+    (funcall
+     (syntax-propertize-rules
+      ;; Turn POD into b-style comments.  Place the cut rule first since it's
+      ;; more specific.
+      ("^=cut\\>.*\\(\n\\)" (1 "> b"))
+      ("^\\(=\\)\\sw" (1 "< b"))
+      ;; Catch ${ so that ${var} doesn't screw up indentation.
+      ;; This also catches $' to handle 'foo$', although it should really
+      ;; check that it occurs inside a '..' string.
+      ("\\(\\$\\)[{']" (1 ". p"))
+      ;; Handle funny names like $DB'stop.
+      ("\\$ ?{?^?[_a-zA-Z][_a-zA-Z0-9]*\\('\\)[_a-zA-Z]" (1 "_"))
+      ;; format statements
+      ("^[ \t]*format.*=[ \t]*\\(\n\\)"
+       (1 (prog1 "\"" (perl-syntax-propertize-special-constructs end))))
+      ;; Funny things in `sub' arg-specs like `sub myfun ($)' or `sub ($)'.
+      ;; Be careful not to match "sub { (...) ... }".
+      ("\\<sub\\(?:[[:space:]]+[^{}[:punct:][:space:]]+\\)?[[:space:]]*(\\([^)]+\\))"
+       (1 "."))
+      ;; Regexp and funny quotes.  Distinguishing a / that starts a regexp
+      ;; match from the division operator is ...interesting.
+      ;; Basically, / is a regexp match if it's preceded by an infix operator
+      ;; (or some similar separator), or by one of the special keywords
+      ;; corresponding to builtin functions that can take their first arg
+      ;; without parentheses.  Of course, that presume we're looking at the
+      ;; *opening* slash.  We can afford to mis-match the closing ones
+      ;; here, because they will be re-treated separately later in
+      ;; perl-font-lock-special-syntactic-constructs.
+      ((concat "\\(?:\\(?:^\\|[^$@&%[:word:]]\\)"
+               (regexp-opt '("split" "if" "unless" "until" "while" "split"
+                             "grep" "map" "not" "or" "and"))
+               "\\|[?:.,;=!~({[]\\|\\(^\\)\\)[ \t\n]*\\(/\\)")
+       (2 (ignore
+           (if (and (match-end 1)       ; / at BOL.
+                    (save-excursion
+                      (goto-char (match-end 1))
+                      (forward-comment (- (point-max)))
+                      (put-text-property (point) (match-end 2)
+                                         'syntax-multiline t)
+                      (not (memq (char-before)
+                                 '(?? ?: ?. ?, ?\; ?= ?! ?~ ?\( ?\[)))))
+               nil ;; A division sign instead of a regexp-match.
+             (put-text-property (match-beginning 2) (match-end 2)
+                                'syntax-table (string-to-syntax "\""))
+             (perl-syntax-propertize-special-constructs end)))))
+      ("\\(^\\|[?:.,;=!~({[ \t]\\)\\([msy]\\|q[qxrw]?\\|tr\\)\\>\\s-*\\([^])}> \n\t]\\)"
+       ;; Nasty cases:
+       ;; /foo/m  $a->m  $#m $m @m %m
+       ;; \s (appears often in regexps).
+       ;; -s file
+       ;; sub tr {...}
+       (3 (ignore
+           (if (save-excursion (goto-char (match-beginning 0))
+                               (forward-word -1)
+                               (looking-at-p "sub[ \t\n]"))
+               ;; This is defining a function.
+               nil
+             (put-text-property (match-beginning 3) (match-end 3)
+                                'syntax-table
+                                (if (assoc (char-after (match-beginning 3))
+                                           perl-quote-like-pairs)
+                                    (string-to-syntax "|")
+                                  (string-to-syntax "\"")))
+             (perl-syntax-propertize-special-constructs end))))))
+     (point) end)))
 
 (defvar perl-empty-syntax-table
   (let ((st (copy-syntax-table)))
@@ -321,95 +338,123 @@
       (modify-syntax-entry close ")" st))
     st))
 
-(defun perl-font-lock-special-syntactic-constructs (limit)
-  ;; We used to do all this in a font-lock-syntactic-face-function, which
-  ;; did not work correctly because sometimes some parts of the buffer are
-  ;; treated with font-lock-syntactic-keywords but not with
-  ;; font-lock-syntactic-face-function (mostly because of
-  ;; font-lock-syntactically-fontified).  That meant that some syntax-table
-  ;; properties were missing.  So now we do the parse-partial-sexp loop
-  ;; ourselves directly from font-lock-syntactic-keywords, so we're sure
-  ;; it's done when necessary.
+(defun perl-syntax-propertize-special-constructs (limit)
+  "Propertize special constructs like regexps and formats."
   (let ((state (syntax-ppss))
         char)
-    (while (< (point) limit)
-      (cond
-       ((or (null (setq char (nth 3 state)))
-            (and (characterp char) (eq (char-syntax (nth 3 state)) ?\")))
-        ;; Normal text, or comment, or docstring, or normal string.
-        nil)
-       ((eq (nth 3 state) ?\n)
-        ;; A `format' command.
-        (save-excursion
-          (when (and (re-search-forward "^\\s *\\.\\s *$" nil t)
-                     (not (eobp)))
-            (put-text-property (point) (1+ (point)) 'syntax-table '(7)))))
-       (t
-        ;; This is regexp like quote thingy.
-        (setq char (char-after (nth 8 state)))
-        (save-excursion
-          (let ((twoargs (save-excursion
-                           (goto-char (nth 8 state))
-                           (skip-syntax-backward " ")
-                           (skip-syntax-backward "w")
-                           (member (buffer-substring
-                                    (point) (progn (forward-word 1) (point)))
-                                   '("tr" "s" "y"))))
-                (close (cdr (assq char perl-quote-like-pairs)))
-                (pos (point))
-                (st (perl-quote-syntax-table char)))
-            (if (not close)
-                ;; The closing char is the same as the opening char.
-                (with-syntax-table st
-                  (parse-partial-sexp (point) (point-max)
-                                      nil nil state 'syntax-table)
-                  (when twoargs
-                    (parse-partial-sexp (point) (point-max)
-                                        nil nil state 'syntax-table)))
-              ;; The open/close chars are matched like () [] {} and <>.
-              (let ((parse-sexp-lookup-properties nil))
-                (condition-case err
-                    (progn
-                      (with-syntax-table st
-                        (goto-char (nth 8 state)) (forward-sexp 1))
-                      (when twoargs
-                        (save-excursion
-                          ;; Skip whitespace and make sure that font-lock will
-                          ;; refontify the second part in the proper context.
-                          (put-text-property
-                           (point) (progn (forward-comment (point-max)) (point))
-                           'font-lock-multiline t)
-                          ;;
-                          (unless
-                              (or (eobp)
-                                  (save-excursion
-                                    (with-syntax-table
-                                        (perl-quote-syntax-table (char-after))
-                                      (forward-sexp 1))
-                                    (put-text-property pos (line-end-position)
-                                                       'jit-lock-defer-multiline t)
-                                    (looking-at "\\s-*\\sw*e")))
-                            (put-text-property (point) (1+ (point))
-                                               'syntax-table
-                                               (if (assoc (char-after)
-                                                          perl-quote-like-pairs)
-                                                   '(15) '(7)))))))
-                  ;; The arg(s) is not terminated, so it extends until EOB.
-                  (scan-error (goto-char (point-max))))))
-            ;; Point is now right after the arg(s).
-            ;; Erase any syntactic marks within the quoted text.
-            (put-text-property pos (1- (point)) 'syntax-table nil)
-            (when (eq (char-before (1- (point))) ?$)
-              (put-text-property (- (point) 2) (1- (point))
-                                 'syntax-table '(1)))
-            (put-text-property (1- (point)) (point)
-                               'syntax-table (if close '(15) '(7)))))))
-
-      (setq state (parse-partial-sexp (point) limit nil nil state
-				      'syntax-table))))
-  ;; Tell font-lock that this needs not further processing.
-  nil)
-
+    (cond
+     ((or (null (setq char (nth 3 state)))
+          (and (characterp char) (eq (char-syntax (nth 3 state)) ?\")))
+      ;; Normal text, or comment, or docstring, or normal string.
+      nil)
+     ((eq (nth 3 state) ?\n)
+      ;; A `format' command.
+      (when (re-search-forward "^\\s *\\.\\s *\n" limit 'move)
+        (put-text-property (1- (point)) (point)
+                           'syntax-table (string-to-syntax "\""))))
+     (t
+      ;; This is regexp like quote thingy.
+      (setq char (char-after (nth 8 state)))
+      (let ((twoargs (save-excursion
+                       (goto-char (nth 8 state))
+                       (skip-syntax-backward " ")
+                       (skip-syntax-backward "w")
+                       (member (buffer-substring
+                                (point) (progn (forward-word 1) (point)))
+                               '("tr" "s" "y"))))
+            (close (cdr (assq char perl-quote-like-pairs)))
+            (st (perl-quote-syntax-table char)))
+        (when (with-syntax-table st
+		(if close
+		    ;; For paired delimiters, Perl allows nesting them, but
+		    ;; since we treat them as strings, Emacs does not count
+		    ;; those delimiters in `state', so we don't know how deep
+		    ;; we are: we have to go back to the beginning of this
+		    ;; "string" and count from there.
+		    (condition-case nil
+                        (progn
+			  ;; Start after the first char since it doesn't have
+			  ;; paren-syntax (an alternative would be to let-bind
+			  ;; parse-sexp-lookup-properties).
+			  (goto-char (1+ (nth 8 state)))
+			  (up-list 1)
+			  t)
+		      (scan-error nil))
+		  (not (or (nth 8 (parse-partial-sexp
+				   (point) limit nil nil state 'syntax-table))
+			   ;; If we have a self-paired opener and a twoargs
+			   ;; command, the form is s/../../ so we have to skip
+			   ;; a second time.
+			   ;; In the case of s{...}{...}, we only handle the
+			   ;; first part here and the next below.
+			   (when (and twoargs (not close))
+			     (nth 8 (parse-partial-sexp
+				     (point) limit
+				     nil nil state 'syntax-table)))))))
+	  ;; Point is now right after the arg(s).
+	  (when (eq (char-before (1- (point))) ?$)
+	    (put-text-property (- (point) 2) (1- (point))
+			       'syntax-table '(1)))
+	  (put-text-property (1- (point)) (point)
+			     'syntax-table
+			     (if close
+				 (string-to-syntax "|")
+			       (string-to-syntax "\"")))
+	  ;; If we have two args with a non-self-paired starter (e.g.
+	  ;; s{...}{...}) we're right after the first arg, so we still have to
+	  ;; handle the second part.
+	  (when (and twoargs close)
+            ;; Skip whitespace and make sure that font-lock will
+            ;; refontify the second part in the proper context.
+            (put-text-property
+             (point) (progn (forward-comment (point-max)) (point))
+	     'syntax-multiline t)
+            ;;
+	    (when (< (point) limit)
+              (put-text-property (point) (1+ (point))
+                                 'syntax-table
+                                 (if (assoc (char-after)
+                                            perl-quote-like-pairs)
+                                     ;; Put an `e' in the cdr to mark this
+                                     ;; char as "second arg starter".
+				     (string-to-syntax "|e")
+				   (string-to-syntax "\"e")))
+	      (forward-char 1)
+	      ;; Re-use perl-syntax-propertize-special-constructs to handle the
+	      ;; second part (the first delimiter of second part can't be
+	      ;; preceded by "s" or "tr" or "y", so it will not be considered
+	      ;; as twoarg).
+	      (perl-syntax-propertize-special-constructs limit)))))))))
+
+(defun perl-font-lock-syntactic-face-function (state)
+  (cond
+   ((and (nth 3 state)
+         (eq ?e (cdr-safe (get-text-property (nth 8 state) 'syntax-table)))
+         ;; This is a second-arg of s{..}{...} form; let's check if this second
+         ;; arg is executable code rather than a string.  For that, we need to
+         ;; look for an "e" after this second arg, so we have to hunt for the
+         ;; end of the arg.  Depending on whether the whole arg has already
+         ;; been syntax-propertized or not, the end-char will have different
+         ;; syntaxes, so let's ignore syntax-properties temporarily so we can
+         ;; pretend it has not been syntax-propertized yet.
+         (let* ((parse-sexp-lookup-properties nil)
+                (char (char-after (nth 8 state)))
+                (paired (assq char perl-quote-like-pairs)))
+           (with-syntax-table (perl-quote-syntax-table char)
+             (save-excursion
+               (if (not paired)
+                   (parse-partial-sexp (point) (point-max)
+                                       nil nil state 'syntax-table)
+                 (condition-case nil
+                     (progn
+                       (goto-char (1+ (nth 8 state)))
+                       (up-list 1))
+                   (scan-error (goto-char (point-max)))))
+               (put-text-property (nth 8 state) (point)
+                                  'jit-lock-defer-multiline t)
+               (looking-at "[ \t]*\\sw*e")))))
+    nil)
+   (t (funcall (default-value 'font-lock-syntactic-face-function) state))))
 
 (defcustom perl-indent-level 4
   "*Indentation of Perl statements with respect to containing block."
@@ -574,9 +619,12 @@
 			      perl-font-lock-keywords-1
 			      perl-font-lock-keywords-2)
 			     nil nil ((?\_ . "w")) nil
-			     (font-lock-syntactic-keywords
-			      . perl-font-lock-syntactic-keywords)
-			     (parse-sexp-lookup-properties . t)))
+                             (font-lock-syntactic-face-function
+                              . perl-font-lock-syntactic-face-function)))
+  (set (make-local-variable 'syntax-propertize-function)
+       #'perl-syntax-propertize-function)
+  (add-hook 'syntax-propertize-extend-region-functions
+            #'syntax-propertize-multiline 'append 'local)
   ;; Tell imenu how to handle Perl.
   (set (make-local-variable 'imenu-generic-expression)
        perl-imenu-generic-expression)

=== modified file 'lisp/progmodes/python.el'
--- lisp/progmodes/python.el	2010-09-01 07:13:21 +0000
+++ lisp/progmodes/python.el	2010-09-10 23:13:42 +0000
@@ -166,29 +166,32 @@
           symbol-end)
      . font-lock-builtin-face)))
 
-(defconst python-font-lock-syntactic-keywords
+(defconst python-syntax-propertize-function
   ;; Make outer chars of matching triple-quote sequences into generic
   ;; string delimiters.  Fixme: Is there a better way?
   ;; First avoid a sequence preceded by an odd number of backslashes.
-  `((,(rx (not (any ?\\))
-	  ?\\ (* (and ?\\ ?\\))
-	  (group (syntax string-quote))
-	  (backref 1)
-	  (group (backref 1)))
-     (2 ,(string-to-syntax "\"")))	; dummy
-    (,(rx (group (optional (any "uUrR"))) ; prefix gets syntax property
-	  (optional (any "rR"))		  ; possible second prefix
-	  (group (syntax string-quote))   ; maybe gets property
-	  (backref 2)			  ; per first quote
-	  (group (backref 2)))		  ; maybe gets property
-     (1 (python-quote-syntax 1))
-     (2 (python-quote-syntax 2))
-     (3 (python-quote-syntax 3)))
-    ;; This doesn't really help.
-;;;     (,(rx (and ?\\ (group ?\n))) (1 " "))
-    ))
+  (syntax-propertize-rules
+   (;; (rx (not (any ?\\))
+    ;;     ?\\ (* (and ?\\ ?\\))
+    ;;     (group (syntax string-quote))
+    ;;     (backref 1)
+    ;;     (group (backref 1)))
+    ;; ¡Backrefs don't work in syntax-propertize-rules!
+    "[^\\]\\\\\\(\\\\\\\\\\)*\\(?:''\\('\\)\\|\"\"\\(?2:\"\\)\\)"
+    (2 "\""))                           ; dummy
+   (;; (rx (optional (group (any "uUrR"))) ; prefix gets syntax property
+    ;;     (optional (any "rR"))           ; possible second prefix
+    ;;     (group (syntax string-quote))   ; maybe gets property
+    ;;     (backref 2)                     ; per first quote
+    ;;     (group (backref 2)))            ; maybe gets property
+    ;; ¡Backrefs don't work in syntax-propertize-rules!
+    "\\([RUru]\\)?[Rr]?\\(?:\\('\\)'\\('\\)\\|\\(?2:\"\\)\"\\(?3:\"\\)\\)"
+    (3 (ignore (python-quote-syntax))))
+   ;; This doesn't really help.
+   ;;((rx (and ?\\ (group ?\n))) (1 " "))
+   ))
 
-(defun python-quote-syntax (n)
+(defun python-quote-syntax ()
   "Put `syntax-table' property correctly on triple quote.
 Used for syntactic keywords.  N is the match number (1, 2 or 3)."
   ;; Given a triple quote, we have to check the context to know
@@ -206,28 +209,25 @@
   ;; x '"""' x """ \"""" x
   (save-excursion
     (goto-char (match-beginning 0))
-    (cond
-     ;; Consider property for the last char if in a fenced string.
-     ((= n 3)
-      (let* ((font-lock-syntactic-keywords nil)
-	     (syntax (syntax-ppss)))
-	(when (eq t (nth 3 syntax))	; after unclosed fence
-	  (goto-char (nth 8 syntax))	; fence position
-	  (skip-chars-forward "uUrR")	; skip any prefix
-	  ;; Is it a matching sequence?
-	  (if (eq (char-after) (char-after (match-beginning 2)))
-	      (eval-when-compile (string-to-syntax "|"))))))
-     ;; Consider property for initial char, accounting for prefixes.
-     ((or (and (= n 2)			; leading quote (not prefix)
-	       (= (match-beginning 1) (match-end 1))) ; prefix is null
-	  (and (= n 1)			; prefix
-	       (/= (match-beginning 1) (match-end 1)))) ; non-empty
-      (let ((font-lock-syntactic-keywords nil))
-	(unless (eq 'string (syntax-ppss-context (syntax-ppss)))
-	  (eval-when-compile (string-to-syntax "|")))))
-     ;; Otherwise (we're in a non-matching string) the property is
-     ;; nil, which is OK.
-     )))
+    (let ((syntax (save-match-data (syntax-ppss))))
+      (cond
+       ((eq t (nth 3 syntax))           ; after unclosed fence
+        ;; Consider property for the last char if in a fenced string.
+        (goto-char (nth 8 syntax))	; fence position
+        (skip-chars-forward "uUrR")	; skip any prefix
+        ;; Is it a matching sequence?
+        (if (eq (char-after) (char-after (match-beginning 2)))
+            (put-text-property (match-beginning 3) (match-end 3)
+                               'syntax-table (string-to-syntax "|"))))
+       ((match-end 1)
+        ;; Consider property for initial char, accounting for prefixes.
+        (put-text-property (match-beginning 1) (match-end 1)
+                           'syntax-table (string-to-syntax "|")))
+       (t
+        ;; Consider property for initial char, accounting for prefixes.
+        (put-text-property (match-beginning 2) (match-end 2)
+                           'syntax-table (string-to-syntax "|"))))
+      )))
 
 ;; This isn't currently in `font-lock-defaults' as probably not worth
 ;; it -- we basically only mess with a few normally-symbol characters.
@@ -2495,12 +2495,12 @@
   :group 'python
   (set (make-local-variable 'font-lock-defaults)
        '(python-font-lock-keywords nil nil nil nil
-				   (font-lock-syntactic-keywords
-				    . python-font-lock-syntactic-keywords)
-				   ;; This probably isn't worth it.
-				   ;; (font-lock-syntactic-face-function
-				   ;;  . python-font-lock-syntactic-face-function)
-				   ))
+         ;; This probably isn't worth it.
+         ;; (font-lock-syntactic-face-function
+         ;;  . python-font-lock-syntactic-face-function)
+         ))
+  (set (make-local-variable 'syntax-propertize-function)
+       python-syntax-propertize-function)
   (set (make-local-variable 'parse-sexp-lookup-properties) t)
   (set (make-local-variable 'parse-sexp-ignore-comments) t)
   (set (make-local-variable 'comment-start) "# ")

=== modified file 'lisp/progmodes/ruby-mode.el'
--- lisp/progmodes/ruby-mode.el	2010-08-24 20:29:44 +0000
+++ lisp/progmodes/ruby-mode.el	2010-09-10 23:13:42 +0000
@@ -100,17 +100,10 @@
 
 (defconst ruby-block-end-re "\\<end\\>")
 
-(defconst ruby-here-doc-beg-re
+(eval-and-compile
+  (defconst ruby-here-doc-beg-re
   "\\(<\\)<\\(-\\)?\\(\\([a-zA-Z0-9_]+\\)\\|[\"]\\([^\"]+\\)[\"]\\|[']\\([^']+\\)[']\\)"
-  "Regexp to match the beginning of a heredoc.")
-
-(defconst ruby-here-doc-end-re
-  "^\\([ \t]+\\)?\\(.*\\)\\(.\\)$"
-  "Regexp to match the end of heredocs.
-
-This will actually match any line with one or more characters.
-It's useful in that it divides up the match string so that
-`ruby-here-doc-beg-match' can search for the beginning of the heredoc.")
+    "Regexp to match the beginning of a heredoc."))
 
 (defun ruby-here-doc-end-match ()
   "Return a regexp to find the end of a heredoc.
@@ -123,18 +116,6 @@
                (match-string 5)
                (match-string 6)))))
 
-(defun ruby-here-doc-beg-match ()
-  "Return a regexp to find the beginning of a heredoc.
-
-This should only be called after matching against `ruby-here-doc-end-re'."
-  (let ((contents (regexp-quote (concat (match-string 2) (match-string 3)))))
-    (concat "<<"
-            (let ((match (match-string 1)))
-              (if (and match (> (length match) 0))
-                  (concat "\\(?:-\\([\"']?\\)\\|\\([\"']\\)" (match-string 1) "\\)"
-                          contents "\\b\\(\\1\\|\\2\\)")
-                (concat "-?\\([\"']\\|\\)" contents "\\b\\1"))))))
-
 (defconst ruby-delimiter
   (concat "[?$/%(){}#\"'`.:]\\|<<\\|\\[\\|\\]\\|\\<\\("
           ruby-block-beg-re
@@ -362,7 +343,7 @@
     (back-to-indentation)
     (current-column)))
 
-(defun ruby-indent-line (&optional flag)
+(defun ruby-indent-line (&optional ignored)
   "Correct the indentation of the current Ruby line."
   (interactive)
   (ruby-indent-to (ruby-calculate-indent)))
@@ -405,8 +386,7 @@
   "TODO: document."
   (save-excursion
     (store-match-data nil)
-    (let ((space (skip-chars-backward " \t"))
-          (start (point)))
+    (let ((space (skip-chars-backward " \t")))
       (cond
        ((bolp) t)
        ((progn
@@ -700,7 +680,7 @@
     (beginning-of-line)
     (let ((ruby-indent-point (point))
           (case-fold-search nil)
-          state bol eol begin op-end
+          state eol begin op-end
           (paren (progn (skip-syntax-forward " ")
                         (and (char-after) (matching-paren (char-after)))))
           (indent 0))
@@ -780,7 +760,6 @@
               (if (re-search-forward "^\\s *#" end t)
                   (beginning-of-line)
                 (setq done t))))
-          (setq bol (point))
           (end-of-line)
           ;; skip the comment at the end
           (skip-chars-backward " \t")
@@ -1037,10 +1016,8 @@
   (ruby-beginning-of-defun)
   (re-search-backward "^\n" (- (point) 1) t))
 
-(defun ruby-indent-exp (&optional shutup-p)
-  "Indent each line in the balanced expression following the point.
-If a prefix arg is given or SHUTUP-P is non-nil, no errors
-are signalled if a balanced expression isn't found."
+(defun ruby-indent-exp (&optional ignored)
+  "Indent each line in the balanced expression following the point."
   (interactive "*P")
   (let ((here (point-marker)) start top column (nest t))
     (set-marker-insertion-type here t)
@@ -1133,58 +1110,208 @@
               (if mlist (concat mlist mname) mname)
             mlist)))))
 
-(defconst ruby-font-lock-syntactic-keywords
-  `(;; #{ }, #$hoge, #@foo are not comments
-    ("\\(#\\)[{$@]" 1 (1 . nil))
-    ;; the last $', $", $` in the respective string is not variable
-    ;; the last ?', ?", ?` in the respective string is not ascii code
-    ("\\(^\\|[\[ \t\n<+\(,=]\\)\\(['\"`]\\)\\(\\\\.\\|\\2\\|[^'\"`\n\\\\]\\)*?\\\\?[?$]\\(\\2\\)"
-     (2 (7 . nil))
-     (4 (7 . nil)))
-    ;; $' $" $` .... are variables
-    ;; ?' ?" ?` are ascii codes
-    ("\\(^\\|[^\\\\]\\)\\(\\\\\\\\\\)*[?$]\\([#\"'`]\\)" 3 (1 . nil))
-    ;; regexps
-    ("\\(^\\|[=(,~?:;<>]\\|\\(^\\|\\s \\)\\(if\\|elsif\\|unless\\|while\\|until\\|when\\|and\\|or\\|&&\\|||\\)\\|g?sub!?\\|scan\\|split!?\\)\\s *\\(/\\)[^/\n\\\\]*\\(\\\\.[^/\n\\\\]*\\)*\\(/\\)"
-     (4 (7 . ?/))
-     (6 (7 . ?/)))
-    ("^=en\\(d\\)\\_>" 1 "!")
-    ("^\\(=\\)begin\\_>" 1 (ruby-comment-beg-syntax))
-    ;; Currently, the following case is highlighted incorrectly:
-    ;;
-    ;;   <<FOO
-    ;;   FOO
-    ;;   <<BAR
-    ;;   <<BAZ
-    ;;   BAZ
-    ;;   BAR
-    ;;
-    ;; This is because all here-doc beginnings are highlighted before any endings,
-    ;; so although <<BAR is properly marked as a beginning, when we get to <<BAZ
-    ;; it thinks <<BAR is part of a string so it's marked as well.
-    ;;
-    ;; This may be fixable by modifying ruby-in-here-doc-p to use
-    ;; ruby-in-non-here-doc-string-p rather than syntax-ppss-context,
-    ;; but I don't want to try that until we've got unit tests set up
-    ;; to make sure I don't break anything else.
-    (,(concat ruby-here-doc-beg-re ".*\\(\n\\)")
-     ,(+ 1 (regexp-opt-depth ruby-here-doc-beg-re))
-     (ruby-here-doc-beg-syntax))
-    (,ruby-here-doc-end-re 3 (ruby-here-doc-end-syntax)))
-  "Syntactic keywords for Ruby mode.  See `font-lock-syntactic-keywords'.")
-
-(defun ruby-comment-beg-syntax ()
-  "Return the syntax cell for a the first character of a =begin.
+(if (eval-when-compile (fboundp #'syntax-propertize-rules))
+    ;; New code that works independently from font-lock.
+    (progn
+      (defun ruby-syntax-propertize-function (start end)
+        "Syntactic keywords for Ruby mode.  See `syntax-propertize-function'."
+        (goto-char start)
+        (ruby-syntax-propertize-heredoc end)
+        (funcall
+         (syntax-propertize-rules
+          ;; #{ }, #$hoge, #@foo are not comments
+          ("\\(#\\)[{$@]" (1 "."))
+          ;; the last $', $", $` in the respective string is not variable
+          ;; the last ?', ?", ?` in the respective string is not ascii code
+          ("\\(^\\|[\[ \t\n<+\(,=]\\)\\(['\"`]\\)\\(\\\\.\\|\\2\\|[^'\"`\n\\\\]\\)*?\\\\?[?$]\\(\\2\\)"
+           (2 "\"")
+           (4 "\""))
+          ;; $' $" $` .... are variables
+          ;; ?' ?" ?` are ascii codes
+          ("\\(^\\|[^\\\\]\\)\\(\\\\\\\\\\)*[?$]\\([#\"'`]\\)" (3 "."))
+          ;; regexps
+          ("\\(^\\|[=(,~?:;<>]\\|\\(^\\|\\s \\)\\(if\\|elsif\\|unless\\|while\\|until\\|when\\|and\\|or\\|&&\\|||\\)\\|g?sub!?\\|scan\\|split!?\\)\\s *\\(/\\)[^/\n\\\\]*\\(\\\\.[^/\n\\\\]*\\)*\\(/\\)"
+           (4 "\"/")
+           (6 "\"/"))
+          ("^=en\\(d\\)\\_>" (1 "!"))
+          ("^\\(=\\)begin\\_>" (1 "!"))
+          ;; Handle here documents.
+          ((concat ruby-here-doc-beg-re ".*\\(\n\\)")
+           (7 (prog1 "\"" (ruby-syntax-propertize-heredoc end)))))
+         (point) end))
+
+      (defun ruby-syntax-propertize-heredoc (limit)
+        (let ((ppss (syntax-ppss))
+              (res '()))
+          (when (eq ?\n (nth 3 ppss))
+            (save-excursion
+              (goto-char (nth 8 ppss))
+              (beginning-of-line)
+              (while (re-search-forward ruby-here-doc-beg-re
+                                        (line-end-position) t)
+                (push (concat (ruby-here-doc-end-match) "\n") res)))
+            (let ((start (point)))
+              ;; With multiple openers on the same line, we don't know in which
+              ;; part `start' is, so we have to go back to the beginning.
+              (when (cdr res)
+                (goto-char (nth 8 ppss))
+                (setq res (nreverse res)))
+              (while (and res (re-search-forward (pop res) limit 'move))
+                (if (null res)
+                    (put-text-property (1- (point)) (point)
+                                       'syntax-table (string-to-syntax "\""))))
+              ;; Make extra sure we don't move back, lest we could fall into an
+              ;; inf-loop.
+              (if (< (point) start) (goto-char start))))))
+      )
+      
+  ;; For Emacsen where syntax-propertize-rules is not (yet) available,
+  ;; fallback on the old font-lock-syntactic-keywords stuff.
+
+  (defconst ruby-here-doc-end-re
+    "^\\([ \t]+\\)?\\(.*\\)\\(\n\\)"
+    "Regexp to match the end of heredocs.
+
+This will actually match any line with one or more characters.
+It's useful in that it divides up the match string so that
+`ruby-here-doc-beg-match' can search for the beginning of the heredoc.")
+
+  (defun ruby-here-doc-beg-match ()
+    "Return a regexp to find the beginning of a heredoc.
+
+This should only be called after matching against `ruby-here-doc-end-re'."
+    (let ((contents (regexp-quote (match-string 2))))
+      (concat "<<"
+              (let ((match (match-string 1)))
+                (if (and match (> (length match) 0))
+                    (concat "\\(?:-\\([\"']?\\)\\|\\([\"']\\)" match "\\)"
+                            contents "\\b\\(\\1\\|\\2\\)")
+                  (concat "-?\\([\"']\\|\\)" contents "\\b\\1"))))))
+
+  (defconst ruby-font-lock-syntactic-keywords
+    `( ;; #{ }, #$hoge, #@foo are not comments
+      ("\\(#\\)[{$@]" 1 (1 . nil))
+      ;; the last $', $", $` in the respective string is not variable
+      ;; the last ?', ?", ?` in the respective string is not ascii code
+      ("\\(^\\|[\[ \t\n<+\(,=]\\)\\(['\"`]\\)\\(\\\\.\\|\\2\\|[^'\"`\n\\\\]\\)*?\\\\?[?$]\\(\\2\\)"
+       (2 (7 . nil))
+       (4 (7 . nil)))
+      ;; $' $" $` .... are variables
+      ;; ?' ?" ?` are ascii codes
+      ("\\(^\\|[^\\\\]\\)\\(\\\\\\\\\\)*[?$]\\([#\"'`]\\)" 3 (1 . nil))
+      ;; regexps
+      ("\\(^\\|[=(,~?:;<>]\\|\\(^\\|\\s \\)\\(if\\|elsif\\|unless\\|while\\|until\\|when\\|and\\|or\\|&&\\|||\\)\\|g?sub!?\\|scan\\|split!?\\)\\s *\\(/\\)[^/\n\\\\]*\\(\\\\.[^/\n\\\\]*\\)*\\(/\\)"
+       (4 (7 . ?/))
+       (6 (7 . ?/)))
+      ("^=en\\(d\\)\\_>" 1 "!")
+      ("^\\(=\\)begin\\_>" 1 (ruby-comment-beg-syntax))
+      ;; Currently, the following case is highlighted incorrectly:
+      ;;
+      ;;   <<FOO
+      ;;   FOO
+      ;;   <<BAR
+      ;;   <<BAZ
+      ;;   BAZ
+      ;;   BAR
+      ;;
+      ;; This is because all here-doc beginnings are highlighted before any endings,
+      ;; so although <<BAR is properly marked as a beginning, when we get to <<BAZ
+      ;; it thinks <<BAR is part of a string so it's marked as well.
+      ;;
+      ;; This may be fixable by modifying ruby-in-here-doc-p to use
+      ;; ruby-in-non-here-doc-string-p rather than syntax-ppss-context,
+      ;; but I don't want to try that until we've got unit tests set up
+      ;; to make sure I don't break anything else.
+      (,(concat ruby-here-doc-beg-re ".*\\(\n\\)")
+       ,(+ 1 (regexp-opt-depth ruby-here-doc-beg-re))
+       (ruby-here-doc-beg-syntax))
+      (,ruby-here-doc-end-re 3 (ruby-here-doc-end-syntax)))
+    "Syntactic keywords for Ruby mode.  See `font-lock-syntactic-keywords'.")
+
+  (defun ruby-comment-beg-syntax ()
+    "Return the syntax cell for a the first character of a =begin.
 See the definition of `ruby-font-lock-syntactic-keywords'.
 
 This returns a comment-delimiter cell as long as the =begin
 isn't in a string or another comment."
-  (when (not (nth 3 (syntax-ppss)))
-    (string-to-syntax "!")))
-
-(unless (functionp 'syntax-ppss)
-  (defun syntax-ppss (&optional pos)
-    (parse-partial-sexp (point-min) (or pos (point)))))
+    (when (not (nth 3 (syntax-ppss)))
+      (string-to-syntax "!")))
+
+  (defun ruby-in-here-doc-p ()
+    "Return whether or not the point is in a heredoc."
+    (save-excursion
+      (let ((old-point (point)) (case-fold-search nil))
+        (beginning-of-line)
+        (catch 'found-beg
+          (while (re-search-backward ruby-here-doc-beg-re nil t)
+            (if (not (or (ruby-in-ppss-context-p 'anything)
+                         (ruby-here-doc-find-end old-point)))
+                (throw 'found-beg t)))))))
+
+  (defun ruby-here-doc-find-end (&optional limit)
+    "Expects the point to be on a line with one or more heredoc openers.
+Returns the buffer position at which all heredocs on the line
+are terminated, or nil if they aren't terminated before the
+buffer position `limit' or the end of the buffer."
+    (save-excursion
+      (beginning-of-line)
+      (catch 'done
+        (let ((eol (save-excursion (end-of-line) (point)))
+              (case-fold-search nil)
+              ;; Fake match data such that (match-end 0) is at eol
+              (end-match-data (progn (looking-at ".*$") (match-data)))
+              beg-match-data end-re)
+          (while (re-search-forward ruby-here-doc-beg-re eol t)
+            (setq beg-match-data (match-data))
+            (setq end-re (ruby-here-doc-end-match))
+
+            (set-match-data end-match-data)
+            (goto-char (match-end 0))
+            (unless (re-search-forward end-re limit t) (throw 'done nil))
+            (setq end-match-data (match-data))
+
+            (set-match-data beg-match-data)
+            (goto-char (match-end 0)))
+          (set-match-data end-match-data)
+          (goto-char (match-end 0))
+          (point)))))
+
+  (defun ruby-here-doc-beg-syntax ()
+    "Return the syntax cell for a line that may begin a heredoc.
+See the definition of `ruby-font-lock-syntactic-keywords'.
+
+This sets the syntax cell for the newline ending the line
+containing the heredoc beginning so that cases where multiple
+heredocs are started on one line are handled correctly."
+    (save-excursion
+      (goto-char (match-beginning 0))
+      (unless (or (ruby-in-ppss-context-p 'non-heredoc)
+                  (ruby-in-here-doc-p))
+        (string-to-syntax "\""))))
+
+  (defun ruby-here-doc-end-syntax ()
+    "Return the syntax cell for a line that may end a heredoc.
+See the definition of `ruby-font-lock-syntactic-keywords'."
+    (let ((pss (syntax-ppss)) (case-fold-search nil))
+      ;; If we aren't in a string, we definitely aren't ending a heredoc,
+      ;; so we can just give up.
+      ;; This means we aren't doing a full-document search
+      ;; every time we enter a character.
+      (when (ruby-in-ppss-context-p 'heredoc pss)
+        (save-excursion
+          (goto-char (nth 8 pss))    ; Go to the beginning of heredoc.
+          (let ((eol (point)))
+            (beginning-of-line)
+            (if (and (re-search-forward (ruby-here-doc-beg-match) eol t) ; If there is a heredoc that matches this line...
+                     (not (ruby-in-ppss-context-p 'anything)) ; And that's not inside a heredoc/string/comment...
+                     (progn (goto-char (match-end 0)) ; And it's the last heredoc on its line...
+                            (not (re-search-forward ruby-here-doc-beg-re eol t))))
+                (string-to-syntax "\"")))))))
+
+  (unless (functionp 'syntax-ppss)
+    (defun syntax-ppss (&optional pos)
+      (parse-partial-sexp (point-min) (or pos (point)))))
+  )
 
 (defun ruby-in-ppss-context-p (context &optional ppss)
   (let ((ppss (or ppss (syntax-ppss (point)))))
@@ -1195,10 +1322,7 @@
          ((eq context 'string)
           (nth 3 ppss))
          ((eq context 'heredoc)
-          (and (nth 3 ppss)
-               ;; If it's generic string, it's a heredoc and we don't care
-               ;; See `parse-partial-sexp'
-               (not (numberp (nth 3 ppss)))))
+          (eq ?\n (nth 3 ppss)))
          ((eq context 'non-heredoc)
           (and (ruby-in-ppss-context-p 'anything)
                (not (ruby-in-ppss-context-p 'heredoc))))
@@ -1210,77 +1334,6 @@
                   "context name `" (symbol-name context) "' is unknown"))))
         t)))
 
-(defun ruby-in-here-doc-p ()
-  "Return whether or not the point is in a heredoc."
-  (save-excursion
-    (let ((old-point (point)) (case-fold-search nil))
-      (beginning-of-line)
-      (catch 'found-beg
-        (while (re-search-backward ruby-here-doc-beg-re nil t)
-          (if (not (or (ruby-in-ppss-context-p 'anything)
-                       (ruby-here-doc-find-end old-point)))
-              (throw 'found-beg t)))))))
-
-(defun ruby-here-doc-find-end (&optional limit)
-  "Expects the point to be on a line with one or more heredoc openers.
-Returns the buffer position at which all heredocs on the line
-are terminated, or nil if they aren't terminated before the
-buffer position `limit' or the end of the buffer."
-  (save-excursion
-    (beginning-of-line)
-    (catch 'done
-      (let ((eol (save-excursion (end-of-line) (point)))
-            (case-fold-search nil)
-            ;; Fake match data such that (match-end 0) is at eol
-            (end-match-data (progn (looking-at ".*$") (match-data)))
-            beg-match-data end-re)
-        (while (re-search-forward ruby-here-doc-beg-re eol t)
-          (setq beg-match-data (match-data))
-          (setq end-re (ruby-here-doc-end-match))
-
-          (set-match-data end-match-data)
-          (goto-char (match-end 0))
-          (unless (re-search-forward end-re limit t) (throw 'done nil))
-          (setq end-match-data (match-data))
-
-          (set-match-data beg-match-data)
-          (goto-char (match-end 0)))
-        (set-match-data end-match-data)
-        (goto-char (match-end 0))
-        (point)))))
-
-(defun ruby-here-doc-beg-syntax ()
-  "Return the syntax cell for a line that may begin a heredoc.
-See the definition of `ruby-font-lock-syntactic-keywords'.
-
-This sets the syntax cell for the newline ending the line
-containing the heredoc beginning so that cases where multiple
-heredocs are started on one line are handled correctly."
-  (save-excursion
-    (goto-char (match-beginning 0))
-    (unless (or (ruby-in-ppss-context-p 'non-heredoc)
-                (ruby-in-here-doc-p))
-      (string-to-syntax "|"))))
-
-(defun ruby-here-doc-end-syntax ()
-  "Return the syntax cell for a line that may end a heredoc.
-See the definition of `ruby-font-lock-syntactic-keywords'."
-  (let ((pss (syntax-ppss)) (case-fold-search nil))
-    ;; If we aren't in a string, we definitely aren't ending a heredoc,
-    ;; so we can just give up.
-    ;; This means we aren't doing a full-document search
-    ;; every time we enter a character.
-    (when (ruby-in-ppss-context-p 'heredoc pss)
-      (save-excursion
-        (goto-char (nth 8 pss))  ; Go to the beginning of heredoc.
-        (let ((eol (point)))
-          (beginning-of-line)
-          (if (and (re-search-forward (ruby-here-doc-beg-match) eol t) ; If there is a heredoc that matches this line...
-                   (not (ruby-in-ppss-context-p 'anything)) ; And that's not inside a heredoc/string/comment...
-                   (progn (goto-char (match-end 0)) ; And it's the last heredoc on its line...
-                          (not (re-search-forward ruby-here-doc-beg-re eol t))))
-              (string-to-syntax "|")))))))
-
 (if (featurep 'xemacs)
     (put 'ruby-mode 'font-lock-defaults
          '((ruby-font-lock-keywords)
@@ -1377,8 +1430,10 @@
    )
   "Additional expressions to highlight in Ruby mode.")
 
+(defvar electric-indent-chars)
+
 ;;;###autoload
-(defun ruby-mode ()
+(define-derived-mode ruby-mode prog-mode "Ruby"
   "Major mode for editing Ruby scripts.
 \\[ruby-indent-line] properly indents subexpressions of multi-line
 class, module, def, if, while, for, do, and case statements, taking
@@ -1387,27 +1442,22 @@
 The variable `ruby-indent-level' controls the amount of indentation.
 
 \\{ruby-mode-map}"
-  (interactive)
-  (kill-all-local-variables)
-  (use-local-map ruby-mode-map)
-  (setq mode-name "Ruby")
-  (setq major-mode 'ruby-mode)
   (ruby-mode-variables)
 
-  (set (make-local-variable 'indent-line-function)
-       'ruby-indent-line)
   (set (make-local-variable 'imenu-create-index-function)
        'ruby-imenu-create-index)
   (set (make-local-variable 'add-log-current-defun-function)
        'ruby-add-log-current-method)
 
   (add-hook
-   (cond ((boundp 'before-save-hook)
-          (make-local-variable 'before-save-hook)
-          'before-save-hook)
+   (cond ((boundp 'before-save-hook) 'before-save-hook)
          ((boundp 'write-contents-functions) 'write-contents-functions)
          ((boundp 'write-contents-hooks) 'write-contents-hooks))
-   'ruby-mode-set-encoding)
+   'ruby-mode-set-encoding nil 'local)
+
+  (set (make-local-variable 'electric-indent-chars)
+       (append '(?\{ ?\}) (if (boundp 'electric-indent-chars)
+                              (default-value 'electric-indent-chars))))
 
   (set (make-local-variable 'font-lock-defaults)
        '((ruby-font-lock-keywords) nil nil))
@@ -1415,12 +1465,12 @@
        ruby-font-lock-keywords)
   (set (make-local-variable 'font-lock-syntax-table)
        ruby-font-lock-syntax-table)
-  (set (make-local-variable 'font-lock-syntactic-keywords)
-       ruby-font-lock-syntactic-keywords)
 
-  (if (fboundp 'run-mode-hooks)
-      (run-mode-hooks 'ruby-mode-hook)
-    (run-hooks 'ruby-mode-hook)))
+  (if (eval-when-compile (fboundp 'syntax-propertize-rules))
+      (set (make-local-variable 'syntax-propertize-function)
+           #'ruby-syntax-propertize-function)
+    (set (make-local-variable 'font-lock-syntactic-keywords)
+         ruby-font-lock-syntactic-keywords)))
 
 ;;; Invoke ruby-mode when appropriate
 

=== modified file 'lisp/progmodes/sh-script.el'
--- lisp/progmodes/sh-script.el	2010-08-26 15:26:33 +0000
+++ lisp/progmodes/sh-script.el	2010-09-10 23:13:42 +0000
@@ -939,7 +939,6 @@
 ;; These are used for the syntax table stuff (derived from cperl-mode).
 ;; Note: parse-sexp-lookup-properties must be set to t for it to work.
 (defconst sh-st-punc (string-to-syntax "."))
-(defconst sh-st-symbol (string-to-syntax "_"))
 (defconst sh-here-doc-syntax (string-to-syntax "|")) ;; generic string
 
 (defconst sh-escaped-line-re
@@ -957,7 +956,7 @@
 (defvar sh-here-doc-re sh-here-doc-open-re)
 (make-variable-buffer-local 'sh-here-doc-re)
 
-(defun sh-font-lock-close-heredoc (bol eof indented)
+(defun sh-font-lock-close-heredoc (bol eof indented eol)
   "Determine the syntax of the \\n after an EOF.
 If non-nil INDENTED indicates that the EOF was indented."
   (let* ((eof-re (if eof (regexp-quote eof) ""))
@@ -971,6 +970,8 @@
 	 (ere (concat "^" (if indented "[ \t]*") eof-re "\n"))
 	 (start (save-excursion
 		  (goto-char bol)
+                  ;; FIXME: will incorrectly find a <<EOF embedded inside
+                  ;; the heredoc.
 		  (re-search-backward (concat sre "\\|" ere) nil t))))
     ;; If subgroup 1 matched, we found an open-heredoc, otherwise we first
     ;; found a close-heredoc which makes the current close-heredoc inoperant.
@@ -990,7 +991,7 @@
 		     (sh-in-comment-or-string (point)))))
 	  ;; No <<EOF2 found after our <<.
 	  (= (point) start)))
-      sh-here-doc-syntax)
+      (put-text-property eol (1+ eol) 'syntax-table sh-here-doc-syntax))
      ((not (or start (save-excursion (re-search-forward sre nil t))))
       ;; There's no <<EOF either before or after us,
       ;; so we should remove ourselves from font-lock's keywords.
@@ -1000,7 +1001,7 @@
 		    (regexp-opt sh-here-doc-markers t) "\\(\n\\)"))
       nil))))
 
-(defun sh-font-lock-open-heredoc (start string)
+(defun sh-font-lock-open-heredoc (start string eol)
   "Determine the syntax of the \\n after a <<EOF.
 START is the position of <<.
 STRING is the actual word used as delimiter (e.g. \"EOF\").
@@ -1030,13 +1031,8 @@
           ;; Don't bother fixing it now, but place a multiline property so
           ;; that when jit-lock-context-* refontifies the rest of the
           ;; buffer, it also refontifies the current line with it.
-          (put-text-property start (point) 'font-lock-multiline t)))
-    sh-here-doc-syntax))
-
-(defun sh-font-lock-here-doc (limit)
-  "Search for a heredoc marker."
-  ;; This looks silly, but it's because `sh-here-doc-re' keeps changing.
-  (re-search-forward sh-here-doc-re limit t))
+          (put-text-property start (point) 'syntax-multiline t)))
+    (put-text-property eol (1+ eol) 'syntax-table sh-here-doc-syntax)))
 
 (defun sh-font-lock-quoted-subshell (limit)
   "Search for a subshell embedded in a string.
@@ -1045,9 +1041,7 @@
   ;; FIXME: This can (and often does) match multiple lines, yet it makes no
   ;; effort to handle multiline cases correctly, so it ends up being
   ;; rather flakey.
-  (when (and (re-search-forward "\"\\(?:\\(?:.\\|\n\\)*?[^\\]\\(?:\\\\\\\\\\)*\\)??\\(\\$(\\|`\\)" limit t)
-             ;; Make sure the " we matched is an opening quote.
-	     (eq ?\" (nth 3 (syntax-ppss))))
+  (when (eq ?\" (nth 3 (syntax-ppss))) ; Check we matched an opening quote.
     ;; bingo we have a $( or a ` inside a ""
     (let ((char (char-after (point)))
           ;; `state' can be: double-quote, backquote, code.
@@ -1082,8 +1076,7 @@
                  (double-quote nil)
                  (t (setq state (pop states)))))
           (t (error "Internal error in sh-font-lock-quoted-subshell")))
-        (forward-char 1)))
-    t))
+        (forward-char 1)))))
 
 
 (defun sh-is-quoted-p (pos)
@@ -1122,7 +1115,7 @@
     (when (progn (backward-char 2)
                  (if (> start (line-end-position))
                      (put-text-property (point) (1+ start)
-                                        'font-lock-multiline t))
+                                        'syntax-multiline t))
                  ;; FIXME: The `in' may just be a random argument to
                  ;; a normal command rather than the real `in' keyword.
                  ;; I.e. we should look back to try and find the
@@ -1136,40 +1129,44 @@
       sh-st-punc
     nil))
 
-(defun sh-font-lock-flush-syntax-ppss-cache (limit)
-  ;; This should probably be a standard function provided by font-lock.el
-  ;; (or syntax.el).
-  (syntax-ppss-flush-cache (point))
-  (goto-char limit)
-  nil)
-
-(defconst sh-font-lock-syntactic-keywords
-  ;; A `#' begins a comment when it is unquoted and at the beginning of a
-  ;; word.  In the shell, words are separated by metacharacters.
-  ;; The list of special chars is taken from the single-unix spec
-  ;; of the shell command language (under `quoting') but with `$' removed.
-  `(("[^|&;<>()`\\\"' \t\n]\\(#+\\)" 1 ,sh-st-symbol)
-    ;; In a '...' the backslash is not escaping.
-    ("\\(\\\\\\)'" (1 (sh-font-lock-backslash-quote)))
-    ;; The previous rule uses syntax-ppss, but the subsequent rules may
-    ;; change the syntax, so we have to tell syntax-ppss that the states it
-    ;; has just computed will need to be recomputed.
-    (sh-font-lock-flush-syntax-ppss-cache)
-    ;; Make sure $@ and $? are correctly recognized as sexps.
-    ("\\$\\([?@]\\)" 1 ,sh-st-symbol)
-    ;; Find HEREDOC starters and add a corresponding rule for the ender.
-    (sh-font-lock-here-doc
-     (2 (sh-font-lock-open-heredoc
-	 (match-beginning 0) (match-string 1)) nil t)
-     (5 (sh-font-lock-close-heredoc
-	 (match-beginning 0) (match-string 4)
-         (and (match-beginning 3) (/= (match-beginning 3) (match-end 3))))
-      nil t))
-    ;; Distinguish the special close-paren in `case'.
-    (")" 0 (sh-font-lock-paren (match-beginning 0)))
-    ;; highlight (possibly nested) subshells inside "" quoted regions correctly.
-    ;; This should be at the very end because it uses syntax-ppss.
-    (sh-font-lock-quoted-subshell)))
+(defun sh-syntax-propertize-function (start end)
+  (goto-char start)
+  (while (prog1
+             (re-search-forward sh-here-doc-re end 'move)
+           (save-excursion
+             (save-match-data
+               (funcall
+                (syntax-propertize-rules
+                 ;; A `#' begins a comment when it is unquoted and at the
+                 ;; beginning of a word.  In the shell, words are separated by
+                 ;; metacharacters.  The list of special chars is taken from
+                 ;; the single-unix spec of the shell command language (under
+                 ;; `quoting') but with `$' removed.
+                 ("[^|&;<>()`\\\"' \t\n]\\(#+\\)" (1 "_"))
+                 ;; In a '...' the backslash is not escaping.
+                 ("\\(\\\\\\)'" (1 (sh-font-lock-backslash-quote)))
+                 ;; Make sure $@ and $? are correctly recognized as sexps.
+                 ("\\$\\([?@]\\)" (1 "_"))
+                 ;; Distinguish the special close-paren in `case'.
+                 (")" (0 (sh-font-lock-paren (match-beginning 0))))
+                 ;; Highlight (possibly nested) subshells inside "" quoted
+                 ;; regions correctly.
+                 ("\"\\(?:\\(?:.\\|\n\\)*?[^\\]\\(?:\\\\\\\\\\)*\\)??\\(\\$(\\|`\\)"
+                  (1 (ignore
+                      ;; Save excursion because we want to also apply other
+                      ;; syntax-propertize rules within the affected region.
+                      (save-excursion
+                        (sh-font-lock-quoted-subshell end))))))
+                (prog1 start (setq start (point))) (point)))))
+    (if (match-beginning 2)
+        ;; FIXME: actually, once we see an heredoc opener, we should just
+        ;; search for its ender without propertizing anything in it.
+        (sh-font-lock-open-heredoc
+	 (match-beginning 0) (match-string 1) (match-beginning 2))
+      (sh-font-lock-close-heredoc
+       (match-beginning 0) (match-string 4)
+       (and (match-beginning 3) (/= (match-beginning 3) (match-end 3)))
+       (match-beginning 5)))))
 
 (defun sh-font-lock-syntactic-face-function (state)
   (let ((q (nth 3 state)))
@@ -1553,9 +1550,12 @@
           sh-font-lock-keywords-1 sh-font-lock-keywords-2)
          nil nil
          ((?/ . "w") (?~ . "w") (?. . "w") (?- . "w") (?_ . "w")) nil
-         (font-lock-syntactic-keywords . sh-font-lock-syntactic-keywords)
          (font-lock-syntactic-face-function
           . sh-font-lock-syntactic-face-function)))
+  (set (make-local-variable 'syntax-propertize-function)
+       #'sh-syntax-propertize-function)
+  (add-hook 'syntax-propertize-extend-region-functions
+            #'syntax-propertize-multiline 'append 'local)
   (set (make-local-variable 'skeleton-pair-alist) '((?` _ ?`)))
   (set (make-local-variable 'skeleton-pair-filter-function) 'sh-quoted-p)
   (set (make-local-variable 'skeleton-further-elements)

=== modified file 'lisp/progmodes/simula.el'
--- lisp/progmodes/simula.el	2010-07-27 16:37:25 +0000
+++ lisp/progmodes/simula.el	2010-09-10 23:13:42 +0000
@@ -163,17 +163,18 @@
 (defvar simula-mode-syntax-table nil
   "Syntax table in SIMULA mode buffers.")
 
-(defconst simula-font-lock-syntactic-keywords
-  `(;; `comment' directive.
-    ("\\<\\(c\\)omment\\>" 1 "<")
-    ;; end comments
-    (,(concat "\\<end\\>\\([^;\n]\\).*?\\(\n\\|\\(.\\)\\(;\\|"
-	      (regexp-opt '("end" "else" "when" "otherwise"))
-	      "\\)\\)")
-     (1 "< b")
-     (3 "> b" nil t))
-    ;; non-quoted single-quote char.
-    ("'\\('\\)'" 1 ".")))
+(defconst simula-syntax-propertize-function
+  (syntax-propertize-rules
+   ;; `comment' directive.
+   ("\\<\\(c\\)omment\\>" (1 "<"))
+   ;; end comments
+   ((concat "\\<end\\>\\([^;\n]\\).*?\\(\n\\|\\(.\\)\\(;\\|"
+            (regexp-opt '("end" "else" "when" "otherwise"))
+            "\\)\\)")
+    (1 "< b")
+    (3 "> b"))
+   ;; non-quoted single-quote char.
+   ("'\\('\\)'" (1 "."))))
 
 ;; Regexps written with help from Alf-Ivar Holm <alfh@ifi.uio.no>.
 (defconst simula-font-lock-keywords-1
@@ -396,8 +397,9 @@
   (setq font-lock-defaults
 	'((simula-font-lock-keywords simula-font-lock-keywords-1
 	   simula-font-lock-keywords-2 simula-font-lock-keywords-3)
-	  nil t ((?_ . "w")) nil
-	  (font-lock-syntactic-keywords . simula-font-lock-syntactic-keywords)))
+	  nil t ((?_ . "w"))))
+  (set (make-local-variable 'syntax-propertize-function)
+       simula-syntax-propertize-function)
   (abbrev-mode 1))
 
 (defun simula-indent-exp ()

=== modified file 'lisp/progmodes/tcl.el'
--- lisp/progmodes/tcl.el	2010-07-27 16:37:25 +0000
+++ lisp/progmodes/tcl.el	2010-09-10 23:13:42 +0000
@@ -411,9 +411,10 @@
 `tcl-typeword-list', and `tcl-keyword-list' by the function
 `tcl-set-font-lock-keywords'.")
 
-(defvar tcl-font-lock-syntactic-keywords
-  ;; Mark the few `#' that are not comment-markers.
-  '(("[^;[{ \t\n][ \t]*\\(#\\)" (1 ".")))
+(defconst tcl-syntax-propertize-function
+  (syntax-propertize-rules
+   ;; Mark the few `#' that are not comment-markers.
+   ("[^;[{ \t\n][ \t]*\\(#\\)" (1 ".")))
   "Syntactic keywords for `tcl-mode'.")
 
 ;; FIXME need some way to recognize variables because array refs look
@@ -593,9 +594,9 @@
   (set (make-local-variable 'outline-level) 'tcl-outline-level)
 
   (set (make-local-variable 'font-lock-defaults)
-       '(tcl-font-lock-keywords nil nil nil beginning-of-defun
- 	 (font-lock-syntactic-keywords . tcl-font-lock-syntactic-keywords)
- 	 (parse-sexp-lookup-properties . t)))
+       '(tcl-font-lock-keywords nil nil nil beginning-of-defun))
+  (set (make-local-variable 'syntax-propertize-function)
+       tcl-syntax-propertize-function)
 
   (set (make-local-variable 'imenu-generic-expression)
        tcl-imenu-generic-expression)

=== modified file 'lisp/progmodes/vhdl-mode.el'
--- lisp/progmodes/vhdl-mode.el	2010-05-25 02:11:08 +0000
+++ lisp/progmodes/vhdl-mode.el	2010-09-10 23:13:42 +0000
@@ -4693,8 +4693,15 @@
   (set (make-local-variable 'font-lock-defaults)
        (list
 	'(nil vhdl-font-lock-keywords) nil
-	(not vhdl-highlight-case-sensitive) '((?\_ . "w")) 'beginning-of-line
-	'(font-lock-syntactic-keywords . vhdl-font-lock-syntactic-keywords)))
+	(not vhdl-highlight-case-sensitive) '((?\_ . "w")) 'beginning-of-line))
+  (if (eval-when-compile (fboundp 'syntax-propertize-rules))
+      (set (make-local-variable 'syntax-propertize-function)
+           (syntax-propertize-rules
+            ;; Mark single quotes as having string quote syntax in
+            ;; 'c' instances.
+            ("\\(\'\\).\\(\'\\)" (1 "\"'") (2 "\"'"))))
+    (set (make-local-variable 'font-lock-syntactic-keywords)
+         vhdl-font-lock-syntactic-keywords))
   (unless vhdl-emacs-21
     (set (make-local-variable 'font-lock-support-mode) 'lazy-lock-mode)
     (set (make-local-variable 'lazy-lock-defer-contextually) nil)
@@ -12914,10 +12921,9 @@
   "Re-initialize fontification and fontify buffer."
   (interactive)
   (setq font-lock-defaults
-	(list
-	 'vhdl-font-lock-keywords nil
-	 (not vhdl-highlight-case-sensitive) '((?\_ . "w")) 'beginning-of-line
-	 '(font-lock-syntactic-keywords . vhdl-font-lock-syntactic-keywords)))
+	`(vhdl-font-lock-keywords
+          nil ,(not vhdl-highlight-case-sensitive) ((?\_ . "w"))
+          beginning-of-line))
   (when (fboundp 'font-lock-unset-defaults)
     (font-lock-unset-defaults))		; not implemented in XEmacs
   (font-lock-set-defaults)

=== modified file 'lisp/textmodes/bibtex.el'
--- lisp/textmodes/bibtex.el	2010-09-06 16:38:03 +0000
+++ lisp/textmodes/bibtex.el	2010-09-10 23:13:42 +0000
@@ -3027,12 +3027,14 @@
                 ;; brace-delimited ones
                 )
          nil
-         (font-lock-syntactic-keywords . bibtex-font-lock-syntactic-keywords)
          (font-lock-extra-managed-props . (category))
 	 (font-lock-mark-block-function
 	  . (lambda ()
               (set-mark (bibtex-end-of-entry))
 	      (bibtex-beginning-of-entry)))))
+  (set (make-local-variable 'syntax-propertize-function)
+       (syntax-propertize-via-font-lock
+        bibtex-font-lock-syntactic-keywords))
   (setq imenu-generic-expression
         (list (list nil bibtex-entry-head bibtex-key-in-head))
         imenu-case-fold-search t)

=== modified file 'lisp/textmodes/reftex.el'
--- lisp/textmodes/reftex.el	2010-05-03 02:29:46 +0000
+++ lisp/textmodes/reftex.el	2010-09-10 23:13:42 +0000
@@ -599,7 +599,6 @@
 (defvar font-lock-mode)
 (defvar font-lock-keywords)
 (defvar font-lock-fontify-region-function)
-(defvar font-lock-syntactic-keywords)
 
 ;;; =========================================================================
 ;;;

=== modified file 'lisp/textmodes/sgml-mode.el'
--- lisp/textmodes/sgml-mode.el	2010-05-25 02:11:08 +0000
+++ lisp/textmodes/sgml-mode.el	2010-09-10 23:13:42 +0000
@@ -293,11 +293,12 @@
 (defvar sgml-font-lock-keywords sgml-font-lock-keywords-1
   "*Rules for highlighting SGML code.  See also `sgml-tag-face-alist'.")
 
-(defvar sgml-font-lock-syntactic-keywords
+(defconst sgml-syntax-propertize-function
+  (syntax-propertize-rules
   ;; Use the `b' style of comments to avoid interference with the -- ... --
   ;; comments recognized when `sgml-specials' includes ?-.
   ;; FIXME: beware of <!--> blabla <!--> !!
-  '(("\\(<\\)!--" (1 "< b"))
+   ("\\(<\\)!--" (1 "< b"))
     ("--[ \t\n]*\\(>\\)" (1 "> b"))
     ;; Double quotes outside of tags should not introduce strings.
     ;; Be careful to call `syntax-ppss' on a position before the one we're
@@ -477,9 +478,9 @@
        '((sgml-font-lock-keywords
           sgml-font-lock-keywords-1
           sgml-font-lock-keywords-2)
-         nil t nil nil
-         (font-lock-syntactic-keywords
-          . sgml-font-lock-syntactic-keywords)))
+         nil t))
+  (set (make-local-variable 'syntax-propertize-function)
+       sgml-syntax-propertize-function)
   (set (make-local-variable 'facemenu-add-face-function)
        'sgml-mode-facemenu-add-face-function)
   (set (make-local-variable 'sgml-xml-mode) (sgml-xml-guess))

=== modified file 'lisp/textmodes/tex-mode.el'
--- lisp/textmodes/tex-mode.el	2010-05-13 21:52:20 +0000
+++ lisp/textmodes/tex-mode.el	2010-09-10 23:13:42 +0000
@@ -488,7 +488,7 @@
 	   ;; (arg "\\(?:{\\(\\(?:[^{}\\]+\\|\\\\.\\|{[^}]*}\\)+\\)\\|\\\\[a-z*]+\\)"))
 	   (arg "{\\(\\(?:[^{}\\]+\\|\\\\.\\|{[^}]*}\\)+\\)"))
       (list
-       ;; font-lock-syntactic-keywords causes the \ of \end{verbatim} to be
+       ;; tex-font-lock-syntactic-keywords causes the \ of \end{verbatim} to be
        ;; highlighted as tex-verbatim face.  Let's undo that.
        ;; This is ugly and brittle :-(  --Stef
        '("^\\(\\\\\\)end" (1 (get-text-property (match-end 1) 'face) t))
@@ -655,6 +655,7 @@
     ;;     line is re-font-locked on its own.
     ;; There's a hack in tex-font-lock-keywords-1 to remove the verbatim
     ;; face from the \ but C-M-f still jumps to the wrong spot :-(  --Stef
+    ;; FIXME: See gud.el for an example of a solution to a similar problem.
     (eval . `(,(concat "^\\(\\\\\\)end *{"
                        (regexp-opt tex-verbatim-environments t)
                        "}\\(.?\\)") (1 "|") (3 "<")))
@@ -1163,10 +1164,9 @@
 	 (font-lock-syntactic-face-function
 	  . tex-font-lock-syntactic-face-function)
 	 (font-lock-unfontify-region-function
-	  . tex-font-lock-unfontify-region)
-	 (font-lock-syntactic-keywords
-	  . tex-font-lock-syntactic-keywords)
-	 (parse-sexp-lookup-properties . t)))
+	  . tex-font-lock-unfontify-region)))
+  (set (make-local-variable 'syntax-propertize-function)
+       (syntax-propertize-via-font-lock tex-font-lock-syntactic-keywords))
   ;; TABs in verbatim environments don't do what you think.
   (set (make-local-variable 'indent-tabs-mode) nil)
   ;; Other vars that should be buffer-local.
@@ -2850,12 +2850,12 @@
 	      (mapcar
 	       (lambda (x)
 		 (case (car-safe x)
-		   (font-lock-syntactic-keywords
-		    (cons (car x) 'doctex-font-lock-syntactic-keywords))
 		   (font-lock-syntactic-face-function
 		    (cons (car x) 'doctex-font-lock-syntactic-face-function))
 		   (t x)))
-	       (cdr font-lock-defaults)))))
+	       (cdr font-lock-defaults))))
+  (set (make-local-variable 'syntax-propertize-function)
+       (syntax-propertize-via-font-lock doctex-font-lock-syntactic-keywords)))
 
 (run-hooks 'tex-mode-load-hook)
 

=== modified file 'lisp/textmodes/texinfo.el'
--- lisp/textmodes/texinfo.el	2010-01-13 08:35:10 +0000
+++ lisp/textmodes/texinfo.el	2010-09-10 23:13:42 +0000
@@ -310,10 +310,11 @@
     ("Chapters" "^@chapter[ \t]+\\(.*\\)$" 1))
   "Imenu generic expression for Texinfo mode.  See `imenu-generic-expression'.")
 
-(defvar texinfo-font-lock-syntactic-keywords
-  '(("\\(@\\)c\\(omment\\)?\\>" (1 "<"))
-    ("^\\(@\\)ignore\\>" (1 "< b"))
-    ("^@end ignore\\(\n\\)" (1 "> b")))
+(defconst texinfo-syntax-propertize-function
+  (syntax-propertize-rules
+   ("\\(@\\)c\\(omment\\)?\\>" (1 "<"))
+   ("^\\(@\\)ignore\\>" (1 "< b"))
+   ("^@end ignore\\(\n\\)" (1 "> b")))
   "Syntactic keywords to catch comment delimiters in `texinfo-mode'.")
 
 (defconst texinfo-environments
@@ -600,9 +601,9 @@
   (setq imenu-case-fold-search nil)
   (make-local-variable 'font-lock-defaults)
   (setq font-lock-defaults
-	'(texinfo-font-lock-keywords nil nil nil backward-paragraph
-				     (font-lock-syntactic-keywords
-				      . texinfo-font-lock-syntactic-keywords)))
+	'(texinfo-font-lock-keywords nil nil nil backward-paragraph))
+  (set (make-local-variable 'syntax-propertize-function)
+       texinfo-syntax-propertize-function)
   (set (make-local-variable 'parse-sexp-lookup-properties) t)
 
   ;; Outline settings.

=== modified file 'test/ChangeLog'
--- test/ChangeLog	2010-08-30 20:34:52 +0000
+++ test/ChangeLog	2010-09-10 23:13:42 +0000
@@ -1,3 +1,7 @@
+2010-09-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* indent/octave.m: Remove some `fixindent' not needed any more.
+
 2010-08-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* indent/octave.m: New file.

=== modified file 'test/indent/octave.m'
--- test/indent/octave.m	2010-08-30 20:34:52 +0000
+++ test/indent/octave.m	2010-09-10 23:13:42 +0000
@@ -1415,7 +1415,7 @@
     endfor                                   # fixindent
 
     ## Search all C++ source files for PKG commands.
-    lst = dir (fullfile (packdir, "src", "*.cc")); # fixindent
+    lst = dir (fullfile (packdir, "src", "*.cc"));
     for i = 1:length (lst)
       nam = fullfile (packdir, "src", lst(i).name);
       fwrite (archfid, extract_pkg (nam, ['^//* *' nm ': *(.*)$']));
@@ -1451,10 +1451,10 @@
         unlink (archpkg);
       endif
     endif
-  endif                         # fixindent
-endfunction                     # fixindent
+  endif
+endfunction
 
-function copy_files (desc, packdir, global_install) # fixindent
+function copy_files (desc, packdir, global_install)
   ## Create the installation directory.
   if (! exist (desc.dir, "dir"))
     [status, output] = mkdir (desc.dir);
------------------------------------------------------------
revno: 101405
committer: Lars Magne Ingebrigtsen <larsi@gnus.org>
branch nick: trunk
timestamp: Fri 2010-09-10 19:51:48 +0200
message:
  * NEWS: Mention the new libxml2 functions.
diff:
=== modified file 'etc/ChangeLog'
--- etc/ChangeLog	2010-09-01 07:13:21 +0000
+++ etc/ChangeLog	2010-09-10 17:51:48 +0000
@@ -1,3 +1,7 @@
+2010-09-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* NEWS: Mention the new libxml2 functions.
+
 2010-08-25  Kenichi Handa  <handa@m17n.org>
 
 	* HELLO: Change designation sequences for Arabic text.

=== modified file 'etc/NEWS'
--- etc/NEWS	2010-09-09 02:21:12 +0000
+++ etc/NEWS	2010-09-10 17:51:48 +0000
@@ -493,6 +493,14 @@
 
 *** `image-extension-data' is renamed to `image-metadata'.
 
+** XML and HTML parsing
+
+*** If Emacs is compiled with libxml2 support (which is the default),
+two new Emacs Lisp-level functions are defined: `html-parse-string'
+(which will parse "real world" HTML) and `xml-parse-string' (which
+parses XML).  Both return an Emacs Lisp parse tree.  See the Emacs
+Lisp Reference Manual for details.
+
 ** Isearch
 
 *** New hook `isearch-update-post-hook' that runs in `isearch-update'.
------------------------------------------------------------
revno: 101404
committer: Lars Magne Ingebrigtsen <larsi@gnus.org>
branch nick: trunk
timestamp: Fri 2010-09-10 19:45:22 +0200
message:
  Remove some trailing white space.
diff:
=== modified file 'src/xml.c'
--- src/xml.c	2010-09-10 16:44:35 +0000
+++ src/xml.c	2010-09-10 17:45:22 +0000
@@ -62,7 +62,7 @@
 
     if (node->content)
       content = build_string (node->content);
-      
+
     return Fcons (intern (node->name), content);
   } else
     return Qnil;
@@ -76,21 +76,21 @@
   Lisp_Object result;
   int ibeg, iend;
   char *burl = "";
-  
+
   LIBXML_TEST_VERSION;
-	
+
   CHECK_STRING (string);
 
   if (! NILP (base_url)) {
     CHECK_STRING (base_url);
     burl = SDATA (base_url);
   }
-  
+
   if (htmlp)
     doc = htmlReadMemory (SDATA (string), SBYTES (string), burl, "utf-8",
 			  HTML_PARSE_RECOVER|HTML_PARSE_NONET|
 			  HTML_PARSE_NOWARNING|HTML_PARSE_NOERROR);
-  else 
+  else
     doc = xmlReadMemory (SDATA (string), SBYTES (string), burl, "utf-8",
 			 XML_PARSE_NONET|XML_PARSE_NOWARNING|
 			 XML_PARSE_NOERROR);
@@ -99,11 +99,11 @@
     node = xmlDocGetRootElement (doc);
     if (node != NULL)
       result = make_dom (node);
-    
+
     xmlFreeDoc (doc);
     xmlCleanupParser ();
   }
-      
+
   return result;
 }
------------------------------------------------------------
revno: 101403
committer: Lars Magne Ingebrigtsen <larsi@gnus.org>
branch nick: trunk
timestamp: Fri 2010-09-10 18:44:35 +0200
message:
  Add support for the libxml2 library.
  
  This adds the html-parse-string and xml-parse-string functions in the
  new file src/xml.c, as well as autoconf detection of the library.
diff:
=== modified file 'ChangeLog'
--- ChangeLog	2010-09-09 02:37:59 +0000
+++ ChangeLog	2010-09-10 16:44:35 +0000
@@ -1,3 +1,7 @@
+2010-09-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* configure.in: Check for libxml2.
+
 2010-09-09  Glenn Morris  <rgm@gnu.org>
 
 	* make-dist: No more TODO files under lisp/.

=== modified file 'configure'
--- configure	2010-09-06 16:38:03 +0000
+++ configure	2010-09-10 16:44:35 +0000
@@ -660,6 +660,8 @@
 LIBS_MAIL
 liblockfile
 ALLOCA
+LIBXML2_LIBS
+LIBXML2_CFLAGS
 LIBXSM
 LIBGPM
 LIBGIF
@@ -807,6 +809,7 @@
 with_gif
 with_png
 with_rsvg
+with_xml2
 with_imagemagick
 with_xft
 with_libotf
@@ -1514,6 +1517,7 @@
   --without-gif           don't compile with GIF image support
   --without-png           don't compile with PNG image support
   --without-rsvg          don't compile with SVG image support
+  --without-xml2          don't compile with XML parsing support
   --with-imagemagick      compile with ImageMagick image support
   --without-xft           don't use XFT for anti aliased fonts
   --without-libotf        don't use libotf for OpenType font support
@@ -2732,6 +2736,14 @@
 fi
 
 
+# Check whether --with-xml2 was given.
+if test "${with_xml2+set}" = set; then :
+  withval=$with_xml2;
+else
+     with_xml2=yes
+fi
+
+
 # Check whether --with-imagemagick was given.
 if test "${with_imagemagick+set}" = set; then :
   withval=$with_imagemagick;
@@ -11070,6 +11082,112 @@
 fi
 
 
+### Use libxml (-lxml2) if available
+if test "${with_xml2}" != "no"; then
+  ### I'm not sure what the version number should be, so I just guessed.
+
+  succeeded=no
+
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+  if test "$PKG_CONFIG" = "no" ; then
+     HAVE_LIBXML2=no
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 > 2.2.0" >&5
+$as_echo_n "checking for libxml-2.0 > 2.2.0... " >&6; }
+
+        if $PKG_CONFIG --exists "libxml-2.0 > 2.2.0" 2>&5; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+            succeeded=yes
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXML2_CFLAGS" >&5
+$as_echo_n "checking LIBXML2_CFLAGS... " >&6; }
+            LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 > 2.2.0"|sed -e 's,///*,/,g'`
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML2_CFLAGS" >&5
+$as_echo "$LIBXML2_CFLAGS" >&6; }
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXML2_LIBS" >&5
+$as_echo_n "checking LIBXML2_LIBS... " >&6; }
+            LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 > 2.2.0"|sed -e 's,///*,/,g'`
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML2_LIBS" >&5
+$as_echo "$LIBXML2_LIBS" >&6; }
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+            LIBXML2_CFLAGS=""
+            LIBXML2_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            LIBXML2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0 > 2.2.0"`
+
+        fi
+
+
+
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     HAVE_LIBXML2=yes
+  else
+     HAVE_LIBXML2=no
+  fi
+
+  if test "${HAVE_LIBXML2}" = "yes"; then
+
+$as_echo "#define HAVE_LIBXML2 1" >>confdefs.h
+
+  fi
+fi
+
+
+
 # If netdb.h doesn't declare h_errno, we must declare it by hand.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether netdb declares h_errno" >&5
 $as_echo_n "checking whether netdb declares h_errno... " >&6; }

=== modified file 'configure.in'
--- configure.in	2010-08-23 12:54:09 +0000
+++ configure.in	2010-09-10 16:44:35 +0000
@@ -155,6 +155,7 @@
 OPTION_DEFAULT_ON([gif],[don't compile with GIF image support])
 OPTION_DEFAULT_ON([png],[don't compile with PNG image support])
 OPTION_DEFAULT_ON([rsvg],[don't compile with SVG image support])
+OPTION_DEFAULT_ON([xml2],[don't compile with XML parsing support])
 OPTION_DEFAULT_OFF([imagemagick],[compile with ImageMagick image support])
 
 OPTION_DEFAULT_ON([xft],[don't use XFT for anti aliased fonts])
@@ -2535,6 +2536,17 @@
 fi
 AC_SUBST(LIBXSM)
 
+### Use libxml (-lxml2) if available
+if test "${with_xml2}" != "no"; then
+  ### I'm not sure what the version number should be, so I just guessed.
+  PKG_CHECK_MODULES(LIBXML2, libxml-2.0 > 2.2.0, HAVE_LIBXML2=yes, HAVE_LIBXML2=no)
+  if test "${HAVE_LIBXML2}" = "yes"; then
+    AC_DEFINE(HAVE_LIBXML2, 1, [Define to 1 if you have the libxml library (-lxml2).])
+  fi
+fi
+AC_SUBST(LIBXML2_LIBS)
+AC_SUBST(LIBXML2_CFLAGS)
+
 # If netdb.h doesn't declare h_errno, we must declare it by hand.
 AC_CACHE_CHECK(whether netdb declares h_errno,
 	       emacs_cv_netdb_declares_h_errno,

=== modified file 'doc/lispref/text.texi'
--- doc/lispref/text.texi	2010-09-02 10:17:02 +0000
+++ doc/lispref/text.texi	2010-09-10 16:44:35 +0000
@@ -59,6 +59,7 @@
                        position stored in a register.
 * Base 64::          Conversion to or from base 64 encoding.
 * MD5 Checksum::     Compute the MD5 "message digest"/"checksum".
+* Parsing HTML::     Parsing HTML and XML.
 * Atomic Changes::   Installing several buffer changes "atomically".
 * Change Hooks::     Supplying functions to be run when text is changed.
 @end menu
@@ -4106,6 +4107,49 @@
 coding instead.
 @end defun
 
+@node Parsing HTML
+@section Parsing HTML
+@cindex parsing html
+@cindex parsing xml
+
+Emacs provides an interface to the @code{libxml2} library via two
+functions: @code{html-parse-buffer} and @code{xml-parse-buffer}.  The
+HTML function will parse ``real world'' HTML and try to return a
+sensible parse tree, while the XML function is somewhat stricter about
+syntax.
+
+They both take a two optional parameter.  The first is a buffer, and
+the second is a base URL to be used to expand relative URLs in the
+document, if any.
+
+Here's an example demonstrating the structure of the parsed data you
+get out.  Given this HTML document:
+
+@example
+<html><hEad></head><body width=101><div class=thing>Foo<div>Yes
+@end example
+
+You get this parse tree:
+
+@example
+(html
+ (head)
+ (body
+  (:width . "101")
+  (div
+   (:class . "thing")
+   (text . "Foo")
+   (div
+    (text . "Yes\n")))))
+@end example
+
+It's a simple tree structure, where the @code{car} for each node is
+the name of the node, and the @code{cdr} is the value, or the list of
+values.
+
+Attributes are coded the same way as child nodes, but with @samp{:} as
+the first character.
+
 @node Atomic Changes
 @section Atomic Change Groups
 @cindex atomic changes

=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-09-05 02:06:39 +0000
+++ src/ChangeLog	2010-09-10 16:44:35 +0000
@@ -1,3 +1,13 @@
+2010-09-09  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* xml.c (Fxml_parse_buffer): New function to parse XML files.
+
+2010-09-08  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* xml.c: New file.
+	(Fhtml_parse_buffer): New function to interface to the libxml2
+	html parsing function.
+
 2010-09-05  Juanma Barranquero  <lekktu@gmail.com>
 
 	* biditype.h: Regenerate.

=== modified file 'src/Makefile.in'
--- src/Makefile.in	2010-08-17 21:19:11 +0000
+++ src/Makefile.in	2010-09-10 16:44:35 +0000
@@ -226,6 +226,8 @@
 IMAGEMAGICK_LIBS= @IMAGEMAGICK_LIBS@
 IMAGEMAGICK_CFLAGS= @IMAGEMAGICK_CFLAGS@
 
+LIBXML2_LIBS = @LIBXML2_LIBS@
+LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
 
 ## widget.o if USE_X_TOOLKIT, otherwise empty.
 WIDGET_OBJ=@WIDGET_OBJ@
@@ -320,7 +322,8 @@
 ## FIXME? MYCPPFLAGS only referenced in etc/DEBUG.
 ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} \
   ${C_SWITCH_MACHINE} ${C_SWITCH_SYSTEM} ${C_SWITCH_X_SITE} \
-  ${C_SWITCH_X_SYSTEM} ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${IMAGEMAGICK_CFLAGS} ${DBUS_CFLAGS} \
+  ${C_SWITCH_X_SYSTEM} ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${IMAGEMAGICK_CFLAGS} \
+  ${LIBXML2_CFLAGS} ${DBUS_CFLAGS} \
   ${GCONF_CFLAGS} ${FREETYPE_CFLAGS} ${FONTCONFIG_CFLAGS} \
   ${LIBOTF_CFLAGS} ${M17N_FLT_CFLAGS} ${DEPFLAGS} ${PROFILING_CFLAGS} \
   ${C_WARNINGS_SWITCH} ${CFLAGS}
@@ -349,7 +352,7 @@
 	syntax.o $(UNEXEC_OBJ) bytecode.o \
 	process.o callproc.o \
 	region-cache.o sound.o atimer.o \
-	doprnt.o strftime.o intervals.o textprop.o composite.o md5.o \
+	doprnt.o strftime.o intervals.o textprop.o composite.o md5.o xml.o \
 	$(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ)
 
 ## Object files used on some machine or other.
@@ -595,7 +598,8 @@
 ## duplicated symbols.  If the standard libraries were compiled
 ## with GCC, we might need LIB_GCC again after them.
 LIBES = $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \
-   $(RSVG_LIBS) ${IMAGEMAGICK_LIBS}  $(DBUS_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \
+   $(RSVG_LIBS) ${IMAGEMAGICK_LIBS} $(DBUS_LIBS) \
+   ${LIBXML2_LIBS} $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \
    $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) ${GCONF_LIBS} ${LIBSELINUX_LIBS} \
    $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \
    $(LIB_GCC) $(LIB_MATH) $(LIB_STANDARD) $(LIB_GCC)

=== modified file 'src/config.in'
--- src/config.in	2010-08-17 21:19:11 +0000
+++ src/config.in	2010-09-10 16:44:35 +0000
@@ -813,6 +813,9 @@
 /* Define to 1 if you have the SM library (-lSM). */
 #undef HAVE_X_SM
 
+/* Define to 1 if you have the libxml2 library (-lxml2). */
+#undef HAVE_LIBXML2
+
 /* Define to 1 if you want to use the X window system. */
 #undef HAVE_X_WINDOWS
 

=== modified file 'src/emacs.c'
--- src/emacs.c	2010-08-22 21:15:20 +0000
+++ src/emacs.c	2010-09-10 16:44:35 +0000
@@ -1544,6 +1544,10 @@
 #endif
 #endif /* HAVE_X_WINDOWS */
 
+#ifdef HAVE_LIBXML2
+      syms_of_xml ();
+#endif
+
       syms_of_menu ();
 
 #ifdef HAVE_NTGUI

=== modified file 'src/lisp.h'
--- src/lisp.h	2010-08-09 19:25:41 +0000
+++ src/lisp.h	2010-09-10 16:44:35 +0000
@@ -3577,6 +3577,11 @@
 EXFUN (Fmsdos_downcase_filename, 1);
 #endif
 
+#ifdef HAVE_LIBXML2
+/* Defined in xml.c */
+extern void syms_of_xml (void);
+#endif
+
 #ifdef HAVE_MENUS
 /* Defined in (x|w32)fns.c, nsfns.m...  */
 extern int have_menus_p (void);

=== added file 'src/xml.c'
--- src/xml.c	1970-01-01 00:00:00 +0000
+++ src/xml.c	2010-09-10 16:44:35 +0000
@@ -0,0 +1,137 @@
+/* Interface to libxml2.
+   Copyright (C) 2010 Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#ifdef HAVE_LIBXML2
+
+#include <setjmp.h>
+#include <libxml/tree.h>
+#include <libxml/parser.h>
+#include <libxml/HTMLparser.h>
+
+#include "lisp.h"
+#include "buffer.h"
+
+Lisp_Object make_dom (xmlNode *node)
+{
+  if (node->type == XML_ELEMENT_NODE) {
+    Lisp_Object result = Fcons (intern (node->name), Qnil);
+    xmlNode *child;
+    xmlAttr *property;
+
+    /* First add the attributes. */
+    property = node->properties;
+    while (property != NULL) {
+      if (property->children &&
+	  property->children->content) {
+	char *pname = xmalloc (strlen (property->name) + 2);
+	*pname = ':';
+	strcpy(pname + 1, property->name);
+	result = Fcons (Fcons (intern (pname),
+			       build_string(property->children->content)),
+			result);
+	xfree (pname);
+      }
+      property = property->next;
+    }
+    /* Then add the children of the node. */
+    child = node->children;
+    while (child != NULL) {
+      result = Fcons (make_dom (child), result);
+      child = child->next;
+    }
+    return Fnreverse (result);
+  } else if (node->type == XML_TEXT_NODE) {
+    Lisp_Object content = Qnil;
+
+    if (node->content)
+      content = build_string (node->content);
+      
+    return Fcons (intern (node->name), content);
+  } else
+    return Qnil;
+}
+
+static Lisp_Object
+parse_buffer (Lisp_Object string, Lisp_Object base_url, int htmlp)
+{
+  xmlDoc *doc;
+  xmlNode *node;
+  Lisp_Object result;
+  int ibeg, iend;
+  char *burl = "";
+  
+  LIBXML_TEST_VERSION;
+	
+  CHECK_STRING (string);
+
+  if (! NILP (base_url)) {
+    CHECK_STRING (base_url);
+    burl = SDATA (base_url);
+  }
+  
+  if (htmlp)
+    doc = htmlReadMemory (SDATA (string), SBYTES (string), burl, "utf-8",
+			  HTML_PARSE_RECOVER|HTML_PARSE_NONET|
+			  HTML_PARSE_NOWARNING|HTML_PARSE_NOERROR);
+  else 
+    doc = xmlReadMemory (SDATA (string), SBYTES (string), burl, "utf-8",
+			 XML_PARSE_NONET|XML_PARSE_NOWARNING|
+			 XML_PARSE_NOERROR);
+
+  if (doc != NULL) {
+    node = xmlDocGetRootElement (doc);
+    if (node != NULL)
+      result = make_dom (node);
+    
+    xmlFreeDoc (doc);
+    xmlCleanupParser ();
+  }
+      
+  return result;
+}
+
+DEFUN ("html-parse-string", Fhtml_parse_string, Shtml_parse_string,
+       0, 2, 0,
+       doc: /* Parse the string as an HTML document and return the parse tree.*/)
+  (Lisp_Object string, Lisp_Object base_url)
+{
+  return parse_buffer (string, base_url, 1);
+}
+
+DEFUN ("xml-parse-string", Fxml_parse_string, Sxml_parse_string,
+       0, 2, 0,
+       doc: /* Parse the string as an XML document and return the parse tree.*/)
+  (Lisp_Object string, Lisp_Object base_url)
+{
+  return parse_buffer (string, base_url, 0);
+}
+
+
+/***********************************************************************
+			    Initialization
+ ***********************************************************************/
+void
+syms_of_xml (void)
+{
+  defsubr (&Shtml_parse_string);
+  defsubr (&Sxml_parse_string);
+}
+
+#endif /* HAVE_LIBXML2 */
------------------------------------------------------------
revno: 101402
committer: Agustin martin <agustin.martin@hispalinux.es>
branch nick: trunk
timestamp: Fri 2010-09-10 13:20:51 +0200
message:
  ispell.el: Improve comments. XEmacs compatibility changes.
  
  * textmodes/ispell.el (ispell-init-process): Improve comments.
    XEmacs compatibility changes regarding (add-hook) 'local option
    and (set-process-query-on-exit-flag).
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-09 13:24:39 +0000
+++ lisp/ChangeLog	2010-09-10 11:20:51 +0000
@@ -1,3 +1,9 @@
+2010-09-10  Agustín Martín  <agustin.martin@hispalinux.es>
+
+	* textmodes/ispell.el (ispell-init-process): Improve comments.
+	XEmacs compatibility changes regarding (add-hook) 'local option
+	and (set-process-query-on-exit-flag).
+
 2010-09-09  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp-cache.el (tramp-parse-connection-properties): Set

=== modified file 'lisp/textmodes/ispell.el'
--- lisp/textmodes/ispell.el	2010-09-08 14:54:00 +0000
+++ lisp/textmodes/ispell.el	2010-09-10 11:20:51 +0000
@@ -2674,24 +2674,27 @@
 	    ispell-filter-continue nil
 	    ispell-process-directory default-directory)
 
-      ;; Kill ispell process when killing its associated buffer if using Ispell
-      ;; per-directory personal dictionaries.
       (unless (equal ispell-process-directory (expand-file-name "~/"))
-        (with-current-buffer
-	    (if (and (window-minibuffer-p)
-                     (fboundp 'minibuffer-selected-window)) ;; E.g. XEmacs.
-                ;; When spellchecking minibuffer contents, assign ispell
-                ;; process to parent buffer if known (not known for XEmacs).
-                ;; Use (buffer-name) otherwise.
+	;; At this point, `ispell-process-directory' will be "~/" unless using
+	;; Ispell with directory-specific dicts and not in XEmacs minibuffer.
+	;; If not, kill ispell process when killing buffer.  It may be in a
+	;; removable device that would otherwise become un-mountable.
+	(with-current-buffer
+	    (if (and (window-minibuffer-p)                  ;; In minibuffer
+		     (fboundp 'minibuffer-selected-window)) ;; Not XEmacs.
+		;; In this case kill ispell only when parent buffer is killed
+		;; to avoid over and over ispell kill.
 		(window-buffer (minibuffer-selected-window))
-              (current-buffer))
-          (add-hook 'kill-buffer-hook (lambda () (ispell-kill-ispell t))
-                    nil 'local)))
+	      (current-buffer))
+	  ;; 'local does not automatically make hook buffer-local in XEmacs.
+	  (if (featurep 'xemacs)
+	      (make-local-hook 'kill-buffer-hook))
+	  (add-hook 'kill-buffer-hook
+		    (lambda () (ispell-kill-ispell t)) nil 'local)))
 
       (if ispell-async-processp
 	  (set-process-filter ispell-process 'ispell-filter))
-      ;; protect against bogus binding of `enable-multibyte-characters' in
-      ;; XEmacs.
+      ;; Protect against XEmacs bogus binding of `enable-multibyte-characters'.
       (if (and (or (featurep 'xemacs)
 		   (and (boundp 'enable-multibyte-characters)
 			enable-multibyte-characters))
@@ -2727,7 +2730,9 @@
 	(if extended-char-mode		; ~ extended character mode
 	    (ispell-send-string (concat extended-char-mode "\n"))))
       (if ispell-async-processp
-	  (set-process-query-on-exit-flag ispell-process nil)))))
+	  (if (fboundp 'set-process-query-on-exit-flag) ;; not XEmacs
+	      (set-process-query-on-exit-flag ispell-process nil)
+	    (process-kill-without-query ispell-process))))))
 
 ;;;###autoload
 (defun ispell-kill-ispell (&optional no-error)
------------------------------------------------------------
revno: 101401 [merge]
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Fri 2010-09-10 05:33:13 +0000
message:
  gnus-start.el (gnus-read-active-for-groups): Check only subscribed groups.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-10 00:08:31 +0000
+++ lisp/gnus/ChangeLog	2010-09-10 05:32:25 +0000
@@ -1,3 +1,11 @@
+2010-09-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-start.el (gnus-read-active-for-groups): Check only subscribed
+	groups; replace mapcar with dolist which is a bit faster; pass groups
+	info to gnus-read-active-file-1.
+	(gnus-read-active-file-1): Scan only specified groups if the new
+	optional arg `infos' is given.
+
 2010-09-09  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* mail-source.el (mail-source-fetch-pop): Use pop3-movemail again.

=== modified file 'lisp/gnus/gnus-start.el'
--- lisp/gnus/gnus-start.el	2010-09-09 06:15:13 +0000
+++ lisp/gnus/gnus-start.el	2010-09-10 05:32:25 +0000
@@ -1801,14 +1801,15 @@
     (cond
      ((gnus-check-backend-function 'retrieve-groups (car method))
       (when (gnus-check-backend-function 'request-scan (car method))
-	(gnus-request-scan nil method))
-      (gnus-read-active-file-2
-       (mapcar (lambda (info)
-		 (gnus-group-real-name (gnus-info-group info)))
-	       infos)
-       method))
+	(dolist (info infos)
+	  (gnus-request-scan (gnus-info-group info) method)))
+      (let (groups)
+	(gnus-read-active-file-2
+	 (dolist (info infos (nreverse groups))
+	   (push (gnus-group-real-name (gnus-info-group info)) groups))
+	 method)))
      ((gnus-check-backend-function 'request-list (car method))
-      (gnus-read-active-file-1 method nil))
+      (gnus-read-active-file-1 method nil infos))
      (t
       (dolist (info infos)
 	(gnus-activate-group (gnus-info-group info) nil nil method t))))))
@@ -2037,7 +2038,7 @@
 	       (message "Quit reading the active file")
 	       nil))))))))
 
-(defun gnus-read-active-file-1 (method force)
+(defun gnus-read-active-file-1 (method force &optional infos)
   (let (where mesg)
     (setq where (nth 1 method)
 	  mesg (format "Reading active file%s via %s..."
@@ -2050,7 +2051,10 @@
       (when (and gnus-agent
 		 (gnus-online method)
 		 (gnus-check-backend-function 'request-scan (car method)))
-	(gnus-request-scan nil method))
+	(if infos
+	    (dolist (info infos)
+	      (gnus-request-scan (gnus-info-group info) method))
+	  (gnus-request-scan nil method)))
       (cond
        ((and (eq gnus-read-active-file 'some)
 	     (gnus-check-backend-function 'retrieve-groups (car method))
------------------------------------------------------------
revno: 101400 [merge]
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Fri 2010-09-10 00:10:20 +0000
message:
  Merge changes made in Gnus trunk.
  
  gnus-html.el (gnus-html-wash-tags): Refactor out the image bit, and don't restrict end-tag searches to the end of the line.
  
  Remove pop3-movemail and rename pop3-streaming-movemail to pop3-movemail.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-09 06:15:13 +0000
+++ lisp/gnus/ChangeLog	2010-09-10 00:08:31 +0000
@@ -1,3 +1,13 @@
+2010-09-09  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* mail-source.el (mail-source-fetch-pop): Use pop3-movemail again.
+
+	* pop3.el (pop3-movemail): Removed.
+	(pop3-streaming-movemail): Renamed to pop3-movemail.
+
+	* gnus-html.el (gnus-html-wash-tags): Refactor out the image bit, and
+	don't restrict end-tag searches to the end of the line.
+
 2010-09-09  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-start.el (gnus-get-unread-articles): Set the number of unread

=== modified file 'lisp/gnus/gnus-html.el'
--- lisp/gnus/gnus-html.el	2010-09-09 00:08:06 +0000
+++ lisp/gnus/gnus-html.el	2010-09-10 00:07:33 +0000
@@ -128,11 +128,9 @@
   (while (re-search-forward "<a name[^\n>]+>" nil t)
     (replace-match "" t t)))
 
-(defun gnus-html-wash-tags ()
+(defun gnus-html-wash-images ()
   (let (tag parameters string start end images url)
-    (gnus-html-pre-wash)
     (goto-char (point-min))
-
     ;; Search for all the images first.
     (while (re-search-forward "<img_alt \\([^>]*\\)>" nil t)
       (setq parameters (match-string 1)
@@ -210,6 +208,13 @@
 			      (set-marker (make-marker) start)
 			      (point-marker))
 			images))))))))
+    (when images
+      (gnus-html-schedule-image-fetching (current-buffer) (nreverse images)))))
+
+(defun gnus-html-wash-tags ()
+  (let (tag parameters string start end images url)
+    (gnus-html-pre-wash)
+    (gnus-html-wash-images)
 
     (goto-char (point-min))
     ;; Then do the other tags.
@@ -220,7 +225,7 @@
       (when (plusp (length parameters))
 	(set-text-properties 0 (1- (length parameters)) nil parameters))
       (delete-region start (point))
-      (when (search-forward (concat "</" tag ">") (line-end-position) t)
+      (when (search-forward (concat "</" tag ">") nil t)
 	(delete-region (match-beginning 0) (match-end 0)))
       (setq end (point))
       (cond
@@ -254,8 +259,6 @@
     ;; off any </pre_int>s that were left over.
     (while (re-search-forward "</pre_int>\\|</internal>" nil t)
       (replace-match "" t t))
-    (when images
-      (gnus-html-schedule-image-fetching (current-buffer) (nreverse images)))
     (mm-url-decode-entities)))
 
 (defun gnus-html-insert-image ()

=== modified file 'lisp/gnus/mail-source.el'
--- lisp/gnus/mail-source.el	2010-09-05 23:38:33 +0000
+++ lisp/gnus/mail-source.el	2010-09-10 00:08:31 +0000
@@ -34,7 +34,7 @@
   (require 'cl)
   (require 'imap))
 (autoload 'auth-source-user-or-password "auth-source")
-(autoload 'pop3-streaming-movemail "pop3")
+(autoload 'pop3-movemail "pop3")
 (autoload 'pop3-get-message-count "pop3")
 (autoload 'nnheader-cancel-timer "nnheader")
 (require 'mm-util)
@@ -839,11 +839,9 @@
 		     (if (eq authentication 'apop) 'apop 'pass))
 		    (pop3-stream-type stream))
 		(if (or debug-on-quit debug-on-error)
-		    (save-excursion (pop3-streaming-movemail
-				     mail-source-crash-box))
+		    (save-excursion (pop3-movemail mail-source-crash-box))
 		  (condition-case err
-		      (save-excursion (pop3-streaming-movemail
-				       mail-source-crash-box))
+		      (save-excursion (pop3-movemail mail-source-crash-box))
 		    (error
 		     ;; We nix out the password in case the error
 		     ;; was because of a wrong password being given.

=== modified file 'lisp/gnus/pop3.el'
--- lisp/gnus/pop3.el	2010-09-06 02:09:42 +0000
+++ lisp/gnus/pop3.el	2010-09-10 00:08:31 +0000
@@ -129,7 +129,8 @@
 		       (truncate pop3-read-timeout))
 		    1000))))))
 
-(defun pop3-streaming-movemail (file)
+;;;###autoload
+(defun pop3-movemail (file)
   "Transfer contents of a maildrop to the specified FILE.
 Use streaming commands."
   (let* ((process (pop3-open-server pop3-mailhost pop3-port))
@@ -227,44 +228,6 @@
 	   (pop3-pass process))
 	  (t (error "Invalid POP3 authentication scheme")))))
 
-(defun pop3-movemail (&optional crashbox)
-  "Transfer contents of a maildrop to the specified CRASHBOX."
-  (or crashbox (setq crashbox (expand-file-name "~/.crashbox")))
-  (let* ((process (pop3-open-server pop3-mailhost pop3-port))
-	 (crashbuf (get-buffer-create " *pop3-retr*"))
-	 (n 1)
-	 message-count
-	 message-sizes)
-    (pop3-logon process)
-    (setq message-count (car (pop3-stat process)))
-    (when (> message-count 0)
-      (setq message-sizes (pop3-list process)))
-    (unwind-protect
-	(while (<= n message-count)
-	  (message "Retrieving message %d of %d from %s... (%.1fk)"
-		   n message-count pop3-mailhost
-		   (/ (cdr (assoc n message-sizes))
-		      1024.0))
-	  (pop3-retr process n crashbuf)
-	  (save-excursion
-	    (set-buffer crashbuf)
-	    (let ((coding-system-for-write 'binary))
-	      (write-region (point-min) (point-max) crashbox t 'nomesg))
-	    (set-buffer (process-buffer process))
-	    (erase-buffer))
-          (unless pop3-leave-mail-on-server
-            (pop3-dele process n))
-	  (setq n (+ 1 n))
-	  (pop3-accept-process-output process))
-      (when (and pop3-leave-mail-on-server
-		 (> n 1))
-	(message "pop3.el doesn't support UIDL.  Setting `pop3-leave-mail-on-server'
-to %s might not give the result you'd expect." pop3-leave-mail-on-server)
-	(sit-for 1))
-      (pop3-quit process))
-    (kill-buffer crashbuf))
-  t)
-
 (defun pop3-get-message-count ()
   "Return the number of messages in the maildrop."
   (let* ((process (pop3-open-server pop3-mailhost pop3-port))
------------------------------------------------------------
revno: 101399
committer: Michael Albinus <michael.albinus@gmx.de>
branch nick: trunk
timestamp: Thu 2010-09-09 15:24:39 +0200
message:
  * net/tramp-cache.el (tramp-parse-connection-properties): Set
  tramp-autoload cookie.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-09 02:25:12 +0000
+++ lisp/ChangeLog	2010-09-09 13:24:39 +0000
@@ -1,3 +1,8 @@
+2010-09-09  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp-cache.el (tramp-parse-connection-properties): Set
+	tramp-autoload cookie.
+
 2010-09-09  Glenn Morris  <rgm@gnu.org>
 
 	* image.el (imagemagick-types-inhibit): Add :type, :version, :group.

=== modified file 'lisp/net/tramp-cache.el'
--- lisp/net/tramp-cache.el	2010-09-08 14:42:54 +0000
+++ lisp/net/tramp-cache.el	2010-09-09 13:24:39 +0000
@@ -357,6 +357,7 @@
 	     (remove-hook 'kill-emacs-hook
 			  'tramp-dump-connection-properties)))
 
+;;;###tramp-autoload
 (defun tramp-parse-connection-properties (method)
   "Return a list of (user host) tuples allowed to access for METHOD.
 This function is added always in `tramp-get-completion-function'
------------------------------------------------------------
revno: 101398
committer: Michael Albinus <michael.albinus@gmx.de>
branch nick: trunk
timestamp: Thu 2010-09-09 10:04:35 +0200
message:
  * tramp.texi: Remove Japanese manual.  Fix typo.
  
  * trampver.texi: Update release number.  Remove japanesemanual.
diff:
=== modified file 'doc/misc/ChangeLog'
--- doc/misc/ChangeLog	2010-09-09 02:16:14 +0000
+++ doc/misc/ChangeLog	2010-09-09 08:04:35 +0000
@@ -1,3 +1,9 @@
+2010-09-09  Michael Albinus  <michael.albinus@gmx.de>
+
+	* tramp.texi: Remove Japanese manual.  Fix typo.
+
+	* trampver.texi: Update release number.  Remove japanesemanual.
+
 2010-09-09  Glenn Morris  <rgm@gnu.org>
 
 	* org.texi: Restore clobbered changes (copyright years, untabify).

=== modified file 'doc/misc/tramp.texi'
--- doc/misc/tramp.texi	2010-09-01 07:13:21 +0000
+++ doc/misc/tramp.texi	2010-09-09 08:04:35 +0000
@@ -16,7 +16,7 @@
 
 @include trampver.texi
 
-@c Macro for formatting a filename according to the repective syntax.
+@c Macro for formatting a filename according to the respective syntax.
 @c xxx and yyy are auxiliary macros in order to omit leading and
 @c trailing whitespace.  Not very elegant, but I don't know it better.
 
@@ -105,11 +105,6 @@
 @end ifset
 
 @ifhtml
-@ifset jamanual
-This manual is also available as a @uref{@value{japanesemanual},
-Japanese translation}.
-@end ifset
-
 The latest release of @value{tramp} is available for
 @uref{ftp://ftp.gnu.org/gnu/tramp/, download}, or you may see
 @ref{Obtaining Tramp} for more details, including the CVS server
@@ -171,7 +166,6 @@
 
 * Installation parameters::     Parameters in order to control installation.
 * Load paths::                  How to plug-in @value{tramp} into your environment.
-* Japanese manual::             Japanese manual.
 
 @end ifset
 

=== modified file 'doc/misc/trampver.texi'
--- doc/misc/trampver.texi	2010-09-01 07:13:21 +0000
+++ doc/misc/trampver.texi	2010-09-09 08:04:35 +0000
@@ -9,7 +9,7 @@
 @c In the Tramp CVS, the version number is auto-frobbed from
 @c configure.ac, so you should edit that file and run
 @c "autoconf && ./configure" to change the version number.
-@set trampver 2.1.19
+@set trampver 2.2.0-pre
 
 @c Other flags from configuration
 @set instprefix /usr/local
@@ -56,7 +56,6 @@
 @set emacsothername     XEmacs
 @set emacsotherdir      xemacs
 @set emacsotherfilename tramp-xemacs.html
-@set japanesemanual     tramp_ja-emacs.html
 @end ifset
 
 @c XEmacs counterparts.
@@ -73,7 +72,6 @@
 @set emacsothername     GNU Emacs
 @set emacsotherdir      emacs
 @set emacsotherfilename tramp-emacs.html
-@set japanesemanual     tramp_ja-xemacs.html
 @end ifset
 
 @ignore
------------------------------------------------------------
revno: 101397 [merge]
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Thu 2010-09-09 06:16:12 +0000
message:
  gnus-start.el (gnus-get-unread-articles): Set the number of unread articles of every unchecked group to t, which means unknown since the server has never been opened.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-09 00:08:06 +0000
+++ lisp/gnus/ChangeLog	2010-09-09 06:15:13 +0000
@@ -1,3 +1,9 @@
+2010-09-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-start.el (gnus-get-unread-articles): Set the number of unread
+	articles of every unchecked group to t, which means unknown since the
+	server has never been opened.
+
 2010-09-08  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus-html.el (gnus-html-show-alt-text): New command.

=== modified file 'lisp/gnus/gnus-start.el'
--- lisp/gnus/gnus-start.el	2010-09-07 00:00:56 +0000
+++ lisp/gnus/gnus-start.el	2010-09-09 06:15:13 +0000
@@ -1692,7 +1692,7 @@
 	 (gnus-agent-article-local-times 0)
 	 (archive-method (gnus-server-to-method "archive"))
 	 infos info group active method cmethod
-	 method-type method-group-list)
+	 method-type method-group-list entry)
     (gnus-message 6 "Checking new news...")
 
     (while newsrc
@@ -1737,12 +1737,18 @@
 	(push (setq method-group-list (list method method-type nil))
 	      type-cache))
       ;; Only add groups that need updating.
-      (when (<= (gnus-info-level info)
-		(if (eq (cadr method-group-list) 'foreign)
-		    foreign-level
-		  alevel))
-	(setcar (nthcdr 2 method-group-list)
-		(cons info (nth 2 method-group-list)))))
+      (if (<= (gnus-info-level info)
+	      (if (eq (cadr method-group-list) 'foreign)
+		  foreign-level
+		alevel))
+	  (setcar (nthcdr 2 method-group-list)
+		  (cons info (nth 2 method-group-list)))
+	;; The group is inactive, so we nix out the number of unread articles.
+	;; It leads `(gnus-group-unread group)' to return t.  See also
+	;; `gnus-group-prepare-flat'.
+	(unless active
+	  (when (setq entry (gnus-group-entry group))
+	    (setcar entry t)))))
 
     ;; Sort the methods based so that the primary and secondary
     ;; methods come first.  This is done for legacy reasons to try to
------------------------------------------------------------
revno: 101396
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Wed 2010-09-08 19:37:59 -0700
message:
  * make-dist: No more TODO files under lisp/.
diff:
=== modified file 'ChangeLog'
--- ChangeLog	2010-09-04 07:30:14 +0000
+++ ChangeLog	2010-09-09 02:37:59 +0000
@@ -1,3 +1,7 @@
+2010-09-09  Glenn Morris  <rgm@gnu.org>
+
+	* make-dist: No more TODO files under lisp/.
+
 2010-09-04  Eli Zaretskii  <eliz@gnu.org>
 
 	* config.bat: Produce lisp/gnus/_dir-locals.el from

=== modified file 'make-dist'
--- make-dist	2010-06-10 05:28:40 +0000
+++ make-dist	2010-09-09 02:37:59 +0000
@@ -398,10 +398,10 @@
    mkdir -p ../${tempdir}/lisp/$file
    ln $file/[a-zA-Z0-9]*.el ../${tempdir}/lisp/$file
    ln $file/[a-zA-Z0-9]*.elc ../${tempdir}/lisp/$file
-   ## calc/README.priv, nxml/TODO
+   ## calc/README.priv
    for f in $file/[a-zA-Z]*.xpm $file/[a-zA-Z]*.[xp]bm \
        $file/README $file/ChangeLog $file/ChangeLog.*[0-9] \
-       $file/README.prev $file/TODO; do
+       $file/README.prev; do
      if [ -f $f ]; then
        ln $f ../${tempdir}/lisp/$file
      fi
------------------------------------------------------------
revno: 101395
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Wed 2010-09-08 19:34:25 -0700
message:
  * lisp/nxml/TODO: Remove.
  * etc/NEWS: Move nxml TODO items here.
diff:
=== modified file 'etc/TODO'
--- etc/TODO	2010-09-09 02:30:31 +0000
+++ etc/TODO	2010-09-09 02:34:25 +0000
@@ -670,6 +670,463 @@
 parallel with the one packaged by Fedora, it worked well.
 Ubuntu 8.04 was tested, but it seems it ships a broken ImageMagick.
 
+** nxml mode
+
+*** High priority
+
+**** Command to insert an element template, including all required
+attributes and child elements.  When there's a choice of elements
+possible, we could insert a comment, and put an overlay on that
+comment that makes it behave like a button with a pop-up menu to
+select the appropriate choice.
+
+**** Command to tag a region.  With a schema should complete using legal
+tags, but should work without a schema as well.
+
+**** Provide a way to conveniently rename an element.  With a schema should
+complete using legal tags, but should work without a schema as well.
+
+*** Outlining
+
+**** Implement C-c C-o C-q.
+
+**** Install pre/post command hook for moving out of invisible section.
+
+**** Put a modify hook on invisible sections that expands them.
+
+**** Integrate dumb folding somehow.
+
+**** An element should be able to be its own heading.
+
+**** Optimize to avoid complete buffer scan on each command.
+
+**** Make it work with HTML-style headings (i.e. level indicated by
+name of heading element rather than depth of section nesting).
+
+**** Recognize root element as a section provided it has a title, even
+if it doesn't match section-element-name-regex.
+
+**** Support for incremental search automatically making hidden text visible.
+
+**** Allow title to be an attribute.
+
+**** Command that says to recognize the tag at point as a section/heading.
+
+**** Explore better ways to determine when an element is a section
+or a heading.
+
+**** rng-next-error needs to either ignore invisible portion or reveal it
+(maybe use isearch oriented text properties).
+
+**** Errors within hidden section should be highlighted by underlining the
+ellipsis.
+
+**** Make indirect buffers work.
+
+**** How should nxml-refresh outline recover from non well-formed tags?
+
+**** Hide tags in title elements?
+
+**** Use overlays instead of text properties for holding outline state?
+Necessary for indirect buffers to work?
+
+**** Allow an outline to go in the speedbar.
+
+**** Split up outlining manual section into subsections.
+
+**** More detail in the manual about each outlining command.
+
+**** More menu entries for hiding/showing?
+
+**** Indication of many lines have been hidden?
+
+*** Locating schemas
+
+**** Should rng-validate-mode give the user an opportunity to specify a
+schema if there is currently none? Or should it at least give a hint
+to the user how to specify a non-vacuous schema?
+
+**** Support for adding new schemas to schema-locating files.
+Add documentElement and namespace elements.
+
+**** C-c C-w should be able to report current type id.
+
+**** Implement doctypePublicId.
+
+**** Implement typeIdBase.
+
+**** Implement typeIdProcessingInstruction.
+
+**** Support xml:base.
+
+**** Implement group.
+
+**** Find preferred prefix from schema-locating files.  Get rid of
+rng-preferred-prefix-alist.
+
+**** Inserting document element with vacuous schema should complete using
+document elements declared in schema locating files, and set schema
+appropriately.
+
+**** Add a ruleType attribute to the <include> element?
+
+**** Allow processing instruction in prolog to contain the compact syntax
+schema directly.
+
+**** Use RDDL to locate a schema based on the namespace URI.
+
+**** Should not prompt to add redundant association to schema locating file.
+
+**** Command to reload current schema.
+
+*** Schema-sensitive features
+
+**** Should filter dynamic markup possibilities using schema validity, by
+adding hook to nxml-mode.
+
+**** Dynamic markup word should (at least optionally) be able to look in
+other buffers that are using nxml-mode.
+
+**** Should clicking on Invalid move to next error if already on an error?
+
+**** Take advantage of a:documentation.  Needs change to schema format.
+
+**** Provide feasible validation (as in Jing) toggle.
+
+**** Save the validation state as a property on the error overlay to enable
+more detailed diagnosis.
+
+**** Provide an Error Summary buffer showing all the validation errors.
+
+**** Pop-up menu.  What is useful?  Tag a region (should be greyed out if
+the region is not balanced).  Suggestions based on error messages.
+
+**** Have configurable list of namespace URIs so that we can provide
+namespace URI completion on extension elements or with schema-less documents.
+
+**** Allow validation to handle XInclude.
+
+**** ID/IDREF support.
+
+*** Completion
+
+**** Make it work with icomplete.  Only use a function to complete when
+some of the possible names have undeclared namespaces.
+
+**** How should C-return in mixed text work?
+
+**** When there's a vacuous schema, C-return after < will insert the end-tag.
+Is this a bug or a feature?
+
+**** After completing start-tag, ensure we don't get unhelpful message
+from validation
+
+**** Syntax table for completion.
+
+**** Should complete start-tag name with a space if namespace attributes
+are required.
+
+**** When completing start-tag name with no prefix and it doesn't match
+should try to infer namespace from local name.
+
+**** Should completion pay attention to characters after point?  If so, how?
+
+**** When completing start-tag name, add required atts if only one required
+attribute.
+
+**** When completing attribute name, add attribute value if only one value
+is possible.
+
+**** After attribute-value completion, insert space after close delimiter
+if more attributes are required.
+
+**** Complete on enumerated data values in elements.
+
+**** When in context that allows only elements, should get tag
+completion without having to type < first.
+
+**** When immediately after start-tag name, and name is valid and not
+prefix of any other name, should C-return complete on attribute names?
+
+**** When completing attributes, more consistent to ignore all attributes
+after point.
+
+**** Inserting attribute value completions needs to be sensitive to what
+delimiter is used so that it quotes the correct character.
+
+**** Complete on encoding-names in XML decl.
+
+**** Complete namespace declarations by searching for all namespaces
+mentioned in the schema.
+
+*** Well-formed XML support
+
+**** Deal better with Mule-UCS
+
+**** Deal with UTF-8 BOM when reading.
+
+**** Complete entity names.
+
+**** Provide some support for entity names for MathML.
+
+**** Command to repeat the last tag.
+
+**** Support for changing between character references and characters.
+Need to check that context is one in which character references are
+allowed.  xmltok prolog parsing will need to distinguish parameter
+literals from other kinds of literal.
+
+**** Provide a comment command to bind to M-; that works better than the
+normal one.
+
+**** Make indenting in a multi-line comment work.
+
+**** Structure view.  Separate buffer displaying element tree.
+Be able to navigate from structure view to document and vice-versa.
+
+**** Flash matching >.
+
+**** Smart selection command that selects increasingly large syntactically
+coherent chunks of XML.  If point is in an attribute value, first
+select complete value; then if command is repeated, select value plus
+delimiters, then select attribute name as well, then complete
+start-tag, then complete element, then enclosing element, etc.
+
+**** ispell integration.
+
+**** Block-level items in mixed content should be indented, e.g:
+  <para>This is list:
+    <ul>
+      <li>item</li>
+
+**** Provide option to indent like this:
+    <para>This is a paragraph
+     occupying multiple lines.</para>
+
+**** Option to add make a / that closes a start-tag electrically insert a
+space for the XHTML guys.
+
+**** C-M-q should work.
+
+*** Datatypes
+
+**** Figure out workaround for CJK characters with regexps.
+
+**** Does category C contain Cn?
+
+**** Do ENTITY datatype properly.
+
+*** XML Parsing Library
+
+**** Parameter entity parsing option, nil (never), t (always),
+unless-standalone (unless standalone="yes" in XML declaration).
+
+**** When a file is currently being edited, there should be an option to
+use its buffer instead of the on-disk copy.
+
+*** Handling all XML features
+
+**** Provide better support for editing external general parsed entities.
+Perhaps provide a way to force ignoring undefined entities; maybe turn
+this on automatically with <?xml encoding=""?> (with no version
+pseudo-att).
+
+**** Handle internal general entity declarations containing elements.
+
+**** Handle external general entity declarations.
+
+**** Handle default attribute declarations in internal subset.
+
+**** Handle parameter entities (including DTD).
+
+*** RELAX NG
+
+**** Do complete schema checking, at least optionally.
+
+**** Detect include/external loops during schema parse.
+
+**** Coding system detection for schemas.  Should use utf-8/utf-16 per the
+spec.  But also need to allow encodings other than UTF-8/16 to support
+CJK charsets that Emacs cannot represent in Unicode.
+
+*** Catching XML errors
+
+**** Check public identifiers.
+
+**** Check default attribute values.
+
+*** Performance
+
+**** Explore whether overlay-recenter can cure overlays performance problems.
+
+**** Cache schemas.  Need to have list of files and mtimes.
+
+**** Make it possible to reduce rng-validate-chunk-size significantly,
+perhaps to 500 bytes, without bad performance impact: don't do
+redisplay on every chunk; pass continue functions on other uses of
+rng-do-some-validation.
+
+**** Cache after first tag.
+
+**** Introduce a new name class that is a choice between names (so that
+we can use member)
+
+**** intern-choice should simplify after patterns with same 1st/2nd args
+
+**** Large numbers of overlays slow things down dramatically.  Represent
+errors using text properties.  This implies we cannot incrementally
+keep track of the number of errors, in order to determine validity.
+Instead, when validation completes, scan for any characters with an
+error text property; this seems to be fast enough even with large
+buffers.  Problem with error at end of buffer, where there's no
+character; need special variable for this.  Need to merge face from
+font-lock with the error face: use :inherit attribute with list of two
+faces.  How do we avoid making rng-valid depend on nxml-mode?
+
+*** Error recovery
+
+**** Don't stop at newline in looking for close of start-tag.
+
+**** Use indentation to guide recovery from mismatched end-tags
+
+**** Don't keep parsing when currently not well-formed but previously
+well-formed
+
+**** Try to recover from a bad start-tag by popping an open element if
+there was a mismatched end-tag unaccounted for.
+
+**** Try to recover from a bad start-tag open on the hypothesis that there
+was an error in the namespace URI.
+
+**** Better recovery from ill-formed XML declarations.
+
+*** Useability improvements
+
+**** Should print a "Parsing..." message during long movements.
+
+**** Provide better position for reference to undefined pattern error.
+
+**** Put Well-formed in the mode-line when validating against any-content.
+
+**** Trim marking of illegal data for leading and trailing whitespace.
+
+**** Show Invalid status as soon as we are sure it's invalid, rather than
+waiting for everything to be completely up to date.
+
+**** When narrowed, Valid or Invalid status should probably consider only
+validity of narrowed region.
+
+*** Bug fixes
+
+**** Need to give an error for a document like: <foo/><![CDATA[  ]]>
+
+**** Make nxml-forward-balanced-item work better for the prolog.
+
+**** Make filling and indenting comments work in the prolog.
+
+**** Should delete RNC Input buffers.
+
+**** Figure out what regex use for NCName and use it consistently,
+
+**** Should have not-well-formed tokens in ref.
+
+**** Require version in XML declaration? Probably not because prevents
+use for external parsed entities.  At least forbid standalone without version.
+
+**** Reject schema that compiles to rng-not-allowed-ipattern.
+
+**** Move point backwards on schema parse error so that it's on the right token.
+
+*** Internal
+
+**** Use rng-quote-string consistently.
+
+**** Use parsing library for XML to texinfo conversion.
+
+**** Rename xmltok.el to nxml-token.el.  Use nxml-t- prefix instead of
+xmltok-.  Change nxml-t-type to nxml-t-token-type, nxml-t-start to
+nxml-t-token-start.
+
+**** Can we set fill-prefix to nil and rely on indenting?
+
+**** xmltok should make available replacement text of entities containing
+elements
+
+**** In rng-valid, instead of using modification-hooks and
+insert-behind-hooks on dependent overlays, use same technique as nxml-mode.
+
+**** Port to XEmacs.  Issues include: Unicode (XEmacs seems to be based on
+Mule-UCS); overlays/text properties vs extents; absence of
+fontification-functions hook.
+
+*** Fontification
+
+**** Allow face to depend on element qname, attribute qname, attribute
+value.  Use list with pairs of (R . F), where R specifies regexps and
+F specifies faces.  How can this list be made to depend on the document type?
+
+*** Other
+
+**** Support RELAX NG XML syntax (use XML parsing library).
+
+**** Support W3C XML Schema (use XML parsing library).
+
+**** Command to infer schema from current document (like trang).
+
+*** Schemas
+
+**** XSLT schema should take advantage of RELAX NG to express cooccurrence
+constraints on attributes (e.g. xsl:template).
+
+*** Documentation
+
+**** Move material from README to manual.
+
+**** Document encodings.
+
+*** Notes
+
+**** How can we allow an error to be displayed on a different token from
+where it is detected?  In particular, for a missing closing ">" we
+will need to display it at the beginning of the following token.  At the
+moment, when we parse the following token the error overlay will get cleared.
+
+**** How should rng-goto-next-error deal with narrowing?
+
+**** Perhaps should merge errors having same start position even if they
+have different ends.
+
+**** How to handle surrogates? One possibility is to be compatible with
+utf8.e: represent as sequence of 4 chars.  But utf-16 is incompatible
+with this.
+
+**** Should we distinguish well-formedness errors from invalidity errors?
+(I think not: we may want to recover from a bad start-tag by implying
+an end-tag.)
+
+**** Seems to be a bug with Emacs, where a mouse movement that causes
+help-echo text to appear counts as pending input but does not cause
+idle timer to be restarted.
+
+**** Use XML to represent this file.
+
+**** I had a TODO which said simply "split-string".  What did I mean?
+
+**** Investigate performance on large files all on one line.
+
+*** Issues for Emacs versions >= 22
+
+**** Take advantage of UTF-8 CJK support.
+
+**** Supply a next-error-function.
+
+**** Investigate this NEWS item "Emacs now tries to set up buffer coding
+systems for HTML/XML files automatically."
+
+**** Take advantage of the pointer text property.
+
+**** Leverage char-displayable-p.
+
 * Internal changes
 
 ** Cleanup all the GC_ mark bit stuff -- there is no longer any distinction

=== removed file 'lisp/nxml/TODO'
--- lisp/nxml/TODO	2010-02-23 04:38:16 +0000
+++ lisp/nxml/TODO	1970-01-01 00:00:00 +0000
@@ -1,468 +0,0 @@
-* High priority
-
-** Command to insert an element template, including all required
-attributes and child elements.  When there's a choice of elements
-possible, we could insert a comment, and put an overlay on that
-comment that makes it behave like a button with a pop-up menu to
-select the appropriate choice.
-
-** Command to tag a region.  With a schema should complete using legal
-tags, but should work without a schema as well.
-
-** Provide a way to conveniently rename an element. With a schema should
-complete using legal tags, but should work without a schema as well.
-
-* Outlining
-
-** Implement C-c C-o C-q.
-
-** Install pre/post command hook for moving out of invisible section.
-
-** Put a modify hook on invisible sections that expands them.
-
-** Integrate dumb folding somehow.
-
-** An element should be able to be its own heading.
-
-** Optimize to avoid complete buffer scan on each command.
-
-** Make it work with HTML-style headings (i.e. level indicated by
-name of heading element rather than depth of section nesting).
-
-** Recognize root element as a section provided it has a title, even
-if it doesn't match section-element-name-regex.
-
-** Support for incremental search automatically making hidden text
-visible.
-
-** Allow title to be an attribute.
-
-** Command that says to recognize the tag at point as a section/heading.
-
-** Explore better ways to determine when an element is a section
-or a heading.
-
-** rng-next-error needs to either ignore invisible portion or reveal it
-(maybe use isearch oriented text properties).
-
-** Errors within hidden section should be highlighted by underlining the
-ellipsis.
-
-** Make indirect buffers work.
-
-** How should nxml-refresh outline recover from non well-formed tags?
-
-** Hide tags in title elements?
-
-** Use overlays instead of text properties for holding outline state?
-Necessary for indirect buffers to work?
-
-** Allow an outline to go in the speedbar.
-
-** Split up outlining manual section into subsections.
-
-** More detail in the manual about each outlining command.
-
-** More menu entries for hiding/showing?
-
-** Indication of many lines have been hidden?
-
-* Locating schemas
-
-** Should rng-validate-mode give the user an opportunity to specify a
-schema if there is currently none? Or should it at least give a hint
-to the user how to specify a non-vacuous schema?
-
-** Support for adding new schemas to schema-locating files. Add
-documentElement and namespace elements.
-
-** C-c C-w should be able to report current type id.
-
-** Implement doctypePublicId.
-
-** Implement typeIdBase.
-
-** Implement typeIdProcessingInstruction.
-
-** Support xml:base.
-
-** Implement group.
-
-** Find preferred prefix from schema-locating files.  Get rid of
-rng-preferred-prefix-alist.
-
-** Inserting document element with vacuous schema should complete using
-document elements declared in schema locating files, and set schema
-appropriately.
-
-** Add a ruleType attribute to the <include> element?
-
-** Allow processing instruction in prolog to contain the compact syntax
-schema directly.
-
-** Use RDDL to locate a schema based on the namespace URI.
-
-** Should not prompt to add redundant association to schema locating
-file.
-
-** Command to reload current schema.
-
-* Schema-sensitive features
-
-** Should filter dynamic markup possibilities using schema validity, by
-adding hook to nxml-mode.
-
-** Dynamic markup word should (at least optionally) be able to look in
-other buffers that are using nxml-mode.
-
-** Should clicking on Invalid move to next error if already on an error?
-
-** Take advantage of a:documentation. Needs change to schema format.
-
-** Provide feasible validation (as in Jing) toggle.
-
-** Save the validation state as a property on the error overlay to enable
-more detailed diagnosis.
-
-** Provide an Error Summary buffer showing all the validation errors.
-
-** Pop-up menu.  What is useful?  Tag a region (should be greyed out if
-the region is not balanced).  Suggestions based on error messages.
-
-** Have configurable list of namespace URIs so that we can provide
-namespace URI completion on extension elements or with schema-less
-documents.
-
-** Allow validation to handle XInclude.
-
-** ID/IDREF support.
-
-* Completion
-
-** Make it work with icomplete.  Only use a function to complete when
-some of the possible names have undeclared namespaces.
-
-** How should C-return in mixed text work?
-
-** When there's a vacuous schema, C-return after < will insert the
-end-tag.  Is this a bug or a feature?
-
-** After completing start-tag, ensure we don't get unhelpful message
-from validation
-
-** Syntax table for completion.
-
-** Should complete start-tag name with a space if namespace attributes
-are required.
-
-** When completing start-tag name with no prefix and it doesn't match
-should try to infer namespace from local name.
-
-** Should completion pay attention to characters after point?  If so,
-how?
-
-** When completing start-tag name, add required atts if only one required
-attribute.
-
-** When completing attribute name, add attribute value if only one value
-is possible.
-
-** After attribute-value completion, insert space after close delimiter
-if more attributes are required.
-
-** Complete on enumerated data values in elements.
-
-** When in context that allows only elements, should get tag
-completion without having to type < first.
-
-** When immediately after start-tag name, and name is valid and not
-prefix of any other name, should C-return complete on attribute names?
-
-** When completing attributes, more consistent to ignore all attributes
-after point.
-
-** Inserting attribute value completions needs to be sensitive to what
-delimiter is used so that it quotes the correct character.
-
-** Complete on encoding-names in XML decl.
-
-** Complete namespace declarations by searching for all namespaces
-mentioned in the schema.
-
-* Well-formed XML support
-
-** Deal better with Mule-UCS
-
-** Deal with UTF-8 BOM when reading.
-
-** Complete entity names.
-
-** Provide some support for entity names for MathML.
-
-** Command to repeat the last tag.
-
-** Support for changing between character references and characters.
-Need to check that context is one in which character references are
-allowed.  xmltok prolog parsing will need to distinguish parameter
-literals from other kinds of literal.
-
-** Provide a comment command to bind to M-; that works better than the
-normal one.
-
-** Make indenting in a multi-line comment work.
-
-** Structure view.  Separate buffer displaying element tree. Be able to
-navigate from structure view to document and vice-versa.
-
-** Flash matching >.
-
-** Smart selection command that selects increasingly large syntactically
-coherent chunks of XML.  If point is in an attribute value, first
-select complete value; then if command is repeated, select value plus
-delimiters, then select attribute name as well, then complete
-start-tag, then complete element, then enclosing element, etc.
-
-** ispell integration.
-
-** Block-level items in mixed content should be indented, e.g:
-  <para>This is list:
-    <ul>
-      <li>item</li>
-
-** Provide option to indent like this:
-
-**   <para>This is a paragraph
-    occupying multiple lines.</para>
-
-** Option to add make a / that closes a start-tag electrically insert a
-space for the XHTML guys.
-
-** C-M-q should work.
-
-* Datatypes
-
-** Figure out workaround for CJK characters with regexps.
-
-** Does category C contain Cn?
-
-** Do ENTITY datatype properly.
-
-* XML Parsing Library
-
-** Parameter entity parsing option, nil (never), t (always),
-unless-standalone (unless standalone="yes" in XML declaration).
-
-** When a file is currently being edited, there should be an option to
-use its buffer instead of the on-disk copy.
-
-* Handling all XML features
-
-** Provide better support for editing external general parsed entities.
-Perhaps provide a way to force ignoring undefined entities; maybe turn
-this on automatically with <?xml encoding=""?> (with no version
-pseudo-att).
-
-** Handle internal general entity declarations containing elements.
-
-** Handle external general entity declarations.
-
-** Handle default attribute declarations in internal subset.
-
-** Handle parameter entities (including DTD).
-
-* RELAX NG
-
-** Do complete schema checking, at least optionally.
-
-** Detect include/external loops during schema parse.
-
-** Coding system detection for schemas.  Should use utf-8/utf-16 per the
-spec. But also need to allow encodings other than UTF-8/16 to support
-CJK charsets that Emacs cannot represent in Unicode.
-
-* Catching XML errors
-
-** Check public identifiers.
-
-** Check default attribute values.
-
-* Performance
-
-** Explore whether overlay-recenter can cure overlays performance
-problems.
-
-** Cache schemas. Need to have list of files and mtimes.
-
-** Make it possible to reduce rng-validate-chunk-size significantly,
-perhaps to 500 bytes, without bad performance impact: don't do
-redisplay on every chunk; pass continue functions on other uses of
-rng-do-some-validation.
-
-** Cache after first tag.
-
-** Introduce a new name class that is a choice between names (so that
-we can use member)
-
-** intern-choice should simplify after patterns with same 1st/2nd args
-
-** Large numbers of overlays slow things down dramatically.  Represent
-errors using text properties.  This implies we cannot incrementally
-keep track of the number of errors, in order to determine validity.
-Instead, when validation completes, scan for any characters with an
-error text property; this seems to be fast enough even with large
-buffers. Problem with error at end of buffer, where there's no
-character; need special variable for this.  Need to merge face from
-font-lock with the error face: use :inherit attribute with list of two
-faces.  How do we avoid making rng-valid depend on nxml-mode?
-
-* Error recovery
-
-** Don't stop at newline in looking for close of start-tag.
-
-** Use indentation to guide recovery from mismatched end-tags
-
-** Don't keep parsing when currently not well-formed but previously
-well-formed
-
-** Try to recover from a bad start-tag by popping an open element if
-there was a mismatched end-tag unaccounted for.
-
-** Try to recover from a bad start-tag open on the hypothesis that there
-was an error in the namespace URI.
-
-** Better recovery from ill-formed XML declarations.
-
-* Useability improvements
-
-** Should print a "Parsing..." message during long movements.
-
-** Provide better position for reference to undefined pattern error.
-
-** Put Well-formed in the mode-line when validating against any-content.
-
-** Trim marking of illegal data for leading and trailing whitespace.
-
-** Show Invalid status as soon as we are sure it's invalid, rather than
-waiting for everything to be completely up to date.
-
-** When narrowed, Valid or Invalid status should probably consider only
-validity of narrowed region.
-
-* Bug fixes
-
-** Need to give an error for a document like: <foo/><![CDATA[  ]]>
-
-** Make nxml-forward-balanced-item work better for the prolog.
-
-** Make filling and indenting comments work in the prolog.
-
-** Should delete RNC Input buffers.
-
-** Figure out what regex use for NCName and use it consistently,
-
-** Should have not-well-formed tokens in ref.
-
-** Require version in XML declaration? Probably not because prevents
-use for external parsed entities. At least forbid standalone
-without version.
-
-** Reject schema that compiles to rng-not-allowed-ipattern.
-
-** Move point backwards on schema parse error so that it's on the right token.
-
-* Internal
-
-** Use rng-quote-string consistently.
-
-** Use parsing library for XML to texinfo conversion.
-
-** Rename xmltok.el to nxml-token.el.  Use nxml-t- prefix instead of
-xmltok-. Change nxml-t-type to nxml-t-token-type, nxml-t-start to
-nxml-t-token-start.
-
-** Can we set fill-prefix to nil and rely on indenting?
-
-** xmltok should make available replacement text of entities containing
-elements
-
-** In rng-valid, instead of using modification-hooks and
-insert-behind-hooks on dependent overlays, use same technique as
-nxml-mode.
-
-** Port to XEmacs.  Issues include: Unicode (XEmacs seems to be based on
-Mule-UCS); overlays/text properties vs extents; absence of
-fontification-functions hook.
-
-* Fontification
-
-** Allow face to depend on element qname, attribute qname, attribute
-value.  Use list with pairs of (R . F), where R specifies regexps and
-F specifies faces.  How can this list be made to depend on the
-document type?
-
-* Other
-
-** Support RELAX NG XML syntax (use XML parsing library).
-
-** Support W3C XML Schema (use XML parsing library).
-
-** Command to infer schema from current document (like trang).
-
-* Schemas
-
-** XSLT schema should take advantage of RELAX NG to express cooccurrence
-constraints on attributes (e.g. xsl:template).
-
-* Documentation
-
-** Move material from README to manual.
-
-** Document encodings.
-
-* Notes
-
-** How can we allow an error to be displayed on a different token from
-where it is detected?  In particular, for a missing closing ">" we
-will need to display it at the beginning of the following token.  At
-the moment, when we parse the following token the error overlay will
-get cleared.
-
-** How should rng-goto-next-error deal with narrowing?
-
-** Perhaps should merge errors having same start position even if they
-have different ends.
-
-** How to handle surrogates? One possibility is to be compatible with
-utf8.e: represent as sequence of 4 chars.  But utf-16 is incompatible
-with this.
-
-** Should we distinguish well-formedness errors from invalidity errors?
-(I think not: we may want to recover from a bad start-tag by implying
-an end-tag.)
-
-** Seems to be a bug with Emacs, where a mouse movement that causes
-help-echo text to appear counts as pending input but does not cause
-idle timer to be restarted.
-
-** Use XML to represent this file.
-
-** I had a TODO which said simply "split-string". What did I mean?
-
-** Investigate performance on large files all on one line.
-
-* Issues for Emacs versions >= 22
-
-** Take advantage of UTF-8 CJK support.
-
-** Supply a next-error-function.
-
-** Investigate this NEWS item "Emacs now tries to set up buffer coding
-systems for HTML/XML files automatically."
-
-** Take advantage of the pointer text property.
-
-** Leverage char-displayable-p.
-
-Local variables:
-mode: outline
-end:
------------------------------------------------------------
revno: 101394
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Wed 2010-09-08 19:30:31 -0700
message:
  * README.imagemagick: Remove.
  * etc/NEWS: Move remaining ImageMagick items here.
diff:
=== removed file 'README.imagemagick'
--- README.imagemagick	2010-08-18 10:35:23 +0000
+++ README.imagemagick	1970-01-01 00:00:00 +0000
@@ -1,151 +0,0 @@
-* README for the ImageMagick Emacs branch
-
-This is the imagemagick branch of Emacs. Imagemagick can now be used
-to load many new image formats, and also do useful transforms like
-scaling and rotation.
-
-This file will attempt to contain draft NEWS, Changelog and manual
-entries for the new functionality. 
-
-You might need to regenerate the configure scripts:
-aclocal
-automake
-autoheader
-autoconf
-./configure --with-imagemagick
-
-
-* TODO  image-type-header-regexps priorities the jpeg loader over the
-imagemagick one. This is not wrong, but how should a user go about
-prefering the imagemagick loader? The user might like zooming etc in
-jpegs. 
-
-try (setq image-type-header-regexps nil) for a quick hack to prefer
-imagemagick over the jpg loader.
-
-* TODO  For some reason its unbearably slow to look at a page in a large
-  image bundle using the :index feature. The imagemagick "display"
-  command is also a bit slow, but nowhere near as slow as the emacs
-  code. It seems imagemagick tries to unpack every page when loading
-  the bundle. This feature is not the primary usecase for the
-  imagemagick patch though.
-
-  ImageMagick 6.6.2-9 introduced a bugfix for single page djvu load.
-  It is now way faster to use the :index feature, but its still not
-  very fast.
-
-** DONE optimize number of pages calculation for bundles as suggested by
-  imagemagick forum: "set the density to something low like 2 and use
-  MagickPingImage()"
-  
-** TODO try to cache the num pages calculation. it can take a while to
-  calculate the number of pages, and if you need to do it for each
-  page view, page-flipping becomes uselessly slow.
-
-* TODO integrate with image-dired
-
-* TODO integrate with docview. 
-  
-* TODO integrate with image-mode
-Some work has been done, M-x image-transform-fit-to-height will fit
-the image to the height of the Emacs window for instance.
-
-* TODO look for optimizations for handling images with low depth
-Currently the code seems to default to 24 bit RGB which is costly for
-images with lower bit depth.
-
-* TODO complete documentation drafts below
-
-* DONE fix inconsistencys with spelling of imagemagick in the src
-* DONE report number of images in image bundle types somehow
-Works like for "gif" support. Thanks to Juri Linkov.
-* DONE probably add pdf to inhibited types
-* DONE inhibit types is defconst should probably be defcustom
-* TODO decide what to do with some uncommitted imagemagick support
-  functions for image size etc.
-* TODO Test with more systems
-Tested on Fedora 12, Fedora 14 so far, and the libmagick that ships with it.
-Ubuntu 8.04 was also tested, but it seems it ships a broken
-ImageMagick.
-
-I also tried using an imagemagick compiled from their SVN, in
-parallell with the one packaged by Fedora, it worked well.
-
-* DONE Also need some way to handle render methods that only work on newer ImageMagicks
-Is handled by configure now
-
-* Some nits from Stefan Monnier
-I just took a quick look at the code and I see the following nits to fix:
-
-** DONE obviously a merge will have to come with a good ChangeLog.
-** DONE also the merge will need to come with documentation.  Maybe not in the
-   Texinfo form yet, but at least in the etc/NEWS with enough info that
-   describes the `scale' and other such arguments that someone can start
-   using them.
-** DONE the README talks about naming inconsistencies, I think these should be
-  fixed before a first commit (should be straightforward).
-
-** DONE the "let" in image.el should not be followed by a line break and the while
-   should be replaced by a dolist.
-
-** DONE the prototype of imagemagick_load_image has some odd indentation in ([[2010.06.14]])
-   its args, not sure what happened.
-** DONE a few lines in the C code break the 80columns limit.
-** DONE please use ANSI style function declarations rather than K&R for new code. ([[2010.06.14]])
-** DONE you can get rid of the prototypes by reordering the code. ([[2010.06.14]])
-** DONE the docstrings in DEFUN should not be indented (they'll display ([[2010.06.14]])
-   weirdly otherwise in C-h f).
-** DONE Some "{" are at the end of a for/if rather than on their own line. ([[2010.06.14]])
-** DONE why use "*( imtypes + i)" rather than "imtypes[i]"? ([[2010.06.14]])
-** DONE some "," lack a space after them. ([[2010.06.14]])
-** DONE several "=" and "==" lack spaces around them. ([[2010.06.14]])
-  
-
-* NEWS entry
-** ImageMagick support
-It is now possible to use the Imagemagick library to load many new
-image formats in Emacs.
-
-To enable, use the following configure option:
---with-imagemagick
-
-The new function (imagemagick-types) returns a list of image file
-extensions that your installation of imagemagick supports.
-
-The function (imagemagick-register-types) will enable the imagemagick
-support for the extensions in imagemagick-types minus the types listed
-in imagemagick-types-inhibit.
-
-imagemagick-types-inhibit has the value  '(C HTML HTM TXT PDF) by default.
-This means imagemagick will be used also to load jpeg files, if you
-have both jpeg and imagemagick libraries linked. Add 'JPG to
-imagemagick-types-inhibit if you do not want this.
-
-imagemagick-render-type is a new variable which can be set to choose
-between screen render methods.
-
-- 0 is a conservative metod which works with older ImageMagick
-  versions. It is a bit slow, but robust.
-
-- 1 utilizes a newer ImageMagick method   
-
-
-Images loaded with imagemagick will support a couple of new display
-specification behaviours:
-
-- if the :width and :height keywords are specified, these values are
-used for scaling the image. If only one of :width or :height is
-specified, the other one will be calculated so as to preserve the
-aspect ratio.If both :width and :height are specified, aspect ratio
-will not be preserved.
-
-- :rotation specifies a rotation angle in degrees.
-
-- :index specifies which image inside an image bundle file format, such
-as TIFF or DJVM, to view.
-
-The image-metadata function can be used to retrieve the total number
-of images in an image bundle. This is simmilar to how GIF files work.
-
-* Manual entry
-nothing yet, but the NEWS entry could be adapted.

=== modified file 'etc/TODO'
--- etc/TODO	2010-06-01 02:34:49 +0000
+++ etc/TODO	2010-09-09 02:30:31 +0000
@@ -625,6 +625,51 @@
    the window associated with that modeline.
    http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg02416.html
 
+* Things to be done for specific packages or features
+
+** ImageMagick support
+
+*** image-type-header-regexps priorities the jpeg loader over the
+ImageMagick one.  This is not wrong, but how should a user go about
+prefering the ImageMagick loader?  The user might like zooming etc in jpegs.
+
+Try (setq image-type-header-regexps nil) for a quick hack to prefer
+ImageMagick over the jpg loader.
+
+*** For some reason its unbearably slow to look at a page in a large
+image bundle using the :index feature.  The ImageMagick "display"
+command is also a bit slow, but nowhere near as slow as the Emacs
+code.  It seems ImageMagick tries to unpack every page when loading the
+bundle.  This feature is not the primary usecase in Emacs though.
+
+ImageMagick 6.6.2-9 introduced a bugfix for single page djvu load.  It
+is now much faster to use the :index feature, but still not very fast.
+
+*** Try to cache the num pages calculation.  It can take a while to
+calculate the number of pages, and if you need to do it for each page
+view, page-flipping becomes uselessly slow.
+
+*** Integrate with image-dired.
+
+*** Integrate with docview. 
+  
+*** Integrate with image-mode.
+Some work has been done, e.g. M-x image-transform-fit-to-height will
+fit the image to the height of the Emacs window.
+
+*** Look for optimizations for handling images with low depth.
+Currently the code seems to default to 24 bit RGB which is costly for
+images with lower bit depth.
+
+*** Decide what to do with some uncommitted imagemagick support
+functions for image size etc.
+
+*** Test with more systems.
+Tested on Fedora 12, 14, and the libmagick that ships with it.
+I also tried using an ImageMagick compiled from their SVN, in
+parallel with the one packaged by Fedora, it worked well.
+Ubuntu 8.04 was tested, but it seems it ships a broken ImageMagick.
+
 * Internal changes
 
 ** Cleanup all the GC_ mark bit stuff -- there is no longer any distinction
------------------------------------------------------------
revno: 101393
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Wed 2010-09-08 19:25:12 -0700
message:
  Tiny image.el fixes.
  * lisp/image.el (imagemagick-types-inhibit): Add :type, :version, :group.
  (imagemagick-register-types): Doc fix.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-08 16:21:23 +0000
+++ lisp/ChangeLog	2010-09-09 02:25:12 +0000
@@ -1,3 +1,8 @@
+2010-09-09  Glenn Morris  <rgm@gnu.org>
+
+	* image.el (imagemagick-types-inhibit): Add :type, :version, :group.
+	(imagemagick-register-types): Doc fix.
+
 2010-09-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* progmodes/octave-mod.el (electric-indent-chars): Silence bytecomp.

=== modified file 'lisp/image.el'
--- lisp/image.el	2010-08-29 16:17:13 +0000
+++ lisp/image.el	2010-09-09 02:25:12 +0000
@@ -697,21 +697,28 @@
 
 (defcustom imagemagick-types-inhibit
   '(C HTML HTM TXT PDF)
-  "Types the imagemagick loader should not try to handle.")
+  ;; FIXME what are the possible options?
+  ;; Are these actually file-name extensions?
+  ;; Why are these upper-case when eg image-types is lower-case?
+  "Types the ImageMagick loader should not try to handle."
+  :type '(choice (const :tag "Let ImageMagick handle all the types it can" nil)
+		 (repeat symbol))
+  :version "24.1"
+  :group 'image)
 
 ;;;###autoload
 (defun imagemagick-register-types ()
-  "Register file types that imagemagick is able to handle."
+  "Register the file types that ImageMagick is able to handle."
   (let ((im-types (imagemagick-types)))
     (dolist (im-inhibit imagemagick-types-inhibit)
       (setq im-types (remove im-inhibit im-types)))
     (dolist (im-type im-types)
       (let ((extension (downcase (symbol-name im-type))))
 	(push
-	 (cons  (concat "\\." extension "\\'") 'image-mode)
+	 (cons (concat "\\." extension "\\'") 'image-mode)
 	 auto-mode-alist)
 	(push
-	 (cons  (concat "\\." extension "\\'") 'imagemagick)
+	 (cons (concat "\\." extension "\\'") 'imagemagick)
 	 image-type-file-name-regexps)))))
------------------------------------------------------------
revno: 101392
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Wed 2010-09-08 19:21:12 -0700
message:
  * etc/NEWS: Misc fixes for ImageMagick section.
diff:
=== modified file 'etc/NEWS'
--- etc/NEWS	2010-09-03 13:06:51 +0000
+++ etc/NEWS	2010-09-09 02:21:12 +0000
@@ -113,21 +113,17 @@
 top, left, right or bottom.  The Options => Show/Hide menu has entries
 for this.
 
-** ImageMagick support
+** ImageMagick support.
 It is now possible to use the Imagemagick library to load many new
-image formats in Emacs.
-
-To enable, use the following configure option:
---with-imagemagick
-
-The new function (imagemagick-types) returns a list of image file
-extensions that your installation of imagemagick supports.
-
-The function (imagemagick-register-types) will enable the imagemagick
-support for the extensions in imagemagick-types minus the types listed
-in imagemagick-types-inhibit.
-
-See the Emacs Manual for more information.
+image formats in Emacs.  To enable this, use the configure option
+`--with-imagemagick'.
+
+The new function `imagemagick-types' returns a list of image file
+extensions that your installation of ImageMagick supports.  The
+function `imagemagick-register-types' enables ImageMagick support for
+these imaeg types, minus those listed in `imagemagick-types-inhibit'.
+
+See the Emacs Lisp Reference Manual for more information.
 
 ** The colors for selected text (the region face) are taken from the GTK
 theme when Emacs is built with GTK.
------------------------------------------------------------
revno: 101391
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Wed 2010-09-08 19:18:38 -0700
message:
  * doc/lispref/display.texi (ImageMagick Images): General cleanup.
diff:
=== modified file 'doc/lispref/ChangeLog'
--- doc/lispref/ChangeLog	2010-09-06 16:38:03 +0000
+++ doc/lispref/ChangeLog	2010-09-09 02:18:38 +0000
@@ -1,3 +1,7 @@
+2010-09-09  Glenn Morris  <rgm@gnu.org>
+
+	* display.texi (ImageMagick Images): General cleanup.
+
 2010-09-06  Alexander Klimov  <alserkli@inbox.ru>  (tiny change)
 
 	* files.texi (Directory Names): Use \` rather than ^.

=== modified file 'doc/lispref/display.texi'
--- doc/lispref/display.texi	2010-08-28 08:10:13 +0000
+++ doc/lispref/display.texi	2010-09-09 02:18:38 +0000
@@ -4468,47 +4468,56 @@
 
 @node ImageMagick Images
 @subsection ImageMagick Images
-The Imagemagick library can be used to load many image formats in Emacs.
-
-The function (imagemagick-types) returns a list of image file
-extensions that your installation of imagemagick supports.
-
-The function (imagemagick-register-types) will enable the imagemagick
-support for the extensions in imagemagick-types minus the types listed
-in imagemagick-types-inhibit.
-
-imagemagick-types-inhibit has the value '(C HTML HTM TXT PDF) by
-default.  There can be overlap between image loaders in your Emacs
-installation. If you never want to use the ImageMagick loader to use
-Jpeg files, for instance, add 'JPG to imagemagick-types-inhibit. Which
-loader that will be used in practice depends on the priority of the
-loaders.
-
-imagemagick-render-type is a new variable which can be set to choose
-between screen render methods for the ImageMagick loader.
-
-- 0 is a conservative metod which works with older ImageMagick
-  versions. It is a bit slow, but robust.
-
-- 1 utilizes a newer ImageMagick method   
-
-
-Images loaded with imagemagick will support a couple of new display
-specification behaviours:
-
-- if the :width and :height keywords are specified, these values are
-used for scaling the image. If only one of :width or :height is
-specified, the other one will be calculated so as to preserve the
-aspect ratio.If both :width and :height are specified, aspect ratio
-will not be preserved.
-
-- :rotation specifies a rotation angle in degrees.
-
-- :index specifies which image inside an image bundle file format, such
-as TIFF or DJVM, to view.
-
-The image-metadata function can be used to retrieve the total number
-of images in an image bundle. This is simmilar to how GIF files work.
+@cindex ImageMagick images
+@cindex images, support for more formats
+
+  If you build Emacs with ImageMagick (@url{http://www.imagemagick.org})
+support, you can use the ImageMagick library to load many image formats.
+
+@findex imagemagick-types
+The function @code{imagemagick-types} returns a list of image file
+extensions that your installation of ImageMagick supports.  To enable
+support, you must call the function @code{imagemagick-register-types}.
+
+@vindex imagemagick-types-inhibit
+The variable @code{imagemagick-types-inhibit} specifies a list of
+image types that you do @emph{not} want ImageMagick to handle.  There
+may be overlap between image loaders in your Emacs installation, and
+you may prefer to use a different one for a given image type (which
+@c FIXME how is this priority determined?
+loader will be used in practice depends on the priority of the loaders).
+@c FIXME why are these uppercase when image-types is lower-case?
+@c FIXME what are the possibe options?  Are these actually file extensions?
+For example, if you never want to use the ImageMagick loader to use
+JPEG files, add @code{JPG} to this list.
+
+@vindex imagemagick-render-type
+You can set the variable @code{imagemagick-render-type} to choose
+between screen render methods for the ImageMagick loader.  The options
+are: @code{0}, a conservative method which works with older
+@c FIXME details of this "newer method"?
+@c Presumably it is faster but may be less "robust"?
+ImageMagick versions (it is a bit slow, but robust); and @code{1},
+a newer ImageMagick method.
+
+Images loaded with ImageMagick support a few new display specifications:
+
+@table @code
+@item :width, :height
+The @code{:width} and @code{:height} keywords are used for scaling the
+image.  If only one of them is specified, the other one will be
+calculated so as to preserve the aspect ratio.  If both are specified,
+aspect ratio may not be preserved.
+
+@item :rotation
+Specifies a rotation angle in degrees.
+
+@item :index
+Specifies which image to view inside an image bundle file format, such
+as TIFF or DJVM.  You can use the @code{image-metadata} function to
+retrieve the total number of images in an image bundle (this is
+similar to how GIF files work).
+@end table
 
 
 @node Other Image Types
------------------------------------------------------------
revno: 101390
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Wed 2010-09-08 19:16:14 -0700
message:
  * doc/misc/org.texi: Restore clobbered changes (copyright years, untabify).
diff:
=== modified file 'doc/misc/ChangeLog'
--- doc/misc/ChangeLog	2010-09-04 15:34:39 +0000
+++ doc/misc/ChangeLog	2010-09-09 02:16:14 +0000
@@ -1,3 +1,7 @@
+2010-09-09  Glenn Morris  <rgm@gnu.org>
+
+	* org.texi: Restore clobbered changes (copyright years, untabify).
+
 2010-09-04  Julien Danjou  <julien@danjou.info>  (tiny change)
 
 	* gnus.texi (Adaptive Scoring): Fix typo.

=== modified file 'doc/misc/org.texi'
--- doc/misc/org.texi	2010-08-08 21:12:29 +0000
+++ doc/misc/org.texi	2010-09-09 02:16:14 +0000
@@ -51,7 +51,8 @@
 @copying
 This manual is for Org version @value{VERSION}.
 
-Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -101,400 +102,400 @@
 @end ifnottex
 
 @menu
-* Introduction::		Getting started
-* Document Structure::		A tree works like your brain
-* Tables::			Pure magic for quick formatting
-* Hyperlinks::			Notes in context
-* TODO Items::			Every tree branch can be a TODO item
-* Tags::			Tagging headlines and matching sets of tags
-* Properties and Columns::	Storing information about an entry
-* Dates and Times::		Making items useful for planning
-* Capture - Refile - Archive::	The ins and outs for projects
-* Agenda Views::		Collecting information into views
-* Markup::			Prepare text for rich export
-* Exporting::			Sharing and publishing of notes
-* Publishing::			Create a web site of linked Org files
-* Working With Source Code::	Export, evaluate, and tangle code blocks
-* Miscellaneous::		All the rest which did not fit elsewhere
-* Hacking::			How to hack your way around
-* MobileOrg::			Viewing and capture on a mobile device
-* History and Acknowledgments::	 How Org came into being
-* Main Index::			An index of Org's concepts and features
-* Key Index::			Key bindings and where they are described
-* Variable Index::		Variables mentioned in the manual
+* Introduction::                Getting started
+* Document Structure::          A tree works like your brain
+* Tables::                      Pure magic for quick formatting
+* Hyperlinks::                  Notes in context
+* TODO Items::                  Every tree branch can be a TODO item
+* Tags::                        Tagging headlines and matching sets of tags
+* Properties and Columns::      Storing information about an entry
+* Dates and Times::             Making items useful for planning
+* Capture - Refile - Archive::  The ins and outs for projects
+* Agenda Views::                Collecting information into views
+* Markup::                      Prepare text for rich export
+* Exporting::                   Sharing and publishing of notes
+* Publishing::                  Create a web site of linked Org files
+* Working With Source Code::    Export, evaluate, and tangle code blocks
+* Miscellaneous::               All the rest which did not fit elsewhere
+* Hacking::                     How to hack your way around
+* MobileOrg::                   Viewing and capture on a mobile device
+* History and Acknowledgments::  How Org came into being
+* Main Index::                  An index of Org's concepts and features
+* Key Index::                   Key bindings and where they are described
+* Variable Index::              Variables mentioned in the manual
 
 @detailmenu
  --- The Detailed Node Listing ---
 
 Introduction
 
-* Summary::			Brief summary of what Org does
-* Installation::		How to install a downloaded version of Org
-* Activation::			How to activate Org for certain buffers
-* Feedback::			Bug reports, ideas, patches etc.
-* Conventions::			Type-setting conventions in the manual
+* Summary::                     Brief summary of what Org does
+* Installation::                How to install a downloaded version of Org
+* Activation::                  How to activate Org for certain buffers
+* Feedback::                    Bug reports, ideas, patches etc.
+* Conventions::                 Type-setting conventions in the manual
 
 Document structure
 
-* Outlines::			Org is based on Outline mode
-* Headlines::			How to typeset Org tree headlines
-* Visibility cycling::		Show and hide, much simplified
-* Motion::			Jumping to other headlines
-* Structure editing::		Changing sequence and level of headlines
-* Sparse trees::		Matches embedded in context
-* Plain lists::			Additional structure within an entry
-* Drawers::			Tucking stuff away
-* Blocks::			Folding blocks
-* Footnotes::			How footnotes are defined in Org's syntax
-* Orgstruct mode::		Structure editing outside Org
+* Outlines::                    Org is based on Outline mode
+* Headlines::                   How to typeset Org tree headlines
+* Visibility cycling::          Show and hide, much simplified
+* Motion::                      Jumping to other headlines
+* Structure editing::           Changing sequence and level of headlines
+* Sparse trees::                Matches embedded in context
+* Plain lists::                 Additional structure within an entry
+* Drawers::                     Tucking stuff away
+* Blocks::                      Folding blocks
+* Footnotes::                   How footnotes are defined in Org's syntax
+* Orgstruct mode::              Structure editing outside Org
 
 Tables
 
-* Built-in table editor::	Simple tables
-* Column width and alignment::	Overrule the automatic settings
-* Column groups::		Grouping to trigger vertical lines
-* Orgtbl mode::			The table editor as minor mode
-* The spreadsheet::		The table editor has spreadsheet capabilities
-* Org-Plot::			Plotting from org tables
+* Built-in table editor::       Simple tables
+* Column width and alignment::  Overrule the automatic settings
+* Column groups::               Grouping to trigger vertical lines
+* Orgtbl mode::                 The table editor as minor mode
+* The spreadsheet::             The table editor has spreadsheet capabilities
+* Org-Plot::                    Plotting from org tables
 
 The spreadsheet
 
-* References::			How to refer to another field or range
-* Formula syntax for Calc::	Using Calc to compute stuff
-* Formula syntax for Lisp::	Writing formulas in Emacs Lisp
-* Field formulas::		Formulas valid for a single field
-* Column formulas::		Formulas valid for an entire column
+* References::                  How to refer to another field or range
+* Formula syntax for Calc::     Using Calc to compute stuff
+* Formula syntax for Lisp::     Writing formulas in Emacs Lisp
+* Field formulas::              Formulas valid for a single field
+* Column formulas::             Formulas valid for an entire column
 * Editing and debugging formulas::  Fixing formulas
-* Updating the table::		Recomputing all dependent fields
-* Advanced features::		Field names, parameters and automatic recalc
+* Updating the table::          Recomputing all dependent fields
+* Advanced features::           Field names, parameters and automatic recalc
 
 Hyperlinks
 
-* Link format::			How links in Org are formatted
-* Internal links::		Links to other places in the current file
-* External links::		URL-like links to the world
-* Handling links::		Creating, inserting and following
-* Using links outside Org::	Linking from my C source code?
-* Link abbreviations::		Shortcuts for writing complex links
-* Search options::		Linking to a specific location
-* Custom searches::		When the default search is not enough
+* Link format::                 How links in Org are formatted
+* Internal links::              Links to other places in the current file
+* External links::              URL-like links to the world
+* Handling links::              Creating, inserting and following
+* Using links outside Org::     Linking from my C source code?
+* Link abbreviations::          Shortcuts for writing complex links
+* Search options::              Linking to a specific location
+* Custom searches::             When the default search is not enough
 
 Internal links
 
-* Radio targets::		Make targets trigger links in plain text
+* Radio targets::               Make targets trigger links in plain text
 
 TODO items
 
-* TODO basics::			Marking and displaying TODO entries
-* TODO extensions::		Workflow and assignments
-* Progress logging::		Dates and notes for progress
-* Priorities::			Some things are more important than others
-* Breaking down tasks::		Splitting a task into manageable pieces
-* Checkboxes::			Tick-off lists
+* TODO basics::                 Marking and displaying TODO entries
+* TODO extensions::             Workflow and assignments
+* Progress logging::            Dates and notes for progress
+* Priorities::                  Some things are more important than others
+* Breaking down tasks::         Splitting a task into manageable pieces
+* Checkboxes::                  Tick-off lists
 
 Extended use of TODO keywords
 
-* Workflow states::		From TODO to DONE in steps
-* TODO types::			I do this, Fred does the rest
-* Multiple sets in one file::	Mixing it all, and still finding your way
-* Fast access to TODO states::	Single letter selection of a state
-* Per-file keywords::		Different files, different requirements
-* Faces for TODO keywords::	Highlighting states
-* TODO dependencies::		When one task needs to wait for others
+* Workflow states::             From TODO to DONE in steps
+* TODO types::                  I do this, Fred does the rest
+* Multiple sets in one file::   Mixing it all, and still finding your way
+* Fast access to TODO states::  Single letter selection of a state
+* Per-file keywords::           Different files, different requirements
+* Faces for TODO keywords::     Highlighting states
+* TODO dependencies::           When one task needs to wait for others
 
 Progress logging
 
-* Closing items::		When was this entry marked DONE?
-* Tracking TODO state changes::	 When did the status change?
-* Tracking your habits::	How consistent have you been?
+* Closing items::               When was this entry marked DONE?
+* Tracking TODO state changes::  When did the status change?
+* Tracking your habits::        How consistent have you been?
 
 Tags
 
-* Tag inheritance::		Tags use the tree structure of the outline
-* Setting tags::		How to assign tags to a headline
-* Tag searches::		Searching for combinations of tags
+* Tag inheritance::             Tags use the tree structure of the outline
+* Setting tags::                How to assign tags to a headline
+* Tag searches::                Searching for combinations of tags
 
 Properties and columns
 
-* Property syntax::		How properties are spelled out
-* Special properties::		Access to other Org-mode features
-* Property searches::		Matching property values
-* Property inheritance::	Passing values down the tree
-* Column view::			Tabular viewing and editing
-* Property API::		Properties for Lisp programmers
+* Property syntax::             How properties are spelled out
+* Special properties::          Access to other Org-mode features
+* Property searches::           Matching property values
+* Property inheritance::        Passing values down the tree
+* Column view::                 Tabular viewing and editing
+* Property API::                Properties for Lisp programmers
 
 Column view
 
-* Defining columns::		The COLUMNS format property
-* Using column view::		How to create and use column view
-* Capturing column view::	A dynamic block for column view
+* Defining columns::            The COLUMNS format property
+* Using column view::           How to create and use column view
+* Capturing column view::       A dynamic block for column view
 
 Defining columns
 
-* Scope of column definitions::	 Where defined, where valid?
-* Column attributes::		Appearance and content of a column
+* Scope of column definitions::  Where defined, where valid?
+* Column attributes::           Appearance and content of a column
 
 Dates and times
 
-* Timestamps::			Assigning a time to a tree entry
-* Creating timestamps::		Commands which insert timestamps
-* Deadlines and scheduling::	Planning your work
-* Clocking work time::		Tracking how long you spend on a task
-* Resolving idle time::		Resolving time if you've been idle
-* Effort estimates::		Planning work effort in advance
-* Relative timer::		Notes with a running timer
+* Timestamps::                  Assigning a time to a tree entry
+* Creating timestamps::         Commands which insert timestamps
+* Deadlines and scheduling::    Planning your work
+* Clocking work time::          Tracking how long you spend on a task
+* Resolving idle time::         Resolving time if you've been idle
+* Effort estimates::            Planning work effort in advance
+* Relative timer::              Notes with a running timer
 
 Creating timestamps
 
-* The date/time prompt::	How Org-mode helps you entering date and time
-* Custom time format::		Making dates look different
+* The date/time prompt::        How Org-mode helps you entering date and time
+* Custom time format::          Making dates look different
 
 Deadlines and scheduling
 
-* Inserting deadline/schedule::	 Planning items
-* Repeated tasks::		Items that show up again and again
+* Inserting deadline/schedule::  Planning items
+* Repeated tasks::              Items that show up again and again
 
 Capture - Refile - Archive
 
-* Capture::			Capturing new stuff
-* Attachments::			Add files to tasks
-* RSS Feeds::			Getting input from RSS feeds
-* Protocols::			External (e.g. Browser) access to Emacs and Org
-* Refiling notes::		Moving a tree from one place to another
-* Archiving::			What to do with finished projects
+* Capture::                     Capturing new stuff
+* Attachments::                 Add files to tasks
+* RSS Feeds::                   Getting input from RSS feeds
+* Protocols::                   External (e.g. Browser) access to Emacs and Org
+* Refiling notes::              Moving a tree from one place to another
+* Archiving::                   What to do with finished projects
 
 Capture
 
-* Setting up capture::		Where notes will be stored
-* Using capture::		Commands to invoke and terminate capture
-* Capture templates::		Define the outline of different note types
+* Setting up capture::          Where notes will be stored
+* Using capture::               Commands to invoke and terminate capture
+* Capture templates::           Define the outline of different note types
 
 Capture templates
 
-* Template elements::		What is needed for a complete template entry
-* Template expansion::		Filling in information about time and context
+* Template elements::           What is needed for a complete template entry
+* Template expansion::          Filling in information about time and context
 
 Archiving
 
-* Moving subtrees::		Moving a tree to an archive file
-* Internal archiving::		Switch off a tree but keep it in the file
+* Moving subtrees::             Moving a tree to an archive file
+* Internal archiving::          Switch off a tree but keep it in the file
 
 Agenda views
 
-* Agenda files::		Files being searched for agenda information
-* Agenda dispatcher::		Keyboard access to agenda views
-* Built-in agenda views::	What is available out of the box?
-* Presentation and sorting::	How agenda items are prepared for display
-* Agenda commands::		Remote editing of Org trees
-* Custom agenda views::		Defining special searches and views
-* Exporting Agenda Views::	Writing a view to a file
-* Agenda column view::		Using column view for collected entries
+* Agenda files::                Files being searched for agenda information
+* Agenda dispatcher::           Keyboard access to agenda views
+* Built-in agenda views::       What is available out of the box?
+* Presentation and sorting::    How agenda items are prepared for display
+* Agenda commands::             Remote editing of Org trees
+* Custom agenda views::         Defining special searches and views
+* Exporting Agenda Views::      Writing a view to a file
+* Agenda column view::          Using column view for collected entries
 
 The built-in agenda views
 
-* Weekly/daily agenda::		The calendar page with current tasks
-* Global TODO list::		All unfinished action items
+* Weekly/daily agenda::         The calendar page with current tasks
+* Global TODO list::            All unfinished action items
 * Matching tags and properties::  Structured information with fine-tuned search
-* Timeline::			Time-sorted view for single file
-* Search view::			Find entries by searching for text
-* Stuck projects::		Find projects you need to review
+* Timeline::                    Time-sorted view for single file
+* Search view::                 Find entries by searching for text
+* Stuck projects::              Find projects you need to review
 
 Presentation and sorting
 
-* Categories::			Not all tasks are equal
-* Time-of-day specifications::	How the agenda knows the time
-* Sorting of agenda items::	The order of things
+* Categories::                  Not all tasks are equal
+* Time-of-day specifications::  How the agenda knows the time
+* Sorting of agenda items::     The order of things
 
 Custom agenda views
 
-* Storing searches::		Type once, use often
-* Block agenda::		All the stuff you need in a single buffer
-* Setting Options::		Changing the rules
+* Storing searches::            Type once, use often
+* Block agenda::                All the stuff you need in a single buffer
+* Setting Options::             Changing the rules
 
 Markup for rich export
 
-* Structural markup elements::	The basic structure as seen by the exporter
-* Images and tables::		Tables and Images will be included
-* Literal examples::		Source code examples with special formatting
-* Include files::		Include additional files into a document
-* Index entries::		Making an index
-* Macro replacement::		Use macros to create complex output
-* Embedded LaTeX::		LaTeX can be freely used inside Org documents
+* Structural markup elements::  The basic structure as seen by the exporter
+* Images and tables::           Tables and Images will be included
+* Literal examples::            Source code examples with special formatting
+* Include files::               Include additional files into a document
+* Index entries::               Making an index
+* Macro replacement::           Use macros to create complex output
+* Embedded LaTeX::              LaTeX can be freely used inside Org documents
 
 Structural markup elements
 
-* Document title::		Where the title is taken from
-* Headings and sections::	The document structure as seen by the exporter
-* Table of contents::		The if and where of the table of contents
-* Initial text::		Text before the first heading?
-* Lists::			Lists
-* Paragraphs::			Paragraphs
-* Footnote markup::		Footnotes
-* Emphasis and monospace::	Bold, italic, etc.
-* Horizontal rules::		Make a line
-* Comment lines::		What will *not* be exported
+* Document title::              Where the title is taken from
+* Headings and sections::       The document structure as seen by the exporter
+* Table of contents::           The if and where of the table of contents
+* Initial text::                Text before the first heading?
+* Lists::                       Lists
+* Paragraphs::                  Paragraphs
+* Footnote markup::             Footnotes
+* Emphasis and monospace::      Bold, italic, etc.
+* Horizontal rules::            Make a line
+* Comment lines::               What will *not* be exported
 
 Embedded La@TeX{}
 
-* Special symbols::		Greek letters and other symbols
-* Subscripts and superscripts::	 Simple syntax for raising/lowering text
-* LaTeX fragments::		Complex formulas made easy
-* Previewing LaTeX fragments::	What will this snippet look like?
-* CDLaTeX mode::		Speed up entering of formulas
+* Special symbols::             Greek letters and other symbols
+* Subscripts and superscripts::  Simple syntax for raising/lowering text
+* LaTeX fragments::             Complex formulas made easy
+* Previewing LaTeX fragments::  What will this snippet look like?
+* CDLaTeX mode::                Speed up entering of formulas
 
 Exporting
 
-* Selective export::		Using tags to select and exclude trees
-* Export options::		Per-file export settings
-* The export dispatcher::	How to access exporter commands
-* ASCII/Latin-1/UTF-8 export::	Exporting to flat files with encoding
-* HTML export::			Exporting to HTML
-* LaTeX and PDF export::	Exporting to La@TeX{}, and processing to PDF
-* DocBook export::		Exporting to DocBook
-* TaskJuggler export::		Exporting to TaskJuggler
-* Freemind export::		Exporting to Freemind mind maps
-* XOXO export::			Exporting to XOXO
-* iCalendar export::		Exporting in iCalendar format
+* Selective export::            Using tags to select and exclude trees
+* Export options::              Per-file export settings
+* The export dispatcher::       How to access exporter commands
+* ASCII/Latin-1/UTF-8 export::  Exporting to flat files with encoding
+* HTML export::                 Exporting to HTML
+* LaTeX and PDF export::        Exporting to La@TeX{}, and processing to PDF
+* DocBook export::              Exporting to DocBook
+* TaskJuggler export::          Exporting to TaskJuggler
+* Freemind export::             Exporting to Freemind mind maps
+* XOXO export::                 Exporting to XOXO
+* iCalendar export::            Exporting in iCalendar format
 
 HTML export
 
-* HTML Export commands::	How to invoke HTML export
-* Quoting HTML tags::		Using direct HTML in Org-mode
-* Links in HTML export::	How links will be interpreted and formatted
-* Tables in HTML export::	How to modify the formatting of tables
-* Images in HTML export::	How to insert figures into HTML output
-* Text areas in HTML export::	An alternative way to show an example
-* CSS support::			Changing the appearance of the output
-* JavaScript support::		Info and Folding in a web browser
+* HTML Export commands::        How to invoke HTML export
+* Quoting HTML tags::           Using direct HTML in Org-mode
+* Links in HTML export::        How links will be interpreted and formatted
+* Tables in HTML export::       How to modify the formatting of tables
+* Images in HTML export::       How to insert figures into HTML output
+* Text areas in HTML export::   An alternative way to show an example
+* CSS support::                 Changing the appearance of the output
+* JavaScript support::          Info and Folding in a web browser
 
 La@TeX{} and PDF export
 
-* LaTeX/PDF export commands::	Which key invokes which commands
-* Header and sectioning::	Setting up the export file structure
-* Quoting LaTeX code::		Incorporating literal La@TeX{} code
-* Tables in LaTeX export::	Options for exporting tables to La@TeX{}
-* Images in LaTeX export::	How to insert figures into La@TeX{} output
-* Beamer class export::		Turning the file into a presentation
+* LaTeX/PDF export commands::   Which key invokes which commands
+* Header and sectioning::       Setting up the export file structure
+* Quoting LaTeX code::          Incorporating literal La@TeX{} code
+* Tables in LaTeX export::      Options for exporting tables to La@TeX{}
+* Images in LaTeX export::      How to insert figures into La@TeX{} output
+* Beamer class export::         Turning the file into a presentation
 
 DocBook export
 
-* DocBook export commands::	How to invoke DocBook export
-* Quoting DocBook code::	Incorporating DocBook code in Org files
-* Recursive sections::		Recursive sections in DocBook
-* Tables in DocBook export::	Tables are exported as HTML tables
-* Images in DocBook export::	How to insert figures into DocBook output
-* Special characters::		How to handle special characters
+* DocBook export commands::     How to invoke DocBook export
+* Quoting DocBook code::        Incorporating DocBook code in Org files
+* Recursive sections::          Recursive sections in DocBook
+* Tables in DocBook export::    Tables are exported as HTML tables
+* Images in DocBook export::    How to insert figures into DocBook output
+* Special characters::          How to handle special characters
 
 Publishing
 
-* Configuration::		Defining projects
-* Uploading files::		How to get files up on the server
-* Sample configuration::	Example projects
-* Triggering publication::	Publication commands
+* Configuration::               Defining projects
+* Uploading files::             How to get files up on the server
+* Sample configuration::        Example projects
+* Triggering publication::      Publication commands
 
 Configuration
 
-* Project alist::		The central configuration variable
-* Sources and destinations::	From here to there
-* Selecting files::		What files are part of the project?
-* Publishing action::		Setting the function doing the publishing
-* Publishing options::		Tweaking HTML export
-* Publishing links::		Which links keep working after publishing?
-* Sitemap::			Generating a list of all pages
-* Generating an index::		An index that reaches across pages
+* Project alist::               The central configuration variable
+* Sources and destinations::    From here to there
+* Selecting files::             What files are part of the project?
+* Publishing action::           Setting the function doing the publishing
+* Publishing options::          Tweaking HTML export
+* Publishing links::            Which links keep working after publishing?
+* Sitemap::                     Generating a list of all pages
+* Generating an index::         An index that reaches across pages
 
 Sample configuration
 
-* Simple example::		One-component publishing
-* Complex example::		A multi-component publishing example
+* Simple example::              One-component publishing
+* Complex example::             A multi-component publishing example
 
 Working with source code
 
-* Structure of code blocks::	Code block syntax described
-* Editing source code::		Language major-mode editing
-* Exporting code blocks::	Export contents and/or results
-* Extracting source code::	Create pure source code files
-* Evaluating code blocks::	Place results of evaluation in the Org-mode buffer
-* Library of Babel::		Use and contribute to a library of useful code blocks
-* Languages::			List of supported code block languages
-* Header arguments::		Configure code block functionality
-* Results of evaluation::	How evaluation results are handled
-* Noweb reference syntax::	Literate programming in Org-mode
+* Structure of code blocks::    Code block syntax described
+* Editing source code::         Language major-mode editing
+* Exporting code blocks::       Export contents and/or results
+* Extracting source code::      Create pure source code files
+* Evaluating code blocks::      Place results of evaluation in the Org-mode buffer
+* Library of Babel::            Use and contribute to a library of useful code blocks
+* Languages::                   List of supported code block languages
+* Header arguments::            Configure code block functionality
+* Results of evaluation::       How evaluation results are handled
+* Noweb reference syntax::      Literate programming in Org-mode
 * Key bindings and useful functions::  Work quickly with code blocks
-* Batch execution::		Call functions from the command line
+* Batch execution::             Call functions from the command line
 
 Header arguments
 
-* Using header arguments::	Different ways to set header arguments
-* Specific header arguments::	List of header arguments
+* Using header arguments::      Different ways to set header arguments
+* Specific header arguments::   List of header arguments
 
 Using header arguments
 
 * System-wide header arguments::  Set global default values
-* Language-specific header arguments::	Set default values by language
+* Language-specific header arguments::  Set default values by language
 * Buffer-wide header arguments::  Set default values for a specific buffer
 * Header arguments in Org-mode properties::  Set default values for a buffer or heading
 * Code block specific header arguments::  The most common way to set values
 
 Specific header arguments
 
-* var::				Pass arguments to code blocks
-* results::			Specify the type of results and how they will be collected and handled
-* file::			Specify a path for file output
-* dir::	                        Specify the default directory for code block execution
-* exports::			Export code and/or results
-* tangle::			Toggle tangling and specify file name
-* no-expand::			Turn off variable assignment and noweb expansion during tangling
-* session::			Preserve the state of code evaluation
-* noweb::			Toggle expansion of noweb references
-* cache::			Avoid re-evaluating unchanged code blocks
-* hlines::			Handle horizontal lines in tables
-* colnames::			Handle column names in tables
-* rownames::			Handle row names in tables
-* shebang::			Make tangled files executable
+* var::                         Pass arguments to code blocks
+* results::                     Specify the type of results and how they will be collected and handled
+* file::                        Specify a path for file output
+* dir::                         Specify the default directory for code block execution
+* exports::                     Export code and/or results
+* tangle::                      Toggle tangling and specify file name
+* no-expand::                   Turn off variable assignment and noweb expansion during tangling
+* session::                     Preserve the state of code evaluation
+* noweb::                       Toggle expansion of noweb references
+* cache::                       Avoid re-evaluating unchanged code blocks
+* hlines::                      Handle horizontal lines in tables
+* colnames::                    Handle column names in tables
+* rownames::                    Handle row names in tables
+* shebang::                     Make tangled files executable
 
 Miscellaneous
 
-* Completion::			M-TAB knows what you need
-* Speed keys::			Electric commands at the beginning of a headline
-* Code evaluation security::	Org mode files evaluate inline code
-* Customization::		Adapting Org to your taste
-* In-buffer settings::		Overview of the #+KEYWORDS
-* The very busy C-c C-c key::	When in doubt, press C-c C-c
-* Clean view::			Getting rid of leading stars in the outline
-* TTY keys::			Using Org on a tty
-* Interaction::			Other Emacs packages
+* Completion::                  M-TAB knows what you need
+* Speed keys::                  Electric commands at the beginning of a headline
+* Code evaluation security::    Org mode files evaluate inline code
+* Customization::               Adapting Org to your taste
+* In-buffer settings::          Overview of the #+KEYWORDS
+* The very busy C-c C-c key::   When in doubt, press C-c C-c
+* Clean view::                  Getting rid of leading stars in the outline
+* TTY keys::                    Using Org on a tty
+* Interaction::                 Other Emacs packages
 
 Interaction with other packages
 
-* Cooperation::			Packages Org cooperates with
-* Conflicts::			Packages that lead to conflicts
+* Cooperation::                 Packages Org cooperates with
+* Conflicts::                   Packages that lead to conflicts
 
 Hacking
 
-* Hooks::			Who to reach into Org's internals
-* Add-on packages::		Available extensions
-* Adding hyperlink types::	New custom link types
-* Context-sensitive commands::	How to add functionality to such commands
-* Tables in arbitrary syntax::	Orgtbl for La@TeX{} and other programs
-* Dynamic blocks::		Automatically filled blocks
-* Special agenda views::	Customized views
+* Hooks::                       Who to reach into Org's internals
+* Add-on packages::             Available extensions
+* Adding hyperlink types::      New custom link types
+* Context-sensitive commands::  How to add functionality to such commands
+* Tables in arbitrary syntax::  Orgtbl for La@TeX{} and other programs
+* Dynamic blocks::              Automatically filled blocks
+* Special agenda views::        Customized views
 * Extracting agenda information::  Postprocessing of agenda information
-* Using the property API::	Writing programs that use entry properties
-* Using the mapping API::	Mapping over all or selected entries
+* Using the property API::      Writing programs that use entry properties
+* Using the mapping API::       Mapping over all or selected entries
 
 Tables and lists in arbitrary syntax
 
-* Radio tables::		Sending and receiving radio tables
-* A LaTeX example::		Step by step, almost a tutorial
-* Translator functions::	Copy and modify
-* Radio lists::			Doing the same for lists
+* Radio tables::                Sending and receiving radio tables
+* A LaTeX example::             Step by step, almost a tutorial
+* Translator functions::        Copy and modify
+* Radio lists::                 Doing the same for lists
 
 MobileOrg
 
-* Setting up the staging area::	 Where to interact with the mobile device
-* Pushing to MobileOrg::	Uploading Org files and agendas
-* Pulling from MobileOrg::	Integrating captured and flagged items
+* Setting up the staging area::  Where to interact with the mobile device
+* Pushing to MobileOrg::        Uploading Org files and agendas
+* Pulling from MobileOrg::      Integrating captured and flagged items
 
 @end detailmenu
 @end menu
@@ -504,11 +505,11 @@
 @cindex introduction
 
 @menu
-* Summary::			Brief summary of what Org does
-* Installation::		How to install a downloaded version of Org
-* Activation::			How to activate Org for certain buffers
-* Feedback::			Bug reports, ideas, patches etc.
-* Conventions::			Type-setting conventions in the manual
+* Summary::                     Brief summary of what Org does
+* Installation::                How to install a downloaded version of Org
+* Activation::                  How to activate Org for certain buffers
+* Feedback::                    Bug reports, ideas, patches etc.
+* Conventions::                 Type-setting conventions in the manual
 @end menu
 
 @node Summary, Installation, Introduction, Introduction
@@ -805,17 +806,17 @@
 edit the structure of the document.
 
 @menu
-* Outlines::			Org is based on Outline mode
-* Headlines::			How to typeset Org tree headlines
-* Visibility cycling::		Show and hide, much simplified
-* Motion::			Jumping to other headlines
-* Structure editing::		Changing sequence and level of headlines
-* Sparse trees::		Matches embedded in context
-* Plain lists::			Additional structure within an entry
-* Drawers::			Tucking stuff away
-* Blocks::			Folding blocks
-* Footnotes::			How footnotes are defined in Org's syntax
-* Orgstruct mode::		Structure editing outside Org
+* Outlines::                    Org is based on Outline mode
+* Headlines::                   How to typeset Org tree headlines
+* Visibility cycling::          Show and hide, much simplified
+* Motion::                      Jumping to other headlines
+* Structure editing::           Changing sequence and level of headlines
+* Sparse trees::                Matches embedded in context
+* Plain lists::                 Additional structure within an entry
+* Drawers::                     Tucking stuff away
+* Blocks::                      Folding blocks
+* Footnotes::                   How footnotes are defined in Org's syntax
+* Orgstruct mode::              Structure editing outside Org
 @end menu
 
 @node Outlines, Headlines, Document Structure, Document Structure
@@ -1640,12 +1641,12 @@
 @end ifnotinfo
 
 @menu
-* Built-in table editor::	Simple tables
-* Column width and alignment::	Overrule the automatic settings
-* Column groups::		Grouping to trigger vertical lines
-* Orgtbl mode::			The table editor as minor mode
-* The spreadsheet::		The table editor has spreadsheet capabilities
-* Org-Plot::			Plotting from org tables
+* Built-in table editor::       Simple tables
+* Column width and alignment::  Overrule the automatic settings
+* Column groups::               Grouping to trigger vertical lines
+* Orgtbl mode::                 The table editor as minor mode
+* The spreadsheet::             The table editor has spreadsheet capabilities
+* Org-Plot::                    Plotting from org tables
 @end menu
 
 @node Built-in table editor, Column width and alignment, Tables, Tables
@@ -2019,14 +2020,14 @@
 formula, moving these references by arrow keys
 
 @menu
-* References::			How to refer to another field or range
-* Formula syntax for Calc::	Using Calc to compute stuff
-* Formula syntax for Lisp::	Writing formulas in Emacs Lisp
-* Field formulas::		Formulas valid for a single field
-* Column formulas::		Formulas valid for an entire column
+* References::                  How to refer to another field or range
+* Formula syntax for Calc::     Using Calc to compute stuff
+* Formula syntax for Lisp::     Writing formulas in Emacs Lisp
+* Field formulas::              Formulas valid for a single field
+* Column formulas::             Formulas valid for an entire column
 * Editing and debugging formulas::  Fixing formulas
-* Updating the table::		Recomputing all dependent fields
-* Advanced features::		Field names, parameters and automatic recalc
+* Updating the table::          Recomputing all dependent fields
+* Advanced features::           Field names, parameters and automatic recalc
 @end menu
 
 @node References, Formula syntax for Calc, The spreadsheet, The spreadsheet
@@ -2730,14 +2731,14 @@
 other files, Usenet articles, emails, and much more.
 
 @menu
-* Link format::			How links in Org are formatted
-* Internal links::		Links to other places in the current file
-* External links::		URL-like links to the world
-* Handling links::		Creating, inserting and following
-* Using links outside Org::	Linking from my C source code?
-* Link abbreviations::		Shortcuts for writing complex links
-* Search options::		Linking to a specific location
-* Custom searches::		When the default search is not enough
+* Link format::                 How links in Org are formatted
+* Internal links::              Links to other places in the current file
+* External links::              URL-like links to the world
+* Handling links::              Creating, inserting and following
+* Using links outside Org::     Linking from my C source code?
+* Link abbreviations::          Shortcuts for writing complex links
+* Search options::              Linking to a specific location
+* Custom searches::             When the default search is not enough
 @end menu
 
 @node Link format, Internal links, Hyperlinks, Hyperlinks
@@ -2830,7 +2831,7 @@
 earlier.
 
 @menu
-* Radio targets::		Make targets trigger links in plain text
+* Radio targets::               Make targets trigger links in plain text
 @end menu
 
 @node Radio targets,  , Internal links, Internal links
@@ -3285,12 +3286,12 @@
 methods to give you an overview of all the things that you have to do.
 
 @menu
-* TODO basics::			Marking and displaying TODO entries
-* TODO extensions::		Workflow and assignments
-* Progress logging::		Dates and notes for progress
-* Priorities::			Some things are more important than others
-* Breaking down tasks::		Splitting a task into manageable pieces
-* Checkboxes::			Tick-off lists
+* TODO basics::                 Marking and displaying TODO entries
+* TODO extensions::             Workflow and assignments
+* Progress logging::            Dates and notes for progress
+* Priorities::                  Some things are more important than others
+* Breaking down tasks::         Splitting a task into manageable pieces
+* Checkboxes::                  Tick-off lists
 @end menu
 
 @node TODO basics, TODO extensions, TODO Items, TODO Items
@@ -3382,13 +3383,13 @@
 TODO items in particular (@pxref{Tags}).
 
 @menu
-* Workflow states::		From TODO to DONE in steps
-* TODO types::			I do this, Fred does the rest
-* Multiple sets in one file::	Mixing it all, and still finding your way
-* Fast access to TODO states::	Single letter selection of a state
-* Per-file keywords::		Different files, different requirements
-* Faces for TODO keywords::	Highlighting states
-* TODO dependencies::		When one task needs to wait for others
+* Workflow states::             From TODO to DONE in steps
+* TODO types::                  I do this, Fred does the rest
+* Multiple sets in one file::   Mixing it all, and still finding your way
+* Fast access to TODO states::  Single letter selection of a state
+* Per-file keywords::           Different files, different requirements
+* Faces for TODO keywords::     Highlighting states
+* TODO dependencies::           When one task needs to wait for others
 @end menu
 
 @node Workflow states, TODO types, TODO extensions, TODO extensions
@@ -3679,9 +3680,9 @@
 work time}.
 
 @menu
-* Closing items::		When was this entry marked DONE?
-* Tracking TODO state changes::	 When did the status change?
-* Tracking your habits::	How consistent have you been?
+* Closing items::               When was this entry marked DONE?
+* Tracking TODO state changes::  When did the status change?
+* Tracking your habits::        How consistent have you been?
 @end menu
 
 @node Closing items, Tracking TODO state changes, Progress logging, Progress logging
@@ -4143,9 +4144,9 @@
 (@pxref{Faces for TODO keywords}).
 
 @menu
-* Tag inheritance::		Tags use the tree structure of the outline
-* Setting tags::		How to assign tags to a headline
-* Tag searches::		Searching for combinations of tags
+* Tag inheritance::             Tags use the tree structure of the outline
+* Setting tags::                How to assign tags to a headline
+* Tag searches::                Searching for combinations of tags
 @end menu
 
 @node Tag inheritance, Setting tags, Tags, Tags
@@ -4432,12 +4433,12 @@
 (@pxref{Column view}).
 
 @menu
-* Property syntax::		How properties are spelled out
-* Special properties::		Access to other Org-mode features
-* Property searches::		Matching property values
-* Property inheritance::	Passing values down the tree
-* Column view::			Tabular viewing and editing
-* Property API::		Properties for Lisp programmers
+* Property syntax::             How properties are spelled out
+* Special properties::          Access to other Org-mode features
+* Property searches::           Matching property values
+* Property inheritance::        Passing values down the tree
+* Column view::                 Tabular viewing and editing
+* Property API::                Properties for Lisp programmers
 @end menu
 
 @node Property syntax, Special properties, Properties and Columns, Properties and Columns
@@ -4673,9 +4674,9 @@
 queries have collected selected items, possibly from a number of files.
 
 @menu
-* Defining columns::		The COLUMNS format property
-* Using column view::		How to create and use column view
-* Capturing column view::	A dynamic block for column view
+* Defining columns::            The COLUMNS format property
+* Using column view::           How to create and use column view
+* Capturing column view::       A dynamic block for column view
 @end menu
 
 @node Defining columns, Using column view, Column view, Column view
@@ -4687,8 +4688,8 @@
 done by defining a column format line.
 
 @menu
-* Scope of column definitions::	 Where defined, where valid?
-* Column attributes::		Appearance and content of a column
+* Scope of column definitions::  Where defined, where valid?
+* Column attributes::           Appearance and content of a column
 @end menu
 
 @node Scope of column definitions, Column attributes, Defining columns, Defining columns
@@ -4770,7 +4771,7 @@
 
 @example
 :COLUMNS:  %25ITEM %9Approved(Approved?)@{X@} %Owner %11Status \@footnote{Please note that the COLUMNS definition must be on a single line---it is wrapped here only because of formatting constraints.}
-		   %10Time_Estimate@{:@} %CLOCKSUM
+                   %10Time_Estimate@{:@} %CLOCKSUM
 :Owner_ALL:    Tammy Mark Karl Lisa Don
 :Status_ALL:   "In progress" "Not started yet" "Finished" ""
 :Approved_ALL: "[ ]" "[X]"
@@ -4970,13 +4971,13 @@
 is used in a much wider sense.
 
 @menu
-* Timestamps::			Assigning a time to a tree entry
-* Creating timestamps::		Commands which insert timestamps
-* Deadlines and scheduling::	Planning your work
-* Clocking work time::		Tracking how long you spend on a task
-* Resolving idle time::		Resolving time if you've been idle
-* Effort estimates::		Planning work effort in advance
-* Relative timer::		Notes with a running timer
+* Timestamps::                  Assigning a time to a tree entry
+* Creating timestamps::         Commands which insert timestamps
+* Deadlines and scheduling::    Planning your work
+* Clocking work time::          Tracking how long you spend on a task
+* Resolving idle time::         Resolving time if you've been idle
+* Effort estimates::            Planning work effort in advance
+* Relative timer::              Notes with a running timer
 @end menu
 
 
@@ -5132,8 +5133,8 @@
 
 
 @menu
-* The date/time prompt::	How Org-mode helps you entering date and time
-* Custom time format::		Making dates look different
+* The date/time prompt::        How Org-mode helps you entering date and time
+* Custom time format::          Making dates look different
 @end menu
 
 @node The date/time prompt, Custom time format, Creating timestamps, Creating timestamps
@@ -5365,8 +5366,8 @@
 sexp entry matches.
 
 @menu
-* Inserting deadline/schedule::	 Planning items
-* Repeated tasks::		Items that show up again and again
+* Inserting deadline/schedule::  Planning items
+* Repeated tasks::              Items that show up again and again
 @end menu
 
 @node Inserting deadline/schedule, Repeated tasks, Deadlines and scheduling, Deadlines and scheduling
@@ -5888,12 +5889,12 @@
 trees to an archive file keeps the system compact and fast.
 
 @menu
-* Capture::			Capturing new stuff
-* Attachments::			Add files to tasks
-* RSS Feeds::			Getting input from RSS feeds
-* Protocols::			External (e.g. Browser) access to Emacs and Org
-* Refiling notes::		Moving a tree from one place to another
-* Archiving::			What to do with finished projects
+* Capture::                     Capturing new stuff
+* Attachments::                 Add files to tasks
+* RSS Feeds::                   Getting input from RSS feeds
+* Protocols::                   External (e.g. Browser) access to Emacs and Org
+* Refiling notes::              Moving a tree from one place to another
+* Archiving::                   What to do with finished projects
 @end menu
 
 @node Capture, Attachments, Capture - Refile - Archive, Capture - Refile - Archive
@@ -5921,9 +5922,9 @@
 does enhance it with templates and more.
 
 @menu
-* Setting up capture::		Where notes will be stored
-* Using capture::		Commands to invoke and terminate capture
-* Capture templates::		Define the outline of different note types
+* Setting up capture::          Where notes will be stored
+* Using capture::               Commands to invoke and terminate capture
+* Capture templates::           Define the outline of different note types
 @end menu
 
 @node Setting up capture, Using capture, Capture, Capture
@@ -6016,8 +6017,8 @@
 
 
 @menu
-* Template elements::		What is needed for a complete template entry
-* Template expansion::		Filling in information about time and context
+* Template elements::           What is needed for a complete template entry
+* Template expansion::          Filling in information about time and context
 @end menu
 
 @node Template elements, Template expansion, Capture templates, Capture templates
@@ -6326,8 +6327,8 @@
 @example
 (setq org-feed-alist
      '(("Slashdot"
-	 "http://rss.slashdot.org/Slashdot/slashdot"
-	 "~/txt/org/feeds.org" "Slashdot Entries")))
+         "http://rss.slashdot.org/Slashdot/slashdot"
+         "~/txt/org/feeds.org" "Slashdot Entries")))
 @end example
 
 @noindent
@@ -6440,8 +6441,8 @@
 @end table
 
 @menu
-* Moving subtrees::		Moving a tree to an archive file
-* Internal archiving::		Switch off a tree but keep it in the file
+* Moving subtrees::             Moving a tree to an archive file
+* Internal archiving::          Switch off a tree but keep it in the file
 @end menu
 
 @node Moving subtrees, Internal archiving, Archiving, Archiving
@@ -6618,14 +6619,14 @@
 @code{org-agenda-restore-windows-after-quit}.
 
 @menu
-* Agenda files::		Files being searched for agenda information
-* Agenda dispatcher::		Keyboard access to agenda views
-* Built-in agenda views::	What is available out of the box?
-* Presentation and sorting::	How agenda items are prepared for display
-* Agenda commands::		Remote editing of Org trees
-* Custom agenda views::		Defining special searches and views
-* Exporting Agenda Views::	Writing a view to a file
-* Agenda column view::		Using column view for collected entries
+* Agenda files::                Files being searched for agenda information
+* Agenda dispatcher::           Keyboard access to agenda views
+* Built-in agenda views::       What is available out of the box?
+* Presentation and sorting::    How agenda items are prepared for display
+* Agenda commands::             Remote editing of Org trees
+* Custom agenda views::         Defining special searches and views
+* Exporting Agenda Views::      Writing a view to a file
+* Agenda column view::          Using column view for collected entries
 @end menu
 
 @node Agenda files, Agenda dispatcher, Agenda Views, Agenda Views
@@ -6767,12 +6768,12 @@
 In this section we describe the built-in views.
 
 @menu
-* Weekly/daily agenda::		The calendar page with current tasks
-* Global TODO list::		All unfinished action items
+* Weekly/daily agenda::         The calendar page with current tasks
+* Global TODO list::            All unfinished action items
 * Matching tags and properties::  Structured information with fine-tuned search
-* Timeline::			Time-sorted view for single file
-* Search view::			Find entries by searching for text
-* Stuck projects::		Find projects you need to review
+* Timeline::                    Time-sorted view for single file
+* Search view::                 Find entries by searching for text
+* Stuck projects::              Find projects you need to review
 @end menu
 
 @node Weekly/daily agenda, Global TODO list, Built-in agenda views, Built-in agenda views
@@ -7237,9 +7238,9 @@
 associated with the item.
 
 @menu
-* Categories::			Not all tasks are equal
-* Time-of-day specifications::	How the agenda knows the time
-* Sorting of agenda items::	The order of things
+* Categories::                  Not all tasks are equal
+* Time-of-day specifications::  How the agenda knows the time
+* Sorting of agenda items::     The order of things
 @end menu
 
 @node Categories, Time-of-day specifications, Presentation and sorting, Presentation and sorting
@@ -7628,12 +7629,12 @@
 @group
 (defun org-my-auto-exclude-function (tag)
   (and (cond
-	((string= tag "Net")
-	 (/= 0 (call-process "/sbin/ping" nil nil nil
-			     "-c1" "-q" "-t1" "mail.gnu.org")))
-	((or (string= tag "Errand") (string= tag "Call"))
-	 (let ((hour (nth 2 (decode-time))))
-	   (or (< hour 8) (> hour 21)))))
+        ((string= tag "Net")
+         (/= 0 (call-process "/sbin/ping" nil nil nil
+                             "-c1" "-q" "-t1" "mail.gnu.org")))
+        ((or (string= tag "Errand") (string= tag "Call"))
+         (let ((hour (nth 2 (decode-time))))
+           (or (< hour 8) (> hour 21)))))
        (concat "-" tag)))
 
 (setq org-agenda-auto-exclude-function 'org-my-auto-exclude-function)
@@ -7963,9 +7964,9 @@
 dispatcher (@pxref{Agenda dispatcher}), just like the default commands.
 
 @menu
-* Storing searches::		Type once, use often
-* Block agenda::		All the stuff you need in a single buffer
-* Setting Options::		Changing the rules
+* Storing searches::            Type once, use often
+* Block agenda::                All the stuff you need in a single buffer
+* Setting Options::             Changing the rules
 @end menu
 
 @node Storing searches, Block agenda, Custom agenda views, Custom agenda views
@@ -8350,29 +8351,29 @@
 summarizes the markup rules used in an Org-mode buffer.
 
 @menu
-* Structural markup elements::	The basic structure as seen by the exporter
-* Images and tables::		Tables and Images will be included
-* Literal examples::		Source code examples with special formatting
-* Include files::		Include additional files into a document
-* Index entries::		Making an index
-* Macro replacement::		Use macros to create complex output
-* Embedded LaTeX::		LaTeX can be freely used inside Org documents
+* Structural markup elements::  The basic structure as seen by the exporter
+* Images and tables::           Tables and Images will be included
+* Literal examples::            Source code examples with special formatting
+* Include files::               Include additional files into a document
+* Index entries::               Making an index
+* Macro replacement::           Use macros to create complex output
+* Embedded LaTeX::              LaTeX can be freely used inside Org documents
 @end menu
 
 @node Structural markup elements, Images and tables, Markup, Markup
 @section Structural markup elements
 
 @menu
-* Document title::		Where the title is taken from
-* Headings and sections::	The document structure as seen by the exporter
-* Table of contents::		The if and where of the table of contents
-* Initial text::		Text before the first heading?
-* Lists::			Lists
-* Paragraphs::			Paragraphs
-* Footnote markup::		Footnotes
-* Emphasis and monospace::	Bold, italic, etc.
-* Horizontal rules::		Make a line
-* Comment lines::		What will *not* be exported
+* Document title::              Where the title is taken from
+* Headings and sections::       The document structure as seen by the exporter
+* Table of contents::           The if and where of the table of contents
+* Initial text::                Text before the first heading?
+* Lists::                       Lists
+* Paragraphs::                  Paragraphs
+* Footnote markup::             Footnotes
+* Emphasis and monospace::      Bold, italic, etc.
+* Horizontal rules::            Make a line
+* Comment lines::               What will *not* be exported
 @end menu
 
 @node Document title, Headings and sections, Structural markup elements, Structural markup elements
@@ -8801,11 +8802,11 @@
 to do with it.
 
 @menu
-* Special symbols::		Greek letters and other symbols
-* Subscripts and superscripts::	 Simple syntax for raising/lowering text
-* LaTeX fragments::		Complex formulas made easy
-* Previewing LaTeX fragments::	What will this snippet look like?
-* CDLaTeX mode::		Speed up entering of formulas
+* Special symbols::             Greek letters and other symbols
+* Subscripts and superscripts::  Simple syntax for raising/lowering text
+* LaTeX fragments::             Complex formulas made easy
+* Previewing LaTeX fragments::  What will this snippet look like?
+* CDLaTeX mode::                Speed up entering of formulas
 @end menu
 
 @node Special symbols, Subscripts and superscripts, Embedded LaTeX, Embedded LaTeX
@@ -9064,17 +9065,17 @@
 enabled (default in Emacs 23).
 
 @menu
-* Selective export::		Using tags to select and exclude trees
-* Export options::		Per-file export settings
-* The export dispatcher::	How to access exporter commands
-* ASCII/Latin-1/UTF-8 export::	Exporting to flat files with encoding
-* HTML export::			Exporting to HTML
-* LaTeX and PDF export::	Exporting to La@TeX{}, and processing to PDF
-* DocBook export::		Exporting to DocBook
-* TaskJuggler export::		Exporting to TaskJuggler
-* Freemind export::		Exporting to Freemind mind maps
-* XOXO export::			Exporting to XOXO
-* iCalendar export::		Exporting in iCalendar format
+* Selective export::            Using tags to select and exclude trees
+* Export options::              Per-file export settings
+* The export dispatcher::       How to access exporter commands
+* ASCII/Latin-1/UTF-8 export::  Exporting to flat files with encoding
+* HTML export::                 Exporting to HTML
+* LaTeX and PDF export::        Exporting to La@TeX{}, and processing to PDF
+* DocBook export::              Exporting to DocBook
+* TaskJuggler export::          Exporting to TaskJuggler
+* Freemind export::             Exporting to Freemind mind maps
+* XOXO export::                 Exporting to XOXO
+* iCalendar export::            Exporting in iCalendar format
 @end menu
 
 @node Selective export, Export options, Exporting, Exporting
@@ -9327,14 +9328,14 @@
 language, but with additional support for tables.
 
 @menu
-* HTML Export commands::	How to invoke HTML export
-* Quoting HTML tags::		Using direct HTML in Org-mode
-* Links in HTML export::	How links will be interpreted and formatted
-* Tables in HTML export::	How to modify the formatting of tables
-* Images in HTML export::	How to insert figures into HTML output
-* Text areas in HTML export::	An alternative way to show an example
-* CSS support::			Changing the appearance of the output
-* JavaScript support::		Info and Folding in a web browser
+* HTML Export commands::        How to invoke HTML export
+* Quoting HTML tags::           Using direct HTML in Org-mode
+* Links in HTML export::        How links will be interpreted and formatted
+* Tables in HTML export::       How to modify the formatting of tables
+* Images in HTML export::       How to insert figures into HTML output
+* Text areas in HTML export::   An alternative way to show an example
+* CSS support::                 Changing the appearance of the output
+* JavaScript support::          Info and Folding in a web browser
 @end menu
 
 @node HTML Export commands, Quoting HTML tags, HTML export, HTML export
@@ -9681,12 +9682,12 @@
 linked.
 
 @menu
-* LaTeX/PDF export commands::	Which key invokes which commands
-* Header and sectioning::	Setting up the export file structure
-* Quoting LaTeX code::		Incorporating literal La@TeX{} code
-* Tables in LaTeX export::	Options for exporting tables to La@TeX{}
-* Images in LaTeX export::	How to insert figures into La@TeX{} output
-* Beamer class export::		Turning the file into a presentation
+* LaTeX/PDF export commands::   Which key invokes which commands
+* Header and sectioning::       Setting up the export file structure
+* Quoting LaTeX code::          Incorporating literal La@TeX{} code
+* Tables in LaTeX export::      Options for exporting tables to La@TeX{}
+* Images in LaTeX export::      How to insert figures into La@TeX{} output
+* Beamer class export::         Turning the file into a presentation
 @end menu
 
 @node LaTeX/PDF export commands, Header and sectioning, LaTeX and PDF export, LaTeX and PDF export
@@ -10011,12 +10012,12 @@
 Currently DocBook exporter only supports DocBook V5.0.
 
 @menu
-* DocBook export commands::	How to invoke DocBook export
-* Quoting DocBook code::	Incorporating DocBook code in Org files
-* Recursive sections::		Recursive sections in DocBook
-* Tables in DocBook export::	Tables are exported as HTML tables
-* Images in DocBook export::	How to insert figures into DocBook output
-* Special characters::		How to handle special characters
+* DocBook export commands::     How to invoke DocBook export
+* Quoting DocBook code::        Incorporating DocBook code in Org files
+* Recursive sections::          Recursive sections in DocBook
+* Tables in DocBook export::    Tables are exported as HTML tables
+* Images in DocBook export::    How to insert figures into DocBook output
+* Special characters::          How to handle special characters
 @end menu
 
 @node DocBook export commands, Quoting DocBook code, DocBook export, DocBook export
@@ -10442,10 +10443,10 @@
 Publishing has been contributed to Org by David O'Toole.
 
 @menu
-* Configuration::		Defining projects
-* Uploading files::		How to get files up on the server
-* Sample configuration::	Example projects
-* Triggering publication::	Publication commands
+* Configuration::               Defining projects
+* Uploading files::             How to get files up on the server
+* Sample configuration::        Example projects
+* Triggering publication::      Publication commands
 @end menu
 
 @node Configuration, Uploading files, Publishing, Publishing
@@ -10455,14 +10456,14 @@
 and many other properties of a project.
 
 @menu
-* Project alist::		The central configuration variable
-* Sources and destinations::	From here to there
-* Selecting files::		What files are part of the project?
-* Publishing action::		Setting the function doing the publishing
-* Publishing options::		Tweaking HTML export
-* Publishing links::		Which links keep working after publishing?
-* Sitemap::			Generating a list of all pages
-* Generating an index::		An index that reaches across pages
+* Project alist::               The central configuration variable
+* Sources and destinations::    From here to there
+* Selecting files::             What files are part of the project?
+* Publishing action::           Setting the function doing the publishing
+* Publishing options::          Tweaking HTML export
+* Publishing links::            Which links keep working after publishing?
+* Sitemap::                     Generating a list of all pages
+* Generating an index::         An index that reaches across pages
 @end menu
 
 @node Project alist, Sources and destinations, Configuration, Configuration
@@ -10836,8 +10837,8 @@
 more complex, with a multi-component project.
 
 @menu
-* Simple example::		One-component publishing
-* Complex example::		A multi-component publishing example
+* Simple example::              One-component publishing
+* Complex example::             A multi-component publishing example
 @end menu
 
 @node Simple example, Complex example, Sample configuration, Sample configuration
@@ -10966,18 +10967,18 @@
 The following sections describe Org-mode's code block handling facilities.
 
 @menu
-* Structure of code blocks::	Code block syntax described
-* Editing source code::		Language major-mode editing
-* Exporting code blocks::	Export contents and/or results
-* Extracting source code::	Create pure source code files
-* Evaluating code blocks::	Place results of evaluation in the Org-mode buffer
-* Library of Babel::		Use and contribute to a library of useful code blocks
-* Languages::			List of supported code block languages
-* Header arguments::		Configure code block functionality
-* Results of evaluation::	How evaluation results are handled
-* Noweb reference syntax::	Literate programming in Org-mode
+* Structure of code blocks::    Code block syntax described
+* Editing source code::         Language major-mode editing
+* Exporting code blocks::       Export contents and/or results
+* Extracting source code::      Create pure source code files
+* Evaluating code blocks::      Place results of evaluation in the Org-mode buffer
+* Library of Babel::            Use and contribute to a library of useful code blocks
+* Languages::                   List of supported code block languages
+* Header arguments::            Configure code block functionality
+* Results of evaluation::       How evaluation results are handled
+* Noweb reference syntax::      Literate programming in Org-mode
 * Key bindings and useful functions::  Work quickly with code blocks
-* Batch execution::		Call functions from the command line
+* Batch execution::             Call functions from the command line
 @end menu
 
 @comment  node-name,  next,  previous,  up
@@ -11271,8 +11272,8 @@
 describes each header argument in detail.
 
 @menu
-* Using header arguments::	Different ways to set header arguments
-* Specific header arguments::	List of header arguments
+* Using header arguments::      Different ways to set header arguments
+* Specific header arguments::   List of header arguments
 @end menu
 
 @node Using header arguments, Specific header arguments, Header arguments, Header arguments
@@ -11282,7 +11283,7 @@
 specific (and having higher priority) than the last.
 @menu
 * System-wide header arguments::  Set global default values
-* Language-specific header arguments::	Set default values by language
+* Language-specific header arguments::  Set default values by language
 * Buffer-wide header arguments::  Set default values for a specific buffer
 * Header arguments in Org-mode properties::  Set default values for a buffer or heading
 * Code block specific header arguments::  The most common way to set values
@@ -11419,25 +11420,25 @@
 The following header arguments are defined:
 
 @menu
-* var::				Pass arguments to code blocks
-* results::			Specify the type of results and how they will
+* var::                         Pass arguments to code blocks
+* results::                     Specify the type of results and how they will
                                 be collected and handled
-* file::			Specify a path for file output
-* dir::	                        Specify the default (possibly remote)
+* file::                        Specify a path for file output
+* dir::                         Specify the default (possibly remote)
                                 directory for code block execution
-* exports::			Export code and/or results
-* tangle::			Toggle tangling and specify file name
-* no-expand::			Turn off variable assignment and noweb
+* exports::                     Export code and/or results
+* tangle::                      Toggle tangling and specify file name
+* no-expand::                   Turn off variable assignment and noweb
                                 expansion during tangling
 * comments::                    Toggle insertion of comments in tangled
                                 code files
-* session::			Preserve the state of code evaluation
-* noweb::			Toggle expansion of noweb references
-* cache::			Avoid re-evaluating unchanged code blocks
-* hlines::			Handle horizontal lines in tables
-* colnames::			Handle column names in tables
-* rownames::			Handle row names in tables
-* shebang::			Make tangled files executable
+* session::                     Preserve the state of code evaluation
+* noweb::                       Toggle expansion of noweb references
+* cache::                       Avoid re-evaluating unchanged code blocks
+* hlines::                      Handle horizontal lines in tables
+* colnames::                    Handle column names in tables
+* rownames::                    Handle row names in tables
+* shebang::                     Make tangled files executable
 * eval::                        Limit evaluation of specific code blocks
 @end menu
 
@@ -12292,15 +12293,15 @@
 @chapter Miscellaneous
 
 @menu
-* Completion::			M-TAB knows what you need
-* Speed keys::			Electric commands at the beginning of a headline
-* Code evaluation security::	Org mode files evaluate inline code
-* Customization::		Adapting Org to your taste
-* In-buffer settings::		Overview of the #+KEYWORDS
-* The very busy C-c C-c key::	When in doubt, press C-c C-c
-* Clean view::			Getting rid of leading stars in the outline
-* TTY keys::			Using Org on a tty
-* Interaction::			Other Emacs packages
+* Completion::                  M-TAB knows what you need
+* Speed keys::                  Electric commands at the beginning of a headline
+* Code evaluation security::    Org mode files evaluate inline code
+* Customization::               Adapting Org to your taste
+* In-buffer settings::          Overview of the #+KEYWORDS
+* The very busy C-c C-c key::   When in doubt, press C-c C-c
+* Clean view::                  Getting rid of leading stars in the outline
+* TTY keys::                    Using Org on a tty
+* Interaction::                 Other Emacs packages
 @end menu
 
 
@@ -12928,8 +12929,8 @@
 with other code out there.
 
 @menu
-* Cooperation::			Packages Org cooperates with
-* Conflicts::			Packages that lead to conflicts
+* Cooperation::                 Packages Org cooperates with
+* Conflicts::                   Packages that lead to conflicts
 @end menu
 
 @node Cooperation, Conflicts, Interaction, Interaction
@@ -13077,9 +13078,9 @@
 
 @lisp
 (add-hook 'org-mode-hook
-	  (lambda ()
-	    (org-set-local 'yas/trigger-key [tab])
-	    (define-key yas/keymap [tab] 'yas/next-field-group)))
+          (lambda ()
+            (org-set-local 'yas/trigger-key [tab])
+            (define-key yas/keymap [tab] 'yas/next-field-group)))
 @end lisp
 
 @item @file{windmove.el} by Hovav Shacham
@@ -13121,16 +13122,16 @@
 Org.
 
 @menu
-* Hooks::			Who to reach into Org's internals
-* Add-on packages::		Available extensions
-* Adding hyperlink types::	New custom link types
-* Context-sensitive commands::	How to add functionality to such commands
-* Tables in arbitrary syntax::	Orgtbl for La@TeX{} and other programs
-* Dynamic blocks::		Automatically filled blocks
-* Special agenda views::	Customized views
+* Hooks::                       Who to reach into Org's internals
+* Add-on packages::             Available extensions
+* Adding hyperlink types::      New custom link types
+* Context-sensitive commands::  How to add functionality to such commands
+* Tables in arbitrary syntax::  Orgtbl for La@TeX{} and other programs
+* Dynamic blocks::              Automatically filled blocks
+* Special agenda views::        Customized views
 * Extracting agenda information::  Postprocessing of agenda information
-* Using the property API::	Writing programs that use entry properties
-* Using the mapping API::	Mapping over all or selected entries
+* Using the property API::      Writing programs that use entry properties
+* Using the mapping API::       Mapping over all or selected entries
 @end menu
 
 @node Hooks, Add-on packages, Hacking, Hacking
@@ -13322,10 +13323,10 @@
 
 
 @menu
-* Radio tables::		Sending and receiving radio tables
-* A LaTeX example::		Step by step, almost a tutorial
-* Translator functions::	Copy and modify
-* Radio lists::			Doing the same for lists
+* Radio tables::                Sending and receiving radio tables
+* A LaTeX example::             Step by step, almost a tutorial
+* Translator functions::        Copy and modify
+* Radio lists::                 Doing the same for lists
 @end menu
 
 @node Radio tables, A LaTeX example, Tables in arbitrary syntax, Tables in arbitrary syntax
@@ -14098,9 +14099,9 @@
 (@pxref{Setting tags}) only for those set in these variables.
 
 @menu
-* Setting up the staging area::	 Where to interact with the mobile device
-* Pushing to MobileOrg::	Uploading Org files and agendas
-* Pulling from MobileOrg::	Integrating captured and flagged items
+* Setting up the staging area::  Where to interact with the mobile device
+* Pushing to MobileOrg::        Uploading Org files and agendas
+* Pulling from MobileOrg::      Integrating captured and flagged items
 @end menu
 
 @node Setting up the staging area, Pushing to MobileOrg, MobileOrg, MobileOrg
------------------------------------------------------------
revno: 101389
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Wed 2010-09-08 19:12:40 -0700
message:
  * doc/emacs/xresources.texi: Untabify.
diff:
=== modified file 'doc/emacs/ChangeLog'
--- doc/emacs/ChangeLog	2010-09-06 16:38:03 +0000
+++ doc/emacs/ChangeLog	2010-09-09 02:12:40 +0000
@@ -1,3 +1,7 @@
+2010-09-09  Glenn Morris  <rgm@gnu.org>
+
+	* xresources.texi: Untabify.
+
 2010-09-06  Chong Yidong  <cyd@stupidchicken.com>
 
 	* dired.texi (Dired Enter): Minor doc fix (Bug#6982).

=== modified file 'doc/emacs/xresources.texi'
--- doc/emacs/xresources.texi	2010-07-10 18:52:53 +0000
+++ doc/emacs/xresources.texi	2010-09-09 02:12:40 +0000
@@ -480,7 +480,7 @@
 For dialog boxes, use @samp{dialog*}:
 
 @example
-Emacs.dialog*.faceName:	Sans-12
+Emacs.dialog*.faceName: Sans-12
 @end example
 
 @noindent
------------------------------------------------------------
revno: 101388 [merge]
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Thu 2010-09-09 00:10:08 +0000
message:
  Merge changes made in Gnus trunk:
  
  gnus-html.el (gnus-html-schedule-image-fetching): Decode entities before feeding URLs to curl.
  gnus-async.el (gnus-async-article-callback): Call `gnus-html-prefetch-images' unconditionally.
  
  gnus-html.el: Allow showing the ALT text of images and to browse the images themselves.
  
  gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-07 06:23:16 +0000
+++ lisp/gnus/ChangeLog	2010-09-09 00:08:06 +0000
@@ -1,3 +1,18 @@
+2010-09-08  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus-html.el (gnus-html-show-alt-text): New command.
+	(gnus-html-browse-image): Ditto.
+	(gnus-html-wash-tags): Add the data to allow showing the ALT text and
+	to browse the image directly.
+	(gnus-html-wash-tags): Search for images first, so that <a><img> works
+	better.
+
+	* gnus-async.el (gnus-async-article-callback): Call
+	`gnus-html-prefetch-images' unconditionally.
+
+	* gnus-html.el (gnus-html-schedule-image-fetching): Decode entities
+	before feeding URLs to curl.
+
 2010-09-07  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-html.el (gnus-html-wash-tags, gnus-html-put-image): Mark cid and

=== modified file 'lisp/gnus/gnus-async.el'
--- lisp/gnus/gnus-async.el	2010-09-07 01:20:19 +0000
+++ lisp/gnus/gnus-async.el	2010-09-08 23:51:10 +0000
@@ -237,13 +237,13 @@
     (setq gnus-async-current-prefetch-article nil)
     (when arg
       (gnus-async-set-buffer)
-      (when gnus-async-post-fetch-function
-	(save-excursion
-	  (save-restriction
-	    (narrow-to-region mark (point-max))
-	    ;; Prefetch images for the groups that want that.
-	    (when (fboundp 'gnus-html-prefetch-images)
-	      (gnus-html-prefetch-images summary))
+      (save-excursion
+	(save-restriction
+	  (narrow-to-region mark (point-max))
+	  ;; Prefetch images for the groups that want that.
+	  (when (fboundp 'gnus-html-prefetch-images)
+	    (gnus-html-prefetch-images summary))
+	  (when gnus-async-post-fetch-function
 	    (funcall gnus-async-post-fetch-function summary))))
       (gnus-async-with-semaphore
 	(setq

=== modified file 'lisp/gnus/gnus-html.el'
--- lisp/gnus/gnus-html.el	2010-09-07 06:23:16 +0000
+++ lisp/gnus/gnus-html.el	2010-09-09 00:08:06 +0000
@@ -72,6 +72,15 @@
     (define-key map "i" 'gnus-html-insert-image)
     map))
 
+(defvar gnus-html-displayed-image-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "a" 'gnus-html-show-alt-text)
+    (define-key map "i" 'gnus-html-browse-image)
+    (define-key map "\r" 'gnus-html-browse-url)
+    (define-key map "u" 'gnus-article-copy-string)
+    (define-key map [tab] 'widget-forward)
+    map))
+
 ;;;###autoload
 (defun gnus-article-html (&optional handle)
   (let ((article-buffer (current-buffer)))
@@ -111,15 +120,99 @@
 
 (defvar gnus-article-mouse-face)
 
+(defun gnus-html-pre-wash ()
+  (goto-char (point-min))
+  (while (re-search-forward " *<pre_int> *</pre_int> *\n" nil t)
+    (replace-match "" t t))
+  (goto-char (point-min))
+  (while (re-search-forward "<a name[^\n>]+>" nil t)
+    (replace-match "" t t)))
+
 (defun gnus-html-wash-tags ()
   (let (tag parameters string start end images url)
-    (goto-char (point-min))
-    (while (re-search-forward " *<pre_int> *</pre_int> *\n" nil t)
-      (replace-match "" t t))
-    (goto-char (point-min))
-    (while (re-search-forward "<a name[^\n>]+>" nil t)
-      (replace-match "" t t))
-    (goto-char (point-min))
+    (gnus-html-pre-wash)
+    (goto-char (point-min))
+
+    ;; Search for all the images first.
+    (while (re-search-forward "<img_alt \\([^>]*\\)>" nil t)
+      (setq parameters (match-string 1)
+	    start (match-beginning 0))
+      (delete-region start (point))
+      (when (search-forward "</img_alt>" (line-end-position) t)
+	(delete-region (match-beginning 0) (match-end 0)))
+      (setq end (point))
+      (when (string-match "src=\"\\([^\"]+\\)" parameters)
+	(setq url (match-string 1 parameters))
+	(gnus-message 8 "gnus-html-wash-tags: fetching image URL %s" url)
+	(if (string-match "^cid:\\(.*\\)" url)
+	    ;; URLs with cid: have their content stashed in other
+	    ;; parts of the MIME structure, so just insert them
+	    ;; immediately.
+	    (let ((handle (mm-get-content-id
+			   (setq url (match-string 1 url))))
+		  image)
+	      (when handle
+		(mm-with-part handle
+		  (setq image (gnus-create-image (buffer-string)
+						 nil t))))
+	      (when image
+		(let ((string (buffer-substring start end)))
+		  (delete-region start end)
+		  (gnus-put-image image (gnus-string-or string "*") 'cid)
+		  (gnus-add-image 'cid image))))
+	  ;; Normal, external URL.
+	  (if (gnus-html-image-url-blocked-p
+	       url
+	       (if (buffer-live-p gnus-summary-buffer)
+		   (with-current-buffer gnus-summary-buffer
+		     gnus-blocked-images)
+		 gnus-blocked-images))
+	      (progn
+		(widget-convert-button
+		 'link start end
+		 :action 'gnus-html-insert-image
+		 :help-echo url
+		 :keymap gnus-html-image-map
+		 :button-keymap gnus-html-image-map)
+		(let ((overlay (gnus-make-overlay start end))
+		      (spec (list url
+				  (set-marker (make-marker) start)
+				  (set-marker (make-marker) end))))
+		  (gnus-overlay-put overlay 'local-map gnus-html-image-map)
+		  (gnus-overlay-put overlay 'gnus-image spec)
+		  (gnus-put-text-property
+		   start end
+		   'gnus-image spec)))
+	    (let ((file (gnus-html-image-id url))
+		  width height alt-text)
+	      (when (string-match "height=\"?\\([0-9]+\\)" parameters)
+		(setq height (string-to-number (match-string 1 parameters))))
+	      (when (string-match "width=\"?\\([0-9]+\\)" parameters)
+		(setq width (string-to-number (match-string 1 parameters))))
+	      (when (string-match "\\(alt\\|title\\)=\"\\([^\"]+\\)"
+				  parameters)
+		(setq alt-text (match-string 2 parameters)))
+	      ;; Don't fetch images that are really small.  They're
+	      ;; probably tracking pictures.
+	      (when (and (or (null height)
+			     (> height 4))
+			 (or (null width)
+			     (> width 4)))
+		(if (file-exists-p file)
+		    ;; It's already cached, so just insert it.
+		    (let ((string (buffer-substring start end)))
+		      ;; Delete the IMG text.
+		      (delete-region start end)
+		      (gnus-html-put-image file (point) string url alt-text))
+		  ;; We don't have it, so schedule it for fetching
+		  ;; asynchronously.
+		  (push (list url
+			      (set-marker (make-marker) start)
+			      (point-marker))
+			images))))))))
+
+    (goto-char (point-min))
+    ;; Then do the other tags.
     (while (re-search-forward "<\\([^ />]+\\)\\([^>]*\\)>" nil t)
       (setq tag (match-string 1)
 	    parameters (match-string 2)
@@ -132,73 +225,7 @@
       (setq end (point))
       (cond
        ;; Fetch and insert a picture.
-       ((equal tag "img_alt")
-        (when (string-match "src=\"\\([^\"]+\\)" parameters)
-	  (setq url (match-string 1 parameters))
-          (gnus-message 8 "gnus-html-wash-tags: fetching image URL %s" url)
-	  (if (string-match "^cid:\\(.*\\)" url)
-	      ;; URLs with cid: have their content stashed in other
-	      ;; parts of the MIME structure, so just insert them
-	      ;; immediately.
-	      (let ((handle (mm-get-content-id
-			     (setq url (match-string 1 url))))
-		    image)
-		(when handle
-		  (mm-with-part handle
-		    (setq image (gnus-create-image (buffer-string)
-						   nil t))))
-		(when image
-		  (let ((string (buffer-substring start end)))
-		    (delete-region start end)
-		    (gnus-put-image image (gnus-string-or string "*") 'cid)
-		    (gnus-add-image 'cid image))))
-	    ;; Normal, external URL.
-	    (if (gnus-html-image-url-blocked-p
-		 url
-		 (if (buffer-live-p gnus-summary-buffer)
-		     (with-current-buffer gnus-summary-buffer
-		       gnus-blocked-images)
-		   gnus-blocked-images))
-		(progn
-		  (widget-convert-button
-		   'link start end
-		   :action 'gnus-html-insert-image
-		   :help-echo url
-		   :keymap gnus-html-image-map
-		   :button-keymap gnus-html-image-map)
-		  (let ((overlay (gnus-make-overlay start end))
-			(spec (list url
-				    (set-marker (make-marker) start)
-				    (set-marker (make-marker) end))))
-		    (gnus-overlay-put overlay 'local-map gnus-html-image-map)
-		    (gnus-overlay-put overlay 'gnus-image spec)
-		    (gnus-put-text-property
-		     start end
-		     'gnus-image spec)))
-	      (let ((file (gnus-html-image-id url))
-		    width height)
-		(when (string-match "height=\"?\\([0-9]+\\)" parameters)
-		  (setq height (string-to-number (match-string 1 parameters))))
-		(when (string-match "width=\"?\\([0-9]+\\)" parameters)
-		  (setq width (string-to-number (match-string 1 parameters))))
-		;; Don't fetch images that are really small.  They're
-		;; probably tracking pictures.
-		(when (and (or (null height)
-			       (> height 4))
-			   (or (null width)
-			       (> width 4)))
-		  (if (file-exists-p file)
-		      ;; It's already cached, so just insert it.
-		      (let ((string (buffer-substring start end)))
-			;; Delete the ALT text.
-			(delete-region start end)
-			(gnus-html-put-image file (point) string))
-		    ;; We don't have it, so schedule it for fetching
-		    ;; asynchronously.
-		    (push (list url
-				(set-marker (make-marker) start)
-				(point-marker))
-			  images))))))))
+       ((equal tag "img_alt"))
        ;; Add a link.
        ((or (equal tag "a")
 	    (equal tag "A"))
@@ -237,6 +264,24 @@
   (gnus-html-schedule-image-fetching
    (current-buffer) (list (get-text-property (point) 'gnus-image))))
 
+(defun gnus-html-show-alt-text ()
+  "Show the ALT text of the image under point."
+  (interactive)
+  (message "%s" (get-text-property (point) 'gnus-alt-text)))
+
+(defun gnus-html-browse-image ()
+  "Browse the image under point."
+  (interactive)
+  (browse-url (get-text-property (point) 'gnus-image)))
+
+(defun gnus-html-browse-url ()
+  "Browse the image under point."
+  (interactive)
+  (let ((url (get-text-property (point) 'gnus-string)))
+    (if (not url)
+	(message "No URL at point")
+      (browse-url url))))
+
 (defun gnus-html-schedule-image-fetching (buffer images)
   (gnus-message 8 "gnus-html-schedule-image-fetching: buffer %s, images %s"
                 buffer images)
@@ -247,7 +292,7 @@
 		   "--location"
 		   "--max-time" "60"
 		   "-o" (gnus-html-image-id url)
-		   url)))
+		   (mm-url-decode-entities-string url))))
     (process-kill-without-query process)
     (set-process-sentinel process 'gnus-html-curl-sentinel)
     (gnus-set-process-plist process (list 'images images
@@ -276,7 +321,7 @@
       (when images
 	(gnus-html-schedule-image-fetching buffer images)))))
 
-(defun gnus-html-put-image (file point string)
+(defun gnus-html-put-image (file point string &optional url alt-text)
   (when (gnus-graphic-display-p)
     (let* ((image (ignore-errors
 		   (gnus-create-image file)))
@@ -301,11 +346,17 @@
 			       'gif)
 			   (= (car size) 30)
 			   (= (cdr size) 30))))
-	    (progn
+	    (let ((start (point)))
 	      (setq image (gnus-html-rescale-image image file size))
 	      (gnus-put-image image
 			      (gnus-string-or string "*")
 			      'external)
+	      (let ((overlay (gnus-make-overlay start (point))))
+		(gnus-overlay-put overlay 'local-map
+				  gnus-html-displayed-image-map)
+		(gnus-put-text-property start (point) 'gnus-alt-text alt-text)
+		(when url
+		  (gnus-put-text-property start (point) 'gnus-image url)))
 	      (gnus-add-image 'external image)
 	      t)
 	  (insert string)
@@ -360,7 +411,7 @@
 	  (delete-file (nth 2 file)))))))
 
 (defun gnus-html-image-url-blocked-p (url blocked-images)
-"Find out if URL is blocked by BLOCKED-IMAGES."
+  "Find out if URL is blocked by BLOCKED-IMAGES."
   (let ((ret (and blocked-images
                   (string-match blocked-images url))))
     (if ret
@@ -395,7 +446,7 @@
 	  (let ((url (match-string 1)))
 	    (unless (gnus-html-image-url-blocked-p url blocked-images)
               (unless (file-exists-p (gnus-html-image-id url))
-                (push url urls)
+                (push (mm-url-decode-entities-string url) urls)
                 (push (gnus-html-image-id url) urls)
                 (push "-o" urls)))))
 	(let ((process
------------------------------------------------------------
revno: 101387
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Wed 2010-09-08 18:21:23 +0200
message:
  Misc cleanups and simplifications.
  * lisp/font-lock.el (save-buffer-state): Remove `varlist' arg.
  (font-lock-unfontify-region, font-lock-default-fontify-region):
  Update usage correspondingly.
  (font-lock-fontify-syntactic-keywords-region):
  Set parse-sexp-lookup-properties buffer-locally here.
  (font-lock-fontify-syntactically-region): Remove unused `ppss' arg.
  * lisp/progmodes/ada-mode.el: Replace "(set '" with setq.
  (ada-mode): Simplify.
  (ada-create-case-exception, ada-adjust-case-interactive)
  (ada-adjust-case-region, ada-format-paramlist, ada-indent-current)
  (ada-search-ignore-string-comment, ada-move-to-start)
  (ada-move-to-end): Use with-syntax-table.
  * lisp/progmodes/fortran.el (fortran-line-length): Don't recompute
  syntactic keywords redundantly a second time.
  * lisp/progmodes/js.el (require): Require is already "eval-and-compile".
  (js--re-search-forward): Avoid `eval'.  Preserve the error data.
  (js--re-search-backward): Use js--re-search-forward.
  * lisp/progmodes/octave-mod.el (electric-indent-chars): Silence bytecomp.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-08 16:14:44 +0000
+++ lisp/ChangeLog	2010-09-08 16:21:23 +0000
@@ -1,5 +1,28 @@
 2010-09-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* progmodes/octave-mod.el (electric-indent-chars): Silence bytecomp.
+
+	* progmodes/js.el (require): Require is already "eval-and-compile".
+	(js--re-search-forward): Avoid `eval'.  Preserve the error data.
+	(js--re-search-backward): Use js--re-search-forward.
+
+	* progmodes/fortran.el (fortran-line-length): Don't recompute
+	syntactic keywords redundantly a second time.
+
+	* progmodes/ada-mode.el: Replace "(set '" with setq.
+	(ada-mode): Simplify.
+	(ada-create-case-exception, ada-adjust-case-interactive)
+	(ada-adjust-case-region, ada-format-paramlist, ada-indent-current)
+	(ada-search-ignore-string-comment, ada-move-to-start)
+	(ada-move-to-end): Use with-syntax-table.
+
+	* font-lock.el (save-buffer-state): Remove `varlist' arg.
+	(font-lock-unfontify-region, font-lock-default-fontify-region):
+	Update usage correspondingly.
+	(font-lock-fontify-syntactic-keywords-region):
+	Set parse-sexp-lookup-properties buffer-locally here.
+	(font-lock-fontify-syntactically-region): Remove unused `ppss' arg.
+
 	* simple.el (blink-matching-open): Don't burp if we can't find a match.
 
 2010-09-08  Glenn Morris  <rgm@gnu.org>

=== modified file 'lisp/font-lock.el'
--- lisp/font-lock.el	2010-08-30 13:57:42 +0000
+++ lisp/font-lock.el	2010-09-08 16:21:23 +0000
@@ -612,11 +612,10 @@
   ;;
   ;; Borrowed from lazy-lock.el.
   ;; We use this to preserve or protect things when modifying text properties.
-  (defmacro save-buffer-state (varlist &rest body)
+  (defmacro save-buffer-state (&rest body)
     "Bind variables according to VARLIST and eval BODY restoring buffer state."
-    (declare (indent 1) (debug let))
-    `(let* ,(append varlist
-                    `((inhibit-point-motion-hooks t)))
+    (declare (indent 0) (debug t))
+    `(let ((inhibit-point-motion-hooks t))
        (with-silent-modifications
          ,@body)))
   ;;
@@ -1020,7 +1019,7 @@
   (funcall font-lock-fontify-region-function beg end loudly))
 
 (defun font-lock-unfontify-region (beg end)
-  (save-buffer-state nil
+  (save-buffer-state
     (funcall font-lock-unfontify-region-function beg end)))
 
 (defun font-lock-default-fontify-buffer ()
@@ -1113,8 +1112,6 @@
 
 (defun font-lock-default-fontify-region (beg end loudly)
   (save-buffer-state
-      ((parse-sexp-lookup-properties
-        (or parse-sexp-lookup-properties font-lock-syntactic-keywords)))
     ;; Use the fontification syntax table, if any.
     (with-syntax-table (or font-lock-syntax-table (syntax-table))
       (save-restriction
@@ -1436,6 +1433,10 @@
 (defun font-lock-fontify-syntactic-keywords-region (start end)
   "Fontify according to `font-lock-syntactic-keywords' between START and END.
 START should be at the beginning of a line."
+  (unless parse-sexp-lookup-properties
+    ;; We wouldn't go through so much trouble if we didn't intend to use those
+    ;; properties, would we?
+    (set (make-local-variable 'parse-sexp-lookup-properties) t))
   ;; Ensure the beginning of the file is properly syntactic-fontified.
   (when (and font-lock-syntactically-fontified
 	     (< font-lock-syntactically-fontified start))
@@ -1483,19 +1484,17 @@
 (defvar font-lock-comment-end-skip nil
   "If non-nil, Font Lock mode uses this instead of `comment-end'.")
 
-(defun font-lock-fontify-syntactically-region (start end &optional loudly ppss)
+(defun font-lock-fontify-syntactically-region (start end &optional loudly)
   "Put proper face on each string and comment between START and END.
 START should be at the beginning of a line."
   (let ((comment-end-regexp
 	 (or font-lock-comment-end-skip
 	     (regexp-quote
 	      (replace-regexp-in-string "^ *" "" comment-end))))
-        state face beg)
+        ;; Find the `start' state.
+        (state (syntax-ppss start))
+        face beg)
     (if loudly (message "Fontifying %s... (syntactically...)" (buffer-name)))
-    (goto-char start)
-    ;;
-    ;; Find the `start' state.
-    (setq state (or ppss (syntax-ppss start)))
     ;;
     ;; Find each interesting place between here and `end'.
     (while

=== modified file 'lisp/progmodes/ada-mode.el'
--- lisp/progmodes/ada-mode.el	2010-05-25 02:11:08 +0000
+++ lisp/progmodes/ada-mode.el	2010-09-08 16:21:23 +0000
@@ -1118,7 +1118,8 @@
 
 ;;;###autoload
 (defun ada-mode ()
-  "Ada mode is the major mode for editing Ada code."
+  "Ada mode is the major mode for editing Ada code.
+\\{ada-mode-map}"
 
   (interactive)
   (kill-all-local-variables)
@@ -1161,9 +1162,9 @@
     (set (make-local-variable 'comment-padding) 0)
     (set (make-local-variable 'parse-sexp-lookup-properties) t))
 
-  (set 'case-fold-search t)
+  (setq case-fold-search t)
   (if (boundp 'imenu-case-fold-search)
-      (set 'imenu-case-fold-search t))
+      (setq imenu-case-fold-search t))
 
   (set (make-local-variable 'fill-paragraph-function)
        'ada-fill-comment-paragraph)
@@ -1322,10 +1323,10 @@
 
   ;;  To be run after the hook, in case the user modified
   ;;  ada-fill-comment-prefix
-  (make-local-variable 'comment-start)
-  (if ada-fill-comment-prefix
-      (set 'comment-start ada-fill-comment-prefix)
-    (set 'comment-start "-- "))
+  ;; FIXME: if the user modified ada-fill-comment-prefix in his .emacs
+  ;; then it was already available before running the hook, and if he
+  ;; modifies it in the hook, he might as well modify comment-start instead.
+  (set (make-local-variable 'comment-start) (or ada-fill-comment-prefix "-- "))
 
   ;;  Run this after the hook to give the users a chance to activate
   ;;  font-lock-mode
@@ -1337,7 +1338,8 @@
   ;; the following has to be done after running the ada-mode-hook
   ;; because users might want to set the values of these variable
   ;; inside the hook
-
+  ;; FIXME: it might even be set later on via file-local vars, no?
+  ;; so maybe ada-keywords should be set lazily.
   (cond ((eq ada-language-version 'ada83)
 	 (setq ada-keywords ada-83-keywords))
 	((eq ada-language-version 'ada95)
@@ -1397,25 +1399,21 @@
 The new word is added to the first file in `ada-case-exception-file'.
 The standard casing rules will no longer apply to this word."
   (interactive)
-  (let ((previous-syntax-table (syntax-table))
-	file-name
-	)
-
-    (cond ((stringp ada-case-exception-file)
-	   (setq file-name ada-case-exception-file))
-	  ((listp ada-case-exception-file)
-	   (setq file-name (car ada-case-exception-file)))
-	  (t
-	   (error (concat "No exception file specified.  "
-			  "See variable ada-case-exception-file"))))
-
-    (set-syntax-table ada-mode-symbol-syntax-table)
+  (let ((file-name
+         (cond ((stringp ada-case-exception-file)
+                ada-case-exception-file)
+               ((listp ada-case-exception-file)
+                (car ada-case-exception-file))
+               (t
+                (error (concat "No exception file specified.  "
+                               "See variable ada-case-exception-file"))))))
+
     (unless word
-      (save-excursion
-	(skip-syntax-backward "w")
-	(setq word (buffer-substring-no-properties
-		    (point) (save-excursion (forward-word 1) (point))))))
-    (set-syntax-table previous-syntax-table)
+      (with-syntax-table ada-mode-symbol-syntax-table
+        (save-excursion
+          (skip-syntax-backward "w")
+          (setq word (buffer-substring-no-properties
+                      (point) (save-excursion (forward-word 1) (point)))))))
 
     ;;  Reread the exceptions file, in case it was modified by some other,
     (ada-case-read-exceptions-from-file file-name)
@@ -1425,11 +1423,9 @@
     (if (and (not (equal ada-case-exception '()))
 	     (assoc-string word ada-case-exception t))
 	(setcar (assoc-string word ada-case-exception t) word)
-      (add-to-list 'ada-case-exception (cons word t))
-      )
+      (add-to-list 'ada-case-exception (cons word t)))
 
-    (ada-save-exceptions-to-file file-name)
-    ))
+    (ada-save-exceptions-to-file file-name)))
 
 (defun ada-create-case-exception-substring (&optional word)
   "Define the substring WORD as an exception for the casing system.
@@ -1464,7 +1460,7 @@
 	      (modify-syntax-entry ?_ "." (syntax-table))
 	      (save-excursion
 		(skip-syntax-backward "w")
-		(set 'word (buffer-substring-no-properties
+		(setq word (buffer-substring-no-properties
 			    (point)
 			    (save-excursion (forward-word 1) (point))))))
 	  (modify-syntax-entry ?_ (make-string 1 underscore-syntax)
@@ -1633,37 +1629,30 @@
   (interactive "P")
 
   (if ada-auto-case
-      (let ((lastk last-command-event)
-	    (previous-syntax-table (syntax-table)))
+      (let ((lastk last-command-event))
 
-	(unwind-protect
-	    (progn
-	      (set-syntax-table ada-mode-symbol-syntax-table)
-	      (cond ((or (eq lastk ?\n)
-			 (eq lastk ?\r))
-		     ;; horrible kludge
-		     (insert " ")
-		     (ada-adjust-case)
-		     ;; horrible dekludge
-		     (delete-char -1)
-		     ;; some special keys and their bindings
-		     (cond
-		      ((eq lastk ?\n)
-		       (funcall ada-lfd-binding))
-		      ((eq lastk ?\r)
-		       (funcall ada-ret-binding))))
-		    ((eq lastk ?\C-i) (ada-tab))
-		    ;; Else just insert the character
-	      ((self-insert-command (prefix-numeric-value arg))))
-	      ;; if there is a keyword in front of the underscore
-	      ;; then it should be part of an identifier (MH)
-	      (if (eq lastk ?_)
-		  (ada-adjust-case t)
-		(ada-adjust-case))
-	      )
-	  ;; Restore the syntax table
-	  (set-syntax-table previous-syntax-table))
-	)
+        (with-syntax-table ada-mode-symbol-syntax-table
+          (cond ((or (eq lastk ?\n)
+                     (eq lastk ?\r))
+                 ;; horrible kludge
+                 (insert " ")
+                 (ada-adjust-case)
+                 ;; horrible dekludge
+                 (delete-char -1)
+                 ;; some special keys and their bindings
+                 (cond
+                  ((eq lastk ?\n)
+                   (funcall ada-lfd-binding))
+                  ((eq lastk ?\r)
+                   (funcall ada-ret-binding))))
+                ((eq lastk ?\C-i) (ada-tab))
+                ;; Else just insert the character
+                ((self-insert-command (prefix-numeric-value arg))))
+          ;; if there is a keyword in front of the underscore
+          ;; then it should be part of an identifier (MH)
+          (if (eq lastk ?_)
+              (ada-adjust-case t)
+            (ada-adjust-case))))
 
     ;; Else, no auto-casing
     (cond
@@ -1672,10 +1661,10 @@
      ((eq last-command-event ?\r)
       (funcall ada-ret-binding))
      (t
-      (self-insert-command (prefix-numeric-value arg))))
-    ))
+      (self-insert-command (prefix-numeric-value arg))))))
 
 (defun ada-activate-keys-for-case ()
+  ;; FIXME: Use post-self-insert-hook instead of changing key bindings.
   "Modify the key bindings for all the keys that should readjust the casing."
   (interactive)
   ;; Save original key-bindings to allow swapping ret/lfd
@@ -1735,44 +1724,41 @@
   (let ((begin nil)
 	(end nil)
 	(keywordp nil)
-	(attribp nil)
-	(previous-syntax-table (syntax-table)))
+	(attribp nil))
     (message "Adjusting case ...")
-    (unwind-protect
-	(save-excursion
-	  (set-syntax-table ada-mode-symbol-syntax-table)
-	  (goto-char to)
-	  ;;
-	  ;; loop: look for all identifiers, keywords, and attributes
-	  ;;
-	  (while (re-search-backward "\\<\\(\\sw+\\)\\>" from t)
-	    (setq end (match-end 1))
-	    (setq attribp
-		 (and (> (point) from)
-		      (save-excursion
-			(forward-char -1)
-			(setq attribp (looking-at "'.[^']")))))
-	    (or
-	     ;; do nothing if it is a string or comment
-	     (ada-in-string-or-comment-p)
-	     (progn
-	       ;;
-	       ;; get the identifier or keyword or attribute
-	       ;;
-	       (setq begin (point))
-	       (setq keywordp (looking-at ada-keywords))
-	       (goto-char end)
-	       ;;
-	       ;; casing according to user-option
-	       ;;
-	       (if attribp
-		   (funcall ada-case-attribute -1)
-		 (if keywordp
-		     (funcall ada-case-keyword -1)
-		   (ada-adjust-case-identifier)))
-	       (goto-char begin))))
-	  (message "Adjusting case ... Done"))
-      (set-syntax-table previous-syntax-table))))
+    (with-syntax-table ada-mode-symbol-syntax-table
+      (save-excursion
+        (goto-char to)
+        ;;
+        ;; loop: look for all identifiers, keywords, and attributes
+        ;;
+        (while (re-search-backward "\\<\\(\\sw+\\)\\>" from t)
+          (setq end (match-end 1))
+          (setq attribp
+                (and (> (point) from)
+                     (save-excursion
+                       (forward-char -1)
+                       (setq attribp (looking-at "'.[^']")))))
+          (or
+           ;; do nothing if it is a string or comment
+           (ada-in-string-or-comment-p)
+           (progn
+             ;;
+             ;; get the identifier or keyword or attribute
+             ;;
+             (setq begin (point))
+             (setq keywordp (looking-at ada-keywords))
+             (goto-char end)
+             ;;
+             ;; casing according to user-option
+             ;;
+             (if attribp
+                 (funcall ada-case-attribute -1)
+               (if keywordp
+                   (funcall ada-case-keyword -1)
+                 (ada-adjust-case-identifier)))
+             (goto-char begin))))
+        (message "Adjusting case ... Done")))))
 
 (defun ada-adjust-case-buffer ()
   "Adjust the case of all words in the whole buffer.
@@ -1803,46 +1789,39 @@
   (let ((begin nil)
 	(end nil)
 	(delend nil)
-	(paramlist nil)
-	(previous-syntax-table (syntax-table)))
-    (unwind-protect
-	(progn
-	  (set-syntax-table ada-mode-symbol-syntax-table)
-
-	  ;; check if really inside parameter list
-	  (or (ada-in-paramlist-p)
-	      (error "Not in parameter list"))
-
-	  ;; find start of current parameter-list
-	  (ada-search-ignore-string-comment
-	   (concat ada-subprog-start-re "\\|\\<body\\>" ) t nil)
-	  (down-list 1)
-	  (backward-char 1)
-	  (setq begin (point))
-
-	  ;; find end of parameter-list
-	  (forward-sexp 1)
-	  (setq delend (point))
-	  (delete-char -1)
-	  (insert "\n")
-
-	  ;; find end of last parameter-declaration
-	  (forward-comment -1000)
-	  (setq end (point))
-
-	  ;; build a list of all elements of the parameter-list
-	  (setq paramlist (ada-scan-paramlist (1+ begin) end))
-
-	  ;; delete the original parameter-list
-	  (delete-region begin  delend)
-
-	  ;; insert the new parameter-list
-	  (goto-char begin)
-	  (ada-insert-paramlist paramlist))
-
-      ;; restore syntax-table
-      (set-syntax-table previous-syntax-table)
-      )))
+	(paramlist nil))
+    (with-syntax-table ada-mode-symbol-syntax-table
+
+      ;; check if really inside parameter list
+      (or (ada-in-paramlist-p)
+          (error "Not in parameter list"))
+
+      ;; find start of current parameter-list
+      (ada-search-ignore-string-comment
+       (concat ada-subprog-start-re "\\|\\<body\\>" ) t nil)
+      (down-list 1)
+      (backward-char 1)
+      (setq begin (point))
+
+      ;; find end of parameter-list
+      (forward-sexp 1)
+      (setq delend (point))
+      (delete-char -1)
+      (insert "\n")
+
+      ;; find end of last parameter-declaration
+      (forward-comment -1000)
+      (setq end (point))
+
+      ;; build a list of all elements of the parameter-list
+      (setq paramlist (ada-scan-paramlist (1+ begin) end))
+
+      ;; delete the original parameter-list
+      (delete-region begin  delend)
+
+      ;; insert the new parameter-list
+      (goto-char begin)
+      (ada-insert-paramlist paramlist))))
 
 (defun ada-scan-paramlist (begin end)
   "Scan the parameter list found in between BEGIN and END.
@@ -2186,14 +2165,12 @@
 Return the calculation that was done, including the reference point
 and the offset."
   (interactive)
-  (let ((previous-syntax-table (syntax-table))
-	(orgpoint (point-marker))
+  (let ((orgpoint (point-marker))
 	cur-indent tmp-indent
 	prev-indent)
 
     (unwind-protect
-	(progn
-	  (set-syntax-table ada-mode-symbol-syntax-table)
+	(with-syntax-table ada-mode-symbol-syntax-table
 
 	  ;;  This need to be done here so that the advice is not always
 	  ;;  activated (this might interact badly with other modes)
@@ -2203,14 +2180,14 @@
 	  (save-excursion
 	    (setq cur-indent
 
-		 ;; Not First line in the buffer ?
-		 (if (save-excursion (zerop (forward-line -1)))
-		     (progn
-		       (back-to-indentation)
-		       (ada-get-current-indent))
+                  ;; Not First line in the buffer ?
+                  (if (save-excursion (zerop (forward-line -1)))
+                      (progn
+                        (back-to-indentation)
+                        (ada-get-current-indent))
 
-		   ;; first line in the buffer
-		   (list (point-min) 0))))
+                    ;; first line in the buffer
+                    (list (point-min) 0))))
 
 	  ;; Evaluate the list to get the column to indent to
 	  ;; prev-indent contains the column to indent to
@@ -2242,14 +2219,10 @@
 	  (if (< (current-column) (current-indentation))
 	      (back-to-indentation)))
 
-      ;; restore syntax-table
-      (set-syntax-table previous-syntax-table)
       (if (featurep 'xemacs)
-	  (ad-deactivate 'parse-partial-sexp))
-      )
+	  (ad-deactivate 'parse-partial-sexp)))
 
-    cur-indent
-    ))
+    cur-indent))
 
 (defun ada-get-current-indent ()
   "Return the indentation to use for the current line."
@@ -2512,11 +2485,11 @@
 	  (if (looking-at "renames")
 	      (let (pos)
 		(save-excursion
-		  (set 'pos (ada-search-ignore-string-comment ";\\|return\\>" t)))
+		  (setq pos (ada-search-ignore-string-comment ";\\|return\\>" t)))
 		(if (and pos
 			 (= (downcase (char-after (car pos))) ?r))
 		    (goto-char (car pos)))
-		(set 'var 'ada-indent-renames)))
+		(setq var 'ada-indent-renames)))
 
 	  (forward-comment -1000)
 	  (if (= (char-before) ?\))
@@ -2533,7 +2506,7 @@
 			     (looking-at "\\(function\\|procedure\\)\\>"))
 			   (progn
 			     (backward-word 1)
-			     (set 'num-back 2)
+			     (setq num-back 2)
 			     (looking-at "\\(function\\|procedure\\)\\>")))))
 
 		;; The indentation depends of the value of ada-indent-return
@@ -4046,8 +4019,7 @@
   (let (found
 	begin
 	end
-	parse-result
-	(previous-syntax-table (syntax-table)))
+	parse-result)
 
     ;; FIXME: need to pass BACKWARD to search-func!
     (unless search-func
@@ -4057,67 +4029,65 @@
     ;; search until found or end-of-buffer
     ;; We have to test that we do not look further than limit
     ;;
-    (set-syntax-table ada-mode-symbol-syntax-table)
-    (while (and (not found)
-		(or (not limit)
-		    (or (and backward (<= limit (point)))
-			(>= limit (point))))
-		(funcall search-func search-re limit 1))
-      (setq begin (match-beginning 0))
-      (setq end (match-end 0))
-
-      (setq parse-result (parse-partial-sexp
-			  (save-excursion (beginning-of-line) (point))
-			  (point)))
-
-      (cond
-       ;;
-       ;; If inside a string, skip it (and the following comments)
-       ;;
-       ((ada-in-string-p parse-result)
-	(if (featurep 'xemacs)
-	    (search-backward "\"" nil t)
-	  (goto-char (nth 8 parse-result)))
-	(unless backward (forward-sexp 1)))
-       ;;
-       ;; If inside a comment, skip it (and the following comments)
-       ;; There is a special code for comments at the end of the file
-       ;;
-       ((ada-in-comment-p parse-result)
-	(if (featurep 'xemacs)
-	    (progn
-	      (forward-line 1)
-	      (beginning-of-line)
-	      (forward-comment -1))
-	  (goto-char (nth 8 parse-result)))
-	(unless backward
-	  ;;  at the end of the file, it is not possible to skip a comment
-	  ;;  so we just go at the end of the line
-	  (if (forward-comment 1)
-	      (progn
-		(forward-comment 1000)
-		(beginning-of-line))
-	    (end-of-line))))
-       ;;
-       ;; directly in front of a comment => skip it, if searching forward
-       ;;
-       ((and (= (char-after begin) ?-) (= (char-after (1+ begin)) ?-))
-	(unless backward (progn (forward-char -1) (forward-comment 1000))))
-
-       ;;
-       ;; found a parameter-list but should ignore it => skip it
-       ;;
-       ((and (not paramlists) (ada-in-paramlist-p))
-	(if backward
-	    (search-backward "(" nil t)
-	  (search-forward ")" nil t)))
-       ;;
-       ;; found what we were looking for
-       ;;
-       (t
-	(setq found t))))               ; end of loop
-
-    (set-syntax-table previous-syntax-table)
+    (with-syntax-table ada-mode-symbol-syntax-table
+      (while (and (not found)
+                  (or (not limit)
+                      (or (and backward (<= limit (point)))
+                          (>= limit (point))))
+                  (funcall search-func search-re limit 1))
+        (setq begin (match-beginning 0))
+        (setq end (match-end 0))
+
+        (setq parse-result (parse-partial-sexp
+                            (save-excursion (beginning-of-line) (point))
+                            (point)))
+
+        (cond
+         ;;
+         ;; If inside a string, skip it (and the following comments)
+         ;;
+         ((ada-in-string-p parse-result)
+          (if (featurep 'xemacs)
+              (search-backward "\"" nil t)
+            (goto-char (nth 8 parse-result)))
+          (unless backward (forward-sexp 1)))
+         ;;
+         ;; If inside a comment, skip it (and the following comments)
+         ;; There is a special code for comments at the end of the file
+         ;;
+         ((ada-in-comment-p parse-result)
+          (if (featurep 'xemacs)
+              (progn
+                (forward-line 1)
+                (beginning-of-line)
+                (forward-comment -1))
+            (goto-char (nth 8 parse-result)))
+          (unless backward
+            ;;  at the end of the file, it is not possible to skip a comment
+            ;;  so we just go at the end of the line
+            (if (forward-comment 1)
+                (progn
+                  (forward-comment 1000)
+                  (beginning-of-line))
+              (end-of-line))))
+         ;;
+         ;; directly in front of a comment => skip it, if searching forward
+         ;;
+         ((and (= (char-after begin) ?-) (= (char-after (1+ begin)) ?-))
+          (unless backward (progn (forward-char -1) (forward-comment 1000))))
+
+         ;;
+         ;; found a parameter-list but should ignore it => skip it
+         ;;
+         ((and (not paramlists) (ada-in-paramlist-p))
+          (if backward
+              (search-backward "(" nil t)
+            (search-forward ")" nil t)))
+         ;;
+         ;; found what we were looking for
+         ;;
+         (t
+          (setq found t)))))            ; end of loop
 
     (if found
 	(cons begin end)
@@ -4398,122 +4368,109 @@
 (defun ada-move-to-start ()
   "Move point to the matching start of the current Ada structure."
   (interactive)
-  (let ((pos (point))
-	(previous-syntax-table (syntax-table)))
-    (unwind-protect
-	(progn
-	  (set-syntax-table ada-mode-symbol-syntax-table)
-
-	  (save-excursion
-	    ;;
-	    ;; do nothing if in string or comment or not on 'end ...;'
-	    ;;            or if an error occurs during processing
-	    ;;
-	    (or
-	     (ada-in-string-or-comment-p)
-	     (and (progn
-		    (or (looking-at "[ \t]*\\<end\\>")
-			(backward-word 1))
-		    (or (looking-at "[ \t]*\\<end\\>")
-			(backward-word 1))
-		    (or (looking-at "[ \t]*\\<end\\>")
-			(error "Not on end ...;")))
-		  (ada-goto-matching-start 1)
-		  (setq pos (point))
-
-		  ;;
-		  ;; on 'begin' => go on, according to user option
-		  ;;
-		  ada-move-to-declaration
-		  (looking-at "\\<begin\\>")
-		  (ada-goto-decl-start)
-		  (setq pos (point))))
-
-	    )                           ; end of save-excursion
-
-	  ;; now really move to the found position
-	  (goto-char pos))
-
-      ;; restore syntax-table
-      (set-syntax-table previous-syntax-table))))
+  (let ((pos (point)))
+    (with-syntax-table ada-mode-symbol-syntax-table
+
+      (save-excursion
+        ;;
+        ;; do nothing if in string or comment or not on 'end ...;'
+        ;;            or if an error occurs during processing
+        ;;
+        (or
+         (ada-in-string-or-comment-p)
+         (and (progn
+                (or (looking-at "[ \t]*\\<end\\>")
+                    (backward-word 1))
+                (or (looking-at "[ \t]*\\<end\\>")
+                    (backward-word 1))
+                (or (looking-at "[ \t]*\\<end\\>")
+                    (error "Not on end ...;")))
+              (ada-goto-matching-start 1)
+              (setq pos (point))
+
+              ;;
+              ;; on 'begin' => go on, according to user option
+              ;;
+              ada-move-to-declaration
+              (looking-at "\\<begin\\>")
+              (ada-goto-decl-start)
+              (setq pos (point))))
+
+        )                               ; end of save-excursion
+
+      ;; now really move to the found position
+      (goto-char pos))))
 
 (defun ada-move-to-end ()
   "Move point to the end of the block around point.
 Moves to 'begin' if in a declarative part."
   (interactive)
   (let ((pos (point))
-	decl-start
-	(previous-syntax-table (syntax-table)))
-    (unwind-protect
-	(progn
-	  (set-syntax-table ada-mode-symbol-syntax-table)
-
-	  (save-excursion
-
-	    (cond
-	     ;; Go to the beginning of the current word, and check if we are
-	     ;; directly on 'begin'
-	     ((save-excursion
-		(skip-syntax-backward "w")
-		(looking-at "\\<begin\\>"))
-	      (ada-goto-matching-end 1)
-	      )
-
-	     ;; on first line of subprogram body
-	     ;; Do nothing for specs or generic instantion, since these are
-	     ;; handled as the general case (find the enclosing block)
-	     ;; We also need to make sure that we ignore nested subprograms
-	     ((save-excursion
-		(and (skip-syntax-backward "w")
-		     (looking-at "\\<function\\>\\|\\<procedure\\>" )
-		     (ada-search-ignore-string-comment "is\\|;")
-		     (not (= (char-before) ?\;))
-		     ))
-	      (skip-syntax-backward "w")
-	      (ada-goto-matching-end 0 t))
-
-	     ;; on first line of task declaration
-	     ((save-excursion
-		(and (ada-goto-stmt-start)
-		     (looking-at "\\<task\\>" )
-		     (forward-word 1)
-		     (ada-goto-next-non-ws)
-		     (looking-at "\\<body\\>")))
-	      (ada-search-ignore-string-comment "begin" nil nil nil
-						'word-search-forward))
-	     ;; accept block start
-	     ((save-excursion
-		(and (ada-goto-stmt-start)
-		     (looking-at "\\<accept\\>" )))
-	      (ada-goto-matching-end 0))
-	     ;; package start
-	     ((save-excursion
-		(setq decl-start (and (ada-goto-decl-start t) (point)))
-		(and decl-start (looking-at "\\<package\\>")))
-	      (ada-goto-matching-end 1))
-
-	     ;;  On a "declare" keyword
-	     ((save-excursion
-		(skip-syntax-backward "w")
-		(looking-at "\\<declare\\>"))
-	      (ada-goto-matching-end 0 t))
-
-	     ;; inside a 'begin' ... 'end' block
-	     (decl-start
-	      (goto-char decl-start)
-	      (ada-goto-matching-end 0 t))
-
-	     ;; (hopefully ;-) everything else
-	     (t
-	      (ada-goto-matching-end 1)))
-	    (setq pos (point))
-	    )
-
-	  ;; now really move to the position found
-	  (goto-char pos))
-
-      ;; restore syntax-table
-      (set-syntax-table previous-syntax-table))))
+	decl-start)
+    (with-syntax-table ada-mode-symbol-syntax-table
+
+      (save-excursion
+
+        (cond
+         ;; Go to the beginning of the current word, and check if we are
+         ;; directly on 'begin'
+         ((save-excursion
+            (skip-syntax-backward "w")
+            (looking-at "\\<begin\\>"))
+          (ada-goto-matching-end 1))
+
+         ;; on first line of subprogram body
+         ;; Do nothing for specs or generic instantion, since these are
+         ;; handled as the general case (find the enclosing block)
+         ;; We also need to make sure that we ignore nested subprograms
+         ((save-excursion
+            (and (skip-syntax-backward "w")
+                 (looking-at "\\<function\\>\\|\\<procedure\\>" )
+                 (ada-search-ignore-string-comment "is\\|;")
+                 (not (= (char-before) ?\;))
+                 ))
+          (skip-syntax-backward "w")
+          (ada-goto-matching-end 0 t))
+
+         ;; on first line of task declaration
+         ((save-excursion
+            (and (ada-goto-stmt-start)
+                 (looking-at "\\<task\\>" )
+                 (forward-word 1)
+                 (ada-goto-next-non-ws)
+                 (looking-at "\\<body\\>")))
+          (ada-search-ignore-string-comment "begin" nil nil nil
+                                            'word-search-forward))
+         ;; accept block start
+         ((save-excursion
+            (and (ada-goto-stmt-start)
+                 (looking-at "\\<accept\\>" )))
+          (ada-goto-matching-end 0))
+         ;; package start
+         ((save-excursion
+            (setq decl-start (and (ada-goto-decl-start t) (point)))
+            (and decl-start (looking-at "\\<package\\>")))
+          (ada-goto-matching-end 1))
+
+         ;;  On a "declare" keyword
+         ((save-excursion
+            (skip-syntax-backward "w")
+            (looking-at "\\<declare\\>"))
+          (ada-goto-matching-end 0 t))
+
+         ;; inside a 'begin' ... 'end' block
+         (decl-start
+          (goto-char decl-start)
+          (ada-goto-matching-end 0 t))
+
+         ;; (hopefully ;-) everything else
+         (t
+          (ada-goto-matching-end 1)))
+        (setq pos (point))
+        )
+
+      ;; now really move to the position found
+      (goto-char pos))))
 
 (defun ada-next-procedure ()
   "Move point to next procedure."
@@ -4818,7 +4775,7 @@
     (if (featurep 'xemacs)
 	(progn
 	  (define-key ada-mode-map [menu-bar] ada-mode-menu)
-	  (set 'mode-popup-menu (cons "Ada mode" ada-mode-menu))))))
+	  (setq mode-popup-menu (cons "Ada mode" ada-mode-menu))))))
 
 
 ;; -------------------------------------------------------
@@ -5040,7 +4997,7 @@
 		   (ada-find-src-file-in-dir
 		    (file-name-nondirectory (concat name (car suffixes))))))
 	      (if other
-		  (set 'is-spec other)))
+		  (setq is-spec other)))
 
 	  ;;  Else search in the current directory
 	  (if (file-exists-p (concat name (car suffixes)))

=== modified file 'lisp/progmodes/fortran.el'
--- lisp/progmodes/fortran.el	2010-05-21 01:13:57 +0000
+++ lisp/progmodes/fortran.el	2010-09-08 16:21:23 +0000
@@ -920,8 +920,7 @@
                       new (fortran-font-lock-syntactic-keywords))
                 ;; Refontify only if necessary.
                 (unless (equal new font-lock-syntactic-keywords)
-                  (setq font-lock-syntactic-keywords
-                        (fortran-font-lock-syntactic-keywords))
+                  (setq font-lock-syntactic-keywords new)
                   (if font-lock-mode (font-lock-mode 1))))))
           (if global
               (buffer-list)

=== modified file 'lisp/progmodes/js.el'
--- lisp/progmodes/js.el	2010-08-29 16:17:13 +0000
+++ lisp/progmodes/js.el	2010-09-08 16:21:23 +0000
@@ -45,16 +45,16 @@
 
 ;;; Code:
 
-(eval-and-compile
-  (require 'cc-mode)
-  (require 'font-lock)
-  (require 'newcomment)
-  (require 'imenu)
-  (require 'etags)
-  (require 'thingatpt)
-  (require 'easymenu)
-  (require 'moz nil t)
-  (require 'json nil t))
+
+(require 'cc-mode)
+(require 'font-lock)
+(require 'newcomment)
+(require 'imenu)
+(require 'etags)
+(require 'thingatpt)
+(require 'easymenu)
+(require 'moz nil t)
+(require 'json nil t)
 
 (eval-when-compile
   (require 'cl)
@@ -725,20 +725,19 @@
 
 If invoked while inside a macro, it treats the contents of the
 macro as normal text."
+  (unless count (setq count 1))
   (let ((saved-point (point))
-        (search-expr
-         (cond ((null count)
-                '(js--re-search-forward-inner regexp bound 1))
-               ((< count 0)
-                '(js--re-search-backward-inner regexp bound (- count)))
-               ((> count 0)
-                '(js--re-search-forward-inner regexp bound count)))))
+        (search-fun
+         (cond ((< count 0) (setq count (- count))
+                #'js--re-search-backward-inner)
+               ((> count 0) #'js--re-search-forward-inner)
+               (t #'ignore))))
     (condition-case err
-        (eval search-expr)
+        (funcall search-fun regexp bound count)
       (search-failed
        (goto-char saved-point)
        (unless noerror
-         (error (error-message-string err)))))))
+         (signal (car err) (cdr err)))))))
 
 
 (defun js--re-search-backward-inner (regexp &optional bound count)
@@ -782,20 +781,7 @@
 removed.
 
 If invoked while inside a macro, treat the macro as normal text."
-  (let ((saved-point (point))
-        (search-expr
-         (cond ((null count)
-                '(js--re-search-backward-inner regexp bound 1))
-               ((< count 0)
-                '(js--re-search-forward-inner regexp bound (- count)))
-               ((> count 0)
-                '(js--re-search-backward-inner regexp bound count)))))
-    (condition-case err
-        (eval search-expr)
-      (search-failed
-       (goto-char saved-point)
-       (unless noerror
-         (error (error-message-string err)))))))
+  (js--re-search-forward regexp bound noerror (if count (- count) -1)))
 
 (defun js--forward-expression ()
   "Move forward over a whole JavaScript expression.

=== modified file 'lisp/progmodes/octave-mod.el'
--- lisp/progmodes/octave-mod.el	2010-09-03 13:28:09 +0000
+++ lisp/progmodes/octave-mod.el	2010-09-08 16:21:23 +0000
@@ -544,6 +544,8 @@
      0)
     ((:before . "case") octave-block-offset)))
 
+(defvar electric-indent-chars)
+
 ;;;###autoload
 (define-derived-mode octave-mode prog-mode "Octave"
   "Major mode for editing Octave code.
------------------------------------------------------------
revno: 101386
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Wed 2010-09-08 18:14:44 +0200
message:
  * lisp/simple.el (blink-matching-open): Don't burp if we can't find a match.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-08 16:02:38 +0000
+++ lisp/ChangeLog	2010-09-08 16:14:44 +0000
@@ -1,3 +1,7 @@
+2010-09-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* simple.el (blink-matching-open): Don't burp if we can't find a match.
+
 2010-09-08  Glenn Morris  <rgm@gnu.org>
 
 	* emacs-lisp/bytecomp.el (byte-compile-report-ops):

=== modified file 'lisp/simple.el'
--- lisp/simple.el	2010-09-03 11:12:46 +0000
+++ lisp/simple.el	2010-09-08 16:14:44 +0000
@@ -5541,6 +5541,7 @@
           (if (minibufferp)
               (minibuffer-message " [Unmatched parenthesis]")
             (message "Unmatched parenthesis"))))
+       ((not blinkpos) nil)
        ((pos-visible-in-window-p blinkpos)
         ;; Matching open within window, temporarily move to blinkpos but only
         ;; if `blink-matching-paren-on-screen' is non-nil.
------------------------------------------------------------
revno: 101385
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Wed 2010-09-08 09:02:38 -0700
message:
  Very minor bytecomp fix.
  * lisp/emacs-lisp/bytecomp.el (byte-compile-report-ops):
  Error if not compiled with -DBYTE_CODE_METER.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-08 15:59:10 +0000
+++ lisp/ChangeLog	2010-09-08 16:02:38 +0000
@@ -1,5 +1,8 @@
 2010-09-08  Glenn Morris  <rgm@gnu.org>
 
+	* emacs-lisp/bytecomp.el (byte-compile-report-ops):
+	Error if not compiled with -DBYTE_CODE_METER.
+
 	* emacs-lisp/bytecomp.el (byte-recompile-directory):
 	Ignore dir-locals-file.
 

=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- lisp/emacs-lisp/bytecomp.el	2010-09-08 15:59:10 +0000
+++ lisp/emacs-lisp/bytecomp.el	2010-09-08 16:02:38 +0000
@@ -4244,6 +4244,8 @@
 
 (defvar byte-code-meter)
 (defun byte-compile-report-ops ()
+  (or (boundp 'byte-metering-on)
+      (error "You must build Emacs with -DBYTE_CODE_METER to use this"))
   (with-output-to-temp-buffer "*Meter*"
     (set-buffer "*Meter*")
     (let ((i 0) n op off)
------------------------------------------------------------
revno: 101384
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Wed 2010-09-08 08:59:10 -0700
message:
  * emacs-lisp/bytecomp.el (byte-recompile-directory): Ignore dir-locals-file.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-08 15:53:08 +0000
+++ lisp/ChangeLog	2010-09-08 15:59:10 +0000
@@ -1,3 +1,8 @@
+2010-09-08  Glenn Morris  <rgm@gnu.org>
+
+	* emacs-lisp/bytecomp.el (byte-recompile-directory):
+	Ignore dir-locals-file.
+
 2010-09-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* progmodes/compile.el (compilation-error-regexp-alist-alist):

=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- lisp/emacs-lisp/bytecomp.el	2010-08-29 16:17:13 +0000
+++ lisp/emacs-lisp/bytecomp.el	2010-09-08 15:59:10 +0000
@@ -1,7 +1,8 @@
 ;;; bytecomp.el --- compilation of Lisp code into byte code
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1998, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;;   Free Software Foundation, Inc.
 
 ;; Author: Jamie Zawinski <jwz@lucid.com>
 ;;	Hallvard Furuseth <hbf@ulrik.uio.no>
@@ -1548,6 +1549,9 @@
 	       (if (and (string-match emacs-lisp-file-regexp bytecomp-source)
 			(file-readable-p bytecomp-source)
 			(not (auto-save-file-name-p bytecomp-source))
+			(not (string-equal dir-locals-file
+					   (file-name-nondirectory
+					    bytecomp-source)))
 			(setq bytecomp-dest
                               (byte-compile-dest-file bytecomp-source))
 			(if (file-exists-p bytecomp-dest)
------------------------------------------------------------
revno: 101383
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Wed 2010-09-08 17:53:08 +0200
message:
  * lisp/progmodes/compile.el (compilation-error-regexp-alist-alist):
  Not a const.
  (compilation-error-regexp-alist-alist): Rule out ": " in file names
  for the `gnu' messages.
  (compilation-set-skip-threshold): New command.
  (compilation-start): Use \' rather than $.
  (compilation-forget-errors): Use clrhash.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-08 14:54:00 +0000
+++ lisp/ChangeLog	2010-09-08 15:53:08 +0000
@@ -1,3 +1,13 @@
+2010-09-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* progmodes/compile.el (compilation-error-regexp-alist-alist):
+	Not a const.
+	(compilation-error-regexp-alist-alist): Rule out ": " in file names
+	for the `gnu' messages.
+	(compilation-set-skip-threshold): New command.
+	(compilation-start): Use \' rather than $.
+	(compilation-forget-errors): Use clrhash.
+
 2010-09-08  Agustín Martín  <agustin.martin@hispalinux.es>
 
 	* textmodes/ispell.el (ispell-valid-dictionary-list):
@@ -140,7 +150,7 @@
 
 2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-	* net/imap.el (imap-message-map): Removed optional buffer parameter,
+	* net/imap.el (imap-message-map): Remove optional buffer parameter,
 	since no callers use it.
 	(imap-message-get): Ditto.
 	(imap-message-put): Ditto.
@@ -151,11 +161,11 @@
 
 2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-	* net/imap.el (imap-fetch-safe): Removed function, and altered all
+	* net/imap.el (imap-fetch-safe): Remove function, and alter all
 	callers to use `imap-fetch' instead.  According to the comments, this
 	should be safe, since all other IMAP clients use the 1:* syntax.
-	(imap-enable-exchange-bug-workaround): Removed.
-	(imap-debug): Removed -- doesn't seem very useful.
+	(imap-enable-exchange-bug-workaround): Remove.
+	(imap-debug): Remove -- doesn't seem very useful.
 
 2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 

=== modified file 'lisp/progmodes/compile.el'
--- lisp/progmodes/compile.el	2010-09-04 20:42:03 +0000
+++ lisp/progmodes/compile.el	2010-09-08 15:53:08 +0000
@@ -164,7 +164,7 @@
 
 (defvar compilation-num-errors-found)
 
-(defconst compilation-error-regexp-alist-alist
+(defvar compilation-error-regexp-alist-alist
   '((absoft
      "^\\(?:[Ee]rror on \\|[Ww]arning on\\( \\)\\)?[Ll]ine[ \t]+\\([0-9]+\\)[ \t]+\
 of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
@@ -263,9 +263,11 @@
      ;; The core of the regexp is the one with *?.  It says that a file name
      ;; can be composed of any non-newline char, but it also rules out some
      ;; valid but unlikely cases, such as a trailing space or a space
-     ;; followed by a -.
+     ;; followed by a -, or a colon followed by a space.
+
+     ;; The "in \\|from " exception was added to handle messages from Ruby.
      "^\\(?:[[:alpha:]][-[:alnum:].]+: ?\\|[ \t]+\\(?:in \\|from \\)\\)?\
-\\([0-9]*[^0-9\n]\\(?:[^\n ]\\| [^-/\n]\\)*?\\): ?\
+\\([0-9]*[^0-9\n]\\(?:[^\n :]\\| [^-/\n]\\|:[^ \n]\\)*?\\): ?\
 \\([0-9]+\\)\\(?:\\([.:]\\)\\([0-9]+\\)\\)?\
 \\(?:-\\([0-9]+\\)?\\(?:\\.\\([0-9]+\\)\\)?\\)?:\
 \\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\)\\|\
@@ -766,12 +768,27 @@
 skip anything less than warning or 0 -- don't skip any messages.
 Note that all messages not positively identified as warning or
 info, are considered errors."
-  :type '(choice (const :tag "Warnings and info" 2)
-		 (const :tag "Info" 1)
-		 (const :tag "None" 0))
+  :type '(choice (const :tag "Skip warnings and info" 2)
+		 (const :tag "Skip info" 1)
+		 (const :tag "No skip" 0))
   :group 'compilation
   :version "22.1")
 
+(defun compilation-set-skip-threshold (level)
+  "Switch the `compilation-skip-threshold' level."
+  (interactive
+   (list
+    (mod (if current-prefix-arg
+             (prefix-numeric-value current-prefix-arg)
+           (1+ compilation-skip-threshold))
+         3)))
+  (setq compilation-skip-threshold level)
+  (message "Skipping %s"
+           (case compilation-skip-threshold
+             (0 "Nothing")
+             (1 "Info messages")
+             (2 "Warnings and info"))))
+
 (defcustom compilation-skip-visited nil
   "Compilation motion commands skip visited messages if this is t.
 Visited messages are ones for which the file, line and column have been jumped
@@ -1212,7 +1229,7 @@
   (let* ((name-of-mode
 	  (if (eq mode t)
 	      "compilation"
-	    (replace-regexp-in-string "-mode$" "" (symbol-name mode))))
+	    (replace-regexp-in-string "-mode\\'" "" (symbol-name mode))))
 	 (thisdir default-directory)
 	 outwin outbuf)
     (with-current-buffer
@@ -2377,7 +2394,7 @@
 (defun compilation-forget-errors ()
   ;; In case we hit the same file/line specs, we want to recompute a new
   ;; marker for them, so flush our cache.
-  (setq compilation-locs (make-hash-table :test 'equal :weakness 'value))
+  (clrhash compilation-locs)
   (setq compilation-gcpro nil)
   ;; FIXME: the old code reset the directory-stack, so maybe we should
   ;; put a `directory change' marker of some sort, but where?  -stef
------------------------------------------------------------
revno: 101382
committer: Agustin martin <agustin.martin@hispalinux.es>
branch nick: trunk
timestamp: Wed 2010-09-08 16:54:00 +0200
message:
  textmodes/ispell.el (ispell-valid-dictionary-list): Simplify logic.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-08 14:42:54 +0000
+++ lisp/ChangeLog	2010-09-08 14:54:00 +0000
@@ -1,3 +1,8 @@
+2010-09-08  Agustín Martín  <agustin.martin@hispalinux.es>
+
+	* textmodes/ispell.el (ispell-valid-dictionary-list):
+	Simplify logic.
+
 2010-09-08  Michael Albinus  <michael.albinus@gmx.de>
 
 	Migrate to Tramp 2.2.  Rearrange load dependencies.

=== modified file 'lisp/textmodes/ispell.el'
--- lisp/textmodes/ispell.el	2010-09-07 18:01:23 +0000
+++ lisp/textmodes/ispell.el	2010-09-08 14:54:00 +0000
@@ -1116,26 +1116,24 @@
 
   (let ((dicts (append ispell-local-dictionary-alist ispell-dictionary-alist))
 	(dict-list (cons "default" nil))
-	name load-dict)
+	name dict-bname)
     (dolist (dict dicts)
       (setq name (car dict)
-	    load-dict (car (cdr (member "-d" (nth 5 dict)))))
+	    dict-bname (or (car (cdr (member "-d" (nth 5 dict))))
+			   name))
       ;; Include if the dictionary is in the library, or dir not defined.
       (if (and
 	   name
-	   ;; include all dictionaries if lib directory not known.
 	   ;; For Aspell, we already know which dictionaries exist.
 	   (or ispell-really-aspell
+	       ;; Include all dictionaries if lib directory not known.
+	       ;; Same for Hunspell, where ispell-library-directory is nil.
 	       (not ispell-library-directory)
 	       (file-exists-p (concat ispell-library-directory
-				      "/" name ".hash"))
-	       (file-exists-p (concat ispell-library-directory "/" name ".has"))
-	       (and load-dict
-		    (or (file-exists-p (concat ispell-library-directory
-					       "/" load-dict ".hash"))
-			(file-exists-p (concat ispell-library-directory
-					       "/" load-dict ".has"))))))
-	  (setq dict-list (cons name dict-list))))
+				      "/" dict-bname ".hash"))
+	       (file-exists-p (concat ispell-library-directory
+				      "/" dict-bname ".has"))))
+	  (push name dict-list)))
     dict-list))
 
 ;;; define commands in menu in opposite order you want them to appear.
------------------------------------------------------------
revno: 101381
committer: Michael Albinus <michael.albinus@gmx.de>
branch nick: trunk
timestamp: Wed 2010-09-08 16:42:54 +0200
message:
  Migrate to Tramp 2.2.  Rearrange load dependencies.
  (Bug#1529, Bug#5448, Bug#5705)
  
  * Makefile.in (TRAMP_DIR, TRAMP_SRC): New variables.
  ($(TRAMP_DIR)/tramp-loaddefs.el): New target.
  (LOADDEFS): Add $(lisp)/net/tramp-loaddefs.el.
  
  * net/tramp.el (top): Remove all other tramp-* loads except
  tramp-compat.el.  Remove all changes to tramp-unload-hook for
  other tramp-* packages.  Rearrange defun order.  Change calls of
  `tramp-compat-call-process', `tramp-compat-decimal-to-octal',
  `tramp-compat-octal-to-decimal' to new function names.
  (tramp-terminal-type, tramp-initial-end-of-output)
  (tramp-methods, tramp-foreign-file-name-handler-alist)
  (tramp-tramp-file-p, tramp-completion-mode-p)
  (tramp-send-command-and-check, tramp-get-remote-path)
  (tramp-get-remote-tmpdir, tramp-get-remote-ln)
  (tramp-shell-quote-argument): Set tramp-autoload cookie.
  (with-file-property, with-connection-property): Move to
  tramp-cache.el.
  (tramp-local-call-process, tramp-decimal-to-octal)
  (tramp-octal-to-decimal): Move to tramp-compat.el.
  (tramp-handle-shell-command): Do not require 'shell.
  (tramp-compute-multi-hops): No special handling for tramp-gw-*
  symbols.
  (tramp-unload-tramp): Do not call `tramp-unload-file-name-handlers'.
  
  * net/tramp-cache.el (top): Require 'tramp.  Add to
  `tramp-unload-hook'.
  (tramp-cache-data, tramp-get-file-property)
  (tramp-set-file-property, tramp-flush-file-property)
  (tramp-flush-directory-property, tramp-get-connection-property)
  (tramp-set-connection-property, tramp-flush-connection-property)
  (tramp-cache-print, tramp-list-connections): Set tramp-autoload
  cookie.
  (with-file-property, with-connection-property): New defuns, moved
  from tramp.el.
  (tramp-flush-file-function): Use `with-parsed-tramp-file-name'
  macro.
  
  * net/tramp-cmds.el (top): Add to `tramp-unload-hook'.
  (tramp-version): Set tramp-autoload cookie.
  
  * net/tramp-compat.el (top): Require 'tramp-loaddefs.  Remove all
  changes to tramp-unload-hook for other tramp-* packages.  Add to
  `tramp-unload-hook'.
  (tramp-compat-decimal-to-octal, tramp-compat-octal-to-decimal)
  (tramp-compat-call-process): New defuns, moved from tramp.el.
  
  * net/tramp-fish.el (top) Require just 'tramp.  Add objects to
  `tramp-methods' and `tramp-foreign-file-name-handler-alist'.  Add
  to `tramp-unload-hook'.  Change call of
  `tramp-compat-decimal-to-octal' to new function name.
  (tramp-fish-method): Make it a defconst.
  (tramp-fish-file-name-p): Make it a defsubst.
  (tramp-fish-method, tramp-fish-file-name-handler)
  (tramp-fish-file-name-p): Set tramp-autoload cookie.
  
  * net/tramp-ftp.el (top) Add objects to `tramp-methods' and
  `tramp-foreign-file-name-handler-alist'.  Add to
  `tramp-unload-hook'.
  (tramp-ftp-method): Make it a defconst.
  (tramp-ftp-file-name-p): Make it a defsubst.
  (tramp-ftp-method, tramp-ftp-file-name-handler)
  (tramp-ftp-file-name-p): Set tramp-autoload cookie.
  
  * net/tramp-gvfs.el (top) Add objects to `tramp-methods' and
  `tramp-foreign-file-name-handler-alist'.  Add to
  `tramp-unload-hook'.  Change checks, whether package can be
  loaded.
  (tramp-gvfs-file-name-p): Make it a defsubst.
  (tramp-gvfs-methods, tramp-gvfs-file-name-handler)
  (tramp-gvfs-file-name-p): Set tramp-autoload cookie.
  (tramp-gvfs-handle-file-directory-p): New defun.
  (tramp-gvfs-file-name-handler-alist): Use it.
  
  * net/tramp-gw.el (top) Add objects to `tramp-methods' and
  `tramp-foreign-file-name-handler-alist'.  Add to
  `tramp-unload-hook'.
  (tramp-gw-tunnel-method, tramp-gw-default-tunnel-port)
  (tramp-gw-socks-method, tramp-gw-default-socks-port): Make it a
  defconst.
  (tramp-gw-tunnel-method, tramp-gw-socks-method)
  (tramp-gw-open-connection): Set tramp-autoload cookie.
  
  * net/tramp-imap.el (top) Require just 'tramp.  Add objects to
  `tramp-methods' and `tramp-foreign-file-name-handler-alist'.  Add
  to `tramp-unload-hook'.  Change checks, whether package can be
  loaded.
  (tramp-imap-file-name-p): Make it a defsubst.
  (tramp-imap-method, tramp-imaps-method)
  (tramp-imap-file-name-handler)
  (tramp-imap-file-name-p): Set tramp-autoload cookie.
  
  * net/tramp-smb.el (top) Require just 'tramp.  Add objects to
  `tramp-methods' and `tramp-foreign-file-name-handler-alist'.  Add
  to `tramp-unload-hook'.  Change checks, whether package can be
  loaded.  Change call of `tramp-compat-decimal-to-octal' to new
  function name.
  (tramp-smb-tunnel-method): Make it a defconst.
  (tramp-smb-file-name-p): Make it a defsubst.
  (tramp-smb-method, tramp-smb-file-name-handler)
  (tramp-smb-file-name-p): Set tramp-autoload cookie.
  
  * net/tramp-uu.el (top) Add to `tramp-unload-hook'.
  (tramp-uuencode-region): Set tramp-autoload cookie.
  
  * net/trampver.el (top) Add to `tramp-unload-hook'.
  (tramp-version, tramp-bug-report-address): Set tramp-autoload
  cookie.  Update release number.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-07 18:01:23 +0000
+++ lisp/ChangeLog	2010-09-08 14:42:54 +0000
@@ -1,3 +1,116 @@
+2010-09-08  Michael Albinus  <michael.albinus@gmx.de>
+
+	Migrate to Tramp 2.2.  Rearrange load dependencies.
+	(Bug#1529, Bug#5448, Bug#5705)
+
+	* Makefile.in (TRAMP_DIR, TRAMP_SRC): New variables.
+	($(TRAMP_DIR)/tramp-loaddefs.el): New target.
+	(LOADDEFS): Add $(lisp)/net/tramp-loaddefs.el.
+
+	* net/tramp.el (top): Remove all other tramp-* loads except
+	tramp-compat.el.  Remove all changes to tramp-unload-hook for
+	other tramp-* packages.  Rearrange defun order.  Change calls of
+	`tramp-compat-call-process', `tramp-compat-decimal-to-octal',
+	`tramp-compat-octal-to-decimal' to new function names.
+	(tramp-terminal-type, tramp-initial-end-of-output)
+	(tramp-methods, tramp-foreign-file-name-handler-alist)
+	(tramp-tramp-file-p, tramp-completion-mode-p)
+	(tramp-send-command-and-check, tramp-get-remote-path)
+	(tramp-get-remote-tmpdir, tramp-get-remote-ln)
+	(tramp-shell-quote-argument): Set tramp-autoload cookie.
+	(with-file-property, with-connection-property): Move to
+	tramp-cache.el.
+	(tramp-local-call-process, tramp-decimal-to-octal)
+	(tramp-octal-to-decimal): Move to tramp-compat.el.
+	(tramp-handle-shell-command): Do not require 'shell.
+	(tramp-compute-multi-hops): No special handling for tramp-gw-*
+	symbols.
+	(tramp-unload-tramp): Do not call `tramp-unload-file-name-handlers'.
+
+	* net/tramp-cache.el (top): Require 'tramp.  Add to
+	`tramp-unload-hook'.
+	(tramp-cache-data, tramp-get-file-property)
+	(tramp-set-file-property, tramp-flush-file-property)
+	(tramp-flush-directory-property, tramp-get-connection-property)
+	(tramp-set-connection-property, tramp-flush-connection-property)
+	(tramp-cache-print, tramp-list-connections): Set tramp-autoload
+	cookie.
+	(with-file-property, with-connection-property): New defuns, moved
+	from tramp.el.
+	(tramp-flush-file-function): Use `with-parsed-tramp-file-name'
+	macro.
+
+	* net/tramp-cmds.el (top): Add to `tramp-unload-hook'.
+	(tramp-version): Set tramp-autoload cookie.
+
+	* net/tramp-compat.el (top): Require 'tramp-loaddefs.  Remove all
+	changes to tramp-unload-hook for other tramp-* packages.  Add to
+	`tramp-unload-hook'.
+	(tramp-compat-decimal-to-octal, tramp-compat-octal-to-decimal)
+	(tramp-compat-call-process): New defuns, moved from tramp.el.
+
+	* net/tramp-fish.el (top) Require just 'tramp.  Add objects to
+	`tramp-methods' and `tramp-foreign-file-name-handler-alist'.  Add
+	to `tramp-unload-hook'.  Change call of
+	`tramp-compat-decimal-to-octal' to new function name.
+	(tramp-fish-method): Make it a defconst.
+	(tramp-fish-file-name-p): Make it a defsubst.
+	(tramp-fish-method, tramp-fish-file-name-handler)
+	(tramp-fish-file-name-p): Set tramp-autoload cookie.
+
+	* net/tramp-ftp.el (top) Add objects to `tramp-methods' and
+	`tramp-foreign-file-name-handler-alist'.  Add to
+	`tramp-unload-hook'.
+	(tramp-ftp-method): Make it a defconst.
+	(tramp-ftp-file-name-p): Make it a defsubst.
+	(tramp-ftp-method, tramp-ftp-file-name-handler)
+	(tramp-ftp-file-name-p): Set tramp-autoload cookie.
+
+	* net/tramp-gvfs.el (top) Add objects to `tramp-methods' and
+	`tramp-foreign-file-name-handler-alist'.  Add to
+	`tramp-unload-hook'.  Change checks, whether package can be
+	loaded.
+	(tramp-gvfs-file-name-p): Make it a defsubst.
+	(tramp-gvfs-methods, tramp-gvfs-file-name-handler)
+	(tramp-gvfs-file-name-p): Set tramp-autoload cookie.
+	(tramp-gvfs-handle-file-directory-p): New defun.
+	(tramp-gvfs-file-name-handler-alist): Use it.
+
+	* net/tramp-gw.el (top) Add objects to `tramp-methods' and
+	`tramp-foreign-file-name-handler-alist'.  Add to
+	`tramp-unload-hook'.
+	(tramp-gw-tunnel-method, tramp-gw-default-tunnel-port)
+	(tramp-gw-socks-method, tramp-gw-default-socks-port): Make it a
+	defconst.
+	(tramp-gw-tunnel-method, tramp-gw-socks-method)
+	(tramp-gw-open-connection): Set tramp-autoload cookie.
+
+	* net/tramp-imap.el (top) Require just 'tramp.  Add objects to
+	`tramp-methods' and `tramp-foreign-file-name-handler-alist'.  Add
+	to `tramp-unload-hook'.  Change checks, whether package can be
+	loaded.
+	(tramp-imap-file-name-p): Make it a defsubst.
+	(tramp-imap-method, tramp-imaps-method)
+	(tramp-imap-file-name-handler)
+	(tramp-imap-file-name-p): Set tramp-autoload cookie.
+
+	* net/tramp-smb.el (top) Require just 'tramp.  Add objects to
+	`tramp-methods' and `tramp-foreign-file-name-handler-alist'.  Add
+	to `tramp-unload-hook'.  Change checks, whether package can be
+	loaded.  Change call of `tramp-compat-decimal-to-octal' to new
+	function name.
+	(tramp-smb-tunnel-method): Make it a defconst.
+	(tramp-smb-file-name-p): Make it a defsubst.
+	(tramp-smb-method, tramp-smb-file-name-handler)
+	(tramp-smb-file-name-p): Set tramp-autoload cookie.
+
+	* net/tramp-uu.el (top) Add to `tramp-unload-hook'.
+	(tramp-uuencode-region): Set tramp-autoload cookie.
+
+	* net/trampver.el (top) Add to `tramp-unload-hook'.
+	(tramp-version, tramp-bug-report-address): Set tramp-autoload
+	cookie.  Update release number.
+
 2010-09-07  Agustín Martín  <agustin.martin@hispalinux.es>
 
 	* textmodes/ispell.el (ispell-start-process): Make sure original

=== modified file 'lisp/Makefile.in'
--- lisp/Makefile.in	2010-08-22 21:15:20 +0000
+++ lisp/Makefile.in	2010-09-08 14:42:54 +0000
@@ -56,7 +56,8 @@
 LOADDEFS = $(lisp)/calendar/cal-loaddefs.el \
 	$(lisp)/calendar/diary-loaddefs.el \
 	$(lisp)/calendar/hol-loaddefs.el \
-	$(lisp)/mh-e/mh-loaddefs.el
+	$(lisp)/mh-e/mh-loaddefs.el \
+	$(lisp)/net/tramp-loaddefs.el
 
 # Elisp files auto-generated.
 AUTOGENEL = loaddefs.el \
@@ -329,6 +330,24 @@
 	   --eval "(setq make-backup-files nil)" \
 	   -f batch-update-autoloads $(MH_E_DIR)
 
+# Update TRAMP internal autoloads. Maybe we could move trmp*.el into
+# an own subdirectory. OTOH, it does not hurt to keep them in
+# lisp/net.
+TRAMP_DIR = $(lisp)/net
+TRAMP_SRC = $(TRAMP_DIR)/tramp.el  $(TRAMP_DIR)/tramp-cache.el  \
+	$(TRAMP_DIR)/tramp-cmds.el $(TRAMP_DIR)/tramp-compat.el \
+	$(TRAMP_DIR)/tramp-fish.el $(TRAMP_DIR)/tramp-ftp.el    \
+	$(TRAMP_DIR)/tramp-gvfs.el $(TRAMP_DIR)/tramp-gw.el     \
+	$(TRAMP_DIR)/tramp-imap.el $(TRAMP_DIR)/tramp-smb.el    \
+	$(TRAMP_DIR)/tramp-uu.el   $(TRAMP_DIR)/trampver.el
+
+$(TRAMP_DIR)/tramp-loaddefs.el: $(TRAMP_SRC)
+	$(emacs) -l autoload \
+	   --eval "(setq generate-autoload-cookie \";;;###tramp-autoload\")" \
+	   --eval "(setq generated-autoload-file \"$@\")" \
+	   --eval "(setq make-backup-files nil)" \
+	   -f batch-update-autoloads $(TRAMP_DIR)
+
 CAL_DIR = $(lisp)/calendar
 ## Those files that may contain internal calendar autoload cookies.
 ## Avoids circular dependency warning for *-loaddefs.el.

=== modified file 'lisp/net/tramp-cache.el'
--- lisp/net/tramp-cache.el	2010-08-29 16:17:13 +0000
+++ lisp/net/tramp-cache.el	2010-09-08 14:42:54 +0000
@@ -50,24 +50,12 @@
 
 ;;; Code:
 
-;; Pacify byte-compiler.
-(eval-when-compile
-  (require 'cl)
-  (autoload 'tramp-message "tramp")
-  (autoload 'tramp-tramp-file-p "tramp")
-  ;; We cannot autoload macro `with-parsed-tramp-file-name', it
-  ;; results in problems of byte-compiled code.
-  (autoload 'tramp-dissect-file-name "tramp")
-  (autoload 'tramp-file-name-method "tramp")
-  (autoload 'tramp-file-name-user "tramp")
-  (autoload 'tramp-file-name-host "tramp")
-  (autoload 'tramp-file-name-localname "tramp")
-  (autoload 'tramp-run-real-handler "tramp")
-  (autoload 'tramp-time-less-p "tramp")
-  (autoload 'time-stamp-string "time-stamp"))
+(require 'tramp)
+(autoload 'time-stamp-string "time-stamp")
 
 ;;; -- Cache --
 
+;;;###tramp-autoload
 (defvar tramp-cache-data (make-hash-table :test 'equal)
   "Hash table for remote files properties.")
 
@@ -103,6 +91,7 @@
 (defvar tramp-cache-data-changed nil
   "Whether persistent cache data have been changed.")
 
+;;;###tramp-autoload
 (defun tramp-get-file-property (vec file property default)
   "Get the PROPERTY of FILE from the cache context of VEC.
 Returns DEFAULT if not set."
@@ -130,6 +119,7 @@
     (tramp-message vec 8 "%s %s %s" file property value)
     value))
 
+;;;###tramp-autoload
 (defun tramp-set-file-property (vec file property value)
   "Set the PROPERTY of FILE to VALUE, in the cache context of VEC.
 Returns VALUE."
@@ -144,6 +134,26 @@
     (tramp-message vec 8 "%s %s %s" file property value)
     value))
 
+;;;###tramp-autoload
+(defmacro with-file-property (vec file property &rest body)
+  "Check in Tramp cache for PROPERTY, otherwise execute BODY and set cache.
+FILE must be a local file name on a connection identified via VEC."
+  `(if (file-name-absolute-p ,file)
+      (let ((value (tramp-get-file-property ,vec ,file ,property 'undef)))
+	(when (eq value 'undef)
+	  ;; We cannot pass @body as parameter to
+	  ;; `tramp-set-file-property' because it mangles our
+	  ;; debug messages.
+	  (setq value (progn ,@body))
+	  (tramp-set-file-property ,vec ,file ,property value))
+	value)
+     ,@body))
+
+(put 'with-file-property 'lisp-indent-function 3)
+(put 'with-file-property 'edebug-form-spec t)
+(font-lock-add-keywords 'emacs-lisp-mode '("\\<with-file-property\\>"))
+
+;;;###tramp-autoload
 (defun tramp-flush-file-property (vec file)
   "Remove all properties of FILE in the cache context of VEC."
   ;; Unify localname.
@@ -152,6 +162,7 @@
   (tramp-message vec 8 "%s" file)
   (remhash vec tramp-cache-data))
 
+;;;###tramp-autoload
 (defun tramp-flush-directory-property (vec directory)
   "Remove all properties of DIRECTORY in the cache context of VEC.
 Remove also properties of all files in subdirectories."
@@ -175,8 +186,7 @@
 		 (buffer-file-name)
 	       default-directory)))
     (when (tramp-tramp-file-p bfn)
-      (let* ((v (tramp-dissect-file-name bfn))
-	     (localname (tramp-file-name-localname v)))
+      (with-parsed-tramp-file-name bfn nil
 	(tramp-flush-file-property v localname)))))
 
 (add-hook 'before-revert-hook 'tramp-flush-file-function)
@@ -193,6 +203,7 @@
 
 ;;; -- Properties --
 
+;;;###tramp-autoload
 (defun tramp-get-connection-property (key property default)
   "Get the named PROPERTY for the connection.
 KEY identifies the connection, it is either a process or a vector.
@@ -209,6 +220,7 @@
     (tramp-message key 7 "%s %s" property value)
     value))
 
+;;;###tramp-autoload
 (defun tramp-set-connection-property (key property value)
   "Set the named PROPERTY of a connection to VALUE.
 KEY identifies the connection, it is either a process or a vector.
@@ -231,6 +243,23 @@
       (error nil))
     value))
 
+;;;###tramp-autoload
+(defmacro with-connection-property (key property &rest body)
+  "Check in Tramp for property PROPERTY, otherwise executes BODY and set."
+  `(let ((value (tramp-get-connection-property ,key ,property 'undef)))
+    (when (eq value 'undef)
+      ;; We cannot pass ,@body as parameter to
+      ;; `tramp-set-connection-property' because it mangles our debug
+      ;; messages.
+      (setq value (progn ,@body))
+      (tramp-set-connection-property ,key ,property value))
+    value))
+
+(put 'with-connection-property 'lisp-indent-function 2)
+(put 'with-connection-property 'edebug-form-spec t)
+(font-lock-add-keywords 'emacs-lisp-mode '("\\<with-connection-property\\>"))
+
+;;;###tramp-autoload
 (defun tramp-flush-connection-property (key)
   "Remove all properties identified by KEY.
 KEY identifies the connection, it is either a process or a vector."
@@ -251,6 +280,7 @@
   (setq tramp-cache-data-changed t)
   (remhash key tramp-cache-data))
 
+;;;###tramp-autoload
 (defun tramp-cache-print (table)
   "Print hash table TABLE."
   (when (hash-table-p table)
@@ -271,6 +301,7 @@
        table)
       result)))
 
+;;;###tramp-autoload
 (defun tramp-list-connections ()
   "Return a list of all known connection vectors according to `tramp-cache'."
     (let (result)
@@ -364,6 +395,10 @@
 	      tramp-persistency-file-name (error-message-string err))
      (clrhash tramp-cache-data))))
 
+(add-hook 'tramp-unload-hook
+	  (lambda ()
+	    (unload-feature 'tramp-cache 'force)))
+
 (provide 'tramp-cache)
 
 ;; arch-tag: ee1739b7-7628-408c-9b96-d11a74b05d26

=== modified file 'lisp/net/tramp-cmds.el'
--- lisp/net/tramp-cmds.el	2010-09-01 07:13:21 +0000
+++ lisp/net/tramp-cmds.el	2010-09-08 14:42:54 +0000
@@ -129,6 +129,7 @@
 
 ;; Tramp version is useful in a number of situations.
 
+;;;###tramp-autoload
 (defun tramp-version (arg)
   "Print version number of tramp.el in minibuffer or current buffer."
   (interactive "P")
@@ -387,6 +388,9 @@
 
 (defalias 'tramp-submit-bug 'tramp-bug)
 
+(add-hook 'tramp-unload-hook
+	  (lambda () (unload-feature 'tramp-cmds 'force)))
+
 (provide 'tramp-cmds)
 
 ;;; TODO:
@@ -395,7 +399,7 @@
 ;; * WIBNI there was an interactive command prompting for Tramp
 ;;   method, hostname, username and filename and translates the user
 ;;   input into the correct filename syntax (depending on the Emacs
-;;   flavor) (Reiner Steib)
+;;   flavor)  (Reiner Steib)
 ;; * Let the user edit the connection properties interactively.
 ;;   Something like `gnus-server-edit-server' in Gnus' *Server* buffer.
 ;; * It's just that when I come to Customize `tramp-default-user-alist'
@@ -404,7 +408,7 @@
 ;;   Option and should not be modified by the code.  add-to-list is
 ;;   called in several places. One way to handle that is to have a new
 ;;   ordinary variable that gets its initial value from
-;;   tramp-default-user-alist and then is added to. (Pete Forman)
+;;   tramp-default-user-alist and then is added to.  (Pete Forman)
 
 ;; arch-tag: 190d4c33-76bb-4e99-8b6f-71741f23d98c
 ;;; tramp-cmds.el ends here

=== modified file 'lisp/net/tramp-compat.el'
--- lisp/net/tramp-compat.el	2010-09-01 07:13:21 +0000
+++ lisp/net/tramp-compat.el	2010-09-08 14:42:54 +0000
@@ -29,6 +29,8 @@
 
 ;;; Code:
 
+(require 'tramp-loaddefs)
+
 (eval-when-compile
 
   ;; Pacify byte-compiler.
@@ -43,33 +45,20 @@
       (require 'timer-funcs)
     (require 'timer))
 
-  (autoload 'tramp-tramp-file-p "tramp")
-  (autoload 'tramp-file-name-handler "tramp")
-
   ;; We check whether `start-file-process' is bound.
   (unless (fboundp 'start-file-process)
 
     ;; tramp-util offers integration into other (X)Emacs packages like
     ;; compile.el, gud.el etc.  Not necessary in Emacs 23.
     (eval-after-load "tramp"
-      '(progn
-	 (require 'tramp-util)
-	 (add-hook 'tramp-unload-hook
-		   '(lambda ()
-		      (when (featurep 'tramp-util)
-			(unload-feature 'tramp-util 'force))))))
+      '(require 'tramp-util))
 
     ;; Make sure that we get integration with the VC package.  When it
     ;; is loaded, we need to pull in the integration module.  Not
     ;; necessary in Emacs 23.
     (eval-after-load "vc"
       (eval-after-load "tramp"
-	'(progn
-	   (require 'tramp-vc)
-	   (add-hook 'tramp-unload-hook
-		     '(lambda ()
-			(when (featurep 'tramp-vc)
-			  (unload-feature 'tramp-vc 'force))))))))
+	'(require 'tramp-vc))))
 
   ;; Avoid byte-compiler warnings if the byte-compiler supports this.
   ;; Currently, XEmacs supports this.
@@ -263,6 +252,24 @@
    ;; Default value in XEmacs.
    (t 134217727)))
 
+(defun tramp-compat-decimal-to-octal (i)
+  "Return a string consisting of the octal digits of I.
+Not actually used.  Use `(format \"%o\" i)' instead?"
+  (cond ((< i 0) (error "Cannot convert negative number to octal"))
+        ((not (integerp i)) (error "Cannot convert non-integer to octal"))
+        ((zerop i) "0")
+        (t (concat (tramp-compat-decimal-to-octal (/ i 8))
+                   (number-to-string (% i 8))))))
+
+;; Kudos to Gerd Moellmann for this suggestion.
+(defun tramp-compat-octal-to-decimal (ostr)
+  "Given a string of octal digits, return a decimal number."
+  (let ((x (or ostr "")))
+    ;; `save-match' is in `tramp-mode-string-to-int' which calls this.
+    (unless (string-match "\\`[0-7]*\\'" x)
+      (error "Non-octal junk in string `%s'" x))
+    (string-to-number ostr 8)))
+
 ;; ID-FORMAT does not exists in XEmacs.
 (defun tramp-compat-file-attributes (filename &optional id-format)
   "Like `file-attributes' for Tramp files (compat function)."
@@ -397,6 +404,20 @@
 element is not omitted."
   (delete "" (split-string string pattern)))
 
+(defun tramp-compat-call-process
+  (program &optional infile destination display &rest args)
+  "Calls `call-process' on the local host.
+This is needed because for some Emacs flavors Tramp has
+defadviced `call-process' to behave like `process-file'.  The
+Lisp error raised when PROGRAM is nil is trapped also, returning 1."
+  (let ((default-directory
+	  (if (file-remote-p default-directory)
+	      (tramp-compat-temporary-file-directory)
+	    default-directory)))
+    (if (executable-find program)
+	(apply 'call-process program infile destination display args)
+      1)))
+
 (defun tramp-compat-process-running-p (process-name)
   "Returns `t' if system process PROCESS-NAME is running for `user-login-name'."
   (when (stringp process-name)
@@ -439,6 +460,10 @@
 	  (setenv "UNIX95" unix95)
 	  result)))))
 
+(add-hook 'tramp-unload-hook
+	  (lambda ()
+	    (unload-feature 'tramp-compat 'force)))
+
 (provide 'tramp-compat)
 
 ;;; TODO:

=== modified file 'lisp/net/tramp-fish.el'
--- lisp/net/tramp-fish.el	2010-09-01 07:13:21 +0000
+++ lisp/net/tramp-fish.el	2010-09-08 14:42:54 +0000
@@ -157,16 +157,14 @@
   (require 'cl))
 
 (require 'tramp)
-(require 'tramp-cache)
-(require 'tramp-compat)
 
 ;; Define FISH method ...
-(defcustom tramp-fish-method "fish"
-  "*Method to connect via FISH protocol."
-  :group 'tramp
-  :type 'string)
+;;;###tramp-autoload
+(defconst tramp-fish-method "fish"
+  "*Method to connect via FISH protocol.")
 
 ;; ... and add it to the method list.
+;;;###tramp-autoload
 (add-to-list 'tramp-methods (cons tramp-fish-method nil))
 
 ;; Add a default for `tramp-default-user-alist'. Default is the local user.
@@ -264,11 +262,13 @@
   "Alist of handler functions for Tramp FISH method.
 Operations not mentioned here will be handled by the default Emacs primitives.")
 
-(defun tramp-fish-file-name-p (filename)
+;;;###tramp-autoload
+(defsubst tramp-fish-file-name-p (filename)
   "Check if it's a filename for FISH protocol."
   (let ((v (tramp-dissect-file-name filename)))
     (string= (tramp-file-name-method v) tramp-fish-method)))
 
+;;;###tramp-autoload
 (defun tramp-fish-file-name-handler (operation &rest args)
   "Invoke the FISH related OPERATION.
 First arg specifies the OPERATION, second arg is a list of arguments to
@@ -278,6 +278,7 @@
 	(save-match-data (apply (cdr fn) args))
       (tramp-run-real-handler operation args))))
 
+;;;###tramp-autoload
 (add-to-list 'tramp-foreign-file-name-handler-alist
 	     (cons 'tramp-fish-file-name-p 'tramp-fish-file-name-handler))
 
@@ -688,7 +689,7 @@
     (tramp-flush-file-property v localname)
     (unless (tramp-fish-send-command-and-check
 	     v (format "#CHMOD %s %s"
-		       (tramp-decimal-to-octal mode)
+		       (tramp-compat-decimal-to-octal mode)
 		       (tramp-shell-quote-argument localname)))
       (tramp-error
        v 'file-error "Error while changing file's mode %s" filename))))
@@ -1170,6 +1171,10 @@
     (goto-char (point-min))
     (looking-at tramp-fish-ok-prompt-regexp)))
 
+(add-hook 'tramp-unload-hook
+	  (lambda ()
+	    (unload-feature 'tramp-fish 'force)))
+
 (provide 'tramp-fish)
 ;
 ;;;; TODO:

=== modified file 'lisp/net/tramp-ftp.el'
--- lisp/net/tramp-ftp.el	2010-09-01 07:13:21 +0000
+++ lisp/net/tramp-ftp.el	2010-09-08 14:42:54 +0000
@@ -30,7 +30,6 @@
 ;;; Code:
 
 (require 'tramp)
-(autoload 'tramp-set-connection-property "tramp-cache")
 
 (eval-when-compile
 
@@ -99,13 +98,14 @@
 (add-hook 'tramp-ftp-unload-hook 'tramp-ftp-enable-ange-ftp)
 
 ;; Define FTP method ...
-(defcustom tramp-ftp-method "ftp"
-  "*When this method name is used, forward all calls to Ange-FTP."
-  :group 'tramp
-  :type 'string)
+;;;###tramp-autoload
+(defconst tramp-ftp-method "ftp"
+  "*When this method name is used, forward all calls to Ange-FTP.")
 
 ;; ... and add it to the method list.
-(add-to-list 'tramp-methods (cons tramp-ftp-method nil))
+;;;###tramp-autoload
+(unless (featurep 'xemacs)
+  (add-to-list 'tramp-methods (cons tramp-ftp-method nil)))
 
 ;; Add some defaults for `tramp-default-method-alist'
 (add-to-list 'tramp-default-method-alist
@@ -129,6 +129,7 @@
 				       (symbol-plist
 					'substitute-in-file-name))))))
 
+;;;###tramp-autoload
 (defun tramp-ftp-file-name-handler (operation &rest args)
   "Invoke the Ange-FTP handler for OPERATION.
 First arg specifies the OPERATION, second arg is a list of arguments to
@@ -199,13 +200,20 @@
 		 (inhibit-file-name-operation operation))
 	    (apply 'ange-ftp-hook-function operation args)))))))
 
-(defun tramp-ftp-file-name-p (filename)
+;;;###tramp-autoload
+(defsubst tramp-ftp-file-name-p (filename)
   "Check if it's a filename that should be forwarded to Ange-FTP."
   (let ((v (tramp-dissect-file-name filename)))
     (string= (tramp-file-name-method v) tramp-ftp-method)))
 
-(add-to-list 'tramp-foreign-file-name-handler-alist
-	     (cons 'tramp-ftp-file-name-p 'tramp-ftp-file-name-handler))
+;;;###tramp-autoload
+(unless (featurep 'xemacs)
+  (add-to-list 'tramp-foreign-file-name-handler-alist
+	       (cons 'tramp-ftp-file-name-p 'tramp-ftp-file-name-handler)))
+
+(add-hook 'tramp-unload-hook
+	  (lambda ()
+	    (unload-feature 'tramp-ftp 'force)))
 
 (provide 'tramp-ftp)
 

=== modified file 'lisp/net/tramp-gvfs.el'
--- lisp/net/tramp-gvfs.el	2010-09-01 07:13:21 +0000
+++ lisp/net/tramp-gvfs.el	2010-09-08 14:42:54 +0000
@@ -108,6 +108,7 @@
 (require 'url-util)
 (require 'zeroconf)
 
+;;;###tramp-autoload
 (defcustom tramp-gvfs-methods '("dav" "davs" "obex" "synce")
   "*List of methods for remote files, accessed with GVFS."
   :group 'tramp
@@ -133,11 +134,11 @@
 
 ;; Add the methods to `tramp-methods', in order to allow minibuffer
 ;; completion.
-(eval-after-load "tramp-gvfs"
-  '(when (featurep 'tramp-gvfs)
-     (dolist (elt tramp-gvfs-methods)
-       (unless (assoc elt tramp-methods)
-	 (add-to-list 'tramp-methods (cons elt nil))))))
+;;;###tramp-autoload
+(when (featurep 'dbusbind)
+  (dolist (elt tramp-gvfs-methods)
+    (unless (assoc elt tramp-methods)
+      (add-to-list 'tramp-methods (cons elt nil)))))
 
 (defconst tramp-gvfs-path-tramp (concat dbus-path-emacs "/Tramp")
   "The preceeding object path for own objects.")
@@ -145,9 +146,12 @@
 (defconst tramp-gvfs-service-daemon "org.gtk.vfs.Daemon"
   "The well known name of the GVFS daemon.")
 
-;; Check that GVFS is available.
-(unless (dbus-ping :session tramp-gvfs-service-daemon 100)
-  (throw 'tramp-loading nil))
+;; Check that GVFS is available.  D-Bus integration is available since
+;; Emacs 23 on some system types.  We don't call `dbus-ping', because
+;; this would load dbus.el.
+(unless (and (tramp-compat-funcall 'dbus-get-unique-name :session)
+	     (tramp-compat-process-running-p "gvfs-fuse-daemon"))
+  (error "Package `tramp-gvfs' not supported"))
 
 (defconst tramp-gvfs-path-mounttracker "/org/gtk/vfs/mounttracker"
   "The object path of the GVFS daemon.")
@@ -385,7 +389,7 @@
     (expand-file-name . tramp-gvfs-handle-expand-file-name)
     ;; `file-accessible-directory-p' performed by default handler.
     (file-attributes . tramp-gvfs-handle-file-attributes)
-    (file-directory-p . tramp-smb-handle-file-directory-p)
+    (file-directory-p . tramp-gvfs-handle-file-directory-p)
     (file-executable-p . tramp-gvfs-handle-file-executable-p)
     (file-exists-p . tramp-gvfs-handle-file-exists-p)
     (file-local-copy . tramp-gvfs-handle-file-local-copy)
@@ -431,13 +435,15 @@
   "Alist of handler functions for Tramp GVFS method.
 Operations not mentioned here will be handled by the default Emacs primitives.")
 
-(defun tramp-gvfs-file-name-p (filename)
+;;;###tramp-autoload
+(defsubst tramp-gvfs-file-name-p (filename)
   "Check if it's a filename handled by the GVFS daemon."
   (and (tramp-tramp-file-p filename)
        (let ((method
 	      (tramp-file-name-method (tramp-dissect-file-name filename))))
 	 (and (stringp method) (member method tramp-gvfs-methods)))))
 
+;;;###tramp-autoload
 (defun tramp-gvfs-file-name-handler (operation &rest args)
   "Invoke the GVFS related OPERATION.
 First arg specifies the OPERATION, second arg is a list of arguments to
@@ -449,8 +455,10 @@
 
 ;; This might be moved to tramp.el.  It shall be the first file name
 ;; handler.
-(add-to-list 'tramp-foreign-file-name-handler-alist
-	     (cons 'tramp-gvfs-file-name-p 'tramp-gvfs-file-name-handler))
+;;;###tramp-autoload
+(when (featurep 'dbusbind)
+  (add-to-list 'tramp-foreign-file-name-handler-alist
+	       (cons 'tramp-gvfs-file-name-p 'tramp-gvfs-file-name-handler)))
 
 (defun tramp-gvfs-stringify-dbus-message (message)
   "Convert a D-Bus message into readable UTF8 strings, used for traces."
@@ -494,7 +502,7 @@
   `(let ((fuse-file-name  (regexp-quote (tramp-gvfs-fuse-file-name ,filename)))
 	 elt)
      (condition-case err
-	 (funcall ,handler ,@args)
+	 (tramp-compat-funcall ,handler ,@args)
        (error
 	(setq elt (cdr err))
 	(while elt
@@ -647,6 +655,10 @@
   "Like `file-attributes' for Tramp files."
   (file-attributes (tramp-gvfs-fuse-file-name filename) id-format))
 
+(defun tramp-gvfs-handle-file-directory-p (filename)
+  "Like `file-directory-p' for Tramp files."
+  (file-directory-p (tramp-gvfs-fuse-file-name filename)))
+
 (defun tramp-gvfs-handle-file-executable-p (filename)
   "Like `file-executable-p' for Tramp files."
   (file-executable-p (tramp-gvfs-fuse-file-name filename)))
@@ -1403,6 +1415,10 @@
 (tramp-set-completion-function
  "synce" '((tramp-synce-parse-device-names "")))
 
+(add-hook 'tramp-unload-hook
+	  (lambda ()
+	    (unload-feature 'tramp-gvfs 'force)))
+
 (provide 'tramp-gvfs)
 
 ;;; TODO:

=== modified file 'lisp/net/tramp-gw.el'
--- lisp/net/tramp-gw.el	2010-08-29 16:17:13 +0000
+++ lisp/net/tramp-gw.el	2010-09-08 14:42:54 +0000
@@ -38,11 +38,6 @@
   (require 'cl)
   (require 'custom))
 
-;; Autoload the socks library.  It is used only when we access a SOCKS server.
-(autoload 'socks-open-network-stream "socks")
-(defvar socks-username (user-login-name))
-(defvar socks-server (list "Default server" "socks" 1080 5))
-
 ;; Avoid byte-compiler warnings if the byte-compiler supports this.
 ;; Currently, XEmacs supports this.
 (eval-when-compile
@@ -50,21 +45,29 @@
       (byte-compiler-options (warnings (- unused-vars)))))
 
 ;; Define HTTP tunnel method ...
-(defvar tramp-gw-tunnel-method "tunnel"
+;;;###tramp-autoload
+(defconst tramp-gw-tunnel-method "tunnel"
   "*Method to connect HTTP gateways.")
 
 ;; ... and port.
-(defvar tramp-gw-default-tunnel-port 8080
+(defconst tramp-gw-default-tunnel-port 8080
   "*Default port for HTTP gateways.")
 
 ;; Define SOCKS method ...
-(defvar tramp-gw-socks-method "socks"
+;;;###tramp-autoload
+(defconst tramp-gw-socks-method "socks"
   "*Method to connect SOCKS servers.")
 
 ;; ... and port.
-(defvar tramp-gw-default-socks-port 1080
+(defconst tramp-gw-default-socks-port 1080
   "*Default port for SOCKS servers.")
 
+;; Autoload the socks library.  It is used only when we access a SOCKS server.
+(autoload 'socks-open-network-stream "socks")
+(defvar socks-username (user-login-name))
+(defvar socks-server
+  (list "Default server" "socks" tramp-gw-default-socks-port 5))
+
 ;; Add a default for `tramp-default-user-alist'.  Default is the local user.
 (add-to-list 'tramp-default-user-alist
 	     `(,tramp-gw-tunnel-method nil ,(user-login-name)))
@@ -125,6 +128,7 @@
     (process-send-string
      (tramp-get-connection-property proc "process" nil) string)))
 
+;;;###tramp-autoload
 (defun tramp-gw-open-connection (vec gw-vec target-vec)
   "Open a remote connection to VEC (see `tramp-file-name' structure).
 Take GW-VEC as SOCKS or HTTP gateway, i.e. its method must be a
@@ -310,6 +314,9 @@
 	(format
 	 "Password for %s@[%s]: " socks-username (read (current-buffer)))))))))
 
+(add-hook 'tramp-unload-hook
+	  (lambda ()
+	    (unload-feature 'tramp-gw 'force)))
 
 (provide 'tramp-gw)
 

=== modified file 'lisp/net/tramp-imap.el'
--- lisp/net/tramp-imap.el	2010-09-01 07:13:21 +0000
+++ lisp/net/tramp-imap.el	2010-09-08 14:42:54 +0000
@@ -55,7 +55,6 @@
 
 (require 'assoc)
 (require 'tramp)
-(require 'tramp-compat)
 
 (autoload 'auth-source-user-or-password "auth-source")
 (autoload 'epg-context-operation "epg")
@@ -76,21 +75,29 @@
   '(add-to-list 'imap-hash-headers 'X-Size 'append))
 
 ;; Define Tramp IMAP method ...
+;;;###tramp-autoload
 (defconst tramp-imap-method "imap"
   "*Method to connect via IMAP protocol.")
 
-(add-to-list 'tramp-methods (list tramp-imap-method '(tramp-default-port 143)))
+;;;###tramp-autoload
+(when (and (locate-library "epa") (locate-library "imap-hash"))
+  (add-to-list 'tramp-methods
+	       (list tramp-imap-method '(tramp-default-port 143))))
 
 ;; Add a default for `tramp-default-user-alist'.  Default is the local user.
 (add-to-list 'tramp-default-user-alist
 	     `(,tramp-imap-method nil ,(user-login-name)))
 
 ;; Define Tramp IMAPS method ...
+;;;###tramp-autoload
 (defconst tramp-imaps-method "imaps"
   "*Method to connect via secure IMAP protocol.")
 
 ;; ... and add it to the method list.
-(add-to-list 'tramp-methods (list tramp-imaps-method '(tramp-default-port 993)))
+;;;###tramp-autoload
+(when (and (locate-library "epa") (locate-library "imap-hash"))
+  (add-to-list 'tramp-methods
+	       (list tramp-imaps-method '(tramp-default-port 993))))
 
 ;; Add a default for `tramp-default-user-alist'.  Default is the local user.
 (add-to-list 'tramp-default-user-alist
@@ -184,13 +191,15 @@
 (defvar tramp-imap-passphrase-cache nil) ;; can be t or 'never
 (defvar tramp-imap-passphrase nil)
 
-(defun tramp-imap-file-name-p (filename)
+;;;###tramp-autoload
+(defsubst tramp-imap-file-name-p (filename)
   "Check if it's a filename for IMAP protocol."
   (let ((v (tramp-dissect-file-name filename)))
     (or
      (string= (tramp-file-name-method v) tramp-imap-method)
      (string= (tramp-file-name-method v) tramp-imaps-method))))
 
+;;;###tramp-autoload
 (defun tramp-imap-file-name-handler (operation &rest args)
   "Invoke the IMAP related OPERATION.
 First arg specifies the OPERATION, second arg is a list of arguments to
@@ -200,8 +209,10 @@
 	(save-match-data (apply (cdr fn) args))
       (tramp-run-real-handler operation args))))
 
-(add-to-list 'tramp-foreign-file-name-handler-alist
-	     (cons 'tramp-imap-file-name-p 'tramp-imap-file-name-handler))
+;;;###tramp-autoload
+(when (and (locate-library "epa") (locate-library "imap-hash"))
+  (add-to-list 'tramp-foreign-file-name-handler-alist
+	       (cons 'tramp-imap-file-name-p 'tramp-imap-file-name-handler)))
 
 (defun tramp-imap-handle-copy-file
   (filename newname &optional ok-if-already-exists keep-date
@@ -776,6 +787,10 @@
 		   tramp-imap-subject-marker
 		   (if needed-subject needed-subject "")))))
 
+(add-hook 'tramp-unload-hook
+	  (lambda ()
+	      (unload-feature 'tramp-imap 'force)))
+
 ;;; TODO:
 
 ;; * Implement `tramp-imap-handle-delete-directory',

=== modified file 'lisp/net/tramp-smb.el'
--- lisp/net/tramp-smb.el	2010-09-01 07:13:21 +0000
+++ lisp/net/tramp-smb.el	2010-09-08 14:42:54 +0000
@@ -30,17 +30,16 @@
 
 (eval-when-compile (require 'cl))	; block, return
 (require 'tramp)
-(require 'tramp-cache)
-(require 'tramp-compat)
 
 ;; Define SMB method ...
-(defcustom tramp-smb-method "smb"
-  "*Method to connect SAMBA and M$ SMB servers."
-  :group 'tramp
-  :type 'string)
+;;;###tramp-autoload
+(defconst tramp-smb-method "smb"
+  "*Method to connect SAMBA and M$ SMB servers.")
 
 ;; ... and add it to the method list.
-(add-to-list 'tramp-methods (cons tramp-smb-method nil))
+;;;###tramp-autoload
+(unless (memq system-type '(cygwin windows-nt))
+  (add-to-list 'tramp-methods (cons tramp-smb-method nil)))
 
 ;; Add a default for `tramp-default-method-alist'. Rule: If there is
 ;; a domain in USER, it must be the SMB method.
@@ -205,11 +204,13 @@
   "Alist of handler functions for Tramp SMB method.
 Operations not mentioned here will be handled by the default Emacs primitives.")
 
-(defun tramp-smb-file-name-p (filename)
+;;;###tramp-autoload
+(defsubst tramp-smb-file-name-p (filename)
   "Check if it's a filename for SMB servers."
   (let ((v (tramp-dissect-file-name filename)))
     (string= (tramp-file-name-method v) tramp-smb-method)))
 
+;;;###tramp-autoload
 (defun tramp-smb-file-name-handler (operation &rest args)
   "Invoke the SMB related OPERATION.
 First arg specifies the OPERATION, second arg is a list of arguments to
@@ -219,8 +220,10 @@
 	(save-match-data (apply (cdr fn) args))
       (tramp-run-real-handler operation args))))
 
-(add-to-list 'tramp-foreign-file-name-handler-alist
-	     (cons 'tramp-smb-file-name-p 'tramp-smb-file-name-handler))
+;;;###tramp-autoload
+(unless (memq system-type '(cygwin windows-nt))
+  (add-to-list 'tramp-foreign-file-name-handler-alist
+	       (cons 'tramp-smb-file-name-p 'tramp-smb-file-name-handler)))
 
 
 ;; File name primitives.
@@ -784,7 +787,7 @@
 	   (if (tramp-smb-get-cifs-capabilities v)
 	       (format
 		"posix_mkdir \"%s\" %s"
-		file (tramp-decimal-to-octal (default-file-modes)))
+		file (tramp-compat-decimal-to-octal (default-file-modes)))
 	     (format "mkdir \"%s\"" file)))
 	  ;; We must also flush the cache of the directory, because
 	  ;; `file-attributes' reads the values from there.
@@ -893,7 +896,7 @@
       (unless (tramp-smb-send-command
 	       v (format "chmod \"%s\" %s"
 			 (tramp-smb-get-localname v)
-			 (tramp-decimal-to-octal mode)))
+			 (tramp-compat-decimal-to-octal mode)))
 	(tramp-error
 	 v 'file-error "Error while changing file's mode %s" filename)))))
 
@@ -1397,6 +1400,9 @@
       (tramp-message vec 6 "\n%s" (buffer-string))
       (not err))))
 
+(add-hook 'tramp-unload-hook
+	  (lambda ()
+	    (unload-feature 'tramp-smb 'force)))
 
 (provide 'tramp-smb)
 

=== modified file 'lisp/net/tramp-uu.el'
--- lisp/net/tramp-uu.el	2010-09-01 07:13:21 +0000
+++ lisp/net/tramp-uu.el	2010-09-08 14:42:54 +0000
@@ -50,6 +50,7 @@
   "Return the byte that is encoded as CHAR."
   (cdr (assq char tramp-uu-b64-char-to-byte)))
 
+;;;###tramp-autoload
 (defun tramp-uuencode-region (beg end)
   "UU-encode the region between BEG and END."
   ;; First we base64 encode the region, then we transmogrify that into
@@ -87,6 +88,10 @@
       (goto-char beg)
       (insert "begin 600 xxx\n"))))
 
+(add-hook 'tramp-unload-hook
+	  (lambda ()
+	    (unload-feature 'tramp-uu 'force)))
+
 (provide 'tramp-uu)
 
 ;; arch-tag: 7153f2c6-8be5-4cd2-8c06-0fbcf5190ef6

=== modified file 'lisp/net/tramp.el'
--- lisp/net/tramp.el	2010-09-01 07:13:21 +0000
+++ lisp/net/tramp.el	2010-09-08 14:42:54 +0000
@@ -8,6 +8,7 @@
 ;; Author: Kai Großjohann <kai.grossjohann@gmx.net>
 ;;         Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes
+;; Package: tramp
 
 ;; This file is part of GNU Emacs.
 
@@ -66,18 +67,7 @@
 (when (and load-in-progress (null (current-message)))
   (message "Loading tramp..."))
 
-;; The Tramp version number and bug report address, as prepared by configure.
-(require 'trampver)
-(add-hook 'tramp-unload-hook
-	  (lambda ()
-	    (when (featurep 'trampver)
-	      (unload-feature 'trampver 'force))))
-
 (require 'tramp-compat)
-(add-hook 'tramp-unload-hook
-	  (lambda ()
-	    (when (featurep 'tramp-compat)
-	      (unload-feature 'tramp-compat 'force))))
 
 (require 'format-spec)
 ;; As long as password.el is not part of (X)Emacs, it shouldn't
@@ -95,82 +85,8 @@
       (load "auth-source" 'noerror)
     (require 'auth-source nil 'noerror)))
 
-;; Requiring 'tramp-cache results in an endless loop.
-(autoload 'tramp-get-file-property "tramp-cache")
-(autoload 'tramp-set-file-property "tramp-cache")
-(autoload 'tramp-flush-file-property "tramp-cache")
-(autoload 'tramp-flush-directory-property "tramp-cache")
-(autoload 'tramp-get-connection-property "tramp-cache")
-(autoload 'tramp-set-connection-property "tramp-cache")
-(autoload 'tramp-flush-connection-property "tramp-cache")
-(autoload 'tramp-parse-connection-properties "tramp-cache")
-(add-hook 'tramp-unload-hook
-	  (lambda ()
-	    (when (featurep 'tramp-cache)
-	      (unload-feature 'tramp-cache 'force))))
-
-(autoload 'tramp-uuencode-region "tramp-uu"
-  "Implementation of `uuencode' in Lisp.")
-(add-hook 'tramp-unload-hook
-	  (lambda ()
-	    (when (featurep 'tramp-uu)
-	      (unload-feature 'tramp-uu 'force))))
-
 (autoload 'uudecode-decode-region "uudecode")
 
-;; The following Tramp packages must be loaded after tramp.el, because
-;; they require it as well.
-(eval-after-load "tramp"
-  '(dolist
-       (feature
-	(list
-
-	 ;; Tramp interactive commands.
-	 'tramp-cmds
-
-	 ;; Load foreign FTP method.
-	 (if (featurep 'xemacs) 'tramp-efs 'tramp-ftp)
-
-	 ;; tramp-smb uses "smbclient" from Samba.  Not available
-	 ;; under Cygwin and Windows, because they don't offer
-	 ;; "smbclient".  And even not necessary there, because Emacs
-	 ;; supports UNC file names like "//host/share/localname".
-	 (unless (memq system-type '(cygwin windows-nt)) 'tramp-smb)
-
-	 ;; Load foreign FISH method.
-	 'tramp-fish
-
-	 ;; tramp-gvfs needs D-Bus messages.  Available since Emacs 23
-	 ;; on some system types.  We don't call `dbus-ping', because
-	 ;; this would load dbus.el.
-	 (when (and (featurep 'dbusbind)
-		    (condition-case nil
-			(tramp-compat-funcall 'dbus-get-unique-name :session)
-		      (error nil))
-		    (tramp-compat-process-running-p "gvfs-fuse-daemon"))
-	   'tramp-gvfs)
-
-	 ;; Load gateways.  It needs `make-network-process' from Emacs 22.
-	 (when (functionp 'make-network-process) 'tramp-gw)
-
-	 ;; tramp-imap needs both epa (from Emacs 23.1) and imap-hash
-	 ;; (from Emacs 23.2).
-	 (when (and (locate-library "epa") (locate-library "imap-hash"))
-	   'tramp-imap)))
-
-     (when feature
-       ;; We have used just some basic tests, whether a package shall
-       ;; be added.  There might still be other errors during loading,
-       ;; which we will catch here.
-       (catch 'tramp-loading
-	 (require feature)
-	 (add-hook 'tramp-unload-hook
-		   `(lambda ()
-		      (when (featurep (quote ,feature))
-			(unload-feature (quote ,feature) 'force)))))
-       (unless (featurep feature)
-	 (message "Loading %s failed, ignoring this package" feature)))))
-
 ;;; User Customizable Internal Variables:
 
 (defgroup tramp nil
@@ -300,6 +216,7 @@
   :group 'tramp
   :type '(choice (const nil) integer))
 
+;;;###tramp-autoload
 (defcustom tramp-terminal-type "dumb"
   "*Value of TERM environment variable for logging in to remote host.
 Because Tramp wants to parse the output of the remote shell, it is easily
@@ -320,9 +237,11 @@
 The '$' character at the end is quoted; the string cannot be
 detected as prompt when being sent on echoing hosts, therefore.")
 
+;;;###tramp-autoload
 (defconst tramp-initial-end-of-output "#$ "
   "Prompt when establishing a connection.")
 
+;;;###tramp-autoload
 (defvar tramp-methods
   `(("rcp"   (tramp-login-program        "rsh")
              (tramp-login-args           (("%h") ("-l" "%u")))
@@ -2097,6 +2016,7 @@
 normal Emacs functions.")
 
 ;; Handlers for foreign methods, like FTP or SMB, shall be plugged here.
+;;;###tramp-autoload
 (defvar tramp-foreign-file-name-handler-alist
   ;; (identity . tramp-sh-file-name-handler) should always be the last
   ;; entry, because `identity' always matches.
@@ -2107,6 +2027,257 @@
 
 ;;; Internal functions which must come first:
 
+
+;; ------------------------------------------------------------
+;; -- Tramp file names --
+;; ------------------------------------------------------------
+;; Conversion functions between external representation and
+;; internal data structure.  Convenience functions for internal
+;; data structure.
+
+(defun tramp-file-name-p (vec)
+  "Check, whether VEC is a Tramp object."
+  (and (vectorp vec) (= 4 (length vec))))
+
+(defun tramp-file-name-method (vec)
+  "Return method component of VEC."
+  (and (tramp-file-name-p vec) (aref vec 0)))
+
+(defun tramp-file-name-user (vec)
+  "Return user component of VEC."
+  (and (tramp-file-name-p vec) (aref vec 1)))
+
+(defun tramp-file-name-host (vec)
+  "Return host component of VEC."
+  (and (tramp-file-name-p vec) (aref vec 2)))
+
+(defun tramp-file-name-localname (vec)
+  "Return localname component of VEC."
+  (and (tramp-file-name-p vec) (aref vec 3)))
+
+;; The user part of a Tramp file name vector can be of kind
+;; "user%domain".  Sometimes, we must extract these parts.
+(defun tramp-file-name-real-user (vec)
+  "Return the user name of VEC without domain."
+  (save-match-data
+    (let ((user (tramp-file-name-user vec)))
+      (if (and (stringp user)
+	       (string-match tramp-user-with-domain-regexp user))
+	  (match-string 1 user)
+	user))))
+
+(defun tramp-file-name-domain (vec)
+  "Return the domain name of VEC."
+  (save-match-data
+    (let ((user (tramp-file-name-user vec)))
+      (and (stringp user)
+	   (string-match tramp-user-with-domain-regexp user)
+	   (match-string 2 user)))))
+
+;; The host part of a Tramp file name vector can be of kind
+;; "host#port".  Sometimes, we must extract these parts.
+(defun tramp-file-name-real-host (vec)
+  "Return the host name of VEC without port."
+  (save-match-data
+    (let ((host (tramp-file-name-host vec)))
+      (if (and (stringp host)
+	       (string-match tramp-host-with-port-regexp host))
+	  (match-string 1 host)
+	host))))
+
+(defun tramp-file-name-port (vec)
+  "Return the port number of VEC."
+  (save-match-data
+    (let ((host (tramp-file-name-host vec)))
+      (and (stringp host)
+	   (string-match tramp-host-with-port-regexp host)
+	   (string-to-number (match-string 2 host))))))
+
+;;;###tramp-autoload
+(defun tramp-tramp-file-p (name)
+  "Return t if NAME is a string with Tramp file name syntax."
+  (save-match-data
+    (and (stringp name) (string-match tramp-file-name-regexp name))))
+
+(defun tramp-find-method (method user host)
+  "Return the right method string to use.
+This is METHOD, if non-nil. Otherwise, do a lookup in
+`tramp-default-method-alist'."
+  (or method
+      (let ((choices tramp-default-method-alist)
+	    lmethod item)
+	(while choices
+	  (setq item (pop choices))
+	  (when (and (string-match (or (nth 0 item) "") (or host ""))
+		     (string-match (or (nth 1 item) "") (or user "")))
+	    (setq lmethod (nth 2 item))
+	    (setq choices nil)))
+	lmethod)
+      tramp-default-method))
+
+(defun tramp-find-user (method user host)
+  "Return the right user string to use.
+This is USER, if non-nil. Otherwise, do a lookup in
+`tramp-default-user-alist'."
+  (or user
+      (let ((choices tramp-default-user-alist)
+	    luser item)
+	(while choices
+	  (setq item (pop choices))
+	  (when (and (string-match (or (nth 0 item) "") (or method ""))
+		     (string-match (or (nth 1 item) "") (or host "")))
+	    (setq luser (nth 2 item))
+	    (setq choices nil)))
+	luser)
+      tramp-default-user))
+
+(defun tramp-find-host (method user host)
+  "Return the right host string to use.
+This is HOST, if non-nil. Otherwise, it is `tramp-default-host'."
+  (or (and (> (length host) 0) host)
+      tramp-default-host))
+
+(defun tramp-dissect-file-name (name &optional nodefault)
+  "Return a `tramp-file-name' structure.
+The structure consists of remote method, remote user, remote host
+and localname (file name on remote host).  If NODEFAULT is
+non-nil, the file name parts are not expanded to their default
+values."
+  (save-match-data
+    (let ((match (string-match (nth 0 tramp-file-name-structure) name)))
+      (unless match (error "Not a Tramp file name: %s" name))
+      (let ((method    (match-string (nth 1 tramp-file-name-structure) name))
+	    (user      (match-string (nth 2 tramp-file-name-structure) name))
+	    (host      (match-string (nth 3 tramp-file-name-structure) name))
+	    (localname (match-string (nth 4 tramp-file-name-structure) name)))
+	(when (member method '("multi" "multiu"))
+	  (error
+	   "`%s' method is no longer supported, see (info \"(tramp)Multi-hops\")"
+	   method))
+	(when host
+	  (when (string-match tramp-prefix-ipv6-regexp host)
+	    (setq host (replace-match "" nil t host)))
+	  (when (string-match tramp-postfix-ipv6-regexp host)
+	    (setq host (replace-match "" nil t host))))
+	(if nodefault
+	    (vector method user host localname)
+	  (vector
+	   (tramp-find-method method user host)
+	   (tramp-find-user   method user host)
+	   (tramp-find-host   method user host)
+	   localname))))))
+
+(defun tramp-buffer-name (vec)
+  "A name for the connection buffer VEC."
+  ;; We must use `tramp-file-name-real-host', because for gateway
+  ;; methods the default port will be expanded later on, which would
+  ;; tamper the name.
+  (let ((method (tramp-file-name-method vec))
+	(user   (tramp-file-name-user vec))
+	(host   (tramp-file-name-real-host vec)))
+    (if (not (zerop (length user)))
+	(format "*tramp/%s %s@%s*" method user host)
+      (format "*tramp/%s %s*" method host))))
+
+(defun tramp-make-tramp-file-name (method user host localname)
+  "Constructs a Tramp file name from METHOD, USER, HOST and LOCALNAME."
+  (concat tramp-prefix-format
+	  (when (not (zerop (length method)))
+	    (concat method tramp-postfix-method-format))
+	  (when (not (zerop (length user)))
+	    (concat user tramp-postfix-user-format))
+	  (when host
+	    (if (string-match tramp-ipv6-regexp host)
+		(concat tramp-prefix-ipv6-format host tramp-postfix-ipv6-format)
+	      host))
+	  tramp-postfix-host-format
+	  (when localname localname)))
+
+(defun tramp-completion-make-tramp-file-name (method user host localname)
+  "Constructs a Tramp file name from METHOD, USER, HOST and LOCALNAME.
+It must not be a complete Tramp file name, but as long as there are
+necessary only.  This function will be used in file name completion."
+  (concat tramp-prefix-format
+	  (when (not (zerop (length method)))
+	    (concat method tramp-postfix-method-format))
+	  (when (not (zerop (length user)))
+	    (concat user tramp-postfix-user-format))
+	  (when (not (zerop (length host)))
+	    (concat
+	     (if (string-match tramp-ipv6-regexp host)
+		 (concat tramp-prefix-ipv6-format host tramp-postfix-ipv6-format)
+	       host)
+	     tramp-postfix-host-format))
+	  (when localname localname)))
+
+(defun tramp-get-buffer (vec)
+  "Get the connection buffer to be used for VEC."
+  (or (get-buffer (tramp-buffer-name vec))
+      (with-current-buffer (get-buffer-create (tramp-buffer-name vec))
+	(setq buffer-undo-list t)
+	(setq default-directory
+	      (tramp-make-tramp-file-name
+	       (tramp-file-name-method vec)
+	       (tramp-file-name-user vec)
+	       (tramp-file-name-host vec)
+	       "/"))
+	(current-buffer))))
+
+(defun tramp-get-connection-buffer (vec)
+  "Get the connection buffer to be used for VEC.
+In case a second asynchronous communication has been started, it is different
+from `tramp-get-buffer'."
+  (or (tramp-get-connection-property vec "process-buffer" nil)
+      (tramp-get-buffer vec)))
+
+(defun tramp-get-connection-process (vec)
+  "Get the connection process to be used for VEC.
+In case a second asynchronous communication has been started, it is different
+from the default one."
+  (get-process
+   (or (tramp-get-connection-property vec "process-name" nil)
+       (tramp-buffer-name vec))))
+
+(defun tramp-debug-buffer-name (vec)
+  "A name for the debug buffer for VEC."
+  ;; We must use `tramp-file-name-real-host', because for gateway
+  ;; methods the default port will be expanded later on, which would
+  ;; tamper the name.
+  (let ((method (tramp-file-name-method vec))
+	(user   (tramp-file-name-user vec))
+	(host   (tramp-file-name-real-host vec)))
+    (if (not (zerop (length user)))
+	(format "*debug tramp/%s %s@%s*" method user host)
+      (format "*debug tramp/%s %s*" method host))))
+
+(defconst tramp-debug-outline-regexp
+  "[0-9]+:[0-9]+:[0-9]+\\.[0-9]+ [a-z0-9-]+ (\\([0-9]+\\)) #")
+
+(defun tramp-get-debug-buffer (vec)
+  "Get the debug buffer for VEC."
+  (with-current-buffer
+      (get-buffer-create (tramp-debug-buffer-name vec))
+    (when (bobp)
+      (setq buffer-undo-list t)
+      ;; Activate `outline-mode'.  This runs `text-mode-hook' and
+      ;; `outline-mode-hook'.  We must prevent that local processes
+      ;; die.  Yes: I've seen `flyspell-mode', which starts "ispell".
+      ;; Furthermore, `outline-regexp' must have the correct value
+      ;; already, because it is used by `font-lock-compile-keywords'.
+      (let ((default-directory (tramp-compat-temporary-file-directory))
+	    (outline-regexp tramp-debug-outline-regexp))
+	(outline-mode))
+      (set (make-local-variable 'outline-regexp) tramp-debug-outline-regexp)
+      (set (make-local-variable 'outline-level) 'tramp-outline-level))
+    (current-buffer)))
+
+(defun tramp-outline-level ()
+  "Return the depth to which a statement is nested in the outline.
+Point must be at the beginning of a header line.
+
+The outline level is equal to the verbosity of the Tramp message."
+  (1+ (string-to-number (match-string 1))))
+
 (defsubst tramp-debug-message (vec fmt-string &rest args)
   "Append message to debug buffer.
 Message is formatted with FMT-STRING as control string and the remaining
@@ -2266,39 +2437,6 @@
 (put 'with-parsed-tramp-file-name 'edebug-form-spec '(form symbolp body))
 (font-lock-add-keywords 'emacs-lisp-mode '("\\<with-parsed-tramp-file-name\\>"))
 
-(defmacro with-file-property (vec file property &rest body)
-  "Check in Tramp cache for PROPERTY, otherwise execute BODY and set cache.
-FILE must be a local file name on a connection identified via VEC."
-  `(if (file-name-absolute-p ,file)
-      (let ((value (tramp-get-file-property ,vec ,file ,property 'undef)))
-	(when (eq value 'undef)
-	  ;; We cannot pass @body as parameter to
-	  ;; `tramp-set-file-property' because it mangles our
-	  ;; debug messages.
-	  (setq value (progn ,@body))
-	  (tramp-set-file-property ,vec ,file ,property value))
-	value)
-     ,@body))
-
-(put 'with-file-property 'lisp-indent-function 3)
-(put 'with-file-property 'edebug-form-spec t)
-(font-lock-add-keywords 'emacs-lisp-mode '("\\<with-file-property\\>"))
-
-(defmacro with-connection-property (key property &rest body)
-  "Check in Tramp for property PROPERTY, otherwise executes BODY and set."
-  `(let ((value (tramp-get-connection-property ,key ,property 'undef)))
-    (when (eq value 'undef)
-      ;; We cannot pass ,@body as parameter to
-      ;; `tramp-set-connection-property' because it mangles our debug
-      ;; messages.
-      (setq value (progn ,@body))
-      (tramp-set-connection-property ,key ,property value))
-    value))
-
-(put 'with-connection-property 'lisp-indent-function 2)
-(put 'with-connection-property 'edebug-form-spec t)
-(font-lock-add-keywords 'emacs-lisp-mode '("\\<with-connection-property\\>"))
-
 (defun tramp-progress-reporter-update (reporter &optional value)
   (let* ((parameters (cdr reporter))
 	 (message (aref parameters 3)))
@@ -2374,7 +2512,7 @@
 	  (setq result nil)
 	;; This creates the file by side effect.
 	(set-file-times result)
-	(set-file-modes result (tramp-octal-to-decimal "0700"))))
+	(set-file-modes result (tramp-compat-octal-to-decimal "0700"))))
 
     ;; Return the local part.
     (with-parsed-tramp-file-name result nil localname)))
@@ -2414,7 +2552,7 @@
 		       ;; Windows registry.
 		       (and (memq system-type '(cygwin windows-nt))
 			    (zerop
-			     (tramp-local-call-process
+			     (tramp-compat-call-process
 			      "reg" nil nil nil "query" (nth 1 (car v)))))
 		     ;; Configuration file.
 		     (file-exists-p (nth 1 (car v)))))
@@ -3026,7 +3164,7 @@
     (unless (zerop (tramp-send-command-and-check
 		    v
 		    (format "chmod %s %s"
-			    (tramp-decimal-to-octal mode)
+			    (tramp-compat-decimal-to-octal mode)
 			    (tramp-shell-quote-argument localname))))
       ;; FIXME: extract the proper text from chmod's stderr.
       (tramp-error
@@ -3057,7 +3195,7 @@
      ;; We handle also the local part, because in older Emacsen,
      ;; without `set-file-times', this function is an alias for this.
      ;; We are local, so we don't need the UTC settings.
-     (tramp-local-call-process
+     (tramp-compat-call-process
       "touch" nil nil nil "-t"
       (format-time-string "%Y%m%d%H%M.%S" time)
       (tramp-shell-quote-argument filename)))))
@@ -3090,7 +3228,7 @@
       ;; `set-file-uid-gid'.  On W32 "chown" might not work.
       (let ((uid (or (and (integerp uid) uid) (tramp-get-local-uid 'integer)))
 	    (gid (or (and (integerp gid) gid) (tramp-get-local-gid 'integer))))
-	(tramp-local-call-process
+	(tramp-compat-call-process
 	 "chown" nil nil nil
          (format "%d:%d" uid gid) (tramp-shell-quote-argument filename))))))
 
@@ -3218,7 +3356,7 @@
 If the file modes of FILENAME cannot be determined, return the
 value of `default-file-modes', without execute permissions."
   (or (file-modes filename)
-      (logand (default-file-modes) (tramp-octal-to-decimal "0666"))))
+      (logand (default-file-modes) (tramp-compat-octal-to-decimal "0666"))))
 
 (defun tramp-handle-file-directory-p (filename)
   "Like `file-directory-p' for Tramp files."
@@ -3905,7 +4043,8 @@
 		      ;; Since this does not work reliable, we also
 		      ;; give read permissions.
 		      (set-file-modes
-		       (concat prefix tmpfile) (tramp-octal-to-decimal "0777"))
+		       (concat prefix tmpfile)
+		       (tramp-compat-octal-to-decimal "0777"))
 		      (tramp-set-file-uid-gid
 		       (concat prefix tmpfile)
 		       (tramp-get-local-uid 'integer)
@@ -3921,7 +4060,8 @@
 		      ;; We must change the ownership as local user.
 		      ;; Since this does not work reliable, we also
 		      ;; give read permissions.
-		      (set-file-modes tmpfile (tramp-octal-to-decimal "0777"))
+		      (set-file-modes
+		       tmpfile (tramp-compat-octal-to-decimal "0777"))
 		      (tramp-set-file-uid-gid
 		       tmpfile
 		       (tramp-get-remote-uid v 'integer)
@@ -4689,20 +4829,6 @@
 	  (keyboard-quit)
 	ret))))
 
-(defun tramp-local-call-process
-  (program &optional infile destination display &rest args)
-  "Calls `call-process' on the local host.
-This is needed because for some Emacs flavors Tramp has
-defadviced `call-process' to behave like `process-file'.  The
-Lisp error raised when PROGRAM is nil is trapped also, returning 1."
-  (let ((default-directory
-	  (if (file-remote-p default-directory)
-	      (tramp-compat-temporary-file-directory)
-	    default-directory)))
-    (if (executable-find program)
-	(apply 'call-process program infile destination display args)
-      1)))
-
 (defun tramp-handle-call-process-region
   (start end program &optional delete buffer display &rest args)
   "Like `call-process-region' for Tramp files."
@@ -4772,7 +4898,7 @@
 	  ;; Display output.
 	  (pop-to-buffer output-buffer)
 	  (setq mode-line-process '(":%s"))
-	  (require 'shell) (shell-mode))
+	  (shell-mode))
 
       (prog1
 	  ;; Run the process.
@@ -4981,7 +5107,7 @@
 	      ;; When the file is not readable for the owner, it
 	      ;; cannot be inserted, even it is redable for the group
 	      ;; or for everybody.
-	      (set-file-modes local-copy (tramp-octal-to-decimal "0600"))
+	      (set-file-modes local-copy (tramp-compat-octal-to-decimal "0600"))
 
 	      (when (and (null remote-copy)
 			 (tramp-get-method-parameter
@@ -5219,7 +5345,8 @@
 	  ;; Ensure, that it is still readable.
 	  (when modes
 	    (set-file-modes
-	     tmpfile (logior (or modes 0) (tramp-octal-to-decimal "0400"))))
+	     tmpfile
+	     (logior (or modes 0) (tramp-compat-octal-to-decimal "0400"))))
 
 	  ;; This is a bit lengthy due to the different methods
 	  ;; possible for file transfer.  First, we check whether the
@@ -5318,7 +5445,7 @@
 			(erase-buffer)
 			(and
 			 ;; cksum runs locally, if possible.
-			 (zerop (tramp-local-call-process "cksum" tmpfile t))
+			 (zerop (tramp-compat-call-process "cksum" tmpfile t))
 			 ;; cksum runs remotely.
 			 (zerop
 			  (tramp-send-command-and-check
@@ -5795,6 +5922,7 @@
 ;; Tramp file name syntax. Maybe another variable should be introduced
 ;; overwriting this check in such cases. Or we change Tramp file name
 ;; syntax in order to avoid ambiguities, like in XEmacs ...
+;;;###tramp-autoload
 (defun tramp-completion-mode-p ()
   "Check, whether method / user name / host name completion is active."
   (or
@@ -6344,7 +6472,7 @@
   (let ((default-directory (tramp-compat-temporary-file-directory))
 	res)
     (with-temp-buffer
-      (when (zerop (tramp-local-call-process "reg" nil t nil "query" registry))
+      (when (zerop (tramp-compat-call-process "reg" nil t nil "query" registry))
 	(goto-char (point-min))
 	(while (not (eobp))
 	  (push (tramp-parse-putty-group registry) res))))
@@ -6419,18 +6547,6 @@
 	       (tramp-shell-quote-argument v1-localname)
 	       (tramp-shell-quote-argument v2-localname))))))
 
-(defun tramp-buffer-name (vec)
-  "A name for the connection buffer VEC."
-  ;; We must use `tramp-file-name-real-host', because for gateway
-  ;; methods the default port will be expanded later on, which would
-  ;; tamper the name.
-  (let ((method (tramp-file-name-method vec))
-	(user   (tramp-file-name-user vec))
-	(host   (tramp-file-name-real-host vec)))
-    (if (not (zerop (length user)))
-	(format "*tramp/%s %s@%s*" method user host)
-      (format "*tramp/%s %s*" method host))))
-
 (defun tramp-delete-temp-file-function ()
   "Remove temporary files related to current buffer."
   (when (stringp tramp-temp-buffer-file-name)
@@ -6444,74 +6560,6 @@
 	    (remove-hook 'kill-buffer-hook
 			 'tramp-delete-temp-file-function)))
 
-(defun tramp-get-buffer (vec)
-  "Get the connection buffer to be used for VEC."
-  (or (get-buffer (tramp-buffer-name vec))
-      (with-current-buffer (get-buffer-create (tramp-buffer-name vec))
-	(setq buffer-undo-list t)
-	(setq default-directory
-	      (tramp-make-tramp-file-name
-	       (tramp-file-name-method vec)
-	       (tramp-file-name-user vec)
-	       (tramp-file-name-host vec)
-	       "/"))
-	(current-buffer))))
-
-(defun tramp-get-connection-buffer (vec)
-  "Get the connection buffer to be used for VEC.
-In case a second asynchronous communication has been started, it is different
-from `tramp-get-buffer'."
-  (or (tramp-get-connection-property vec "process-buffer" nil)
-      (tramp-get-buffer vec)))
-
-(defun tramp-get-connection-process (vec)
-  "Get the connection process to be used for VEC.
-In case a second asynchronous communication has been started, it is different
-from the default one."
-  (get-process
-   (or (tramp-get-connection-property vec "process-name" nil)
-       (tramp-buffer-name vec))))
-
-(defun tramp-debug-buffer-name (vec)
-  "A name for the debug buffer for VEC."
-  ;; We must use `tramp-file-name-real-host', because for gateway
-  ;; methods the default port will be expanded later on, which would
-  ;; tamper the name.
-  (let ((method (tramp-file-name-method vec))
-	(user   (tramp-file-name-user vec))
-	(host   (tramp-file-name-real-host vec)))
-    (if (not (zerop (length user)))
-	(format "*debug tramp/%s %s@%s*" method user host)
-      (format "*debug tramp/%s %s*" method host))))
-
-(defconst tramp-debug-outline-regexp
-  "[0-9]+:[0-9]+:[0-9]+\\.[0-9]+ [a-z0-9-]+ (\\([0-9]+\\)) #")
-
-(defun tramp-get-debug-buffer (vec)
-  "Get the debug buffer for VEC."
-  (with-current-buffer
-      (get-buffer-create (tramp-debug-buffer-name vec))
-    (when (bobp)
-      (setq buffer-undo-list t)
-      ;; Activate `outline-mode'.  This runs `text-mode-hook' and
-      ;; `outline-mode-hook'.  We must prevent that local processes
-      ;; die.  Yes: I've seen `flyspell-mode', which starts "ispell".
-      ;; Furthermore, `outline-regexp' must have the correct value
-      ;; already, because it is used by `font-lock-compile-keywords'.
-      (let ((default-directory (tramp-compat-temporary-file-directory))
-	    (outline-regexp tramp-debug-outline-regexp))
-	(outline-mode))
-      (set (make-local-variable 'outline-regexp) tramp-debug-outline-regexp)
-      (set (make-local-variable 'outline-level) 'tramp-outline-level))
-    (current-buffer)))
-
-(defun tramp-outline-level ()
-  "Return the depth to which a statement is nested in the outline.
-Point must be at the beginning of a header line.
-
-The outline level is equal to the verbosity of the Tramp message."
-  (1+ (string-to-number (match-string 1))))
-
 (defun tramp-find-executable
   (vec progname dirlist &optional ignore-tilde ignore-path)
   "Searches for PROGNAME in $PATH and all directories mentioned in DIRLIST.
@@ -7294,7 +7342,7 @@
 OUTPUT can be a string (which specifies a filename), or t (which
 means standard output and thus the current buffer), or nil (which
 means discard it)."
-  (tramp-local-call-process
+  (tramp-compat-call-process
    tramp-encoding-shell
    (when (and input (not (string-match "%s" cmd))) input)
    (if (eq output t) t nil)
@@ -7397,12 +7445,10 @@
 	    (setq choices tramp-default-proxies-alist)))))
 
     ;; Handle gateways.
-    (when (and (boundp 'tramp-gw-tunnel-method)
-	       (string-match (format
-			      "^\\(%s\\|%s\\)$"
-			      (symbol-value 'tramp-gw-tunnel-method)
-			      (symbol-value 'tramp-gw-socks-method))
-			     (tramp-file-name-method (car target-alist))))
+    (when (string-match
+	   (format
+	    "^\\(%s\\|%s\\)$" tramp-gw-tunnel-method tramp-gw-socks-method)
+	   (tramp-file-name-method (car target-alist)))
       (let ((gw (pop target-alist))
 	    (hop (pop target-alist)))
 	;; Is the method prepared for gateways?
@@ -7699,6 +7745,7 @@
       ;; Return value is whether end-of-output sentinel was found.
       found)))
 
+;;;###tramp-autoload
 (defun tramp-send-command-and-check
   (vec command &optional subshell dont-suppress-err)
   "Run COMMAND and check its exit status.
@@ -7807,57 +7854,57 @@
     (save-match-data
       (logior
        (cond
-	((char-equal owner-read ?r) (tramp-octal-to-decimal "00400"))
+	((char-equal owner-read ?r) (tramp-compat-octal-to-decimal "00400"))
 	((char-equal owner-read ?-) 0)
 	(t (error "Second char `%c' must be one of `r-'" owner-read)))
        (cond
-	((char-equal owner-write ?w) (tramp-octal-to-decimal "00200"))
+	((char-equal owner-write ?w) (tramp-compat-octal-to-decimal "00200"))
 	((char-equal owner-write ?-) 0)
 	(t (error "Third char `%c' must be one of `w-'" owner-write)))
        (cond
 	((char-equal owner-execute-or-setid ?x)
-	 (tramp-octal-to-decimal "00100"))
+	 (tramp-compat-octal-to-decimal "00100"))
 	((char-equal owner-execute-or-setid ?S)
-	 (tramp-octal-to-decimal "04000"))
+	 (tramp-compat-octal-to-decimal "04000"))
 	((char-equal owner-execute-or-setid ?s)
-	 (tramp-octal-to-decimal "04100"))
+	 (tramp-compat-octal-to-decimal "04100"))
 	((char-equal owner-execute-or-setid ?-) 0)
 	(t (error "Fourth char `%c' must be one of `xsS-'"
 		  owner-execute-or-setid)))
        (cond
-	((char-equal group-read ?r) (tramp-octal-to-decimal "00040"))
+	((char-equal group-read ?r) (tramp-compat-octal-to-decimal "00040"))
 	((char-equal group-read ?-) 0)
 	(t (error "Fifth char `%c' must be one of `r-'" group-read)))
        (cond
-	((char-equal group-write ?w) (tramp-octal-to-decimal "00020"))
+	((char-equal group-write ?w) (tramp-compat-octal-to-decimal "00020"))
 	((char-equal group-write ?-) 0)
 	(t (error "Sixth char `%c' must be one of `w-'" group-write)))
        (cond
 	((char-equal group-execute-or-setid ?x)
-	 (tramp-octal-to-decimal "00010"))
+	 (tramp-compat-octal-to-decimal "00010"))
 	((char-equal group-execute-or-setid ?S)
-	 (tramp-octal-to-decimal "02000"))
+	 (tramp-compat-octal-to-decimal "02000"))
 	((char-equal group-execute-or-setid ?s)
-	 (tramp-octal-to-decimal "02010"))
+	 (tramp-compat-octal-to-decimal "02010"))
 	((char-equal group-execute-or-setid ?-) 0)
 	(t (error "Seventh char `%c' must be one of `xsS-'"
 		  group-execute-or-setid)))
        (cond
 	((char-equal other-read ?r)
-	 (tramp-octal-to-decimal "00004"))
+	 (tramp-compat-octal-to-decimal "00004"))
 	((char-equal other-read ?-) 0)
 	(t (error "Eighth char `%c' must be one of `r-'" other-read)))
        (cond
-         ((char-equal other-write ?w) (tramp-octal-to-decimal "00002"))
+         ((char-equal other-write ?w) (tramp-compat-octal-to-decimal "00002"))
 	 ((char-equal other-write ?-) 0)
          (t (error "Nineth char `%c' must be one of `w-'" other-write)))
        (cond
 	((char-equal other-execute-or-sticky ?x)
-	 (tramp-octal-to-decimal "00001"))
+	 (tramp-compat-octal-to-decimal "00001"))
 	((char-equal other-execute-or-sticky ?T)
-	 (tramp-octal-to-decimal "01000"))
+	 (tramp-compat-octal-to-decimal "01000"))
 	((char-equal other-execute-or-sticky ?t)
-	 (tramp-octal-to-decimal "01001"))
+	 (tramp-compat-octal-to-decimal "01001"))
 	((char-equal other-execute-or-sticky ?-) 0)
 	(t (error "Tenth char `%c' must be one of `xtT-'"
 		  other-execute-or-sticky)))))))
@@ -8018,24 +8065,6 @@
 		(and suid (upcase suid-text)) ; suid, !execute
 		(and x "x") "-"))))	; !suid
 
-(defun tramp-decimal-to-octal (i)
-  "Return a string consisting of the octal digits of I.
-Not actually used.  Use `(format \"%o\" i)' instead?"
-  (cond ((< i 0) (error "Cannot convert negative number to octal"))
-        ((not (integerp i)) (error "Cannot convert non-integer to octal"))
-        ((zerop i) "0")
-        (t (concat (tramp-decimal-to-octal (/ i 8))
-                   (number-to-string (% i 8))))))
-
-;; Kudos to Gerd Moellmann for this suggestion.
-(defun tramp-octal-to-decimal (ostr)
-  "Given a string of octal digits, return a decimal number."
-  (let ((x (or ostr "")))
-    ;; `save-match' is in `tramp-mode-string-to-int' which calls this.
-    (unless (string-match "\\`[0-7]*\\'" x)
-      (error "Non-octal junk in string `%s'" x))
-    (string-to-number ostr 8)))
-
 (defun tramp-shell-case-fold (string)
   "Converts STRING to shell glob pattern which ignores case."
   (mapconcat
@@ -8046,145 +8075,6 @@
    string
    ""))
 
-
-;; ------------------------------------------------------------
-;; -- Tramp file names --
-;; ------------------------------------------------------------
-;; Conversion functions between external representation and
-;; internal data structure.  Convenience functions for internal
-;; data structure.
-
-(defun tramp-file-name-p (vec)
-  "Check, whether VEC is a Tramp object."
-  (and (vectorp vec) (= 4 (length vec))))
-
-(defun tramp-file-name-method (vec)
-  "Return method component of VEC."
-  (and (tramp-file-name-p vec) (aref vec 0)))
-
-(defun tramp-file-name-user (vec)
-  "Return user component of VEC."
-  (and (tramp-file-name-p vec) (aref vec 1)))
-
-(defun tramp-file-name-host (vec)
-  "Return host component of VEC."
-  (and (tramp-file-name-p vec) (aref vec 2)))
-
-(defun tramp-file-name-localname (vec)
-  "Return localname component of VEC."
-  (and (tramp-file-name-p vec) (aref vec 3)))
-
-;; The user part of a Tramp file name vector can be of kind
-;; "user%domain".  Sometimes, we must extract these parts.
-(defun tramp-file-name-real-user (vec)
-  "Return the user name of VEC without domain."
-  (save-match-data
-    (let ((user (tramp-file-name-user vec)))
-      (if (and (stringp user)
-	       (string-match tramp-user-with-domain-regexp user))
-	  (match-string 1 user)
-	user))))
-
-(defun tramp-file-name-domain (vec)
-  "Return the domain name of VEC."
-  (save-match-data
-    (let ((user (tramp-file-name-user vec)))
-      (and (stringp user)
-	   (string-match tramp-user-with-domain-regexp user)
-	   (match-string 2 user)))))
-
-;; The host part of a Tramp file name vector can be of kind
-;; "host#port".  Sometimes, we must extract these parts.
-(defun tramp-file-name-real-host (vec)
-  "Return the host name of VEC without port."
-  (save-match-data
-    (let ((host (tramp-file-name-host vec)))
-      (if (and (stringp host)
-	       (string-match tramp-host-with-port-regexp host))
-	  (match-string 1 host)
-	host))))
-
-(defun tramp-file-name-port (vec)
-  "Return the port number of VEC."
-  (save-match-data
-    (let ((host (tramp-file-name-host vec)))
-      (and (stringp host)
-	   (string-match tramp-host-with-port-regexp host)
-	   (string-to-number (match-string 2 host))))))
-
-(defun tramp-tramp-file-p (name)
-  "Return t if NAME is a string with Tramp file name syntax."
-  (save-match-data
-    (and (stringp name) (string-match tramp-file-name-regexp name))))
-
-(defun tramp-find-method (method user host)
-  "Return the right method string to use.
-This is METHOD, if non-nil. Otherwise, do a lookup in
-`tramp-default-method-alist'."
-  (or method
-      (let ((choices tramp-default-method-alist)
-	    lmethod item)
-	(while choices
-	  (setq item (pop choices))
-	  (when (and (string-match (or (nth 0 item) "") (or host ""))
-		     (string-match (or (nth 1 item) "") (or user "")))
-	    (setq lmethod (nth 2 item))
-	    (setq choices nil)))
-	lmethod)
-      tramp-default-method))
-
-(defun tramp-find-user (method user host)
-  "Return the right user string to use.
-This is USER, if non-nil. Otherwise, do a lookup in
-`tramp-default-user-alist'."
-  (or user
-      (let ((choices tramp-default-user-alist)
-	    luser item)
-	(while choices
-	  (setq item (pop choices))
-	  (when (and (string-match (or (nth 0 item) "") (or method ""))
-		     (string-match (or (nth 1 item) "") (or host "")))
-	    (setq luser (nth 2 item))
-	    (setq choices nil)))
-	luser)
-      tramp-default-user))
-
-(defun tramp-find-host (method user host)
-  "Return the right host string to use.
-This is HOST, if non-nil. Otherwise, it is `tramp-default-host'."
-  (or (and (> (length host) 0) host)
-      tramp-default-host))
-
-(defun tramp-dissect-file-name (name &optional nodefault)
-  "Return a `tramp-file-name' structure.
-The structure consists of remote method, remote user, remote host
-and localname (file name on remote host).  If NODEFAULT is
-non-nil, the file name parts are not expanded to their default
-values."
-  (save-match-data
-    (let ((match (string-match (nth 0 tramp-file-name-structure) name)))
-      (unless match (error "Not a Tramp file name: %s" name))
-      (let ((method    (match-string (nth 1 tramp-file-name-structure) name))
-	    (user      (match-string (nth 2 tramp-file-name-structure) name))
-	    (host      (match-string (nth 3 tramp-file-name-structure) name))
-	    (localname (match-string (nth 4 tramp-file-name-structure) name)))
-	(when (member method '("multi" "multiu"))
-	  (error
-	   "`%s' method is no longer supported, see (info \"(tramp)Multi-hops\")"
-	   method))
-	(when host
-	  (when (string-match tramp-prefix-ipv6-regexp host)
-	    (setq host (replace-match "" nil t host)))
-	  (when (string-match tramp-postfix-ipv6-regexp host)
-	    (setq host (replace-match "" nil t host))))
-	(if nodefault
-	    (vector method user host localname)
-	  (vector
-	   (tramp-find-method method user host)
-	   (tramp-find-user   method user host)
-	   (tramp-find-host   method user host)
-	   localname))))))
-
 (defun tramp-equal-remote (file1 file2)
   "Check, whether the remote parts of FILE1 and FILE2 are identical.
 The check depends on method, user and host name of the files.  If
@@ -8203,37 +8093,6 @@
        (stringp (file-remote-p file2))
        (string-equal (file-remote-p file1) (file-remote-p file2))))
 
-(defun tramp-make-tramp-file-name (method user host localname)
-  "Constructs a Tramp file name from METHOD, USER, HOST and LOCALNAME."
-  (concat tramp-prefix-format
-	  (when (not (zerop (length method)))
-	    (concat method tramp-postfix-method-format))
-	  (when (not (zerop (length user)))
-	    (concat user tramp-postfix-user-format))
-	  (when host
-	    (if (string-match tramp-ipv6-regexp host)
-		(concat tramp-prefix-ipv6-format host tramp-postfix-ipv6-format)
-	      host))
-	  tramp-postfix-host-format
-	  (when localname localname)))
-
-(defun tramp-completion-make-tramp-file-name (method user host localname)
-  "Constructs a Tramp file name from METHOD, USER, HOST and LOCALNAME.
-It must not be a complete Tramp file name, but as long as there are
-necessary only.  This function will be used in file name completion."
-  (concat tramp-prefix-format
-	  (when (not (zerop (length method)))
-	    (concat method tramp-postfix-method-format))
-	  (when (not (zerop (length user)))
-	    (concat user tramp-postfix-user-format))
-	  (when (not (zerop (length host)))
-	    (concat
-	     (if (string-match tramp-ipv6-regexp host)
-		 (concat tramp-prefix-ipv6-format host tramp-postfix-ipv6-format)
-	       host)
-	     tramp-postfix-host-format))
-	  (when localname localname)))
-
 (defun tramp-make-copy-program-file-name (vec)
   "Create a file name suitable to be passed to `rcp' and workalikes."
   (let ((user (tramp-file-name-user vec))
@@ -8281,6 +8140,7 @@
 
 ;; Variables local to connection.
 
+;;;###tramp-autoload
 (defun tramp-get-remote-path (vec)
   (with-connection-property
       ;; When `tramp-own-remote-path' is in `tramp-remote-path', we
@@ -8354,6 +8214,7 @@
 	   x))
 	remote-path)))))
 
+;;;###tramp-autoload
 (defun tramp-get-remote-tmpdir (vec)
   (with-connection-property vec "tmp-directory"
     (let ((dir (tramp-shell-quote-argument "/tmp")))
@@ -8435,6 +8296,7 @@
     (tramp-message vec 5 "Finding command to check if file exists")
     (tramp-find-file-exists-command vec)))
 
+;;;###tramp-autoload
 (defun tramp-get-remote-ln (vec)
   (with-connection-property vec "ln"
     (tramp-message vec 5 "Finding a suitable `ln' command")
@@ -8682,8 +8544,9 @@
       ;; Permissions should be set always, because there might be an old
       ;; auto-saved file belonging to another original file.  This could
       ;; be a security threat.
-      (set-file-modes buffer-auto-save-file-name
-		      (or (file-modes bfn) (tramp-octal-to-decimal "0600"))))))
+      (set-file-modes
+       buffer-auto-save-file-name
+       (or (file-modes bfn) (tramp-compat-octal-to-decimal "0600"))))))
 
 (unless (and (featurep 'xemacs)
 	     (= emacs-major-version 21)
@@ -8787,7 +8650,6 @@
 (defun tramp-time-diff (t1 t2)
   "Return the difference between the two times, in seconds.
 T1 and T2 are time values (as returned by `current-time' for example)."
-  ;; Pacify byte-compiler with `symbol-function'.
   (cond ((and (fboundp 'subtract-time)
 	      (fboundp 'float-time))
          (tramp-compat-funcall
@@ -8863,6 +8725,7 @@
 ;; CCC: This function should be rewritten so that
 ;; `shell-quote-argument' is not used.  This way, we are safe from
 ;; changes in `shell-quote-argument'.
+;;;###tramp-autoload
 (defun tramp-shell-quote-argument (s)
   "Similar to `shell-quote-argument', but groks newlines.
 Only works for Bourne-like shells."
@@ -8888,11 +8751,9 @@
 (defun tramp-unload-tramp ()
   "Discard Tramp from loading remote files."
   (interactive)
-  ;; When Tramp is not loaded yet, its autoloads are still active.
-  (tramp-unload-file-name-handlers)
   ;; ange-ftp settings must be enabled.
   (tramp-compat-funcall 'tramp-ftp-enable-ange-ftp)
-  ;; Maybe its not loaded yet.
+  ;; Maybe it's not loaded yet.
   (condition-case nil
       (unload-feature 'tramp 'force)
     (error nil)))
@@ -8991,7 +8852,6 @@
 ;;   expects English?  Or just to set LC_MESSAGES to "C" if Tramp
 ;;   expects only English messages?  (Juri Linkov)
 ;; * Make shadowfile.el grok Tramp filenames.  (Bug#4526, Bug#4846)
-;; * Load Tramp subpackages only when needed.  (Bug#1529, Bug#5448, Bug#5705)
 ;; * Try telnet+curl as new method.  It might be useful for busybox,
 ;;   without built-in uuencode/uudecode.
 ;; * Load ~/.emacs_SHELLNAME on the remote host for `shell'.

=== modified file 'lisp/net/trampver.el'
--- lisp/net/trampver.el	2010-09-01 07:13:21 +0000
+++ lisp/net/trampver.el	2010-09-08 14:42:54 +0000
@@ -31,16 +31,29 @@
 ;; version check is defined in macro AC_EMACS_INFO of aclocal.m4;
 ;; should be changed only there.
 
-(defconst tramp-version "2.1.19"
+;;;###tramp-autoload
+(defconst tramp-version "2.2.0-pre"
   "This version of Tramp.")
 
+;;;###tramp-autoload
 (defconst tramp-bug-report-address "tramp-devel@gnu.org"
   "Email address to send bug reports to.")
 
 ;; Check for (X)Emacs version.
-(let ((x (if (or (>= emacs-major-version 22)	(and (featurep 'xemacs)	     (= emacs-major-version 21)	     (>= emacs-minor-version 4)))    "ok"    (format "Tramp 2.1.19 is not fit for %s"	    (when (string-match "^.*$" (emacs-version))	      (match-string 0 (emacs-version)))))))
+(let ((x (if (or (>= emacs-major-version 22)
+		 (and (featurep 'xemacs)
+		      (= emacs-major-version 21)
+		      (>= emacs-minor-version 4)))
+	     "ok"
+	   (format "Tramp 2.2.0-pre is not fit for %s"
+		   (when (string-match "^.*$" (emacs-version))
+		     (match-string 0 (emacs-version)))))))
   (unless (string-match "\\`ok\\'" x) (error "%s" x)))
 
+(add-hook 'tramp-unload-hook
+	  (lambda ()
+	    (unload-feature 'trampver 'force)))
+
 (provide 'trampver)
 
 ;; arch-tag: 443576ca-f8f1-4bb1-addc-5c70861e93b1
------------------------------------------------------------
revno: 101380
committer: Agustin martin <agustin.martin@hispalinux.es>
branch nick: trunk
timestamp: Tue 2010-09-07 20:01:23 +0200
message:
  Make sure original ispell arg list is initialized in (ispell-start-process).
  
  * textmodes/ispell.el (ispell-start-process): Make sure original
    arg list is properly initialized (Bug#6993, Bug#6994).
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-06 16:38:03 +0000
+++ lisp/ChangeLog	2010-09-07 18:01:23 +0000
@@ -1,3 +1,8 @@
+2010-09-07  Agustín Martín  <agustin.martin@hispalinux.es>
+
+	* textmodes/ispell.el (ispell-start-process): Make sure original
+	arg list is properly initialized (Bug#6993, Bug#6994).
+
 2010-09-06  Alexander Klimov  <alserkli@inbox.ru>  (tiny change)
 
 	* files.el (directory-abbrev-alist): Use \` as default regexp.

=== modified file 'lisp/textmodes/ispell.el'
--- lisp/textmodes/ispell.el	2010-09-04 18:47:29 +0000
+++ lisp/textmodes/ispell.el	2010-09-07 18:01:23 +0000
@@ -2591,12 +2591,13 @@
                default-directory
              ;; Defend against bad `default-directory'.
              (expand-file-name "~/")))
+	 (orig-args (ispell-get-ispell-args))
          (args
           (append
-           (if (and ispell-current-dictionary ; Use specified dictionary.
-                    (not (member "-d" args))) ; Only define if not overridden.
+           (if (and ispell-current-dictionary      ; Not for default dict (nil)
+                    (not (member "-d" orig-args))) ; Only define if not overridden.
                (list "-d" ispell-current-dictionary))
-           (ispell-get-ispell-args)
+           orig-args
            (if ispell-current-personal-dictionary ; Use specified pers dict.
                (list "-p"
                      (expand-file-name ispell-current-personal-dictionary)))
------------------------------------------------------------
revno: 101379
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Tue 2010-09-07 06:23:16 +0000
message:
  gnus-html.el (gnus-html-wash-tags, gnus-html-put-image): Mark cid and internal images as deletable by `W D D'.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-07 01:20:19 +0000
+++ lisp/gnus/ChangeLog	2010-09-07 06:23:16 +0000
@@ -1,5 +1,8 @@
 2010-09-07  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+	* gnus-html.el (gnus-html-wash-tags, gnus-html-put-image): Mark cid and
+	internal images as deletable by `W D D'.
+
 	* gnus-async.el (gnus-html-prefetch-images): Autoload it when compiling.
 	(gnus-async-article-callback): Fix typo.
 

=== modified file 'lisp/gnus/gnus-html.el'
--- lisp/gnus/gnus-html.el	2010-09-07 00:08:33 +0000
+++ lisp/gnus/gnus-html.el	2010-09-07 06:23:16 +0000
@@ -150,7 +150,8 @@
 		(when image
 		  (let ((string (buffer-substring start end)))
 		    (delete-region start end)
-		    (gnus-put-image image (gnus-string-or string "*")))))
+		    (gnus-put-image image (gnus-string-or string "*") 'cid)
+		    (gnus-add-image 'cid image))))
 	    ;; Normal, external URL.
 	    (if (gnus-html-image-url-blocked-p
 		 url
@@ -309,9 +310,11 @@
 	      t)
 	  (insert string)
 	  (when (fboundp 'find-image)
-	    (gnus-put-image (find-image
-			     '((:type xpm :file "lock-broken.xpm")))
-			    (gnus-string-or string "*")))
+	    (setq image (find-image '((:type xpm :file "lock-broken.xpm"))))
+	    (gnus-put-image image
+			    (gnus-string-or string "*")
+			    'internal)
+	    (gnus-add-image 'internal image))
 	  nil)))))
 
 (defun gnus-html-rescale-image (image file size)
------------------------------------------------------------
revno: 101378
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Tue 2010-09-07 01:20:19 +0000
message:
  gnus-async.el (gnus-html-prefetch-images): Autoload it when compiling; (gnus-async-article-callback): Fix typo.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-07 00:08:33 +0000
+++ lisp/gnus/ChangeLog	2010-09-07 01:20:19 +0000
@@ -1,3 +1,8 @@
+2010-09-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-async.el (gnus-html-prefetch-images): Autoload it when compiling.
+	(gnus-async-article-callback): Fix typo.
+
 2010-09-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus-html.el (gnus-html-wash-tags): Limit end-tag matching to the

=== modified file 'lisp/gnus/gnus-async.el'
--- lisp/gnus/gnus-async.el	2010-09-07 00:05:59 +0000
+++ lisp/gnus/gnus-async.el	2010-09-07 01:20:19 +0000
@@ -228,6 +228,9 @@
   `(lambda (arg)
      (gnus-async-article-callback arg ,group ,article ,mark ,summary ,next)))
 
+(eval-when-compile
+  (autoload 'gnus-html-prefetch-images "gnus-html"))
+
 (defun gnus-async-article-callback (arg group article mark summary next)
   "Function called when an async article is done being fetched."
   (save-excursion
@@ -240,7 +243,7 @@
 	    (narrow-to-region mark (point-max))
 	    ;; Prefetch images for the groups that want that.
 	    (when (fboundp 'gnus-html-prefetch-images)
-	      (gnus-async-post-fetch-function summary))
+	      (gnus-html-prefetch-images summary))
 	    (funcall gnus-async-post-fetch-function summary))))
       (gnus-async-with-semaphore
 	(setq
------------------------------------------------------------
revno: 101377 [merge]
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Tue 2010-09-07 00:12:08 +0000
message:
  Merge changes made in Gnus trunk:
  
  nnml.el (nnml-save-nov): Remove some debugging-related messages.
  
  gnus-start.el (gnus-read-active-for-groups): Do a `gnus-request-scan' for the methods that support -retrieve-groups, too.
  
  gnus-html.el (gnus-html-wash-tags): Remove <a name...> tags, which confuses the rest of the function.
  
  gnus-start.el (gnus-get-unread-articles): If being given an explicit level to get unread articles from, then use that for foreign groups, too.
  
  nntp.el (nntp-wait-for-string): Supply a timeout for accept-process-output to ensure progress.
  
  gnus-async.el (gnus-async-article-callback): Always prefetch images for groups that want that.
  
  gnus-html.el (gnus-html-wash-tags): Limit end-tag matching to the current line to work around bugs in the output from w3m.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-06 02:09:42 +0000
+++ lisp/gnus/ChangeLog	2010-09-07 00:08:33 +0000
@@ -1,3 +1,26 @@
+2010-09-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus-html.el (gnus-html-wash-tags): Limit end-tag matching to the
+	current line to work around bugs in the output from w3m.
+
+	* gnus-async.el (gnus-async-article-callback): Always prefetch images
+	for groups that want that.
+
+	* nntp.el (nntp-wait-for-string): Supply a timeout for
+	accept-process-output to ensure progress.
+
+	* gnus-start.el (gnus-get-unread-articles): If being given an explicit
+	level to get unread articles from, then use that for foreign groups,
+	too.
+
+	* gnus-html.el (gnus-html-wash-tags): Remove <a name...> tags, which
+	confuses the rest of the function.
+
+	* gnus-start.el (gnus-read-active-for-groups): Do a `gnus-request-scan'
+	for the methods that support -retrieve-groups, too.
+
+	* nnml.el (nnml-save-nov): Remove some debugging-related messages.
+
 2010-09-06  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* pop3.el: Require cl when compiling.

=== modified file 'lisp/gnus/gnus-async.el'
--- lisp/gnus/gnus-async.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/gnus-async.el	2010-09-07 00:05:59 +0000
@@ -238,6 +238,9 @@
 	(save-excursion
 	  (save-restriction
 	    (narrow-to-region mark (point-max))
+	    ;; Prefetch images for the groups that want that.
+	    (when (fboundp 'gnus-html-prefetch-images)
+	      (gnus-async-post-fetch-function summary))
 	    (funcall gnus-async-post-fetch-function summary))))
       (gnus-async-with-semaphore
 	(setq

=== modified file 'lisp/gnus/gnus-html.el'
--- lisp/gnus/gnus-html.el	2010-09-06 00:41:06 +0000
+++ lisp/gnus/gnus-html.el	2010-09-07 00:08:33 +0000
@@ -117,6 +117,9 @@
     (while (re-search-forward " *<pre_int> *</pre_int> *\n" nil t)
       (replace-match "" t t))
     (goto-char (point-min))
+    (while (re-search-forward "<a name[^\n>]+>" nil t)
+      (replace-match "" t t))
+    (goto-char (point-min))
     (while (re-search-forward "<\\([^ />]+\\)\\([^>]*\\)>" nil t)
       (setq tag (match-string 1)
 	    parameters (match-string 2)
@@ -124,7 +127,7 @@
       (when (plusp (length parameters))
 	(set-text-properties 0 (1- (length parameters)) nil parameters))
       (delete-region start (point))
-      (when (search-forward (concat "</" tag ">") nil t)
+      (when (search-forward (concat "</" tag ">") (line-end-position) t)
 	(delete-region (match-beginning 0) (match-end 0)))
       (setq end (point))
       (cond
@@ -221,7 +224,7 @@
     (goto-char (point-min))
     ;; The output from -halfdump isn't totally regular, so strip
     ;; off any </pre_int>s that were left over.
-    (while (re-search-forward "</pre_int>" nil t)
+    (while (re-search-forward "</pre_int>\\|</internal>" nil t)
       (replace-match "" t t))
     (when images
       (gnus-html-schedule-image-fetching (current-buffer) (nreverse images)))

=== modified file 'lisp/gnus/gnus-start.el'
--- lisp/gnus/gnus-start.el	2010-09-06 00:48:40 +0000
+++ lisp/gnus/gnus-start.el	2010-09-07 00:00:56 +0000
@@ -1677,14 +1677,16 @@
   (let* ((newsrc (cdr gnus-newsrc-alist))
 	 (alevel (or level gnus-activate-level (1+ gnus-level-subscribed)))
 	 (foreign-level
-	  (min
-	   (cond ((and gnus-activate-foreign-newsgroups
-		       (not (numberp gnus-activate-foreign-newsgroups)))
-		  (1+ gnus-level-subscribed))
-		 ((numberp gnus-activate-foreign-newsgroups)
-		  gnus-activate-foreign-newsgroups)
-		 (t 0))
-	   alevel))
+	  (or
+	   level
+	   (min
+	    (cond ((and gnus-activate-foreign-newsgroups
+			(not (numberp gnus-activate-foreign-newsgroups)))
+		   (1+ gnus-level-subscribed))
+		  ((numberp gnus-activate-foreign-newsgroups)
+		   gnus-activate-foreign-newsgroups)
+		  (t 0))
+	    alevel)))
 	 (methods-cache nil)
 	 (type-cache nil)
 	 (gnus-agent-article-local-times 0)
@@ -1792,6 +1794,8 @@
   (with-current-buffer nntp-server-buffer
     (cond
      ((gnus-check-backend-function 'retrieve-groups (car method))
+      (when (gnus-check-backend-function 'request-scan (car method))
+	(gnus-request-scan nil method))
       (gnus-read-active-file-2
        (mapcar (lambda (info)
 		 (gnus-group-real-name (gnus-info-group info)))

=== modified file 'lisp/gnus/nnml.el'
--- lisp/gnus/nnml.el	2010-09-05 01:27:15 +0000
+++ lisp/gnus/nnml.el	2010-09-06 23:54:07 +0000
@@ -784,7 +784,6 @@
 (defvar nnml-incremental-nov-buffer-alist nil)
 
 (defun nnml-save-incremental-nov ()
-  (message "nnml saving incremental nov...")
   (save-excursion
     (while nnml-incremental-nov-buffer-alist
       (when (buffer-name (cdar nnml-incremental-nov-buffer-alist))
@@ -795,8 +794,7 @@
 	(set-buffer-modified-p nil)
 	(kill-buffer (current-buffer)))
       (setq nnml-incremental-nov-buffer-alist
-	    (cdr nnml-incremental-nov-buffer-alist))))
-  (message "nnml saving incremental nov...done"))
+	    (cdr nnml-incremental-nov-buffer-alist)))))
 
 (defun nnml-open-incremental-nov (group)
   (or (cdr (assoc group nnml-incremental-nov-buffer-alist))
@@ -863,7 +861,6 @@
 	buffer)))
 
 (defun nnml-save-nov ()
-  (message "nnml saving nov...")
   (save-excursion
     (while nnml-nov-buffer-alist
       (when (buffer-name (cdar nnml-nov-buffer-alist))
@@ -873,8 +870,7 @@
 			       nnml-nov-buffer-file-name nil 'nomesg))
 	(set-buffer-modified-p nil)
 	(kill-buffer (current-buffer)))
-      (setq nnml-nov-buffer-alist (cdr nnml-nov-buffer-alist))))
-  (message "nnml saving nov...done"))
+      (setq nnml-nov-buffer-alist (cdr nnml-nov-buffer-alist)))))
 
 ;;;###autoload
 (defun nnml-generate-nov-databases (&optional server)

=== modified file 'lisp/gnus/nntp.el'
--- lisp/gnus/nntp.el	2010-09-02 01:42:32 +0000
+++ lisp/gnus/nntp.el	2010-09-07 00:04:11 +0000
@@ -1768,7 +1768,7 @@
     (while (and (setq proc (get-buffer-process buf))
 		(memq (process-status proc) '(open run))
 		(not (re-search-forward regexp nil t)))
-      (accept-process-output proc)
+      (accept-process-output proc 0.1)
       (set-buffer buf)
       (goto-char (point-min)))))
 

=== modified file 'lisp/gnus/spam-report.el'
--- lisp/gnus/spam-report.el	2010-09-02 01:42:32 +0000
+++ lisp/gnus/spam-report.el	2010-09-07 00:04:11 +0000
@@ -267,7 +267,7 @@
 	(gnus-message 7 "Waiting for response from %s..." host)
 	(while (and (memq (process-status tcp-connection) '(open run))
 		    (zerop (buffer-size)))
-	  (accept-process-output tcp-connection))
+	  (accept-process-output tcp-connection 1))
 	(gnus-message 7 "Waiting for response from %s... done" host)))))
 
 ;;;###autoload

=== modified file 'lisp/mail/hashcash.el'
--- lisp/mail/hashcash.el	2010-09-02 00:55:51 +0000
+++ lisp/mail/hashcash.el	2010-09-07 00:04:11 +0000
@@ -276,7 +276,7 @@
   (unless buffer (setq buffer (current-buffer)))
   (let (entry)
     (while (setq entry (rassq buffer hashcash-process-alist))
-      (accept-process-output (car entry)))))
+      (accept-process-output (car entry) 1))))
 
 (defun hashcash-processes-running-p (buffer)
   "Return non-nil if hashcash processes in BUFFER are still running."
------------------------------------------------------------
revno: 101376 [merge]
committer: Chong Yidong <cyd@stupidchicken.com>
branch nick: trunk
timestamp: Mon 2010-09-06 12:40:56 -0400
message:
  Merge changes from emacs-23 branch.
diff:
=== modified file 'doc/emacs/ChangeLog'
--- doc/emacs/ChangeLog	2010-09-02 10:20:20 +0000
+++ doc/emacs/ChangeLog	2010-09-06 16:38:03 +0000
@@ -1,3 +1,11 @@
+2010-09-06  Chong Yidong  <cyd@stupidchicken.com>
+
+	* dired.texi (Dired Enter): Minor doc fix (Bug#6982).
+
+2010-09-06  Glenn Morris  <rgm@gnu.org>
+
+	* misc.texi (Saving Emacs Sessions): Mention desktop-path.  (Bug#6948)
+
 2010-09-02  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* frames.texi (Cut/Paste Other App): Remove vut-buffer text.

=== modified file 'doc/emacs/dired.texi'
--- doc/emacs/dired.texi	2010-07-10 18:52:53 +0000
+++ doc/emacs/dired.texi	2010-09-06 16:38:03 +0000
@@ -75,13 +75,12 @@
 
   The variable @code{dired-listing-switches} specifies the options to
 give to @code{ls} for listing the directory; this string @emph{must}
-contain @samp{-l}.  If you use a numeric prefix argument with the
-@code{dired} command, you can specify the @code{ls} switches with the
-minibuffer before you enter the directory specification.  No matter
-how they are specified, the @code{ls} switches can include short
-options (that is, single characters) requiring no arguments, and long
-options (starting with @samp{--}) whose arguments are specified with
-@samp{=}.
+contain @samp{-l}.  If you use a prefix argument with the @code{dired}
+command, you can specify the @code{ls} switches with the minibuffer
+before you enter the directory specification.  No matter how they are
+specified, the @code{ls} switches can include short options (that is,
+single characters) requiring no arguments, and long options (starting
+with @samp{--}) whose arguments are specified with @samp{=}.
 
   On MS-Windows and MS-DOS systems, Emacs @emph{emulates} @code{ls};
 see @ref{ls in Lisp}, for options and peculiarities of that emulation.

=== modified file 'doc/emacs/misc.texi'
--- doc/emacs/misc.texi	2010-08-21 02:14:07 +0000
+++ doc/emacs/misc.texi	2010-09-02 05:41:23 +0000
@@ -2349,8 +2349,11 @@
 
 @findex desktop-change-dir
 @findex desktop-revert
+@vindex desktop-path
   If you turn on @code{desktop-save-mode} in your init file, then when
 Emacs starts, it looks for a saved desktop in the current directory.
+(More precisely, it looks in the directories specified by
+@var{desktop-path}, and uses the first desktop it finds.)
 Thus, you can have separate saved desktops in different directories,
 and the starting directory determines which one Emacs reloads.  You
 can save the current desktop and reload one saved in another directory

=== modified file 'doc/lispref/ChangeLog'
--- doc/lispref/ChangeLog	2010-09-02 10:17:02 +0000
+++ doc/lispref/ChangeLog	2010-09-06 16:38:03 +0000
@@ -1,3 +1,7 @@
+2010-09-06  Alexander Klimov  <alserkli@inbox.ru>  (tiny change)
+
+	* files.texi (Directory Names): Use \` rather than ^.
+
 2010-09-02  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* text.texi (Low-Level Kill Ring):

=== modified file 'doc/lispref/files.texi'
--- doc/lispref/files.texi	2010-06-23 03:36:56 +0000
+++ doc/lispref/files.texi	2010-09-05 22:03:56 +0000
@@ -1933,7 +1933,7 @@
 abbreviations to use for file directories.  Each element has the form
 @code{(@var{from} . @var{to})}, and says to replace @var{from} with
 @var{to} when it appears in a directory name.  The @var{from} string is
-actually a regular expression; it should always start with @samp{^}.
+actually a regular expression; it should always start with @samp{\`}.
 The @var{to} string should be an ordinary absolute directory name.  Do
 not use @samp{~} to stand for a home directory in that string.  The
 function @code{abbreviate-file-name} performs these substitutions.
@@ -1946,9 +1946,9 @@
 and so on.
 
 @example
-(("^/home/fsf" . "/fsf")
- ("^/home/gp" . "/gp")
- ("^/home/gd" . "/gd"))
+(("\\`/home/fsf" . "/fsf")
+ ("\\`/home/gp" . "/gp")
+ ("\\`/home/gd" . "/gd"))
 @end example
 @end defopt
 

=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-06 00:10:55 +0000
+++ lisp/ChangeLog	2010-09-06 16:38:03 +0000
@@ -1,3 +1,20 @@
+2010-09-06  Alexander Klimov  <alserkli@inbox.ru>  (tiny change)
+
+	* files.el (directory-abbrev-alist): Use \` as default regexp.
+
+	* emacs-lisp/rx.el (rx-any): Don't explode ranges that end in special
+	chars like - or ] (bug#6984).
+	(rx-any-condense-range): Explode 2-char ranges.
+
+2010-09-06  Glenn Morris  <rgm@gnu.org>
+
+	* desktop.el (desktop-path): Bump :version after 2009-09-15 change.
+
+2010-09-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* textmodes/bibtex.el:
+	* proced.el: Update to new email for Roland Winkler <winkler@gnu.org>.
+
 2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* net/imap.el (imap-message-map): Removed optional buffer parameter,

=== modified file 'lisp/desktop.el'
--- lisp/desktop.el	2010-06-09 22:08:50 +0000
+++ lisp/desktop.el	2010-09-06 16:38:03 +0000
@@ -226,7 +226,7 @@
 The base name of the file is specified in `desktop-base-file-name'."
   :type '(repeat directory)
   :group 'desktop
-  :version "22.1")
+  :version "23.2")                      ; user-emacs-directory added
 
 (defcustom desktop-missing-file-warning nil
   "If non-nil, offer to recreate the buffer of a deleted file.

=== modified file 'lisp/emacs-lisp/rx.el'
--- lisp/emacs-lisp/rx.el	2010-06-29 12:09:07 +0000
+++ lisp/emacs-lisp/rx.el	2010-09-05 09:44:55 +0000
@@ -427,7 +427,7 @@
 	    (mapcar (lambda (e)
 		      (cond
 		       ((= (car e) (cdr e)) (list (car e)))
-		       ;; ((= (1+ (car e)) (cdr e)) (list (car e) (cdr e)))
+		       ((= (1+ (car e)) (cdr e)) (list (car e) (cdr e)))
 		       ((list e))))
 		    l))
      (delete-dups str))))
@@ -545,7 +545,10 @@
 			    ((numberp e) (string e))
 			    ((consp e)
 			     (if (and (= (1+ (car e)) (cdr e))
-				      (null (memq (car e) '(?\] ?-))))
+                                      ;; rx-any-condense-range should
+                                      ;; prevent this case from happening.
+				      (null (memq (car e) '(?\] ?-)))
+                                      (null (memq (cdr e) '(?\] ?-))))
 				 (string (car e) (cdr e))
 			       (string (car e) ?- (cdr e))))
 			    (e)))

=== modified file 'lisp/files.el'
--- lisp/files.el	2010-09-05 19:03:20 +0000
+++ lisp/files.el	2010-09-06 16:38:03 +0000
@@ -67,9 +67,9 @@
 via absolute symbolic links.  Make TO the name of the link, and FROM
 the name it is linked to."
   :type '(repeat (cons :format "%v"
-		       :value ("" . "")
+		       :value ("\\`" . "")
 		       (regexp :tag "From")
-		       (regexp :tag "To")))
+		       (string :tag "To")))
   :group 'abbrev
   :group 'find-file)
 

=== modified file 'lisp/proced.el'
--- lisp/proced.el	2010-01-13 08:35:10 +0000
+++ lisp/proced.el	2010-09-02 11:47:15 +0000
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
-;; Author: Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
+;; Author: Roland Winkler <winkler@gnu.org>
 ;; Keywords: Processes, Unix
 
 ;; This file is part of GNU Emacs.

=== modified file 'lisp/textmodes/bibtex.el'
--- lisp/textmodes/bibtex.el	2010-05-25 02:11:08 +0000
+++ lisp/textmodes/bibtex.el	2010-09-06 16:38:03 +0000
@@ -9,7 +9,7 @@
 ;;      Mike Newton <newton@gumby.cs.caltech.edu>
 ;;      Aaron Larson <alarson@src.honeywell.com>
 ;;      Dirk Herrmann <D.Herrmann@tu-bs.de>
-;; Maintainer: Roland Winkler <roland.winkler@physik.uni-erlangen.de>
+;; Maintainer: Roland Winkler <winkler@gnu.org>
 ;; Keywords: BibTeX, LaTeX, TeX
 
 ;; This file is part of GNU Emacs.
------------------------------------------------------------
revno: 101375
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Mon 2010-09-06 02:09:42 +0000
message:
  pop3.el (pop3-number-of-responses): Search for "+OK", not "+OK ".
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-06 00:48:40 +0000
+++ lisp/gnus/ChangeLog	2010-09-06 02:09:42 +0000
@@ -1,3 +1,8 @@
+2010-09-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* pop3.el: Require cl when compiling.
+	(pop3-number-of-responses): Search for "+OK", not "+OK ".
+
 2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus-start.el (gnus-get-unread-articles): Don't bother with groups

=== modified file 'lisp/gnus/pop3.el'
--- lisp/gnus/pop3.el	2010-09-05 23:34:30 +0000
+++ lisp/gnus/pop3.el	2010-09-06 02:09:42 +0000
@@ -33,6 +33,7 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
 (require 'mail-utils)
 (defvar parse-time-months)
 
@@ -204,7 +205,7 @@
   (let ((responses 0))
     (save-excursion
       (goto-char (point-min))
-      (while (or (and (re-search-forward "^\\+OK " nil t)
+      (while (or (and (re-search-forward "^\\+OK" nil t)
 		      (or (not endp)
 			  (re-search-forward "^\\.\r?\n" nil t)))
 		 (re-search-forward "^-ERR " nil t))
------------------------------------------------------------
revno: 101374
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Mon 2010-09-06 00:48:40 +0000
message:
  gnus-start.el (gnus-get-unread-articles): Fix up the last commit.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-06 00:44:55 +0000
+++ lisp/gnus/ChangeLog	2010-09-06 00:48:40 +0000
@@ -2,6 +2,7 @@
 
 	* gnus-start.el (gnus-get-unread-articles): Don't bother with groups
 	that aren't going to be activated.
+	(gnus-get-unread-articles): Fix up the last commit.
 
 	* gnus-html.el (gnus-article-html): Allow calling without specifying
 	the handle.  In that case, dissect the buffer first.

=== modified file 'lisp/gnus/gnus-start.el'
--- lisp/gnus/gnus-start.el	2010-09-06 00:44:55 +0000
+++ lisp/gnus/gnus-start.el	2010-09-06 00:48:40 +0000
@@ -1736,7 +1736,7 @@
 	      type-cache))
       ;; Only add groups that need updating.
       (when (<= (gnus-info-level info)
-		(if (eq method-type 'foreign)
+		(if (eq (cadr method-group-list) 'foreign)
 		    foreign-level
 		  alevel))
 	(setcar (nthcdr 2 method-group-list)
------------------------------------------------------------
revno: 101373
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Mon 2010-09-06 00:44:55 +0000
message:
  gnus-start.el (gnus-get-unread-articles): Don't bother with groups that aren't going to be activated.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-06 00:41:06 +0000
+++ lisp/gnus/ChangeLog	2010-09-06 00:44:55 +0000
@@ -1,5 +1,8 @@
 2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* gnus-start.el (gnus-get-unread-articles): Don't bother with groups
+	that aren't going to be activated.
+
 	* gnus-html.el (gnus-article-html): Allow calling without specifying
 	the handle.  In that case, dissect the buffer first.
 

=== modified file 'lisp/gnus/gnus-start.el'
--- lisp/gnus/gnus-start.el	2010-09-06 00:20:42 +0000
+++ lisp/gnus/gnus-start.el	2010-09-06 00:44:55 +0000
@@ -1734,8 +1734,13 @@
 		'foreign)))
 	(push (setq method-group-list (list method method-type nil))
 	      type-cache))
-      (setcar (nthcdr 2 method-group-list)
-	      (cons info (nth 2 method-group-list))))
+      ;; Only add groups that need updating.
+      (when (<= (gnus-info-level info)
+		(if (eq method-type 'foreign)
+		    foreign-level
+		  alevel))
+	(setcar (nthcdr 2 method-group-list)
+		(cons info (nth 2 method-group-list)))))
 
     ;; Sort the methods based so that the primary and secondary
     ;; methods come first.  This is done for legacy reasons to try to
@@ -1753,19 +1758,13 @@
 	    infos (nth 2 (car type-cache)))
       (pop type-cache)
 
-      (when method
+      (when (and method
+		 infos)
 	;; See if any of the groups from this method require updating.
-	(when (block nil
-		(dolist (info infos)
-		  (when (<= (gnus-info-level info)
-			    (if (eq method-type 'foreign)
-				foreign-level
-			      alevel))
-		    (return t))))
-	  (gnus-read-active-for-groups method infos)
-	  (dolist (info infos)
-	    (inline (gnus-get-unread-articles-in-group
-		     info (gnus-active (gnus-info-group info))))))))
+	(gnus-read-active-for-groups method infos)
+	(dolist (info infos)
+	  (inline (gnus-get-unread-articles-in-group
+		   info (gnus-active (gnus-info-group info)))))))
     (gnus-message 6 "Checking new news...done")))
 
 (defun gnus-method-rank (type method)
------------------------------------------------------------
revno: 101372
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Mon 2010-09-06 00:41:06 +0000
message:
  gnus-html.el (gnus-article-html): Allow calling without specifying the handle.  In that case, dissect the buffer first.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-06 00:37:02 +0000
+++ lisp/gnus/ChangeLog	2010-09-06 00:41:06 +0000
@@ -1,5 +1,8 @@
 2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* gnus-html.el (gnus-article-html): Allow calling without specifying
+	the handle.  In that case, dissect the buffer first.
+
 	* gnus-sum.el (gnus-set-mode-line): Don't pad the mode line string.
 
 	* nnimap.el (nnimap-open-connection): Revert the change that would look

=== modified file 'lisp/gnus/gnus-html.el'
--- lisp/gnus/gnus-html.el	2010-09-04 15:28:57 +0000
+++ lisp/gnus/gnus-html.el	2010-09-06 00:41:06 +0000
@@ -73,8 +73,10 @@
     map))
 
 ;;;###autoload
-(defun gnus-article-html (handle)
+(defun gnus-article-html (&optional handle)
   (let ((article-buffer (current-buffer)))
+    (unless handle
+      (setq handle (mm-dissect-buffer t)))
     (save-restriction
       (narrow-to-region (point) (point))
       (save-excursion
------------------------------------------------------------
revno: 101371
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Mon 2010-09-06 00:37:02 +0000
message:
  gnus-sum.el (gnus-set-mode-line): Don\t pad the mode line string.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-06 00:33:15 +0000
+++ lisp/gnus/ChangeLog	2010-09-06 00:37:02 +0000
@@ -1,5 +1,7 @@
 2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* gnus-sum.el (gnus-set-mode-line): Don't pad the mode line string.
+
 	* nnimap.el (nnimap-open-connection): Revert the change that would look
 	into authinfo for imaps instead of imap.
 

=== modified file 'lisp/gnus/gnus-sum.el'
--- lisp/gnus/gnus-sum.el	2010-09-04 00:30:49 +0000
+++ lisp/gnus/gnus-sum.el	2010-09-06 00:37:02 +0000
@@ -6051,9 +6051,7 @@
 	  (when (> (length mode-string) max-len)
 	    (setq mode-string
 		  (concat (truncate-string-to-width mode-string (- max-len 3))
-			  "...")))
-	  ;; Pad the mode string a bit.
-	  (setq mode-string (format (format "%%-%ds" max-len) mode-string))))
+			  "...")))))
       ;; Update the mode line.
       (setq mode-line-buffer-identification
 	    (gnus-mode-line-buffer-identification (list mode-string)))
------------------------------------------------------------
revno: 101370
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Mon 2010-09-06 00:33:15 +0000
message:
  nnimap.el (nnimap-open-connection): Revert the change that would look into authinfo for imaps instead of imap.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-06 00:20:42 +0000
+++ lisp/gnus/ChangeLog	2010-09-06 00:33:15 +0000
@@ -1,5 +1,8 @@
 2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* nnimap.el (nnimap-open-connection): Revert the change that would look
+	into authinfo for imaps instead of imap.
+
 	* gnus-start.el (gnus-activate-group): Take an optional parameter to
 	say that you don't want to call gnus-request-group with don-check, but
 	do check the reponse.  This is for virtual groups only.

=== modified file 'lisp/gnus/nnimap.el'
--- lisp/gnus/nnimap.el	2010-09-06 00:06:55 +0000
+++ lisp/gnus/nnimap.el	2010-09-06 00:33:15 +0000
@@ -833,13 +833,9 @@
     (let* ((list (progn (gnus-message 7 "Parsing authinfo file `%s'."
 				      nnimap-authinfo-file)
 			(netrc-parse nnimap-authinfo-file)))
-	   (port (cond
-		  (nnimap-server-port
-		   (int-to-string nnimap-server-port))
-		  ((eq nnimap-stream 'ssl)
-		   "imaps")
-		  (t
-		   "imap")))
+ 	   (port (if nnimap-server-port
+		     (int-to-string nnimap-server-port)
+		   "imap"))
 	   (auth-info
 	    (auth-source-user-or-password '("login" "password") server port))
 	   (auth-user (nth 0 auth-info))
------------------------------------------------------------
revno: 101369
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Mon 2010-09-06 00:20:42 +0000
message:
  gnus-start.el (gnus-get-unread-articles): Count the archive groups as secondary, so that they're activated the same way as before.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-06 00:15:13 +0000
+++ lisp/gnus/ChangeLog	2010-09-06 00:20:42 +0000
@@ -3,6 +3,8 @@
 	* gnus-start.el (gnus-activate-group): Take an optional parameter to
 	say that you don't want to call gnus-request-group with don-check, but
 	do check the reponse.  This is for virtual groups only.
+	(gnus-get-unread-articles): Count the archive groups as secondary, so
+	that they're activated the same way as before.
 
 	* nnimap.el (nnimap-request-list): Servers may return \NoSelect
 	case-insensitively.

=== modified file 'lisp/gnus/gnus-start.el'
--- lisp/gnus/gnus-start.el	2010-09-06 00:15:13 +0000
+++ lisp/gnus/gnus-start.el	2010-09-06 00:20:42 +0000
@@ -1688,6 +1688,7 @@
 	 (methods-cache nil)
 	 (type-cache nil)
 	 (gnus-agent-article-local-times 0)
+	 (archive-method (gnus-server-to-method "archive"))
 	 infos info group active method cmethod
 	 method-type method-group-list)
     (gnus-message 6 "Checking new news...")
@@ -1723,7 +1724,9 @@
       (unless method-group-list
 	(setq method-type
 	      (cond
-	       ((gnus-secondary-method-p method)
+	       ((or (gnus-secondary-method-p method)
+		    (and (gnus-archive-server-wanted-p)
+			 (gnus-methods-equal-p archive-method method)))
 		'secondary)
 	       ((inline (gnus-server-equal gnus-select-method method))
 		'primary)
------------------------------------------------------------
revno: 101368
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Mon 2010-09-06 00:15:13 +0000
message:
  gnus-start.el (gnus-activate-group): Take an optional parameter to say that you don't want to call gnus-request-group with don-check, but do check the reponse.  This is for virtual groups only.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-06 00:06:55 +0000
+++ lisp/gnus/ChangeLog	2010-09-06 00:15:13 +0000
@@ -1,5 +1,9 @@
 2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* gnus-start.el (gnus-activate-group): Take an optional parameter to
+	say that you don't want to call gnus-request-group with don-check, but
+	do check the reponse.  This is for virtual groups only.
+
 	* nnimap.el (nnimap-request-list): Servers may return \NoSelect
 	case-insensitively.
 	(nnimap-debug): Removed.

=== modified file 'lisp/gnus/gnus-start.el'
--- lisp/gnus/gnus-start.el	2010-09-05 23:20:25 +0000
+++ lisp/gnus/gnus-start.el	2010-09-06 00:15:13 +0000
@@ -1526,7 +1526,8 @@
 	  (when (> (cdr cache-active) (cdr active))
 	    (setcdr active (cdr cache-active))))))))
 
-(defun gnus-activate-group (group &optional scan dont-check method)
+(defun gnus-activate-group (group &optional scan dont-check method
+				  dont-sub-check)
   "Check whether a group has been activated or not.
 If SCAN, request a scan of that group as well."
   (let ((method (or method (inline (gnus-find-method-for-group group))))
@@ -1541,9 +1542,11 @@
 		(gnus-request-scan group method))
 	   t)
 	 (if (or debug-on-error debug-on-quit)
-	     (inline (gnus-request-group group dont-check method))
+	     (inline (gnus-request-group group (or dont-sub-check dont-check)
+					 method))
 	   (condition-case nil
-	       (inline (gnus-request-group group dont-check method))
+	       (inline (gnus-request-group group (or dont-sub-check dont-check)
+					   method))
 	     ;;(error nil)
 	     (quit
 	      (message "Quit activating %s" group)
@@ -1796,7 +1799,7 @@
       (gnus-read-active-file-1 method nil))
      (t
       (dolist (info infos)
-	(gnus-activate-group (gnus-info-group info) nil t method))))))
+	(gnus-activate-group (gnus-info-group info) nil nil method t))))))
 
 ;; Create a hash table out of the newsrc alist.  The `car's of the
 ;; alist elements are used as keys.
------------------------------------------------------------
revno: 101367
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Mon 2010-09-06 00:10:55 +0000
message:
  imap.el (imap-mailbox-get): Revert last change for this function.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-06 00:06:55 +0000
+++ lisp/ChangeLog	2010-09-06 00:10:55 +0000
@@ -7,6 +7,7 @@
 	(imap-mailbox-map): Ditto.
 	(imap-mailbox-put): Ditto.
 	(imap-mailbox-get): Ditto.
+	(imap-mailbox-get): Revert last change for this function.
 
 2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 

=== modified file 'lisp/net/imap.el'
--- lisp/net/imap.el	2010-09-06 00:06:55 +0000
+++ lisp/net/imap.el	2010-09-06 00:10:55 +0000
@@ -1315,9 +1315,10 @@
   (get (intern-soft (or mailbox imap-current-mailbox) imap-mailbox-data)
        propname))
 
-(defun imap-mailbox-get (propname &optional mailbox)
-  (imap-mailbox-get-1 propname (or (imap-utf7-encode mailbox)
-				   imap-current-mailbox)))
+(defun imap-mailbox-get (propname &optional mailbox buffer)
+  (with-current-buffer (or buffer (current-buffer))
+    (imap-mailbox-get-1 propname (or (imap-utf7-encode mailbox)
+				     imap-current-mailbox))))
 
 (defun imap-mailbox-map-1 (func &optional mailbox-decoder)
   (let (result)
------------------------------------------------------------
revno: 101366
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Mon 2010-09-06 00:06:55 +0000
message:
  nnimap.el (nnimap-debug): Removed; imap.el: Remove an optional buffer parameter from many functions.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-05 23:49:02 +0000
+++ lisp/ChangeLog	2010-09-06 00:06:55 +0000
@@ -1,5 +1,15 @@
 2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* net/imap.el (imap-message-map): Removed optional buffer parameter,
+	since no callers use it.
+	(imap-message-get): Ditto.
+	(imap-message-put): Ditto.
+	(imap-mailbox-map): Ditto.
+	(imap-mailbox-put): Ditto.
+	(imap-mailbox-get): Ditto.
+
+2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
 	* net/imap.el (imap-fetch-safe): Removed function, and altered all
 	callers to use `imap-fetch' instead.  According to the comments, this
 	should be safe, since all other IMAP clients use the 1:* syntax.

=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-05 23:56:42 +0000
+++ lisp/gnus/ChangeLog	2010-09-06 00:06:55 +0000
@@ -2,6 +2,7 @@
 
 	* nnimap.el (nnimap-request-list): Servers may return \NoSelect
 	case-insensitively.
+	(nnimap-debug): Removed.
 
 	* mail-source.el (mail-source-fetch): Don't message if we're fetching
 	mail from a file, and the file doesn't exist.

=== modified file 'lisp/gnus/nnimap.el'
--- lisp/gnus/nnimap.el	2010-09-05 23:56:42 +0000
+++ lisp/gnus/nnimap.el	2010-09-06 00:06:55 +0000
@@ -589,10 +589,11 @@
 	(let (minuid maxuid)
 	  (when (> (imap-mailbox-get 'exists) 0)
 	    (imap-fetch "1:*" "UID" nil 'nouidfetch)
-	    (imap-message-map (lambda (uid Uid)
-				(setq minuid (if minuid (min minuid uid) uid)
-				      maxuid (if maxuid (max maxuid uid) uid)))
-			      'UID))
+	    (imap-message-map
+	     (lambda (uid Uid)
+	       (setq minuid (if minuid (min minuid uid) uid)
+		     maxuid (if maxuid (max maxuid uid) uid)))
+	     'UID))
 	  (list (imap-mailbox-get 'exists) minuid maxuid))))))
 
 (defun nnimap-possibly-change-group (group &optional server)
@@ -1813,68 +1814,6 @@
   "Return t if MARK can be permanently (between IMAP sessions) saved on articles, in GROUP."
   (imap-message-flag-permanent-p (nnimap-mark-to-flag mark)))
 
-(when nnimap-debug
-  (require 'trace)
-  (buffer-disable-undo (get-buffer-create nnimap-debug-buffer))
-  (mapc (lambda (f) (trace-function-background f nnimap-debug-buffer))
-	'(
-	  nnimap-possibly-change-server
-	  nnimap-verify-uidvalidity
-	  nnimap-find-minmax-uid
-	  nnimap-before-find-minmax-bugworkaround
-	  nnimap-possibly-change-group
-	  ;;nnimap-replace-whitespace
-	  nnimap-retrieve-headers-progress
-	  nnimap-retrieve-which-headers
-	  nnimap-group-overview-filename
-	  nnimap-retrieve-headers-from-file
-	  nnimap-retrieve-headers-from-server
-	  nnimap-retrieve-headers
-	  nnimap-open-connection
-	  nnimap-open-server
-	  nnimap-server-opened
-	  nnimap-close-server
-	  nnimap-request-close
-	  nnimap-status-message
-	  ;;nnimap-demule
-	  nnimap-request-article-part
-	  nnimap-request-article
-	  nnimap-request-head
-	  nnimap-request-body
-	  nnimap-request-group
-	  nnimap-close-group
-	  nnimap-pattern-to-list-arguments
-	  nnimap-request-list
-	  nnimap-request-post
-	  nnimap-retrieve-groups
-	  nnimap-request-update-info-internal
-	  nnimap-request-type
-	  nnimap-request-set-mark
-	  nnimap-split-to-groups
-	  nnimap-split-find-rule
-	  nnimap-split-find-inbox
-	  nnimap-split-articles
-	  nnimap-request-scan
-	  nnimap-request-newgroups
-	  nnimap-request-create-group
-	  nnimap-time-substract
-	  nnimap-date-days-ago
-	  nnimap-request-expire-articles-progress
-	  nnimap-request-expire-articles
-	  nnimap-request-move-article
-	  nnimap-request-accept-article
-	  nnimap-request-delete-group
-	  nnimap-request-rename-group
-	  gnus-group-nnimap-expunge
-	  gnus-group-nnimap-edit-acl
-	  gnus-group-nnimap-edit-acl-done
-	  nnimap-group-mode-hook
-	  nnimap-mark-to-predicate
-	  nnimap-mark-to-flag-1
-	  nnimap-mark-to-flag
-	  nnimap-mark-permanent-p
-	  )))
-
 (provide 'nnimap)
 
 ;;; nnimap.el ends here

=== modified file 'lisp/net/imap.el'
--- lisp/net/imap.el	2010-09-05 23:49:02 +0000
+++ lisp/net/imap.el	2010-09-06 00:06:55 +0000
@@ -1303,40 +1303,37 @@
 
 ;; Mailbox functions:
 
-(defun imap-mailbox-put (propname value &optional mailbox buffer)
-  (with-current-buffer (or buffer (current-buffer))
-    (if imap-mailbox-data
-	(put (intern (or mailbox imap-current-mailbox) imap-mailbox-data)
-	     propname value)
-      (error "Imap-mailbox-data is nil, prop %s value %s mailbox %s buffer %s"
-	     propname value mailbox (current-buffer)))
-    t))
+(defun imap-mailbox-put (propname value &optional mailbox)
+  (if imap-mailbox-data
+      (put (intern (or mailbox imap-current-mailbox) imap-mailbox-data)
+	   propname value)
+    (error "Imap-mailbox-data is nil, prop %s value %s mailbox %s buffer %s"
+	   propname value mailbox (current-buffer)))
+  t)
 
 (defsubst imap-mailbox-get-1 (propname &optional mailbox)
   (get (intern-soft (or mailbox imap-current-mailbox) imap-mailbox-data)
        propname))
 
-(defun imap-mailbox-get (propname &optional mailbox buffer)
-  (let ((mailbox (imap-utf7-encode mailbox)))
-    (with-current-buffer (or buffer (current-buffer))
-      (imap-mailbox-get-1 propname (or mailbox imap-current-mailbox)))))
-
-(defun imap-mailbox-map-1 (func &optional mailbox-decoder buffer)
-  (with-current-buffer (or buffer (current-buffer))
-    (let (result)
-      (mapatoms
-       (lambda (s)
-	 (push (funcall func (if mailbox-decoder
-				 (funcall mailbox-decoder (symbol-name s))
-			       (symbol-name s))) result))
-       imap-mailbox-data)
-      result)))
-
-(defun imap-mailbox-map (func &optional buffer)
+(defun imap-mailbox-get (propname &optional mailbox)
+  (imap-mailbox-get-1 propname (or (imap-utf7-encode mailbox)
+				   imap-current-mailbox)))
+
+(defun imap-mailbox-map-1 (func &optional mailbox-decoder)
+  (let (result)
+    (mapatoms
+     (lambda (s)
+       (push (funcall func (if mailbox-decoder
+			       (funcall mailbox-decoder (symbol-name s))
+			     (symbol-name s))) result))
+     imap-mailbox-data)
+    result))
+
+(defun imap-mailbox-map (func)
   "Map a function across each mailbox in `imap-mailbox-data', returning a list.
 Function should take a mailbox name (a string) as
 the only argument."
-  (imap-mailbox-map-1 func 'imap-utf7-decode buffer))
+  (imap-mailbox-map-1 func 'imap-utf7-decode))
 
 (defun imap-current-mailbox (&optional buffer)
   (with-current-buffer (or buffer (current-buffer))
@@ -1650,29 +1647,26 @@
 		    uids)
 	  (imap-message-get uids receive))))))
 
-(defun imap-message-put (uid propname value &optional buffer)
-  (with-current-buffer (or buffer (current-buffer))
-    (if imap-message-data
-	(put (intern (number-to-string uid) imap-message-data)
-	     propname value)
-      (error "Imap-message-data is nil, uid %s prop %s value %s buffer %s"
-	     uid propname value (current-buffer)))
-    t))
-
-(defun imap-message-get (uid propname &optional buffer)
-  (with-current-buffer (or buffer (current-buffer))
-    (get (intern-soft (number-to-string uid) imap-message-data)
-	 propname)))
-
-(defun imap-message-map (func propname &optional buffer)
+(defun imap-message-put (uid propname value)
+  (if imap-message-data
+      (put (intern (number-to-string uid) imap-message-data)
+	   propname value)
+    (error "Imap-message-data is nil, uid %s prop %s value %s buffer %s"
+	   uid propname value (current-buffer)))
+  t)
+
+(defun imap-message-get (uid propname)
+  (get (intern-soft (number-to-string uid) imap-message-data)
+       propname))
+
+(defun imap-message-map (func propname)
   "Map a function across each message in `imap-message-data', returning a list."
-  (with-current-buffer (or buffer (current-buffer))
-    (let (result)
-      (mapatoms
-       (lambda (s)
-	 (push (funcall func (get s 'UID) (get s propname)) result))
-       imap-message-data)
-      result)))
+  (let (result)
+    (mapatoms
+     (lambda (s)
+       (push (funcall func (get s 'UID) (get s propname)) result))
+     imap-message-data)
+    result))
 
 (defmacro imap-message-envelope-date (uid &optional buffer)
   `(with-current-buffer (or ,buffer (current-buffer))
------------------------------------------------------------
revno: 101365
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Sun 2010-09-05 23:56:42 +0000
message:
  nnimap.el (nnimap-request-list): Servers may return \NoSelect case-insensitively.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-05 23:38:33 +0000
+++ lisp/gnus/ChangeLog	2010-09-05 23:56:42 +0000
@@ -1,5 +1,8 @@
 2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* nnimap.el (nnimap-request-list): Servers may return \NoSelect
+	case-insensitively.
+
 	* mail-source.el (mail-source-fetch): Don't message if we're fetching
 	mail from a file, and the file doesn't exist.
 

=== modified file 'lisp/gnus/nnimap.el'
--- lisp/gnus/nnimap.el	2010-09-05 23:45:14 +0000
+++ lisp/gnus/nnimap.el	2010-09-05 23:56:42 +0000
@@ -1118,14 +1118,16 @@
       (dolist (pattern (nnimap-pattern-to-list-arguments nnimap-list-pattern))
 	(dolist (mbx (funcall nnimap-request-list-method
 			      (cdr pattern) (car pattern)))
-	  (or (member "\\NoSelect" (imap-mailbox-get 'list-flags mbx))
-	      (let* ((encoded-mbx (nnimap-encode-group-name mbx))
-		     (info (nnimap-find-minmax-uid encoded-mbx 'examine)))
-		(when info
-		  (with-current-buffer nntp-server-buffer
-		    (insert (format "\"%s\" %d %d y\n"
-				    encoded-mbx (or (nth 2 info) 0)
-				    (max 1 (or (nth 1 info) 1)))))))))))
+	  (unless (member "\\noselect"
+			  (mapcar #'downcase
+				  (imap-mailbox-get 'list-flags mbx)))
+	    (let* ((encoded-mbx (nnimap-encode-group-name mbx))
+		   (info (nnimap-find-minmax-uid encoded-mbx 'examine)))
+	      (when info
+		(with-current-buffer nntp-server-buffer
+		  (insert (format "\"%s\" %d %d y\n"
+				  encoded-mbx (or (nth 2 info) 0)
+				  (max 1 (or (nth 1 info) 1)))))))))))
     (gnus-message 5 "nnimap: Generating active list%s...done"
 		  (if (> (length server) 0) (concat " for " server) ""))
     t))
------------------------------------------------------------
revno: 101364
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Sun 2010-09-05 23:49:02 +0000
message:
  imap.el (imap-debug): Removed -- doesn't seem very useful.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-05 23:45:14 +0000
+++ lisp/ChangeLog	2010-09-05 23:49:02 +0000
@@ -1,9 +1,10 @@
 2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-	* imap.el (imap-fetch-safe): Removed function, and altered all callers
-	to use `imap-fetch' instead.  According to the comments, this should be
-	safe, since all other IMAP clients use the 1:* syntax.
+	* net/imap.el (imap-fetch-safe): Removed function, and altered all
+	callers to use `imap-fetch' instead.  According to the comments, this
+	should be safe, since all other IMAP clients use the 1:* syntax.
 	(imap-enable-exchange-bug-workaround): Removed.
+	(imap-debug): Removed -- doesn't seem very useful.
 
 2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 

=== modified file 'lisp/net/imap.el'
--- lisp/net/imap.el	2010-09-05 23:45:14 +0000
+++ lisp/net/imap.el	2010-09-05 23:49:02 +0000
@@ -2897,104 +2897,6 @@
 	(imap-forward)
 	(nreverse body)))))
 
-(when imap-debug			; (untrace-all)
-  (require 'trace)
-  (buffer-disable-undo (get-buffer-create imap-debug-buffer))
-  (mapc (lambda (f) (trace-function-background f imap-debug-buffer))
-	'(
-	  imap-utf7-encode
-	  imap-utf7-decode
-	  imap-error-text
-	  imap-kerberos4s-p
-	  imap-kerberos4-open
-	  imap-ssl-p
-	  imap-ssl-open
-	  imap-network-p
-	  imap-network-open
-	  imap-interactive-login
-	  imap-kerberos4a-p
-	  imap-kerberos4-auth
-	  imap-cram-md5-p
-	  imap-cram-md5-auth
-	  imap-login-p
-	  imap-login-auth
-	  imap-anonymous-p
-	  imap-anonymous-auth
-	  imap-open-1
-	  imap-open
-	  imap-opened
-	  imap-ping-server
-	  imap-authenticate
-	  imap-close
-	  imap-capability
-	  imap-namespace
-	  imap-send-command-wait
-	  imap-mailbox-put
-	  imap-mailbox-get
-	  imap-mailbox-map-1
-	  imap-mailbox-map
-	  imap-current-mailbox
-	  imap-current-mailbox-p-1
-	  imap-current-mailbox-p
-	  imap-mailbox-select-1
-	  imap-mailbox-select
-	  imap-mailbox-examine-1
-	  imap-mailbox-examine
-	  imap-mailbox-unselect
-	  imap-mailbox-expunge
-	  imap-mailbox-close
-	  imap-mailbox-create-1
-	  imap-mailbox-create
-	  imap-mailbox-delete
-	  imap-mailbox-rename
-	  imap-mailbox-lsub
-	  imap-mailbox-list
-	  imap-mailbox-subscribe
-	  imap-mailbox-unsubscribe
-	  imap-mailbox-status
-	  imap-mailbox-acl-get
-	  imap-mailbox-acl-set
-	  imap-mailbox-acl-delete
-	  imap-current-message
-	  imap-list-to-message-set
-	  imap-fetch-asynch
-	  imap-fetch
-	  imap-message-put
-	  imap-message-get
-	  imap-message-map
-	  imap-search
-	  imap-message-flag-permanent-p
-	  imap-message-flags-set
-	  imap-message-flags-del
-	  imap-message-flags-add
-	  imap-message-copyuid-1
-	  imap-message-copyuid
-	  imap-message-copy
-	  imap-message-appenduid-1
-	  imap-message-appenduid
-	  imap-message-append
-	  imap-body-lines
-	  imap-envelope-from
-	  imap-send-command-1
-	  imap-send-command
-	  imap-wait-for-tag
-	  imap-sentinel
-	  imap-find-next-line
-	  imap-arrival-filter
-	  imap-parse-greeting
-	  imap-parse-response
-	  imap-parse-resp-text
-	  imap-parse-resp-text-code
-	  imap-parse-data-list
-	  imap-parse-fetch
-	  imap-parse-status
-	  imap-parse-acl
-	  imap-parse-flag-list
-	  imap-parse-envelope
-	  imap-parse-body-extension
-	  imap-parse-body
-	  )))
-
 (provide 'imap)
 
 ;;; imap.el ends here
------------------------------------------------------------
revno: 101363
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Sun 2010-09-05 23:45:14 +0000
message:
  imap.el (imap-fetch-safe, imap-enable-exchange-bug-workaround): Removed.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-05 23:34:30 +0000
+++ lisp/ChangeLog	2010-09-05 23:45:14 +0000
@@ -1,9 +1,16 @@
 2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* imap.el (imap-fetch-safe): Removed function, and altered all callers
+	to use `imap-fetch' instead.  According to the comments, this should be
+	safe, since all other IMAP clients use the 1:* syntax.
+	(imap-enable-exchange-bug-workaround): Removed.
+
+2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
 	* net/imap.el (imap-log): New convenience function used throughout
 	instead of repeating the same code all over the place.
 
-2010-09-05  David De La Harpe Golden <david@harpegolden.net>
+2010-09-05  David De La Harpe Golden  <david@harpegolden.net>
 
 	* mouse.el (mouse-save-then-kill): Save region to kill-ring
 	when mouse-drag-copy-region is non-nil (Bug#6956).

=== modified file 'lisp/gnus/nnimap.el'
--- lisp/gnus/nnimap.el	2010-09-05 23:27:15 +0000
+++ lisp/gnus/nnimap.el	2010-09-05 23:45:14 +0000
@@ -588,7 +588,7 @@
 		(imap-mailbox-select decoded-group examine))
 	(let (minuid maxuid)
 	  (when (> (imap-mailbox-get 'exists) 0)
-	    (imap-fetch-safe '("1,*" . "1,*:*") "UID" nil 'nouidfetch)
+	    (imap-fetch "1:*" "UID" nil 'nouidfetch)
 	    (imap-message-map (lambda (uid Uid)
 				(setq minuid (if minuid (min minuid uid) uid)
 				      maxuid (if maxuid (max maxuid uid) uid)))

=== modified file 'lisp/net/imap.el'
--- lisp/net/imap.el	2010-09-05 23:34:30 +0000
+++ lisp/net/imap.el	2010-09-05 23:45:14 +0000
@@ -448,18 +448,6 @@
 The function should take two arguments, the first the IMAP tag and the
 second the status (OK, NO, BAD etc) of the command.")
 
-(defvar imap-enable-exchange-bug-workaround nil
-  "Send FETCH UID commands as *:* instead of *.
-
-When non-nil, use an alternative UIDS form.  Enabling appears to
-be required for some servers (e.g., Microsoft Exchange 2007)
-which otherwise would trigger a response 'BAD The specified
-message set is invalid.'.  We don't unconditionally use this
-form, since this is said to be significantly inefficient.
-
-This variable is set to t automatically per server if the
-canonical form fails.")
-
 
 ;; Utility functions:
 
@@ -1780,48 +1768,6 @@
 	 (format "String %s cannot be converted to a Lisp integer" number))
       number)))
 
-(defun imap-fetch-safe (uids props &optional receive nouidfetch buffer)
-  "Like `imap-fetch', but DTRT with Exchange 2007 bug.
-However, UIDS here is a cons, where the car is the canonical form
-of the UIDS specification, and the cdr is the one which works with
-Exchange 2007 or, potentially, other buggy servers.
-See `imap-enable-exchange-bug-workaround'."
-  ;; The first time we get here for a given, we'll try the canonical
-  ;; form.  If we get the known error from the buggy server, set the
-  ;; flag buffer-locally (to account for connections to multiple
-  ;; servers), then re-try with the alternative UIDS spec.  We don't
-  ;; unconditionally use the alternative form, since the
-  ;; currently-used alternatives are seriously inefficient with some
-  ;; servers (although they are valid).
-  ;;
-  ;; FIXME:  Maybe it would be cleaner to have a flag to not signal
-  ;; the error (which otherwise gives a message), and test
-  ;; `imap-failed-tags'.  Also, Other IMAP clients use other forms of
-  ;; request which work with Exchange, e.g. Claws does "UID FETCH 1:*
-  ;; (UID)" rather than "FETCH UID 1,*".  Is there a good reason not
-  ;; to do the same?
-  (condition-case data
-      ;; Binding `debug-on-error' allows us to get the error from
-      ;; `imap-parse-response' -- it's normally caught by Emacs around
-      ;; execution of a process filter.
-      (let ((debug-on-error t))
-	(imap-fetch (if imap-enable-exchange-bug-workaround
-			(cdr uids)
-		      (car uids))
-		    props receive nouidfetch buffer))
-    (error
-     (if (and (not imap-enable-exchange-bug-workaround)
-	      ;; This is the Exchange 2007 response.  It may be more
-	      ;; robust just to check for a BAD response to the
-	      ;; attempted fetch.
-	      (string-match "The specified message set is invalid"
-			    (cadr data)))
-	 (with-current-buffer (or buffer (current-buffer))
-	   (set (make-local-variable 'imap-enable-exchange-bug-workaround)
-		t)
-	   (imap-fetch (cdr uids) props receive nouidfetch))
-       (signal (car data) (cdr data))))))
-
 (defun imap-message-copyuid-1 (mailbox)
   (if (imap-capability 'UIDPLUS)
       (list (nth 0 (imap-mailbox-get-1 'copyuid mailbox))
@@ -1831,7 +1777,7 @@
 	  (imap-message-data (make-vector 2 0)))
       (when (imap-mailbox-examine-1 mailbox)
 	(prog1
-	    (and (imap-fetch-safe '("*" . "*:*") "UID")
+	    (and (imap-fetch "*:*" "UID")
 		 (list (imap-mailbox-get-1 'uidvalidity mailbox)
 		       (apply 'max (imap-message-map
 				    (lambda (uid prop) uid) 'UID))))
@@ -1877,7 +1823,7 @@
 	  (imap-message-data (make-vector 2 0)))
       (when (imap-mailbox-examine-1 mailbox)
 	(prog1
-	    (and (imap-fetch-safe '("*" . "*:*") "UID")
+	    (and (imap-fetch "*:*" "UID")
 		 (list (imap-mailbox-get-1 'uidvalidity mailbox)
 		       (apply 'max (imap-message-map
 				    (lambda (uid prop) uid) 'UID))))
@@ -3013,7 +2959,6 @@
 	  imap-list-to-message-set
 	  imap-fetch-asynch
 	  imap-fetch
-	  imap-fetch-safe
 	  imap-message-put
 	  imap-message-get
 	  imap-message-map
------------------------------------------------------------
revno: 101362
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Sun 2010-09-05 23:38:33 +0000
message:
  mail-source.el (mail-source-fetch): Don't message if we're fetching mail from a file, and the file doesn't exist.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-05 23:34:30 +0000
+++ lisp/gnus/ChangeLog	2010-09-05 23:38:33 +0000
@@ -1,5 +1,8 @@
 2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* mail-source.el (mail-source-fetch): Don't message if we're fetching
+	mail from a file, and the file doesn't exist.
+
 	* pop3.el (pop3-streaming-movemail): Return t for success.
 
 	* nnimap.el (nnimap-open-connection): Look for the "imaps" entry in the

=== modified file 'lisp/gnus/mail-source.el'
--- lisp/gnus/mail-source.el	2010-09-05 01:27:15 +0000
+++ lisp/gnus/mail-source.el	2010-09-05 23:38:33 +0000
@@ -544,11 +544,16 @@
   (mail-source-bind-common source
     (if (or mail-source-plugged plugged)
 	(save-excursion
-	  (nnheader-message 4 "%sReading incoming mail from %s..."
-			    (if method
-				(format "%s: " method)
-			      "")
-			    (car source))
+	  ;; Special-case the `file' handler since it's so common and
+	  ;; just adds noise.
+	  (when (or (not (eq (car source) 'file))
+		    (mail-source-bind (file source)
+		      (file-exists-p path)))
+	    (nnheader-message 4 "%sReading incoming mail from %s..."
+			      (if method
+				  (format "%s: " method)
+				"")
+			      (car source)))
 	  (let ((function (cadr (assq (car source) mail-source-fetcher-alist)))
 		(found 0))
 	    (unless function
------------------------------------------------------------
revno: 101361
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Sun 2010-09-05 23:34:30 +0000
message:
  pop3.el (pop3-streaming-movemail): Return t for success; imap.el (imap-log): New convenience function used throughout instead of repeating the same code all over the place.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-05 22:40:57 +0000
+++ lisp/ChangeLog	2010-09-05 23:34:30 +0000
@@ -1,3 +1,8 @@
+2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* net/imap.el (imap-log): New convenience function used throughout
+	instead of repeating the same code all over the place.
+
 2010-09-05  David De La Harpe Golden <david@harpegolden.net>
 
 	* mouse.el (mouse-save-then-kill): Save region to kill-ring

=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-05 23:27:15 +0000
+++ lisp/gnus/ChangeLog	2010-09-05 23:34:30 +0000
@@ -1,5 +1,7 @@
 2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* pop3.el (pop3-streaming-movemail): Return t for success.
+
 	* nnimap.el (nnimap-open-connection): Look for the "imaps" entry in the
 	.authinfo if we're using ssl connection.
 

=== modified file 'lisp/gnus/pop3.el'
--- lisp/gnus/pop3.el	2010-09-05 04:01:41 +0000
+++ lisp/gnus/pop3.el	2010-09-05 23:34:30 +0000
@@ -145,7 +145,8 @@
 	(unless pop3-leave-mail-on-server
 	  (pop3-send-streaming-command
 	   process "DELE" message-count nil))))
-    (pop3-quit process)))
+    (pop3-quit process)
+    t))
 
 (defun pop3-send-streaming-command (process command count total-size)
   (erase-buffer)

=== modified file 'lisp/net/imap.el'
--- lisp/net/imap.el	2010-09-02 01:42:32 +0000
+++ lisp/net/imap.el	2010-09-05 23:34:30 +0000
@@ -515,6 +515,16 @@
 
 ;; Server functions; stream stuff:
 
+(defun imap-log (string-or-buffer)
+  (when imap-log
+    (with-current-buffer (get-buffer-create imap-log-buffer)
+      (imap-disable-multibyte)
+      (buffer-disable-undo)
+      (goto-char (point-max))
+      (if (bufferp string-or-buffer)
+	  (insert-buffer-substring string-or-buffer)
+	(insert string-or-buffer)))))
+
 (defun imap-kerberos4-stream-p (buffer)
   (imap-capability 'AUTH=KERBEROS_V4 buffer))
 
@@ -569,12 +579,6 @@
 				  (setq response (match-string 1)))))
 	      (accept-process-output process 1)
 	      (sit-for 1))
-	    (and imap-log
-		 (with-current-buffer (get-buffer-create imap-log-buffer)
-		   (imap-disable-multibyte)
-		   (buffer-disable-undo)
-		   (goto-char (point-max))
-		   (insert-buffer-substring buffer)))
 	    (erase-buffer)
 	    (message "Opening Kerberos 4 IMAP connection with `%s'...%s" cmd
 		     (if response (concat "done, " response) "failed"))
@@ -645,12 +649,7 @@
 				  (setq response (match-string 1)))))
 	      (accept-process-output process 1)
 	      (sit-for 1))
-	    (and imap-log
-		 (with-current-buffer (get-buffer-create imap-log-buffer)
-		   (imap-disable-multibyte)
-		   (buffer-disable-undo)
-		   (goto-char (point-max))
-		   (insert-buffer-substring buffer)))
+	    (imap-log buffer)
 	    (erase-buffer)
 	    (message "GSSAPI IMAP connection: %s" (or response "failed"))
 	    (if (and response (let ((case-fold-search nil))
@@ -701,12 +700,7 @@
 			(not (imap-parse-greeting)))
 	      (accept-process-output process 1)
 	      (sit-for 1))
-	    (and imap-log
-		 (with-current-buffer (get-buffer-create imap-log-buffer)
-		   (imap-disable-multibyte)
-		   (buffer-disable-undo)
-		   (goto-char (point-max))
-		   (insert-buffer-substring buffer)))
+	    (imap-log buffer)
 	    (erase-buffer)
 	    (when (memq (process-status process) '(open run))
 	      (setq done process))))))
@@ -740,12 +734,7 @@
 		  (not (imap-parse-greeting)))
 	(accept-process-output process 1)
 	(sit-for 1))
-      (and imap-log
-	   (with-current-buffer (get-buffer-create imap-log-buffer)
-	     (imap-disable-multibyte)
-	     (buffer-disable-undo)
-	     (goto-char (point-max))
-	     (insert-buffer-substring buffer)))
+      (imap-log buffer)
       (when (memq (process-status process) '(open run))
 	process))))
 
@@ -764,12 +753,7 @@
 		  (not (imap-parse-greeting)))
 	(accept-process-output process 1)
 	(sit-for 1))
-      (and imap-log
-	   (with-current-buffer (get-buffer-create imap-log-buffer)
-	     (imap-disable-multibyte)
-	     (buffer-disable-undo)
-	     (goto-char (point-max))
-	     (insert-buffer-substring buffer)))
+      (imap-log buffer)
       (when (memq (process-status process) '(open run))
 	process))))
 
@@ -803,12 +787,7 @@
 		      (not (imap-parse-greeting)))
 	    (accept-process-output process 1)
 	    (sit-for 1))
-	  (and imap-log
-	       (with-current-buffer (get-buffer-create imap-log-buffer)
-		 (imap-disable-multibyte)
-		 (buffer-disable-undo)
-		 (goto-char (point-max))
-		 (insert-buffer-substring buffer)))
+	  (imap-log buffer)
 	  (erase-buffer)
 	  (when (memq (process-status process) '(open run))
 	    (setq done process)))))
@@ -845,11 +824,7 @@
 		  (not (re-search-forward "[0-9]+ OK.*\r?\n" nil t)))
 	(accept-process-output process 1)
 	(sit-for 1))
-      (and imap-log
-	   (with-current-buffer (get-buffer-create imap-log-buffer)
-	     (buffer-disable-undo)
-	     (goto-char (point-max))
-	     (insert-buffer-substring buffer)))
+      (imap-log buffer)
       (when (and (setq tls-info (starttls-negotiate process))
 		 (memq (process-status process) '(open run)))
 	(setq done process)))
@@ -1959,12 +1934,7 @@
 
 (defun imap-send-command-1 (cmdstr)
   (setq cmdstr (concat cmdstr imap-client-eol))
-  (and imap-log
-       (with-current-buffer (get-buffer-create imap-log-buffer)
-	 (imap-disable-multibyte)
-	 (buffer-disable-undo)
-	 (goto-char (point-max))
-	 (insert cmdstr)))
+  (imap-log cmdstr)
   (process-send-string imap-process cmdstr))
 
 (defun imap-send-command (command &optional buffer)
@@ -2002,13 +1972,7 @@
 			     (stream imap-stream)
 			     (eol imap-client-eol))
 			 (with-current-buffer cmd
-			   (and imap-log
-				(with-current-buffer (get-buffer-create
-						      imap-log-buffer)
-				  (imap-disable-multibyte)
-				  (buffer-disable-undo)
-				  (goto-char (point-max))
-				  (insert-buffer-substring cmd)))
+			   (imap-log cmd)
 			   (process-send-region process (point-min)
 						(point-max)))
 			 (process-send-string process imap-client-eol))))
@@ -2084,12 +2048,7 @@
     (with-current-buffer (process-buffer proc)
       (goto-char (point-max))
       (insert string)
-      (and imap-log
-	   (with-current-buffer (get-buffer-create imap-log-buffer)
-	     (imap-disable-multibyte)
-	     (buffer-disable-undo)
-	     (goto-char (point-max))
-	     (insert string)))
+      (imap-log string)
       (let (end)
 	(goto-char (point-min))
 	(while (setq end (imap-find-next-line))
------------------------------------------------------------
revno: 101360
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Sun 2010-09-05 23:27:15 +0000
message:
  nnimap.el (nnimap-open-connection): Look for the "imaps" entry in the .authinfo if we're using ssl connection.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-05 23:20:25 +0000
+++ lisp/gnus/ChangeLog	2010-09-05 23:27:15 +0000
@@ -1,5 +1,8 @@
 2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* nnimap.el (nnimap-open-connection): Look for the "imaps" entry in the
+	.authinfo if we're using ssl connection.
+
 	* nnvirtual.el (nnvirtual-create-mapping): Use the active info we
 	already have if we're in a main Gnus `g' run.
 

=== modified file 'lisp/gnus/nnimap.el'
--- lisp/gnus/nnimap.el	2010-09-02 00:55:51 +0000
+++ lisp/gnus/nnimap.el	2010-09-05 23:27:15 +0000
@@ -832,9 +832,13 @@
     (let* ((list (progn (gnus-message 7 "Parsing authinfo file `%s'."
 				      nnimap-authinfo-file)
 			(netrc-parse nnimap-authinfo-file)))
- 	   (port (if nnimap-server-port
- 		     (int-to-string nnimap-server-port)
- 		   "imap"))
+	   (port (cond
+		  (nnimap-server-port
+		   (int-to-string nnimap-server-port))
+		  ((eq nnimap-stream 'ssl)
+		   "imaps")
+		  (t
+		   "imap")))
 	   (auth-info
 	    (auth-source-user-or-password '("login" "password") server port))
 	   (auth-user (nth 0 auth-info))
------------------------------------------------------------
revno: 101359
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Sun 2010-09-05 23:20:25 +0000
message:
  nnvirtual.el (nnvirtual-create-mapping): Use the active info we already have if we're in a main Gnus `g' run.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-05 23:13:43 +0000
+++ lisp/gnus/ChangeLog	2010-09-05 23:20:25 +0000
@@ -1,5 +1,8 @@
 2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* nnvirtual.el (nnvirtual-create-mapping): Use the active info we
+	already have if we're in a main Gnus `g' run.
+
 	* gnus-start.el (gnus-method-rank): Get info for virtual groups last.
 
 2010-09-05  Katsumi Yamaoka  <yamaoka@jpl.org>

=== modified file 'lisp/gnus/gnus-start.el'
--- lisp/gnus/gnus-start.el	2010-09-05 23:13:43 +0000
+++ lisp/gnus/gnus-start.el	2010-09-05 23:20:25 +0000
@@ -1796,7 +1796,7 @@
       (gnus-read-active-file-1 method nil))
      (t
       (dolist (info infos)
-	(gnus-activate-group (gnus-info-group info) nil nil method))))))
+	(gnus-activate-group (gnus-info-group info) nil t method))))))
 
 ;; Create a hash table out of the newsrc alist.  The `car's of the
 ;; alist elements are used as keys.

=== modified file 'lisp/gnus/nnvirtual.el'
--- lisp/gnus/nnvirtual.el	2010-09-05 00:34:16 +0000
+++ lisp/gnus/nnvirtual.el	2010-09-05 23:20:25 +0000
@@ -260,13 +260,11 @@
     (nnheader-report 'nnvirtual "No component groups in %s" group))
    (t
     (setq nnvirtual-current-group group)
-    (when (or (not dont-check)
-	      nnvirtual-always-rescan)
-      (nnvirtual-create-mapping)
-      (when nnvirtual-always-rescan
-	(nnvirtual-request-update-info
-	 (nnvirtual-current-group)
-	 (gnus-get-info (nnvirtual-current-group)))))
+    (nnvirtual-create-mapping dont-check)
+    (when nnvirtual-always-rescan
+      (nnvirtual-request-update-info
+       (nnvirtual-current-group)
+       (gnus-get-info (nnvirtual-current-group))))
     (nnheader-insert "211 %d 1 %d %s\n"
 		     nnvirtual-mapping-len nnvirtual-mapping-len group))))
 
@@ -670,7 +668,7 @@
     carticles))
 
 
-(defun nnvirtual-create-mapping ()
+(defun nnvirtual-create-mapping (dont-check)
   "Build the tables necessary to map between component (group, article) to virtual article.
 Generate the set of read messages and marks for the virtual group
 based on the marks on the component groups."
@@ -689,7 +687,9 @@
     ;; Into all-marks we put (g marks).
     ;; We also increment cnt and tot here, and compute M (max of sizes).
     (mapc (lambda (g)
-	    (setq active (gnus-activate-group g)
+	    (setq active (or (and dont-check
+				  (gnus-active g))
+			     (gnus-activate-group g))
 		  min (car active)
 		  max (cdr active))
 	    (when (and active (>= max min) (not (zerop max)))
------------------------------------------------------------
revno: 101358
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Sun 2010-09-05 23:13:43 +0000
message:
  gnus-start.el (gnus-method-rank): Get info for virtual groups last.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-05 11:53:59 +0000
+++ lisp/gnus/ChangeLog	2010-09-05 23:13:43 +0000
@@ -1,3 +1,7 @@
+2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus-start.el (gnus-method-rank): Get info for virtual groups last.
+
 2010-09-05  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-start.el (gnus-method-rank): Replace equalp with equal.

=== modified file 'lisp/gnus/gnus-start.el'
--- lisp/gnus/gnus-start.el	2010-09-05 11:53:59 +0000
+++ lisp/gnus/gnus-start.el	2010-09-05 23:13:43 +0000
@@ -1764,6 +1764,9 @@
 
 (defun gnus-method-rank (type method)
   (cond
+   ;; Get info for virtual groups last.
+   ((eq (car method) 'nnvirtual)
+    200)
    ((eq type 'primary)
     1)
    ;; Compute the rank of the secondary methods based on where they
------------------------------------------------------------
revno: 101357
committer: David De La Harpe Golden <david@harpegolden.net>
branch nick: trunk
timestamp: Sun 2010-09-05 23:40:57 +0100
message:
  Respect mouse-drag-copy-region upon mouse-3 region adjustment.
  
  * mouse.el (mouse-save-then-kill): Save region to kill-ring when
  mouse-drag-copy-region is non-nil (Bug#6956).
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-05 21:28:50 +0000
+++ lisp/ChangeLog	2010-09-05 22:40:57 +0000
@@ -1,3 +1,8 @@
+2010-09-05  David De La Harpe Golden <david@harpegolden.net>
+
+	* mouse.el (mouse-save-then-kill): Save region to kill-ring
+	when mouse-drag-copy-region is non-nil (Bug#6956).
+
 2010-09-05  Chong Yidong  <cyd@stupidchicken.com>
 
 	* dired.el (dired-ls-sorting-switches, dired-sort-by-name-regexp):

=== modified file 'lisp/mouse.el'
--- lisp/mouse.el	2010-08-29 16:17:13 +0000
+++ lisp/mouse.el	2010-09-05 22:40:57 +0000
@@ -43,7 +43,10 @@
   :group 'mouse)
 
 (defcustom mouse-drag-copy-region nil
-  "If non-nil, mouse drag copies region to kill-ring."
+  "If non-nil, copy to kill-ring upon mouse adjustments of the region.
+
+This affects `mouse-save-then-kill' (\\[mouse-save-then-kill]) in
+addition to mouse drags."
   :type 'boolean
   :version "24.1"
   :group 'mouse)
@@ -1348,8 +1351,13 @@
 have selected whole words or lines, move point or mark to the
 word or line boundary closest to CLICK instead.
 
+If `mouse-drag-copy-region' is non-nil, this command also saves the
+new region to the kill ring (replacing the previous kill if the
+previous region was just saved to the kill ring).
+
 If this command is called a second consecutive time with the same
-CLICK position, kill the region."
+CLICK position, kill the region (or delete it
+if `mouse-drag-copy-region' is non-nil)"
   (interactive "e")
   (mouse-minibuffer-check click)
   (let* ((posn     (event-start click))
@@ -1371,7 +1379,11 @@
      ((and (eq last-command 'mouse-save-then-kill)
 	   (eq click-pt mouse-save-then-kill-posn)
 	   (eq window (selected-window)))
-      (kill-region (mark t) (point))
+      (if mouse-drag-copy-region
+          ;; Region already saved in the previous click;
+          ;; don't make a duplicate entry, just delete.
+          (delete-region (mark t) (point))
+        (kill-region (mark t) (point)))
       (setq mouse-selection-click-count 0)
       (setq mouse-save-then-kill-posn nil))
 
@@ -1394,6 +1406,9 @@
 	  (goto-char (nth 1 range)))
 	(setq deactivate-mark nil)
 	(mouse-set-region-1)
+        (when mouse-drag-copy-region
+          ;; Region already copied to kill-ring once, so replace.
+          (kill-new (filter-buffer-substring (mark t) (point)) t))
 	;; Arrange for a repeated mouse-3 to kill the region.
 	(setq mouse-save-then-kill-posn click-pt)))
 
@@ -1405,6 +1420,8 @@
 	(if before-scroll (goto-char before-scroll)))
       (exchange-point-and-mark)
       (mouse-set-region-1)
+      (when mouse-drag-copy-region
+        (kill-new (filter-buffer-substring (mark t) (point))))
       (setq mouse-save-then-kill-posn click-pt)))))
------------------------------------------------------------
revno: 101356
committer: Chong Yidong <cyd@stupidchicken.com>
branch nick: trunk
timestamp: Sun 2010-09-05 17:28:50 -0400
message:
  Improve ls date switch parsing in Dired (Bug#6987).
  
  * dired.el (dired-ls-sorting-switches, dired-sort-by-name-regexp):
  Improve regexps (Bug#6987).
  (dired-sort-toggle): Search more robustly for -t flag.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-05 19:03:20 +0000
+++ lisp/ChangeLog	2010-09-05 21:28:50 +0000
@@ -1,5 +1,9 @@
 2010-09-05  Chong Yidong  <cyd@stupidchicken.com>
 
+	* dired.el (dired-ls-sorting-switches, dired-sort-by-name-regexp):
+	Improve regexps (Bug#6987).
+	(dired-sort-toggle): Search more robustly for -t flag.
+
 	* files.el (get-free-disk-space): Search more robustly for
 	"available" column.  Suggested by Ehud Karni
 	<ehud@unix.mvs.co.il>.

=== modified file 'lisp/dired.el'
--- lisp/dired.el	2010-08-29 16:17:13 +0000
+++ lisp/dired.el	2010-09-05 21:28:50 +0000
@@ -3249,12 +3249,16 @@
 format, use `\\[universal-argument] \\[dired]'.")
 
 (defvar dired-sort-by-date-regexp
-  (concat "^-[^" dired-ls-sorting-switches
-	  "]*t[^" dired-ls-sorting-switches "]*$")
+  (concat "\\(\\`\\| \\)-[^- ]*t"
+	  ;; `dired-ls-sorting-switches' after -t overrides -t.
+	  "[^ " dired-ls-sorting-switches "]*"
+	  "\\(\\(\\`\\| +\\)\\(--[^ ]+\\|-[^- t"
+	  dired-ls-sorting-switches "]+\\)\\)* *$")
   "Regexp recognized by Dired to set `by date' mode.")
 
 (defvar dired-sort-by-name-regexp
-  (concat "^-[^t" dired-ls-sorting-switches "]+$")
+  (concat "\\`\\(\\(\\`\\| +\\)\\(--[^ ]+\\|"
+	  "-[^- t" dired-ls-sorting-switches "]+\\)\\)* *$")
   "Regexp recognized by Dired to set `by name' mode.")
 
 (defvar dired-sort-inhibit nil
@@ -3280,8 +3284,8 @@
     (force-mode-line-update)))
 
 (defun dired-sort-toggle-or-edit (&optional arg)
-  "Toggle between sort by date/name and refresh the dired buffer.
-With a prefix argument you can edit the current listing switches instead."
+  "Toggle sorting by date, and refresh the Dired buffer.
+With a prefix argument, edit the current listing switches instead."
   (interactive "P")
   (when dired-sort-inhibit
     (error "Cannot sort this dired buffer"))
@@ -3292,24 +3296,24 @@
 
 (defun dired-sort-toggle ()
   ;; Toggle between sort by date/name.  Reverts the buffer.
-  (setq dired-actual-switches
-	(let (case-fold-search)
-	  (if (string-match " " dired-actual-switches)
-	      ;; New toggle scheme: add/remove a trailing " -t"
-	      (if (string-match " -t\\'" dired-actual-switches)
-		  (substring dired-actual-switches 0 (match-beginning 0))
-		(concat dired-actual-switches " -t"))
-	    ;; old toggle scheme: look for some 't' switch and add/remove it
-	    (concat
-	     "-l"
-	     (dired-replace-in-string (concat "[-lt"
-					      dired-ls-sorting-switches "]")
-				      ""
-				      dired-actual-switches)
-	     (if (string-match (concat "[t" dired-ls-sorting-switches "]")
-			       dired-actual-switches)
-		 ""
-	       "t")))))
+  (let ((sorting-by-date (string-match dired-sort-by-date-regexp
+				       dired-actual-switches))
+	;; Regexp for finding (possibly embedded) -t switches.
+	(switch-regexp "\\(\\`\\| \\)-\\([a-su-zA-Z]*\\)\\(t\\)\\([^ ]*\\)")
+	case-fold-search)
+    ;; Remove the -t switch.
+    (while (string-match switch-regexp dired-actual-switches)
+      (if (and (equal (match-string 2 dired-actual-switches) "")
+	       (equal (match-string 4 dired-actual-switches) ""))
+	  ;; Remove a stand-alone -t switch.
+	  (setq dired-actual-switches
+		(replace-match "" t t dired-actual-switches))
+	;; Remove a switch of the form -XtY for some X and Y.
+	(setq dired-actual-switches
+	      (replace-match "" t t dired-actual-switches 3))))
+    ;; Now, if we weren't sorting by date before, add the -t switch.
+    (unless sorting-by-date
+      (setq dired-actual-switches (concat dired-actual-switches " -t"))))
   (dired-sort-set-modeline)
   (revert-buffer))
------------------------------------------------------------
revno: 101355
committer: Chong Yidong <cyd@stupidchicken.com>
branch nick: trunk
timestamp: Sun 2010-09-05 15:03:20 -0400
message:
  * files.el (get-free-disk-space): Search more robustly for "available" column.
  
  Suggested by Ehud Karni <ehud@unix.mvs.co.il>:
  http://lists.gnu.org/archive/html/emacs-devel/2010-09/msg00163.html
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-05 02:06:39 +0000
+++ lisp/ChangeLog	2010-09-05 19:03:20 +0000
@@ -1,3 +1,9 @@
+2010-09-05  Chong Yidong  <cyd@stupidchicken.com>
+
+	* files.el (get-free-disk-space): Search more robustly for
+	"available" column.  Suggested by Ehud Karni
+	<ehud@unix.mvs.co.il>.
+
 2010-09-05  Juanma Barranquero  <lekktu@gmail.com>
 
 	* international/uni-bidi.el:

=== modified file 'lisp/files.el'
--- lisp/files.el	2010-08-29 16:17:13 +0000
+++ lisp/files.el	2010-09-05 19:03:20 +0000
@@ -5563,12 +5563,14 @@
 
 (defun get-free-disk-space (dir)
   "Return the amount of free space on directory DIR's file system.
-The result is a string that gives the number of free 1KB blocks,
-or nil if the system call or the program which retrieve the information
-fail.  It returns also nil when DIR is a remote directory.
+The return value is a string describing the amount of free
+space (normally, the number of free 1KB blocks).
 
-This function calls `file-system-info' if it is available, or invokes the
-program specified by `directory-free-space-program' if that is non-nil."
+This function calls `file-system-info' if it is available, or
+invokes the program specified by `directory-free-space-program'
+and `directory-free-space-args'.  If the system call or program
+is unsuccessful, or if DIR is a remote directory, this function
+returns nil."
   (unless (file-remote-p dir)
     ;; Try to find the number of free blocks.  Non-Posix systems don't
     ;; always have df, but might have an equivalent system call.
@@ -5588,19 +5590,22 @@
 					 directory-free-space-args
 					 dir)
 			   0)))
-	    ;; Usual format is a header line followed by a line of
-	    ;; numbers.
+	    ;; Usual format is as follows:
+	    ;; Filesystem ...    Used  Available  Capacity ...
+	    ;; /dev/sda6  ...48106535   35481255  10669850 ...
 	    (goto-char (point-min))
-	    (forward-line 1)
-	    (if (not (eobp))
-		(progn
-		  ;; Move to the end of the "available blocks" number.
-		  (skip-chars-forward "^ \t")
-		  (forward-word 3)
-		  ;; Copy it into AVAILABLE.
-		  (let ((end (point)))
-		    (forward-word -1)
-		    (buffer-substring (point) end))))))))))
+	    (when (re-search-forward " +Avail[^ \n]*"
+				     (line-end-position) t)
+	      (let ((beg (match-beginning 0))
+		    (end (match-end 0))
+		    str)
+		(forward-line 1)
+		(setq str
+		      (buffer-substring-no-properties
+		       (+ beg (point) (- (point-min)))
+		       (+ end (point) (- (point-min)))))
+		(when (string-match "\\` *\\([^ ]+\\)" str)
+		  (match-string 1 str))))))))))
 
 ;; The following expression replaces `dired-move-to-filename-regexp'.
 (defvar directory-listing-before-filename-regexp
------------------------------------------------------------
revno: 101354
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Sun 2010-09-05 11:53:59 +0000
message:
  gnus-start.el (gnus-method-rank): Replace equalp with equal.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-05 04:09:07 +0000
+++ lisp/gnus/ChangeLog	2010-09-05 11:53:59 +0000
@@ -1,5 +1,7 @@
 2010-09-05  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+	* gnus-start.el (gnus-method-rank): Replace equalp with equal.
+
 	* nnmh.el (nnmh-request-list-1): Bind `file'.
 
 	* pop3.el (pop3-set-process-query-on-exit-flag): New function that's an

=== modified file 'lisp/gnus/gnus-start.el'
--- lisp/gnus/gnus-start.el	2010-09-05 01:08:22 +0000
+++ lisp/gnus/gnus-start.el	2010-09-05 11:53:59 +0000
@@ -1772,7 +1772,7 @@
     (let ((i 2))
       (block nil
 	(dolist (smethod gnus-secondary-select-methods)
-	  (when (equalp method smethod)
+	  (when (equal method smethod)
 	    (return i))
 	  (incf i))
 	i)))
------------------------------------------------------------
revno: 101353
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Sun 2010-09-05 04:09:07 +0000
message:
  (nnmh-request-list-1): Bind `file'.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-09-05 04:01:41 +0000
+++ lisp/gnus/ChangeLog	2010-09-05 04:09:07 +0000
@@ -1,5 +1,7 @@
 2010-09-05  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+	* nnmh.el (nnmh-request-list-1): Bind `file'.
+
 	* pop3.el (pop3-set-process-query-on-exit-flag): New function that's an
 	alias to set-process-query-on-exit-flag or process-kill-without-query.
 	(pop3-open-server): Use it.

=== modified file 'lisp/gnus/nnmh.el'
--- lisp/gnus/nnmh.el	2010-09-05 00:44:53 +0000
+++ lisp/gnus/nnmh.el	2010-09-05 04:09:07 +0000
@@ -209,7 +209,7 @@
   ;; Recurse down all directories.
   (let ((files (nnheader-directory-files dir t nil t))
 	(max 0)
-	min rdir num subdirectoriesp)
+	min rdir num subdirectoriesp file)
     ;; Recurse down directories.
     (setq subdirectoriesp (> (nth 1 (file-attributes dir)) 2))
     (dolist (rdir files)
------------------------------------------------------------
Use --include-merges or -n0 to see merged revisions.